Bump version to 2.28.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="148"
-      android:versionName="2.26.2">
+      android:versionCode="156"
+      android:versionName="2.28.1">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
 

build.gradle

@@ -81,9 +81,16 @@ dependencies {
     compile 'org.whispersystems:textsecure-android:1.6.2'
     compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0'
 
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.assertj:assertj-core:1.7.1'
+    testCompile 'org.mockito:mockito-core:1.9.5'
+    testCompile 'org.powermock:powermock-api-mockito:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testCompile 'org.powermock:powermock-classloading-xstream:1.6.1'
+
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-
     androidTestCompile ('org.assertj:assertj-core:1.7.1') {
         exclude group: 'org.hamcrest', module: 'hamcrest-core'
     }
@@ -91,13 +98,6 @@ dependencies {
         exclude group: 'org.hamcrest',        module: 'hamcrest-core'
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestCompile ('com.android.support.test:runner:0.2') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    androidTestCompile ('com.android.support.test.espresso:espresso-core:2.1') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-        exclude group: 'javax.inject'
-    }
 }
 
 dependencyVerification {
@@ -162,7 +162,6 @@ android {
         minSdkVersion 9
         targetSdkVersion 22
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
         buildConfigField "String", "PUSH_URL", "\"https://textsecure-service.whispersystems.org\""
         buildConfigField "boolean", "DEV_BUILD", "false"
@@ -227,6 +226,9 @@ android {
         androidTest {
             java.srcDirs = ['test/androidTest/java']
         }
+        test {
+            java.srcDirs = ['test/unitTest/java']
+        }
     }
 
      lintOptions {
@@ -265,27 +267,3 @@ if (propFile.canRead()){
     android.buildTypes.release.signingConfig = null
 }
 
-if (project.hasProperty('espresso') && System.console() != null) {
-    println "______________________WARNING_______________________"
-    println "ALL YOUR CONTACTS WILL BE DELETED IN THE PROCESS"
-    println "OF RUNNING THESE TESTS, TYPE 'delete all my contacts'"
-    println "TO CONTINUE"
-    println "----------------------------------------------------"
-
-    def input = System.console().readLine(':')
-    if (input == 'delete all my contacts') {
-        android.productFlavors {
-            base {}
-            espresso {
-                testInstrumentationRunner "org.thoughtcrime.securesms.TextSecureWakingTestRunner"
-            }
-        }
-        android.sourceSets.espresso {
-            manifest.srcFile 'test/espresso/AndroidManifest.xml'
-        }
-        android.sourceSets.androidTestEspresso {
-            java.srcDirs = ['test/androidTestEspresso/java']
-            res.srcDirs  = ['test/androidTestEspresso/res']
-        }
-    }
-}

res/drawable/conversation_attachment_close_circle.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:height="24dp" android:width="24dp"/>
-            <solid android:color="@color/white"/>
-        </shape>
-    </item>
     <item>
         <shape android:shape="oval">
             <size android:height="21dp" android:width="21dp"/>

res/drawable/conversation_item_background.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:state_selected="true"
-          android:drawable="@drawable/list_selected_holo_light" />
-</selector>
+    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+</selector>

res/drawable/conversation_item_background_dark.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:state_selected="true"
-          android:drawable="@drawable/list_selected_holo_dark" />
-</selector>

res/layout/conversation_fragment.xml

@@ -5,18 +5,12 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <ListView android:id="@android:id/list"
-              android:layout_width="fill_parent"
-              android:layout_height="0dp"
-              android:layout_weight="1.0"
-              android:drawSelectorOnTop="false"
-              android:transcriptMode="normal"
-              android:scrollbarAlwaysDrawVerticalTrack="false"
-              android:scrollbarStyle="insideOverlay"
-              android:stackFromBottom="true"
-              android:fadingEdge="none"
-              android:divider="@android:color/transparent"
-              android:dividerHeight="0dp"
-              android:cacheColorHint="?conversation_background" />
+    <android.support.v7.widget.RecyclerView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1.0"
+            android:scrollbars="vertical"
+            android:cacheColorHint="?conversation_background" />
 
-</LinearLayout>
+</LinearLayout>

res/layout/conversation_item_activity.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.ConversationItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/conversation_item"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp">
-
-    <TextView android:id="@+id/conversation_item_body"
-        android:autoLink="all"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:linksClickable="true"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center"
-        android:textStyle="italic"
-        android:textColor="?attr/conversation_group_member_name"
-        android:textSize="14sp" />
-    <TextView android:id="@+id/conversation_item_date"
-        android:autoLink="all"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:linksClickable="false"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_gravity="right"
-        android:fontFamily="sans-serif-light"
-        android:textColor="?conversation_item_sent_text_secondary_color"
-        android:text="date"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone"/>
-
-</org.thoughtcrime.securesms.ConversationItem>

res/layout/conversation_item_pending_v11.xml

@@ -5,7 +5,7 @@
     <pl.tajchert.sample.DotsTextView
             android:id="@+id/pending_indicator"
             android:layout_width="20dp"
-            android:layout_height="wrap_content"
+            android:layout_height="20dp"
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:fontFamily="sans-serif-light"

res/layout/conversation_item_received.xml

@@ -4,11 +4,9 @@
                                              android:layout_height="wrap_content"
                                              android:paddingRight="10dip"
                                              android:orientation="vertical"
-                                             android:background="?conversation_item_background"
+                                             android:background="@drawable/conversation_item_background"
                                              xmlns:android="http://schemas.android.com/apk/res/android"
-                                             xmlns:tools="http://schemas.android.com/tools"
-                                             xmlns:dots="http://schemas.android.com/apk/res-auto"
-                                             xmlns:app="http://schemas.android.com/apk/res-auto">
+                                             xmlns:tools="http://schemas.android.com/tools">
 
     <TextView android:id="@+id/group_message_status"
               android:layout_width="wrap_content"

res/layout/conversation_item_sent.xml

@@ -2,12 +2,11 @@
 <org.thoughtcrime.securesms.ConversationItem
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/conversation_item"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?conversation_item_background">
+    android:background="@drawable/conversation_item_background">
 
     <RelativeLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"

res/layout/conversation_item_update.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.ConversationUpdateItem
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/conversation_update_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:padding="20dp">
+
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content">
+
+        <ImageView android:id="@+id/conversation_update_icon"
+                   android:layout_marginRight="7dp"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"/>
+
+        <TextView android:id="@+id/conversation_update_body"
+                  android:autoLink="all"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:linksClickable="true"
+                  android:textAppearance="?android:attr/textAppearanceSmall"
+                  android:textStyle="italic"
+                  android:textColor="?attr/conversation_group_member_name"/>
+
+    </LinearLayout>
+
+</org.thoughtcrime.securesms.ConversationUpdateItem>

res/layout/thumbnail_view.xml

@@ -5,27 +5,20 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:adjustViewBounds="true"
+               android:clickable="false"
+               android:longClickable="false"
                android:scaleType="fitCenter"
-               android:contentDescription="@string/conversation_item__mms_image_description"
-               android:layout_margin="@dimen/media_bubble_border_width" />
+               android:contentDescription="@string/conversation_item__mms_image_description" />
 
-    <ViewStub android:id="@+id/progress_wheel_stub"
+    <ViewStub android:id="@+id/transfer_controls_stub"
               android:layout_width="70dp"
               android:layout_height="70dp"
               android:layout_gravity="center"
-              android:layout="@layout/thumbnail_view_progress_wheel" />
+              android:layout="@layout/transfer_controls_stub" />
 
     <ViewStub android:id="@+id/remove_button_stub"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_gravity="top|right"
               android:layout="@layout/thumbnail_view_remove_button" />
-
-    <ImageButton android:id="@+id/download_button"
-                 android:layout_width="70dp"
-                 android:layout_height="70dp"
-                 android:layout_gravity="center"
-                 android:background="@drawable/progress_background"
-                 android:src="@drawable/ic_file_download_white_36dp"
-                 android:visibility="gone" />
 </merge>

res/layout/thumbnail_view_progress_wheel.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.pnikosis.materialishprogress.ProgressWheel
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/progress_wheel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/progress_background"
-        android:visibility="gone"
-        app:matProg_barColor="@color/white"
-        app:matProg_linearProgress="true"
-        app:matProg_spinSpeed="0.333" />

res/layout/thumbnail_view_remove_button.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
            android:id="@+id/remove_image_button"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
+           android:layout_width="@dimen/media_bubble_remove_button_size"
+           android:layout_height="@dimen/media_bubble_remove_button_size"
            android:src="@drawable/conversation_attachment_close_circle" />

res/layout/transfer_controls_stub.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.TransferControlView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/transfer_controls"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+

res/layout/transfer_controls_view.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.pnikosis.materialishprogress.ProgressWheel
+            android:id="@+id/progress_wheel"
+            android:layout_width="@dimen/transfer_controls_contracted_width"
+            android:layout_height="@dimen/transfer_controls_contracted_width"
+            android:visibility="gone"
+            android:layout_gravity="center"
+            app:matProg_barColor="@color/white"
+            app:matProg_linearProgress="true"
+            app:matProg_spinSpeed="0.333" />
+
+    <TextView android:id="@+id/download_details"
+              android:layout_width="@dimen/transfer_controls_expanded_width"
+              android:layout_height="@dimen/transfer_controls_contracted_width"
+              android:padding="15dp"
+              android:gravity="center"
+              android:longClickable="false"
+              android:textColor="?conversation_item_received_text_primary_color"
+              android:drawableLeft="@drawable/ic_file_download_white_36dp"
+              android:textSize="16dp"
+              android:visibility="gone"
+              android:textStyle="bold" />
+</merge>

res/values-ar/strings.xml

@@ -10,15 +10,15 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">لم تقم بتحديد عبارة سرية بعد!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s رسائل في المحادثة</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">احذف جميع الرسائل القديمة الآن؟</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من حذف جميع الرسائل بالمحادثات وإبقاء أحدث %s رسالة فقط؟</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من تقليم جميع الرسائل بالمحادثات وإبقاء أحدث %s الرسائل فقط؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">تعطيل العبارة السرية؟</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
-إلغاء قفل الشاشة للرسائل؟</string>
+إزالة قفل الشاشة للرسائل؟</string>
   <string name="ApplicationPreferencesActivity_disable">تعطيل</string>
   <string name="ApplicationPreferencesActivity_unregistering">جارٍ إلغاء التسجيل</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">جارٍ إلغاء التسجيل من رسائل تيكست سيكيور...</string>
-  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">تعطيل رسائل تيكست سيكيور؟</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">إلغاء رسائل تيكست سيكيور؟</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
 سوف يتم وقف رسائل تيكست سيكيور بإلغاء تسجيلك من الخدمة. سوف يتعين عليك إعادة تسجيل رقم هاتفك لمعاودة استخدام رسائل تيكست سيكيور في المستقبل.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطأ في الاتصال بالخادم!</string>
@@ -107,6 +107,7 @@
   <string name="ConversationActivity_unblock_question">إلغاء الحظر؟</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">تأكيد إلغاء حظر جهة الاتصال؟</string>
   <string name="ConversationActivity_unblock">إلغاء الحظر</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">حجم المرفق تجاوز الحد المسموح بهذا النوع من الرسائل.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">تفاصيل الرسالة</string>
   <string name="ConversationFragment_transport_s_sent_received_s">نقل: %1$s\nSent/Received: %2$s</string>
@@ -152,14 +153,14 @@
   <string name="DeviceListActivity_network_failed">فشل في الشبكة!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">جهاز غير مسمى</string>
-  <string name="DeviceListItem_linked_s">متصل %s</string>
+  <string name="DeviceListItem_linked_s">مقترن %s</string>
   <string name="DeviceListItem_last_active_s">آخر مرة %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">شارك مع</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">تصدير</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">تصدير نص غير مشفر إلي بطاقة الذاكرة الخارجية؟</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">تحذير: سوف يتم تصدير محتوى رسائل تيكست سيكيور في هيئة نص مجرد إلى بطاقة الذاكرة.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">تحذير: سيتم تصدير محتوى رسائل تيكست سيكيور إلى بطاقة الذاكرة بدون تشفير.</string>
   <string name="ExportFragment_cancel">إلغاء</string>
   <string name="ExportFragment_exporting">التصدير جارٍ...</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">جارٍ تصدير غير مشفر إلى بطاقة الذاكرة...</string>
@@ -200,7 +201,7 @@
 استرجاع نسخة احتياطية مشفرة سيستبدل بالكامل المفاتيح حالية والإعدادات والرسائل. ستفقد المعلومات الموجودة الآن في تيكست سيكيور وغير موجودة في النسخة الاحتياطية.</string>
   <string name="ImportFragment_restore">استعادة</string>
   <string name="ImportFragment_import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة؟</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">سيتم استيراد رسائل ظاهرة من نسخة احتياطية. إذا قمت سابقا باستيراد هذه النسخة الاحتياطية فسوف يؤدي اسيترادها مرة أخرى إلى تكرار الرسائل.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">سيتم استيراد رسائل غير مشفرة من نسخة احتياطية. إذا قمت سابقا باستيراد هذا الملف فسوف يؤدي الاستيراد مرة أخرى إلى تكرار الرسائل.</string>
   <string name="ImportFragment_importing">الاستيراد جارٍ...</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">جارٍ استيراد نسخة احتياطية غير مشفرة...</string>
   <string name="ImportFragment_no_plaintext_backup_found">لم يتم العثور على نسخ احتياطية غير مشفرة!</string>
@@ -242,15 +243,15 @@
 \n- استخدام أسمك للإرسال</string>
   <string name="DeviceProvisioningActivity_content_progress_title">ربط الجهاز</string>
   <string name="DeviceProvisioningActivity_content_progress_content">جارٍ ربط الجهاز...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">الجهاز متصل!</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">الجهاز مقترن!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">لم يتم العثور على جهاز.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">خطأ في الشبكة.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">الرمز غير سليم.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">عذرا، لديك بالفعل أجهزة عديدة متصلة. حاول إزالة بعضهم...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">عذرا، لديك أجهزة عديدة مقترنة حاليا. حاول إلغاء إقران بعضهم...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_watermark_content_description">أيقونة تيكست سيكيور</string>
-  <string name="PassphrasePromptActivity_ok_button_content_description">أرسل العبارة السرية </string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">عبارة سرية غير صحيحة!</string>
   <!--PlayServicesProblemFragment-->
   <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">تطبيق Google Play Service الذي قمت بتثبيته لا يعمل بشكل صحيح. رجاء إعادة تثبيته والمحاولة مرة أخرى.</string>
@@ -311,12 +312,16 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">تسجيل تيكست سيكيور تم بنجاح.</string>
   <string name="RegistrationService_registration_error">خطأ في التسجيل</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">تسجيل تيكست سيكيور واجه مشكلة.</string>
+  <!--Slide-->
+  <string name="Slide_image">صورة</string>
+  <string name="Slide_audio">صوت</string>
+  <string name="Slide_video">فيديو</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">تم استلام رسالة تبادل مفاتيح تالفة.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 تم استلام رسالة تبادل مفاتيح مع إصدارة بروتوكول غير صحيحة.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-تم استلام رسالة مع مفتاح هوية مجهول. أنقر للمتابعة والإظهار</string>
+تم استلام رسالة بمفتاح هوية غير معلوم. أنقر للمتابعة والإظهار.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">تم استلام تحديث ولكن معلومات الهوية مجهولة. أنقر للتحقق من الهوية.</string>
   <string name="SmsMessageRecord_secure_session_ended">انتهى التشفير.</string>
   <string name="SmsMessageRecord_duplicate_message">رسالة مكررة.</string>
@@ -380,6 +385,7 @@
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d رسائل جديدة في %2$d محادثات</string>
   <string name="MessageNotifier_most_recent_from_s">الأحدث من: %1$s</string>
+  <string name="MessageNotifier_locked_message">رسالة مقفوله...</string>
   <string name="MessageNotifier_media_message_with_text">رسالة وسائط متعددة: %s</string>
   <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
   <string name="MessageNotifier_message_delivery_failed">فشل توصيل الرسالة.</string>
@@ -422,8 +428,8 @@
   <string name="conversation_activity__remove">إزالة</string>
   <string name="conversation_activity__window_description">محادثة مع %1$s</string>
   <string name="conversation_activity__compose_description">تكوين الرسالة</string>
-  <string name="conversation_activity__emoji_toggle_description">تبديل لوحة مفاتيح إيموجي</string>
-  <string name="conversation_activity__attachment_thumbnail"> المرفق</string>
+  <string name="conversation_activity__emoji_toggle_description">تبديل لوحة مفاتيح الرموز التعبيرية</string>
+  <string name="conversation_activity__attachment_thumbnail">المصغّرة للمرفق</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">جارٍ تنزيل رسالة الوسائط</string>
   <string name="conversation_item__mms_image_description">رسالة وسائط متعددة</string>
@@ -445,9 +451,9 @@
   <string name="country_selection_fragment__loading_countries">تحميل البلدان جارٍ ...</string>
   <string name="country_selection_fragment__search">بحث</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_linked">لا توجد أجهزة متصلة...</string>
+  <string name="device_list_fragment__no_devices_linked">لا توجد أجهزة مقترنة...</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط سجلات التصحيح من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
+  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط السجلات من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
   <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
   <string name="log_submit_activity__submitting">إرسال</string>
   <string name="log_submit_activity__posting_logs">جاري نشر السجلات إلى Gist...</string>
@@ -462,7 +468,7 @@
   <string name="database_upgrade_activity__updating_database">تحديث قاعدة البيانات...</string>
   <string name="export_fragment__export_plaintext_backup">تصدير نسخة احتياطية غير مشفرة</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-تصدير نسخة غير مشفرة لبطاقة الذاكرة الخارجية بصيغة متوافقة مع SMSBackup And Restore</string>
+تصدير نسخة غير مشفرة لبطاقة الذاكرة الخارجية بصيغة متوافقة مع \"SMSBackup And Restore\".</string>
   <string name="import_fragment__import_system_sms_database">استيراد قاعدة بيانات الرسائل بالنظام</string>
   <string name="import_fragment__import_the_database_from_the_default_system">استيراد قاعدة البيانات
 من تطبيق الرسائل الافتراضي لنظام التشغيل</string>
@@ -470,7 +476,8 @@
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
 استعادة نسخة احتياطية مشفرة من تيكست سيكيور.</string>
   <string name="import_fragment__import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">استيراد نسخة احتياطية غير مشفرة إلى ملف متوافق مع \"نسخ احتياطي واستعادة الرسائل\"</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+استيراد نسخة احتياطية غير مشفرة، متوافقة مع \"SMSBackup And Restore\".</string>
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">لا توجد صور</string>
   <!--message_recipients_list_item-->
@@ -481,8 +488,8 @@
   <string name="MmsPreferencesFragment__enabled">مفعل</string>
   <string name="MmsPreferencesFragment__disabled">معطل</string>
   <string name="MmsPreferencesFragment__not_set">لم يتم التعيين</string>
-  <string name="MmsPreferencesFragment__invalid_uri">النص  ليس معرّف موارد صحيح</string>
-  <string name="MmsPreferencesFragment__invalid_host">النص ليس خادم صحيح</string>
+  <string name="MmsPreferencesFragment__invalid_uri">النص  ليس وفقا لصيغة معرّف موارد صحيحة</string>
+  <string name="MmsPreferencesFragment__invalid_host">النص ليس وفقا لصيغة خادم صحيحة</string>
   <!--GroupUtil-->
   <string name="GroupUtil_joined_the_group">%1$s أنضم إلى المجموعة.</string>
   <string name="GroupUtil_group_updated">تم تحديث المجموعة.</string>
@@ -490,13 +497,13 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">فتح القفل</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">يتطلب تيكست سيكيور إعدادات خدمة الوسائط المتعددة من أجل تسليم رسائل الوسائط المتعددة والمجموعات عبر المشغل اللاسلكي. في بعض الأحوال لا تتاح هذه المعلومات مع الهواتف المقفولة أو ذات الإعدادات المقيدة.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">يتطلب تيكست سيكيور إعدادات خدمة الوسائط المتعددة من أجل تسليم رسائل الوسائط المتعددة والمجموعات عبر شبكة الجوال. في بعض الأحوال لا تتاح هذه المعلومات مع الهواتف المقفولة أو ذات الإعدادات المقيدة.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">من اجل إرسال وسائط متعددة ورسائل إلى مجموعات أضغط على \"تم\" وأكمل الإعدادات المطلوبة. يمكن العثور على إعدادات رسائل الوسائط المتعددة الخاصة بمشغل شبكة الجوال الخاصة بك بالبحث عن \"أسم المشغل APN\". سوف تحتاج إلى القيام  بهذه الخطوة مرة واحدة.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">جهة الاتصال محظورة</string>
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">كتم المحادثة</string>
-  <string name="recipient_preferences__disable_notifications_for_this_conversation">إلغاء الإشعارات لهذه المحادثة</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">تعطيل الإشعارات لهذه المحادثة</string>
   <string name="recipient_preferences__ringtone">نغمة الرنين</string>
   <string name="recipient_preferences__vibrate">الاهتزاز</string>
   <string name="recipient_preferences__block">حظر</string>
@@ -545,7 +552,7 @@
   <string name="registration_progress_activity__connecting">الاتصال جارِ...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">انتظار رسالة التحقق...</string>
   <string name="registration_progress_activity__registering_with_server">التسجيل مع الخادم جارِ...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">هذا قد يأخذ لحظات. الرجاء التحلي بالصبر وسنقوم بإخطارك عند إتمام التحقق.</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">هذا قد يستغرق لحظات. الرجاء التحلي بالصبر وسنقوم بإخطارك عند إتمام التحقق.</string>
   <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
 انتهت مهلة تيكست سيكيور أثناء انتظار رسالة التحقق.</string>
   <string name="registration_progress_activity__sms_verification_failed">فشل التحقق بواسطة رسالة.</string>
@@ -580,7 +587,7 @@
   <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_manage_linked_devices">إدارة الأجهزة المقترنة</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد / تصدير</string>
   <string name="arrays__my_identity_key">مفتاح هويتي</string>
@@ -595,6 +602,10 @@
   <string name="arrays__disabled">معطل</string>
   <string name="arrays__name_and_message">الاسم والرسالة</string>
   <string name="arrays__name_only">الاسم فقط</string>
+  <string name="arrays__neither">لا هذا ولا ذاك</string>
+  <string name="arrays__images">صور</string>
+  <string name="arrays__audio">صوت</string>
+  <string name="arrays__video">فيديو</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="zero">%d صفر</item>
@@ -615,7 +626,7 @@
   <string name="preferences__enable_enter_key_title">تفعيل مفتاح الإدخال</string>
   <string name="preferences__replace_smiley_with_enter_key">استبدال مفتاح الابتسامة بمفتاح الدخول</string>
   <string name="preferences__pref_enter_sends_title">مفتاح الدخول يقوم بالإرسال</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">الضغط على مفتاح الدخول سيقوم بالإرسال الرسالة</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">الضغط على مفتاح الدخول سيقوم بإرسال الرسالة</string>
   <string name="preferences__display_settings">إعدادات العرض</string>
   <string name="preferences__choose_identity">اختيار الهوية</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">اختر جهة الاتصال من القائمة</string>
@@ -675,7 +686,7 @@
   <string name="preferences__enable_manual_mms">استخدم الإعدادات اليدوية لرسائل الوسائط المتعددة</string>
   <string name="preferences__override_system_mms_settings">تغيير إعدادات رسائل الوسائط المتعددة للنظام بالمعلومات أدناه.</string>
   <string name="preferences__mmsc_url">رابط MMSC</string>
-  <string name="preferences__mms_proxy_host">مستضيف الخدمة الوسيطة MMS</string>
+  <string name="preferences__mms_proxy_host">مستضيف خدمة MMS</string>
   <string name="preferences__mms_proxy_port">منفذ الوسيط MMS</string>
   <string name="preferences__mmsc_username">اسم المستخدم MMSC</string>
   <string name="preferences__mmsc_password">كلمة السر MMSC</string>
@@ -683,8 +694,9 @@
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">طلب تقرير تسليم لكل رسالة قصيرة ترسلها</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">حذف الرسائل القديمة آليا عند تجاوز المحادثة الطول المحدد</string>
   <string name="preferences__delete_old_messages">احذف الرسائل القديمة</string>
+  <string name="preferences__chats">المحادثات والوسائط</string>
   <string name="preferences__conversation_length_limit">حد طول المحادثة</string>
-  <string name="preferences__trim_all_threads_now">نظف كل المحادثات الآن</string>
+  <string name="preferences__trim_all_threads_now">تقليم كل المحادثات الآن</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">افحص كل المحادثات وافرض حد الطول لكل محادثة</string>
   <string name="preferences__light_theme">فاتح</string>
   <string name="preferences__dark_theme">داكن</string>
@@ -699,16 +711,23 @@
 رسائل مجانية وآمنة مع مستخدمي تيكست سيكيور وسيجنال</string>
   <string name="preferences__submit_debug_log">إرسال سجل التصحيح</string>
   <string name="preferences__support_wifi_calling">وضع التوافق مع \'مكالمات الواي فاي\'</string>
-  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">يمكنك تفعيل الخاصية إذا كان هاتفك يستخدم الواي فاي لتسليم الرسائل النصية والوسائط المتعددة ( قم بالتفعيل فقط في حال تفعيل الاتصال عبر الواي فاي بهاتفك)</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">يمكنك تفعيل الخاصية إذا كان هاتفك يدعم خاصية WiFi Calling لتسليم الرسائل النصية والوسائط المتعددة ( قم بالتفعيل فقط في حال تفعيل WiFi Calling بهاتفك)</string>
   <string name="preferences_app_protection__blocked_contacts">جهات الاتصال المحظورة</string>
   <string name="preferences_notifications__display_in_notifications">أظهر في الإشعارات </string>
+  <string name="preferences_chats__when_using_mobile_data">عند استخدام بيانات الجوّال</string>
+  <string name="preferences_chats__when_using_wifi">عند استخدام واي فاي</string>
+  <string name="preferences_chats__when_roaming">عند استخدام التجوال</string>
+  <string name="preferences_chats__media_auto_download">تنزلي تلقائي للوسائط</string>
+  <string name="preferences_chats__message_trimming">تقليم الرسالة</string>
+  <string name="preferences_advanced__use_system_emoji">استخدام الرموز التعبيرية بالنظام</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">تعطيل الرموز التعبيرية المدمجة في تيكست سيكيور</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">أختر الكل</string>
   <string name="contact_selection_list__menu_unselect_all">إلغاء التحديد</string>
-  <string name="contact_selection_list__header_textsecure_users">مستخدمين تيكست سيكيور</string>
+  <string name="contact_selection_list__header_textsecure_users">مستخدمي تيكست سيكيور</string>
   <string name="contact_selection_list__header_other">جهات الاتصال</string>
   <string name="contact_selection_list__unknown_contact">رسالة جديدة إلى...</string>
   <!--contact_selection-->

res/values-be/strings.xml

@@ -266,6 +266,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Рэгістрацыя TextSecure выканана паспяхова.</string>
   <string name="RegistrationService_registration_error">Памылка рэгістрацыі</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Падчас рэгістрацыі TextSecure узнікла праблема.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Атрыманы пашкоджаны ключ абмену паведамленнямі!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">

res/values-bg/strings.xml

@@ -109,6 +109,7 @@
   <string name="ConversationActivity_unblock_question">Отблокирай?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Сигурен ли си, че искаш да отблокираш този контакт?</string>
   <string name="ConversationActivity_unblock">Отблокирай</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Размерът на прикачения файл надминава допустимия лимит за типа съобщение, който изпращате.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Информация за съобщението</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Транспорт: %1$s\nИзпратени/Получени: %2$s</string>
@@ -324,6 +325,10 @@ SMS съобщенията от системната базата данни в
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure регистрацията е успешно завършена.</string>
   <string name="RegistrationService_registration_error">Грешка при регистрацията</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Регистрацията за TextSecure се натъкна на проблем.</string>
+  <!--Slide-->
+  <string name="Slide_image">Изображение</string>
+  <string name="Slide_audio">Аудио</string>
+  <string name="Slide_video">Видео</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Съобщението за обмяна на ключ
 е объркано!</string>
@@ -633,6 +638,9 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="arrays__name_and_message">Име и съобщение</string>
   <string name="arrays__name_only">Само име</string>
   <string name="arrays__neither">Нито едното</string>
+  <string name="arrays__images">Изображения</string>
+  <string name="arrays__audio">Аудио</string>
+  <string name="arrays__video">Видео</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d час</item>
@@ -717,6 +725,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Поискай потвърждение при получаване за всяко изпратено SMS съобщение</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматично изтрий най-старите съобщения, когато разговорът превиши определена дължина</string>
   <string name="preferences__delete_old_messages">Изтрий старите съобщения</string>
+  <string name="preferences__chats">Чат и мултимедия</string>
   <string name="preferences__conversation_length_limit">Граница за дължина на разговора</string>
   <string name="preferences__trim_all_threads_now">Скъси всички разговори сега</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Сканирай всички разговори и приложи ограничението за дължина</string>
@@ -736,6 +745,13 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включи ако устройството ти използва WiFi за SMS/MMS(само ако \'Wifi Calling\' е включен на устройството ти)</string>
   <string name="preferences_app_protection__blocked_contacts">Блокирани контакти</string>
   <string name="preferences_notifications__display_in_notifications">Покажи в полето с известия</string>
+  <string name="preferences_chats__when_using_mobile_data">Когато използвам мобилен интернет</string>
+  <string name="preferences_chats__when_using_wifi">Когато използвам Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Когато ползвам роуминг</string>
+  <string name="preferences_chats__media_auto_download">Автоматично теглене на мултимедия</string>
+  <string name="preferences_chats__message_trimming">Съкращаване на съобщенията</string>
+  <string name="preferences_advanced__use_system_emoji">Използвай вградените emoji-та</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Изключи вградена в TextSecure подръжка на emoji-та</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-bo/strings.xml

@@ -1,269 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">གཡག་འཕྲིན། </string>
-  <string name="yes">ཡིན།</string>
-  <string name="no">མིན། </string>
-  <string name="delete">གསུབ། </string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">ད་ལྟ།:%s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ཁྱོད་ཀྱིས་གསང་ཚིག་བཟོས་མི་འདུག</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">ད་ལྟ་རང་འཕྲིན་ཐུང་རྙིང་པ་ཚང་མ་གསུབ་གི་ཡིན་ནམ། </string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">ཁྱེད་ཀྱིས་མྱུར་དུ་ཉེ་འཆར་གྱི་འཕྲིན་ཐུང་དེའི་སླད་དུ་གླེང་མོལ་གྱི་སྐུད་པ་ཚང་མ་གཙང་བཟོ་བྱེད་ཀྱི་ཡིན་ནམ། </string>
-  <string name="ApplicationPreferencesActivity_delete">གསུབ། </string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">འདྲ་པར།</string>
-  <string name="AttachmentTypeSelectorAdapter_video">བརྙན་པར།</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">སྒྲ་ཟློས། </string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">འཕྲིན་ཐུང་ཆེ་ཆུང་།%d KB</string>
-  <string name="ConversationItem_expires_s">དུས་ཚོད་རྫོགས།%s</string>
-  <string name="ConversationItem_view_secure_media_question">ཉེན་སྲུང་ཡོད་པའི་བརྒྱུད་ལམ་ལ་ལྟོས། </string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">ནོར་འཁྲུལ། ལྡེ་མིག་རྙིང་པ་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན་འབྱོར་ཚར། དེ་རུ་ནོར་འཁྲུལ་འདུག </string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">%s དང་ལྷན་དུ་བདེ་འཇགས་ཀྱི་གླེང་མོལ་འགོ་རྩོམ་གྱི་ཡིན་ནམ།</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">ཁྱོད་ཀྱིས་གླེང་མོལ་འདི་གཏན་དུ་གསུབ་རྒྱུ་ཡིན་ནམ། </string>
-  <string name="ConversationActivity_add_attachment">ཟུར་སྣོན་ཁ་སྣོན་བྱོས། </string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">དགོངས་དག ཁྱོད་ཀྱི་ཟུར་སྣོན་ལ་སྒྲིག་བཟོ་བྱེད་པར་ནོར་འཁྲུལ་ཞིག་འདུག </string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">གཏོང་ས་དེར་གློག་འཕྲིན་ཁ་བྱང་ངམ་འཕྲིན་ཐུང་(SMS) ཁ་བྱང་ཚད་ལྡན་མི་འདུག </string>
-  <string name="ConversationActivity_message_is_empty_exclamation">འཕྲིན་ཐུང་སྟོང་པ་རེད་འདུག </string>
-  <string name="ConversationActivity_transport_textsecure">གཡག་འཕྲིན། </string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
-  <string name="ConversationFragment_success_exclamation">ལེགས་འགྲུབ། </string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ཁྱོད་ཀྱིས་དངོས་གནས་འཕྲིན་ཐུང་སྐུད་རིམ་འདེམས་པ་ཆ་ཚང་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
-  <string name="ConversationListFragment_deleting">གསུབ་་བཞིན་ཡོད།</string>
-  <string name="ConversationListFragment_deleting_selected_threads">འཕྲིན་ཐུང་སྐུད་རིམ་རྣམས་གསུབ་བཞིན་ཡོད།</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">ལྡེ་མིག་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན།</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">ཕྱི་འདྲེན་བྱོས། </string>
-  <string name="ExportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
-  <string name="ExportFragment_success">ལེགས་འགྲུབ། </string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">ནང་འདྲེན་བྱོས། </string>
-  <string name="ImportExportActivity_export">ཕྱི་འདྲེན་བྱོས། </string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_import">ནང་འདྲེན་བྱོས། </string>
-  <string name="ImportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་རྙེད་མི་ཐུབ།</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གསོག་ཉར་ལ་སྐྱོན་འདུག </string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་མཁོ་སྤྲོད་བྱེད་མཁན་ལ་འབྲེལ་ཐག་གི་སྐྱོན་འདུག </string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">གསང་ཚིག་རྙིང་པ་དེ་ནོར་འདུག </string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_continue">མུ་མཐུད། </string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <!--RegistrationService-->
-  <!--SmsMessageRecord-->
-  <!--ThreadRecord-->
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">ཁྱེད་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">གཏོང་ཡུལ་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">གཏོང་ཡུལ་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">གཤིབ་བསྡུར་ཆེད་ཁོང་ཚོའི་ལྡེ་མིག་ལ་བརྟག་ཞིབ་བྱོས། </string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">ངའི་ལྡེ་མིག་ཞིབ་བརྟག་ཚར་བ་བྱོས། </string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ཉེན་བརྡ། ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་དེ་མཚུངས་གི་མི་འདུག  མཛུབ་རིས་ཡི་གེ་དེར་གཟབ་ནན་ངང་ཞིབ་བཤེར་བྱོས།</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">ར་སྤྲོད་བྱས་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">གཞན་གྱི་ལྡེ་མིག་འགྲིག་འདུག  ཁྱེད་ཀྱི་ལྡེ་མིག་གཞན་དང་མཉམ་དུ་ར་སྤྲོད་བྱེད་དགོས་ངེས་རེད། </string>
-  <string name="VerifyIdentityActivity_verified_exclamation">ར་སྤྲོད་བྱས་ཟིན།</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">ཁྱེད་ལ་ངོ་འཛིན་ལྡེ་མིག་མི་འདུག</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">ཁྱེད་ལ་ངོས་འཛིན་ལྡེ་མིག་མི་འདུག</string>
-  <string name="ViewIdentityActivity_scan_to_compare">འགྲན་ཆེད་ཞིབ་བརྟག་བྱོས། </string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">གཤིབ་སྡུར་ཆེད་ཞིབ་བརྟག་བྱོས། </string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ཉེན་བརྡ། ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་དེ་མི་མཚུངས།</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་དེ་མཚུངས།</string>
-  <string name="ViewIdentityActivity_verified_exclamation">ར་སྤྲོད་བྱས་ཟིན།</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">ཁྱེད་ཀྱིས་གཏོང་ཡུལ་དེར་རེ་སྐུལ་ཞིག་བཏང་ཚར་འདུག ཁྱེད་ཀྱིས་ཡང་བསྐྱར་གཅིག་གཏོང་འདོད་དམ།  འདི་ཡིས་ཁྱེད་ཀྱི་རེ་སྐུལ་དང་པོ་དེ་རྩིས་མེད་གཏོང་གི་རེད། </string>
-  <string name="KeyExchangeInitiator_send">ཐོངས། </string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">གསང་སྡོམ་འཕྲིན་ཐུང་ཕན་མེད་ཞིག </string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">གསང་སྡོམ་བཤིག་བཞིན་ཡོད། ཅུང་སྒུག་དང་།</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">རྙེད་རྒྱུ་མེད་པའི་སྡེ་ཚན་ཞིག་གི་ཆེད་དུ་འཕྲིན་ཐུང་གསང་སྡོམ་བྱས་ཡོད། </string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་ MMS ཞབས་ཞུའི་ཡོ་ཆས་ལ་མཐུད་བཞིན་ཡོད།</string>
-  <string name="MmsDatabase_downloading_mms">བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་ MMS ཕབ་ལེན་བྱེད་བཞིན་ཡོད།</string>
-  <string name="MmsDatabase_downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད།</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS གསང་གྲོལ་བྱེད་བཞིན་ཡོད། ཅུང་སྒུག་རོགས། </string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">མཁོ་མེད་གསང་སྡོམ་བྱས་བའི་བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS </string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">སྡེ་ཚན་མི་མངོན་པ་དེའི་ཆེད་དུ་།  བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS གསང་སྡོམ་བྱས་འདུག </string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">ནང་འདྲེན་བྱེད་བཞིན་ཡོད། </string>
-  <!--KeyCachingService-->
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">འཕྲིན་ཐུང་བཏང་བ་དེ་འགྲོ་མི་འདུག </string>
-  <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>
-  <string name="MessageNotifier_error_delivering_message">འཕྲིན་ཐུང་གཏོང་བར་སྐྱོན་ཤོར་འདུག </string>
-  <!--QuickResponseService-->
-  <!--SingleRecipientNotificationBuilder-->
-  <!--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-->
-  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">འབྲེལ་མིང་མི་འདུག</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">ཆེད་དུ་འདེམས།</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">ཉེ་ཆར་ཁ་པར་བཏང་བ་མི་འདུག </string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">ཐོངས། </string>
-  <string name="conversation_activity__remove">ཕྱིར་ཕུད། </string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">ཕབ་ལེན་བྱོས། </string>
-  <string name="conversation_item_sent__downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད། </string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">ཕབ་ལེན་བྱོས། </string>
-  <string name="conversation_item_received__downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད། </string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__search">འཚོལ།</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">ཁྱེད་ཀྱིས་ད་ཡོད་འཕྲིན་ཐུང་ཡི་གེ་དེ་གཡག་འཕྲིན་གསང་སྡོམ་མཛོད་ཀྱི་ཁོངས་སུ་བཅུག་འདོད་འདུག་གམ། </string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">གཏན་འཇགས་མཛོད་ཀྱི་མ་ལག་དེར་ཕྱོགས་གང་ཅིའི་ཐད་ནས་འགྱུར་བ་གཏོང་ཐུབ་གི་མ་རེད། </string>
-  <string name="database_migration_activity__skip">བསྐྱུར། </string>
-  <string name="database_migration_activity__import">ནང་འདྲེན། </string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">འདི་ལ་དུས་ཚོད་ཅུང་ཙམ་འགོར་སྲིད། བཟོད་སྒོམ་གནང་རོགས། ནང་འདྲེན་ལེགས་འགྲུབ་བྱུང་མཚམས་ང་ཚོས་ཁྱོད་ལ་བརྡ་གཏོང་གི་ཡིན། </string>
-  <string name="database_migration_activity__importing">ནང་འདྲེན་བྱེད་བཞིན་པ། </string>
-  <!--database_upgrade_activity-->
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">སྒོ་ཕྱེས། </string>
-  <!--prompt_mms_activity-->
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <!--registration_problems-->
-  <!--registration_progress_activity-->
-  <!--recipients_panel-->
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">གཞན་གྱི་ངོས་འཛིན། (ཁོང་ཚོས་ཀློགས)</string>
-  <string name="verify_identity_activity__your_identity_you_read">ཁྱེད་ཀྱི་ངོས་འཛིན། (ཁྱེད་ཀྱིས་ཀློགས)</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__input_settings">ནང་འཇུག་སྒྲིག་བཟོ། </string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">འབྲེལ་ཐོ་ནས་ཁྱེད་ཀྱིས་འབྲེལ་བ་བྱེད་ས་དེ་གདེམས། </string>
-  <string name="preferences__change_passphrase">གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
-  <string name="preferences__change_my_passphrase">ངའི་གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">དུས་བརྒལ་གྱི་དབར་དྲན་ཐོ་ནས་གསང་ཚིག་བརྗེད། </string>
-  <string name="preferences__timeout_passphrase">གསང་ཚིག་གི་དུས་ཚོད་ཡོལ་འདུག</string>
-  <string name="preferences__pref_timeout_interval_title">བར་སེང་མཚམས་ཞོག </string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">དྲན་ཐོ་ནས་གསང་ཚིག་མ་བརྗེད་གོང་སྒུག་ཡུན་དུས་ཚོད།</string>
-  <string name="preferences__notifications">བརྡ་གཏོང་།</string>
-  <string name="preferences__vibrate"> འདར་བཅུག</string>
-  <string name="preferences__also_vibrate_when_notified">བརྡ་གཏོང་སྐབས་འདར་བཅུག</string>
-  <string name="preferences__minutes">སྐར་མ།</string>
-  <string name="preferences__hours">དུས་ཚོད།</string>
-  <string name="preferences__green">ལྗང་ཁུ།</string>
-  <string name="preferences__red">དམར་པོ།</string>
-  <string name="preferences__blue">སྔོན་པོ།</string>
-  <string name="preferences__orange">ལི་ཁྲི།</string>
-  <string name="preferences__cyan">སྔོ་དཀར།</string>
-  <string name="preferences__magenta">རྒྱ་ཚོས་ཀྱི་ཚོས་གཞི།</string>
-  <string name="preferences__fast">མགྱོགས་པོ།</string>
-  <string name="preferences__normal">སྤྱིར་བཏང་། </string>
-  <string name="preferences__slow">དལ་བོ། </string>
-  <string name="preferences__custom">ཡུལ་སྲོལ། </string>
-  <string name="preferences__sms_delivery_reports">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གིས་སྙན་ཐོ་སྐྱེལ། </string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ཁྱེད་ཀྱིས་གཏོང་བའི་འཕྲིན་ཐུང་རེ་རེར་སྙན་ཐོ་སྐྱེལ་བའི་རེ་སྐུལ་བྱོས། </string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">གླེང་མོལ་གྱི་སྐུད་པའི་དམིགས་བསལ་རིང་ཚད་རྫོགས་མཚམས། རང་བཞིན་ནས་འཕྲིན་ཐུང་རྙིང་པ་དག་བསུབ་འགྲོ་གི་རེད། </string>
-  <string name="preferences__delete_old_messages">འཕྲིན་ཐུང་རྙིང་པ་གསུབ། </string>
-  <string name="preferences__conversation_length_limit">གླེང་མོལ་གྱི་རིང་ཐུང་གི་ཚད། </string>
-  <string name="preferences__trim_all_threads_now">སྐུད་པ་ཚང་མ་གཙང་བཟོ་བྱོས། </string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">གླེང་མོལ་གྱི་སྐུད་པ་ཚང་མ་གཙང་སེལ་དང་གླེང་མོལ་གྱི་རིང་ཚད་ནུས་ལྡན་དུ་ཐོངས། </string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">མཇུག་རྫོགས་སོ།</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">ཁ་པར་ཐོངས། </string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
-  <string name="conversation_context__menu_copy_text">ཡི་གེ་འདྲ་བཤུས་བྱོས། </string>
-  <string name="conversation_context__menu_delete_message">འཕྲིན་ཐུང་གསུབ།</string>
-  <string name="conversation_context__menu_forward_message">འཕྲིན་ཐུང་བརྒྱུད་འགྲེམ་བྱོས། </string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">ཉེན་སྲུང་།</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">འཚོལ།</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">ཉེན་སྲུང་།</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">ཟུར་སྣོན་ཞོག </string>
-  <string name="conversation__menu_delete_thread">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ།</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">འཕྲིན་ཐུང་འབྱོར་ཡུལ་གྱི་ཐོ་གཞུང་། </string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">ཞིབ་བསྡུར་བྱོས། </string>
-  <string name="key_scanning__menu_get_scanned_to_compare">ལྡེ་མིག་ཞིབ་བསྡུར་ཆེད་ཞིབ་བརྟག་བྱོས།</string>
-  <string name="key_scanning__menu_scan_to_compare">ཞིབ་བསྡུར་ཆེད་ཆེད་ཞིབ་བརྟག་བྱོས།</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">སྒྲིག་བཟོ།</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-ca/strings.xml

@@ -1,403 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">Si</string>
-  <string name="no">No</string>
-  <string name="delete">Esborra</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">Actualment: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Encara no has establert cap frase contrasenya!</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Esborrar ara els missatges antics?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Estàs segur que vols retallar immediatament tots els fils de conversa deixant només els %s missatges més recents?</string>
-  <string name="ApplicationPreferencesActivity_delete">Esborra</string>
-  <string name="ApplicationPreferencesActivity_disable">Desactiva</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connectant amb el servidor!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Habilitats</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toca per canviar la teva app d\'SMS predeterminada</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Deshabilitats</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Toca per fer TextSecure la teva app d\'SMS predeterminada</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">Fotografia</string>
-  <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">So</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Pot ser que vulguis verificar aquest contacte.</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Mida del missatge: %d KB</string>
-  <string name="ConversationItem_expires_s">Expira: %s</string>
-  <string name="ConversationItem_view_secure_media_question">Vols veure continguts segurs?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aquest contingut ha estat emmagatzemant en una base de dades encriptada. Desafortunadament, actualment per veure\'l amb un visor de continguts externs les dades han de ser temporalment desencriptades i escrites al disc. Estàs segur que vols fer això?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Error, s\'ha rebut un missatge d\'intercanvi de clau viciat.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">S\'ha rebut un missatge d\'intercanvi de clau, clica per processar-lo.</string>
-  <string name="ConversationItem_group_action_left">%1$s ha deixat el grup.</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar una sessió segura amb %s?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Estàs segur que vols finalitzar aquesta sessió segura?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Estàs segur que vols esborrar permanentment aquesta conversa?</string>
-  <string name="ConversationActivity_add_attachment">Afegeix un adjunt</string>
-  <string name="ConversationActivity_select_contact_info">Selecciona info del contacte</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ho sento, hi ha hagut un error establint el teu adjunt.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">El recipient no és una adreça de correu electrònic o SMS vàlid!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">El missatge és buit!</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d membres</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 membre</string>
-  <string name="ConversationActivity_invalid_recipient">Destinatari invàlid!</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Aquest dispositiu no sembla suportar accions de trucada.</string>
-  <string name="ConversationActivity_leave_group">Deixar el grup?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Estàs segur que vols deixar aquest grup?</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">Detalls del missatge</string>
-  <string name="ConversationFragment_success_exclamation">Èxit!</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Esborrar fils de conversa?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Estàs segur que vols esborrar TOTS els fils de conversa seleccionats?</string>
-  <string name="ConversationListFragment_deleting">Esborrant</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Esborrant els fils de conversa seleccionats...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Missatge d\'intercanvi de clau...</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">Exporta</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Alerta, això exportarà els continguts de text pla dels teus missatges TextSecure a la targeta SD.</string>
-  <string name="ExportFragment_cancel">Cancel·la</string>
-  <string name="ExportFragment_exporting">Exportant</string>
-  <string name="ExportFragment_success">Èxit!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_contacts_dont_support_push">Has seleccionat un contacte que no suporta grups de TextSecure, això farà que aquest grup sigui de MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">No estàs registrat per utilitzar el canal de dades, això farà que els grups de TextSecure estiguin desactivats.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">Ha passat un error inesperat que ha fet que la creació del grup hagi fallat.</string>
-  <string name="GroupCreateActivity_contacts_no_members">Necessites almenys una persona dins el teu grup!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Un dels membres del teu grup té un número que no pot ser llegit correctament. Si us plau corregeix o treu aquest contacte i intenta-ho de nou.</string>
-  <string name="GroupCreateActivity_creating_group">Creant %1$s…</string>
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">Importa</string>
-  <string name="ImportExportActivity_export">Exporta</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Això importarà els missatges des de la base de dades SMS del sistema a TextSecure. Si has importat prèviament els missatges de la base de dades SMS del sistema, importar-los de nou provocarà tenir missatges duplicats.</string>
-  <string name="ImportFragment_import">Importa</string>
-  <string name="ImportFragment_cancel">Cancel·la</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Restaurar una còpia de seguretat encriptada provocarà que es substitueixi completament les teves claus existents, preferències, i missatges. Perdràs qualsevol informació que sigui a la teva instal·lació de TextSecure i no hi sigui a la còpia de seguretat.</string>
-  <string name="ImportFragment_restore">Restaura</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Això importarà els missatges des d\'una còpia de seguretat en text pla. Si has importat prèviament la base de dades SMS del sistema, importar-la de nou provocarà la generació de missatges duplicats.</string>
-  <string name="ImportFragment_importing">Important</string>
-  <string name="ImportFragment_no_plaintext_backup_found">No s\'ha trobat la còpia de seguretat en text pla!</string>
-  <string name="ImportFragment_error_importing_backup">Error important la còpia de seguretat!</string>
-  <string name="ImportFragment_import_complete">Importació completada!</string>
-  <string name="ImportFragment_restoring">Restaurant</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Restaurant còpia de seguretat encriptada...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">No s\'ha trobat cap còpia de seguretat encriptada!</string>
-  <string name="ImportFragment_restore_complete">Restauració completa!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">No s\'ha trobat cap clau escanejada!</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">Error emmagatzemant MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Error connectant amb l\'operador de MMS...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Error llegint els ajustaments MMS de l\'operador inalàmbric\u2026</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase contrasenya antiga incorrecta!</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">Connecta amb TextSecure</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Has d\'especificar el teu codi de país</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Has d\'especificar el teu número de telèfon</string>
-  <string name="RegistrationActivity_invalid_number">Número invàlid</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">El número que has especificat (%s) és invàlid.</string>
-  <string name="RegistrationActivity_unsupported">No suportat</string>
-  <string name="RegistrationActivity_continue">Continua</string>
-  <string name="RegistrationActivity_edit">Edita</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Verificant número</string>
-  <string name="RegistrationProgressActivity_edit_s">Edita %s</string>
-  <string name="RegistrationProgressActivity_registration_complete">Registre complet!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Primer has d\'introduir el codi que has rebut...</string>
-  <string name="RegistrationProgressActivity_connecting">Connectant</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Connectant per verificar...</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">No s\'ha pogut connectar. Si us plau verifica la teva connexió de xarxa i intenta-ho de nou.</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">El codi de verificació que has enviat és incorrecte. Si us plau intenta-ho de nou.</string>
-  <string name="RegistrationProgressActivity_too_many_attempts">Massa intents</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Has enviat un codi de verificació incorrecte massa vegades. Si us plau espera un minut abans d\'intentar-ho de nou.</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Demanant una trucada de verificació...</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">El servidor ha trobat un error. Si us plau intenta-ho de nou.</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Ja has demanat recentment una trucada de veu. Pots tornar-la a demanar d\'aquí 20 minuts.</string>
-  <string name="RegistrationProgressActivity_registration_conflict">Conflicte de registre</string>
-  <!--RegistrationService-->
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">El registre a TextSecure s\'ha completat satisfactòriament.</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">El registre a TextSecure ha trobat un problema.</string>
-  <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">S\'ha rebut un missatge d\'intercanvi de claus corromput!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">S\'ha rebut un missatge d\'intercanvi de claus per una versió del protocol invàlida.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">S\'ha rebut un missatge d\'una clau d\'identitat desconeguda. Clica per processar-la i mostrar-la.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">S\'ha rebut informació actualitzada però desconeguda. Pica per validar l\'identitat.</string>
-  <string name="SmsMessageRecord_secure_session_ended">La sessió segura s\'ha acabat.</string>
-  <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Ha deixat el grup...</string>
-  <string name="TheadRecord_secure_session_ended">La sessió segura s\'ha acabat.</string>
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Tu no tens una clau d\'identitat.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">El destinatari no té clau d\'identitat.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">El destinatari no té clau d\'identitat!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Escaneja la seva clau per comparar</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Escaneja la meva clau</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ALERTA, la clau escanejada NO coincideix! Si us plau verifica el text de l\'empremta digital cuidadosament.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">NO Verificat!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">La seva clau és correcta, però també és necessari verificar la teva clau.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Verificat!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Tu no tens una clau d\'identitat!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Tu no tens una clau d\'identitat.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Escaneja per comparar</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Sigues escanejat per comparar</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ALERTA, la clau escanejada NO coincideix!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">La clau escanejada coincideix!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Verificat!</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ja has enviat una petició per iniciar una sessió a aquest destinatari, estàs segur que vols enviar-ne una altra? Això invalidarà la primera petició.</string>
-  <string name="KeyExchangeInitiator_send">Envia</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Missatge mal encriptat...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Desencriptant, si us plau espera...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Missatge encriptat per una sessió no existent...</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Connectant al servidor MMS...</string>
-  <string name="MmsDatabase_downloading_mms">Descarregant MMS...</string>
-  <string name="MmsDatabase_downloading">Descarregant...</string>
-  <string name="MmsDatabase_mms_pending_download">Pica i configura els ajustaments MMS per continuar la descàrrega.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">Desencriptant MMS, si us plau espera...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Missatge MMS mal encriptat...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Missatge MMS encriptat per una sessió no existent...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Importació en curs</string>
-  <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Toca per obrir.</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Toca per obrir, o toca el bloqueig per tancar.</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure està desbloquejat</string>
-  <string name="KeyCachingService_lock">Bloqueja amb una frase contrasenya</string>
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">Entrega del missatge fallida.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">No s\'ha pogut entregar el missatge.</string>
-  <string name="MessageNotifier_error_delivering_message">Error entregant el missatge.</string>
-  <string name="MessageNotifier_mark_all_as_read">Marca-ho tot com a llegit</string>
-  <!--QuickResponseService-->
-  <!--SingleRecipientNotificationBuilder-->
-  <!--change_passphrase_activity-->
-  <string name="change_passphrase_activity__old_passphrase">FRASE CONTRASENYA ANTIGA:</string>
-  <string name="change_passphrase_activity__new_passphrase">NOVA FRASE CONTRASENYA:</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">REPETEIX LA NOVA FRASE CONTRASENYA:</string>
-  <!--contact_selection_activity-->
-  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">Sense contactes.</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">Selecciona per</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">Sense trucades recents.</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">Envia</string>
-  <string name="conversation_activity__remove">Treu</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">Descàrrega</string>
-  <string name="conversation_item_sent__downloading">Descarregant</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">Descàrrega</string>
-  <string name="conversation_item_received__downloading">Descarregant</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Carregant països...</string>
-  <string name="country_selection_fragment__search">Cerca</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">No s\'han pogut recollir els registres del teu dispositiu. Encara pots utilitzar ADB per aconseguir els registres de depuració.</string>
-  <string name="log_submit_activity__thanks">Gràcies per la teva ajuda!</string>
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Vols importar tots el teus missatges de text existents a la base de dades encriptada de TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de dades predeterminada del sistema no serà modificada o alterada de cap manera.</string>
-  <string name="database_migration_activity__skip">Salta</string>
-  <string name="database_migration_activity__import">Importa</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Això pot tardar una mica. Si us plau sigues pacient, et notificarem quan la importació estigui completa.</string>
-  <string name="database_migration_activity__importing">IMPORTANT</string>
-  <!--database_upgrade_activity-->
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporta una còpia de seguretat en text pla compatible amb \'Còpia de seguretat i restauració d\'SMS\' a la targeta SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importa la base de dades
-des de l\'app de missatgeria predeterminada del sistema.</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Restaura una còpia de seguretat encriptada de TextSecure prèviament exportada.</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">Importa un arxiu de còpia de seguretat en text pla. Compatible amb \'Còpia de seguretat i restauració d\'SMS\'.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">En el teu telèfon són necessaris els ajustaments MMS manuals.</string>
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">Desbloqueja</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure necessita ajustaments MMS per entregar missatges de grup i multimèdia a través de l\'operador inalàmbric. El teu dispositiu no fa que aquesta informació estigui disponible, cosa que és certa ocasionalment en dispositius bloquejats o amb altres configuracions restringides.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per enviar missatges multimèdia i de grup, clica \'OK\' i completa els ajustaments demanats. Els ajustaments MMS de la teva operadora normalment poden ser trobats buscant \'latevaoperadora APN\'. Només necessitaràs fer això una vegada.</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <string name="registration_activity__your_country">EL TEU PAÍS</string>
-  <string name="registration_activity__your_country_code_and_phone_number">EL TEU CODI DE PAÍS I NÚMERO DE TELÈFON</string>
-  <string name="registration_activity__phone_number">NÚMERO DE TELÈFON</string>
-  <string name="registration_activity__register">Registra</string>
-  <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Alguns possibles problemes inclouen:</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">Alguns clients de missatgeria de text de tercers, com ara Handcent o GoSMS, es comporten inadequadament i intercepten tots els missatges SMS entrants. Verifica per veure si has rebut un missatge de text que comença per \'Your TextSecure verification code:\', en aquest cas necessitaràs configurar la teva app de missatgeria de tercers per deixar passar els missatges de text.</string>
-  <string name="registration_problems__incorrect_number">Número incorrecte.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">Si us plau verifica per estar segur que has introduït el teu número correctament, i està ajustat correctament per la teva regió.</string>
-  <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">TextSecure no funcionarà amb números de Google Voice.</string>
-  <!--registration_progress_activity-->
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">TextSecure també et pot trucar per verificar el teu número de telèfon. Pica \'Truca\'m\' i introdueix a sota el codi de sis dígits que sentis.</string>
-  <string name="registration_progress_activity__verify">Verifica</string>
-  <string name="registration_progress_activity__edit_number">Edita número</string>
-  <string name="registration_progress_activity__connectivity_error">Error de connectivitat.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure no s\'ha pogut connectar al servei push.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Alguns possibles problemes inclouen:</string>
-  <string name="registration_progress_activity__no_network_connectivity">No hi ha connexió de xarxa.</string>
-  <string name="registration_progress_activity__restrictive_firewall">Tallafocs restrictiu.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">TextSecure verificarà automàticament el teu número amb un missatge de confirmació SMS.</string>
-  <string name="registration_progress_activity__connecting">Connectant...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Esperant la verificació SMS...</string>
-  <string name="registration_progress_activity__registering_with_server">Registrant-se al servidor...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Això portarà una estona. Si us plau sigues pacient, et notificarem quan la verificació estigui completada.</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">S\'ha acabat el temps d\'espera de TextSecure mentre s\'esperava el missatge SMS de verificació.</string>
-  <string name="registration_progress_activity__sms_verification_failed">La verificació SMS ha fallat.</string>
-  <string name="registration_progress_activity__generating_keys">Generant claus...</string>
-  <!--recipients_panel-->
-  <string name="recipients_panel__add_member">Afegeix membre</string>
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">La seva identitat (ells llegeixen):</string>
-  <string name="verify_identity_activity__your_identity_you_read">La teva identitat (tu llegeixes):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">Canvia frase contrasenya</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">General</string>
-  <string name="preferences__enable_enter_key_title">Habilita la tecla Enter</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Escull el teu contacte de la llista de contactes</string>
-  <string name="preferences__change_passphrase">Canvia frase contrasenya</string>
-  <string name="preferences__change_my_passphrase">Canvia la meva frase contrasenya</string>
-  <string name="preferences__screen_security">Seguretat de pantalla</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Oblida la frase contrasenya de la memòria després d\'un interval de temps</string>
-  <string name="preferences__timeout_passphrase">Temps d\'espera de la frase contrasenya</string>
-  <string name="preferences__pref_timeout_interval_title">Interval del temps d\'espera</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantitat de temps que s\'esperarà abans d\'oblidar la frase contrasenya de la memòria</string>
-  <string name="preferences__notifications">Notificacions</string>
-  <string name="preferences__led_color">Color del LED</string>
-  <string name="preferences__pref_led_blink_title">Patró d\'intermitència del LED</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">S\'ha fixat un patró de parpalleig del LED personalitzat!</string>
-  <string name="preferences__sound">So</string>
-  <string name="preferences__change_notification_sound">Canvia el so de notificació</string>
-  <string name="preferences__inthread_notifications">Notificacions dins del fil</string>
-  <string name="preferences__vibrate">Vibra</string>
-  <string name="preferences__also_vibrate_when_notified">Vibra també en notificar</string>
-  <string name="preferences__minutes">minuts</string>
-  <string name="preferences__hours">hores</string>
-  <string name="preferences__green">Verd</string>
-  <string name="preferences__red">Vermell</string>
-  <string name="preferences__blue">Blau</string>
-  <string name="preferences__orange">Taronja</string>
-  <string name="preferences__cyan">Cian</string>
-  <string name="preferences__magenta">Magenta</string>
-  <string name="preferences__white">Blanc</string>
-  <string name="preferences__fast">Ràpid</string>
-  <string name="preferences__normal">Normal</string>
-  <string name="preferences__slow">Lent</string>
-  <string name="preferences__custom">Personalitzat</string>
-  <string name="preferences__advanced">Avançat</string>
-  <string name="preferences__override_system_mms_settings">Sobreescriu els ajustaments MMS del sistema amb la informació següent.</string>
-  <string name="preferences__sms_delivery_reports">Informes de lliurament de SMS</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demana un informe de lliurament en cada missatge SMS que enviïs</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Esborra automàticament els missatges antics una vegada el fil de conversa excedeixi la mida especificada</string>
-  <string name="preferences__delete_old_messages">Esborra missatges antics</string>
-  <string name="preferences__conversation_length_limit">Límit de mida de la conversació</string>
-  <string name="preferences__trim_all_threads_now">Escapça tots els fils ara</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Cerca en tots els fils de conversa i fes respectar els límits de mida de la conversació</string>
-  <string name="preferences__appearance">Aparença</string>
-  <string name="preferences__theme">Tema</string>
-  <string name="preferences__default">Predeterminat</string>
-  <string name="preferences__language">Idioma</string>
-  <string name="preferences__submit_debug_log">Envia un registre de depuració</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">Finalitzat</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">Truca</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Detalls del missatge</string>
-  <string name="conversation_context__menu_copy_text">Copia el text</string>
-  <string name="conversation_context__menu_delete_message">Esborra el missatge</string>
-  <string name="conversation_context__menu_forward_message">Reenvia el missatge</string>
-  <string name="conversation_context__menu_resend_message">Torna a enviar el missatge</string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">Seguretat</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">Cerca</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">Seguretat</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">Afegeix un adjunt</string>
-  <string name="conversation__menu_delete_thread">Esborra fil</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Llista de destinataris</string>
-  <string name="conversation_group_options__delivery">Lliurament</string>
-  <string name="conversation_group_options__conversation">Conversa</string>
-  <string name="conversation_group_options__broadcast">Difusió</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">Compara</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Sigues escanejat per comparar</string>
-  <string name="key_scanning__menu_scan_to_compare">Escaneja per comparar</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">Configuració</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Bloqueja</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-cs/strings.xml

@@ -112,6 +112,7 @@ kontakt</string>
   <string name="ConversationActivity_unblock_question">Odblokovat?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Opravdu chcete odblokovat tento kontakt?</string>
   <string name="ConversationActivity_unblock">Odblokovat</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Velikost přílohy překročila limit pro typ zprávy kterou posíláte</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti zprávy</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Přenos: %1$s\nOdesláno/Přijato: %2$s</string>
@@ -318,6 +319,10 @@ telefonní číslo</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registrace TextSecure byla úspěšně dokončena</string>
   <string name="RegistrationService_registration_error">Chyba registrace</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Při registraci TextSecure došlo k potížím.</string>
+  <!--Slide-->
+  <string name="Slide_image">Obrázek</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Obdržen neplatný požadavek na výměnu klíčů.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -731,6 +736,13 @@ Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Povolit pokud vaše zařízení používá doručování SMS/MMS přes Wifi (povoleno pouze když je na zařízení povoleno \'Wifi volání\')</string>
   <string name="preferences_app_protection__blocked_contacts">Blokované kontakty</string>
   <string name="preferences_notifications__display_in_notifications">Zobrazit v upozornění</string>
+  <string name="preferences_chats__when_using_mobile_data">Při použití mobilních datových přenosů</string>
+  <string name="preferences_chats__when_using_wifi">Při použití Wfi</string>
+  <string name="preferences_chats__when_roaming">Při roamingu</string>
+  <string name="preferences_chats__media_auto_download">Automatické stahování multimedií</string>
+  <string name="preferences_chats__message_trimming">Ořezávání práv</string>
+  <string name="preferences_advanced__use_system_emoji">Použít systémové smajlíky</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Zakázat použití smajlíků integrovaných v TextSecure </string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-de/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s Nachrichten pro Unterhaltung</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Wollen Sie alle Unterhaltungen bis auf die letzten %s Nachrichten wirklich löschen?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Wollen Sie wirklich alle Nachrichten in sämtlichen Unterhaltungen bis auf die letzten %s Nachrichten löschen?</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -95,7 +95,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_calls_not_supported">Anrufe nicht unterstützt</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dieses Gerät scheint keine Wahlvorgänge zu unterstützen.</string>
   <string name="ConversationActivity_leave_group">Gruppe verlassen?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Wollen Sie diese Gruppe wirklich verlassen?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Wollen Sie wirklich diese Gruppe verlassen?</string>
   <string name="ConversationActivity_transport_insecure_sms">Unsichere SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Unsichere MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
@@ -108,6 +108,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_unblock_question">Nicht mehr blockieren?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Diesen Kontakt nicht mehr blockieren.</string>
   <string name="ConversationActivity_unblock">Nicht mehr blockieren</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Der Anhang ist für diese Nachrichtenart zu groß.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Übertragung: %1$s\nGesendet/Empfangen: %2$s</string>
@@ -313,6 +314,10 @@ Bitte kontrollieren Sie noch einmal Ihre Rufnummer. Diese wird anschließend dur
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Die Registrierung von TextSecure wurde erfolgreich abgeschlossen.</string>
   <string name="RegistrationService_registration_error">Fehler bei der Registrierung</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Bei der TextSecure-Registrierung ist ein Fehler aufgetreten.</string>
+  <!--Slide-->
+  <string name="Slide_image">Bild</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Fehlerhafte Schlüsselaustausch-Nachricht empfangen!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -686,7 +691,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald die Unterhaltung eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
-  <string name="preferences__chats">Unterhaltungen und Medien</string>
+  <string name="preferences__chats">Unterhaltungen und Multimedia</string>
   <string name="preferences__conversation_length_limit">Höchstzahl an Nachrichten</string>
   <string name="preferences__trim_all_threads_now">Alle Unterhaltungen jetzt kürzen</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Unterhaltungen prüfen und deren Längenbegrenzung sicherstellen</string>
@@ -709,8 +714,10 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="preferences_chats__when_using_mobile_data">Bei mobiler Datenverbindung</string>
   <string name="preferences_chats__when_using_wifi">Bei WLAN-Verbindung</string>
   <string name="preferences_chats__when_roaming">Bei Roaming</string>
-  <string name="preferences_chats__media_auto_download">Automatisches Herunterladen von Medien</string>
-  <string name="preferences_chats__message_trimming">Kürzen von Unterhaltungen</string>
+  <string name="preferences_chats__media_auto_download">Multimediainhalte automatisch herunterladen</string>
+  <string name="preferences_chats__message_trimming">Unterhaltungen kürzen</string>
+  <string name="preferences_advanced__use_system_emoji">System-Emoji verwenden</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">TextSecures integrierte Emoji-Unterstützung deaktivieren</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-el/strings.xml

@@ -300,6 +300,7 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Η εγγραφή TextSecure ολοκληρώθηκε επιτυχώς.</string>
   <string name="RegistrationService_registration_error">Σφάλμα εγγραφής</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Η εγγραφή TextSecure παρουσίασε ένα πρόβλημα.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ελήφθη προβληματικό μήνυμα
 ανταλλαγής κλειδιών!

res/values-es/strings.xml

@@ -113,6 +113,7 @@ este contacto.
   <string name="ConversationActivity_unblock_question">¿Desbloquear?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">¿Está seguro de que desea desbloquear este contacto?</string>
   <string name="ConversationActivity_unblock">Desbloquear</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">El adjunto excede los límites de tamaño para el tipo de mensaje que está enviando.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s
@@ -345,6 +346,10 @@ requieren una cuenta de Google, pero deben tener la aplicación Play Store insta
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">El proceso de registro de TextSecure ha finalizado con éxito.</string>
   <string name="RegistrationService_registration_error">Error al registrarse</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">El proceso de registro de TextSecure ha encontrado un problema.</string>
+  <!--Slide-->
+  <string name="Slide_image">Imagen</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Vídeo</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">¡Se recibió un mensaje corrupto
 de intercambio de claves!
@@ -761,6 +766,7 @@ por SMS.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Solicita la confirmación de entrega de SMS para todos los SMS que envíe.</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Eliminar automáticamente los mensajes más antiguos cuando una conversación exceda el límite de longitud especificado</string>
   <string name="preferences__delete_old_messages">Eliminar mensajes antiguos</string>
+  <string name="preferences__chats">Chats y audiovisuales</string>
   <string name="preferences__conversation_length_limit">Límite de longitud de la conversación</string>
   <string name="preferences__trim_all_threads_now">Recortar todos los hilos ahora</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Escanear todas las conversaciones y forzar los límites de tamaño de conversación</string>
@@ -780,6 +786,13 @@ Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Habilítelo si su dispositivo utiliza entrega de SMS/MMS vía WiFi (actívelo sólo cuando \'Llamada por WiFi\' esté activada en su dispositivo)</string>
   <string name="preferences_app_protection__blocked_contacts">Contactos bloqueados</string>
   <string name="preferences_notifications__display_in_notifications">Mostrar en notificaciones</string>
+  <string name="preferences_chats__when_using_mobile_data">Al usar datos móviles</string>
+  <string name="preferences_chats__when_using_wifi">Al usar Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Al usar roaming</string>
+  <string name="preferences_chats__media_auto_download">Auto-descarga de audiovisuales</string>
+  <string name="preferences_chats__message_trimming">Recortado de mensaje</string>
+  <string name="preferences_advanced__use_system_emoji">Usar emoji del sistema</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Deshabilitar el soporte de emoji integrado de Textsecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-eu/strings.xml

@@ -1,647 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">Bai</string>
-  <string name="no">Ez</string>
-  <string name="delete">Ezabatu</string>
-  <string name="please_wait">Itxaron, mesedez...</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">Une honetan: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Oraindik ez duzu pasahitza ezarri!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mezu solasaldiko</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Mezu zahar guztiak ezabatu orain?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ziur zaude solasaldi hari guztiak berehala azkenengo %s mezuetara murriztu nahi izateaz?</string>
-  <string name="ApplicationPreferencesActivity_delete">Ezabatu</string>
-  <string name="ApplicationPreferencesActivity_disable">Desgaitu</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errorea zerbitzariarekin konektatzerakoan!</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Ukitu zure SMS aplikazio lehenetsia aldatzeko</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Ukitu TextSecure zure SMS aplikazio lehenetsia bihurtzeko</string>
-  <string name="ApplicationPreferencesActivity_on">piztuta</string>
-  <string name="ApplicationPreferencesActivity_On">Aktibatuta</string>
-  <string name="ApplicationPreferencesActivity_off">desaktibatuta</string>
-  <string name="ApplicationPreferencesActivity_Off">Desaktibatuta</string>
-  <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d minutu</string>
-  <!--DraftDatabase-->
-  <string name="DraftDatabase_Draft_image_snippet">(irudia)</string>
-  <string name="DraftDatabase_Draft_audio_snippet">(audioa)</string>
-  <string name="DraftDatabase_Draft_video_snippet">(bideoa)</string>
-  <!--AttchmentManager-->
-  <string name="AttachmentManager_cant_open_media_selection">Ezin dut topatu euskarria aukeratzeko aplikaziorik</string>
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">Irudia</string>
-  <string name="AttachmentTypeSelectorAdapter_video">Bideoa</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">Audioa</string>
-  <string name="AttachmentTypeSelectorAdapter_contact">Kontaktuaren informazioa</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Agian kontaktu hau egiaztatu beharko zenuke.</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Mezuaren tamaina: %d KB</string>
-  <string name="ConversationItem_expires_s">Iraingutuko da: %s</string>
-  <string name="ConversationItem_view_secure_media_question">Euskarri segurua ikusi?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Media hau enkriptatutako datubase batean gorde da. Tamalez, aplikazioaz kanpoko edukien ikusle bat erabili ahal izateko, datuak tenporalki desenkriptatu behar dira eta diskoan gorde. Ziur zaude hau egin nahi izateaz?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Errorea, jaso da iraungita dagoen datu-trukerako gakoaren mezua.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Jaso da gakoaren datu-trukatzearen mezua, klik egin prozesatzeko</string>
-  <string name="ConversationItem_group_action_left">%1$s taldea utzi du</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Tap egin segurtasunik gabeko alternatibarako</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Enkriptatzerik gabeko SMSra pasatu aukera gisa?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Enkriptatzerik gabeko MMSra pasatu aukera gisa?</string>
-  <string name="ConversationItem_unable_to_open_media">Ezin dut aurkitu euskarri hau irekitzeko gai den aplikaziorik</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_question">Hasi saio segurua?</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">%s-(r)ekin saio segurua abiatu?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Saio segurua bukatzeko berrespena</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ziur zaude saio seguru hau bukatu nahi izateaz?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Haria ezabatzeko berrespena</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ziur zaude solasaldi hau behin betiko ezabatu nahi izateaz?</string>
-  <string name="ConversationActivity_add_attachment">Eranskina gehitu</string>
-  <string name="ConversationActivity_select_contact_info">Kontaktuaren informazioa aukeratu</string>
-  <string name="ConversationActivity_compose_message">Mezua idatzi</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Barkatu, zure eranskina ezartzean errore bat izan da</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Barkatu, aukeratutako bideoak amainaren mugak gainditzen ditu t(%1$skB).</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Barkatu, aukeratutako audioak mezuaren tamaina mugak gainditzen ditu  (%1$skB).</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Hartzailea SMS edo email baliogabea da!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">Mezua hutsik dago!</string>
-  <string name="ConversationActivity_group_conversation">Taldeko solasaldia</string>
-  <string name="ConversationActivity_unnamed_group">Izenik gabeko taldea</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d partaide</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">partaide 1</string>
-  <string name="ConversationActivity_saved_draft">Gordetako zirriborroa</string>
-  <string name="ConversationActivity_invalid_recipient">Hartzaile baliogabea!</string>
-  <string name="ConversationActivity_calls_not_supported">Deiak ez daude onartuta</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Badirudi gailu honek ez duela onartzen telefono deiekin lotutako ekintzak.</string>
-  <string name="ConversationActivity_leave_group">Taldea utzi?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Ziur zaude talde hau utzi nahi izateaz?</string>
-  <string name="ConversationActivity_transport_insecure_sms">SMS ez segurua</string>
-  <string name="ConversationActivity_transport_insecure_mms">MMS ez segurua</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <string name="ConversationActivity_get_with_it">Ondokoa lortu: %s</string>
-  <string name="ConversationActivity_error_leaving_group">Errorea taldea uzterakoan...</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">Mezuaren detaileak</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">Garraioa: %1$s\nBidalita/Jasota: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Bidaltzailea: %1$s\nGarraioa: %2$sIgorrita: %3$s\nJasota: %4$s</string>
-  <string name="ConversationFragment_confirm_message_delete">Berretsi mezuaren ezabaketa</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Ziur zaude aukeratutako mezu guztiak behin betiko ezabatu nahi izateaz?</string>
-  <string name="ConversationFragment_save_to_sd_card">Biltegian gorde?</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Media hau biltegian gordetzeak zure telefonoan dagoen beste edozein aplikazio ahalbidetuko du euskarrirako sarbidea.\n\nJarraitu?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Errorea eranskina biltegian gordetzerakoan!</string>
-  <string name="ConversationFragment_success_exclamation">Arrakasta!</string>
-  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Ezgai biltegian idazteko!</string>
-  <string name="ConversationFragment_saving_attachment">Eranskina gordetzen</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Eranskina biltegian gordetzen...</string>
-  <string name="ConversationFragment_mms">MMS</string>
-  <string name="ConversationFragment_sms">SMS</string>
-  <string name="ConversationFragment_deleting_messages">Mezuak ezabatzen...</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Hariak ezabatu?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ziur zaude aukeratutako solasaldi hari GUZTIAK ezabatu nahi izateaz?</string>
-  <string name="ConversationListFragment_deleting">Ezabatzen</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Aukeratutako hariak ezabatzen...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Gakoaren datu-trukerako mezua...</string>
-  <!--CustomDefaultPreference-->
-  <string name="CustomDefaultPreference_none">Bat ere ez</string>
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <string name="ShareActivity_share_with">Norekin konpartitu</string>
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">Esportatu</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Enkriptatu gabeko testua SD txartel batera esportatu?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Kontuz, ekintza honek
- zure TextSecure mezuen enkriptatu gabeko testua SD txartelera esportatuko du.
-</string>
-  <string name="ExportFragment_cancel">Utzi</string>
-  <string name="ExportFragment_exporting">Esportatzen</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Enkriptatu gabeko testua SD txartelera esportatzen...</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Errorea, ezgai SD txartelean idazteko!</string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Errorea SD txartelean idazterakoan.</string>
-  <string name="ExportFragment_success">Arrakasta!</string>
-  <!--GcmRefreshJob-->
-  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">TextSecuren behin betiko komunikazio akatsa</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure ez da gai izan Google Play Zerbitzuekin erregistratzeko.
-Datu kanalaren bitartezko komunikazioa desgaitu egin da, mesedez saiatu bererregistratzen TextSecure-eko ezarpenen menutik.</string>
-  <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_actionbar_title">Talde berria</string>
-  <string name="GroupCreateActivity_actionbar_update_title">Taldea eguneratu</string>
-  <string name="GroupCreateActivity_group_name_hint">Taldearen izena</string>
-  <string name="GroupCreateActivity_actionbar_mms_title">MMS talde berria</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">TextSecure taldeak onartzen ez duen kontaktu bat aukeratu duzu; beraz, talde hau MMS izango da.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Ez zaude erregistratuta datuen kanala erabiltzeko, hortaz TextSecure-eko taldeak ezgaituta daude.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">Ustekabeko errorea gertatu da eta eragin du taldea sortu ezin izatea.</string>
-  <string name="GroupCreateActivity_contacts_no_members">Gutxienez pertsona bat behar duzu zure taldean!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Zure taldeko partaide batek ondo irakurri ezin daitekeen zenbaki bat dauka. Mesedez, konpondu edo ezabatu kontaktua eta saiatu berriro.</string>
-  <string name="GroupCreateActivity_avatar_content_description">Taldearen abatarra</string>
-  <string name="GroupCreateActivity_menu_create_title">Taldea sortu</string>
-  <string name="GroupCreateActivity_creating_group">Sortzen %1$s...</string>
-  <string name="GroupCreateActivity_updating_group">Eguneratzen: %1$s...</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Ezin duzu TextSecurekoak ez diren kontaktuak gehitu TextSecureko talde batera</string>
-  <string name="GroupCreateActivity_loading_group_details">Taldearen detaileak kargatzen...</string>
-  <!--GroupMembersDialog-->
-  <string name="GroupMembersDialog_me">Ni</string>
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">Inportatu</string>
-  <string name="ImportExportActivity_export">Esportatu</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_import_system_sms_database">Inportatu sistemaren SMS datubasea?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Zure sisteman lehenetsitako SMS datubasearen mezuak inportatuko dira TextSecure-era. Lehenago inportatu baduzu sistemaren SMS datubasea, berriro egiteak mezu bikoiztuak sor ditzake.</string>
-  <string name="ImportFragment_import">Inportatu</string>
-  <string name="ImportFragment_cancel">Utzi</string>
-  <string name="ImportFragment_restore_encrypted_backup">Enkriptatutako babeskopia leheneratu?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-Enkriptatutako babeskopia bat leheneratzeak zure gakoak, ezapenak eta mezuak erabat 
-ordezkatuko ditu. Galduko duzu zure egungo TextSecure instalazioan dagoen edozein informazio, 
-baina ez babeskopian
-</string>
-  <string name="ImportFragment_restore">Leheneratu</string>
-  <string name="ImportFragment_import_plaintext_backup">Inportatu enkriptatu gabeko babeskopia?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Enkriptatu gabeko babeskopia
-batetik mezuak inportatuko dira. 
-Babeskopia hau lehenago inportatu baduzu, mezu bikoiztuak sortu daitezke.
-</string>
-  <string name="ImportFragment_importing">Inportatzen</string>
-  <string name="ImportFragment_no_plaintext_backup_found">Ez da enkriptatu gabeko babeskopiarik topatu!</string>
-  <string name="ImportFragment_error_importing_backup">Errorea babeskopia inportatzerakoan!</string>
-  <string name="ImportFragment_import_complete">Inportaketa bukatuta!</string>
-  <string name="ImportFragment_restoring">Leheneratzen</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Enkriptatutako babeskopia leheneratzen...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Ez da topatu enkriptatuko babeskopiarik!</string>
-  <string name="ImportFragment_restore_complete">Leheneratzea osatuta!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Ez da topatu eskaneatutako gakorik!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">Barcode Scanner instalatu?</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure-ek Barcode Scanner behar du QR kodeak irakurri ahal izateko.</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">Errorea MMS gordetzen!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Errorea MMS hornitzailearekin konentatzerakoan...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Errorea hari-gabeko hornitzailearen MMS ezarpenak irakurtzen...</string>
-  <!--NotificationMmsMessageRecord-->
-  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia mezua</string>
-  <!--MessageRecord-->
-  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Jaso duzun mezua TextSecuren bertsio zahar eta jadanik ez onartu bat erabiliz enkriptatu zen. Mesedez, eskatu bidaltzaileari bertsiorik berrienera eguneratu dadin eta mezua berbidali dezan. </string>
-  <string name="MessageRecord_left_group">Taldea utzi duzu.</string>
-  <string name="MessageRecord_updated_group">Taldea eguneratuta.</string>
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Pasahitzak ez datoz bat!</string>
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Pasahitz zahar ez zuzena!</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <string name="PassphrasePromptActivity_enter_passphrase">Pasahitza sartu</string>
-  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-ren ikonoa</string>
-  <string name="PassphrasePromptActivity_ok_button_content_description">Bidali pasahitza</string>
-  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Pasahitz baliogabea!</string>
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">TextSecure-ekin Konektatu</string>
-  <string name="RegistrationActivity_select_your_country">Zure herrialdea aukeratu</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Zure herrialdearen 
-kodea zehaztu behar duzu
-</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Zure telefono zenbakia 
-zehaztu behar duzu
-</string>
-  <string name="RegistrationActivity_invalid_number">Zenbaki baliogabea</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Zehaztu duzun 
-zenbakia (%s) baliogabea da.
-</string>
-  <string name="RegistrationActivity_unsupported">Ez onartua</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sentitzen dugu,
-baina gailu honek ez dago onartuta datuen bidezko mezulararitzarako. Android 4.0 bertsioa baino zaharragoa duten gailuek Google Kontu bat izan behar dute. 
-Android 4.0 edo berriagoa badute, ez da beharrezkoa Google Kontu bat izatea, baina Play Store-eko aplikakzioa instalatuta eduki behar da.</string>
-  <string name="RegistrationActivity_continue">Jarraitu</string>
-  <string name="RegistrationActivity_edit">Editatu</string>
-  <!--RegistrationProblemsActivity-->
-  <string name="RegistrationProblemsActivity_possible_problems">Aurreikusi daitezkeen arazoak</string>
-  <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Zenbakia egiaztatzen</string>
-  <string name="RegistrationProgressActivity_edit_s">Editatu %s</string>
-  <string name="RegistrationProgressActivity_registration_complete">Erregistratzea osatuta!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Lehenago jaso duzun kodea sartu behar duzu...</string>
-  <string name="RegistrationProgressActivity_connecting">Konektatzen</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Egiaztatzeko konektatzen...</string>
-  <string name="RegistrationProgressActivity_network_error">Sareko errorea!</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Konektatzeko ezgai. Mesedez, egiazta ezazu zure konexioa eta saiatu berriro.</string>
-  <string name="RegistrationProgressActivity_verification_failed">Egiaztapenak huts egin du!</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Bidali duzun egiaztapen kodea ez da zuzena. Mesedez, saiatu berriro.</string>
-  <string name="RegistrationProgressActivity_too_many_attempts">Saio gehiegi</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Zuzena ez den egiaztapen gako bat aldi gehiegi bidali duzu. Mesedez, minutu bat itxaron berriro saitu baino lehenago.</string>
-  <string name="RegistrationProgressActivity_requesting_call">Deia eskatzen</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Sarrera egiaztapen deia eskatzen...</string>
-  <string name="RegistrationProgressActivity_server_error">Zerbitzariaren errorea</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Zerbitzariak errore bat topatu du. Mesedez, saiatu berriro.</string>
-  <string name="RegistrationProgressActivity_too_many_requests">Eskaera gehiegi!</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Duela gutxi ahotsezko dei bat eskatu duzu. Beste bat eska dezakezu 20 minutu barru.</string>
-  <string name="RegistrationProgressActivity_registration_conflict">Erregistratze gatazka</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Zenbaki hau beste TextSecure zerbitzari batean erregistratuta dago jadanik (CyanogenMod?) Deserregistratu behar duzu hemen erregistratu aurretik.</string>
-  <!--RegistrationService-->
-  <string name="RegistrationService_registration_complete">Erregistratzea osatuta</string>
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure-ren erregistratea arrakastaz osatu da.</string>
-  <string name="RegistrationService_registration_error">Erregistratze errorea</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure-ren erregistratzeak arazo bat topatu du.</string>
-  <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Mezuaren elkar-trukerako
- gakoa hondatuta dago!
-</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
-Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
-</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakusteko.
-</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Eguneratutako baina ezezaguna den nortasun informazioa jaso da. Ukitu nortasuna balidatzeko.</string>
-  <string name="SmsMessageRecord_secure_session_ended">Saio segurua bukatu da.</string>
-  <string name="SmsMessageRecord_duplicate_message">Mezu bikoiztua.</string>
-  <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Taldea utzita...</string>
-  <string name="TheadRecord_secure_session_ended">Saio segurua bukatu da</string>
-  <string name="ThreadRecord_draft">Zirriborroa:</string>
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Ez daukazu nortasun gakorik.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Hartzaileak ez dauka nortasun gakorik.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Hartzaileak ez dauka nortasun gakorik!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Eskaneatu beraien gakoa konparatzeko</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Eskaneatu nire gakoa</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">KONTUZ, eskaneatutako gakoa EZ DATOR BAT. Mesedez, aztarnaren testua kontu handiz aztertu.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">EZ Egiaztatua!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Beraien gakoa zuzena da. Beharrezkoa da zure gakoa beraiekin egiaztatzea ere.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Egiaztatua!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Ez daukazu nortasun gakorik!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Ez daukazu nortasun gakorik.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Eskaneatu konparatzeko</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Eskaneatu konparatzeko</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">KONTUZ, eskaneatutako gakoa EZ DATOR BAT!</string>
-  <string name="ViewIdentityActivity_not_verified_exclamation">EZ egiaztatua!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Eskaneatutako gakoa bat dator!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Egiaztatua!</string>
-  <string name="ViewIdentityActivity_my_identity_fingerprint">Nire nortasunaren aztarna</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Hasi nahiz eta beste eskaera bat indarrean egon?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Dagoeneko saioa hasteko eskaera bat bidali diozu hartzaile honi, ziur zaude beste bat bidali nahi izateaz? Honek lehenengo eskaera baliogabetuko luke.</string>
-  <string name="KeyExchangeInitiator_send">Bidali</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Gaizki enkriptatuako mezua...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Desenkriptatzen, mesedez itxaron...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Esistitzen ez den saio baterako enkriptatutako mezua...</string>
-  <!--EncryptingSmsDatabase-->
-  <string name="EncryptingSmsDatabase_error_decrypting_message">Mezua desenkriptatzerakoan errorea.</string>
-  <!--ThreadDatabase-->
-  <string name="ThreadDatabase_error_decrypting_message">Mezua desenkriptatzerakoan errorea.</string>
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">MMS zerbitzari batekin konektatzen...</string>
-  <string name="MmsDatabase_downloading_mms">MMS behera kargatzen...</string>
-  <string name="MmsDatabase_mms_download_failed">MMS-aren behera kargatzeak huts egin du!</string>
-  <string name="MmsDatabase_downloading">Behera kargatzen...</string>
-  <string name="MmsDatabase_mms_pending_download">Ukitu eta MMSaren ezarpenak konfiguratu behera kargatzearekin jarraitzeko.</string>
-  <string name="MmsDatabase_error_decrypting_message">Mezua desenkriptatzerakoan errorea.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSa desenkriptatzen, mesedez itxaron...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Gaizki enkriptatuko MMS mezua...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS mezua enkriptatua esistitzen ez den saio baterako...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Inportaketa indarrean</string>
-  <string name="ApplicationMigrationService_importing_text_messages">Testu mezuak inportatzen</string>
-  <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Ukitu irekitzeko</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Ukitu irekitzeko, edo sarraila ukitu ixteko.</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure desblokeatuta dago</string>
-  <string name="KeyCachingService_lock">Blokeatu pasahitz bat erabiliz</string>
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_no_subject">(Ez dago gairik)</string>
-  <string name="MessageNotifier_message_delivery_failed">Mezuaren banaketak huts egin du.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">Mezuaren banaketak huts egin du.</string>
-  <string name="MessageNotifier_error_delivering_message">Errorea mezua banatzen.</string>
-  <string name="MessageNotifier_mark_all_as_read">Denak irrakurritako gisa markatu</string>
-  <string name="MessageNotifier_media_message">Media mezua</string>
-  <!--QuickResponseService-->
-  <!--SingleRecipientNotificationBuilder-->
-  <!--change_passphrase_activity-->
-  <string name="change_passphrase_activity__old_passphrase">PASAHITZ ZAHARRA:</string>
-  <string name="change_passphrase_activity__new_passphrase">PASAHITZ BERRIA:</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">PASAHITZ BERRIA ERREPIKATU:</string>
-  <!--contact_selection_activity-->
-  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">Kontakturik ez.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Kontaktuak kargatzen...</string>
-  <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_contact_photo">Kontaktuaren Argazkia</string>
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">Hautatu egiteko...</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">Ez dago azken deirik.</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Bidali TextSecure-eko mezua</string>
-  <string name="conversation_activity__type_message_sms_insecure">SMS ez segurua bidali</string>
-  <string name="conversation_activity__type_message_mms_insecure">MMS ez segurua bidali</string>
-  <string name="conversation_activity__send">Bidali</string>
-  <string name="conversation_activity__remove">Ezabatu</string>
-  <string name="conversation_activity__window_description">%1$s-(r)ekin solasaldia</string>
-  <string name="conversation_activity__compose_description">Mezuaren konposizioa</string>
-  <string name="conversation_activity__emoji_toggle_description">Emoji teklatua aktibatu/desaktibatu</string>
-  <!--conversation_item-->
-  <string name="conversation_item__mms_image_description">Media mezua</string>
-  <string name="conversation_item__secure_message_description">Mezu segurua</string>
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">Behera kargatu</string>
-  <string name="conversation_item_sent__downloading">Behera kargatzen</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Bidalketak huts egin du</string>
-  <string name="conversation_item_sent__pending_approval_description">Onespenaren Zain</string>
-  <string name="conversation_item_sent__delivered_description">Banatua</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">Behera kargatu</string>
-  <string name="conversation_item_received__contact_photo_description">Kontaktuaren argazkia</string>
-  <string name="conversation_item_received__downloading">Behera kargatzen</string>
-  <!--conversation_fragment_cab-->
-  <string name="conversation_fragment_cab__batch_selection_mode">Batch hautatzeko modua</string>
-  <string name="conversation_fragment_cab__batch_selection_amount">%s hautatua</string>
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Herrialdeak kargatzen...</string>
-  <string name="country_selection_fragment__search">Bilatu</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Ezin izan dira logak eskuratu zure gailutik. ADB erabili dezakezu arazketa logak lortzeko.</string>
-  <string name="log_submit_activity__thanks">Eskerrik asko zure laguntzagatik!</string>
-  <string name="log_submit_activity__submitting">Bidaltzen</string>
-  <string name="log_submit_activity__posting_logs">Logak gist-era bidaltzen...</string>
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Nahiko zenuke zure testu mezuak TextSecure-ren enkriptatutako datubasera inportatu?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Sistemaren lehenetsitako datubasea ez da inolako moduan aldatuko.</string>
-  <string name="database_migration_activity__skip">Saltatu</string>
-  <string name="database_migration_activity__import">Inportatu</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Honek denbora tarte bat har lezake. Mesedez, pazientzia izan, jakinaraziko dizugu inportatzea osatuta dagoenean.</string>
-  <string name="database_migration_activity__importing">INPORTATZEN</string>
-  <!--database_upgrade_activity-->
-  <string name="database_upgrade_activity__updating_database">Datubasea eguneratzen...</string>
-  <string name="export_fragment__export_plaintext_backup">Esportatu enkriptatu gabeko babeskopia</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-\'SMSBackup and Restorekin\' bateragarria den enkriptatu gabeko babeskopia bat esportatu SD txartelera.</string>
-  <string name="import_fragment__import_system_sms_database">Inportatu sistemaren SMS datubasea</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Inportatu datubasea sisteman lehenetsitako mezularitza aplikaziotik.</string>
-  <string name="import_fragment__import_encrypted_backup">Enkriptatutako babeskopia inportatu</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
-Aurretik enkriptatu eta esportatu den TextSecure babeskopia leheneratu.
-</string>
-  <string name="import_fragment__import_plaintext_backup">Enkriptatu gabeko babeskopia inportatu</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">
-Enkriptatu gabeko babeskopia bat inportatu. Bateragarria \'SMSBackup Eta Restore\'-ekin.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">MMS eskuzko ezarpenak behar dira zure telefonorako.</string>
-  <string name="MmsPreferencesFragment__enabled">Gaituta</string>
-  <string name="MmsPreferencesFragment__disabled">Ezgaituta</string>
-  <string name="MmsPreferencesFragment__not_set">Ez ezarria</string>
-  <string name="MmsPreferencesFragment__invalid_uri">Sartutako testua URI baliogabea da</string>
-  <string name="MmsPreferencesFragment__invalid_host">Sartutako testua host baliogabea da</string>
-  <!--GroupUtil-->
-  <string name="GroupUtil_joined_the_group">%1$s taldean sartu da.</string>
-  <string name="GroupUtil_group_updated">Taldea eguneratuta.</string>
-  <string name="GroupUtil_title_is_now">Izenburua \'%1$s\' da orain.</string>
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">Desblokeatu</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecurek MMS ezarpenak behar ditu media eta taldeko mezuak banatu ahal izateko zure hari-gabeko hornitzailearen bitartez. Zure gailuak ez dauka informazio hau eskuragarri. Hau batzuetan gertatzen da blokeatuta dauden eta beste konfigurazio murrizgarriak dituzten gailuetan.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Media eta taldeko mezuak bidaltzeko, klik egin \'OK\'-n eta osatu beharrezkoak diren ezarpenak. Zure hornitzailearentzako ezarpenak normalean topa daitezke zure hornitzailearen APNa bilatuz. Bakarrik behin egin beharko duzu hau.</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <string name="registration_activity__your_country">ZURE HERRIALDEA</string>
-  <string name="registration_activity__your_country_code_and_phone_number">ZURE HERRIALDEA ETA 
-TELEFONO ZENBAKIA
-</string>
-  <string name="registration_activity__phone_number">TELEFONO ZENBAKIA</string>
-  <string name="registration_activity__register">Erregistratu</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Erregistratzeak kontakturako informazioa igortzen du zerbitzarira. Ez da gordetzen.</string>
-  <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Aurreikusi daitezkeen arazo 
-batzuk ondokoak dira:
-</string>
-  <string name="registration_problems__sms_interceptors">SMSen pase-harrapatzaileak</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
-Hirugarren testu mezulararitzarako bezero batzuk, hala nola, Handcent edo GoSMS, gaizki jokatzen dute eta
-sartzen diren SMS mezu guztiak bidan atzematen dute. Egiaztatu zure mezuaren hasieran 
-\"Zure TextSecure egiaztapen kode:\" agertzen den. Hala bada, zure hirugarren testu mezulararitzarako aplikazioa konfiguratu beharko duzu mezuak pasatzen uzteko.</string>
-  <string name="registration_problems__incorrect_number">Zenbaki ez zuzena.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">Mesedez, egiazta ezazu zenbakia ondo sartu duzun, eta zure zonaldeari dagokion formatoan dagoen.</string>
-  <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">TextSecurek ez du funtzionatuko Google Voice-eko zenbakiekin.</string>
-  <!--registration_progress_activity-->
-  <string name="registration_progress_activity__voice_verification">Ahotsaren bidezko egiaztapena</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">TextSecurek, era berean, deitu diezazuke zure zenbakia egiaztatzeko. Ukitu \"Dei iezadazu\" eta sartu azpian entzungo duzun sei zenbakiko kodea.</string>
-  <string name="registration_progress_activity__verify">Egiaztatu</string>
-  <string name="registration_progress_activity__call_me">Dei iezadazu</string>
-  <string name="registration_progress_activity__edit_number">Zenbakia editatu</string>
-  <string name="registration_progress_activity__connectivity_error">Konexioaren errorea</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure ez da gai izan push zerbitzuarekin konektatzeko.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Aurreikusi daitezkeen 
-arazo batzuk ondokoak dira:
-</string>
-  <string name="registration_progress_activity__no_network_connectivity">Ez dago s
-areko konexiorik.
-</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Zure
-gailuak sarerako konexioa behar du TextSecure-eko ezaugarri hau erabili ahal izateko. Egiaztatu
-konektatuta dagoen 3G edo Wi-Fi sare batekin.</string>
-  <string name="registration_progress_activity__restrictive_firewall">Firewall murrizgarria.</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
-Wi-Fi bidez konektatua bazaude, izan daiteke firewall bat TextSecure-eko zerbitzarirako sarrera blokeatzea. Saia zaitez beste sare edo mugikorreko datu konexioarekin.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-Orain TextSecure-ek zure zenbakia automatikoki egiaztatuko du SMS egiaztapen mezu bat bidaliz.</string>
-  <string name="registration_progress_activity__connecting">Konektatzen...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">SMS bidezko
-egiaztapenaren zain...
-</string>
-  <string name="registration_progress_activity__registering_with_server">Zerbitzariarekin erregistratzen...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Honek 
-denbora tarte bat har lezake. Mesedez, pazientzia izan, jakinaraziko dizugu egiaztapena osatuta dagoenean.
-</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
-TextSecure SMS bidez egiaztatzeko mezuaren zain zegoela denbora mugara iritsi da.
-</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS bidezko egiaztapenak 
-huts egin du.
-</string>
-  <string name="registration_progress_activity__generating_keys">Gakoak sortzen...</string>
-  <!--recipients_panel-->
-  <string name="recipients_panel__to"><small>Izen edo zenbaki bat sartu</small></string>
-  <string name="recipients_panel__add_member">Partaidea gehitu</string>
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Beraien nortasuna (beraiek irakurri dezatela):</string>
-  <string name="verify_identity_activity__your_identity_you_read">Zure nortasuna (zuk irakurri):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__create_passphrase">Pasahitza sortu</string>
-  <string name="AndroidManifest__enter_passphrase">Pasahitza sartu</string>
-  <string name="AndroidManifest__select_contacts">Kontaktuak hautatu</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure detektatua</string>
-  <string name="AndroidManifest__public_identity_key">Gako publikoaren nortasuna</string>
-  <string name="AndroidManifest__change_passphrase">Pasahitza aldatu</string>
-  <string name="AndroidManifest__verify_identity">Nortasuna egiaztatu</string>
-  <string name="AndroidManifest__log_submit">Arazketa logak bidali</string>
-  <string name="AndroidManifest__media_preview">Mediaren Aurrebista</string>
-  <!--arrays.xml-->
-  <string name="arrays__import_export">Inportatu / esportatu</string>
-  <string name="arrays__my_identity_key">Nire nortasunerako gakoa</string>
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">Orokorra</string>
-  <string name="preferences__sms_mms">SMS eta MMS</string>
-  <string name="preferences__pref_all_sms_title">Jaso SMS guztiak</string>
-  <string name="preferences__pref_all_mms_title">Jaso MMS guztiak</string>
-  <string name="preferences__input_settings">Sarreraren Ezarpenak</string>
-  <string name="preferences__enable_enter_key_title">Enter tekla gaitu</string>
-  <string name="preferences__replace_smiley_with_enter_key">Smiley tekla Enter teklaren bidez ordezkatu</string>
-  <string name="preferences__pref_enter_sends_title">Enter teklak bidaltzen duena</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter tekla sakatzeak testu mezuak bidaliko ditu</string>
-  <string name="preferences__display_settings">Bistaratze-ezarpenak</string>
-  <string name="preferences__choose_identity">Nortasuna aukeratu</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Hautatu zure kontaktua kontaktuen zerrendatik.</string>
-  <string name="preferences__change_passphrase">Pasahitza aldatu</string>
-  <string name="preferences__change_my_passphrase">Nire pasahitza aldatu</string>
-  <string name="preferences__enable_passphrase">Pasahitza gaitu</string>
-  <string name="preferences__screen_security">Pantailaren segurtasuna</string>
-  <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokeatu pantailazoak arestikoen zerrendan eta aplikazioaren barruan</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Ahaztu pasahitza memoriatik denbora tarte bat pasa ondoren</string>
-  <string name="preferences__timeout_passphrase">Denbora tartearen pasahitza</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Hautatu pasahitzaren iraungitze-denbora</string>
-  <string name="preferences__pref_timeout_interval_title">Iraungitzearen tartea</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Memoriatik pasahitza kentzeko itxaron behar den denbora</string>
-  <string name="preferences__notifications">Jakinarazpenak</string>
-  <string name="preferences__led_color">LED kolorea</string>
-  <string name="preferences__led_color_unknown">Ezezaguna</string>
-  <string name="preferences__pref_led_blink_title">LEDaren keinuka eredua</string>
-  <string name="preferences__pref_led_blink_custom_pattern_title">LEDaren keinuka eredu pertsonalizatu bat ezarri</string>
-  <string name="preferences__pref_led_blink_custom_pattern_on_for">Zenbat denbora piztuta:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_off_for">Zenbat denbora itzalita:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">Personalizatutako LED keinu eredua ezarrita!</string>
-  <string name="preferences__sound">Soinua</string>
-  <string name="preferences__change_notification_sound">Aldatu jakinarazpenaren soinua</string>
-  <string name="preferences__inthread_notifications">Hari barruko jakinarazpenak</string>
-  <string name="preferences__vibrate">Bibratu</string>
-  <string name="preferences__also_vibrate_when_notified">Jakinarazpena denean ere bibratu</string>
-  <string name="preferences__minutes">minutuak</string>
-  <string name="preferences__hours">orduak</string>
-  <string name="preferences__green">Berdea</string>
-  <string name="preferences__red">Gorria</string>
-  <string name="preferences__blue">Urdina</string>
-  <string name="preferences__orange">Laranja</string>
-  <string name="preferences__cyan">Cyan</string>
-  <string name="preferences__magenta">Magenta</string>
-  <string name="preferences__white">Zuria</string>
-  <string name="preferences__none">Bat ere ez</string>
-  <string name="preferences__fast">Arina</string>
-  <string name="preferences__normal">Normala</string>
-  <string name="preferences__slow">Motela</string>
-  <string name="preferences__custom">Pertsonalizatua</string>
-  <string name="preferences__advanced">Aurreratua</string>
-  <string name="preferences__advanced_mms_access_point_names">MMS eskuzko ezarpenak</string>
-  <string name="preferences__enable_manual_mms">MMS eskuzko ezarpenak erabili</string>
-  <string name="preferences__override_system_mms_settings">Jaramonik ez sistemaren MMS ezarpenei azpian dagoen informazioa erabiliz.</string>
-  <string name="preferences__sms_delivery_reports">SMS banaketaren txostenak</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Bidaltzen duzun SMS mezu bakoitzeko banaketa txosten bat eskatu</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatikoki ezabatu mezu zaharragoak behin solasaldi hari batek ezarritako luzera gainditutakoan</string>
-  <string name="preferences__delete_old_messages">Mezu zaharrak ezabatu</string>
-  <string name="preferences__conversation_length_limit">Solasaldiaren luzera muga</string>
-  <string name="preferences__trim_all_threads_now">Hari guztiak garbitu orain</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Eskaneatu solasaldien hari guztiak eta derrigortu solasaldien luzera mugak.</string>
-  <string name="preferences__light_theme">Argia</string>
-  <string name="preferences__dark_theme">Iluna</string>
-  <string name="preferences__appearance">Itxura</string>
-  <string name="preferences__theme">Gaia</string>
-  <string name="preferences__default">Lehenetsia</string>
-  <string name="preferences__language">Hizkuntza</string>
-  <string name="preferences__submit_debug_log">Arazketaren log-a bidali</string>
-  <string name="preferences__support_wifi_calling">\'\"WiFi Calling\' modu bateragarria</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <string name="contact_selection_list__menu_select_all">Denak hautatu</string>
-  <string name="contact_selection_list__menu_unselect_all">Denak ez-hautatu</string>
-  <string name="contact_selection_list__header_textsecure_users">TEXTSECURE-eko ERABILTZAILEAK</string>
-  <string name="contact_selection_list__header_other">KONTAKTU GUZTIAK</string>
-  <string name="contact_selection_list__unknown_contact">Mezu berria honi...</string>
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">Bukatua</string>
-  <!--refreshing push directory from menu-->
-  <string name="push_directory__menu_refresh">Freskatu kontaktuen zerrenda</string>
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">Deitu</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Mezuaren detaileak</string>
-  <string name="conversation_context__menu_copy_text">Testua kopiatu</string>
-  <string name="conversation_context__menu_delete_message">Mezua ezabatu</string>
-  <string name="conversation_context__menu_forward_message">Birbidali mezua</string>
-  <string name="conversation_context__menu_resend_message">Mezua berbidali</string>
-  <!--conversation_context_image-->
-  <string name="conversation_context_image__save_attachment">Eraskina gorde</string>
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__menu_start_secure_session">Saio segurua hasi</string>
-  <string name="conversation_insecure__security">Segurtasuna</string>
-  <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Hautatutakoak ezabatu</string>
-  <string name="conversation_list_batch__menu_select_all">Denak hautatu</string>
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">Bilatu</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">Segurtasuna</string>
-  <string name="conversation_secure_verified__menu_verify_identity">Nortasuna egiaztatu</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Saio segurua bukatu</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">Eranskina gehitu</string>
-  <string name="conversation__menu_update_group">Taldea eguneratu</string>
-  <string name="conversation__menu_leave_group">Taldea utzi</string>
-  <string name="conversation__menu_delete_thread">Haria ezabatu</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <string name="conversation_add_to_contacts__menu_add_to_contacts">Kontaktuetara gehitu</string>
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Hartzaileen zerrenda</string>
-  <string name="conversation_group_options__delivery">Banatu</string>
-  <string name="conversation_group_options__conversation">Solasaldia</string>
-  <string name="conversation_group_options__broadcast">Difusioa</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">Konparatu</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Eskaneatu konparatzeko</string>
-  <string name="key_scanning__menu_scan_to_compare">Eskaneatu konparatzeko</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_new_message">Mezu berria</string>
-  <string name="text_secure_normal__menu_new_group">Talde berria</string>
-  <string name="text_secure_normal__menu_settings">Ezarpenak</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Blokeatu</string>
-  <string name="text_secure_normal__mark_all_as_read">Irakurritako gisa markatu guztiak</string>
-  <!--reminder_header-->
-  <string name="reminder_header_sms_default_title">Lehenetsitako SMS aplikazio gisa erabili?</string>
-  <string name="reminder_header_sms_import_title">Sistemaren SMSa inportatu?</string>
-  <string name="reminder_header_push_title">Gaitu TextSecure mezuak?</string>
-  <!--MediaPreviewActivity-->
-  <string name="MediaPreviewActivity_you">Zu</string>
-  <string name="MediaPreviewActivity_cant_display">Ezgai irudi honen aurrebista sortzeko</string>
-  <string name="MediaPreviewActivity_unssuported_media_type">Euskarri mota ez-onartua</string>
-  <!--media_preview-->
-  <string name="media_preview__save_title">Gorde</string>
-  <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Irudiaren Aurrebista</string>
-  <!--Trimmer-->
-  <string name="trimmer__deleting_old_messages">Mezu zaharrak ezabatzen...</string>
-  <string name="trimmer__old_messages_successfully_deleted">Mezu zaharrak ondo ezabatu dira</string>
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-fa/strings.xml

@@ -36,6 +36,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">امکان یافتن برنامه‌ای برای انتخاب مدیا وجود ندارد.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">دوربین</string>
   <string name="AttachmentTypeSelectorAdapter_picture">تصویر</string>
   <string name="AttachmentTypeSelectorAdapter_video">ویدئو</string>
   <string name="AttachmentTypeSelectorAdapter_audio">صدا</string>
@@ -123,7 +124,9 @@
   <string name="CustomDefaultPreference_none">هیچ کدام</string>
   <!--DateUtils-->
   <string name="DateUtils_now">اکنون</string>
+  <string name="DateUtils_minutes_ago">%d دقیقه</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">قطع ارتباط \'%s\'؟</string>
   <string name="DeviceListActivity_try_again">دوباره تلاش کن</string>
   <string name="DeviceListActivity_network_failed">شکست خوردن در شبکه!</string>
   <!--DeviceListItem-->
@@ -255,6 +258,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">ثبت نام TextSecure با موفقیت به پایان رسید.</string>
   <string name="RegistrationService_registration_error">خطای ثبت نام</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">ثبت نام TextSecure با مشکل مواجه شده است.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">دریافت کلید خراب
 تبادل پیام!</string>
@@ -475,6 +479,7 @@
   <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>
   <string name="arrays__my_identity_key">کلید هویت من</string>
@@ -487,6 +492,12 @@
   <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__neither">نه</string>
+  <string name="arrays__images">تصویر</string>
+  <string name="arrays__audio">صدا</string>
+  <string name="arrays__video">ویدئو</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d ساعت</item>

res/values-fi/strings.xml

@@ -112,6 +112,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_unblock_question">Poista esto?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Haluatko varmasti poistaa eston tältä yhteystiedolta?</string>
   <string name="ConversationActivity_unblock">Poista esto</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Liitetiedosto ylittää kyseisen viestityypin kokorajoituikset.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Viestin tiedot</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Tyyppi: %1$s
@@ -332,6 +333,10 @@ Tarkista vielä, että tämä on varmasti numerosi! Aiomme seuraavaksi vahvistaa
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecuren rekisteröityminen onnistui.</string>
   <string name="RegistrationService_registration_error">Rekisteröitymisvirhe</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Rekisteröitymisessä ilmeni ongelma.</string>
+  <!--Slide-->
+  <string name="Slide_image">Kuva</string>
+  <string name="Slide_audio">Äänitallenne</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Vastaanotettu avaintenvaihtoviesti 
 on viallinen!</string>
@@ -715,7 +720,7 @@ epäonnistui.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä vahvistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Poista vanhimpia viestejä automaattisesti, kun keskustelu ylittää määritetyn pituusrajan</string>
   <string name="preferences__delete_old_messages">Vanhojen viestien poisto</string>
-  <string name="preferences__chats">Keskustelut ja media</string>
+  <string name="preferences__chats">Keskustelut ja liitetiedostot</string>
   <string name="preferences__conversation_length_limit">Keskustelun pituusraja</string>
   <string name="preferences__trim_all_threads_now">Karsi kaikki keskustelut nyt</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Käy läpi kaikki keskustelut ja pakota niihin pituusrajat</string>
@@ -735,11 +740,13 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ota käyttöön, jos laitteesi lähettää SMS- ja MMS-viestit WiFi-yhteyden kautta. (Ota käyttöön vain, kun \"WiFi Calling\" on käytössä laitteessasi.)</string>
   <string name="preferences_app_protection__blocked_contacts">Estetyt yhteystiedot</string>
   <string name="preferences_notifications__display_in_notifications">Ilmoituksissa näytetään</string>
-  <string name="preferences_chats__when_using_mobile_data">Mobiilitiedonsiirtoverkossa</string>
+  <string name="preferences_chats__when_using_mobile_data">Mobiiliverkossa</string>
   <string name="preferences_chats__when_using_wifi">Wi-Fi-verkossa</string>
-  <string name="preferences_chats__when_roaming">Roaming-verkossa</string>
+  <string name="preferences_chats__when_roaming">Roaming-tilassa</string>
   <string name="preferences_chats__media_auto_download">Liitetiedostojen automaattinen lataus</string>
-  <string name="preferences_chats__message_trimming">Viestien karsiminen</string>
+  <string name="preferences_chats__message_trimming">Keskustelujen karsiminen</string>
+  <string name="preferences_advanced__use_system_emoji">Käytä järjestelmän hymiöitä</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Ota TextSecuren omat hymiöt pois käytöstä</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-fr/strings.xml

@@ -332,6 +332,7 @@ cet appareil n\'est pas supporté pour la messagerie sur le canal de données. L
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">L\'inscription de TextSecure s\'est achevée avec succès.</string>
   <string name="RegistrationService_registration_error">Erreur lors de l\'enregistrement</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">L\'enregistrement de TextSecure a rencontré un problème.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Une clé corrompue a été reçue
 Message d\'échange!</string>
@@ -632,6 +633,9 @@ par SMS.</string>
   <string name="arrays__name_and_message">Nom et message</string>
   <string name="arrays__name_only">Nom seulement</string>
   <string name="arrays__neither">Aucun</string>
+  <string name="arrays__images">Images</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Vidéo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d heure</item>
@@ -716,6 +720,7 @@ par SMS.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatiquement les anciens messages lorsque la conversation dépasse un certaine taille.</string>
   <string name="preferences__delete_old_messages">Supprimer les anciens messages</string>
+  <string name="preferences__chats">Chats et médias</string>
   <string name="preferences__conversation_length_limit">Limite de taille de la conversation</string>
   <string name="preferences__trim_all_threads_now">Réduire toutes les conversations maintenant</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Parcourir toutes les conversations et appliquer la limite de taille de conversation</string>
@@ -736,6 +741,11 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activer si votre appareil délivre les SMS/MMS à l\'aide du WiFi (n\'activer que si \"WiFi Calling\" est activé sur votre appareil).</string>
   <string name="preferences_app_protection__blocked_contacts">Contacts bloqués</string>
   <string name="preferences_notifications__display_in_notifications">Afficher dans les notifications</string>
+  <string name="preferences_chats__when_using_mobile_data">Avec les donnes mobiles</string>
+  <string name="preferences_chats__when_using_wifi">Avec le WI-FI</string>
+  <string name="preferences_chats__when_roaming">Avec l’itinérance</string>
+  <string name="preferences_chats__media_auto_download">Auto-télécharger les contenus médias</string>
+  <string name="preferences_chats__message_trimming">Découpage des messages</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-hr/strings.xml

@@ -110,6 +110,7 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_unblock_question">Ukloni blokadu?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Jeste li sigurni da želite ukloniti blokadu ovog kontakta?</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>
   <!--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>
@@ -325,6 +326,10 @@ Provjerite da li je ovo vaš broj telefona! Uskoro ćemo poslati SMS poruku na n
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registracija je uspješno završena.</string>
   <string name="RegistrationService_registration_error">Greška prilikom registracije</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure registracija je naišla na problem.</string>
+  <!--Slide-->
+  <string name="Slide_image">Slika</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Primljena iskvarena poruka
 razmjene ključeva!</string>
@@ -625,6 +630,9 @@ neuspješno.</string>
   <string name="arrays__name_and_message">Ime i poruka</string>
   <string name="arrays__name_only">Samo ime</string>
   <string name="arrays__neither">Niti jedno</string>
+  <string name="arrays__images">Slike</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d sat</item>
@@ -710,6 +718,7 @@ neuspješno.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Traži potvrdu isporuke za svaki poslani SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatski obriši starije poruke nakon što razgovor pređe određenu duljinu</string>
   <string name="preferences__delete_old_messages">Obriši stare poruke</string>
+  <string name="preferences__chats">Razgovori i media</string>
   <string name="preferences__conversation_length_limit">Maksimalna duljina razgovora</string>
   <string name="preferences__trim_all_threads_now">Skrati sve teme sada</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skeniraj sve teme i primijeni maksimalnu duljinu razgovora</string>
@@ -729,6 +738,13 @@ Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Omogućite ukoliko vaš uređaj koristi SMS/MMS isporuku preko WiFi (omogućite jedino kada je \'WiFi pozivanje\' omogućeno na vašem uređaju)</string>
   <string name="preferences_app_protection__blocked_contacts">Blokirani kontakti</string>
   <string name="preferences_notifications__display_in_notifications">Prikaži u obavijestima</string>
+  <string name="preferences_chats__when_using_mobile_data">Prilikom korištenja mobilnih podataka</string>
+  <string name="preferences_chats__when_using_wifi">Prilikom korištenja Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Prilikom roaminga</string>
+  <string name="preferences_chats__media_auto_download">Automatsko preuzimanje media sadržaja</string>
+  <string name="preferences_chats__message_trimming">Skraćivanje poruke</string>
+  <string name="preferences_advanced__use_system_emoji">Koristi emotikone sustava</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Onemogući TextSecure ugrađenu podršku za emotikone</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-hu/strings.xml

@@ -115,6 +115,7 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_unblock_question">Tiltás feloldása?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Biztosan feloldod ennek a névjegynek a tiltását?</string>
   <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>
   <!--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>
@@ -339,6 +340,10 @@ Ellenőrizd újra, hogy ez a te számod! Hamarosan egy SMS-ben fogjuk ellenőriz
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">A TextSecure regisztráció sikeresen befejeződött.</string>
   <string name="RegistrationService_registration_error">Regisztráció hiba</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">A TextSecure regisztráció közben hiba merült fel.</string>
+  <!--Slide-->
+  <string name="Slide_image">Kép</string>
+  <string name="Slide_audio">Hang</string>
+  <string name="Slide_video">Videó</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Elrontott csere kulcs
 üzenet érkezett!
@@ -662,6 +667,9 @@ sikertelen.
   <string name="arrays__name_and_message">Név és üzenet</string>
   <string name="arrays__name_only">Csak név</string>
   <string name="arrays__neither">Egyik sem</string>
+  <string name="arrays__images">Képek</string>
+  <string name="arrays__audio">Hang</string>
+  <string name="arrays__video">Videó</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d óra</item>
@@ -746,6 +754,7 @@ sikertelen.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Kézbesítési jelentés kérése minden elküldött SMS esetén</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Régebbi üzenetek automatikus törlése, amikor egy beszélgetésfolyam túllép egy megadott hosszt</string>
   <string name="preferences__delete_old_messages">Régi üzenetek törlése</string>
+  <string name="preferences__chats">Csevegések és média</string>
   <string name="preferences__conversation_length_limit">Beszélgetés hosszának behatárolása</string>
   <string name="preferences__trim_all_threads_now">Minden beszélgetésfolyam csonkolása</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Minden beszélgetésfolyam átnézése és a beszélgetés határoló hossz érvényre juttatása</string>
@@ -765,6 +774,13 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <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_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>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi használatakor</string>
+  <string name="preferences_chats__when_roaming">Barangoláskor</string>
+  <string name="preferences_chats__media_auto_download">Média auto-letöltés</string>
+  <string name="preferences_chats__message_trimming">Üzenet trimmelés</string>
+  <string name="preferences_advanced__use_system_emoji">Rendszer emoji használata</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">A TextSecure beépített emoji támogatásának letiltása</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-it/strings.xml

@@ -109,6 +109,7 @@ questo contatto.</string>
   <string name="ConversationActivity_unblock_question">Sbloccare?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Vuoi davvero sbloccare questo contatto?</string>
   <string name="ConversationActivity_unblock">Sblocca</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">L\'allegato che stai cercando di inviare supera le dimensioni consentite</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Dettagli messaggio</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Trasporto: %1$s\nInviato/Ricevuto: %2$s</string>
@@ -326,6 +327,10 @@ Assicurati che questo sia il tuo numero! Stiamo per verificarlo con un SMS.</str
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">La registrazione di TextSecure è stata competata con successo.</string>
   <string name="RegistrationService_registration_error">Errore nella registrazione</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Si è verificato un problema durante la registrazione a TextSecure.</string>
+  <!--Slide-->
+  <string name="Slide_image">Immagini</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ricevuta una chiave corrotta
 scambia un altro messaggio!
@@ -748,6 +753,13 @@ Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Abilitare se il tuo device spedisce gli SMM/MMS  via WiFi ( abilita solo quando \"WiFi Calling\" è abilitato per il tuo dispositivo )</string>
   <string name="preferences_app_protection__blocked_contacts">Contatti bloccati</string>
   <string name="preferences_notifications__display_in_notifications">Visualizza nelle notifiche</string>
+  <string name="preferences_chats__when_using_mobile_data">Su rete cellulare</string>
+  <string name="preferences_chats__when_using_wifi">Su Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">In roaming</string>
+  <string name="preferences_chats__media_auto_download">Download automatico file</string>
+  <string name="preferences_chats__message_trimming">Cancellazione messaggi</string>
+  <string name="preferences_advanced__use_system_emoji">Usa le emoji di sistema</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Disattiva le emoji di TextSecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-iw/strings.xml

@@ -1,331 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">כן</string>
-  <string name="no">לא</string>
-  <string name="delete">מחק</string>
-  <string name="please_wait">המתן בבקשה...</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">עכשיו: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">עדיין לא הגדרת סיסמה!</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">למחוק את כל ההודעות הישנות עכשיו?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">אתה בטוח שברצונך לקצץ מיד את כל שרשורי השיחות עד להודעות ה-%s הכי חדשות?</string>
-  <string name="ApplicationPreferencesActivity_delete">מחק</string>
-  <string name="ApplicationPreferencesActivity_disable">בטל</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">אירעה שגיאה בחיבור לשרת!</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">תמונה</string>
-  <string name="AttachmentTypeSelectorAdapter_video">וידאו</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">שמע</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ייתכן שתרצה לאמת
-את איש הקשר הזה.
-</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">גודל ההודעה: %d KB</string>
-  <string name="ConversationItem_expires_s">פג: %s</string>
-  <string name="ConversationItem_view_secure_media_question">לצפות במדיה מאובטחת?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">שגיאה, התקבלה הודעת החלפת מפתח מיושנת.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">התקבלה הודעת החלפת מפתח, לחץ כדי להמשיך</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">להתחיל חיבור מאובטח עם %s?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">אתה בטוח שאתה רוצה למחוק את השיחה הזאת לתמיד?</string>
-  <string name="ConversationActivity_add_attachment">צרף קובץ</string>
-  <string name="ConversationActivity_select_contact_info">בחר מידע של איש קשר</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">סליחה, הייתה שגיאה בהצבת הקובץ המצורף שלך.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">הנמען אינו SMS או אימייל חוקיים!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">ההודעה ריקה!</string>
-  <string name="ConversationActivity_invalid_recipient">נמען שגוי!</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">נראה כי מכשיר זה אינו תומך בפעולות חיוג.</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">פרטי הודעה</string>
-  <string name="ConversationFragment_success_exclamation">הצליח!</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">למחוק שרשורים?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">אתה בטוח שאתה רוצה למחוק את השרשורים של כל השיחות שנבחרו?</string>
-  <string name="ConversationListFragment_deleting">מוחק</string>
-  <string name="ConversationListFragment_deleting_selected_threads">מוחק שרשורים שנבחרו...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">הודעת החלפת מפתח...</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">יצא</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">אזהרה, פעולה זו
-תייצא את תוכן הודעות ה-TextSecure שלך לכרטיס ה-SD ללא הצפנה.
-</string>
-  <string name="ExportFragment_cancel">בטל</string>
-  <string name="ExportFragment_exporting">מייצא</string>
-  <string name="ExportFragment_success">הצליח!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">יבא</string>
-  <string name="ImportExportActivity_export">יצא</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">פעולה זו תייבא
-הודעות מבסיס הנתונים של ה-SMS ברירת המחדל של המערכת ל-TextSecure.
- אם כבר ייבאת מבסיס נתונים זה, ייבוא מחדש יגרום להודעות כפולות.</string>
-  <string name="ImportFragment_import">יבא</string>
-  <string name="ImportFragment_cancel">בטל</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-שחזור גיבוי מוצפן יחליף לגמרי את המפתחות, ההגדרות וההודעות הקיימות.
-אתה 
-תאבד את כל המידע שבהתקנת ה-TextSecure הנוכחית שלך אבל לא שבגיבוי.
-</string>
-  <string name="ImportFragment_restore">שחזר</string>
-  <string name="ImportFragment_importing">מייבא</string>
-  <string name="ImportFragment_no_plaintext_backup_found">לא נמצא גיבוי לא מוצפן!</string>
-  <string name="ImportFragment_error_importing_backup">שגיאה בייבוא הגיבוי!</string>
-  <string name="ImportFragment_import_complete">הייבוא הסתיים!</string>
-  <string name="ImportFragment_restoring">משחזר</string>
-  <string name="ImportFragment_restoring_encrypted_backup">משחזר גיבוי מוצפן...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">לא נמצא גיבוי מוצפן!</string>
-  <string name="ImportFragment_restore_complete">השחזור הסתיים!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">לא נמצא מפתח סרוק!</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">שגיאה באחסון ה-MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">שגיאה בהתחברות לספק ה-MMS...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">שגיאה בקריאת הגדרות ה-MMS של ספק השירות...</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">סיסמה ישנה לא נכונה.</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_continue">המשך</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <!--RegistrationService-->
-  <!--SmsMessageRecord-->
-  <!--ThreadRecord-->
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">אין לך מפתח זהות.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">לנמען אין מפתח זהות.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">לנמען אין מפתח זהות!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">סרוק את המפתח שלהם כדי להשוות</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">סרוק את המפתח שלי</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">אזהרה, המפתח שנסרק אינו זהה! בבקשה בדוק בזהירות את הטקסט של טביעת האצבע.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">לא מאומת!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">המפתח שלהם נכון. זה הכרחי גם לאמת את המפתח שלך איתם.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">אומת!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">אין לך מפתח זהות!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">אין לך מפתח זהות.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">סרוק להשוואה</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">עבור סריקה להשוואה</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">אזהרה המפתח שנסרק אינו תואם!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">המפתח שנסרק מתאים!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">אומת!</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">אתה כבר שלחת בקשת אתחול חיבור לנמען הזה, אתה בטוח שאתה רוצה לשלוח עוד אחד? זה יבטל את הבקשה הראשונה.</string>
-  <string name="KeyExchangeInitiator_send">שלח</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">הודעה מוצפנת פגומה...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">מפענח, אנא המתן...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">ההודעה הוצפנה לחיבור שאינו קיים...</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">מתחבר לשרת ה-MMS...</string>
-  <string name="MmsDatabase_downloading_mms">מוריד MMS...</string>
-  <string name="MmsDatabase_downloading">מוריד...</string>
-  <string name="MmsDatabase_mms_pending_download">גע להגדרת תצורת ה-MMS ולהמשך הורדה.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">מפענח MMS, אנא המתן...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">הודעת MMS מוצפנת פגומה...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">הודעת ה-MMS הוצפנה לחיבור שלא קיים...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">בתהליך ייבוא</string>
-  <!--KeyCachingService-->
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">מסירת ההודעה נכשלה.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">כישלון במסירת ההודעה.</string>
-  <string name="MessageNotifier_error_delivering_message">שגיאה במסירת ההודעה.</string>
-  <string name="MessageNotifier_mark_all_as_read">סמן הכל כנקרא</string>
-  <!--QuickResponseService-->
-  <!--SingleRecipientNotificationBuilder-->
-  <!--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-->
-  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">אין אנשי קשר.</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">בחר עבור</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">אין שיחות אחרונות.</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">שלח</string>
-  <string name="conversation_activity__remove">הסר</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">הורד</string>
-  <string name="conversation_item_sent__downloading">מוריד</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">הורד</string>
-  <string name="conversation_item_received__downloading">מוריד</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__search">חפש</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">אתה רוצה לייבא את הודעות הטקסט הקיימות שלך לבסיס הנתונים המוצפן של TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">בסיס הנתונים ברירת המחדל של המערכת לא ישתנה בשום אופן.</string>
-  <string name="database_migration_activity__skip">דלג</string>
-  <string name="database_migration_activity__import">יבא</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">זה יכול לקחת כמה רגעים. סבלנות בבקשה, אנחנו נודיע לך כשהייבוא הושלם.</string>
-  <string name="database_migration_activity__importing">מייבא</string>
-  <!--database_upgrade_activity-->
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-יצא גיבוי לא מוצפן שתואם את האפליקציה \'SMSBackup And Restore\' לכרטיס ה-SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">יבא את בסיס הנתונים
-מאפליקציית ברירת המחדל של המערכת.
-</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
-שחזר גיבוי מוצפן של TextSecure שיוצא בעבר.
-</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">
-יבא קובץ גיבוי לא מוצפן. תואם \'SMSBackup And Restore\'.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">נדרשות הגדרות MMS ידניות עבור מכשירך.</string>
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">פתח</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure דורש הגדרות MMS כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות דרך ספק השירות שלך. המכשיר שלך לא מספק את המידע הזה, זה קורה לעיתים במכשירים נעולים או קונפיגורציות מוגבלות אחרות.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות,לחץ \'אישור\' והשלם את ההגדרות המתבקשות.את הגדרות ה-MMS עבור ספק השירות שלך אתה יכול למצוא בד\"כ ע\"י חיפוש \"ספק השרות APN\". אתה תצטרך להשלים מידע זה רק פעם אחת.</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <!--registration_problems-->
-  <!--registration_progress_activity-->
-  <!--recipients_panel-->
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">הזהות שלהם (הם קוראים):</string>
-  <string name="verify_identity_activity__your_identity_you_read">הזהות שלך (אתה קורא):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">שנה סיסמה</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">כללי</string>
-  <string name="preferences__input_settings">הכנס הגדרות</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">בחר איש קשר מאנשי הקשר.</string>
-  <string name="preferences__change_passphrase">שנה סיסמה</string>
-  <string name="preferences__change_my_passphrase">שנה סיסמה</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">שכח את הסיסמה מהזיכרון לאחר זמן מסויים </string>
-  <string name="preferences__timeout_passphrase">זמן תוקף לסיסמה</string>
-  <string name="preferences__pref_timeout_interval_title">זמן התוקף</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">פרק הזמן שיש להמתין לפני שכיחת הסיסמה מהזיכרון</string>
-  <string name="preferences__notifications">התראות</string>
-  <string name="preferences__led_color">צבע LED</string>
-  <string name="preferences__pref_led_blink_title">תבנית הבהוב ה- LED</string>
-  <string name="preferences__sound">קול</string>
-  <string name="preferences__inthread_notifications">התראות תוך-שרשוריות</string>
-  <string name="preferences__vibrate">רטט</string>
-  <string name="preferences__also_vibrate_when_notified">הפעל רטט בקבלת התראה</string>
-  <string name="preferences__minutes">דקות</string>
-  <string name="preferences__hours">שעות</string>
-  <string name="preferences__green">ירוק</string>
-  <string name="preferences__red">אדום</string>
-  <string name="preferences__blue">כחול</string>
-  <string name="preferences__orange">כתום</string>
-  <string name="preferences__cyan">ציאן</string>
-  <string name="preferences__magenta">מגנטה</string>
-  <string name="preferences__fast">מהיר</string>
-  <string name="preferences__normal">רגיל</string>
-  <string name="preferences__slow">איטי</string>
-  <string name="preferences__custom">מותאם אישית</string>
-  <string name="preferences__advanced">מתקדם</string>
-  <string name="preferences__override_system_mms_settings">החלף את הגדרות ה-MMS של המערכת עם המידע הבא.</string>
-  <string name="preferences__sms_delivery_reports">דוחות מסירה של SMS</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">בקש דוח מסירה לכל SMS שאתה שולח</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">מחק אוטומטית הודעות ישנות יותר כששרשור השיחה עולה על אורך מסויים</string>
-  <string name="preferences__delete_old_messages">מחק הודעות ישנות</string>
-  <string name="preferences__conversation_length_limit">הגבלת אורך שיחה</string>
-  <string name="preferences__trim_all_threads_now">קצץ את כל השרשורים כעת</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">סרוק את כל השרשורים ואכוף את הגבלות אורך השיחה</string>
-  <string name="preferences__appearance">מראה</string>
-  <string name="preferences__theme">ערכת נושא</string>
-  <string name="preferences__default">ברירת מחדל</string>
-  <string name="preferences__language">שפה</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">הושלם</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">התקשר</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">פרטי הודעה</string>
-  <string name="conversation_context__menu_copy_text">העתק טקסט</string>
-  <string name="conversation_context__menu_delete_message">מחק הודעה</string>
-  <string name="conversation_context__menu_forward_message">העבר הודעה</string>
-  <string name="conversation_context__menu_resend_message">שלח הודעה מחדש</string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">אבטחה</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">חפש</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">אבטחה</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">צרף קובץ</string>
-  <string name="conversation__menu_delete_thread">מחק שרשור</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">רשימת נמענים</string>
-  <string name="conversation_group_options__delivery">מסירה</string>
-  <string name="conversation_group_options__conversation">שיחה</string>
-  <string name="conversation_group_options__broadcast">שידור</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">השווה</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">עבור סריקה להשוואה</string>
-  <string name="key_scanning__menu_scan_to_compare">סרוק להשוואה</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">הגדרות</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-ja/strings.xml

@@ -318,6 +318,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure登録が正常に完了しました。</string>
   <string name="RegistrationService_registration_error">登録エラー</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure登録中にエラーが発生しました。</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">無効な鍵交換メッセージを受信しました。</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -608,6 +609,9 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="arrays__name_and_message">名前とメッセージ</string>
   <string name="arrays__name_only">名前のみ</string>
   <string name="arrays__neither">もしくは</string>
+  <string name="arrays__images">画像</string>
+  <string name="arrays__audio">音声</string>
+  <string name="arrays__video">動画</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d 時間</item>
@@ -692,6 +696,7 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">送信する全てのSMSに配信報告をつけます</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">会話スレッドが一定の長さを超えると、古いメッセージが自動的に削除されます</string>
   <string name="preferences__delete_old_messages">古いメッセージの削除</string>
+  <string name="preferences__chats">チャットとメディア</string>
   <string name="preferences__conversation_length_limit">会話の最大の長さ</string>
   <string name="preferences__trim_all_threads_now">全スレッドを今、トリムする</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">すべての会話スレッドをスキャンして、会話の長さの制限を強制します</string>
@@ -712,6 +717,11 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">あなたのデバイスでSMS/MMSの配送をWi-Fi(Wi-Fi Callingが有効にできるデバイスで有効にしある時のみ)上で行うのを有効にする</string>
   <string name="preferences_app_protection__blocked_contacts">ブロックした連絡先</string>
   <string name="preferences_notifications__display_in_notifications">画面に通知を表示</string>
+  <string name="preferences_chats__when_using_mobile_data">モバイルデータ通信利用時</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi利用時</string>
+  <string name="preferences_chats__when_roaming">ローミング時</string>
+  <string name="preferences_chats__media_auto_download">メディアの自動ダウンロード</string>
+  <string name="preferences_chats__message_trimming">メッセージの要約</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-kn-rIN/strings.xml

@@ -290,6 +290,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ನ ನೋಂದಣಿ ಯಶಸ್ವಿಯಾಗಿ ಮುಕ್ತಾಯಗೊಂಡಿದೆ.</string>
   <string name="RegistrationService_registration_error">ನೋಂದಣಿ ದೋಷ</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ಗೆ ನೋಂದಾಯಿಸುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">ಭ್ರಷ್ಟಗೊಂಡಿದೆ ಕೀಲಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 ವಿನಿಮಯ ಸಂದೇಶ!</string>

res/values-ko/strings.xml

@@ -105,6 +105,7 @@
   <string name="ConversationActivity_unblock_question">사용자를 차단 해제하시겠습니까?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">이 사용자를 차단 해제하시겠습니까?</string>
   <string name="ConversationActivity_unblock">차단 해제</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">첨부파일 크기 제한 초과됨</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">메시지 세부정보</string>
   <string name="ConversationFragment_transport_s_sent_received_s">전송: %1$s\n송수신: %2$s</string>
@@ -305,6 +306,10 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure 가입이 완료되었습니다.</string>
   <string name="RegistrationService_registration_error">가입 오류</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure 가입에 문제가 발생했습니다.</string>
+  <!--Slide-->
+  <string name="Slide_image">이미지</string>
+  <string name="Slide_audio">오디오</string>
+  <string name="Slide_video">동영상</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">받은 키 교환 메시지가 손상되었습니다.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">받은 키 교환 메시지에 프로토콜 버전이 잘못되었습니다.</string>
@@ -681,6 +686,13 @@
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">\'Wi-Fi 통화\' 사용 과 SMS/MMS Wi-Fi로 전송 설정되면 사용</string>
   <string name="preferences_app_protection__blocked_contacts">차단된 사용자</string>
   <string name="preferences_notifications__display_in_notifications">알림에 표시</string>
+  <string name="preferences_chats__when_using_mobile_data">모바일 데이터 사용할 때</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi 사용할 때</string>
+  <string name="preferences_chats__when_roaming">로밍할 때</string>
+  <string name="preferences_chats__media_auto_download">미디어 자동 다운로드</string>
+  <string name="preferences_chats__message_trimming">대화 줄이기</string>
+  <string name="preferences_advanced__use_system_emoji">시스템 이모티콘 사용</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">TextSecure 이모티콘 사용 중지</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-mk/strings.xml

@@ -309,6 +309,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure регистрацијата е успешно завршена.</string>
   <string name="RegistrationService_registration_error">Грешка при регистрацијата</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure регистрацијата наиде на проблем.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Примена е погрешна порака
 за размена на клучеви!</string>

res/values-my/strings.xml

@@ -1,265 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">ဟုတ်ကဲ့</string>
-  <string name="no">မလုပ်ပါ</string>
-  <string name="delete">ဖျက်ရန်</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">လက်ရှိ: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">စကားဝှက်မသတ်မှတ်ရသေးပါ</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">စာတိုအဟောင်းများအားလံုးဖျက်မည်လား</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">စကားဝိုင်း၊ စကားတွဲများအားလုံးကို လတ်တလော စာသား %s ခုသာ သိမ်းထား၍ အခြားစာသားများကို ဖျက်မှာ သေချာရဲ့လား</string>
-  <string name="ApplicationPreferencesActivity_delete">ဖျက်ရန်</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">ပုံ</string>
-  <string name="AttachmentTypeSelectorAdapter_video">ဗွီဒီယို</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">အသံ</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">စာတိုအရွယ်အစား: %d KB</string>
-  <string name="ConversationItem_expires_s">သက်တမ်းကုန်: %s</string>
-  <string name="ConversationItem_view_secure_media_question">လံုခြုံသောမီဒီယာကိုကြည့်မည်လား</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">ပြဿနာ၊ ရရှိလာတဲ့ ကီးအလဲအလှယ်စာသား လွဲနေပါသည်။</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">%s ဖြင့်လံုခြုံသောဆက်ရှင်အစပြုမည်လား?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">စကားစမြည်ပြောထားခြင်းကို အပြီးဖျက်မှာသေချာပြီလား</string>
-  <string name="ConversationActivity_add_attachment">ပူးတွဲမှုအားပေါင်းထည့်</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">ပူးတွဲပါဖိုင်တွင် ဆက်တင်အမှားရှိ.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">လက်ခံသူသည်　မှန်ကန်သော SMS(သို့)အီးမေးလိပ်စာ　မဟုတ်</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">စာတိုမရှိ</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
-  <string name="ConversationFragment_success_exclamation">အောင်မြင်!</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">စကားဝိုင်းကိုဖျက်မည်လား</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">စကားဝိုင်းတွင်စကားစမည်ပြောထားသည်များကိုဖျက်မည်မှာသေချာပြီလား</string>
-  <string name="ConversationListFragment_deleting">ဖျက်နေသည်</string>
-  <string name="ConversationListFragment_deleting_selected_threads">ရွေးချယ်ထားသောစကားဝိုင်းကိုဖျက်နေသည်...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">ထုတ်ယူ</string>
-  <string name="ExportFragment_success">အောင်မြင်!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">သွင်းယူ</string>
-  <string name="ImportExportActivity_export">ထုတ်ယူ</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_import">သွင်းယူ</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">စိစစ်ထားသောကီးရှာမတွေ့</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">MMS အားသိမ်းဆည်းခြင်းအမှား</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">MMS ထောက်ပံ့သူသို့ဆက်သွယ်ခြင်းအမှား...</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">စကားဝှက်အဟောင်းမမှန်ကန်</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_continue">ရှေ့ဆက်</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <!--RegistrationService-->
-  <!--SmsMessageRecord-->
-  <!--ThreadRecord-->
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">လက်ခံသူတွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">လက်ခံသူ၌အသိအမှတ်ပြုကီးမရှိ</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">၎င်းတို့၏　ကီးများကို　နှိုင်းယှဉ်ရန်　စစ်ဆေးပါ</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">ကီးကိုစစ်ဆေးပြီးရယူရန်</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">သတိပေးချက်၊　စစ်ဆေးလိုက်သောကီးသည်　တူညီမှုမရှိ၊　ကျေးဇူးပြု၍　လက်ဗွေစာသားကို　ဂရုတစိုက်စစ်ပါ</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">မစိစစ်ရသေး</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">၎င်းတို့ကီးမှန်ကန်၊ ၎င်းတို့ကဲ့သို့　သင့်ကီးအား　အတည်ပြုစိစစ်ရန်　လိုအပ်</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">သင့်မှာ　အသိအမှတ်ပြုကီးမရှိ</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
-  <string name="ViewIdentityActivity_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">သတိပေးချက်၊ ဖတ်ထားသည့် ကီးများ မကိုက်ညီပါ။</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">ဖတ်ထားသည့်ကီးများ ကိုက်ပါသည်။</string>
-  <string name="ViewIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">ဒီအဆက်အသွယ်ထံ ဆက်ရှင်စရန် တောင်းဆိုချက် ပို့ထားပြီးသားဖြစ်သည်။ ထပ်မံပို့မှာ သေချာလား။ ထပ်ပို့ပါက ယခင်ပို့ထားသော တောင်းဆိုချက်ကို ပယ်ဖျက်မည်ဖြစ်သည်</string>
-  <string name="KeyExchangeInitiator_send">ပို့</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">ဝှက်သိမ်းမှုလွဲမှားနေသောစာသား...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">ဝှက်စာအားဖေါ်နေသည်၊ ခေတ္တစောင့်ပါ...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">စာသားများကို နဂိုမရှိသောဆက်ရှင်မားအတွက် ဝှက်သိမ်းထားပါသည်...</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">MMS　ဆာဗာသို့ချိတ်ဆက်နေသည်...</string>
-  <string name="MmsDatabase_downloading_mms">MMS အားကူးဆွဲနေသည်...</string>
-  <string name="MmsDatabase_downloading">ကူးဆွဲနေသည်...</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSမှဝှက်စာ ဖော်နေသည်၊ ခေတ္တစောင့်ပါ...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">ဝှက်ထားမှုလွဲနေသော MMS စာသား....</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS စာသားများကို နဂိုမရှိသောဆက်ရှင်အတွက် ဝှက်သိမ်းလိုက်ပါသည်...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">သွင်းယူနေ</string>
-  <!--KeyCachingService-->
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">အကြောင်းကြားချက်ပို့လွတ်ခြင်းမအောင်မြင်</string>
-  <string name="MessageNotifier_failed_to_deliver_message">အကြောင်းကြားချက်ပို့လွတ်ရန်မအောင်မြင်</string>
-  <string name="MessageNotifier_error_delivering_message">အကြောင်းကြားချက်ပို့လွတ်စဉ်အမှား</string>
-  <!--QuickResponseService-->
-  <!--SingleRecipientNotificationBuilder-->
-  <!--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-->
-  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">အဆက်အသွယ်မရှိ</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">အတွက်　ရွေးချယ်ပါ</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">မကြာသေးမှီကခေါ်ဆိုထားမှုများမရှိ</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">ပို့</string>
-  <string name="conversation_activity__remove">ဖယ်ပစ်</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">ကူးဆွဲ</string>
-  <string name="conversation_item_sent__downloading">ကူးဆွဲနေသည်</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">ကူးဆွဲ</string>
-  <string name="conversation_item_received__downloading">ကူးဆွဲနေသည်</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__search">ရှာရန်</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">အသင်၏ ရှိရင်းစွဲ စာသားများကို Textsecure၏ ဝှက်သိမ်းထားသော ဒေတာဘေ့စ်ထဲသို့ တင်သွင်းမည်လား။</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">စနစ်ပိုင်းဆိုင်ရာ နဂိုဒေတာဘေ့စ်ကို ပြောင်းလဲမည် မဟုတ်ပါ</string>
-  <string name="database_migration_activity__skip">ကျော်</string>
-  <string name="database_migration_activity__import">သွင်းယူ</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">ခေတ္တကြာပါလိမ့်မယ်။ တင်သွင်းမှု ပြီးဆုံးသွားရင် အကြောင်းကြားပေးပါမယ်။</string>
-  <string name="database_migration_activity__importing">သွင်းယူနေ</string>
-  <!--database_upgrade_activity-->
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
-  <!--prompt_mms_activity-->
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <!--registration_problems-->
-  <!--registration_progress_activity-->
-  <!--recipients_panel-->
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">သူများ အိုင်ဒီ (သူများ အမြင်) - </string>
-  <string name="verify_identity_activity__your_identity_you_read">အသင့်အိုင်ဒီ (အသင့်အမြင်) - </string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__input_settings">ကီးဘုတ်ပုံစံသတ်မှတ်ချက်များ</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">အဆက်အသွယ်ကို အဆက်အသွယ်စာရင်းမှ ရွေးယူပါ</string>
-  <string name="preferences__change_my_passphrase">ကျွန်ုပ်စကားဝှက်ကိုပြောင်းပါ</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">အချိန်တစ်ခုကြာပြီးနောက်မန်မိုရီပေါ်မှဝှက်စာကိုမေ့ပစ်ပါ</string>
-  <string name="preferences__timeout_passphrase">စကားဝှက် အချိန်လွန်</string>
-  <string name="preferences__pref_timeout_interval_title">ကြားချိန်</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">မန်မိုရီပေါ်မှစကားဝှက်ပျောက်မသွားခင်စောင့်ရမည့်ကြာချိန်</string>
-  <string name="preferences__notifications">အသိပေးချက်များ</string>
-  <string name="preferences__vibrate">တုန်ခါမှု</string>
-  <string name="preferences__also_vibrate_when_notified">အချက်ပြစဉ်တုန်ခါပါ</string>
-  <string name="preferences__minutes">မိနစ်</string>
-  <string name="preferences__hours">နာရီ</string>
-  <string name="preferences__green">အစိမ်း</string>
-  <string name="preferences__red">အနီ</string>
-  <string name="preferences__blue">အပြာ</string>
-  <string name="preferences__orange">လိမ္မော်</string>
-  <string name="preferences__cyan">ခရမ်း</string>
-  <string name="preferences__magenta">ခရမ်းရင့်</string>
-  <string name="preferences__fast">အမြန်</string>
-  <string name="preferences__normal">ပုံမှန်</string>
-  <string name="preferences__slow">အနှေး</string>
-  <string name="preferences__custom">စိတ်ကြိုက်</string>
-  <string name="preferences__sms_delivery_reports">SMS ပို့ပြီးကြောင်းအသိပေးခြင်း</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">SMS တစ်ခုပို့ပြီးတိုင်း ပို့ပြီးကြောင်း အသိပေးပါ</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">သတ်မှတ်အရေအတွက်ထက်ကျော်လွန်ပါက စာတိုအဟောင်းများကို အလိုလျှောက်ဖျတ်ပါ</string>
-  <string name="preferences__delete_old_messages">စာတိုအဟောင်းများကိုဖျတ်ပါ</string>
-  <string name="preferences__conversation_length_limit">စာလုံးရေအကန့်အသတ်</string>
-  <string name="preferences__trim_all_threads_now">စာတွဲများအာလုံး တိပစ်ပါ</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">အကြောင်းအရာများအားလုံးကိုစစ်ဆေး၍စကားလုံးအရေအတွက်ကိုကန့်သတ်ပါ</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">ပြီးပါပြီ</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">ခေါ်ရန်</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
-  <string name="conversation_context__menu_copy_text">စာသားကူးရန်</string>
-  <string name="conversation_context__menu_delete_message">စာတိုဖျက်ရန်</string>
-  <string name="conversation_context__menu_forward_message">စာတိုဆက်ပို့ရန်</string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">လုံခြုံရေး</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">ရှာရန်</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">လုံခြုံရေး</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">ပူးတွဲမှုအားပေါင်းထည့်</string>
-  <string name="conversation__menu_delete_thread">စာတွဲကိုဖျက်ပါ</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">လက်ခံမည့်သူစာရင်း</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">နှိုင်းယှဉ်</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
-  <string name="key_scanning__menu_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">ဆက်တင်</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-nl/strings.xml

@@ -109,6 +109,7 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <string name="ConversationActivity_unblock_question">Ontblokken?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Weet je zeker dat je dit contact wilt ontblokken?</string>
   <string name="ConversationActivity_unblock">Ontblokken</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Bijlage overschrijdt de maximale grootte voor het type bericht dat je wilt versturen.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Berichtdetails</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Overdracht: %1$s\nVerzonden/Ontvangen: %2$s</string>
@@ -317,6 +318,10 @@ ingevoerd (%s) is ongeldig.</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registratie bij TextSecure is succesvol afgerond.</string>
   <string name="RegistrationService_registration_error">Registratiefout</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Registratie bij TextSecure is mislukt.</string>
+  <!--Slide-->
+  <string name="Slide_image">Afbeelding</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Misvormd sleuteluitwisselingsbericht
 ontvangen!</string>
@@ -722,6 +727,13 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Inschakelen als je toestel SMS/MMS over WiFi gebruikt (alleen inschakelen als \'WiFi Bellen\' is ingeschakeld op je toestel)</string>
   <string name="preferences_app_protection__blocked_contacts">Geblokkeerde contacten</string>
   <string name="preferences_notifications__display_in_notifications">Toon in notificaties</string>
+  <string name="preferences_chats__when_using_mobile_data">Wanneer mobiele gegevensoverdracht gebruikt wordt</string>
+  <string name="preferences_chats__when_using_wifi">Wanneer Wi-Fi gebruikt wordt</string>
+  <string name="preferences_chats__when_roaming">Bij roaming</string>
+  <string name="preferences_chats__media_auto_download">Media automatisch downloaden</string>
+  <string name="preferences_chats__message_trimming">Bericht inkorten</string>
+  <string name="preferences_advanced__use_system_emoji">Gebruik systeem emoji</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">TextSecure\'s ingebouwde emoji ondersteuning uitschakelen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-no/strings.xml

@@ -109,6 +109,7 @@ denne kontakten.</string>
   <string name="ConversationActivity_unblock_question">Opphev blokkering?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Er du sikker på at du ønsker å oppheve blokkeringen av denne kontakten?</string>
   <string name="ConversationActivity_unblock">Opphev blokkering</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Vedlegget overstiger størrelsesbegrensningen for den typen melding du sender.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meldingsdetaljer</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSendt/Mottatt: %2$s</string>
@@ -317,6 +318,10 @@ Dobbelsjekk at dette er nummeret ditt! Vi er i ferd med å verifisere det med en
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registreringen er fullført.</string>
   <string name="RegistrationService_registration_error">Registreringsfeil</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Det oppstod en feil under registeringen til TextSecure.</string>
+  <!--Slide-->
+  <string name="Slide_image">Bilde</string>
+  <string name="Slide_audio">Lyd</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Mottok korrupt nøkkelutvekslingsmelding!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -716,6 +721,13 @@ Gratis og private meldinger til TextSecure- og Signal-brukere
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktiver dersom enheten din bruker WiFi for å sende SMS/MMS (brukes bare hvis \'WiFi anrop\' er aktivert på enheten din)</string>
   <string name="preferences_app_protection__blocked_contacts">Blokkerte kontakter</string>
   <string name="preferences_notifications__display_in_notifications">Vis i varslingslisten</string>
+  <string name="preferences_chats__when_using_mobile_data">Ved bruk av mobil data</string>
+  <string name="preferences_chats__when_using_wifi">Ved bruk av Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Ved roaming</string>
+  <string name="preferences_chats__media_auto_download">Media auto-download</string>
+  <string name="preferences_chats__message_trimming">Meldingsavkorting</string>
+  <string name="preferences_advanced__use_system_emoji">Bruk systemets smilefjes</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Deaktiver TextSecures innebygde støtte for smilefjes</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-pl/strings.xml

@@ -111,6 +111,7 @@ ten kontakt.
   <string name="ConversationActivity_unblock_question">Odblokować?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Czy jesteś pewny, że chcesz odblokować ten kontakt?</string>
   <string name="ConversationActivity_unblock">Odblokuj</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Rozmiar tego załącznika przekracza limit wiadomości.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Szczegóły wiadomości</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nWysłano/Otrzymano: %2$s</string>
@@ -320,6 +321,10 @@ Upewnij się, że to jest Twój numer! Zamierzamy zweryfikować go SMSem.
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Rejestracja TextSecure została pomyślnie zakończona.</string>
   <string name="RegistrationService_registration_error">Błąd rejestracji</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Rejestracja TextSecure napotkała problem.</string>
+  <!--Slide-->
+  <string name="Slide_image">Obraz</string>
+  <string name="Slide_audio">Audio</string>
+  <string name="Slide_video">Wideo</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Otrzymano uszkodzony klucz!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
@@ -715,6 +720,13 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</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>
   <string name="preferences_app_protection__blocked_contacts">Zablokowane kontakty</string>
   <string name="preferences_notifications__display_in_notifications">Pokaż w powiadomieniach</string>
+  <string name="preferences_chats__when_using_mobile_data">Podczas używania Danych Mobilnych</string>
+  <string name="preferences_chats__when_using_wifi">Podczas używania Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Podczas roamingu</string>
+  <string name="preferences_chats__media_auto_download">Auto-pobieranie plików mediów</string>
+  <string name="preferences_chats__message_trimming">Przycinanie wiadomości</string>
+  <string name="preferences_advanced__use_system_emoji">Używaj emoji systemu</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Wyłącz wbudowane wspomaganie emoji TextSecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-pt-rBR/strings.xml

@@ -117,6 +117,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationActivity_unblock_question">Desbloquear?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Tem certeza que deseja desbloquear este contato?</string>
   <string name="ConversationActivity_unblock">Desbloquear</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">O anexo excede os limites de tamanho para o tipo de mensagem sendo enviada.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviadas/Recebidas: %2$s</string>
@@ -343,6 +344,10 @@ Tem certeza que deseja fazer isto?</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">O cadastro em TextSecure foi completado com sucesso.</string>
   <string name="RegistrationService_registration_error">Erro de cadastro</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">O cadastro em TextSecure encontrou um problema.</string>
+  <!--Slide-->
+  <string name="Slide_image">Imagem</string>
+  <string name="Slide_audio">Áudio</string>
+  <string name="Slide_video">Vídeo</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Recebida mensagem de troca
         de chaves corrompida!
@@ -661,6 +666,9 @@ falhou.</string>
   <string name="arrays__name_and_message">Nome e mensagem</string>
   <string name="arrays__name_only">Apenas nome</string>
   <string name="arrays__neither">Nenhum</string>
+  <string name="arrays__images">Imagens</string>
+  <string name="arrays__audio">Áudio</string>
+  <string name="arrays__video">Vídeo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -745,6 +753,7 @@ falhou.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente excluir mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
   <string name="preferences__delete_old_messages">Excluir mensagens antigas</string>
+  <string name="preferences__chats">Chats e mídia</string>
   <string name="preferences__conversation_length_limit">Tamanho máximo de conversa</string>
   <string name="preferences__trim_all_threads_now">Apagar todas conversas agora</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verificar todas conversas e aplicar tamanho máximo de conversa</string>
@@ -765,6 +774,13 @@ falhou.</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Habilite se o seu dispositivo usa entrega de SMS/MMS via WiFi (somente habilite quando \'WiFi Calling\' estiver habilitado no seu dispositivo)</string>
   <string name="preferences_app_protection__blocked_contacts">Contatos bloqueados</string>
   <string name="preferences_notifications__display_in_notifications">Exibir em notificações</string>
+  <string name="preferences_chats__when_using_mobile_data">Quando usar dados móveis</string>
+  <string name="preferences_chats__when_using_wifi">Quando usar Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Quando em roaming</string>
+  <string name="preferences_chats__media_auto_download">Download automático de mídia</string>
+  <string name="preferences_chats__message_trimming">Aparar mensagem</string>
+  <string name="preferences_advanced__use_system_emoji">Usar emoji do sistema</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Desabilitar o suporte a emoji nativo do TextSecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-pt/strings.xml

@@ -334,6 +334,7 @@ Verifique que este é o seu número! Estamos prestes a confirmá-lo com uma SMS.
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">O registo TextSecure foi completado com sucesso.</string>
   <string name="RegistrationService_registration_error">Erro de registo</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">O registo do TextSecure deparou-se com um problema.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Foi recebida uma
 chave corrompida.

res/values-ro/strings.xml

@@ -34,6 +34,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nu pot găsi o aplicație pentru selecție media.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Camera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Imagine</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -70,6 +71,7 @@
   <string name="ConversationActivity_select_contact_info">Selectează informații de contact</string>
   <string name="ConversationActivity_compose_message">Compune mesaj</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ne pare rău, a apărut o eroare în setarea atașamentului tău.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Fişierul gif pe care l-ai selectat este prea mare!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Ne pare rău, video-ul selectat depășește restricția de mărime a mesajelor (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ne pare rău, fișierul audio selectat depășește restricția marimii mesajului (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatarul nu este o adresă validă de SMS sau e-mail.</string>
@@ -285,6 +287,7 @@ Trebuie să vă scoateţi de acolo înainte de a vă înregistra aici.</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Inregistrarea TextSecure a fost finalizata cu succes.</string>
   <string name="RegistrationService_registration_error">Eroare de inregistrare</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Inregistrarea TextSecure a intampinat o problema.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Primit mesajul conform caruia
 schimbul de chei este corupt </string>
@@ -352,6 +355,7 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="KeyCachingService_passphrase_cached">TextSecure e deblocat.</string>
   <string name="KeyCachingService_lock">Blocare acces cu parola</string>
   <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d mesaje noi în %2$d conversaţii</string>
   <string name="MessageNotifier_most_recent_from_s">Cel mai recent de la: %1$s</string>
   <string name="MessageNotifier_locked_message">Mesaj blocat...</string>
   <string name="MessageNotifier_media_message_with_text">Mesaje media: %s</string>
@@ -366,6 +370,8 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <!--QuickResponseService-->
   <string name="QuickResponseService_problem_sending_message">Problemă la trimiterea mesajului!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Mesaj nou TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Conţinut ascuns</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">PAROLA VECHE:</string>
   <string name="change_passphrase_activity__new_passphrase">NOUA PAROLĂ:</string>
@@ -563,8 +569,15 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="arrays__mute_for_two_hours">Silenţios pentru 2 ore</string>
   <string name="arrays__mute_for_one_day">Silenţios pentru o zi</string>
   <string name="arrays__mute_for_seven_days">Silenţios pentru 7 zile</string>
+  <string name="arrays__settings_default">Setări implicite</string>
   <string name="arrays__enabled">Activat</string>
   <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__neither">Niciunul</string>
+  <string name="arrays__images">Imagini</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d oră</item>
@@ -598,6 +611,7 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__pref_timeout_interval_title">Interval expirare</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Perioada de timp de așteptare înainte de a șterge parola din memorie</string>
   <string name="preferences__notifications">Notificări</string>
+  <string name="preferences__enable_message_notifications">Activează notificari pentru mesaje</string>
   <string name="preferences__led_color">Culoare LED</string>
   <string name="preferences__led_color_unknown">Necunoscut</string>
   <string name="preferences__pref_led_blink_title">Tipar de clipire LED</string>
@@ -646,6 +660,7 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Cere o confirmare de livrare pentru fiecare SMS trimis</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Șterge automat mesajele vechi când conversația depășește mărimea specificată</string>
   <string name="preferences__delete_old_messages">Șterge mesajele vechi</string>
+  <string name="preferences__chats">Conversaţii şi media</string>
   <string name="preferences__conversation_length_limit">Limita mărime conversație</string>
   <string name="preferences__trim_all_threads_now">Scurtează toate conversaţiile acum</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verifică toate conversațiile și aplică limite de mărime a conversației</string>
@@ -664,6 +679,11 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__submit_debug_log">Trimite log-urile de depanare</string>
   <string name="preferences__support_wifi_calling">Mod compatibilitate \"Apelare WiFi\"</string>
   <string name="preferences_app_protection__blocked_contacts">Contacte blocate</string>
+  <string name="preferences_notifications__display_in_notifications">Afişează în notificări</string>
+  <string name="preferences_chats__when_using_mobile_data">Când se utilizează datele mobile </string>
+  <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>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-ru/strings.xml

@@ -12,6 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Удалить все старые сообщения?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы уверены, что хотите обрезать все разговоры до %s последних сообщений, удалив более старые?</string>
   <string name="ApplicationPreferencesActivity_delete">Удалить</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Отключить парольную фразу?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Отключить пароль на просмотр сообщений?</string>
   <string name="ApplicationPreferencesActivity_disable">Отключить</string>
   <string name="ApplicationPreferencesActivity_unregistering">Отмена регистрации</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Отменяем регистрацию в TextSecure...</string>
@@ -38,6 +41,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Не найдено приложение для выбора медиа-файлов.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Камера</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Изображение</string>
   <string name="AttachmentTypeSelectorAdapter_video">Видео</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Аудио</string>
@@ -50,6 +54,7 @@
 стоит перепроверить.</string>
   <string name="ConfirmIdentityDialog_accept">Принять</string>
   <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Сообщение %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Размер сообщения: %d Kб</string>
   <string name="ConversationItem_expires_s">Истекает: %s</string>
@@ -76,6 +81,7 @@
   <string name="ConversationActivity_select_contact_info">Выбрать контакт</string>
   <string name="ConversationActivity_compose_message">Написать сообщение</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Извините, произошла ошибка при обработке вложения.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Gif, которую вы выбрали, слишком большая!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Извините, выбранное видео превышает ограничение на размер сообщения (%1$s Кб).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Извините, выбранное аудио превышает ограничение на размер сообщения (%1$s Кб).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Адрес получателя не является ни номером телефона, ни адресом электронной почты.</string>
@@ -298,6 +304,7 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Регистрация в TextSecure успешно завершена.</string>
   <string name="RegistrationService_registration_error">Ошибка регистрации</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">При регистрации в TextSecure возникла ошибка.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Получено повреждённое
 сообщение обмена ключами!
@@ -368,6 +375,7 @@
   <string name="KeyCachingService_passphrase_cached">TextSecure разблокирован</string>
   <string name="KeyCachingService_lock">Заблокировать парольной фразой</string>
   <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d новых сообщений в %2$d разговорах</string>
   <string name="MessageNotifier_most_recent_from_s">Последнее от %1$s</string>
   <string name="MessageNotifier_media_message_with_text">MMS-сообщение: %s</string>
   <string name="MessageNotifier_no_subject">(Нет темы)</string>
@@ -382,11 +390,14 @@
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Быстрые ответы недоступны, когда TextSecure заблокирован!</string>
   <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Новое сообщение TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Содержимое скрыто</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
   <string name="change_passphrase_activity__new_passphrase">НОВАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">ПОВТОРИТЕ НОВУЮ ПАРОЛЬНУЮ ФРАЗУ:</string>
   <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Введите имя или номер</string>
   <!--contact_selection_group_activity-->
   <string name="contact_selection_group_activity__no_contacts">Нет контактов.</string>
   <string name="contact_selection_group_activity__finding_contacts">Загружаем контакты...</string>
@@ -590,6 +601,12 @@ SMS-подтверждения...
   <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__neither">Ничего</string>
+  <string name="arrays__images">Изображения</string>
+  <string name="arrays__audio">Аудио</string>
+  <string name="arrays__video">Видео</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d час</item>
@@ -616,6 +633,7 @@ SMS-подтверждения...
   <string name="preferences__change_my_passphrase">Изменить мою парольную фразу</string>
   <string name="preferences__enable_passphrase">Включить парольную фразу</string>
   <string name="preferences__passphrase_summary">Парольная фраза %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">Включить пароль на просмотр сообщений</string>
   <string name="preferences__screen_security">Защита экрана</string>
   <string name="preferences__screen_security_summary">Безопасность экрана %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Блокировать снимки экрана внутри приложения</string>
@@ -625,6 +643,7 @@ SMS-подтверждения...
   <string name="preferences__pref_timeout_interval_title">Срок хранения</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Время, по прошествии которого парольная фраза будет стёрта из памяти</string>
   <string name="preferences__notifications">Уведомления</string>
+  <string name="preferences__enable_message_notifications">Разрешить уведомления</string>
   <string name="preferences__led_color">Цвет светодиода</string>
   <string name="preferences__led_color_unknown">Неизвестен</string>
   <string name="preferences__pref_led_blink_title">Мигание светодиода</string>
@@ -674,6 +693,7 @@ SMS-подтверждения...
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запрашивать отчёт о доставке каждого отправленного SMS-сообщения</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматически удалять старые сообщения, когда длина разговора превышает заданную</string>
   <string name="preferences__delete_old_messages">Удалять старые сообщения</string>
+  <string name="preferences__chats">Чаты и медиа</string>
   <string name="preferences__conversation_length_limit">Ограничение длины разговора</string>
   <string name="preferences__trim_all_threads_now">Обрезать все разговоры</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Привести длину всех разговоров в соответствие с заданной</string>
@@ -692,6 +712,12 @@ SMS-подтверждения...
   <string name="preferences__support_wifi_calling">Совместимость с Wi-Fi звонками</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включите, если ваше устройство отправляет и принимает SMS и MMS через Wi-Fi (и если Wi-Fi звонки включены)</string>
   <string name="preferences_app_protection__blocked_contacts">Заблокированные контакты</string>
+  <string name="preferences_notifications__display_in_notifications">Отображать в уведомлениях</string>
+  <string name="preferences_chats__when_using_mobile_data">Через мобильную сеть</string>
+  <string name="preferences_chats__when_using_wifi">Через Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">В роуминге</string>
+  <string name="preferences_chats__media_auto_download">Автозагрузка медиа</string>
+  <string name="preferences_chats__message_trimming">Обрезка сообщений</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-sk/strings.xml

@@ -296,6 +296,7 @@ Skontrolujte pre istotu znovu, že ste správne zadali Vaše telefónne číslo!
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registrácia bola úspešne dokončená.</string>
   <string name="RegistrationService_registration_error">Chyba pri registrácii</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pri TextSecure registrácii sa vyskytol problém.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Bola prijatá poškodená správa
 vzájomnej výmeny kľúčov.</string>

res/values-sl/strings.xml

@@ -109,6 +109,7 @@ preveriti ta stik.</string>
   <string name="ConversationActivity_unblock_question">Odblokiram?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Ste prepričani, da želite odblokirati ta stik?</string>
   <string name="ConversationActivity_unblock">Odblokiraj</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Velikost priponke presega omejitev velikosti za ta tip sporočil.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti sporočila</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Način prenosa: %1$s\nPoslano/Prejeto: %2$s</string>
@@ -311,6 +312,10 @@ Preverite, če je to zares vaša telefonska številka! Overili jo bomo s sporoč
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registracija TextSecure je bila uspešno zaključena.</string>
   <string name="RegistrationService_registration_error">Napaka pri registraciji</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pri registraciji TextSecure je prišlo do težav.</string>
+  <!--Slide-->
+  <string name="Slide_image">Slika</string>
+  <string name="Slide_audio">Zvok</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Prejeto poškodovano
 sporočilo za izmenjavo ključev!</string>
@@ -693,7 +698,7 @@ bila uspešna.</string>
   <string name="preferences__sms_delivery_reports">Potrdila o dostavi SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Samodejen izbris starih sporočil, ko pogovor preseže določeno dolžino</string>
-  <string name="preferences__delete_old_messages">Izbris starih sporočil</string>
+  <string name="preferences__delete_old_messages">Samodejen izbris</string>
   <string name="preferences__chats">Pogovori in multimedija</string>
   <string name="preferences__conversation_length_limit">Omejitev dolžine pogovorov</string>
   <string name="preferences__trim_all_threads_now">Obreži vse pogovore zdaj</string>
@@ -714,6 +719,13 @@ Brezplačno zasebno sporočanje za TextSecure in Signal</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivirajte, če dostava SMS/MMS sporočil na vaši napravi poteka preko povezave WiFi (samo, če imate vklopljeno \'WiFi klicanje/WiFi Calling)</string>
   <string name="preferences_app_protection__blocked_contacts">Blokirani stiki</string>
   <string name="preferences_notifications__display_in_notifications">Prikazano v obvestilu</string>
+  <string name="preferences_chats__when_using_mobile_data">Ob uporabi mobilnega omrežja</string>
+  <string name="preferences_chats__when_using_wifi">Ob uporabi omrežja Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Med gostovanjem</string>
+  <string name="preferences_chats__media_auto_download">Samodejen prenos priponk</string>
+  <string name="preferences_chats__message_trimming">Izbris starih sporočil</string>
+  <string name="preferences_advanced__use_system_emoji">Uporabi sistemske emoji</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Onemogoči TextSecure vgrajeno podporo za emoji</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-sn/strings.xml

@@ -3,15 +3,15 @@
   <string name="app_name">TextSecure</string>
   <string name="yes">Hongu</string>
   <string name="no">Kwete</string>
-  <string name="delete">Dzimura</string>
+  <string name="delete">Dzima</string>
   <string name="please_wait">Tinokumbira umire kanguva....</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Parizvino: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Hausati wagadzira izwi rekudarika!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s tsamba pahutaurwa</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Dzimura tsamba dzekare izvozvi?</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Dzima tsamba dzekare izvozvi?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Unechokwadi kuti unoda kudimbura shinda dzehutaurwa dzese kusvika pa %s dzetsamba dzamanje here?</string>
-  <string name="ApplicationPreferencesActivity_delete">Dzimura </string>
+  <string name="ApplicationPreferencesActivity_delete">Dzima </string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Tadzisa izwi rekudarika?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
 Tadzisa kuvhara chivhitivhiti chetsamba?
@@ -29,7 +29,7 @@ Uchada kuti unyorese zvakare svumbunuro dzembozha runhare rwako kuti ushandise t
   <string name="ApplicationPreferencesActivity_sms_disabled">Tsamba pfupi dzatadziswa</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Bata kuti TextSecure ive iri apu yako yehurongwa hwetsamba pfupi</string>
   <string name="ApplicationPreferencesActivity_on">batidza</string>
-  <string name="ApplicationPreferencesActivity_On">Kubatira</string>
+  <string name="ApplicationPreferencesActivity_On">Batidza</string>
   <string name="ApplicationPreferencesActivity_off">dzimwa</string>
   <string name="ApplicationPreferencesActivity_Off">Dzimwa</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">Tsamba pfupi %1$s, Tsamba ine midhiya %2$s</string>
@@ -37,7 +37,7 @@ Uchada kuti unyorese zvakare svumbunuro dzembozha runhare rwako kuti ushandise t
   <string name="AppProtectionPreferenceFragment_minutes">maminiti %d</string>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(mufananidzo)</string>
-  <string name="DraftDatabase_Draft_audio_snippet">(izwi)</string>
+  <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
   <string name="DraftDatabase_Draft_video_snippet">(vhidhiyo)</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Hatisi kukwanisa kuwana apu yekusarudza midhiya.</string>
@@ -45,7 +45,7 @@ Uchada kuti unyorese zvakare svumbunuro dzembozha runhare rwako kuti ushandise t
   <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Mufananidzo</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vhidhiyo</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">Izwi</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Mashoko ezita</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Mazita akadzivirirwa</string>
@@ -65,29 +65,29 @@ kwezita iri.</string>
   <string name="ConversationItem_error_not_delivered">Haina kusvitswa</string>
   <string name="ConversationItem_view_secure_media_question">Wowona midhiya yakakwedekerwa?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Midhiya iyi yakachengetedzwa mupfimbi yedhata yakakwedekerwa. Zvisinei, kuti uione nechioneso chemashoko chekunze parizvino zvinoda kuti dhata rimbobviswa kukwedekerwa kwenguva pfupi uye rinyorerwe padhisiki. Unechokwadi chekuti unoda kuita izvi here?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Kanganiso, tsamba yekutsinhana kwesvumbunuro iyi yave yekare.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Tatambira tsamba yekutsinhana svumbunuro, baya kuti ipinde mushishi.</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Kanganiso, pagamuchirwa tsamba yekutsinhana kwesvumbunuro iyi yekare.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Tagamuchira tsamba yekutsinhana svumbunuro, baya kuti ipinde mushishi.</string>
   <string name="ConversationItem_group_action_left">%1$s abuda muboka.</string>
   <string name="ConversationItem_click_for_details">Bata kuti uwone zvizere</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Bata kuti zvisina kuchengetedzwa zvidzoke </string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Dzokera kutsamba isina kukwedekerwa? </string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Dzokera kutsamba dzemidhiya isina kukwedekerwa? </string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tsamba iyi<b>haikwanise</b> kukwedekerwa nekuda kwekuti anotambira haasisiri mushandisi weTextSecure.\n\nTotumira tsamba isina kukwedekerwa?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tsamba iyi<b>haikwanise</b> kukwedekerwa nekuda kwekuti anogamuchira haasisiri mushandisi weTextSecure.\n\nTotumira tsamba isina kukwedekerwa?</string>
   <string name="ConversationItem_unable_to_open_media">Hatisi kukwanisa kuwana apu inokwanisa kuvhura midhiya iyi.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Totangisa chikamu chakakwedekerwa?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Totangisa chikamu chakakwedekerwa na %s?</string>
   <string name="ConversationActivity_abort_secure_session_confirmation">Kutsinhira kuti chikamu chakakwedekerwa chivharwe</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Unechokwadi here kuti unoda kuvhara chikamu chakakwedekerwa?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Kutsinhira kuti shinda idzimurwe</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Unechokwadi here kuti unoda kudzimura hutaurwa uwu zvamuchose?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Kutsinhira kuti shinda idzimwe</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Unechokwadi here kuti unoda kudzima hutaurwa uwu zvamuchose?</string>
   <string name="ConversationActivity_add_attachment">Kuwedzera batanidzwa</string>
   <string name="ConversationActivity_select_contact_info">Sarudza mashoko ezita</string>
   <string name="ConversationActivity_compose_message">Nyora shoko</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ruregerero, paita kanganiso pakugadzira batanidzwa yako.</string>
   <string name="ConversationActivity_the_gif_you_selected_was_too_big">Butiro re\"gif\" rasarudzwa iri rakakurisa!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Ruregerero, vhidhiyo yasarudzwa inodarika hukuru hwetsamba inobvumirwa (%1$skB).</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ruregerero, izwi rasarudzwa rinodarika hukuru hwetsamba inobvumirwa (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ruregerero, audio rasarudzwa rinodarika hukuru hwetsamba inobvumirwa (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Anotambira haana kero yetsamba pfupi kana tsambambozha inoshanda!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Tsamba haina zvirimo!</string>
   <string name="ConversationActivity_group_members">Nhengo dzemuboka</string>
@@ -117,8 +117,8 @@ kwezita iri.</string>
   <string name="ConversationFragment_message_details">Shoko zvizere</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Fambisa: %1$s\nYatumirwa/Yagamuchirwa: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Mutumiri: %1$s\nFambisa: %2$s\nYatumirwa: %3$s\nYagamuchirwa: %4$s</string>
-  <string name="ConversationFragment_confirm_message_delete">Tsinhira shoko zvizere	</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Unechokwadi here kuti unoda kudzimura tsamba dzese dzasarudzwa zvamuchose?</string>
+  <string name="ConversationFragment_confirm_message_delete">Tsamba yekutsinhira kudzima</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Unechokwadi here kuti unoda kudzima tsamba dzese dzasarudzwa zvamuchose?</string>
   <string name="ConversationFragment_save_to_sd_card">Chengetedza ku pfimbi	</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Kuchengetedza midhiya iyi kupfimbi kuchabvumira mamwe maapu aripa runhare rwako kuti ave nehupindwa pairi.\n\nEnderera?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Paita kanganiso pakuchengetedza batanidzwa kupfimbi!</string>
@@ -135,8 +135,8 @@ kwezita iri.</string>
   <!--ConversationListActivity-->
   <string name="ConversationListActivity_search">Tsvaga....</string>
   <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Todzimura shinda?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Unechokwadi here kuti unoda kudzimura hutaurwa HWOSE hwasarudzwa?</string>
+  <string name="ConversationListFragment_delete_threads_question">Dzima shinda?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Unechokwadi here kuti unoda kudzima hutaurwa HWOSE hwasarudzwa?</string>
   <string name="ConversationListFragment_deleting">Kudzimura</string>
   <string name="ConversationListFragment_deleting_selected_threads">Kudzimura shinda dzasarudzwa...</string>
   <!--ConversationListItem-->
@@ -163,13 +163,13 @@ kwezita iri.</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Gova na..</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export">Tumira</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Tumira bomhoremavara ku SD kadhi?</string>
+  <string name="ExportFragment_export">Exupota</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Exupota bomhoremavara ku SD kadhi?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Yambiro, izvi zvichaita 
-kuti zvirimukati mebomhoremavara retsamba dzako dzeTextSecure zvitumirwe ku SD kadhi.</string>
+kuti zvirimukati mebomhoremavara retsamba dzako dzeTextSecure zviexupotwe ku SD kadhi.</string>
   <string name="ExportFragment_cancel">Kanzura</string>
-  <string name="ExportFragment_exporting">Kutumira</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Kutumira bomhoremavara ku SD kadhi...</string>
+  <string name="ExportFragment_exporting">Kuexupota</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Kuexupota bomhoremavara ku SD kadhi...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Kanganiso pakunyorera ku SD kadhi!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Paita kanganiso pakati pekunyorera ku SD kadhi!</string>
   <string name="ExportFragment_success">Budiriro</string>
@@ -196,7 +196,7 @@ kuti zvirimukati mebomhoremavara retsamba dzako dzeTextSecure zvitumirwe ku SD k
   <string name="GroupMembersDialog_me">Ini</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Imupota</string>
-  <string name="ImportExportActivity_export">Tumira </string>
+  <string name="ImportExportActivity_export">Exupota</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Imupota gumbapamwe repfimbi yedhata retsamba pfupi?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Izvi zvicha imupota tsamba kubva muhurongwa hwemugumbapamwe retsamba pfupi ku pfimbi yedhata kuTextSecure. Kana uchinge
@@ -329,13 +329,14 @@ Ongorora zvakare kuti iyi inhamba dzako! Tava pedyo nekuiongorora netsamba pfupi
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Kunyoresa paTextSecure kwabudirira kuzadziswa.</string>
   <string name="RegistrationService_registration_error">Kanganiso pakunyoresa</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Kuregisita paTextSecure kwasangana nedambudziko.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Tatambira svumbunuro yakaworera
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Tagamuhira svumbunuro yakaworera
 tsinha tsamba!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 Tagamuchira tsamba yekutsinhana svumbunuro, baya kuti zvishishwe nekutaridzwa.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Tatambira tsamba ine chitupa chine svumbunuro isingazivikanwe. Baya kuti zvishishwe nekutaridzwa.</string>
+Tagamuchira tsamba ine chitupa chine svumbunuro isingazivikanwe. Baya kuti zvishishwe nekutaridzwa.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Zvagamuchirwa kuwedzerwa asi pane chitupa chemashoko chisingazivikanwi. Bata kuti utsinhidzire chitupa. </string>
   <string name="SmsMessageRecord_secure_session_ended">Chikamu chakakwedekerwa chaguma.</string>
   <string name="SmsMessageRecord_duplicate_message">Tsamba yakafanana</string>
@@ -481,15 +482,15 @@ Tatambira tsamba ine chitupa chine svumbunuro isingazivikanwe. Baya kuti zvishis
   <string name="database_migration_activity__importing">KUIMUPOTA</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Zivisa pfimbi redhata....</string>
-  <string name="export_fragment__export_plaintext_backup">Tumira bhekiapu yebomhoremavara</string>
+  <string name="export_fragment__export_plaintext_backup">Exupota bhekiapu yebomhoremavara</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-Tumira bhekiapu rebomhoremavara rinopindirana ne\"Bhekiapu yetsamba pfupi nekudzoreredza\" kuenda kuSD kadhi.</string>
+Exupota bhekiapu rebomhoremavara rinopindirana ne\"Bhekiapu yetsamba pfupi nekudzoreredza\" kuenda kuSD kadhi.</string>
   <string name="import_fragment__import_system_sms_database">Imupota gumbapamwe yepfimbi redhata retsamba pfupi</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Imupota pfimbi yedhata
 kubva kuhurongwa hwegumbapambwe reapu retsamba.</string>
   <string name="import_fragment__import_encrypted_backup">Imupota bhekiapu yakakwedekerwa</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
-Dzorera bhekiapu yakakwedekerwa yeTextSecure yanga yambo tumirwa.</string>
+Dzorera bhekiapu yakakwedekerwa yeTextSecure yanga yambo exupotwa.</string>
   <string name="import_fragment__import_plaintext_backup">Imupota bhekiapu yebomhoremavara</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Imupota bhekiapu rebomhoremavara. Rinopindirana ne\"Bhekiapu yetsamba pfupi nekudzoreredza\".</string>
@@ -526,7 +527,7 @@ Imupota bhekiapu rebomhoremavara. Rinopindirana ne\"Bhekiapu yetsamba pfupi neku
   <string name="recipient_preferences__color_for_this_contact">Ruvara rwezita iri</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-Ruramisa nhamba dzako dzenhare kuti ukochekere kuTextSecure.</string>
+Wongorora kururama kwenhamba dzako dzenhare kuti ukochekere kuTextSecure.</string>
   <string name="registration_activity__your_country">NYIKA YAKO</string>
   <string name="registration_activity__your_country_code_and_phone_number">KODHI YENYIKA YAKO NE
 NHAMBA DZEMBOZHA RUNHARE RWAKO</string>
@@ -597,7 +598,7 @@ kwaramba.</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">Zvimwe zvinhu zvinoda teerero yako. </string>
   <string name="message_details_header__sent">Kutumira</string>
-  <string name="message_details_header__received">Kutambira</string>
+  <string name="message_details_header__received">Kugamuchira</string>
   <string name="message_details_header__via">Kuburikidza</string>
   <string name="message_details_header__to">Kuna:</string>
   <string name="message_details_header__from">Kubva:</string>
@@ -617,7 +618,7 @@ kwaramba.</string>
   <string name="AndroidManifest__message_details">Zvizere zvetsamba</string>
   <string name="AndroidManifest_manage_linked_devices">Maneja michina yakakochekerwa </string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Imupota/ Tumira</string>
+  <string name="arrays__import_export">Imupota/ Exupota</string>
   <string name="arrays__my_identity_key">Chitupa chesvumbunuro yangu</string>
   <string name="arrays__use_default">Shandisa hurongwa</string>
   <string name="arrays__use_custom">Shandisa gadziro yako</string>
@@ -631,6 +632,9 @@ kwaramba.</string>
   <string name="arrays__name_and_message">Zita netsamba</string>
   <string name="arrays__name_only">Zita chete</string>
   <string name="arrays__neither">Isiri </string>
+  <string name="arrays__images">Mifananidzo</string>
+  <string name="arrays__audio">Audio </string>
+  <string name="arrays__video">Vhidhiyo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">awa %d</item>
@@ -639,8 +643,8 @@ kwaramba.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Zvenguva dzose </string>
   <string name="preferences__sms_mms">Tsamba pfupi netsamba ine midhiya</string>
-  <string name="preferences__pref_all_sms_title">Tambira tsamba pfupi dzese</string>
-  <string name="preferences__pref_all_mms_title">Tambira tsamba dzine midhiya dzose</string>
+  <string name="preferences__pref_all_sms_title">Gamuchira tsamba pfupi dzese</string>
+  <string name="preferences__pref_all_mms_title">Gamuchira tsamba dzine midhiya dzose</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Shandisa TextSecure panopinda tsamba dzine mavara dzose</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Shandisa TextSecure panopinda tsamba dzine midhiya dzose</string>
   <string name="preferences__input_settings">Gadziro dzekuisa</string>
@@ -714,7 +718,8 @@ kwaramba.</string>
   <string name="preferences__sms_delivery_reports">Kumhan\'ara kwekusvika kwetsamba pfupi  </string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Kumbira kuman\'arwa kwekusvitswa kwetsamba pfupi imwe ne imwe yaunenge watumira </string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Ita kuti tsamba dzakare dzizvidzime pachadzo kana shinda yeutaurwa yapfurikidza hurebu hwakatarwa.</string>
-  <string name="preferences__delete_old_messages">Dzimura tsamba dzekare</string>
+  <string name="preferences__delete_old_messages">Dzima tsamba dzekare</string>
+  <string name="preferences__chats">Hutaurwa ne midhiya</string>
   <string name="preferences__conversation_length_limit">Magumo ehurefu hweutaurwa</string>
   <string name="preferences__trim_all_threads_now">Nyerenyesa shinda dzese izvozvi</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Tsvagiridza mukati meshinda dzehutaurwa uye manikidzira magumo ehurefu hwehutaurwa.</string>
@@ -734,6 +739,11 @@ Sunungura kutumirwa ketsamba dziri puraivheti kuvashandisi veTextSecure neSignal
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Gonesa kana muchina wako uchishandisa nepfenyuro yepasina waya kusvitsa tsamba pfupi/ tsamba dzine midhiya (gonesa chete kana \"kuchaya pasina waya\" kwakagoneswa pamuchina wako). </string>
   <string name="preferences_app_protection__blocked_contacts">Mazita akadzivirirwa</string>
   <string name="preferences_notifications__display_in_notifications">Ratidza zviziviso </string>
+  <string name="preferences_chats__when_using_mobile_data">Kana pachishandiswa dhata rinofamba</string>
+  <string name="preferences_chats__when_using_wifi">Kana pachishandiswa nepfenyuro isina waya</string>
+  <string name="preferences_chats__when_roaming">Kana urikufamba kunze kwenyika</string>
+  <string name="preferences_chats__media_auto_download">Kuzvitutunura kwemidhiya</string>
+  <string name="preferences_chats__message_trimming">Kudimbura tsamba</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -752,7 +762,7 @@ Sunungura kutumirwa ketsamba dziri puraivheti kuvashandisi veTextSecure neSignal
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Shoko zvizere</string>
   <string name="conversation_context__menu_copy_text">Kopa mavara</string>
-  <string name="conversation_context__menu_delete_message">Dzimura tsamba</string>
+  <string name="conversation_context__menu_delete_message">Dzima tsamba</string>
   <string name="conversation_context__menu_forward_message">Endesa tsamba mberi</string>
   <string name="conversation_context__menu_resend_message">Tumira tsamba zvekare</string>
   <!--conversation_context_image-->
@@ -763,7 +773,7 @@ Sunungura kutumirwa ketsamba dziri puraivheti kuvashandisi veTextSecure neSignal
   <string name="conversation_insecure__menu_start_secure_session">Tanga chikamu chakakwedekera</string>
   <string name="conversation_insecure__security">Tsivatsaona</string>
   <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Dzimura zvasarudzwa</string>
+  <string name="conversation_list_batch__menu_delete_selected">Dzima zvasarudzwa</string>
   <string name="conversation_list_batch__menu_select_all">Sarudza zvese </string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Tsvaga</string>
@@ -784,7 +794,7 @@ Sunungura kutumirwa ketsamba dziri puraivheti kuvashandisi veTextSecure neSignal
   <string name="conversation__menu_add_attachment">Kuwedzera batanidzwa</string>
   <string name="conversation__menu_update_group">Zivisa boka</string>
   <string name="conversation__menu_leave_group">Buda muboka</string>
-  <string name="conversation__menu_delete_thread">Dzimura shinda</string>
+  <string name="conversation__menu_delete_thread">Dzima shinda</string>
   <string name="conversation__menu_view_media">Mifananidzo yese</string>
   <string name="conversation__menu_conversation_settings">Gadziro yehutaurwa</string>
   <!--conversation_popup-->
@@ -826,7 +836,7 @@ Sunungura kutumirwa ketsamba dziri puraivheti kuvashandisi veTextSecure neSignal
   <!--Trimmer-->
   <string name="trimmer__deleting">Kudzimura</string>
   <string name="trimmer__deleting_old_messages">Kudzimura tsamba dzekare....</string>
-  <string name="trimmer__old_messages_successfully_deleted">Tsamba dzekare dzabudirira pakudzimurwa</string>
+  <string name="trimmer__old_messages_successfully_deleted">Tsamba dzekare dzakwanisa kudzimwa</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Tumidzira chimiriro chemufanidzo </string>
   <!--quick_attachment_drawer-->

res/values-sr/strings.xml

@@ -28,9 +28,9 @@
   <string name="ApplicationPreferencesActivity_sms_disabled">СМС онемогућен</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Додирните да бисте поставили Сигурне поруке као подразумевану апликацију за СМС</string>
   <string name="ApplicationPreferencesActivity_on">укључена</string>
-  <string name="ApplicationPreferencesActivity_On">Укључена</string>
+  <string name="ApplicationPreferencesActivity_On">Укључено</string>
   <string name="ApplicationPreferencesActivity_off">искључена</string>
-  <string name="ApplicationPreferencesActivity_Off">Искључена</string>
+  <string name="ApplicationPreferencesActivity_Off">Искључено</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">СМС %1$s, ММС %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d минута</string>
@@ -112,6 +112,7 @@
   <string name="ConversationActivity_unblock_question">Одблокирати?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Желите ли заиста да одблокирате овај контакт?</string>
   <string name="ConversationActivity_unblock">Одблокирај</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Прилог прекорачује ограничење величине за тип поруке коју шаљете.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Детаљи поруке</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Пренос: %1$s\nПослата/примљена: %2$s</string>
@@ -143,7 +144,7 @@
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Користим посебно: %s</string>
   <string name="CustomDefaultPreference_using_default">Користим подразумевано: %s</string>
-  <string name="CustomDefaultPreference_none">Ниједна</string>
+  <string name="CustomDefaultPreference_none">ништа</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Сад</string>
   <string name="DateUtils_minutes_ago">%d минута</string>
@@ -280,8 +281,8 @@
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Одлокирати овај контакт?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Желите ли заиста да одблокирате овај контакт?</string>
   <string name="RecipientPreferenceActivity_unblock">Одблокирај</string>
-  <string name="RecipientPreferenceActivity_enabled">Омогућена</string>
-  <string name="RecipientPreferenceActivity_disabled">Онемогућена</string>
+  <string name="RecipientPreferenceActivity_enabled">Укључено</string>
+  <string name="RecipientPreferenceActivity_disabled">Искључено</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Повежите се на Сигурне поруке</string>
   <string name="RegistrationActivity_select_your_country">Изаберите вашу државу</string>
@@ -329,6 +330,10 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Пријава на Сигурне поруке је успешно завршена.</string>
   <string name="RegistrationService_registration_error">Грешка пријаве</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Дошло је до проблема приликом пријаве на сервер Сигурних порука.</string>
+  <!--Slide-->
+  <string name="Slide_image">Слика</string>
+  <string name="Slide_audio">Звук</string>
+  <string name="Slide_video">Видео</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Примљена је оштећена
 порука размене кључа!</string>
@@ -520,7 +525,7 @@
   <string name="recipient_preferences__mute_conversation">Утишај преписку</string>
   <string name="recipient_preferences__disable_notifications_for_this_conversation">Искључи обавештења за ову преписку</string>
   <string name="recipient_preferences__ringtone">Звоно</string>
-  <string name="recipient_preferences__vibrate">Вибрирај</string>
+  <string name="recipient_preferences__vibrate">Вибрирање</string>
   <string name="recipient_preferences__block">Блокирај</string>
   <string name="recipient_preferences__color">Боја</string>
   <string name="recipient_preferences__color_for_this_contact">Боја за контакт</string>
@@ -630,6 +635,9 @@
   <string name="arrays__name_and_message">Име и порука</string>
   <string name="arrays__name_only">Само име</string>
   <string name="arrays__neither">Ниједно</string>
+  <string name="arrays__images">Слике</string>
+  <string name="arrays__audio">Звук</string>
+  <string name="arrays__video">Видео</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d сат</item>
@@ -684,8 +692,8 @@
   <string name="preferences__three_times">Три пута</string>
   <string name="preferences__five_times">5 пута</string>
   <string name="preferences__ten_times">Десет пута</string>
-  <string name="preferences__vibrate">Вибрирај</string>
-  <string name="preferences__also_vibrate_when_notified">Вибрирај при обавештењу</string>
+  <string name="preferences__vibrate">Вибрирање</string>
+  <string name="preferences__also_vibrate_when_notified">Вибрирање при обавештењу</string>
   <string name="preferences__minutes">минута</string>
   <string name="preferences__hours">сати</string>
   <string name="preferences__green">Зелена</string>
@@ -695,7 +703,7 @@
   <string name="preferences__cyan">Цијан</string>
   <string name="preferences__magenta">Магента</string>
   <string name="preferences__white">Бела</string>
-  <string name="preferences__none">Ниједна</string>
+  <string name="preferences__none">Ништа</string>
   <string name="preferences__fast">Брзо</string>
   <string name="preferences__normal">Нормално</string>
   <string name="preferences__slow">Споро</string>
@@ -715,6 +723,7 @@
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Захтевај извештај о испоруци за сваку послату СМС поруку</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Аутоматски обриши старе поруке када нит преписке пређе наведену дужину</string>
   <string name="preferences__delete_old_messages">Бриши старе поруке</string>
+  <string name="preferences__chats">Ћаскања и медији</string>
   <string name="preferences__conversation_length_limit">Ограничење дужине преписке</string>
   <string name="preferences__trim_all_threads_now">Скрати све нити сада</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Претражи све нити преписки и наметни ограничења дужине</string>
@@ -723,7 +732,7 @@
   <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__default">Подразумевано</string>
   <string name="preferences__language">Језик</string>
   <string name="preferences__language_summary">Језик %s</string>
   <string name="preferences__textsecure_messages">Сигурне поруке</string>
@@ -734,6 +743,13 @@
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Омогућите ако ваш уређај доставља СМС/ММС преко бежичне мреже (омогућите само ако је „WiFi Calling“ омогућено на вашем уређају)</string>
   <string name="preferences_app_protection__blocked_contacts">Блокирани контакти</string>
   <string name="preferences_notifications__display_in_notifications">Прикажи у обавештењу</string>
+  <string name="preferences_chats__when_using_mobile_data">На мобилном интернету</string>
+  <string name="preferences_chats__when_using_wifi">На бежичној</string>
+  <string name="preferences_chats__when_roaming">У ромингу</string>
+  <string name="preferences_chats__media_auto_download">Ауто-преузимање медија</string>
+  <string name="preferences_chats__message_trimming">Скраћивање порука</string>
+  <string name="preferences_advanced__use_system_emoji">Користи системски емоџи</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Искључи уграђене емоџије Сигурних порука</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-sv/strings.xml

@@ -112,6 +112,7 @@ verifiera denna kontakt.</string>
   <string name="ConversationActivity_unblock_question">Avblockera?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Är du säker på att du vill avblockera 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>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meddelandedetaljer</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSkickat/Mottagits: %2$s</string>
@@ -320,6 +321,10 @@ Dubbelkolla att det här är ditt nummer! Vi ska nu verifiera det med ett SMS.</
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure-registrering har lyckats.</string>
   <string name="RegistrationService_registration_error">Registreringsfel</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure-registreringen har drabbats av ett problem.</string>
+  <!--Slide-->
+  <string name="Slide_image">Bilder</string>
+  <string name="Slide_audio">Ljud</string>
+  <string name="Slide_video">Video</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Tog emot skadat meddelande
 för nyckelutbyte!</string>
@@ -699,7 +704,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Radera automatiskt gamla meddelanden när en konversationstråd överstiger en specificerad längd</string>
   <string name="preferences__delete_old_messages">Radera gamla meddelanden</string>
   <string name="preferences__chats">Konversationer och media</string>
-  <string name="preferences__conversation_length_limit">Konversationstrådslängd</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__light_theme">Ljust</string>
@@ -718,6 +723,13 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivera om din enhet använder SMS/MMS sändning över WiFi (aktivera endast när \'WiFi Calling\' är aktiverat på din enhet)</string>
   <string name="preferences_app_protection__blocked_contacts">Blockerade kontakter</string>
   <string name="preferences_notifications__display_in_notifications">Visa i aviseringar</string>
+  <string name="preferences_chats__when_using_mobile_data">Vid användande av mobildata</string>
+  <string name="preferences_chats__when_using_wifi">Vid användande av Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Vid roaming</string>
+  <string name="preferences_chats__media_auto_download">Autonedladdning av media</string>
+  <string name="preferences_chats__message_trimming">Trimma meddelanden</string>
+  <string name="preferences_advanced__use_system_emoji">Använd systemets emojis</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Stäng av TextSecures inbyggda emojistöd</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-ta/strings.xml

@@ -273,6 +273,7 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure பதிவு வெற்றிகரமாக நிறைவுபெற்றது.</string>
   <string name="RegistrationService_registration_error">பதிவுசெய்தலில்  பிழை</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure பதிவு ஒரு பிரச்சனையை சந்தித்தது.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">சிதைந்த சாவிபரிமாற்ற
  செய்தி பெறப்பட்டது!</string>

res/values-tr/strings.xml

@@ -290,6 +290,7 @@ Numaranızı ikinci kez kontrol ediniz! Onu bir SMS ile doğrulamak üzereyiz.</
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure kaydı başarıyla tamamlandı.</string>
   <string name="RegistrationService_registration_error">Kayıt hatası</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure kaydı bir sorunla karşılaştı.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Bozulmuş anahtar değişim 
 mesajı alındı!</string>

res/values-uk/strings.xml

@@ -1,390 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">Так</string>
-  <string name="no">Ні</string>
-  <string name="delete">Видалити</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">Зараз: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ви ще не вказали фразу-пароль!</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Вилучити всі старі повідомлення зараз?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ви впевнені що хочете негайно обрізати всі розмови до %s останніх повідомлень?</string>
-  <string name="ApplicationPreferencesActivity_delete">Видалити</string>
-  <string name="ApplicationPreferencesActivity_disable">Вимкнути</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Помилка підключення до сервера!</string>
-  <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_touch_to_make_textsecure_your_default_sms_app">Торкніться аби зробити TextSecure типовою програмою SMS</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">Зображення</string>
-  <string name="AttachmentTypeSelectorAdapter_video">Відео</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">Аудіо</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Можливо, вам потрібно перевірити цей контакт.</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Розмір повідомленя: %d KБ</string>
-  <string name="ConversationItem_expires_s">Минає: %s</string>
-  <string name="ConversationItem_view_secure_media_question">Переглянути захищений медіа-файл?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Цей медіа-файл зберігається в зашифрованій базі даних. Через технічні обмеження для того, щоб переглянути його через сторонній додаток, необхідно його тимчасово розшифрувати і записати на диск. Ви впевнені, що хочете це зробити?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Помилка, отримано застаріле повідомлення обміну ключами.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Отримано повідомлення обміну ключами, натисніть щоб його обробити</string>
-  <string name="ConversationItem_group_action_left">%1$s більше не в групі.</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Почати захищений сеанс зв’язку з %s?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ви впевнені, що хочете завершити цей захищений сеанс зв’язку?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ви впевнені, що хочете назавжди видалити цю розмову?</string>
-  <string name="ConversationActivity_add_attachment">Додати прикріплення</string>
-  <string name="ConversationActivity_select_contact_info">Виберіть контакт</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Вибачте, сталася помилка при обробці вкладення.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Адреса одержувача не є ні номером телефону, ні адресою електронної пошти!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">Повідомлення порожнє!</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d отримувачів в групі</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 учасник</string>
-  <string name="ConversationActivity_invalid_recipient">Неприпустимий отримувач!</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Ваше пристрій мабуть не підтримує голосові дзвінки.</string>
-  <string name="ConversationActivity_leave_group">Покинути групу?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Ви дійсно хочете покинути цю групу?</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">Деталі повідомлення</string>
-  <string name="ConversationFragment_success_exclamation">Успішно!</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Видалити розмови?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ви впевнені, що хочете видалити ВСІ вибрані розмови?</string>
-  <string name="ConversationListFragment_deleting">Вилучення</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Видалення обраних бесід\u2026</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Повідомлення обміну ключами\u2026</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">Експортувати</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Увага, цим Ви експортуєте на SD-карту свої повідомлення в незашифрованому вигляді.</string>
-  <string name="ExportFragment_cancel">Скасувати</string>
-  <string name="ExportFragment_exporting">Експортування</string>
-  <string name="ExportFragment_success">Успішно!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_creating_group">Створення %1$s…</string>
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">Імпортувати</string>
-  <string name="ImportExportActivity_export">Експортувати</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Це імпортує повідомлення з системної бази даних SMS в TextSecure. Якщо Ви вже робили це, то повторний імпорт призведе до дублювання повідомлень.</string>
-  <string name="ImportFragment_import">Імпортувати</string>
-  <string name="ImportFragment_cancel">Скасувати</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Відновлення з шифрованої резервної копії повністю замінить ваші поточні ключі, налаштування та повідомлення. Ви втратите всю інформацію поточної установки TextSecure, але не резервну копію.</string>
-  <string name="ImportFragment_restore">Відновити</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Це імпортує повідомлення з текстової резервної копії. Якщо ви до цього імпортували SMS з системної бази даних, повторний імпорт призведе до дублювання повідомлень.</string>
-  <string name="ImportFragment_importing">Імпортування</string>
-  <string name="ImportFragment_no_plaintext_backup_found">Незашифрована резервна копія не знайдена!</string>
-  <string name="ImportFragment_error_importing_backup">Помилка при імпорті!</string>
-  <string name="ImportFragment_import_complete">Імпортування завершено!</string>
-  <string name="ImportFragment_restoring">Відновлення</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Відновлення зашифрованої резервної копії\u2026</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Зашифрована резервна копія не знайдена!</string>
-  <string name="ImportFragment_restore_complete">Відновлення завершено!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">При скануванні ключ невиявлений!</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">Помилка при збереженні MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Помилка підключення до MMS провайдеру\u2026</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Помилка читання налаштувань MMS провайдера\u2026</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Невірна стара фраза!</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">Підключитися до TextSecure</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Ви маєте вказати код країни</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Ви маєте вказати свій номер телефону</string>
-  <string name="RegistrationActivity_invalid_number">Невірний номер</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Вказаний вами номер (%s) не є дійсним.</string>
-  <string name="RegistrationActivity_unsupported">Не підтримується</string>
-  <string name="RegistrationActivity_continue">Продовжити</string>
-  <string name="RegistrationActivity_edit">Редагувати</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Перевірка номера</string>
-  <string name="RegistrationProgressActivity_edit_s">Редагувати %s</string>
-  <string name="RegistrationProgressActivity_registration_complete">Реєстрацію завершено!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Необхідно ввести отриманий код\u2026</string>
-  <string name="RegistrationProgressActivity_connecting">Підключення</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Підключення до сервера верифікації\u2026</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Неможливо підключитися. Перевірте підключення до мережі та повторіть спробу.</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Введений код підтвердження неправильний. Спробуйте ще раз.</string>
-  <string name="RegistrationProgressActivity_too_many_attempts">Забагато спроб</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Занадто багато спроб введення неправильних кодів підтвердження. Зачекайте хвилину і спробуйте знову.</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Виконується запит телефонного дзвінка\u2026</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">На сервері сталася помилка. Будь ласка, спробуйте ще.</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Телефонний дзвінок вже був запитаний. Запросити ще один можна тільки через 20 хвилин.</string>
-  <!--RegistrationService-->
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Реєстрація в службі TextSecure успішно виконана.</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Виникла помилка при реєстрації на TextSecure.</string>
-  <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Отримано пошкоджене повідомлення обміну ключами!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">Отримано повідомлення обміну ключами для неправильної версії протоколу.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">Отримано повідомлення з невідомим особистим ключем. Натисніть для його відображення.</string>
-  <string name="SmsMessageRecord_secure_session_ended">Захищений сеанс завершено.</string>
-  <!--ThreadRecord-->
-  <string name="TheadRecord_secure_session_ended">Захищений сеанс завершено.</string>
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">У вас немає особистого ключа.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">У одержувача немає особистого ключа.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">У одержувача немає особистого ключа!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Cканувати ключ співрозмовника</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Дати сканувати мій ключ</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">УВАГА, просканований ключ НЕ СПІВПАДАЄ! Уважно перевірте текст відбитка.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">НЕ перевірено!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ключ співрозмовника вірний. Також необхідно, щоб співрозмовник підтвердив ваш ключ.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Перевірено!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">У вас немає особистого ключа!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">У вас немає особистого ключа.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Сканувати і порівняти</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Дати сканувати і порівняти</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">УВАГА, просканований ключ НЕ СПІВПАДАЄ!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Просканований ключ збігається!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Перевірено!</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ви вже відправили цьому співрозмовнику запит на початок сеансу. Ви впевнені, що хочете відправити ще один? Попередній буде анульовано.</string>
-  <string name="KeyExchangeInitiator_send">Відправити</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Зашифроване повідомлення зіпсоване\u2026</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Триває розшифрування, зачекайте, будь ласка\u2026</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Повідомлення зашифровано для неіснуючої сесії\u2026</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Підключення до MMS сервера\u2026</string>
-  <string name="MmsDatabase_downloading_mms">Завантаження MMS\u2026</string>
-  <string name="MmsDatabase_downloading">Завантаження\u2026</string>
-  <string name="MmsDatabase_mms_pending_download">Торкніться аби підлаштувати параметри MMS та продовжити завантаження.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">Розшифрування MMS, зачекайте, будь ласка\u2026</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Зашифроване MMS повідомлення зіпсоване\u2026</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS повідомлення зашифровано для неіснуючої сесії\u2026</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Триває імпортування</string>
-  <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Фраза-ключ TextSecure кешована</string>
-  <string name="KeyCachingService_passphrase_cached">Фраза-ключ кешована</string>
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">Збій доставки повідомлення.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">Не вдалось доставити повідомлення.</string>
-  <string name="MessageNotifier_error_delivering_message">Помилка доставки повідомлення.</string>
-  <string name="MessageNotifier_mark_all_as_read">Позначити все як прочитане</string>
-  <!--QuickResponseService-->
-  <!--SingleRecipientNotificationBuilder-->
-  <!--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-->
-  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">Контактів не знайдено.</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">Вибрати для</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">Останнім часом ви нікому не телефонували.</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">Надіслати</string>
-  <string name="conversation_activity__remove">Вилучити</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">Завантажити</string>
-  <string name="conversation_item_sent__downloading">Завантаження</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">Завантажити</string>
-  <string name="conversation_item_received__downloading">Завантаження</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Завантаження країн\u2026</string>
-  <string name="country_selection_fragment__search">Пошук</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Не вдалось захопити журнал відлагодження. Натомість ви можете скористатись ADB, щоб це зробити.</string>
-  <string name="log_submit_activity__thanks">Дякуємо за вашу допомогу!</string>
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ви хочете імпортувати існуючі текстові повідомлень в зашифровану базу даних TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Системна база даних не буде порушена.</string>
-  <string name="database_migration_activity__skip">Пропустити</string>
-  <string name="database_migration_activity__import">Імпортувати</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Це може зайняти якийсь час. Будь ласка, наберіться терпіння, ми Вам повідомимо, коли імпортування завершиться.</string>
-  <string name="database_migration_activity__importing">ІМПОРТУВАННЯ</string>
-  <!--database_upgrade_activity-->
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Експортувати на SD-карту незашифровану резервну копію, сумісну з додатком \'SMSBackup And Restore\'.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Імпортувати базу даних з SMS-додатку, який використовується зараз за замовчуванням.</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Відновити з раніше експортованої зашифрованої резервної копії TextSecure</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">Імпортувати з незашифрованої резервної копії. Сумісно з додатком \'SMSBackup And Restore\'.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Параметри MMS для вашого телефону потрібно вказати вручну.</string>
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">Розблокувати</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Для надсилання MMS-повідомлень TextSecure необхідно знати настройки APN вашого оператора. Однак ваш пристрій не надає цієї інформації - так іноді буває, якщо воно заблоковане або відповідним чином налаштоване.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Щоб мати можливість відправляти MMS-повідомлення, введіть інформацію про APN нижче. Потрібні значення для вашого оператора можна знайти в інтернеті за запитом \'оператор APN\' або в його службі підтримки. Це потрібно зробити тільки один раз.</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <string name="registration_activity__your_country">ВАША КРАЇНА</string>
-  <string name="registration_activity__your_country_code_and_phone_number">КОД ВАШОЇ КРАЇНИ ТА НОМЕР ТЕЛЕФОНУ
-    </string>
-  <string name="registration_activity__phone_number">НОМЕР ТЕЛЕФОНУ</string>
-  <string name="registration_activity__register">Реєстрація</string>
-  <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Можливі проблеми:</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">Деякі програми повідомлень інших розробників, такі як Handcent або GoSMS, спрацьовують некоректно і перехоплюють всі вхідні SMS-повідомлення. Перевірте наявність отриманих повідомлень, які починаються з \'Ваш код доступу TextSecure\', якщо такі повідомлення є, вам потрібно налаштувати ваш додаток повідомлень інших розробників для пропуску текстових повідомлень.</string>
-  <string name="registration_problems__incorrect_number">Неправильний номер.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">Переконайтеся, що номер введений правильно і має вірний формат.</string>
-  <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">TextSecure не працюватиме з номерами Голосового пошуку Google.</string>
-  <!--registration_progress_activity-->
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">TextSecure може зробити дзвінок для перевірки вашого номера. Торкніться \'Подзвонити мені\' і введіть шестизначний код, який ви почуєте, нижче.</string>
-  <string name="registration_progress_activity__verify">Перевірити</string>
-  <string name="registration_progress_activity__edit_number">Редагувати номер</string>
-  <string name="registration_progress_activity__connectivity_error">Помилка взаємозв’яку.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure не може підключитися до 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__restrictive_firewall">Обмежувальні брандмауер.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">TextSecure зараз перевірить ваш номер підтверджувальним SMS-повідомленням.</string>
-  <string name="registration_progress_activity__connecting">Підключення\u2026</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Очікування SMS для перевірки\u2026</string>
-  <string name="registration_progress_activity__registering_with_server">Реєстрація на сервері\u2026</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Це може зайняти якийсь час. Будь ласка, наберіться терпіння, ми вам повідомимо, коли перевірка завершиться.</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">Минув час очікування TextSecure перевірочної SMS.</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS-перевірка не вдалася.</string>
-  <string name="registration_progress_activity__generating_keys">Генерація ключів\u2026</string>
-  <!--recipients_panel-->
-  <string name="recipients_panel__add_member">Додати учасника</string>
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Cпіврозмовник (він читає):</string>
-  <string name="verify_identity_activity__your_identity_you_read">Ви (ви читаєте):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">Змінити фразу-ключ</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">Загальні</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Виберіть себе із списку контактів.</string>
-  <string name="preferences__change_passphrase">Змінити фразу-ключ</string>
-  <string name="preferences__change_my_passphrase">Змінити мою фразу-ключ</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Стирати з пам’яті фразу-ключ через деякий час</string>
-  <string name="preferences__timeout_passphrase">Забувати фразу-ключ</string>
-  <string name="preferences__pref_timeout_interval_title">Термін зберігання</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Час, після якого фраза-пароль буде стерта з пам’яті</string>
-  <string name="preferences__notifications">Сповіщення</string>
-  <string name="preferences__led_color">Колір LED</string>
-  <string name="preferences__pref_led_blink_title">Шаблон мерехтіння LED</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">Власний шаблон мерехтіння LED задано!</string>
-  <string name="preferences__sound">Звук</string>
-  <string name="preferences__change_notification_sound">Змінити звук сповіщення</string>
-  <string name="preferences__inthread_notifications">Повідомлення при розмові</string>
-  <string name="preferences__vibrate">Вібрувати</string>
-  <string name="preferences__also_vibrate_when_notified">Також вібрувати під час сповіщення</string>
-  <string name="preferences__minutes">хвилин</string>
-  <string name="preferences__hours">годин</string>
-  <string name="preferences__green">Зелений</string>
-  <string name="preferences__red">Червоний</string>
-  <string name="preferences__blue">Синій</string>
-  <string name="preferences__orange">Помаранчевий</string>
-  <string name="preferences__cyan">Ціан</string>
-  <string name="preferences__magenta">Пурпуровий</string>
-  <string name="preferences__fast">Швидко</string>
-  <string name="preferences__normal">Звичайний</string>
-  <string name="preferences__slow">Повільно</string>
-  <string name="preferences__custom">Користувацький</string>
-  <string name="preferences__advanced">Додаткові функції</string>
-  <string name="preferences__override_system_mms_settings">Перезаписати системні налаштування MMS вказаними нижче.</string>
-  <string name="preferences__sms_delivery_reports">Звіти про доставку SMS</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запитувати звіт про доставку для кожного відісланого вами SMS</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматично видаляти старі повідомлення, коли довжина розмови перевищує задану</string>
-  <string name="preferences__delete_old_messages">Вилучати старі повідомлення</string>
-  <string name="preferences__conversation_length_limit">Обмеження довжини розмови</string>
-  <string name="preferences__trim_all_threads_now">Обрізати всі розмови</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Переглянути всі розмови і привести їх довжину у відповідність із заданою</string>
-  <string name="preferences__appearance">Вигляд</string>
-  <string name="preferences__theme">Тема</string>
-  <string name="preferences__default">Типово</string>
-  <string name="preferences__language">Мова</string>
-  <string name="preferences__submit_debug_log">Відіслати журнал відлагодження</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">Завершено</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">Виклик</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Деталі повідомлення</string>
-  <string name="conversation_context__menu_copy_text">Скопіювати текст</string>
-  <string name="conversation_context__menu_delete_message">Видалити повідомлення</string>
-  <string name="conversation_context__menu_forward_message">Переслати повідомлення</string>
-  <string name="conversation_context__menu_resend_message">Переслати повідомлення</string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">Безпека</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">Пошук</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">Безпека</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">Додати вкладення</string>
-  <string name="conversation__menu_delete_thread">Видалити розмову</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Список одержувачів</string>
-  <string name="conversation_group_options__delivery">Доставка</string>
-  <string name="conversation_group_options__conversation">Розмова</string>
-  <string name="conversation_group_options__broadcast">Трансляція</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">Порівняти</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Дати сканувати і порівняти</string>
-  <string name="key_scanning__menu_scan_to_compare">Сканувати і порівняти</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">Налаштування</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Очистити фразу-ключ</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-vi/strings.xml

@@ -334,6 +334,7 @@ mã số quốc gia bạn</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Đăng ký TextSecure đã hoàn tất tốt đẹp.</string>
   <string name="RegistrationService_registration_error">Có lỗi đăng ký</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Đăng ký TextSecure gặp phải vấn đề.</string>
+  <!--Slide-->
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Nhận được thông tin
 trao đổi chìa khóa bị hỏng!</string>

res/values-zh-rCN/strings.xml

@@ -109,6 +109,7 @@
   <string name="ConversationActivity_unblock_question">解除屏蔽？</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">您确定想要解除对此联系人的屏蔽？</string>
   <string name="ConversationActivity_unblock">解除屏蔽</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">当前信息的附件类型已经已经超过大小限制。</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">信息详情</string>
   <string name="ConversationFragment_transport_s_sent_received_s">传输：%1$s\n 发送/接收：%2$s</string>
@@ -319,6 +320,10 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">已经成功完成TextSecure注册。</string>
   <string name="RegistrationService_registration_error">注册出现错误</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure注册出错。</string>
+  <!--Slide-->
+  <string name="Slide_image">图片</string>
+  <string name="Slide_audio">音频</string>
+  <string name="Slide_video">视频</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">收到损坏的密钥
 交换消息！</string>
@@ -725,6 +730,13 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">如果您的设备使用WiFi发送彩信或短信，请启用此选项(仅当\"WiFi 语音呼叫\"在您的设备上启用时才可用)</string>
   <string name="preferences_app_protection__blocked_contacts">已屏蔽的联系人</string>
   <string name="preferences_notifications__display_in_notifications">在通知中显示</string>
+  <string name="preferences_chats__when_using_mobile_data">当使用移动数据时</string>
+  <string name="preferences_chats__when_using_wifi">当使用 WiFi 时</string>
+  <string name="preferences_chats__when_roaming">当漫游时</string>
+  <string name="preferences_chats__media_auto_download">媒体自动下载</string>
+  <string name="preferences_chats__message_trimming">信息整理</string>
+  <string name="preferences_advanced__use_system_emoji">使用系统表情符号</string>
+  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">禁用 TextSecure 的内置表情支持</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-zh-rTW/strings.xml

@@ -1,594 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">是</string>
-  <string name="no">否</string>
-  <string name="delete">刪除</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">目前: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您尚未建立『自訂密碼』！</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">刪除\"全部\"的舊訊息？</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">您確定要將所有對話群組精簡為只剩最近 %s 則的對話？</string>
-  <string name="ApplicationPreferencesActivity_delete">刪除</string>
-  <string name="ApplicationPreferencesActivity_disable">解除</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">與伺服器的連線發生錯誤！</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">按這裡來變更您預設的手機簡訊APP</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">按這裡將 TextSecure 設為預設的手機簡訊APP</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <string name="AttachmentManager_cant_open_media_selection">找不到合適的 APP 來選擇媒體檔案。</string>
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">照片</string>
-  <string name="AttachmentTypeSelectorAdapter_video">影片</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">音樂</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">您想要對這名連絡人
-進行認證嗎？</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">訊息大小: %d KB</string>
-  <string name="ConversationItem_expires_s">於: %s 後過期</string>
-  <string name="ConversationItem_view_secure_media_question">檢視安全的媒體檔案？</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">由於這個媒體檔案已被加密。如果要用外部的媒體瀏覽APP來開啟／檢視它，則需將其解密並儲存至未加密的空間。您確定要這樣做嗎？</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">錯誤，收到的是過期的金鑰交換訊息。</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">接收到金鑰交換訊息，按一下開始更新。</string>
-  <string name="ConversationItem_group_action_left">%1$s 已經離開群組。</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">撤回未加密的手機簡訊？</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">撤回未加密的多媒體簡訊？</string>
-  <string name="ConversationItem_unable_to_open_media">找不到合適的 APP 來開啟媒體檔案。</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_question">開啟一條安全連線？</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">與 %s 開啟安全連線？</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">結束安全連線再確認</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">您真的確定要結束此安全連線？</string>
-  <string name="ConversationActivity_delete_thread_confirmation">刪除對話再確認</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">您真的確定要永久刪除此則對話紀錄？</string>
-  <string name="ConversationActivity_add_attachment">增加附件檔案</string>
-  <string name="ConversationActivity_select_contact_info">選擇連絡人資訊</string>
-  <string name="ConversationActivity_compose_message">撰寫訊息</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">抱歉，無法成功設定您指定的附件檔案</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">收件人並不是一個有效的 手機門號 或 email 位址！</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">訊息內容是空的！</string>
-  <string name="ConversationActivity_group_conversation">群組聊天</string>
-  <string name="ConversationActivity_unnamed_group">未命名的群組</string>
-  <string name="ConversationActivity_d_recipients_in_group">有 %d 名成員</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">有 1 名成員</string>
-  <string name="ConversationActivity_saved_draft">草稿已存</string>
-  <string name="ConversationActivity_invalid_recipient">無效的連絡人！</string>
-  <string name="ConversationActivity_calls_not_supported">不支援的通話</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">您使用的裝置看來不支援撥號通話功能。</string>
-  <string name="ConversationActivity_leave_group">離開群組？</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">您確定要離開此群組？</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</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>
-  <string name="ConversationFragment_confirm_message_delete">刪除訊息確認</string>
-  <string name="ConversationFragment_save_to_sd_card">儲存到儲存裝置？</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">將檔案儲存到儲存裝置，將會使得手機上的其他 APP 也能存取它。\n\n您要繼續嗎？</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">儲存檔案到儲存裝置時發生錯誤！</string>
-  <string name="ConversationFragment_success_exclamation">成功！</string>
-  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">無法寫入儲存裝置！</string>
-  <string name="ConversationFragment_saving_attachment">正在儲存附件檔案</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">正在寫入儲存裝置中...</string>
-  <string name="ConversationFragment_deleting">正在刪除</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">刪除對話群組？</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">您確定要刪除已選擇的對話群組？</string>
-  <string name="ConversationListFragment_deleting">正在刪除</string>
-  <string name="ConversationListFragment_deleting_selected_threads">正在刪除已選的對話群組...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">金鑰交換訊息...</string>
-  <!--CustomDefaultPreference-->
-  <string name="CustomDefaultPreference_none">無</string>
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <string name="ShareActivity_share_with">分享給</string>
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">匯出</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">以純文字（未加密）格式輸出至 SD 卡？</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">警告！這將會
-        以未加密的格式將您的 TextSecure 訊息紀錄匯出到 SD 卡中！
-    </string>
-  <string name="ExportFragment_cancel">取消</string>
-  <string name="ExportFragment_exporting">正在匯出...</string>
-  <string name="ExportFragment_success">成功！</string>
-  <!--GcmRefreshJob-->
-  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">TextSecure 持續發生傳輸異常！</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure 無法順利註冊為 Google Play Services。指定的傳輸通道已被停用。請試著從TextSecure 的設定選單中，重新註冊。</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">因您選擇加入未安裝 TextSecure 對話群組的連絡人，所以這個群組將被設定為 MMS-多媒體簡訊群組。</string>
-  <string name="GroupCreateActivity_you_dont_support_push">由於您為註冊使用加密的資料通道，所以 TextSecure 對話群組將被取消。</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">擲茭？ 無法成功建立群組。</string>
-  <string name="GroupCreateActivity_contacts_no_members">建立群組至少需要加入一個連絡人！</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">群組中某個連絡人的號碼有誤，請更正或移除該名連絡人，並再試一次。</string>
-  <string name="GroupCreateActivity_avatar_content_description">群組的大頭照</string>
-  <string name="GroupCreateActivity_menu_create_title">建立群組</string>
-  <string name="GroupCreateActivity_creating_group">%1$s 建立中…</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">無法加入未使用 TextSercure APP 的連絡人到既有的 TextSecure 群組中</string>
-  <!--GroupMembersDialog-->
-  <string name="GroupMembersDialog_me">我</string>
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">匯入</string>
-  <string name="ImportExportActivity_export">匯出</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_import_system_sms_database">匯入目前裝置上的手機簡訊？</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">這將會匯入
-        目前裝置上已收發的手機簡訊到 TextSecure APP 中。如果您之前已經做過，
-       再匯入一次手機簡訊將會使 TextSecure 中出現重複的簡訊。
-    </string>
-  <string name="ImportFragment_import">匯入</string>
-  <string name="ImportFragment_cancel">取消</string>
-  <string name="ImportFragment_restore_encrypted_backup">自加密的備份資料庫中還原？</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-        從加密的備份資料庫還原，將會覆蓋您目前所使用的金鑰、設定
-        ，以及訊息。若從您上一次備份後，有任何新增的紀錄、設定等資料
-        將一併被抹除。
-    </string>
-  <string name="ImportFragment_restore">還原</string>
-  <string name="ImportFragment_import_plaintext_backup">匯入未加密的備份資料庫？</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">這將會匯入
-       未經加密的訊息紀錄備份檔案。 如果您之前已經做過，
-       再匯入一次訊息紀錄將會使 TextSecure 中出現重複的訊息紀錄。
-    </string>
-  <string name="ImportFragment_importing">匯入中</string>
-  <string name="ImportFragment_no_plaintext_backup_found">找不到任何未加密的備份檔案！</string>
-  <string name="ImportFragment_error_importing_backup">匯入備份時發生錯誤！</string>
-  <string name="ImportFragment_import_complete">匯入完成！</string>
-  <string name="ImportFragment_restoring">正在還原</string>
-  <string name="ImportFragment_restoring_encrypted_backup">正在還原已加密的備份...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">找不到已加密的備份檔案！</string>
-  <string name="ImportFragment_restore_complete">還原完成！</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">找不到任何金鑰！</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">儲存 MMS 多媒體簡訊時有誤！</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">連線到 MMS 多媒體簡訊伺服器時有誤！</string>
-  <string name="MmsDownloader_error_reading_mms_settings">讀取 MMS多媒體簡訊伺服器的無線設定時有誤！</string>
-  <!--NotificationMmsMessageRecord-->
-  <string name="NotificationMmsMessageRecord_multimedia_message">多媒體訊息</string>
-  <!--MessageRecord-->
-  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">您收到一則已加密的訊息，但採用的是舊版／不支援的 TextSecure。您須提醒該名連絡人更新 TextSecure 版本後再重送。</string>
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">輸入的「自訂密碼」不相符！</string>
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">輸入的是舊的「自訂密碼」！</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <string name="PassphrasePromptActivity_enter_passphrase">輸入「自訂密碼」</string>
-  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 圖示</string>
-  <string name="PassphrasePromptActivity_ok_button_content_description">確認『自訂密碼』</string>
-  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">無效的『自訂密碼』！</string>
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">正在與 TextSecure 連線</string>
-  <string name="RegistrationActivity_select_your_country">選擇您的國家／地區</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">您必須輸入
-您的國碼</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">您必須輸入
-您的手機號碼</string>
-  <string name="RegistrationActivity_invalid_number">無效的手機號碼</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">您輸入的
-        號碼 (%s) 是無效的
-    </string>
-  <string name="RegistrationActivity_unsupported">不支援</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">抱歉，
-        你目前使用裝置不支援 TextSecure 即時訊息功能。.採用早於 Android 4.0 或更舊版
-        必須登入已註冊的 Google Account. 採用 Android 4.0 或更新版
-        的手機則無須 Google account，但須具備 Play Store APP。
-    </string>
-  <string name="RegistrationActivity_continue">繼續</string>
-  <string name="RegistrationActivity_edit">更正</string>
-  <!--RegistrationProblemsActivity-->
-  <string name="RegistrationProblemsActivity_possible_problems">可能的問題</string>
-  <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">驗證門號</string>
-  <string name="RegistrationProgressActivity_edit_s">編輯 %s</string>
-  <string name="RegistrationProgressActivity_registration_complete">註冊完成！</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">您必須輸入剛才收到的驗證碼...</string>
-  <string name="RegistrationProgressActivity_connecting">連線中</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">驗證碼確認連線中</string>
-  <string name="RegistrationProgressActivity_network_error">網路錯誤！</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">無法連線。請確認網路連線後再試。</string>
-  <string name="RegistrationProgressActivity_verification_failed">驗證失敗！</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">您輸入的驗證碼不正確。請再試一次。</string>
-  <string name="RegistrationProgressActivity_too_many_attempts">您已重複嘗試太多次</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">您已重複嘗試輸入錯誤的驗證碼數次，請等約莫一分鐘後再試。</string>
-  <string name="RegistrationProgressActivity_requesting_call">請求語音通話</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">請求撥出語音通話告知驗證碼...</string>
-  <string name="RegistrationProgressActivity_server_error">伺服器錯誤</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">伺服器發生錯誤，請稍後再試。</string>
-  <string name="RegistrationProgressActivity_too_many_requests">送出太多次要求！</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">您剛已接到一通語音驗證碼提示通話。須於20分鐘後再提出下一次通話需求。</string>
-  <string name="RegistrationProgressActivity_registration_conflict">註冊發生衝突</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">您已用此組電話號碼註冊過 TextSecure (在 CyanogenMod或模擬器上？) 您必須回到該裝置上解除註冊後，才能於此裝置重新註冊。</string>
-  <!--RegistrationService-->
-  <string name="RegistrationService_registration_complete">註冊完成</string>
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure 註冊程序已完成！</string>
-  <string name="RegistrationService_registration_error">註冊失敗</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">您的 TextSecure 註冊程序發生錯誤。</string>
-  <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">收到一組毀損的
-金鑰交換訊息！</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
-        收到的金鑰交換訊息是未知的協定／版本。
-    </string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-        收到的金鑰交換訊息夾帶未知的身分值，按此顯示細節並執行。
-    </string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">已接收金鑰交換更新請求但未知對方身分。按此進行身分確認。</string>
-  <string name="SmsMessageRecord_secure_session_ended">安全連線已結束。</string>
-  <string name="SmsMessageRecord_duplicate_message">複製訊息。</string>
-  <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">離開這個群組...</string>
-  <string name="TheadRecord_secure_session_ended">安全連線已結束。</string>
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">您不具備身分認證金鑰。</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">收件者不具備身分認證金鑰。</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">收件者不具備身分認證金鑰！</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">比對他們的金鑰</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">驗證我的金鑰</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">警告！驗證結果不符合！請再目視並仔細比對一次指紋碼。</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">無法驗證！</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">對方提供的金鑰是正確的。但您也必須將您的金鑰與其比對。</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">已驗證！</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">您不具備身分認證金鑰！</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">您不具備身分認證金鑰。</string>
-  <string name="ViewIdentityActivity_scan_to_compare">掃描以比對</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">掃描並且進行比對</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">警告！掃描的值並不相符！</string>
-  <string name="ViewIdentityActivity_not_verified_exclamation">無法驗證！</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">掃描的金鑰相符！</string>
-  <string name="ViewIdentityActivity_verified_exclamation">已驗證！</string>
-  <string name="ViewIdentityActivity_my_identity_fingerprint">我的身分識別指紋碼</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">忽略既有請求，依然啟動？</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">您已對連絡人送出請求，而現在您還要再送出另一個新的請求？這樣將使前一個請求自動失效。</string>
-  <string name="KeyExchangeInitiator_send">送出</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">不良的加密訊息...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">解密中... 請稍後...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">與加密訊息匹配的連線已不存在...</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">連線到 MMS多媒體訊息伺服器...</string>
-  <string name="MmsDatabase_downloading_mms">正在下載 MMS多媒體訊息...</string>
-  <string name="MmsDatabase_mms_download_failed">MMS多媒體訊息下載失敗！</string>
-  <string name="MmsDatabase_downloading">下載中...</string>
-  <string name="MmsDatabase_mms_pending_download">按一下進行MMS多媒體訊息設定值調整，以利繼續下載。</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">解密 MMS多媒體訊息中，請稍後...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">失效的加密 MMS多媒體簡訊...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">與 加密 MMS多媒體簡訊匹配的連線已不存在...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">匯入中</string>
-  <string name="ApplicationMigrationService_importing_text_messages">匯入文字簡訊</string>
-  <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">按一下開啟</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">按一下開啟，或按一下鎖住並關閉。</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure 已解除鎖定</string>
-  <string name="KeyCachingService_lock">以『自訂密碼』進行鎖定</string>
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_no_subject">(在此輸入主題)</string>
-  <string name="MessageNotifier_message_delivery_failed">訊息傳送失敗。</string>
-  <string name="MessageNotifier_failed_to_deliver_message">無法傳送訊息。</string>
-  <string name="MessageNotifier_error_delivering_message">傳送訊息發生失誤。</string>
-  <string name="MessageNotifier_mark_all_as_read">全部標示為已讀</string>
-  <string name="MessageNotifier_media_message">媒體訊息</string>
-  <!--QuickResponseService-->
-  <!--SingleRecipientNotificationBuilder-->
-  <!--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-->
-  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">沒有連絡人。</string>
-  <string name="contact_selection_group_activity__finding_contacts">載入連絡人中...</string>
-  <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_contact_photo">連絡人的相片</string>
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">相片</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">沒有最近通話。</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">傳送 TextSecure 加密訊息</string>
-  <string name="conversation_activity__send">送出</string>
-  <string name="conversation_activity__remove">移除</string>
-  <string name="conversation_activity__window_description">與 %1$s 聊天</string>
-  <string name="conversation_activity__compose_description">編輯簡訊</string>
-  <string name="conversation_activity__emoji_toggle_description">叫出「表情符號」列表</string>
-  <!--conversation_item-->
-  <string name="conversation_item__mms_image_description">媒體訊息</string>
-  <string name="conversation_item__secure_message_description">安全的訊息</string>
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">下載</string>
-  <string name="conversation_item_sent__downloading">正在下載</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">傳送失敗</string>
-  <string name="conversation_item_sent__pending_approval_description">等待核准</string>
-  <string name="conversation_item_sent__delivered_description">已傳送</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">下載</string>
-  <string name="conversation_item_received__contact_photo_description">連絡人的相片</string>
-  <string name="conversation_item_received__downloading">下載中...</string>
-  <!--conversation_fragment_cab-->
-  <string name="conversation_fragment_cab__batch_selection_mode">批次選擇模式</string>
-  <string name="conversation_fragment_cab__batch_selection_amount">%s 已選</string>
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">載入國家清單中...</string>
-  <string name="country_selection_fragment__search">搜尋</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">無法從您的裝置上取得紀錄資料。 您還是可以改透過 ADB 來擷取除錯記錄檔。</string>
-  <string name="log_submit_activity__thanks">感謝您的協助！</string>
-  <string name="log_submit_activity__submitting">上傳中</string>
-  <string name="log_submit_activity__posting_logs">正在把登錄資料轉貼到gist上...</string>
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">您想把裝置上既有的簡訊紀錄都匯入 TextSecure 的加密資料庫裡面嗎？</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">裝置上預設的資料庫將不會被做任何修改或變更。</string>
-  <string name="database_migration_activity__skip">略過</string>
-  <string name="database_migration_activity__import">匯入</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">這可能花上一點時間處理。請耐心等候，當匯入完成我們將告知您。</string>
-  <string name="database_migration_activity__importing">匯入中</string>
-  <!--database_upgrade_activity-->
-  <string name="database_upgrade_activity__updating_database">更新資料庫...</string>
-  <string name="export_fragment__export_plaintext_backup">匯出未加密的備份資料</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-匯出一個未加密、但相容於 \"SMSBackup And Restore\" 格式的備份資料到 SD 卡。</string>
-  <string name="import_fragment__import_system_sms_database">匯入裝置上的手機簡訊</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">從裝置上預設的手機簡訊管理程式
-匯入簡訊資料。</string>
-  <string name="import_fragment__import_encrypted_backup">匯入加密的備份資料</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
-還原前一個匯出的 TestSecure 加密備份資料庫。</string>
-  <string name="import_fragment__import_plaintext_backup">匯入未加密的資料備份</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">
-匯入一個未加密的備份資料。 相容於 \"SMSBackup And Restore\"。</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">您的手機需要手動設定 MMS多媒體簡訊。</string>
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">解鎖</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure 需要您通信業者的 MMS多媒體簡訊設定以發送媒體檔案與群組訊息。目前您的裝置並未提供完整的相關資訊，有時是因為裝置出廠時即被鎖定／限制該方面的功能。</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">傳送媒體檔案或群組訊息，請按下 \"OK\" 並完成必要的設定。您所使用電信業者相關的MMS多媒體簡訊設定可能羅列在 \'無線與網路／行動網路\'的設定項目內。且您只需設定一次。</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <string name="recipient_preferences__vibrate">震動</string>
-  <!--registration_activity-->
-  <string name="registration_activity__your_country">您的國家／區域</string>
-  <string name="registration_activity__your_country_code_and_phone_number">您的國碼與
-手機號碼</string>
-  <string name="registration_activity__phone_number">手機號碼</string>
-  <string name="registration_activity__register">註冊</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">註冊過程中將會傳送某些您手機上的連絡人資訊到我們的伺服器端。不過它們不會被保存在伺服器上。</string>
-  <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">某些可能的問題
-包含：</string>
-  <string name="registration_problems__sms_interceptors">手機簡訊攔截</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
-某些第三方的手機簡訊程式，如 Handcent、GoSMS 對於接收手機簡訊的能力不盡理想。請嚐試看
-您是否能收到一個包含 \'Your TextSecure verification code:\' 的新簡訊，如果不能收到，
-那麼您可能必須再調整這類簡訊程式的設定，好讓手機簡訊可以順利接收。</string>
-  <string name="registration_problems__incorrect_number">手機號碼不正確</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
-請再確認您輸入的號碼的正確性，並且依照您所處的位置
-給予正確的區碼／國碼。</string>
-  <string name="registration_problems__google_voice">Google 語音輸入</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
-TextSecure 無法利用 Google語音輸入來撥號。</string>
-  <!--registration_progress_activity-->
-  <string name="registration_progress_activity__voice_verification">語音認證</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
-TextSecure 也可撥出電話到您的手機並告知您驗證碼。 按下 \'打給我\' 並且輸入您聽到的 6 位數驗證碼。</string>
-  <string name="registration_progress_activity__verify">驗證</string>
-  <string name="registration_progress_activity__call_me">打給我</string>
-  <string name="registration_progress_activity__edit_number">輸入號碼</string>
-  <string name="registration_progress_activity__connectivity_error">連線失敗。</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
-TextSecure 無法連線到即時訊息服務。</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">您的
-裝置需要網際網路的連線能力，才能使用 TextSecure 的即時訊息功能。
-請先確認您是否已透過 3G/4G 或 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連線，有可能是防火牆阻擋了
-TextSecure的伺服器連線。請試著用別的網路或行動上網看看。</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-TextSecure將會發送一則包含確認碼的手機簡訊來自動驗證您的手機號碼。</string>
-  <string name="registration_progress_activity__connecting">連線中...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">等待手機簡訊
-驗證中...</string>
-  <string name="registration_progress_activity__registering_with_server">透過伺服器來進行註冊...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">這
-可能花上一點時間。請耐心等候，將流程完成時，我們將告知您。</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
-TextSecure 等候驗證用的手機簡訊已逾時。</string>
-  <string name="registration_progress_activity__sms_verification_failed">手機簡訊驗證
-已失敗。</string>
-  <string name="registration_progress_activity__generating_keys">產生新的金鑰中...</string>
-  <!--recipients_panel-->
-  <string name="recipients_panel__to"><small>輸入名稱或手機號碼</small></string>
-  <string name="recipients_panel__add_member">新增成員</string>
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">他們的身份 (請他們唸出)</string>
-  <string name="verify_identity_activity__your_identity_you_read">你的驗證碼 (你自己唸出)</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__create_passphrase">新增『自訂密碼』</string>
-  <string name="AndroidManifest__enter_passphrase">輸入「自訂密碼」</string>
-  <string name="AndroidManifest__select_contacts">選擇多個連絡人</string>
-  <string name="AndroidManifest__textsecure_detected">偵測到使用 TextSecure</string>
-  <string name="AndroidManifest__public_identity_key">公鑰／公開金鑰</string>
-  <string name="AndroidManifest__change_passphrase">變更『自訂密碼』</string>
-  <string name="AndroidManifest__verify_identity">驗證身分</string>
-  <string name="AndroidManifest__log_submit">送出偵錯紀錄</string>
-  <string name="AndroidManifest__media_preview">預覽檔案</string>
-  <!--arrays.xml-->
-  <string name="arrays__import_export">匯入／匯出</string>
-  <string name="arrays__my_identity_key">我的身分識別金鑰</string>
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">一般</string>
-  <string name="preferences__pref_all_sms_title">接收所有手機簡訊</string>
-  <string name="preferences__pref_all_mms_title">接收所有MMS多媒體簡訊</string>
-  <string name="preferences__input_settings">輸入設定</string>
-  <string name="preferences__enable_enter_key_title">啟用 Enter 鍵</string>
-  <string name="preferences__replace_smiley_with_enter_key">把介面上的表情符號按鈕，換成 Enter 按鈕</string>
-  <string name="preferences__pref_enter_sends_title">啟用 按 Enter 鍵 就送出訊息</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">若按下 Enter 鍵，不會換行，而是直接把訊息送出</string>
-  <string name="preferences__display_settings">顯示設定</string>
-  <string name="preferences__choose_identity">選擇身份識別</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">從您的連絡人清單中選擇連絡人。</string>
-  <string name="preferences__change_passphrase">變更『自訂密碼』</string>
-  <string name="preferences__change_my_passphrase">變更我的『自訂密碼』</string>
-  <string name="preferences__screen_security">螢幕安全設定</string>
-  <string name="preferences__disable_screen_security_to_allow_screen_shots">停用畫面擷取功能，在對話清單或APP內</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">若閒置太久沒用，讓『自訂密碼』自動幫 TextSecure上鎖</string>
-  <string name="preferences__timeout_passphrase">『自訂密碼』上鎖倒數</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">選擇『自訂密碼』上鎖倒數的區間</string>
-  <string name="preferences__pref_timeout_interval_title">倒數時間</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">等候『自訂密碼』幫 TextSecure 上鎖的等候時間</string>
-  <string name="preferences__notifications">通知</string>
-  <string name="preferences__led_color">LED燈號顏色</string>
-  <string name="preferences__pref_led_blink_title">LED 閃爍模式</string>
-  <string name="preferences__pref_led_blink_custom_pattern_title">自訂 LED 閃爍模式</string>
-  <string name="preferences__pref_led_blink_custom_pattern_on_for">開啟，當:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_off_for">關閉，當:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">自訂 LED 閃爍模式設定完成！</string>
-  <string name="preferences__sound">提示音效</string>
-  <string name="preferences__change_notification_sound">變更通知音效</string>
-  <string name="preferences__inthread_notifications">聊天中的提示音效</string>
-  <string name="preferences__vibrate">震動</string>
-  <string name="preferences__also_vibrate_when_notified">通知時一併啟用震動</string>
-  <string name="preferences__minutes">分</string>
-  <string name="preferences__hours">小時</string>
-  <string name="preferences__green">綠色</string>
-  <string name="preferences__red">紅色</string>
-  <string name="preferences__blue">藍色</string>
-  <string name="preferences__orange">橘色</string>
-  <string name="preferences__cyan">青色</string>
-  <string name="preferences__magenta">洋紅色</string>
-  <string name="preferences__white">白色</string>
-  <string name="preferences__none">無</string>
-  <string name="preferences__fast">快速</string>
-  <string name="preferences__normal">正常</string>
-  <string name="preferences__slow">緩慢</string>
-  <string name="preferences__custom">自訂</string>
-  <string name="preferences__advanced">進階</string>
-  <string name="preferences__override_system_mms_settings">您可自訂 MMS多媒體簡訊設定，並覆蓋過系統的預設值。</string>
-  <string name="preferences__sms_delivery_reports">手機簡訊傳送狀態報告</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">針對每則手機簡訊都要求回覆傳送報告</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">自動刪除舊的簡訊，當對話群組超過一定長度時</string>
-  <string name="preferences__delete_old_messages">刪除舊的簡訊</string>
-  <string name="preferences__conversation_length_limit">對話群組長度上限</string>
-  <string name="preferences__trim_all_threads_now">現在開始精簡所有的對話群組</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">這會掃描目前所有的對話群組，並且強制刪除超過長度上限的部分。</string>
-  <string name="preferences__appearance">介面設定</string>
-  <string name="preferences__theme">主題</string>
-  <string name="preferences__default">預設</string>
-  <string name="preferences__language">語言選項</string>
-  <string name="preferences__submit_debug_log">送出偵錯紀錄</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <string name="contact_selection_list__menu_select_all">全選</string>
-  <string name="contact_selection_list__menu_unselect_all">取消全選</string>
-  <string name="contact_selection_list__header_textsecure_users">全部 TextSecure 使用者</string>
-  <string name="contact_selection_list__header_other">所有使用者</string>
-  <string name="contact_selection_list__unknown_contact">傳送新訊息給...</string>
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">完成</string>
-  <!--refreshing push directory from menu-->
-  <string name="push_directory__menu_refresh">更新連絡人清單</string>
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">撥出</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">訊息細節</string>
-  <string name="conversation_context__menu_copy_text">複製文字</string>
-  <string name="conversation_context__menu_delete_message">刪除訊息</string>
-  <string name="conversation_context__menu_forward_message">轉寄訊息</string>
-  <string name="conversation_context__menu_resend_message">重送訊息</string>
-  <!--conversation_context_image-->
-  <string name="conversation_context_image__save_attachment">另存附件檔案</string>
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__menu_start_secure_session">起始安全連線</string>
-  <string name="conversation_insecure__security">安全設定</string>
-  <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">刪除已選項目</string>
-  <string name="conversation_list_batch__menu_select_all">全選</string>
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">搜尋</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">安全設定</string>
-  <string name="conversation_secure_verified__menu_verify_identity">驗證身分</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">結束安全連線</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">增加附件檔案</string>
-  <string name="conversation__menu_update_group">更新群組</string>
-  <string name="conversation__menu_leave_group">離開對話群組</string>
-  <string name="conversation__menu_delete_thread">刪除對話群組</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">收件人清單</string>
-  <string name="conversation_group_options__delivery">傳送</string>
-  <string name="conversation_group_options__conversation">對話</string>
-  <string name="conversation_group_options__broadcast">訊息廣播</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">比對</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">掃描並且進行比對</string>
-  <string name="key_scanning__menu_scan_to_compare">掃描以比對</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_new_message">新訊息</string>
-  <string name="text_secure_normal__menu_new_group">新增群組</string>
-  <string name="text_secure_normal__menu_settings">設定</string>
-  <string name="text_secure_normal__menu_clear_passphrase">鎖定</string>
-  <string name="text_secure_normal__mark_all_as_read">全部標示為已讀</string>
-  <!--reminder_header-->
-  <string name="reminder_header_sms_default_title">設定為預設的手機簡訊 APP？</string>
-  <string name="reminder_header_sms_import_title">匯入裝置上目前的手機簡訊？</string>
-  <string name="reminder_header_push_title">啟用 TextSecure 即時訊息功能？</string>
-  <!--MediaPreviewActivity-->
-  <string name="MediaPreviewActivity_you">您</string>
-  <!--media_preview-->
-  <string name="media_preview__save_title">儲存</string>
-  <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">預覽圖片</string>
-  <!--Trimmer-->
-  <string name="trimmer__deleting">正在刪除</string>
-  <string name="trimmer__deleting_old_messages">正在刪除舊訊息...</string>
-  <string name="trimmer__old_messages_successfully_deleted">已完成刪除舊訊息。</string>
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values/arrays.xml

@@ -6,8 +6,6 @@
       <item>English</item>
       <item>Arabic العربية</item>
       <item>Bulgarian български</item>
-      <item>Burmese မြန်မာစာ</item>
-      <item>Català</item>
       <item>Čeština</item>
       <item>Chinese 中国的</item>
       <item>Dansk</item>
@@ -15,7 +13,6 @@
       <item>Español</item>
       <item>Français</item>
       <item>Greek ελληνικά</item>
-      <item>Hebrew עברית</item>
       <item>Hrvatski</item>
       <item>Indonesia</item>
       <item>Italiano</item>
@@ -36,9 +33,7 @@
       <item>Slovenský</item>
       <item>Suomi</item>
       <item>Svenska</item>
-      <item>Tibetan བོད་སྐད།</item>
       <item>Türkçe</item>
-      <item>Ukrainian Український</item>
       <item>Vietnamese Tiếng Việt</item>
   </string-array>
 
@@ -47,8 +42,6 @@
       <item>en</item>
       <item>ar</item>
       <item>bg</item>
-      <item>my</item>
-      <item>ca</item>
       <item>cs</item>
       <item>zh_CN</item>
       <item>da</item>
@@ -56,7 +49,6 @@
       <item>es</item>
       <item>fr</item>
       <item>el</item>
-      <item>iw</item>
       <item>hr</item>
       <item>in</item>
       <item>it</item>
@@ -77,9 +69,7 @@
       <item>sk</item>
       <item>fi</item>
       <item>sv</item>
-      <item>bo</item>
       <item>tr</item>
-      <item>uk</item>
       <item>vi</item>
   </string-array>
 

res/values/dimens.xml

@@ -24,6 +24,7 @@
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
     <dimen name="media_bubble_height">210dp</dimen>
     <dimen name="media_bubble_border_width">3dp</dimen>
+    <dimen name="media_bubble_remove_button_size">24dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
     <dimen name="message_details_table_row_pad">10dp</dimen>
@@ -33,4 +34,7 @@
 
     <dimen name="quick_media_drawer_default_height">250dp</dimen>
     <dimen name="quick_camera_shutter_ring_size">52dp</dimen>
+
+    <dimen name="transfer_controls_expanded_width">150dp</dimen>
+    <dimen name="transfer_controls_contracted_width">70dp</dimen>
 </resources>

res/values/strings.xml

@@ -126,6 +126,7 @@
     <string name="ConversationActivity_unblock_question">Unblock?</string>
     <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Are you sure you want to unblock this contact?</string>
     <string name="ConversationActivity_unblock">Unblock</string>
+    <string name="ConversationActivity_attachment_exceeds_size_limits">Attachment exceeds size limits for the type of message you\'re sending.</string>
 
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
@@ -383,6 +384,11 @@
     <string name="RegistrationService_registration_error">Registration error</string>
     <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure registration has encountered a problem.</string>
 
+    <!-- Slide -->
+    <string name="Slide_image">Image</string>
+    <string name="Slide_audio">Audio</string>
+    <string name="Slide_video">Video</string>
+
     <!-- SmsMessageRecord -->
     <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Received corrupted key
         exchange message!
@@ -877,6 +883,8 @@
     <string name="preferences_chats__when_roaming">When roaming</string>
     <string name="preferences_chats__media_auto_download">Media auto-download</string>
     <string name="preferences_chats__message_trimming">Message trimming</string>
+    <string name="preferences_advanced__use_system_emoji">Use system emoji</string>
+    <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Disable TextSecure\'s built-in emoji support</string>
 
     <!-- **************************************** -->
     <!-- menus -->

res/values/themes.xml

@@ -125,15 +125,14 @@
 
 
         <item name="conversation_item_bubble_background">@color/white</item>
-        <item name="conversation_item_sent_text_primary_color">#99000000</item>
-        <item name="conversation_item_sent_text_secondary_color">#bb000000</item>
+        <item name="conversation_item_sent_text_primary_color">@color/grey_800</item>
+        <item name="conversation_item_sent_text_secondary_color">@color/grey_900</item>
         <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
         <item name="conversation_item_received_text_primary_color">@color/white</item>
         <item name="conversation_item_received_text_secondary_color">#BFffffff</item>
 
         <item name="quick_camera_icon">@drawable/quick_camera_light</item>
 
-        <item name="conversation_item_background">@drawable/conversation_item_background</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
@@ -204,7 +203,6 @@
 
         <item name="conversation_group_member_name">#99ffffff</item>
 
-        <item name="conversation_item_background">@drawable/conversation_item_background_dark</item>
         <item name="conversation_item_bubble_background">#ff333333</item>
         <item name="conversation_item_sent_text_primary_color">#ffffffff</item>
         <item name="conversation_item_sent_text_secondary_color">#aaeeeeee</item>

res/xml/preferences_advanced.xml

@@ -13,6 +13,11 @@
                         android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
                         android:title="@string/preferences__pref_enter_sends_title"/>
 
+    <CheckBoxPreference android:defaultValue="false"
+                        android:key="pref_system_emoji"
+                        android:title="@string/preferences_advanced__use_system_emoji"
+                        android:summary="@string/preferences_advanced__disable_textsecures_built_in_emoji_support" />
+
     <Preference android:key="pref_choose_identity"
                 android:title="@string/preferences__choose_identity"
                 android:summary="@string/preferences__choose_your_contact_entry_from_the_contacts_list"/>

src/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms;
+
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+
+import java.util.Locale;
+import java.util.Set;
+
+public interface BindableConversationItem extends Unbindable {
+  void bind(@NonNull MasterSecret masterSecret,
+            @NonNull MessageRecord messageRecord,
+            @NonNull Locale locale,
+            @NonNull Set<MessageRecord> batchSelected,
+            boolean groupThread, boolean pushDestination);
+}

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -35,6 +35,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.view.WindowCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -85,6 +86,7 @@ import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsColumns.Types;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.mms.AttachmentManager;
+import org.thoughtcrime.securesms.mms.AttachmentManager.MediaType;
 import org.thoughtcrime.securesms.mms.AttachmentTypeSelectorAdapter;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.mms.MediaTooLargeException;
@@ -113,6 +115,7 @@ import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.GroupUtil;
+import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
@@ -211,6 +214,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     initializeActionBar();
     initializeViews();
     initializeResources();
+    initializeSecurity();
     initializeDraft();
   }
 
@@ -226,6 +230,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     setIntent(intent);
     initializeResources();
+    initializeSecurity();
     initializeDraft();
 
     if (fragment != null) {
@@ -240,7 +245,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     dynamicLanguage.onResume(this);
     quickAttachmentDrawer.onResume();
 
-    initializeSecurity();
     initializeEnabledCheck();
     initializeMmsEnabledCheck();
     composeText.setTransport(sendButton.getSelectedTransport());
@@ -288,13 +292,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     switch (reqCode) {
     case PICK_IMAGE:
-      addAttachmentImage(masterSecret, data.getData());
+      setMedia(data.getData(),
+               MediaUtil.isGif(MediaUtil.getMimeType(this, data.getData())) ? MediaType.GIF
+                   : MediaType.IMAGE,
+               false);
       break;
     case PICK_VIDEO:
-      addAttachmentVideo(data.getData());
+      setMedia(data.getData(), MediaType.VIDEO, false);
       break;
     case PICK_AUDIO:
-      addAttachmentAudio(data.getData());
+      setMedia(data.getData(), MediaType.AUDIO, false);
       break;
     case PICK_CONTACT_INFO:
       addAttachmentContactInfo(data.getData());
@@ -308,7 +315,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       break;
     case TAKE_PHOTO:
       if (attachmentManager.getCaptureUri() != null) {
-        addAttachmentImage(masterSecret, attachmentManager.getCaptureUri());
+        setMedia(attachmentManager.getCaptureUri(), MediaType.IMAGE, true);
       }
       break;
     }
@@ -671,9 +678,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     Uri    draftVideo = getIntent().getParcelableExtra(DRAFT_VIDEO_EXTRA);
 
     if (draftText != null)  composeText.setText(draftText);
-    if (draftImage != null) addAttachmentImage(masterSecret, draftImage);
-    if (draftAudio != null) addAttachmentAudio(draftAudio);
-    if (draftVideo != null) addAttachmentVideo(draftVideo);
+
+    if      (draftImage != null) setMedia(draftImage, MediaType.IMAGE, false);
+    else if (draftAudio != null) setMedia(draftAudio, MediaType.AUDIO, false);
+    else if (draftVideo != null) setMedia(draftVideo, MediaType.VIDEO, false);
 
     if (draftText == null && draftImage == null && draftAudio == null && draftVideo == null) {
       initializeDraftFromDatabase();
@@ -707,11 +715,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
           if (draft.getType().equals(Draft.TEXT)) {
             composeText.setText(draft.getValue());
           } else if (draft.getType().equals(Draft.IMAGE)) {
-            addAttachmentImage(masterSecret, Uri.parse(draft.getValue()));
+            setMedia(Uri.parse(draft.getValue()), MediaType.IMAGE, false);
           } else if (draft.getType().equals(Draft.AUDIO)) {
-            addAttachmentAudio(Uri.parse(draft.getValue()));
+            setMedia(Uri.parse(draft.getValue()), MediaType.AUDIO, false);
           } else if (draft.getType().equals(Draft.VIDEO)) {
-            addAttachmentVideo(Uri.parse(draft.getValue()));
+            setMedia(Uri.parse(draft.getValue()), MediaType.VIDEO, false);
           }
         }
 
@@ -781,17 +789,21 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     SendButtonListener        sendButtonListener        = new SendButtonListener();
     ComposeKeyPressedListener composeKeyPressedListener = new ComposeKeyPressedListener();
 
-    emojiToggle.attach(emojiDrawer);
-    emojiToggle.setOnClickListener(new EmojiToggleListener());
-    emojiDrawer.setEmojiEventListener(new EmojiEventListener() {
-      @Override public void onKeyEvent(KeyEvent keyEvent) {
-        composeText.dispatchKeyEvent(keyEvent);
-      }
+    if (TextSecurePreferences.isSystemEmojiPreferred(this)) {
+      emojiToggle.setVisibility(View.GONE);
+    } else {
+      emojiToggle.attach(emojiDrawer);
+      emojiToggle.setOnClickListener(new EmojiToggleListener());
+      emojiDrawer.setEmojiEventListener(new EmojiEventListener() {
+        @Override public void onKeyEvent(KeyEvent keyEvent) {
+          composeText.dispatchKeyEvent(keyEvent);
+        }
 
-      @Override public void onEmojiSelected(String emoji) {
-        composeText.insertEmoji(emoji);
-      }
-    });
+        @Override public void onEmojiSelected(String emoji) {
+          composeText.insertEmoji(emoji);
+        }
+      });
+    }
 
     composeText.setOnEditorActionListener(sendButtonListener);
     attachButton.setOnClickListener(new AttachButtonListener());
@@ -917,55 +929,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
-  private void addAttachmentImage(MasterSecret masterSecret, Uri imageUri) {
-    try {
-      attachmentManager.setImage(masterSecret, imageUri);
-    } catch (IOException | BitmapDecodingException e) {
-      Log.w(TAG, e);
-      attachmentManager.clear();
-      Toast.makeText(this, R.string.ConversationActivity_sorry_there_was_an_error_setting_your_attachment,
-                     Toast.LENGTH_LONG).show();
-    } catch (MediaTooLargeException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, getString(R.string.ConversationActivity_the_gif_you_selected_was_too_big),
-                     Toast.LENGTH_LONG).show();
-      Log.w(TAG, e);
-    }
-  }
-
-  private void addAttachmentVideo(Uri videoUri) {
-    try {
-      attachmentManager.setVideo(videoUri);
-    } catch (IOException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, R.string.ConversationActivity_sorry_there_was_an_error_setting_your_attachment,
-                     Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);
-    } catch (MediaTooLargeException e) {
-      attachmentManager.clear();
-
-      Toast.makeText(this, getString(R.string.ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions,
-                                     (MmsMediaConstraints.MAX_MESSAGE_SIZE/1024)),
-                     Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);
-    }
-  }
-
-  private void addAttachmentAudio(Uri audioUri) {
-    try {
-      attachmentManager.setAudio(audioUri);
-    } catch (IOException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, R.string.ConversationActivity_sorry_there_was_an_error_setting_your_attachment,
-                     Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);
-    } catch (MediaTooLargeException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, getString(R.string.ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions,
-                                     (MmsMediaConstraints.MAX_MESSAGE_SIZE/1024)),
-                     Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);
-    }
+  private void setMedia(Uri uri, MediaType mediaType, boolean isCapture) {
+    attachmentManager.setMedia(masterSecret, uri, mediaType, getCurrentMediaConstraints(), isCapture);
   }
 
   private void addAttachmentContactInfo(Uri contactUri) {
@@ -1132,6 +1097,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     return rawText;
   }
 
+  private MediaConstraints getCurrentMediaConstraints() {
+    return sendButton.getSelectedTransport().getType() == Type.TEXTSECURE
+           ? MediaConstraints.PUSH_CONSTRAINTS
+           : MediaConstraints.MMS_CONSTRAINTS;
+  }
+
   private void markThreadAsRead() {
     new AsyncTask<Long, Void, Void>() {
       @Override
@@ -1198,8 +1169,24 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     final Context context = getApplicationContext();
     SlideDeck slideDeck;
 
-    if (attachmentManager.isAttachmentPresent()) slideDeck = new SlideDeck(attachmentManager.getSlideDeck());
-    else                                         slideDeck = new SlideDeck();
+    if (attachmentManager.isAttachmentPresent()) {
+      Slide            mediaSlide  = attachmentManager.getSlideDeck().getThumbnailSlide();
+      MediaConstraints constraints = getCurrentMediaConstraints();
+
+      if (mediaSlide != null &&
+          !constraints.isSatisfied(this, masterSecret, mediaSlide.getPart()) &&
+          !constraints.canResize(mediaSlide.getPart()))
+      {
+        Toast.makeText(context,
+                       R.string.ConversationActivity_attachment_exceeds_size_limits,
+                       Toast.LENGTH_SHORT).show();
+        return;
+      }
+
+      slideDeck = new SlideDeck(attachmentManager.getSlideDeck());
+    } else {
+      slideDeck = new SlideDeck();
+    }
 
     OutgoingMediaMessage outgoingMessage = new OutgoingMediaMessage(this, recipients, slideDeck,
                                                                     getMessage(), distributionType);
@@ -1272,8 +1259,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void onImageCapture(@NonNull final byte[] imageBytes) {
-    attachmentManager.setCaptureUri(CaptureProvider.getInstance(this).create(masterSecret, recipients, imageBytes));
-    addAttachmentImage(masterSecret, attachmentManager.getCaptureUri());
+    setMedia(CaptureProvider.getInstance(this).create(masterSecret, recipients, imageBytes), MediaType.IMAGE, true);
     quickAttachmentDrawer.hide(false);
   }
 
@@ -1382,11 +1368,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     public void onFocusChange(View v, boolean hasFocus) {}
   }
 
-  @Override
-  public void setComposeText(String text) {
-    this.composeText.setText(text);
-  }
-
   @Override
   public void setThreadId(long threadId) {
     this.threadId = threadId;
@@ -1397,4 +1378,5 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     initializeSecurity();
     updateToggleButtonState();
   }
+
 }

src/org/thoughtcrime/securesms/ConversationAdapter.java

@@ -18,13 +18,18 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.support.v4.widget.CursorAdapter;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
@@ -39,7 +44,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import org.thoughtcrime.securesms.ConversationFragment.SelectionClickListener;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 /**
  * A cursor adapter for a conversation thread.  Ultimately
@@ -49,7 +54,9 @@ import org.thoughtcrime.securesms.ConversationFragment.SelectionClickListener;
  * @author Moxie Marlinspike
  *
  */
-public class ConversationAdapter extends CursorAdapter implements AbsListView.RecyclerListener {
+public class ConversationAdapter <V extends View & BindableConversationItem>
+    extends CursorRecyclerViewAdapter<ConversationAdapter.ViewHolder>
+{
 
   private static final int MAX_CACHE_SIZE = 40;
   private final Map<String,SoftReference<MessageRecord>> messageRecordCache =
@@ -57,41 +64,50 @@ public class ConversationAdapter extends CursorAdapter implements AbsListView.Re
 
   public static final int MESSAGE_TYPE_OUTGOING = 0;
   public static final int MESSAGE_TYPE_INCOMING = 1;
-  public static final int MESSAGE_TYPE_GROUP_ACTION = 2;
+  public static final int MESSAGE_TYPE_UPDATE   = 2;
 
   private final Set<MessageRecord> batchSelected = Collections.synchronizedSet(new HashSet<MessageRecord>());
 
-  private final SelectionClickListener selectionClickListener;
-  private final Context                context;
+  private final ItemClickListener      clickListener;
   private final MasterSecret           masterSecret;
   private final Locale                 locale;
   private final boolean                groupThread;
   private final boolean                pushDestination;
+  private final MmsSmsDatabase         db;
   private final LayoutInflater         inflater;
 
-  public ConversationAdapter(Context context, MasterSecret masterSecret, Locale locale,
-                             SelectionClickListener selectionClickListener, boolean groupThread,
-                             boolean pushDestination)
-  {
-    super(context, null, 0);
-    this.context                = context;
-    this.masterSecret           = masterSecret;
-    this.locale                 = locale;
-    this.selectionClickListener = selectionClickListener;
-    this.groupThread            = groupThread;
-    this.pushDestination        = pushDestination;
-    this.inflater               = LayoutInflater.from(context);
+  protected static class ViewHolder extends RecyclerView.ViewHolder {
+    public <V extends View & BindableConversationItem> ViewHolder(final @NonNull V itemView) {
+      super(itemView);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <V extends View & BindableConversationItem> V getView() {
+      return (V)itemView;
+    }
   }
 
-  @Override
-  public void bindView(View view, Context context, Cursor cursor) {
-    ConversationItem item       = (ConversationItem)view;
-    long id                     = cursor.getLong(cursor.getColumnIndexOrThrow(SmsDatabase.ID));
-    String type                 = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT));
-    MessageRecord messageRecord = getMessageRecord(id, cursor, type);
+  public interface ItemClickListener {
+    void onItemClick(ConversationItem item);
+    void onItemLongClick(ConversationItem item);
+  }
 
-    item.set(masterSecret, messageRecord, locale, batchSelected, selectionClickListener,
-             groupThread, pushDestination);
+  public ConversationAdapter(@NonNull Context context,
+                             @NonNull MasterSecret masterSecret,
+                             @NonNull Locale locale,
+                             @Nullable ItemClickListener clickListener,
+                             @Nullable Cursor cursor,
+                             boolean groupThread,
+                             boolean pushDestination)
+  {
+    super(context, cursor);
+    this.masterSecret    = masterSecret;
+    this.locale          = locale;
+    this.clickListener   = clickListener;
+    this.groupThread     = groupThread;
+    this.pushDestination = pushDestination;
+    this.inflater        = LayoutInflater.from(context);
+    this.db              = DatabaseFactory.getMmsSmsDatabase(context);
   }
 
   @Override
@@ -100,87 +116,87 @@ public class ConversationAdapter extends CursorAdapter implements AbsListView.Re
     super.changeCursor(cursor);
   }
 
-  @Override
-  public View newView(Context context, Cursor cursor, ViewGroup parent) {
-    View view;
+  @Override public void onBindViewHolder(ViewHolder viewHolder, @NonNull Cursor cursor) {
+    long          id            = cursor.getLong(cursor.getColumnIndexOrThrow(SmsDatabase.ID));
+    String        type          = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT));
+    MessageRecord messageRecord = getMessageRecord(id, cursor, type);
 
-    int type = getItemViewType(cursor);
+    viewHolder.getView().bind(masterSecret, messageRecord, locale, batchSelected, groupThread, pushDestination);
+  }
 
-    switch (type) {
-      case ConversationAdapter.MESSAGE_TYPE_OUTGOING:
-        view = inflater.inflate(R.layout.conversation_item_sent, parent, false);
-        break;
-      case ConversationAdapter.MESSAGE_TYPE_INCOMING:
-        view = inflater.inflate(R.layout.conversation_item_received, parent, false);
-        break;
-      case ConversationAdapter.MESSAGE_TYPE_GROUP_ACTION:
-        view = inflater.inflate(R.layout.conversation_item_activity, parent, false);
-        break;
-      default: throw new IllegalArgumentException("unsupported item view type given to ConversationAdapter");
+  @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    final V itemView = ViewUtil.inflate(inflater, parent, getLayoutForViewType(viewType));
+    if (viewType == MESSAGE_TYPE_INCOMING || viewType == MESSAGE_TYPE_OUTGOING) {
+      itemView.setOnClickListener(new OnClickListener() {
+        @Override
+        public void onClick(View view) {
+          if (clickListener != null) clickListener.onItemClick((ConversationItem)itemView);
+        }
+      });
+      itemView.setOnLongClickListener(new OnLongClickListener() {
+        @Override
+        public boolean onLongClick(View view) {
+          if (clickListener != null) clickListener.onItemLongClick((ConversationItem)itemView);
+          return true;
+        }
+      });
     }
 
-    return view;
+    return new ViewHolder(itemView);
+  }
+
+  @Override public void onViewRecycled(ViewHolder holder) {
+    holder.getView().unbind();
+  }
+
+  private @LayoutRes int getLayoutForViewType(int viewType) {
+    switch (viewType) {
+    case ConversationAdapter.MESSAGE_TYPE_OUTGOING: return R.layout.conversation_item_sent;
+    case ConversationAdapter.MESSAGE_TYPE_INCOMING: return R.layout.conversation_item_received;
+    case ConversationAdapter.MESSAGE_TYPE_UPDATE:   return R.layout.conversation_item_update;
+    default: throw new IllegalArgumentException("unsupported item view type given to ConversationAdapter");
+    }
   }
 
   @Override
-  public int getViewTypeCount() {
-    return 3;
-  }
-
-  @Override
-  public int getItemViewType(int position) {
-    Cursor cursor = (Cursor)getItem(position);
-    return getItemViewType(cursor);
-  }
-
-  private int getItemViewType(Cursor cursor) {
+  public int getItemViewType(@NonNull Cursor cursor) {
     long id                     = cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.ID));
     String type                 = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT));
     MessageRecord messageRecord = getMessageRecord(id, cursor, type);
 
-    if      (messageRecord.isGroupAction()) return MESSAGE_TYPE_GROUP_ACTION;
+    if      (messageRecord.isGroupAction()) return MESSAGE_TYPE_UPDATE;
     else if (messageRecord.isOutgoing())    return MESSAGE_TYPE_OUTGOING;
     else                                    return MESSAGE_TYPE_INCOMING;
   }
 
   private MessageRecord getMessageRecord(long messageId, Cursor cursor, String type) {
-    SoftReference<MessageRecord> reference = messageRecordCache.get(type + messageId);
-
+    final SoftReference<MessageRecord> reference = messageRecordCache.get(type + messageId);
     if (reference != null) {
-      MessageRecord record = reference.get();
-
-      if (record != null)
-        return record;
+      final MessageRecord record = reference.get();
+      if (record != null) return record;
     }
 
-    MmsSmsDatabase.Reader reader = DatabaseFactory.getMmsSmsDatabase(context)
-                                                  .readerFor(cursor, masterSecret);
-
-    MessageRecord messageRecord = reader.getCurrent();
-
+    final MessageRecord messageRecord = db.readerFor(cursor, masterSecret).getCurrent();
     messageRecordCache.put(type + messageId, new SoftReference<>(messageRecord));
 
     return messageRecord;
   }
 
   public void close() {
-    this.getCursor().close();
+    getCursor().close();
   }
 
-  public void toggleBatchSelected(MessageRecord messageRecord) {
-    if (batchSelected.contains(messageRecord)) {
-      batchSelected.remove(messageRecord);
-    } else {
+  public void toggleSelection(MessageRecord messageRecord) {
+    if (!batchSelected.remove(messageRecord)) {
       batchSelected.add(messageRecord);
     }
   }
 
-  public Set<MessageRecord> getBatchSelected() {
-    return batchSelected;
+  public void clearSelection() {
+    batchSelected.clear();
   }
 
-  @Override
-  public void onMovedToScrapHeap(View view) {
-    ((ConversationItem)view).unbind();
+  public Set<MessageRecord> getSelectedItems() {
+    return Collections.unmodifiableSet(new HashSet<>(batchSelected));
   }
 }

src/org/thoughtcrime/securesms/ConversationFragment.java

@@ -8,12 +8,13 @@ import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
-import android.support.v4.widget.CursorAdapter;
 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.text.ClipboardManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -24,12 +25,11 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.AlertDialogWrapper;
 
+import org.thoughtcrime.securesms.ConversationAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
@@ -45,21 +45,22 @@ import org.thoughtcrime.securesms.util.FutureTaskListener;
 import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
-import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
-public class ConversationFragment extends ListFragment
+public class ConversationFragment extends Fragment
   implements LoaderManager.LoaderCallbacks<Cursor>
 {
   private static final String TAG = ConversationFragment.class.getSimpleName();
 
-  private final ActionModeCallback     actionModeCallback     = new ActionModeCallback();
-  private final SelectionClickListener selectionClickListener = new ConversationFragmentSelectionClickListener();
+  private final ActionModeCallback actionModeCallback     = new ActionModeCallback();
+  private final ItemClickListener  selectionClickListener = new ConversationFragmentItemClickListener();
 
   private ConversationFragmentListener listener;
 
@@ -68,6 +69,7 @@ public class ConversationFragment extends ListFragment
   private long         threadId;
   private ActionMode   actionMode;
   private Locale       locale;
+  private RecyclerView list;
 
   @Override
   public void onCreate(Bundle icicle) {
@@ -78,16 +80,24 @@ public class ConversationFragment extends ListFragment
 
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-    return inflater.inflate(R.layout.conversation_fragment, container, false);
+    final View view = inflater.inflate(R.layout.conversation_fragment, container, false);
+    list = ViewUtil.findById(view, android.R.id.list);
+    return view;
   }
 
   @Override
   public void onActivityCreated(Bundle bundle) {
     super.onActivityCreated(bundle);
 
+    final LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
+    layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+    layoutManager.setReverseLayout(true);
+    list.setHasFixedSize(false);
+    list.setScrollContainer(true);
+    list.setLayoutManager(layoutManager);
+
     initializeResources();
     initializeListAdapter();
-    initializeContextualActionBar();
   }
 
   @Override
@@ -100,8 +110,8 @@ public class ConversationFragment extends ListFragment
   public void onResume() {
     super.onResume();
 
-    if (getListAdapter() != null) {
-      ((ConversationAdapter) getListAdapter()).notifyDataSetChanged();
+    if (list.getAdapter() != null) {
+      list.getAdapter().notifyDataSetChanged();
     }
   }
 
@@ -125,21 +135,15 @@ public class ConversationFragment extends ListFragment
 
   private void initializeListAdapter() {
     if (this.recipients != null && this.threadId != -1) {
-      this.setListAdapter(new ConversationAdapter(getActivity(), masterSecret, locale, selectionClickListener,
-                                                  (!this.recipients.isSingleRecipient()) || this.recipients.isGroupRecipient(),
-                                                  DirectoryHelper.isPushDestination(getActivity(), this.recipients)));
-      getListView().setRecyclerListener((ConversationAdapter)getListAdapter());
+      list.setAdapter(new ConversationAdapter(getActivity(), masterSecret, locale, selectionClickListener, null,
+                                              (!this.recipients.isSingleRecipient()) || this.recipients.isGroupRecipient(),
+                                              DirectoryHelper.isPushDestination(getActivity(), this.recipients)));
       getLoaderManager().restartLoader(0, null, this);
     }
   }
 
-  private void initializeContextualActionBar() {
-    getListView().setOnItemClickListener(selectionClickListener);
-    getListView().setOnItemLongClickListener(selectionClickListener);
-  }
-
   private void setCorrectMenuVisibility(Menu menu) {
-    List<MessageRecord> messageRecords = getSelectedMessageRecords();
+    Set<MessageRecord> messageRecords = getListAdapter().getSelectedItems();
 
     if (actionMode != null && messageRecords.size() == 0) {
       actionMode.finish();
@@ -152,7 +156,7 @@ public class ConversationFragment extends ListFragment
       menu.findItem(R.id.menu_context_save_attachment).setVisible(false);
       menu.findItem(R.id.menu_context_resend).setVisible(false);
     } else {
-      MessageRecord messageRecord = messageRecords.get(0);
+      MessageRecord messageRecord = messageRecords.iterator().next();
 
       menu.findItem(R.id.menu_context_resend).setVisible(messageRecord.isFailed());
       menu.findItem(R.id.menu_context_save_attachment).setVisible(messageRecord.isMms()              &&
@@ -165,15 +169,15 @@ public class ConversationFragment extends ListFragment
     }
   }
 
-  private MessageRecord getSelectedMessageRecord() {
-    List<MessageRecord> messageRecords = getSelectedMessageRecords();
-
-    if (messageRecords.size() == 1) return messageRecords.get(0);
-    else                            throw new AssertionError();
+  private ConversationAdapter getListAdapter() {
+    return (ConversationAdapter) list.getAdapter();
   }
 
-  private List<MessageRecord> getSelectedMessageRecords() {
-    return new LinkedList<>(((ConversationAdapter)getListAdapter()).getBatchSelected());
+  private MessageRecord getSelectedMessageRecord() {
+    Set<MessageRecord> messageRecords = getListAdapter().getSelectedItems();
+
+    if (messageRecords.size() == 1) return messageRecords.iterator().next();
+    else                            throw new AssertionError();
   }
 
   public void reload(Recipients recipients, long threadId) {
@@ -186,17 +190,18 @@ public class ConversationFragment extends ListFragment
   }
 
   public void scrollToBottom() {
-    final ListView list = getListView();
     list.post(new Runnable() {
       @Override
       public void run() {
-        list.setSelection(getListAdapter().getCount() - 1);
+        list.stopScroll();
+        list.smoothScrollToPosition(0);
       }
     });
   }
 
-  private void handleCopyMessage(final List<MessageRecord> messageRecords) {
-    Collections.sort(messageRecords, new Comparator<MessageRecord>() {
+  private void handleCopyMessage(final Set<MessageRecord> messageRecords) {
+    List<MessageRecord> messageList = new LinkedList<>(messageRecords);
+    Collections.sort(messageList, new Comparator<MessageRecord>() {
       @Override
       public int compare(MessageRecord lhs, MessageRecord rhs) {
         if      (lhs.getDateReceived() < rhs.getDateReceived())  return -1;
@@ -209,7 +214,7 @@ public class ConversationFragment extends ListFragment
     ClipboardManager clipboard   = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
     boolean          first       = true;
 
-    for (MessageRecord messageRecord : messageRecords) {
+    for (MessageRecord messageRecord : messageList) {
       String body = messageRecord.getDisplayBody().toString();
 
       if (body != null) {
@@ -225,7 +230,7 @@ public class ConversationFragment extends ListFragment
         clipboard.setText(result);
   }
 
-  private void handleDeleteMessages(final List<MessageRecord> messageRecords) {
+  private void handleDeleteMessages(final Set<MessageRecord> messageRecords) {
     AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
     builder.setTitle(R.string.ConversationFragment_confirm_message_delete);
     builder.setIconAttribute(R.attr.dialog_alert_icon);
@@ -319,53 +324,41 @@ public class ConversationFragment extends ListFragment
 
   @Override
   public void onLoadFinished(Loader<Cursor> arg0, Cursor cursor) {
-    if (getListAdapter() != null) {
-      ((CursorAdapter) getListAdapter()).changeCursor(cursor);
+    if (list.getAdapter() != null) {
+      getListAdapter().changeCursor(cursor);
     }
   }
 
   @Override
   public void onLoaderReset(Loader<Cursor> arg0) {
-    if (getListAdapter() != null) {
-      ((CursorAdapter) getListAdapter()).changeCursor(null);
+    if (list.getAdapter() != null) {
+      getListAdapter().changeCursor(null);
     }
   }
 
   public interface ConversationFragmentListener {
-    public void setComposeText(String text);
-
-    public void setThreadId(long threadId);
+    void setThreadId(long threadId);
   }
 
-  public interface SelectionClickListener extends
-      AdapterView.OnItemLongClickListener, AdapterView.OnItemClickListener {}
+  private class ConversationFragmentItemClickListener implements ItemClickListener {
 
-  private class ConversationFragmentSelectionClickListener
-      implements SelectionClickListener
-  {
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-      if (actionMode != null && view instanceof ConversationItem) {
-        MessageRecord messageRecord = ((ConversationItem)view).getMessageRecord();
-        ((ConversationAdapter) getListAdapter()).toggleBatchSelected(messageRecord);
-        ((ConversationAdapter) getListAdapter()).notifyDataSetChanged();
+    @Override public void onItemClick(ConversationItem item) {
+      if (actionMode != null) {
+        MessageRecord messageRecord = item.getMessageRecord();
+        ((ConversationAdapter) list.getAdapter()).toggleSelection(messageRecord);
+        list.getAdapter().notifyDataSetChanged();
 
         setCorrectMenuVisibility(actionMode.getMenu());
       }
     }
 
-    @Override
-    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-      if (actionMode == null && view instanceof ConversationItem) {
-        MessageRecord messageRecord = ((ConversationItem)view).getMessageRecord();
-        ((ConversationAdapter) getListAdapter()).toggleBatchSelected(messageRecord);
-        ((ConversationAdapter) getListAdapter()).notifyDataSetChanged();
+    @Override public void onItemLongClick(ConversationItem item) {
+      if (actionMode == null) {
+        ((ConversationAdapter) list.getAdapter()).toggleSelection(item.getMessageRecord());
+        list.getAdapter().notifyDataSetChanged();
 
         actionMode = ((AppCompatActivity)getActivity()).startSupportActionMode(actionModeCallback);
-        return true;
       }
-
-      return false;
     }
   }
 
@@ -395,8 +388,8 @@ public class ConversationFragment extends ListFragment
 
     @Override
     public void onDestroyActionMode(ActionMode mode) {
-      ((ConversationAdapter)getListAdapter()).getBatchSelected().clear();
-      ((ConversationAdapter)getListAdapter()).notifyDataSetChanged();
+      ((ConversationAdapter)list.getAdapter()).clearSelection();
+      list.getAdapter().notifyDataSetChanged();
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
         getActivity().getWindow().setStatusBarColor(statusBarColor);
@@ -409,11 +402,11 @@ public class ConversationFragment extends ListFragment
     public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
       switch(item.getItemId()) {
         case R.id.menu_context_copy:
-          handleCopyMessage(getSelectedMessageRecords());
+          handleCopyMessage(getListAdapter().getSelectedItems());
           actionMode.finish();
           return true;
         case R.id.menu_context_delete_message:
-          handleDeleteMessages(getSelectedMessageRecords());
+          handleDeleteMessages(getListAdapter().getSelectedItems());
           actionMode.finish();
           return true;
         case R.id.menu_context_details:
@@ -436,5 +429,5 @@ public class ConversationFragment extends ListFragment
 
       return false;
     }
-  };
+  }
 }

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -23,10 +23,11 @@ import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.text.util.Linkify;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -40,7 +41,6 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.AlertDialogWrapper;
 
-import org.thoughtcrime.securesms.ConversationFragment.SelectionClickListener;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.ThumbnailView;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -60,6 +60,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.Util;
 
 import java.util.List;
 import java.util.Locale;
@@ -73,7 +74,9 @@ import java.util.Set;
  *
  */
 
-public class ConversationItem extends LinearLayout implements Recipient.RecipientModifiedListener {
+public class ConversationItem extends LinearLayout
+    implements Recipient.RecipientModifiedListener, BindableConversationItem
+{
   private final static String TAG = ConversationItem.class.getSimpleName();
 
   private MessageRecord messageRecord;
@@ -96,32 +99,32 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
   private View            pendingIndicator;
   private ImageView       pendingApprovalIndicator;
 
-  private StatusManager          statusManager;
-  private Set<MessageRecord>     batchSelected;
-  private SelectionClickListener selectionClickListener;
-  private ThumbnailView          mediaThumbnail;
-  private Button                 mmsDownloadButton;
-  private TextView               mmsDownloadingLabel;
+  private StatusManager      statusManager;
+  private Set<MessageRecord> batchSelected;
+  private ThumbnailView      mediaThumbnail;
+  private Button             mmsDownloadButton;
+  private TextView           mmsDownloadingLabel;
 
-  private int      defaultBubbleColor;
-  private Drawable selectedBackground;
-  private Drawable normalBackground;
+  private int defaultBubbleColor;
 
   private final MmsDownloadClickListener    mmsDownloadClickListener    = new MmsDownloadClickListener();
   private final MmsPreferencesClickListener mmsPreferencesClickListener = new MmsPreferencesClickListener();
-  private final ClickListener               clickListener               = new ClickListener();
   private final Context                     context;
 
   public ConversationItem(Context context) {
-    super(context);
-    this.context = context;
-   }
+    this(context, null);
+  }
 
   public ConversationItem(Context context, AttributeSet attrs) {
     super(context, attrs);
     this.context = context;
   }
 
+  @Override
+  public void setOnClickListener(OnClickListener l) {
+    super.setOnClickListener(new ClickListener(l));
+  }
+
   @Override
   protected void onFinishInflate() {
     super.onFinishInflate();
@@ -130,7 +133,7 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     ViewGroup pendingIndicatorStub = (ViewGroup) findViewById(R.id.pending_indicator_stub);
 
     if (pendingIndicatorStub != null) {
-      LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+      LayoutInflater inflater = LayoutInflater.from(context);
       if (Build.VERSION.SDK_INT >= 11) inflater.inflate(R.layout.conversation_item_pending_v11, pendingIndicatorStub, true);
       else                             inflater.inflate(R.layout.conversation_item_pending, pendingIndicatorStub, true);
     }
@@ -152,45 +155,42 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     this.mediaThumbnail           = (ThumbnailView)   findViewById(R.id.image_view);
     this.statusManager            = new StatusManager(pendingIndicator, sentIndicator, deliveredIndicator, failedIndicator, pendingApprovalIndicator);
 
-    setOnClickListener(clickListener);
+    setOnClickListener(new ClickListener(null));
+    PassthroughClickListener passthroughClickListener = new PassthroughClickListener();
     if (mmsDownloadButton != null) mmsDownloadButton.setOnClickListener(mmsDownloadClickListener);
-    if (mediaThumbnail != null) {
-      mediaThumbnail.setThumbnailClickListener(new ThumbnailClickListener());
-      mediaThumbnail.setOnLongClickListener(new MultiSelectLongClickListener());
-      mediaThumbnail.setDownloadClickListener(new ThumbnailDownloadClickListener());
-    }
+    mediaThumbnail.setThumbnailClickListener(new ThumbnailClickListener());
+    mediaThumbnail.setDownloadClickListener(new ThumbnailDownloadClickListener());
+    mediaThumbnail.setOnLongClickListener(passthroughClickListener);
+    mediaThumbnail.setOnClickListener(passthroughClickListener);
+    bodyText.setOnLongClickListener(passthroughClickListener);
+    bodyText.setOnClickListener(passthroughClickListener);
   }
 
-  public void set(@NonNull MasterSecret masterSecret,
-                  @NonNull MessageRecord messageRecord,
-                  @NonNull Locale locale,
-                  @NonNull Set<MessageRecord> batchSelected,
-                  @NonNull SelectionClickListener selectionClickListener,
-                  boolean groupThread, boolean pushDestination)
+  @Override
+  public void bind(@NonNull MasterSecret       masterSecret,
+                   @NonNull MessageRecord      messageRecord,
+                   @NonNull Locale             locale,
+                   @NonNull Set<MessageRecord> batchSelected,
+                   boolean groupThread, boolean pushDestination)
   {
     this.masterSecret           = masterSecret;
     this.messageRecord          = messageRecord;
     this.locale                 = locale;
     this.batchSelected          = batchSelected;
-    this.selectionClickListener = selectionClickListener;
     this.groupThread            = groupThread;
     this.pushDestination        = pushDestination;
     this.recipient              = messageRecord.getIndividualRecipient();
 
     this.recipient.addListener(this);
 
-    setSelectionBackgroundDrawables(messageRecord);
+    setInteractionState(messageRecord);
     setBodyText(messageRecord);
-
-    if (hasConversationBubble(messageRecord)) {
-      setBubbleState(messageRecord, recipient);
-      setStatusIcons(messageRecord);
-      setContactPhoto(recipient);
-      setGroupMessageStatus(messageRecord, recipient);
-      setEvents(messageRecord);
-      setMinimumWidth();
-      setMediaAttributes(messageRecord);
-    }
+    setBubbleState(messageRecord, recipient);
+    setStatusIcons(messageRecord);
+    setContactPhoto(recipient);
+    setGroupMessageStatus(messageRecord, recipient);
+    setMinimumWidth();
+    setMediaAttributes(messageRecord);
   }
 
   private void initializeAttributes() {
@@ -200,11 +200,10 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     final TypedArray attrs      = context.obtainStyledAttributes(attributes);
 
     defaultBubbleColor = attrs.getColor(0, Color.WHITE);
-    selectedBackground = attrs.getDrawable(1);
-    normalBackground   = attrs.getDrawable(2);
     attrs.recycle();
   }
 
+  @Override
   public void unbind() {
     if (recipient != null) {
       recipient.removeListener(this);
@@ -228,16 +227,12 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     }
   }
 
-  private void setSelectionBackgroundDrawables(MessageRecord messageRecord) {
-    if (batchSelected.contains(messageRecord)) {
-      setBackgroundDrawable(selectedBackground);
-    } else {
-      setBackgroundDrawable(normalBackground);
-    }
-  }
-
-  private boolean hasConversationBubble(MessageRecord messageRecord) {
-    return !messageRecord.isGroupAction();
+  private void setInteractionState(MessageRecord messageRecord) {
+    setSelected(batchSelected.contains(messageRecord));
+    mediaThumbnail.setFocusable(!shouldInterceptClicks(messageRecord) && batchSelected.isEmpty());
+    mediaThumbnail.setClickable(!shouldInterceptClicks(messageRecord) && batchSelected.isEmpty());
+    mediaThumbnail.setLongClickable(batchSelected.isEmpty());
+    bodyText.setAutoLinkMask(batchSelected.isEmpty() ? Linkify.ALL : 0);
   }
 
   private boolean isCaptionlessMms(MessageRecord messageRecord) {
@@ -260,11 +255,6 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
       bodyText.setText(messageRecord.getDisplayBody());
       bodyText.setVisibility(View.VISIBLE);
     }
-
-    if (bodyText.isClickable() && bodyText.isFocusable()) {
-      bodyText.setOnLongClickListener(new MultiSelectLongClickListener());
-      bodyText.setOnClickListener(new MultiSelectLongClickListener());
-    }
   }
 
   private void setMediaAttributes(MessageRecord messageRecord) {
@@ -337,14 +327,11 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     }
   }
 
-  private void setEvents(MessageRecord messageRecord) {
-    setClickable(batchSelected.isEmpty() &&
-                 (messageRecord.isFailed()                     ||
-                  messageRecord.isPendingInsecureSmsFallback() ||
-                  messageRecord.isBundleKeyExchange()));
-    if (messageRecord.isFailed()) {
-      setOnLongClickListener(new MultiSelectLongClickListener());
-    }
+  private boolean shouldInterceptClicks(MessageRecord messageRecord) {
+    return batchSelected.isEmpty() &&
+           (messageRecord.isFailed() ||
+            messageRecord.isPendingInsecureSmsFallback() ||
+            messageRecord.isBundleKeyExchange());
   }
 
   private void setGroupMessageStatus(MessageRecord messageRecord, Recipient recipient) {
@@ -403,19 +390,23 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
   }
 
   @Override
-  public void onModified(Recipient recipient) {
-    if (hasConversationBubble(messageRecord)) {
-      setBubbleState(messageRecord, recipient);
-      setContactPhoto(recipient);
-      setGroupMessageStatus(messageRecord, recipient);
-    }
+  public void onModified(final Recipient recipient) {
+    Util.runOnMain(new Runnable() {
+      @Override
+      public void run() {
+        setBubbleState(messageRecord, recipient);
+        setContactPhoto(recipient);
+        setGroupMessageStatus(messageRecord, recipient);
+      }
+    });
   }
 
   private class ThumbnailDownloadClickListener implements ThumbnailView.ThumbnailClickListener {
-    @Override public void onClick(View v, Slide slide) {
+    @Override public void onClick(View v, final Slide slide) {
       DatabaseFactory.getPartDatabase(context).setTransferState(messageRecord.getId(), slide.getPart().getPartId(), PartDatabase.TRANSFER_PROGRESS_STARTED);
     }
   }
+
   private class ThumbnailClickListener implements ThumbnailView.ThumbnailClickListener {
     private void fireIntent(Slide slide) {
       Log.w(TAG, "Clicked: " + slide.getUri() + " , " + slide.getContentType());
@@ -431,8 +422,8 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     }
 
     public void onClick(final View v, final Slide slide) {
-      if (!batchSelected.isEmpty()) {
-        selectionClickListener.onItemClick(null, ConversationItem.this, -1, -1);
+      if (shouldInterceptClicks(messageRecord) || !batchSelected.isEmpty()) {
+        performClick();
       } else if (MediaPreviewActivity.isContentTypeSupported(slide.getContentType()) &&
                  slide.getThumbnailUri() != null)
       {
@@ -484,11 +475,30 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     }
   }
 
-  private class ClickListener implements View.OnClickListener {
+  private class PassthroughClickListener implements View.OnLongClickListener, View.OnClickListener {
+
+    @Override
+    public boolean onLongClick(View v) {
+      performLongClick();
+      return true;
+    }
+
+    @Override
     public void onClick(View v) {
-      if (messageRecord.isFailed() && !batchSelected.isEmpty()) {
-        selectionClickListener.onItemClick(null, ConversationItem.this, -1, -1);
-      } else if(messageRecord.isFailed()) {
+      performClick();
+    }
+  }
+  private class ClickListener implements View.OnClickListener {
+    private OnClickListener parent;
+
+    public ClickListener(@Nullable OnClickListener parent) {
+      this.parent = parent;
+    }
+
+    public void onClick(View v) {
+      if (!shouldInterceptClicks(messageRecord) && parent != null) {
+        parent.onClick(v);
+      } else if (messageRecord.isFailed()) {
         Intent intent = new Intent(context, MessageDetailsActivity.class);
         intent.putExtra(MessageDetailsActivity.MASTER_SECRET_EXTRA, masterSecret);
         intent.putExtra(MessageDetailsActivity.MESSAGE_ID_EXTRA, messageRecord.getId());
@@ -503,19 +513,6 @@ public class ConversationItem extends LinearLayout implements Recipient.Recipien
     }
   }
 
-  private class MultiSelectLongClickListener implements OnLongClickListener, OnClickListener {
-    @Override
-    public boolean onLongClick(View view) {
-      selectionClickListener.onItemLongClick(null, ConversationItem.this, -1, -1);
-      return true;
-    }
-
-    @Override
-    public void onClick(View view) {
-      selectionClickListener.onItemClick(null, ConversationItem.this, -1, -1);
-    }
-  }
-
   private void handleMessageApproval() {
     final int title;
     final int message;

src/org/thoughtcrime/securesms/ConversationListAdapter.java

@@ -100,8 +100,12 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
                                                                  parent, false), clickListener);
   }
 
+  @Override public void onViewRecycled(ViewHolder holder) {
+    holder.getItem().unbind();
+  }
+
   @Override
-  public void onBindViewHolder(ViewHolder viewHolder, Cursor cursor) {
+  public void onBindViewHolder(ViewHolder viewHolder, @NonNull Cursor cursor) {
     ThreadDatabase.Reader reader = threadDatabase.readerFor(cursor, masterCipher);
     ThreadRecord          record = reader.getCurrent();
 

src/org/thoughtcrime/securesms/ConversationListFragment.java

@@ -159,12 +159,6 @@ public class ConversationListFragment extends Fragment
 
   private void initializeListAdapter() {
     list.setAdapter(new ConversationListAdapter(getActivity(), masterSecret, locale, null, this));
-    list.setRecyclerListener(new RecyclerListener() {
-      @Override
-      public void onViewRecycled(ViewHolder holder) {
-        ((ConversationListItem)holder.itemView).unbind();
-      }
-    });
     getLoaderManager().restartLoader(0, null, this);
   }
 

src/org/thoughtcrime/securesms/ConversationListItem.java

@@ -49,7 +49,7 @@ import static org.thoughtcrime.securesms.util.SpanUtil.color;
  */
 
 public class ConversationListItem extends RelativeLayout
-                                  implements Recipients.RecipientsModifiedListener
+                                  implements Recipients.RecipientsModifiedListener, Unbindable
 {
   private final static String TAG = ConversationListItem.class.getSimpleName();
 
@@ -115,9 +115,9 @@ public class ConversationListItem extends RelativeLayout
     this.contactPhotoImage.setAvatar(recipients, true);
   }
 
+  @Override
   public void unbind() {
-    if (this.recipients != null)
-      this.recipients.removeListener(this);
+    if (this.recipients != null) this.recipients.removeListener(this);
   }
 
   private void setBatchState(boolean batch) {

src/org/thoughtcrime/securesms/ConversationUpdateItem.java

@@ -0,0 +1,113 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.util.GroupUtil;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.util.Locale;
+import java.util.Set;
+
+public class ConversationUpdateItem extends LinearLayout
+    implements Recipients.RecipientsModifiedListener, Recipient.RecipientModifiedListener, BindableConversationItem, View.OnClickListener
+{
+  private static final String TAG = ConversationUpdateItem.class.getSimpleName();
+
+  private ImageView     icon;
+  private TextView      body;
+  private Recipient     sender;
+  private MessageRecord messageRecord;
+
+  public ConversationUpdateItem(Context context) {
+    super(context);
+  }
+
+  public ConversationUpdateItem(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @Override
+  public void onFinishInflate() {
+    super.onFinishInflate();
+
+    this.icon = (ImageView)findViewById(R.id.conversation_update_icon);
+    this.body = (TextView)findViewById(R.id.conversation_update_body);
+
+    setOnClickListener(this);
+  }
+
+  @Override
+  public void bind(@NonNull MasterSecret masterSecret,
+                   @NonNull MessageRecord messageRecord,
+                   @NonNull Locale locale,
+                   @NonNull Set<MessageRecord> batchSelected,
+                   boolean groupThread, boolean pushDestination)
+  {
+    bind(messageRecord);
+  }
+
+  private void bind(@NonNull MessageRecord messageRecord) {
+    this.messageRecord = messageRecord;
+    this.sender        = messageRecord.getIndividualRecipient();
+
+    this.sender.addListener(this);
+
+    if (messageRecord.isGroupAction()) {
+      icon.setImageDrawable(getContext().getResources().getDrawable(R.drawable.ic_group_grey600_24dp));
+
+      if (messageRecord.isGroupQuit() && messageRecord.isOutgoing()) {
+        body.setText(R.string.MessageRecord_left_group);
+      } else if (messageRecord.isGroupQuit()) {
+        body.setText(getContext().getString(R.string.ConversationItem_group_action_left, sender.toShortString()));
+      } else {
+        GroupUtil.GroupDescription description = GroupUtil.getDescription(getContext(), messageRecord.getBody().getBody());
+        description.addListener(this);
+        body.setText(description.toString());
+      }
+    }
+  }
+
+  @Override
+  public void onModified(Recipients recipients) {
+    onModified(recipients.getPrimaryRecipient());
+  }
+
+  @Override
+  public void onModified(Recipient recipient) {
+    Util.runOnMain(new Runnable() {
+      @Override
+      public void run() {
+        bind(messageRecord);
+      }
+    });
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (messageRecord.isIdentityUpdate()) {
+      Intent intent = new Intent(getContext(), RecipientPreferenceActivity.class);
+      intent.putExtra(RecipientPreferenceActivity.RECIPIENTS_EXTRA,
+                      new long[] {messageRecord.getIndividualRecipient().getRecipientId()});
+
+      getContext().startActivity(intent);
+    }
+  }
+
+  @Override
+  public void unbind() {
+    if (sender != null) {
+      sender.removeListener(this);
+    }
+  }
+}

src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java

@@ -66,7 +66,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
   public static final int PUSH_DECRYPT_SERIAL_ID_VERSION       = 131;
   public static final int MIGRATE_SESSION_PLAINTEXT            = 136;
   public static final int CONTACTS_ACCOUNT_VERSION             = 136;
-  public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 146;
+  public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 151;
 
   private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
     add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
@@ -233,8 +233,8 @@ public class DatabaseUpgradeActivity extends BaseActivity {
         final Reader        reader = mmsDb.readerFor(masterSecret, mmsDb.getMessage(part.getMmsId()));
         final MessageRecord record = reader.getNext();
 
-        if (part.getContentLocation() == null) {
-          Log.w(TAG, "corrected a pending self-sent media part " + part.getPartId() + ".");
+        if (part.getDataUri() != null) {
+          Log.w(TAG, "corrected a pending media part " + part.getPartId() + "that already had data.");
           partDb.setTransferState(part.getMmsId(), part.getPartId(), PartDatabase.TRANSFER_PROGRESS_DONE);
         } else if (record != null && !record.isOutgoing() && record.isPush()) {
           Log.w(TAG, "queuing new attachment download job for incoming push part " + part.getPartId() + ".");

src/org/thoughtcrime/securesms/ImageMediaAdapter.java

@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -64,7 +65,7 @@ public class ImageMediaAdapter extends CursorRecyclerViewAdapter<ViewHolder> {
   }
 
   @Override
-  public void onBindViewHolder(final ViewHolder viewHolder, final Cursor cursor) {
+  public void onBindViewHolder(final ViewHolder viewHolder, final @NonNull Cursor cursor) {
     final ThumbnailView imageView   = viewHolder.imageView;
     final ImageRecord   imageRecord = ImageRecord.from(cursor);
 
@@ -74,7 +75,7 @@ public class ImageMediaAdapter extends CursorRecyclerViewAdapter<ViewHolder> {
     part.setContentType(imageRecord.getContentType().getBytes());
     part.setPartId(imageRecord.getPartId());
 
-    Slide slide = MediaUtil.getSlideForPart(getContext(), masterSecret, part, imageRecord.getContentType());
+    Slide slide = MediaUtil.getSlideForPart(getContext(), part, imageRecord.getContentType());
     if (slide != null) {
       imageView.setImageResource(slide, masterSecret);
     }

src/org/thoughtcrime/securesms/MessageDetailsActivity.java

@@ -28,7 +28,6 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -173,8 +172,8 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
       toFromRes = R.string.message_details_header__from;
     }
     toFrom.setText(toFromRes);
-    conversationItem.set(masterSecret, messageRecord, dynamicLanguage.getCurrentLocale(),
-                         new HashSet<MessageRecord>(), new NullSelectionListener(),
+    conversationItem.bind(masterSecret, messageRecord, dynamicLanguage.getCurrentLocale(),
+                         new HashSet<MessageRecord>(),
                          recipients != messageRecord.getRecipients(),
                          DirectoryHelper.isPushDestination(this, recipients));
     recipientsList.setAdapter(new MessageDetailsRecipientAdapter(this, masterSecret, messageRecord,
@@ -184,7 +183,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
   private void inflateMessageViewIfAbsent(MessageRecord messageRecord) {
     if (conversationItem == null) {
       if (messageRecord.isGroupAction()) {
-        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_activity, itemParent, false);
+        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_update, itemParent, false);
       } else if (messageRecord.isOutgoing()) {
         conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_sent, itemParent, false);
       } else {
@@ -306,13 +305,4 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
       }
     }
   }
-
-  private static class NullSelectionListener implements ConversationFragment.SelectionClickListener {
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {}
-    @Override
-    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-      return false;
-    }
-  }
 }

src/org/thoughtcrime/securesms/SmsSendtoActivity.java

@@ -38,7 +38,7 @@ public class SmsSendtoActivity extends Activity {
       destination = getDestinationForView(original);
     }
 
-    Recipients recipients = RecipientFactory.getRecipientsFromString(this, destination.getDestination(), false);
+    Recipients recipients = RecipientFactory.getRecipientsFromString(this, destination.getDestination(), true);
     long       threadId   = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipients);
 
     final Intent nextIntent;

src/org/thoughtcrime/securesms/Unbindable.java

@@ -0,0 +1,5 @@
+package org.thoughtcrime.securesms;
+
+public interface Unbindable {
+  public void unbind();
+}

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

@@ -2,34 +2,39 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
 import android.view.animation.AnimationUtils;
-import android.view.animation.TranslateAnimation;
 import android.widget.FrameLayout;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class AnimatingToggle extends FrameLayout {
 
-  private static final int SPEED_MILLIS = 200;
-
   private View current;
 
+  private final Animation inAnimation;
+  private final Animation outAnimation;
+
   public AnimatingToggle(Context context) {
-    super(context);
+    this(context, null);
   }
 
   public AnimatingToggle(Context context, AttributeSet attrs) {
-    super(context, attrs);
+    this(context, attrs, 0);
   }
 
   public AnimatingToggle(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
+    this.outAnimation = AnimationUtils.loadAnimation(getContext(), R.anim.animation_toggle_out);
+    this.inAnimation  = AnimationUtils.loadAnimation(getContext(), R.anim.animation_toggle_in);
+    this.outAnimation.setInterpolator(new FastOutSlowInInterpolator());
+    this.inAnimation.setInterpolator(new FastOutSlowInInterpolator());
   }
 
   @Override
@@ -45,45 +50,11 @@ public class AnimatingToggle extends FrameLayout {
     child.setClickable(false);
   }
 
-  public void display(View view) {
+  public void display(@Nullable View view) {
     if (view == current) return;
-
-    animateOut(current, AnimationUtils.loadAnimation(getContext(), R.anim.animation_toggle_out));
-    animateIn(view, AnimationUtils.loadAnimation(getContext(), R.anim.animation_toggle_in));
+    if (current != null) ViewUtil.animateOut(current, outAnimation);
+    if (view    != null) ViewUtil.animateIn(view, inAnimation);
 
     current = view;
   }
-
-  private void animateOut(final View view, Animation animation) {
-    animation.setAnimationListener(new Animation.AnimationListener() {
-      @Override
-      public void onAnimationStart(Animation animation) {
-      }
-
-      @Override
-      public void onAnimationEnd(Animation animation) {
-        view.setVisibility(View.GONE);
-      }
-
-      @Override
-      public void onAnimationRepeat(Animation animation) {
-      }
-    });
-
-    view.startAnimation(animation);
-  }
-
-  private void animateIn(View view, Animation animation) {
-    animation.setInterpolator(new FastOutSlowInInterpolator());
-    view.setVisibility(View.VISIBLE);
-    view.startAnimation(animation);
-  }
-
-  private int getViewIndex(View view) {
-    for (int i=0;i<getChildCount();i++) {
-      if (getChildAt(i) == view) return i;
-    }
-
-    throw new IllegalArgumentException("Not a parent of this view.");
-  }
 }

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

@@ -64,7 +64,8 @@ public class ComposeText extends EmojiEditText {
   }
 
   public void setTransport(TransportOption transport) {
-    final boolean enterSends = TextSecurePreferences.isEnterSendsEnabled(getContext());
+    final boolean enterSends     = TextSecurePreferences.isEnterSendsEnabled(getContext());
+    final boolean useSystemEmoji = TextSecurePreferences.isSystemEmojiPreferred(getContext());
 
     int imeOptions = (getImeOptions() & ~EditorInfo.IME_MASK_ACTION) | EditorInfo.IME_ACTION_SEND;
     int inputType  = getInputType();
@@ -72,6 +73,10 @@ public class ComposeText extends EmojiEditText {
     if (isLandscape()) setImeActionLabel(transport.getComposeHint(), EditorInfo.IME_ACTION_SEND);
     else               setImeActionLabel(null, 0);
 
+    if (useSystemEmoji) {
+      inputType = (inputType & ~InputType.TYPE_MASK_VARIATION) | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE;
+    }
+
     inputType  = !isLandscape() && enterSends
                ? inputType & ~InputType.TYPE_TEXT_FLAG_MULTI_LINE
                : inputType | InputType.TYPE_TEXT_FLAG_MULTI_LINE;

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

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.recipients.Recipients.RecipientsModifiedListener;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -49,7 +50,7 @@ import java.util.Set;
  *
  * @author Moxie Marlinspike
  */
-public class PushRecipientsPanel extends RelativeLayout {
+public class PushRecipientsPanel extends RelativeLayout implements RecipientsModifiedListener {
   private final String                         TAG = PushRecipientsPanel.class.getSimpleName();
   private       RecipientsPanelChangedListener panelChangeListener;
 
@@ -90,7 +91,7 @@ public class PushRecipientsPanel extends RelativeLayout {
 
   public Recipients getRecipients() throws RecipientFormattingException {
     String rawText = recipientsText.getText().toString();
-    Recipients recipients = RecipientFactory.getRecipientsFromString(getContext(), rawText, false);
+    Recipients recipients = RecipientFactory.getRecipientsFromString(getContext(), rawText, true);
 
     if (recipients.isEmpty())
       throw new RecipientFormattingException("Recipient List Is Empty!");
@@ -129,6 +130,7 @@ public class PushRecipientsPanel extends RelativeLayout {
     } catch (RecipientFormattingException e) {
       recipients = RecipientFactory.getRecipientsFor(getContext(), new LinkedList<Recipient>(), true);
     }
+    recipients.addListener(this);
 
     recipientsText.setAdapter(new RecipientsAdapter(this.getContext()));
     recipientsText.populate(recipients);
@@ -149,6 +151,10 @@ public class PushRecipientsPanel extends RelativeLayout {
     });
   }
 
+  @Override public void onModified(Recipients recipients) {
+    recipientsText.populate(recipients);
+  }
+
   private class FocusChangedListener implements View.OnFocusChangeListener {
     public void onFocusChange(View v, boolean hasFocus) {
       if (!hasFocus && (panelChangeListener != null)) {

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

@@ -17,7 +17,6 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -33,6 +32,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.recipients.Recipients.RecipientsModifiedListener;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -44,7 +44,7 @@ import java.util.List;
  *
  * @author Moxie Marlinspike
  */
-public class SingleRecipientPanel extends RelativeLayout {
+public class SingleRecipientPanel extends RelativeLayout implements RecipientsModifiedListener {
   private final String                         TAG = SingleRecipientPanel.class.getSimpleName();
   private       RecipientsPanelChangedListener panelChangeListener;
 
@@ -94,7 +94,7 @@ public class SingleRecipientPanel extends RelativeLayout {
 
   public Recipients getRecipients() throws RecipientFormattingException {
     String rawText = recipientsText.getText().toString();
-    Recipients recipients = RecipientFactory.getRecipientsFromString(getContext(), rawText, false);
+    Recipients recipients = RecipientFactory.getRecipientsFromString(getContext(), rawText, true);
 
     if (recipients.isEmpty())
       throw new RecipientFormattingException("Recipient List Is Empty!");
@@ -132,6 +132,7 @@ public class SingleRecipientPanel extends RelativeLayout {
     } catch (RecipientFormattingException e) {
       recipients = RecipientFactory.getRecipientsFor(getContext(), new LinkedList<Recipient>(), true);
     }
+    recipients.addListener(this);
 
     recipientsText.setAdapter(new RecipientsAdapter(this.getContext()));
     recipientsText.populate(recipients);
@@ -152,6 +153,10 @@ public class SingleRecipientPanel extends RelativeLayout {
     });
   }
 
+  @Override public void onModified(Recipients recipients) {
+    recipientsText.populate(recipients);
+  }
+
   private class FocusChangedListener implements OnFocusChangeListener {
     public void onFocusChange(View v, boolean hasFocus) {
       if (!hasFocus && (panelChangeListener != null)) {

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

@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
@@ -13,11 +12,7 @@ import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 
 import com.bumptech.glide.DrawableTypeRequest;
@@ -27,12 +22,10 @@ import com.bumptech.glide.load.resource.bitmap.GlideBitmapDrawable;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
-import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.PartDatabase;
-import org.thoughtcrime.securesms.jobs.PartProgressEvent;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.RoundedCorners;
 import org.thoughtcrime.securesms.mms.Slide;
@@ -41,21 +34,21 @@ import org.thoughtcrime.securesms.util.FutureTaskListener;
 import org.thoughtcrime.securesms.util.ListenableFutureTask;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
+import org.whispersystems.libaxolotl.util.guava.Optional;
 
-import de.greenrobot.event.EventBus;
 import ws.com.google.android.mms.pdu.PduPart;
 
 public class ThumbnailView extends FrameLayout {
   private static final String TAG = ThumbnailView.class.getSimpleName();
 
-  private boolean       hideControls;
-  private ImageView     image;
-  private ProgressWheel progress;
-  private ImageView     removeButton;
-  private ImageButton   downloadButton;
-  private int           backgroundColorHint;
-  private int           radius;
+  private boolean         hideControls;
+  private ImageView       image;
+  private ImageView       removeButton;
+  private int             backgroundColorHint;
+  private int             radius;
+  private OnClickListener parentClickListener;
 
+  private Optional<TransferControlView>   transferControls       = Optional.absent();
   private ListenableFutureTask<SlideDeck> slideDeckFuture        = null;
   private SlideDeckListener               slideDeckListener      = null;
   private ThumbnailClickListener          thumbnailClickListener = null;
@@ -74,10 +67,9 @@ public class ThumbnailView extends FrameLayout {
   public ThumbnailView(final Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
     inflate(context, R.layout.thumbnail_view, this);
-    radius         = getResources().getDimensionPixelSize(R.dimen.message_bubble_corner_radius);
-    image          = (ImageView)     findViewById(R.id.thumbnail_image);
-    progress       = (ProgressWheel) findViewById(R.id.progress_wheel);
-    downloadButton = (ImageButton)   findViewById(R.id.download_button);
+    radius = getResources().getDimensionPixelSize(R.dimen.message_bubble_corner_radius);
+    image  = (ImageView) findViewById(R.id.thumbnail_image);
+    super.setOnClickListener(new ThumbnailClickDispatcher());
 
     if (attrs != null) {
       TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.ThumbnailView, 0, 0);
@@ -86,6 +78,20 @@ public class ThumbnailView extends FrameLayout {
     }
   }
 
+  @Override public void setOnClickListener(OnClickListener l) {
+    parentClickListener = l;
+  }
+
+  @Override public void setFocusable(boolean focusable) {
+    super.setFocusable(focusable);
+    if (transferControls.isPresent()) transferControls.get().setFocusable(focusable);
+  }
+
+  @Override public void setClickable(boolean clickable) {
+    super.setClickable(clickable);
+    if (transferControls.isPresent()) transferControls.get().setClickable(clickable);
+  }
+
   @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
     super.onLayout(changed, left, top, right, bottom);
     if (removeButton != null) {
@@ -95,49 +101,26 @@ public class ThumbnailView extends FrameLayout {
     }
   }
 
-  @Override protected void onAttachedToWindow() {
-    super.onAttachedToWindow();
-    if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().registerSticky(this);
-  }
-
-  @Override protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    EventBus.getDefault().unregister(this);
-  }
-
-  private ProgressWheel getProgressWheel() {
-    if (progress == null) progress = ViewUtil.inflateStub(this, R.id.progress_wheel_stub);
-    return progress;
-  }
-
-  private void hideProgressWheel() {
-    if (progress != null) progress.setVisibility(GONE);
-  }
-
   private ImageView getRemoveButton() {
     if (removeButton == null) removeButton = ViewUtil.inflateStub(this, R.id.remove_button_stub);
     return removeButton;
   }
 
-  @SuppressWarnings("unused")
-  public void onEventAsync(final PartProgressEvent event) {
-    if (this.slide != null && event.partId.equals(this.slide.getPart().getPartId())) {
-      Util.runOnMain(new Runnable() {
-        @Override public void run() {
-          getProgressWheel().setInstantProgress(((float)event.progress) / event.total);
-          if (event.progress >= event.total) animateOutProgress();
-        }
-      });
+  private TransferControlView getTransferControls() {
+    if (!transferControls.isPresent()) {
+      transferControls = Optional.of((TransferControlView)ViewUtil.inflateStub(this, R.id.transfer_controls_stub));
     }
+    return transferControls.get();
   }
 
   public void setBackgroundColorHint(int color) {
     this.backgroundColorHint = color;
   }
 
-  public void setImageResource(@Nullable MasterSecret masterSecret,
-                               long id, long timestamp,
-                               @NonNull ListenableFutureTask<SlideDeck> slideDeckFuture)
+  public void setImageResource(@Nullable MasterSecret                    masterSecret,
+                                         long                            id,
+                                         long                            timestamp,
+                               @NonNull  ListenableFutureTask<SlideDeck> slideDeckFuture)
   {
     if (this.slideDeckFuture != null && this.slideDeckListener != null) {
       this.slideDeckFuture.removeListener(this.slideDeckListener);
@@ -146,7 +129,7 @@ public class ThumbnailView extends FrameLayout {
     String slideId = id + "::" + timestamp;
 
     if (!slideId.equals(this.slideId)) {
-      hideProgressWheel();
+      if (transferControls.isPresent()) getTransferControls().clear();
       image.setImageDrawable(null);
       this.slide   = null;
       this.slideId = slideId;
@@ -162,34 +145,22 @@ public class ThumbnailView extends FrameLayout {
       Log.w(TAG, "Not re-loading slide " + slide.getPart().getPartId());
       return;
     }
+
     if (!isContextValid()) {
       Log.w(TAG, "Not loading slide, context is invalid");
       return;
     }
 
-    Log.w(TAG, "loading part with id " + slide.getPart().getPartId() + ", progress " + slide.getTransferProgress());
-    if (!hideControls && slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_STARTED) {
-      getProgressWheel().spin();
-      getProgressWheel().setVisibility(VISIBLE);
-      downloadButton.setVisibility(GONE);
-    } else if (!hideControls && slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_AUTO_PENDING ||
-                                slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_FAILED)
-    {
-      hideProgressWheel();
-      downloadButton.setVisibility(VISIBLE);
-    } else {
-      hideProgressWheel();
-      downloadButton.setVisibility(GONE);
-    }
+    Log.w(TAG, "loading part with id " + slide.getPart().getPartId()
+               + ", progress " + slide.getTransferProgress());
 
     this.slide = slide;
-    buildGlideRequest(slide, masterSecret).into(image);
-    if (this.slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_DONE) {
-      setOnClickListener(new ThumbnailClickDispatcher(thumbnailClickListener, slide));
-    } else {
-      setOnClickListener(null);
+    loadInto(slide, masterSecret, image);
+
+    if (!hideControls) {
+      getTransferControls().setSlide(slide);
+      getTransferControls().setDownloadClickListener(new DownloadClickDispatcher());
     }
-    downloadButton.setOnClickListener(new ThumbnailClickDispatcher(downloadClickListener, slide));
   }
 
   public void setThumbnailClickListener(ThumbnailClickListener listener) {
@@ -198,6 +169,8 @@ public class ThumbnailView extends FrameLayout {
 
   public void setRemoveClickListener(OnClickListener listener) {
     getRemoveButton().setOnClickListener(listener);
+    final int pad = getResources().getDimensionPixelSize(R.dimen.media_bubble_remove_button_size);
+    image.setPadding(pad, pad, pad, 0);
   }
 
   public void setDownloadClickListener(ThumbnailClickListener listener) {
@@ -205,12 +178,22 @@ public class ThumbnailView extends FrameLayout {
   }
 
   public void clear() {
-    if (isContextValid()) Glide.clear(this);
+    if (isContextValid())             Glide.clear(image);
+    if (slideDeckFuture != null)      slideDeckFuture.removeListener(slideDeckListener);
+    if (transferControls.isPresent()) getTransferControls().clear();
+    slide             = null;
+    slideId           = null;
+    slideDeckFuture   = null;
+    slideDeckListener = null;
   }
 
   public void hideControls(boolean hideControls) {
     this.hideControls = hideControls;
-    if (hideControls) hideProgressWheel();
+    if (hideControls && transferControls.isPresent()) getTransferControls().setVisibility(View.GONE);
+  }
+
+  public void showProgressSpinner() {
+    getTransferControls().showProgressSpinner();
   }
 
   @TargetApi(VERSION_CODES.JELLY_BEAN_MR1)
@@ -220,29 +203,27 @@ public class ThumbnailView extends FrameLayout {
            !((Activity)getContext()).isDestroyed();
   }
 
-  private GenericRequestBuilder buildGlideRequest(@NonNull Slide slide,
-                                                  @Nullable MasterSecret masterSecret)
+  private void loadInto(@NonNull  Slide        slide,
+                        @Nullable MasterSecret masterSecret,
+                        @NonNull  ImageView    view)
   {
-    final GenericRequestBuilder builder;
     if (slide.getThumbnailUri() != null) {
-      builder = buildThumbnailGlideRequest(slide, masterSecret);
+      buildThumbnailGlideRequest(slide, masterSecret).into(view);
+    } else if (!slide.isInProgress()) {
+      buildPlaceholderGlideRequest(slide).into(view);
     } else {
-      builder = buildPlaceholderGlideRequest(slide);
-    }
-
-    if (slide.isInProgress() && !hideControls) {
-      return builder;
-    } else {
-      return builder.error(R.drawable.ic_missing_thumbnail_picture);
+      Glide.clear(view);
     }
   }
 
   private GenericRequestBuilder buildThumbnailGlideRequest(Slide slide, MasterSecret masterSecret) {
-
     final GenericRequestBuilder builder;
+
     if   (slide.isDraft()) builder = buildDraftGlideRequest(slide, masterSecret);
     else                   builder = buildPartGlideRequest(slide, masterSecret);
-    return builder;
+
+    if (slide.isInProgress()) return builder;
+    else                      return builder.error(R.drawable.ic_missing_thumbnail_picture);
   }
 
   private GenericRequestBuilder buildDraftGlideRequest(Slide slide, MasterSecret masterSecret) {
@@ -270,20 +251,6 @@ public class ThumbnailView extends FrameLayout {
                                    .fitCenter();
   }
 
-  private void animateOutProgress() {
-    if (progress == null) return;
-    AlphaAnimation animation = new AlphaAnimation(1f, 0f);
-    animation.setDuration(200);
-    animation.setAnimationListener(new AnimationListener() {
-      @Override public void onAnimationStart(Animation animation) { }
-      @Override public void onAnimationRepeat(Animation animation) { }
-      @Override public void onAnimationEnd(Animation animation) {
-        getProgressWheel().setVisibility(View.GONE);
-      }
-    });
-    getProgressWheel().startAnimation(animation);
-  }
-
   private class SlideDeckListener implements FutureTaskListener<SlideDeck> {
     private final MasterSecret masterSecret;
 
@@ -332,20 +299,26 @@ public class ThumbnailView extends FrameLayout {
     void onClick(View v, Slide slide);
   }
 
-  private static class ThumbnailClickDispatcher implements View.OnClickListener {
-    private ThumbnailClickListener listener;
-    private Slide                  slide;
-
-    public ThumbnailClickDispatcher(ThumbnailClickListener listener, Slide slide) {
-      this.listener = listener;
-      this.slide    = slide;
-    }
-
+  private class ThumbnailClickDispatcher implements View.OnClickListener {
     @Override
     public void onClick(View view) {
-      if (listener != null)
+      if (thumbnailClickListener       != null &&
+          slide                        != null &&
+          slide.getPart().getDataUri() != null &&
+          slide.getTransferProgress()  == PartDatabase.TRANSFER_PROGRESS_DONE)
       {
-        listener.onClick(view, slide);
+        thumbnailClickListener.onClick(view, slide);
+      } else if (parentClickListener != null) {
+        parentClickListener.onClick(view);
+      }
+    }
+  }
+
+  private class DownloadClickDispatcher implements View.OnClickListener {
+    @Override
+    public void onClick(View view) {
+      if (downloadClickListener != null && slide != null) {
+        downloadClickListener.onClick(view, slide);
       }
     }
   }
@@ -368,11 +341,15 @@ public class ThumbnailView extends FrameLayout {
         Log.w(TAG, "onResourceReady() for a Bitmap. Saving.");
         part.setThumbnail(((GlideBitmapDrawable)resource).getBitmap());
       }
-      if (resource.getIntrinsicWidth() < resource.getIntrinsicHeight()) {
-        getRemoveButton().setPadding(0, 0, (getWidth() - resource.getIntrinsicWidth()) / 2, 0);
+      LayoutParams layoutParams = (LayoutParams) getRemoveButton().getLayoutParams();
+      if (resource.getIntrinsicWidth() < getWidth()) {
+        layoutParams.topMargin   = 0;
+        layoutParams.rightMargin = Math.max(0, (getWidth() - image.getPaddingRight() - resource.getIntrinsicWidth()) / 2);
       } else {
-        getRemoveButton().setPadding(0, (getHeight() - resource.getIntrinsicHeight()) / 2, 0, 0);
+        layoutParams.topMargin   = Math.max(0, (getHeight() - image.getPaddingTop() - resource.getIntrinsicHeight()) / 2);
+        layoutParams.rightMargin = 0;
       }
+      getRemoveButton().setLayoutParams(layoutParams);
       return false;
     }
   }

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

@@ -0,0 +1,176 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.drawable.Drawable;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.ValueAnimator;
+import com.nineoldandroids.animation.ValueAnimator.AnimatorUpdateListener;
+import com.pnikosis.materialishprogress.ProgressWheel;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.database.PartDatabase;
+import org.thoughtcrime.securesms.jobs.PartProgressEvent;
+import org.thoughtcrime.securesms.mms.Slide;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+import de.greenrobot.event.EventBus;
+
+public class TransferControlView extends FrameLayout {
+  private static final int TRANSITION_MS = 300;
+
+  @Nullable private Slide slide;
+  @Nullable private View  current;
+
+  private final ProgressWheel progressWheel;
+  private final TextView      downloadDetails;
+  private final int           contractedWidth;
+  private final int           expandedWidth;
+
+  public TransferControlView(Context context) {
+    this(context, null);
+  }
+
+  public TransferControlView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public TransferControlView(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    inflate(context, R.layout.transfer_controls_view, this);
+
+    final Drawable background = ContextCompat.getDrawable(context, R.drawable.transfer_controls_background);
+    if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
+      background.setColorFilter(0x66ffffff, Mode.MULTIPLY);
+    }
+    setLongClickable(false);
+    ViewUtil.setBackground(this, background);
+    setVisibility(GONE);
+
+    this.progressWheel   = ViewUtil.findById(this, R.id.progress_wheel);
+    this.downloadDetails = ViewUtil.findById(this, R.id.download_details);
+    this.contractedWidth = getResources().getDimensionPixelSize(R.dimen.transfer_controls_contracted_width);
+    this.expandedWidth   = getResources().getDimensionPixelSize(R.dimen.transfer_controls_expanded_width);
+  }
+
+  @Override
+  public void setFocusable(boolean focusable) {
+    super.setFocusable(focusable);
+    downloadDetails.setFocusable(focusable);
+  }
+
+  @Override
+  public void setClickable(boolean clickable) {
+    super.setClickable(clickable);
+    downloadDetails.setClickable(clickable);
+  }
+
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().registerSticky(this);
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    EventBus.getDefault().unregister(this);
+  }
+
+  public void setSlide(final @NonNull Slide slide) {
+    this.slide = slide;
+    if (slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_STARTED) {
+      showProgressSpinner();
+    } else if (slide.isPendingDownload()) {
+      downloadDetails.setText(slide.getContentDescription());
+      display(downloadDetails);
+    } else {
+      display(null);
+    }
+  }
+
+  public void showProgressSpinner() {
+    progressWheel.spin();
+    display(progressWheel);
+  }
+
+  public void setDownloadClickListener(final @Nullable OnClickListener listener) {
+    downloadDetails.setOnClickListener(listener);
+  }
+
+  public void clear() {
+    clearAnimation();
+    setVisibility(GONE);
+    if (current != null) {
+      current.clearAnimation();
+      current.setVisibility(GONE);
+    }
+    current = null;
+    slide   = null;
+  }
+
+  private void display(@Nullable final View view) {
+    final int sourceWidth = current == downloadDetails ? expandedWidth : contractedWidth;
+    final int targetWidth = view    == downloadDetails ? expandedWidth : contractedWidth;
+
+    if (current == view || current == null) {
+      ViewGroup.LayoutParams layoutParams = getLayoutParams();
+      layoutParams.width = targetWidth;
+      setLayoutParams(layoutParams);
+    } else {
+      ViewUtil.fadeOut(current, TRANSITION_MS);
+      Animator anim = getWidthAnimator(sourceWidth, targetWidth);
+      anim.start();
+    }
+
+    if (view == null) {
+      ViewUtil.fadeOut(this, TRANSITION_MS);
+    } else {
+      ViewUtil.fadeIn(this, TRANSITION_MS);
+      ViewUtil.fadeIn(view, TRANSITION_MS);
+    }
+
+    current = view;
+  }
+
+  private Animator getWidthAnimator(final int from, final int to) {
+    final ValueAnimator anim = ValueAnimator.ofInt(from, to);
+    anim.addUpdateListener(new AnimatorUpdateListener() {
+      @Override
+      public void onAnimationUpdate(ValueAnimator animation) {
+        final int val = (Integer)animation.getAnimatedValue();
+        final ViewGroup.LayoutParams layoutParams = getLayoutParams();
+        layoutParams.width = val;
+        setLayoutParams(layoutParams);
+      }
+    });
+    anim.setInterpolator(new FastOutSlowInInterpolator());
+    anim.setDuration(TRANSITION_MS);
+    return anim;
+  }
+
+  @SuppressWarnings("unused")
+  public void onEventAsync(final PartProgressEvent event) {
+    if (this.slide != null && event.partId.equals(this.slide.getPart().getPartId())) {
+      Util.runOnMain(new Runnable() {
+        @Override
+        public void run() {
+          progressWheel.setInstantProgress(((float)event.progress) / event.total);
+        }
+      });
+    }
+  }
+}

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

@@ -114,19 +114,28 @@ public class CameraView extends FrameLayout {
           host.onCameraFail(result);
           return;
         }
-        cameraReady = true;
-        if (getActivity().getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
-          onOrientationChange.enable();
+        try {
+          cameraReady = true;
+          if (getActivity().getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
+            onOrientationChange.enable();
+          }
+          setCameraDisplayOrientation();
+          synchronized (CameraView.this) {
+            CameraView.this.notifyAll();
+          }
+          previewCreated();
+          initPreview();
+          requestLayout();
+          invalidate();
+          Log.w(TAG, "onResume() completed");
+        } catch (RuntimeException re) {
+          Log.w(TAG, "exception when starting camera preview", re);
+          try {
+            previewDestroyed();
+          } catch (RuntimeException re2) {
+            Log.w(TAG, "also failed to release camera", re2);
+          }
         }
-        setCameraDisplayOrientation();
-        synchronized (CameraView.this) {
-          CameraView.this.notifyAll();
-        }
-        previewCreated();
-        initPreview();
-        requestLayout();
-        invalidate();
-        Log.w(TAG, "onResume() completed");
       }
     });
   }
@@ -272,9 +281,12 @@ public class CameraView extends FrameLayout {
   }
 
   void previewDestroyed() {
-    if (camera != null) {
-      previewStopped();
-      camera.release();
+    try {
+      if (camera != null) {
+        previewStopped();
+        camera.release();
+      }
+    } finally {
       camera = null;
     }
   }

src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java

@@ -9,6 +9,7 @@ import android.util.AttributeSet;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 
 public class EmojiEditText extends AppCompatEditText {
@@ -24,7 +25,9 @@ public class EmojiEditText extends AppCompatEditText {
 
   public EmojiEditText(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
-    setFilters(new InputFilter[]{ new EmojiFilter(this) });
+    if (!TextSecurePreferences.isSystemEmojiPreferred(getContext())) {
+      setFilters(new InputFilter[]{ new EmojiFilter(this) });
+    }
   }
 
   public void insertEmoji(String emoji) {
@@ -32,7 +35,7 @@ public class EmojiEditText extends AppCompatEditText {
     final int          end   = getSelectionEnd();
 
     getText().replace(Math.min(start, end), Math.max(start, end), emoji);
-    setSelection(end + emoji.length());
+    setSelection(start + emoji.length());
   }
 
   @Override public void invalidateDrawable(@NonNull Drawable drawable) {

src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java

@@ -11,6 +11,7 @@ import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class EmojiTextView extends AppCompatTextView {
@@ -30,11 +31,20 @@ public class EmojiTextView extends AppCompatTextView {
   }
 
   @Override public void setText(@Nullable CharSequence text, BufferType type) {
+    if (useSystemEmoji()) {
+      super.setText(text, type);
+      return;
+    }
+
     source = EmojiProvider.getInstance(getContext()).emojify(text, this);
     setTextEllipsized(source);
   }
 
-  public void setTextEllipsized(final @Nullable CharSequence source) {
+  private boolean useSystemEmoji() {
+   return TextSecurePreferences.isSystemEmojiPreferred(getContext());
+  }
+
+  private void setTextEllipsized(final @Nullable CharSequence source) {
     super.setText(needsEllipsizing ? ViewUtil.ellipsize(source, this) : source, BufferType.SPANNABLE);
   }
 
@@ -46,7 +56,8 @@ public class EmojiTextView extends AppCompatTextView {
   @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     final int size = MeasureSpec.getSize(widthMeasureSpec);
     final int mode = MeasureSpec.getMode(widthMeasureSpec);
-    if (getEllipsize() == TruncateAt.END                             &&
+    if (!useSystemEmoji()                                            &&
+        getEllipsize() == TruncateAt.END                             &&
         !TextUtils.isEmpty(source)                                   &&
         (mode == MeasureSpec.AT_MOST || mode == MeasureSpec.EXACTLY) &&
         getPaint().breakText(source, 0, source.length()-1, true, size, null) != source.length())
@@ -62,7 +73,7 @@ public class EmojiTextView extends AppCompatTextView {
   }
 
   @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    if (changed) setTextEllipsized(source);
+    if (changed && !useSystemEmoji()) setTextEllipsized(source);
     super.onLayout(changed, left, top, right, bottom);
   }
 }

src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java

@@ -175,6 +175,10 @@ public class ContactsDatabase {
       uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI;
     }
 
+    if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      uri = uri.buildUpon().appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true").build();
+    }
+
     String[] projection = new String[]{ContactsContract.CommonDataKinds.Phone._ID,
                                        ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME,
                                        ContactsContract.CommonDataKinds.Phone.NUMBER,

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

@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.DataSetObserver;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 
 /**
@@ -39,7 +40,7 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
       cursor.registerDataSetObserver(observer);
     }
 
-    setHasStableIds(true);
+    setHasStableIds(false);
   }
 
   public Context getContext() {
@@ -90,17 +91,34 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
            : 0;
   }
 
-  public abstract void onBindViewHolder(VH viewHolder, Cursor cursor);
+  public abstract void onBindViewHolder(VH viewHolder, @NonNull Cursor cursor);
 
   @Override
   public void onBindViewHolder(VH viewHolder, int position) {
+    moveToPositionOrThrow(position);
+    onBindViewHolder(viewHolder, cursor);
+  }
+
+  @Override public int getItemViewType(int position) {
+    moveToPositionOrThrow(position);
+    return getItemViewType(cursor);
+  }
+
+  public int getItemViewType(@NonNull Cursor cursor) {
+    return 0;
+  }
+
+  private void assertActiveCursor() {
     if (!isActiveCursor()) {
       throw new IllegalStateException("this should only be called when the cursor is valid");
     }
+  }
+
+  private void moveToPositionOrThrow(final int position) {
+    assertActiveCursor();
     if (!cursor.moveToPosition(position)) {
       throw new IllegalStateException("couldn't move cursor to position " + position);
     }
-    onBindViewHolder(viewHolder, cursor);
   }
 
   private boolean isActiveCursor() {

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

@@ -1094,7 +1094,7 @@ public class MmsDatabase extends MessagingDatabase {
       List<IdentityKeyMismatch> mismatches      = getMismatchedIdentities(mismatchDocument);
       List<NetworkFailure>      networkFailures = getFailures(networkDocument);
 
-      ListenableFutureTask<SlideDeck> slideDeck = getSlideDeck(masterSecret, dateReceived, id);
+      ListenableFutureTask<SlideDeck> slideDeck = getSlideDeck(dateReceived, id);
 
       return new MediaMmsMessageRecord(context, id, recipients, recipients.getPrimaryRecipient(),
                                        addressDeviceId, dateSent, dateReceived, receiptCount,
@@ -1159,8 +1159,7 @@ public class MmsDatabase extends MessagingDatabase {
       }
     }
 
-    private ListenableFutureTask<SlideDeck> getSlideDeck(final MasterSecret masterSecret,
-                                                         final long timestamp,
+    private ListenableFutureTask<SlideDeck> getSlideDeck(final long timestamp,
                                                          final long id)
     {
       ListenableFutureTask<SlideDeck> future = getCachedSlideDeck(timestamp, id);
@@ -1172,12 +1171,9 @@ public class MmsDatabase extends MessagingDatabase {
       Callable<SlideDeck> task = new Callable<SlideDeck>() {
         @Override
         public SlideDeck call() throws Exception {
-          if (masterSecret == null)
-            return null;
-
           PartDatabase partDatabase = DatabaseFactory.getPartDatabase(context);
           PduBody      body         = getPartsAsBody(partDatabase.getParts(id));
-          SlideDeck    slideDeck    = new SlideDeck(context, masterSecret, body);
+          SlideDeck    slideDeck    = new SlideDeck(context, body);
 
           if (!body.containsPushInProgress()) {
             slideCache.put(timestamp + "::" + id, new SoftReference<>(slideDeck));

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

@@ -56,7 +56,7 @@ public class MmsSmsDatabase extends Database {
                               MmsSmsColumns.MISMATCHED_IDENTITIES,
                               MmsDatabase.NETWORK_FAILURE, TRANSPORT};
 
-    String order           = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " ASC";
+    String order           = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
 
     String selection       = MmsSmsColumns.THREAD_ID + " = " + threadId;
 

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

@@ -298,6 +298,11 @@ public class PartDatabase extends Database {
 
     if (!cursor.isNull(sizeColumn))
       part.setDataSize(cursor.getLong(cursor.getColumnIndexOrThrow(SIZE)));
+
+    int dataColumn = cursor.getColumnIndexOrThrow(DATA);
+
+    if (!cursor.isNull(dataColumn))
+      part.setDataUri(PartAuthority.getPartUri(part.getPartId()));
   }
 
   private ContentValues getContentValuesForPart(PduPart part) throws MmsException {
@@ -440,8 +445,6 @@ public class PartDatabase extends Database {
 
     getPartValues(part, cursor);
 
-    part.setDataUri(PartAuthority.getPartUri(part.getPartId()));
-
     return part;
   }