Bump version to 2.14.3

// FREEBIE

AndroidManifest.xml

@@ -2,14 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="105"
-      android:versionName="2.9.2">
+      android:versionCode="117"
+      android:versionName="2.14.3">
+
+    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable"/>
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
                 android:protectionLevel="signature" />
 
-	<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
+    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
     <uses-permission android:name="android.permission.WRITE_PROFILE"/>
     <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
@@ -42,41 +44,14 @@
                  android:label="@string/app_name"
                  android:theme="@style/TextSecure.LightTheme">
 
-        <meta-data android:name="com.google.android.gms.version"
-                   android:value="@integer/google_play_services_version" />
+    <meta-data android:name="com.google.android.gms.version"
+               android:value="@integer/google_play_services_version" />
 
-        <activity android:name=".RoutingActivity"
-                  android:theme="@style/NoAnimation.Theme.BlackScreen"
-                  android:launchMode="singleTask"
-                  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <intent-filter>
-                  <action android:name="android.intent.action.SENDTO"/>
-                  <category android:name="android.intent.category.DEFAULT" />
-                  <data android:scheme="sms" />
-                  <data android:scheme="smsto" />
-                  <data android:scheme="mms" />
-                  <data android:scheme="mmsto" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="audio/*" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="text/plain" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
-
-        </activity>
+    <meta-data android:name="org.thoughtcrime.securesms.mms.TextSecureGlideModule"
+               android:value="GlideModule" />
 
     <activity android:name=".RegistrationProblemsActivity"
-              android:theme="@style/TextSecure.Light.Dialog"
+              android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".CountrySelectionActivity"
@@ -109,21 +84,44 @@
               android:launchMode="singleTask"
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+
+        <intent-filter>
+            <action android:name="android.intent.action.SEND" />
+            <category android:name="android.intent.category.DEFAULT"/>
+            <data android:mimeType="audio/*" />
+            <data android:mimeType="image/*" />
+            <data android:mimeType="text/plain" />
+            <data android:mimeType="video/*" />
+        </intent-filter>
+
+    </activity>
 
     <activity android:name=".ConversationListActivity"
           android:label="@string/app_name"
           android:launchMode="singleTask"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+          android:exported="true" />
+
+    <activity-alias android:name=".RoutingActivity"
+                    android:targetActivity=".ConversationListActivity"
+                    android:exported="true">
+
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+
+    </activity-alias>
 
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".MessageDetailsActivity"
-              android:label="Message Details"
-              android:windowSoftInputMode="stateUnchanged"
+              android:label="@string/AndroidManifest__message_details"
+              android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -145,12 +143,12 @@
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
               android:theme="@style/TextSecure.IntroTheme"
-              android:launchMode="singleTop"
+              android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphrasePromptActivity"
               android:label="@string/AndroidManifest__enter_passphrase"
-              android:launchMode="singleTop"
+              android:launchMode="singleTask"
               android:theme="@style/TextSecure.IntroTheme"
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -181,7 +179,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ReceiveKeyActivity"
-              android:theme="@style/TextSecure.Light.Dialog"
+              android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
     
     <activity android:name=".ApplicationPreferencesActivity"
@@ -224,6 +222,19 @@
               android:theme="@android:style/Theme.Translucent.NoTitleBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".SmsSendtoActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.SENDTO" />
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sms" />
+            <data android:scheme="smsto" />
+            <data android:scheme="mms" />
+            <data android:scheme="mmsto" />
+        </intent-filter>
+    </activity>
+
     <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
 
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
@@ -245,14 +256,6 @@
     </service>
 
 
-<!--	<receiver android:name=".service.BootListener" -->
-<!-- 			  android:enabled="true" -->
-<!-- 			  android:exported="false">-->
-<!--    		<intent-filter>-->
-<!--        		<action android:name="android.intent.action.BOOT_COMPLETED" />-->
-<!--    		</intent-filter>-->
-<!--	</receiver>-->
-
     <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
         <intent-filter>
             <action android:name="com.google.android.c2dm.intent.RECEIVE" />

README.md

@@ -2,8 +2,7 @@
 
 TextSecure is a messaging app for simple private communication with friends.
 
-TextSecure can use either data (WiFi/3G/4G) or SMS to communicate securely, and all TextSecure
-messages can also be encrypted locally on your device.
+TextSecure uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone.
 
 Currently available on the Play store.
 
@@ -22,7 +21,7 @@ You can subscribe to TextSecure Beta releases in two steps:
 1. Join the [TextSecure Beta Google+ Community](https://plus.google.com/communities/114424213916773497091).
 1. After you've joined the community, [subscribe to the beta](https://play.google.com/apps/testing/org.thoughtcrime.securesms).
 
-If you're interesting a life of peace and tranquility, stick with the standard releases.
+If you're interested in a life of peace and tranquility, stick with the standard releases.
 
 ## Contributing Translations
 Interested in helping to translate TextSecure? Contribute here:

androidTest/java/org/thoughtcrime/securesms/RegistrationActivityTest.java

@@ -1,24 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import static android.support.test.espresso.Espresso.*;
-import static android.support.test.espresso.action.ViewActions.*;
-import static android.support.test.espresso.matcher.ViewMatchers.*;
-import static android.support.test.espresso.assertion.ViewAssertions.*;
-
-import android.test.suitebuilder.annotation.LargeTest;
-
-@LargeTest
-public class RegistrationActivityTest extends RoutedInstrumentationTestCase {
-  private final static String TAG = RegistrationActivityTest.class.getSimpleName();
-
-  public RegistrationActivityTest() {
-    super();
-  }
-
-  @SuppressWarnings("unchecked")
-  public void testRegistrationButtons() throws Exception {
-    waitOn(RegistrationActivity.class);
-    onView(withId(R.id.registerButton)).check(matches(isDisplayed()));
-    onView(withId(R.id.skipButton)).check(matches(isDisplayed())).perform(click());
-  }
-}

androidTest/java/org/thoughtcrime/securesms/RoutedInstrumentationTestCase.java

@@ -1,37 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.app.Activity;
-import android.app.Instrumentation.ActivityMonitor;
-import android.preference.PreferenceManager;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-
-import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-
-public class RoutedInstrumentationTestCase extends ActivityInstrumentationTestCase2<RoutingActivity> {
-  private static final String TAG = RoutedInstrumentationTestCase.class.getSimpleName();
-
-  public RoutedInstrumentationTestCase() {
-    super(RoutingActivity.class);
-  }
-
-  @Override
-  public void setUp() throws Exception {
-    System.setProperty("dexmaker.dexcache", getInstrumentation().getTargetContext().getCacheDir().getPath());
-    super.setUp();
-    clearSharedPrefs();
-    getActivity();
-  }
-
-  protected void clearSharedPrefs() {
-    PreferenceManager.getDefaultSharedPreferences(getInstrumentation().getTargetContext())
-                     .edit().clear().commit();
-    getInstrumentation().getTargetContext().getSharedPreferences(MasterSecretUtil.PREFERENCES_NAME, 0)
-                                           .edit().clear().commit();
-  }
-
-  protected static void waitOn(Class<? extends Activity> clazz) {
-    Log.w(TAG, "waiting for " + clazz.getName());
-    new ActivityMonitor(clazz.getName(), null, true).waitForActivityWithTimeout(10000);
-  }
-}

androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java

@@ -0,0 +1,154 @@
+/**
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.thoughtcrime.securesms.service;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.provider.Telephony;
+import android.telephony.PhoneNumberUtils;
+import android.util.Log;
+
+import org.mockito.ArgumentCaptor;
+import org.thoughtcrime.securesms.TextSecureTestCase;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Method;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.contains;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class SmsListenerTest extends TextSecureTestCase {
+
+  private static final String CHALLENGE_SMS_3_3         = "Your TextSecure verification code: 337-337";
+  private static final String CHALLENGE_SMS_3_4         = "Your TextSecure verification code: 337-1337";
+  private static final String CHALLENGE_SMS_4_3         = "Your TextSecure verification code: 1337-337";
+  private static final String CHALLENGE_SMS_4_4         = "Your TextSecure verification code: 1337-1337";
+  private static final String CHALLENGE_SMS_4_4_PREPEND = "XXXYour TextSecure verification code: 1337-1337";
+  private static final String CHALLENGE_SMS_4_4_APPEND  = "Your TextSecure verification code: 1337-1337XXX";
+  private static final String[] CHALLENGE_SMS = {
+      CHALLENGE_SMS_3_3, CHALLENGE_SMS_3_4,         CHALLENGE_SMS_4_3,
+      CHALLENGE_SMS_4_4, CHALLENGE_SMS_4_4_PREPEND, CHALLENGE_SMS_4_4_APPEND
+  };
+
+  private static final String CHALLENGE_3_3 = "337337";
+  private static final String CHALLENGE_3_4 = "3371337";
+  private static final String CHALLENGE_4_3 = "1337337";
+  private static final String CHALLENGE_4_4 = "13371337";
+  private static final String[] CHALLENGES = {
+      CHALLENGE_3_3, CHALLENGE_3_4, CHALLENGE_4_3,
+      CHALLENGE_4_4, CHALLENGE_4_4, CHALLENGE_4_4,
+  };
+
+  /*
+  credit :D
+  http://stackoverflow.com/a/12338541
+   */
+  private static byte[] buildSmsPdu(String sender, String body) throws Exception{
+    byte[]   scBytes     = PhoneNumberUtils.networkPortionToCalledPartyBCD("0000000000");
+    byte[]   senderBytes = PhoneNumberUtils.networkPortionToCalledPartyBCD(sender);
+    int      lsmcs       = scBytes.length;
+    byte[]   dateBytes   = new byte[7];
+    Calendar calendar    = new GregorianCalendar();
+
+    dateBytes[0] = reverseByte((byte) (calendar.get(Calendar.YEAR)));
+    dateBytes[1] = reverseByte((byte) (calendar.get(Calendar.MONTH) + 1));
+    dateBytes[2] = reverseByte((byte) (calendar.get(Calendar.DAY_OF_MONTH)));
+    dateBytes[3] = reverseByte((byte) (calendar.get(Calendar.HOUR_OF_DAY)));
+    dateBytes[4] = reverseByte((byte) (calendar.get(Calendar.MINUTE)));
+    dateBytes[5] = reverseByte((byte) (calendar.get(Calendar.SECOND)));
+    dateBytes[6] = reverseByte((byte) ((calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET)) / (60 * 1000 * 15)));
+
+    ByteArrayOutputStream bo = new ByteArrayOutputStream();
+    bo.write(lsmcs);
+    bo.write(scBytes);
+    bo.write(0x04);
+    bo.write((byte) sender.length());
+    bo.write(senderBytes);
+    bo.write(0x00);
+    bo.write(0x00);
+    bo.write(dateBytes);
+
+    String sReflectedClassName   = "com.android.internal.telephony.GsmAlphabet";
+    Class  cReflectedNFCExtras   = Class.forName(sReflectedClassName);
+    Method stringToGsm7BitPacked = cReflectedNFCExtras.getMethod("stringToGsm7BitPacked", new Class[] { String.class });
+
+    stringToGsm7BitPacked.setAccessible(true);
+    byte[] bodybytes = (byte[]) stringToGsm7BitPacked.invoke(null, body);
+    bo.write(bodybytes);
+
+    return bo.toByteArray();
+  }
+
+  private static byte reverseByte(byte b) {
+    return (byte) ((b & 0xF0) >> 4 | (b & 0x0F) << 4);
+  }
+
+  @SuppressLint("NewApi")
+  private Intent buildSmsReceivedIntent(String smsBody) throws Exception {
+    final Intent smsIntent = mock(Intent.class);
+    final Bundle smsExtras = new Bundle();
+    final byte[] smsPdu    = buildSmsPdu("15555555555", smsBody);
+
+    smsExtras.putSerializable("pdus", new Object[]{smsPdu});
+
+    when(smsIntent.getAction()).thenReturn(Telephony.Sms.Intents.SMS_RECEIVED_ACTION);
+    when(smsIntent.getExtras()).thenReturn(smsExtras);
+
+    return smsIntent;
+  }
+
+  public void testReceiveChallenges() throws Exception {
+    final SmsListener smsListener = new SmsListener();
+
+    for (int i = 0; i < CHALLENGES.length; i++) {
+      final String CHALLENGE     = CHALLENGES[i];
+      final String CHALLENGE_SMS = SmsListenerTest.CHALLENGE_SMS[i];
+
+      final Context                mockContext     = mock(Context.class);
+      final SharedPreferences      mockPreferences = mock(SharedPreferences.class);
+      final ArgumentCaptor<Intent> intentCaptor    = ArgumentCaptor.forClass(Intent.class);
+
+      when(mockContext.getPackageName()).thenReturn(getContext().getPackageName());
+      when(mockContext.getSharedPreferences(anyString(), anyInt())).thenReturn(mockPreferences);
+      when(mockPreferences.getBoolean(contains("pref_verifying"), anyBoolean())).thenReturn(true);
+
+      try {
+        smsListener.onReceive(mockContext, buildSmsReceivedIntent(CHALLENGE_SMS));
+      } catch (IllegalStateException e) {
+        Log.d(getClass().getName(), "some api levels are picky with abortBroadcast()");
+      }
+
+      verify(mockContext, times(1)).sendBroadcast(intentCaptor.capture());
+
+      final Intent sendIntent = intentCaptor.getValue();
+      assertTrue(sendIntent.getAction().equals(RegistrationService.CHALLENGE_EVENT));
+      assertTrue(sendIntent.getStringExtra(RegistrationService.CHALLENGE_EXTRA).equals(CHALLENGE));
+    }
+  }
+}

androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java

@@ -0,0 +1,85 @@
+package org.thoughtcrime.securesms.util;
+
+import org.thoughtcrime.securesms.TextSecureTestCase;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+
+public class ListPartitionTest extends TextSecureTestCase {
+
+  public void testPartitionEven() {
+    List<Integer> list = new LinkedList<>();
+
+    for (int i=0;i<100;i++) {
+      list.add(i);
+    }
+
+    List<List<Integer>> partitions = Util.partition(list, 10);
+
+    assertEquals(partitions.size(), 10);
+
+    int counter = 0;
+
+    for (int i=0;i<partitions.size();i++) {
+      List<Integer> partition = partitions.get(i);
+      assertEquals(partition.size(), 10);
+
+      for (int j=0;j<partition.size();j++) {
+        assertEquals((int)partition.get(j), counter++);
+      }
+    }
+  }
+
+  public void testPartitionOdd() {
+    List<Integer> list = new LinkedList<>();
+
+    for (int i=0;i<100;i++) {
+      list.add(i);
+    }
+
+    list.add(100);
+
+    List<List<Integer>> partitions = Util.partition(list, 10);
+
+    assertEquals(partitions.size(), 11);
+
+    int counter = 0;
+
+    for (int i=0;i<partitions.size()-1;i++) {
+      List<Integer> partition = partitions.get(i);
+      assertEquals(partition.size(), 10);
+
+      for (int j=0;j<partition.size();j++) {
+        assertEquals((int)partition.get(j), counter++);
+      }
+    }
+
+    assertEquals(partitions.get(10).size(), 1);
+    assertEquals((int)partitions.get(10).get(0), 100);
+  }
+
+  public void testPathological() {
+    List<Integer> list = new LinkedList<>();
+
+    for (int i=0;i<100;i++) {
+      list.add(i);
+    }
+
+    List<List<Integer>> partitions = Util.partition(list, 1);
+
+    assertEquals(partitions.size(), 100);
+
+    int counter = 0;
+
+    for (int i=0;i<partitions.size();i++) {
+      List<Integer> partition = partitions.get(i);
+      assertEquals(partition.size(), 1);
+
+      for (int j=0;j<partition.size();j++) {
+        assertEquals((int)partition.get(j), counter++);
+      }
+    }
+  }
+}

androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.thoughtcrime.securesms.util;
+
+import android.util.Log;
+
+import org.thoughtcrime.securesms.TextSecureTestCase;
+
+import java.net.URISyntaxException;
+
+public class Rfc5724UriTest extends TextSecureTestCase {
+
+  private static final String TAG = Rfc5724UriTest.class.getSimpleName();
+
+  public void testInvalidPath() throws Exception {
+    final String[] invalidSchemaUris = {
+        "",
+        ":",
+        "sms:",
+        ":sms",
+        "sms:?goto=fail",
+        "sms:?goto=fail&fail=goto"
+    };
+
+    for (String uri : invalidSchemaUris) {
+      try {
+        new Rfc5724Uri(uri);
+        Log.e(TAG, "uri " + uri + " should have failed path check");
+        assertTrue(false);
+      } catch (URISyntaxException e) { }
+    }
+  }
+
+  public void testGetSchema() throws Exception {
+    final String[][] uriTestPairs = {
+        {"sms:+15555555555",           "sms"},
+        {"sMs:+15555555555",           "sMs"},
+        {"smsto:+15555555555?",        "smsto"},
+        {"mms:+15555555555?a=b",       "mms"},
+        {"mmsto:+15555555555?a=b&c=d", "mmsto"}
+    };
+
+    for (String[] uriTestPair : uriTestPairs) {
+      final Rfc5724Uri testUri = new Rfc5724Uri(uriTestPair[0]);
+      Log.d(TAG, testUri.getSchema() + " ?= " + uriTestPair[1]);
+      assertTrue(testUri.getSchema().equals(uriTestPair[1]));
+    }
+  }
+
+  public void testGetPath() throws Exception {
+    final String[][] uriTestPairs = {
+        {"sms:+15555555555",                      "+15555555555"},
+        {"smsto:+15555555555?",                   "+15555555555"},
+        {"mms:+15555555555?a=b",                  "+15555555555"},
+        {"mmsto:+15555555555?a=b&c=d",            "+15555555555"},
+        {"sms:+15555555555,+14444444444",         "+15555555555,+14444444444"},
+        {"sms:+15555555555,+14444444444?",        "+15555555555,+14444444444"},
+        {"sms:+15555555555,+14444444444?a=b",     "+15555555555,+14444444444"},
+        {"sms:+15555555555,+14444444444?a=b&c=d", "+15555555555,+14444444444"}
+    };
+
+    for (String[] uriTestPair : uriTestPairs) {
+      final Rfc5724Uri testUri = new Rfc5724Uri(uriTestPair[0]);
+      Log.d(TAG, testUri.getPath() + " ?= " + uriTestPair[1]);
+      assertTrue(testUri.getPath().equals(uriTestPair[1]));
+    }
+  }
+
+  public void testGetQueryParams() throws Exception {
+    final String[][] uriTestPairs = {
+        {"sms:+15555555555",         "a", null},
+        {"mms:+15555555555?b=",      "a", null},
+        {"mmsto:+15555555555?a=",    "a", ""},
+        {"sms:+15555555555?a=b",     "a", "b"},
+        {"sms:+15555555555?a=b&c=d", "a", "b"},
+        {"sms:+15555555555?a=b&c=d", "b", null},
+        {"sms:+15555555555?a=b&c=d", "c", "d"},
+        {"sms:+15555555555?a=b&c=d", "d", null}
+    };
+
+    for (String[] uriTestPair : uriTestPairs) {
+      final Rfc5724Uri testUri     = new Rfc5724Uri(uriTestPair[0]);
+      final String     paramResult = testUri.getQueryParams().get(uriTestPair[1]);
+
+      Log.d(TAG, paramResult + " ?= " + uriTestPair[2]);
+      if (paramResult == null) assertTrue(uriTestPair[2] == null);
+      else                     assertTrue(paramResult.equals(uriTestPair[2]));
+    }
+  }
+
+}

androidTest/org/thoughtcrime/securesms/service/MmsReceiverTest.java

@@ -1,28 +0,0 @@
-package org.thoughtcrime.securesms.service;
-
-import android.content.Intent;
-import android.test.InstrumentationTestCase;
-
-import static org.fest.assertions.api.Assertions.*;
-
-public class MmsReceiverTest extends InstrumentationTestCase {
-
-  private MmsReceiver mmsReceiver;
-
-  public void setUp() throws Exception {
-    super.setUp();
-    mmsReceiver = new MmsReceiver(getInstrumentation().getContext());
-  }
-
-  public void tearDown() throws Exception {
-
-  }
-
-  public void testProcessMalformedData() throws Exception {
-    Intent intent = new Intent();
-    intent.setAction(SendReceiveService.RECEIVE_MMS_ACTION);
-    intent.putExtra("data", new byte[]{0x00});
-    mmsReceiver.process(null, intent);
-  }
-
-}

build.gradle

@@ -26,27 +26,31 @@ repositories {
     maven {
         url "https://raw.github.com/whispersystems/maven/master/shortcutbadger/releases/"
     }
+    maven { // textdrawable
+        url 'https://dl.bintray.com/amulyakhare/maven'
+    }
     jcenter()
     mavenLocal()
 }
 
 dependencies {
-    compile 'me.leolin:ShortcutBadger:1.0.2-WS2'
+    compile 'me.leolin:ShortcutBadger:1.1.0-WS1'
     compile 'se.emilsjolander:stickylistheaders:2.2.0'
     compile 'com.google.android.gms:play-services-base:6.5.87'
     compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
     compile 'org.w3c:smil:1.0.0'
     compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
     compile 'com.github.chrisbanes.photoview:library:1.2.3'
+    compile 'com.github.bumptech.glide:glide:3.5.2'
     compile 'com.makeramen:roundedimageview:1.5.0'
-    compile ('com.afollestad:material-dialogs:0.6.4.7') {
+    compile ('com.afollestad:material-dialogs:0.7.3.1') {
         exclude module: 'appcompat-v7'
         exclude module: 'recyclerview-v7'
         exclude module: 'support-annotations'
     }
 
     compile 'com.soundcloud.android:android-crop:0.9.10@aar'
-    compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.android.support:appcompat-v7:22.1.1'
     compile 'com.android.support:recyclerview-v7:21.0.3'
     compile 'com.melnykov:floatingactionbutton:1.1.0'
     compile 'com.google.zxing:android-integration:3.1.0'
@@ -62,7 +66,8 @@ dependencies {
 
     compile 'org.whispersystems:jobmanager:0.11.0'
     compile 'org.whispersystems:libpastelog:1.0.6'
-    compile 'org.whispersystems:textsecure-android:1.2.4'
+    compile 'org.whispersystems:textsecure-android:1.3.0'
+    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
@@ -81,17 +86,18 @@ dependencies {
 
 dependencyVerification {
     verify = [
-            'me.leolin:ShortcutBadger:027977c718035e5997035e04e05152d6c72d94df645e8b7099a274ada722bd14',
+            'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9',
             'se.emilsjolander:stickylistheaders:89146b46c96fea0e40200474a2625cda10fe94891e4128f53cdb42375091b9b6',
             'com.google.android.gms:play-services-base:832cb6b3130e871db6a412c4ab585656dbcc5e7948101f190186757785703f75',
             'com.astuetz:pagerslidingtabstrip:f1641396732c7132a7abb837e482e5ee2b0ebb8d10813fc52bbaec2c15c184c2',
             'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
             'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
             'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc',
+            'com.github.bumptech.glide:glide:16936352b96aa604b030f2d2263fb0cc656933e6cdda0bf6ac681282d1f7f196',
             'com.makeramen:roundedimageview:7dda2e78c406760e5c356ccce59b0df46b5b171cf18abb891998594405021548',
-            'com.afollestad:material-dialogs:6ed57c1c479219f8ae929c310fc171dbfcbcee8326a6dcd50a91959d69eccdf0',
+            'com.afollestad:material-dialogs:c17205f0d300baa307599c428a5473a6659684c94a5f68ae3c2b84b5e4741172',
             'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
-            'com.android.support:appcompat-v7:5dbeb5316d0a6027d646ae552804c3baa5e3bd53f7f33db50904d51505c8a0e5',
+            'com.android.support:appcompat-v7:9a2355537c2f01cf0b95523605c18606b8d824017e6e94a05c77b0cfc8f21c96',
             'com.android.support:recyclerview-v7:e525ad3f33c84bb12b73d2dc975b55364a53f0f2d0697e043efba59ba73e22d2',
             'com.melnykov:floatingactionbutton:0679ad9f7d61eb7aeab91e8dc56358cdedd5b1c1b9c48464499ffa05c40d3985',
             'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
@@ -101,12 +107,12 @@ dependencyVerification {
             'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
             'org.whispersystems:jobmanager:ea9cb943c4892fb90c1eea1be30efeb85cefca213d52c788419553b58d0ed70d',
             'org.whispersystems:libpastelog:550d33c565380d90f4c671e7b8ed5f3a6da55a9fda468373177106b2eb5220b2',
-            'org.whispersystems:textsecure-android:c867b4e1f9cf430aa15c73841833469f71af9c6149becea447a72b96de214398',
-            'com.android.support:support-annotations:fdee2354787ef66b268e75958de3f7f6c4f8f325510a6dac9f49c929f83a63de',
+            'org.whispersystems:textsecure-android:df4c1ac9ee8f7cd43c8c07d64b16e31875e04632afc3fe73f2a47292a86c79a1',
+            'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
             'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
             'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
             'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
-            'org.whispersystems:textsecure-java:141132e1c917759bdc285f80ed9e9784be0dc99ec6872f738439505955832906',
+            'org.whispersystems:textsecure-java:59d7c998c83a0f96bbc84db36719c9be8007bce16ee1ba9748af5610ab429656',
             'org.whispersystems:axolotl-android:40d3db5004a84749a73f68d2f0d01b2ae35a73c54df96d8c6c6723b96efb6fc0',
             'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab',
             'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
@@ -118,13 +124,15 @@ dependencyVerification {
             'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94',
             'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0',
             'org.whispersystems:curve25519-java:9ccef8f5aba05d9942336f023c589d6278b4f9135bdc34a7bade1f4e7ad65fa3',
-            'com.android.support:support-v4:703572d3015a088cc5604b7e38885af3d307c829d0c5ceaf8654ff41c71cd160',
+            'com.android.support:support-v4:1e2e4d35ac7fd30db5ce3bc177b92e4d5af86acef2ef93e9221599d733346f56',
+            'com.android.support:support-annotations:7bc07519aa613b186001160403bcfd68260fa82c61cc7e83adeedc9b862b94ae',
     ]
 }
 
 android {
     compileSdkVersion 22
     buildToolsVersion '22.0.1'
+    testBuildType "testing"
 
     dexOptions {
         javaMaxHeapSize "4g"
@@ -132,7 +140,7 @@ android {
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 22
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
@@ -157,13 +165,41 @@ android {
     buildTypes {
         debug {
             minifyEnabled true
-            proguardFiles 'proguard.cfg'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                          'proguard-google-play-services.pro',
+                          'proguard-dagger.pro',
+                          'proguard-jackson.pro',
+                          'proguard-sqlite.pro',
+                          'proguard-appcompat-v7.pro',
+                          'proguard-square-okhttp.pro',
+                          'proguard-square-okio.pro',
+                          'proguard-spongycastle.pro',
+                          'proguard-rounded-image-view.pro',
+                          'proguard-glide.pro',
+                          'proguard-shortcutbadger.pro',
+                          'proguard.cfg'
         }
         release {
             minifyEnabled true
-            proguardFiles 'proguard.cfg'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                          'proguard-google-play-services.pro',
+                          'proguard-dagger.pro',
+                          'proguard-jackson.pro',
+                          'proguard-sqlite.pro',
+                          'proguard-appcompat-v7.pro',
+                          'proguard-square-okhttp.pro',
+                          'proguard-square-okio.pro',
+                          'proguard-spongycastle.pro',
+                          'proguard-rounded-image-view.pro',
+                          'proguard-glide.pro',
+                          'proguard-shortcutbadger.pro',
+                          'proguard.cfg'
             signingConfig signingConfigs.release
         }
+        testing.initWith(buildTypes.debug)
+        testing {
+            proguardFile 'proguard-testing.pro'
+        }
     }
 
     sourceSets {

contributing.md

@@ -28,3 +28,4 @@ Truths which we believe to be self-evident:
 1. **There is no such thing as time.** Protocol ideas that require synchronized
    clocks are doomed to failure. 
 
+Before you submit a pull request, please check if your code follows the [Code style Guidelines](https://github.com/WhisperSystems/RedPhone/wiki/Code-style-Guidelines).

proguard-appcompat-v7.pro

@@ -0,0 +1,9 @@
+# https://code.google.com/p/android/issues/detail?id=78377
+-keepnames class !android.support.v7.internal.view.menu.**, ** { *; }
+
+-keep public class android.support.v7.widget.** { *; }
+-keep public class android.support.v7.internal.widget.** { *; }
+
+-keep public class * extends android.support.v4.view.ActionProvider {
+    public <init>(android.content.Context);
+}

proguard-dagger.pro

@@ -0,0 +1,20 @@
+-keepattributes *Annotation*,EnclosingMethod
+-keep @interface dagger.*,javax.inject.*
+-keep @dagger.Module class *
+-keepclassmembers class * {
+    @javax.inject.* *;
+    @dagger.* *;
+    <init>();
+}
+-keepclasseswithmembernames class * {
+  @javax.inject.* <fields>;
+}
+-keep class javax.inject.** { *; }
+-keep class **$$ModuleAdapter
+-keep class **$$InjectAdapter
+-keep class **$$StaticInjection
+
+-keep class dagger.** { *; }
+-keep class * extends dagger.** { *; }
+-keep interface dagger.** {*;}
+-dontwarn dagger.internal.codegen.**

proguard-glide.pro

@@ -0,0 +1,4 @@
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    **[] $VALUES;
+    public *;
+}

proguard-google-play-services.pro

@@ -0,0 +1,19 @@
+## Google Play Services 4.3.23 specific rules ##
+## https://developer.android.com/google/play-services/setup.html#Proguard ##
+
+-keep class * extends java.util.ListResourceBundle {
+    protected Object[][] getContents();
+}
+
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}

proguard-jackson.pro

@@ -0,0 +1,12 @@
+# Proguard configuration for Jackson 2.x (fasterxml package instead of codehaus package)
+
+-keepattributes *Annotation*,EnclosingMethod,Signature
+-keepnames class com.fasterxml.jackson.** {
+*;
+}
+-keepnames interface com.fasterxml.jackson.** {
+    *;
+}
+-dontwarn com.fasterxml.jackson.databind.**
+-keep class org.codehaus.** { *; }
+

proguard-rounded-image-view.pro

@@ -0,0 +1 @@
+-dontwarn com.squareup.picasso.**

proguard-shortcutbadger.pro

@@ -0,0 +1 @@
+-keep class me.leolin.shortcutbadger.** {*;}

proguard-spongycastle.pro

@@ -0,0 +1,2 @@
+-keep class org.spongycastle.** {*;}
+-dontwarn javax.naming.**

proguard-sqlite.pro

@@ -0,0 +1,2 @@
+-keep class org.sqlite.** { *; }
+-keep class org.sqlite.database.** { *; }

proguard-square-okhttp.pro

@@ -0,0 +1,6 @@
+# OkHttp
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class com.squareup.okhttp.** { *; }
+-keep interface com.squareup.okhttp.** { *; }
+-dontwarn com.squareup.okhttp.**

proguard-square-okio.pro

@@ -0,0 +1,5 @@
+# Okio
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**

proguard-testing.pro

@@ -0,0 +1,10 @@
+-keepattributes Exceptions
+-dontskipnonpubliclibraryclassmembers
+
+-dontwarn android.test.**
+-dontwarn com.android.support.test.**
+-dontwarn sun.reflect.**
+-dontwarn org.assertj.**
+-dontwarn org.hamcrest.**
+-dontwarn org.mockito.**
+-dontwarn com.squareup.**

proguard.cfg

@@ -1,6 +1,5 @@
--keepattributes **
-
--keep class !com.afollestad.materialdialogs.**,!com.nineoldandroids.**,!org.spongycastle.crypto.tls.**,!com.doomonafireball.betterpickers.**,!org.w3c.**,!android.support.v7.internal.view.menu.**,!org.spongycastle.asn1.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.x509.**,!org.spongycastle.crypto.agreement.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.math.**,!org.spongycastle.pqc.**,!org.spongycastle.jcajce.provider.asymmetric.**,!org.apache.http.**,** {*;}
--dontpreverify
 -dontoptimize
--dontwarn **
+-keepattributes SourceFile,LineNumberTable
+-keep class org.whispersystems.** { *; }
+-keep class org.thoughtcrime.securesms.** { *; }
+

res/drawable/conversation_list_divider_shape.xml

@@ -8,6 +8,7 @@
     <item android:left="83dp" android:right="10dp">
         <shape android:shape="rectangle">
             <solid android:color="@color/conversation_list_divider_light" />
+            <size android:height="1px" />
         </shape>
     </item>
-</layer-list>
+</layer-list>

res/drawable/conversation_list_divider_shape_dark.xml

@@ -8,6 +8,7 @@
     <item android:left="83dp" android:right="10dp">
         <shape android:shape="rectangle">
             <solid android:color="@color/conversation_list_divider_dark" />
+            <size android:height="1px" />
         </shape>
     </item>
-</layer-list>
+</layer-list>

res/layout/conversation_activity.xml

@@ -14,12 +14,10 @@
             android:orientation="vertical"
             android:gravity="bottom">
 
-        <fragment
-                android:id="@+id/fragment_content"
-                android:name="org.thoughtcrime.securesms.ConversationFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_above="@+id/bottom_container" />
+        <FrameLayout android:id="@+id/fragment_content"
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent"
+                     android:layout_above="@+id/bottom_container" />
 
         <LinearLayout
                 android:layout_alignParentBottom="true"
@@ -38,7 +36,7 @@
                         android:orientation="horizontal"
                         android:visibility="gone">
 
-                    <ImageView
+                    <org.thoughtcrime.securesms.components.ThumbnailView
                             android:id="@+id/attachment_thumbnail"
                             android:layout_width="0dp"
                             android:layout_height="150dip"
@@ -86,9 +84,12 @@
                         android:autoText="true"
                         android:capitalize="sentences"
                         android:background="@drawable/compose_background"
+                        android:paddingTop="12dp"
+                        android:paddingBottom="12dp"
                         android:paddingRight="0dp"
+                        android:paddingLeft="0dp"
                         android:imeOptions="actionSend|flagNoEnterAction|flagNoExtractUi"
-                        android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
+                        android:inputType="textAutoCorrect|textCapSentences"
                         android:maxLength="2000"
                         android:maxLines="4"
                         android:nextFocusForward="@+id/send_button"

res/layout/conversation_bubble_incoming.xml

@@ -19,14 +19,14 @@
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content">
 
-        <org.thoughtcrime.securesms.components.ForegroundImageView
+        <org.thoughtcrime.securesms.components.ThumbnailView
                 android:id="@+id/image_view"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/media_bubble_height"
                 android:layout_marginRight="@dimen/message_bubble_end_padding"
                 android:visibility="gone"
                 android:layout_gravity="center"
-                android:scaleType="centerCrop"
+                android:scaleType="centerInside"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/conversation_item__mms_image_description"
                 app:riv_corner_radius="@dimen/message_bubble_corner_radius"

res/layout/conversation_bubble_outgoing.xml

@@ -17,7 +17,7 @@
                   android:layout_gravity="center"
                   android:layout_height="wrap_content">
 
-        <org.thoughtcrime.securesms.components.ForegroundImageView
+        <org.thoughtcrime.securesms.components.ThumbnailView
             android:id="@+id/image_view"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/media_bubble_height"

res/layout/conversation_item_received.xml

@@ -26,17 +26,15 @@
                     android:layout_marginBottom="6dp"
                     android:layout_marginRight="0dp">
 
-        <org.thoughtcrime.securesms.components.ForegroundImageView
+        <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo"
             android:foreground="@drawable/contact_photo_background"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            app:riv_oval="true"
             android:layout_marginRight="10dp"
             android:layout_alignParentLeft="true"
             android:cropToPadding="true"
-            android:contentDescription="@string/conversation_item_received__contact_photo_description"
-            android:scaleType="centerCrop" />
+            android:contentDescription="@string/conversation_item_received__contact_photo_description" />
 
         <org.thoughtcrime.securesms.components.IncomingBubbleContainer
                 android:id="@+id/bubble"

res/layout/conversation_list_activity.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:id="@+id/drawer_layout"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <fragment
-            android:id="@+id/fragment_content"
-            android:name="org.thoughtcrime.securesms.ConversationListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:layout="@layout/conversation_list_fragment" />
-
-</LinearLayout>

res/layout/conversation_list_fragment.xml

@@ -7,31 +7,37 @@
               android:layout_height="fill_parent"
               android:orientation="vertical">
 
-        <ListView android:id="@android:id/list"
-                  android:layout_width="fill_parent"
+    <LinearLayout android:layout_width="match_parent"
                   android:layout_height="match_parent"
-                  android:drawSelectorOnTop="false"
-                  android:scrollbarStyle="insideOverlay"
-                  android:fadingEdgeLength="16dip"
-                  android:divider="?conversation_list_item_divider"
-                  android:headerDividersEnabled="false"
-                  android:footerDividersEnabled="false"
-                  android:dividerHeight="1px"
-                  android:nextFocusDown="@+id/fab"
-                  android:nextFocusForward="@+id/fab"
-                  tools:listitem="@layout/conversation_list_item_view"/>
+                  android:orientation="vertical">
+
+        <org.thoughtcrime.securesms.components.ReminderView
+                android:id="@+id/reminder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        <android.support.v7.widget.RecyclerView
+                android:id="@+id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical"
+                android:nextFocusDown="@+id/fab"
+                android:nextFocusForward="@+id/fab"
+                tools:listitem="@layout/conversation_list_item_view" />
+
+    </LinearLayout>
 
     <com.melnykov.fab.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_create_white_24dp"
-        android:focusable="true"
-        android:contentDescription="@string/conversation_list_fragment__fab_content_description"
-        fab:fab_colorNormal="?fab_color"
-        fab:fab_colorPressed="@color/textsecure_primary_dark"
-        fab:fab_colorRipple="@color/textsecure_primary_dark" />
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|right"
+            android:layout_margin="16dp"
+            android:src="@drawable/ic_create_white_24dp"
+            android:focusable="true"
+            android:contentDescription="@string/conversation_list_fragment__fab_content_description"
+            fab:fab_colorNormal="?fab_color"
+            fab:fab_colorPressed="@color/textsecure_primary_dark"
+            fab:fab_colorRipple="@color/textsecure_primary_dark" />
 
 </FrameLayout>

res/layout/conversation_list_item_view.xml

@@ -17,14 +17,12 @@
                  android:paddingRight="10dp"
                  android:visibility="visible">
 
-        <com.makeramen.RoundedImageView
+        <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
             android:foreground="@drawable/contact_photo_background"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            app:riv_oval="true"
             android:cropToPadding="true"
-            android:scaleType="centerCrop"
             android:visibility="gone"
             tools:src="@drawable/ic_contact_picture"
             android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
@@ -49,7 +47,8 @@
             android:weightSum="1"
             android:gravity="bottom">
 
-            <TextView android:id="@+id/from"
+            <org.thoughtcrime.securesms.components.FromTextView
+                      android:id="@+id/from"
                       android:layout_weight="1"
                       android:layout_width="0dp"
                       android:layout_height="wrap_content"

res/layout/emoji_drawer.xml

@@ -16,13 +16,14 @@
                                           android:layout_width="0dp"
                                           android:layout_height="45dp" />
 
-        <ImageButton android:id="@+id/backspace"
-                     android:src="@drawable/ic_emoji_backspace"
-                     android:background="@color/emoji_tab_underline"
-                     android:paddingLeft="@dimen/emoji_drawer_left_right_padding"
-                     android:paddingRight="@dimen/emoji_drawer_left_right_padding"
-                     android:layout_width="wrap_content"
-                     android:layout_height="match_parent" />
+        <org.thoughtcrime.securesms.components.RepeatableImageKey
+                android:id="@+id/backspace"
+                android:src="@drawable/ic_emoji_backspace"
+                android:background="@color/emoji_tab_underline"
+                android:paddingLeft="@dimen/emoji_drawer_left_right_padding"
+                android:paddingRight="@dimen/emoji_drawer_left_right_padding"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent" />
 
     </LinearLayout>
 

res/layout/emoji_grid_layout.xml

@@ -5,8 +5,6 @@
              android:layout_height="match_parent">
 
     <GridView android:id="@+id/emoji"
-              android:paddingLeft="10dp"
-              android:paddingRight="10dp"
               android:visibility="visible"
               android:layout_width="fill_parent"
               android:layout_height="match_parent"

res/layout/media_overview_item.xml

@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <org.thoughtcrime.securesms.components.ForegroundImageView
+    <org.thoughtcrime.securesms.components.ThumbnailView
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

res/layout/message_details_activity.xml

@@ -6,19 +6,9 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <FrameLayout android:id="@+id/item_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:background="?conversation_background"
-                 android:paddingTop="15dp"
-                 android:paddingBottom="15dp"
-                 android:elevation="2dp" />
-
     <ListView android:id="@+id/recipients_list"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:paddingLeft="10dp"
-              android:paddingRight="10dp"
               tools:listitem="@layout/message_recipient_list_item" />
 
 </LinearLayout>

res/layout/message_details_header.xml

@@ -6,89 +6,105 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <TextView android:id="@+id/error_text"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:visibility="gone"
-              android:textSize="16sp"
-              android:padding="5dp"
-              tools:visibility="visible"
-              android:text="@string/message_details_header__issues_need_your_attention"
-              android:drawableLeft="@drawable/ic_info_outline_light"
-              android:drawableStart="@drawable/ic_info_outline_light"
-              android:gravity="center_vertical" />
-
-    <TableLayout android:id="@+id/metadata_container"
+    <FrameLayout android:id="@+id/item_container"
                  android:layout_width="match_parent"
-                 android:layout_height="match_parent">
+                 android:layout_height="wrap_content"
+                 android:background="?conversation_background"
+                 android:paddingTop="15dp"
+                 android:paddingBottom="15dp"
+                 android:elevation="2dp" />
 
-        <TableRow android:id="@+id/sent_container"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <TextView android:id="@+id/error_text"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
+                  android:visibility="gone"
+                  android:textSize="16sp"
+                  android:padding="5dp"
+                  tools:visibility="visible"
+                  android:text="@string/message_details_header__issues_need_your_attention"
+                  android:drawableLeft="@drawable/ic_info_outline_light"
+                  android:drawableStart="@drawable/ic_info_outline_light"
+                  android:gravity="center_vertical" />
 
-            <TextView android:layout_width="wrap_content"
+        <TableLayout android:id="@+id/metadata_container"
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent">
+
+            <TableRow android:id="@+id/sent_container"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:text="@string/message_details_header__sent"
-                      android:gravity="right"
-                      android:textStyle="bold" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-            <TextView android:id="@+id/sent_time"
-                      android:layout_width="wrap_content"
+                <TextView android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/message_details_header__sent"
+                          android:gravity="right"
+                          android:textStyle="bold" />
+
+                <TextView android:id="@+id/sent_time"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          tools:text="Jan 18, 9:29AM" />
+
+            </TableRow>
+
+            <TableRow android:id="@+id/received_container"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                      tools:text="Jan 18, 9:29AM" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-        </TableRow>
+                <TextView android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/message_details_header__received"
+                          android:gravity="right"
+                          android:textStyle="bold" />
 
-        <TableRow android:id="@+id/received_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
+                <TextView android:id="@+id/received_time"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          tools:text="Jan 18, 9:31AM" />
 
-            <TextView android:layout_width="wrap_content"
+            </TableRow>
+
+            <TableRow android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:text="@string/message_details_header__received"
-                      android:gravity="right"
-                      android:textStyle="bold" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-            <TextView android:id="@+id/received_time"
-                      android:layout_width="wrap_content"
+                <TextView android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/message_details_header__via"
+                          android:gravity="right"
+                          android:textStyle="bold" />
+
+                <TextView android:id="@+id/transport"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          tools:text="Push (TextSecure)" />
+
+            </TableRow>
+
+            <TableRow android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                      tools:text="Jan 18, 9:31AM" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-        </TableRow>
+                <TextView android:id="@+id/tofrom"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          tools:text="@string/message_details_header__to"
+                          android:textStyle="bold" />
 
-        <TableRow android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
+            </TableRow>
 
-            <TextView android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/message_details_header__via"
-                      android:gravity="right"
-                      android:textStyle="bold" />
-
-            <TextView android:id="@+id/transport"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                      tools:text="Push (TextSecure)" />
-
-        </TableRow>
-
-        <TableRow android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
-
-            <TextView android:id="@+id/tofrom"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      tools:text="@string/message_details_header__to"
-                      android:textStyle="bold" />
-
-        </TableRow>
-
-    </TableLayout>
-    </LinearLayout>
+        </TableLayout>
+    </LinearLayout>
+</LinearLayout>

res/layout/message_recipient_list_item.xml

@@ -5,12 +5,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center_vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp">
 
-    <com.makeramen.RoundedImageView
+    <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
             android:foreground="@drawable/contact_photo_background"
-            app:riv_oval="true"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_centerVertical="true"
@@ -19,7 +20,6 @@
             android:layout_marginBottom="3dp"
             android:layout_marginRight="10dp"
             android:cropToPadding="true"
-            android:scaleType="centerCrop"
             tools:src="@drawable/ic_contact_picture"
             android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
 
@@ -36,7 +36,8 @@
                       android:layout_height="wrap_content"
                       android:orientation="vertical">
 
-            <TextView android:id="@+id/from"
+            <org.thoughtcrime.securesms.components.FromTextView
+                      android:id="@+id/from"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:textAppearance="?android:attr/textAppearanceMedium"

res/layout/push_contact_selection_list_item.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/listPreferredItemHeight"
                 android:paddingRight="25dip">
 
-    <com.makeramen.RoundedImageView
+    <ImageView
         android:id="@+id/contact_photo_image"
         android:layout_width="@dimen/contact_selection_photo_size"
         android:layout_height="@dimen/contact_selection_photo_size"
@@ -15,7 +14,6 @@
         android:layout_marginLeft="10dp"
         android:cropToPadding="true"
         android:scaleType="centerCrop"
-        app:riv_oval="true"
         android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
 
     <TextView android:id="@+id/number"

res/layout/recipient_filter_item.xml

@@ -22,7 +22,8 @@
     style="?android:attr/dropDownItemStyle"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight">
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:background="?conversation_background">
 
     <LinearLayout android:id="@+id/name_and_label"
         android:layout_width="fill_parent"

res/layout/share_activity.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/drawer_layout"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
-    <fragment android:id="@+id/fragment_content"
-        android:name="org.thoughtcrime.securesms.ShareFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</LinearLayout>
+</FrameLayout>

res/layout/share_list_item_view.xml

@@ -5,7 +5,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-    <com.makeramen.RoundedImageView
+    <org.thoughtcrime.securesms.components.AvatarImageView
         android:id="@+id/contact_photo_image"
         android:foreground="@drawable/contact_photo_background"
         android:layout_width="50dp"
@@ -17,8 +17,6 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:cropToPadding="true"
-        android:scaleType="centerCrop"
-        app:riv_oval="true"
         android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
 
     <LinearLayout
@@ -32,7 +30,8 @@
         android:layout_toRightOf="@id/contact_photo_image"
         android:orientation="vertical">
 
-        <TextView android:id="@+id/from"
+        <org.thoughtcrime.securesms.components.FromTextView
+            android:id="@+id/from"
             android:layout_weight="1"
             android:layout_width="wrap_content"
             android:layout_height="0dp"

res/layout/verify_identity_activity.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
+            android:layout_height="fill_parent"
+            android:fillViewport="true">
 
     <LinearLayout android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="16dip"
-                  android:layout_marginRight="16dip"
-                  android:layout_gravity="center"
+                  android:padding="20dp"
+                  android:gravity="center"
                   android:orientation="vertical">
 
         <TextView
@@ -15,23 +15,26 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:text="@string/verify_identity_activity__their_identity_they_read"
-                android:padding="7dip" />
+                android:layout_marginBottom="8dp" />
 
         <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:typeface="monospace"
+                android:fontFamily="monospace"
                 android:id="@+id/friend_reads"
                 android:text=""
-                android:padding="7dip" />
+                android:layout_marginBottom="8dp" />
+
 
         <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/verify_identity_activity__your_identity_you_read"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:padding="7dip" />
+                android:layout_marginBottom="8dp" />
+
 
         <TextView
                 android:layout_width="fill_parent"
@@ -39,7 +42,8 @@
                 android:id="@+id/you_read"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:typeface="monospace"
-                android:text=""
-                android:padding="7dip" />
+                android:fontFamily="monospace"
+                android:text="" />
+
     </LinearLayout>
 </ScrollView>

res/values-ar/strings.xml

@@ -77,6 +77,7 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">عذرا، حجم ملف الصوت يتجاوز الحد المسموح (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">الطرف الآخر ليس رقم هاتف أو عنوان بريد الكتروني صحيح!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">الرسالة فارغة</string>
+  <string name="ConversationActivity_group_members">أعضاء المجموعة</string>
   <string name="ConversationActivity_group_conversation">دردشة جماعية</string>
   <string name="ConversationActivity_unnamed_group">مجموعة غير مسماه</string>
   <string name="ConversationActivity_d_recipients_in_group">أعضاء %d </string>
@@ -91,7 +92,11 @@
   <string name="ConversationActivity_transport_insecure_mms">رسالة وسائط متعددة غير آمنة</string>
   <string name="ConversationActivity_transport_textsecure">تيكست سيكيور</string>
   <string name="ConversationActivity_get_with_it">احصل معها: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">دعنا نستخدم هذا للمحادثة: %s</string>
   <string name="ConversationActivity_error_leaving_group">خطأ أثناء ترك المجموعة...</string>
+  <string name="ConversationActivity_mms_not_supported_title">رسائل الوسائط المتعددة غير مدعمة</string>
+  <string name="ConversationActivity_mms_not_supported_message">لا يمكن إرسال هذه الرسالة لأن شبكة الجوال التي تستخدمها لا تدعم رسائل الوسائط المتعددة</string>
+  <string name="ConversationActivity_specify_recipient">رجاء اختيار جهة اتصال</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">تفاصيل الرسالة</string>
   <string name="ConversationFragment_transport_s_sent_received_s">نقل: %1$s\nSent/Received: %2$s</string>
@@ -144,7 +149,7 @@
   <string name="GroupCreateActivity_actionbar_update_title">تحديث المجموعة</string>
   <string name="GroupCreateActivity_group_name_hint">أسم المجموعة</string>
   <string name="GroupCreateActivity_actionbar_mms_title">مجموعة وسائط متعددة جديدة</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">قمت باختيار شخص لا يدعم مجوعات تيكست سكيور وبالتاليستكون مجموعة وسائط متعددة.</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">قمت باختيار شخص لا يدعم مجوعات تيكست سكيور وبالتالي ستكون مجموعة وسائط متعددة.</string>
   <string name="GroupCreateActivity_you_dont_support_push">أنت غير مسجل لاستخدام بيانات الجوال ولذلك فإن مجموعات تيكست سيكيور معطلة.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">خطأ غير متوقع تسبب في تعذر إنشاء المجموعة.</string>
   <string name="GroupCreateActivity_contacts_no_members">تحتاج إلى شخص واحد على الأقل في المجموعة!</string>
@@ -201,6 +206,7 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">العبارات السرية غير متطابقة!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">العبارة السرية القديمة غير صحيحة!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">أدخل عبارة سرية جديدة!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ربط هذا الجهاز؟</string>
   <string name="DeviceProvisioningActivity_cancel">إلغاء</string>
@@ -215,12 +221,19 @@
   <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_content_progress_key_error">الرمز غير سليم.</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_invalid_passphrase_exclamation">عبارة سرية غير صحيحة!</string>
+  <!--PlayServicesProblemFragment-->
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">تقييم التطبيق</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">إذا كنت مستمتع باستخدام التطبيق رجاء مساعدتنا بتقييمه</string>
+  <string name="RatingManager_rate_now">قَيّم الآن</string>
+  <string name="RatingManager_no_thanks">لا، شكرا</string>
+  <string name="RatingManager_later">فيما بعد</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">المفتاح لجهة الاتصال هذه مختلف عن المرة السابقة. هذا قد يعني ان هناك محاولة لاعتراض اتصالاتك، أو ان جهة الاتصال قام\قامت بإعادة تنصيب تكست سيكيور لديهم.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال هذه.</string>
@@ -252,7 +265,7 @@
   <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_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>
@@ -333,8 +346,8 @@
   <string name="KeyCachingService_passphrase_cached">تيكست سيكيور غير مقفل</string>
   <string name="KeyCachingService_lock">أقفل بالعبارة السرية</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">(%d) رسائل جديدة</string>
-  <string name="MessageNotifier_most_recent_from_s">آخر رسالة من: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d رسالة في %2$d محادثات</string>
+  <string name="MessageNotifier_most_recent_from_s">الأحدث من: %1$s</string>
   <string name="MessageNotifier_encrypted_message">رسالة مشفرة...</string>
   <string name="MessageNotifier_media_message_with_text">رسالة وسائط متعددة: %s</string>
   <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
@@ -376,7 +389,6 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">جارٍ تنزيل رسالة الوسائط</string>
   <string name="conversation_item__mms_image_description">رسالة وسائط متعددة</string>
-  <string name="conversation_item__play_button_description">زر التشغيل</string>
   <string name="conversation_item__secure_message_description">رسالة آمنة</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">تنزيل</string>
@@ -455,7 +467,7 @@
 وتتضمن:</string>
   <string name="registration_problems__sms_interceptors">القائمون باعتراض الرسائل النصية.</string>
   <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
-بعض عملاء التراسل اللحظي العاملة بواسطة طرف ثالث، مثل Handcent أو GoSMS، تتصرف بشكل سيء وتعترض الرسائل النصية القصيرة الواردة. تحقق من استلامك رسالة نصية تبدأ  بـ\"كود تحقق تيكست سيكيور الخاص بك:\". في حالة عدم تلقيها سوف تحتاج إلي ضبط عميل التراسل اللحظي الخاص بالطرف الثالث للسماح بمرور الرسائل النصية.</string>
+بعض تطبيقات التراسل اللحظي العاملة بواسطة طرف ثالث، مثل Handcent أو GoSMS، تتصرف بشكل سيء وتعترض الرسائل النصية القصيرة الواردة. تحقق من استلامك رسالة نصية تبدأ  بـ\"كود تحقق تيكست سيكيور الخاص بك:\". في حالة عدم تلقيها سوف تحتاج إلي ضبط عميل التراسل اللحظي الخاص بالطرف الثالث للسماح بمرور الرسائل النصية.</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>
@@ -518,6 +530,7 @@
   <string name="AndroidManifest__media_preview">معاينة الوسائط</string>
   <string name="AndroidManifest__media_overview">جميع الصور</string>
   <string name="AndroidManifest__media_overview_named">جميع الصور مع %1$s</string>
+  <string name="AndroidManifest__message_details">تفاصيل الرسالة</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد \ تصدير</string>
   <string name="arrays__my_identity_key">مفتاح هويتي</string>
@@ -562,7 +575,7 @@
   <string name="preferences__enable_local_encryption_of_messages_and_keys">تفعيل تشفير تخزين الرسائل والمفاتيح</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">امنع لقطات الشاشة داخل التطبيق وفي قائمة Recents</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">منع لقطات الشاشة داخل التطبيق</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">انسى العبارة السرية من ذاكرة الجهاز بعد فترة</string>
   <string name="preferences__timeout_passphrase">نسيان العبارة السرية بعد فترة</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">تحديد مهلة العبارة السرية</string>
@@ -606,6 +619,7 @@
   <string name="preferences__custom">مخصص</string>
   <string name="preferences__advanced">متقدم</string>
   <string name="preferences__app_protection">حماية التطبيق</string>
+  <string name="preferences__mms_user_agent">الوكيل المستخدم لرسائل الوسائط المتعددة</string>
   <string name="preferences__advanced_mms_access_point_names">الإعدادات اليدوية لرسائل الوسائط المتعددة</string>
   <string name="preferences__enable_manual_mms">استخدم الإعدادات اليدوية لرسائل الوسائط المتعددة</string>
   <string name="preferences__override_system_mms_settings">تغيير إعدادات رسائل الوسائط المتعددة للنظام بالمعلومات أدناه.</string>
@@ -670,7 +684,6 @@
   <string name="conversation_list__menu_search">بحث</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">صورة جهة الاتصال</string>
-  <string name="conversation_list_item_view__attachment_indicator">مؤشر المرفق</string>
   <string name="conversation_list_item_view__error_alert">تنبيه بخطأ</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">محادثة جديدة</string>

res/values-be/strings.xml

@@ -97,6 +97,8 @@
   <string name="ConversationActivity_get_with_it">Атрымай з гэтым: %s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Выкарыстайце гэта, каб пачаць гутарку: %s</string>
   <string name="ConversationActivity_error_leaving_group">Памылка выхаду з групы...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS не падтрымліваюцца</string>
+  <string name="ConversationActivity_mms_not_supported_message">Гэтае паведамленне ня можа быць даслана, бо ваша мабільны аператар не падтрымлівае MMS</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Дэталі паведамлення</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Транспарт: %1$s\nДаслана/Атрымана: %2$s</string>
@@ -232,6 +234,8 @@
   <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-->
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Подпіс падчас цяперашняга абмене ключамі адрозніваецца ад таго, які быў атрыманы ад гэтага кантакта мінулым разам. Гэта можа вызначаць, што нехта спрабуе перахапіць вашыя паведамленні, альбо гэты кантакт проста пераўсталяваў па-новай TextSecure і зараз мае новы ідэнтыфікацыйны ключ.
     </string>
@@ -343,8 +347,6 @@
   <string name="KeyCachingService_passphrase_cached">TextSecure разблакіравана</string>
   <string name="KeyCachingService_lock">Замкнуць гэты пароль</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d новых паведамленняў</string>
-  <string name="MessageNotifier_most_recent_from_s">Самыя апошнія ад: %s</string>
   <string name="MessageNotifier_encrypted_message">Разшыфраванае паведамленне...</string>
   <string name="MessageNotifier_media_message_with_text">Мультымедыя паведамленне: %s</string>
   <string name="MessageNotifier_no_subject">(Няма тэмы)</string>
@@ -386,7 +388,6 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Запампоўка медыя паведамлення</string>
   <string name="conversation_item__mms_image_description">Медыя паведамленне</string>
-  <string name="conversation_item__play_button_description">Кнопка Play</string>
   <string name="conversation_item__secure_message_description">Бяспечнае паведамленне</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Запампаваць</string>
@@ -613,6 +614,7 @@ TextSecure не дачакаўся параверачная SMS.</string>
   <string name="preferences__custom">Пэўны</string>
   <string name="preferences__advanced">Прасунуты</string>
   <string name="preferences__app_protection">Абарона аплікацыі</string>
+  <string name="preferences__mms_user_agent">MMS User Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Ручныя налады MMS</string>
   <string name="preferences__enable_manual_mms">Выкарыстоўваць ручныя налады MMS</string>
   <string name="preferences__override_system_mms_settings">Перапісаць сістэмныя налады MMS тымі, якія знаходзяцца ніжэй.</string>
@@ -677,7 +679,6 @@ TextSecure не дачакаўся параверачная SMS.</string>
   <string name="conversation_list__menu_search">Пошук</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Фота кантакта</string>
-  <string name="conversation_list_item_view__attachment_indicator">Індыкатар дадатку</string>
   <string name="conversation_list_item_view__error_alert">Папярэджванне пра памылкі</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Новая размова</string>

res/values-bg/strings.xml

@@ -82,6 +82,7 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">За съжеление, избраното audio надвишава допустимия максимален размер (%1$skB).</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_group_members">Членове на групата</string>
   <string name="ConversationActivity_group_conversation">Групов разговор</string>
   <string name="ConversationActivity_unnamed_group">Безименна група</string>
   <string name="ConversationActivity_d_recipients_in_group">%d участника</string>
@@ -96,7 +97,11 @@
   <string name="ConversationActivity_transport_insecure_mms">Некриптиран MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Започвай: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Нека да го използваме за: %s</string>
   <string name="ConversationActivity_error_leaving_group">Грешка при напускането на група...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS не се поддържа</string>
+  <string name="ConversationActivity_mms_not_supported_message">Това съобщение не може да бъде изпратезо, защото мобилния Ви оператор не поддържа MMS.</string>
+  <string name="ConversationActivity_specify_recipient">Моля избери контакт</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Информация за съобщението</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Транспорт: %1$s\nИзпратени/Получени: %2$s</string>
@@ -213,6 +218,7 @@ SMS съобщенията от системната базата данни в
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Паролите не съвпадат!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Грешна стара парола!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Въведи нова парола!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Свържи това устройство?</string>
   <string name="DeviceProvisioningActivity_cancel">ОТКАЖИ</string>
@@ -233,6 +239,14 @@ SMS съобщенията от системната базата данни в
   <string name="PassphrasePromptActivity_watermark_content_description">Икона на TextSecure</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 Services, която сте инсталирали не функционира правилно. Моля, преинсталирайте Google Play Services и опитайте пак.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Оцени тази програма</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Ако харесваш тази програма, отдели една секунда и ни помогни като ѝ дадеш оценка.</string>
+  <string name="RatingManager_rate_now">Оцени сега!</string>
+  <string name="RatingManager_no_thanks">Не благодаря</string>
+  <string name="RatingManager_later">По-късно</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different"> 
 Подписът получен при обмяната на ключове е по-различен от този, който си получавал преди от същия
@@ -355,8 +369,8 @@ SMS съобщенията от системната базата данни в
   <string name="KeyCachingService_passphrase_cached">TextSecure е отключен</string>
   <string name="KeyCachingService_lock">Заключи паролата</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d нови съобщения</string>
-  <string name="MessageNotifier_most_recent_from_s">Най-скорошното от: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d съобщения в %2$d чата</string>
+  <string name="MessageNotifier_most_recent_from_s">Най-скорошно от: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Шифровано съобщение...</string>
   <string name="MessageNotifier_media_message_with_text">Медийно съобщение: %s</string>
   <string name="MessageNotifier_no_subject">(Няма зададена тема)</string>
@@ -398,7 +412,6 @@ SMS съобщенията от системната базата данни в
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Изтегляне на медийно съобщение</string>
   <string name="conversation_item__mms_image_description">Медийно съобщение</string>
-  <string name="conversation_item__play_button_description">Бутон за възпроизвеждане</string>
   <string name="conversation_item__secure_message_description">Подсигурено съобщение</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Изтегли</string>
@@ -560,6 +573,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="AndroidManifest__media_preview">Преглед на файла</string>
   <string name="AndroidManifest__media_overview">Всички изображения</string>
   <string name="AndroidManifest__media_overview_named">Всички изображения с %1$s</string>
+  <string name="AndroidManifest__message_details">Информаця за съобщението</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__my_identity_key">Моят ключ за самоличност</string>
@@ -640,6 +654,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__custom">Ръчно</string>
   <string name="preferences__advanced">Допълнителни</string>
   <string name="preferences__app_protection">Защита на приложението</string>
+  <string name="preferences__mms_user_agent">MMS User Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Ръчни MMS настройки</string>
   <string name="preferences__enable_manual_mms">Използвай ръчни MMS настройки</string>
   <string name="preferences__override_system_mms_settings">Промени системните MMS настройки със следната инфромация.</string>
@@ -704,7 +719,6 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="conversation_list__menu_search">Търси</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Изображение на контакта</string>
-  <string name="conversation_list_item_view__attachment_indicator">Индикатор за прикачен файл</string>
   <string name="conversation_list_item_view__error_alert">Известие за грешка</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Нов разговор</string>

res/values-bo/strings.xml

@@ -69,6 +69,8 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">གསང་ཚིག་རྙིང་པ་དེ་ནོར་འདུག </string>
   <!--DeviceProvisioningActivity-->
   <!--PassphrasePromptActivity-->
+  <!--PlayServicesProblemFragment-->
+  <!--RatingManager-->
   <!--ReceiveKeyActivity-->
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_continue">མུ་མཐུད། </string>
@@ -116,8 +118,6 @@
   <string name="ApplicationMigrationService_import_in_progress">ནང་འདྲེན་བྱེད་བཞིན་ཡོད། </string>
   <!--KeyCachingService-->
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">(%d) ཡི་འཕྲིན་ཐུང་གསར་པ་རྣམས།</string>
-  <string name="MessageNotifier_most_recent_from_s">%s: ནས་ཉེ་ཆར་གྱི་དེ། </string>
   <string name="MessageNotifier_encrypted_message">གསང་སྡོམ་འཕྲིན་ཐུང་། </string>
   <string name="MessageNotifier_message_delivery_failed">འཕྲིན་ཐུང་བཏང་བ་དེ་འགྲོ་མི་འདུག </string>
   <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>

res/values-ca/strings.xml

@@ -117,6 +117,8 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase contrasenya antiga incorrecta!</string>
   <!--DeviceProvisioningActivity-->
   <!--PassphrasePromptActivity-->
+  <!--PlayServicesProblemFragment-->
+  <!--RatingManager-->
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La signatura en aquest intercanvi de claus és diferent que el que havies rebut prèviament d\'aquest contacte. Això pot voler dir tant que algú està intentant interceptar la teva comunicació, o que aquest contacte simplement ha re-instal·lat TextSecure i ara té una clau d\'identitat nova.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Pot ser que vulguis verificar aquest contacte.</string>
@@ -203,8 +205,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="KeyCachingService_passphrase_cached">TextSecure està desbloquejat</string>
   <string name="KeyCachingService_lock">Bloqueja amb una frase contrasenya</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d nous missatges</string>
-  <string name="MessageNotifier_most_recent_from_s">Més recent de: %s</string>
   <string name="MessageNotifier_encrypted_message">Missatge encriptat...</string>
   <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>

res/values-cs/strings.xml

@@ -101,6 +101,9 @@ kontakt</string>
   <string name="ConversationActivity_get_with_it">Získat s ním: %s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Použít pro rozhovor: %s</string>
   <string name="ConversationActivity_error_leaving_group">Chyba při opouštění skupiny.</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS nejsou podporovány</string>
+  <string name="ConversationActivity_mms_not_supported_message">Zpráva nemůže být odeslána protože váš operátor nepodporuje MMS.</string>
+  <string name="ConversationActivity_specify_recipient">Vyberte prosím kontakt</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>
@@ -233,6 +236,14 @@ Poslat zprávy Vaším jménem.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Zadejte heslo</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Chybné heslo!</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Verze služby Google Play, kterou máte nainstalovánu, nepracuje správně. Prosím přeinstalujete službu Google Play a zkuste to znovu.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Ohodnotit tuto aplikaci</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Pokud jste s aplikací spokojeni, prosím věnujte chvilku jejímu ohodnocení. Pomůže nám to.</string>
+  <string name="RatingManager_rate_now">Ohodnotit teď!</string>
+  <string name="RatingManager_no_thanks">Ne díky</string>
+  <string name="RatingManager_later">Později</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis na této výměně klíčů je jiný, než jaký jste od tohoto kontaktu obdrželi dříve. To může
 znamenat, že se někdo pokouší zachytit vaši konverzaci, nebo jen že si váš kontakt
@@ -348,8 +359,8 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="KeyCachingService_passphrase_cached">TextSecure je odemčený</string>
   <string name="KeyCachingService_lock">Uzamknout heslem</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d nových zpráv</string>
-  <string name="MessageNotifier_most_recent_from_s">Poslední od: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d zpráv v %2$d konverzacích</string>
+  <string name="MessageNotifier_most_recent_from_s">Poslední od: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Šifrovaná zpráva...</string>
   <string name="MessageNotifier_media_message_with_text">Multimediální zpráva: %s</string>
   <string name="MessageNotifier_no_subject">(Předmět neuveden)</string>
@@ -391,7 +402,6 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Stahuji multimediální zprávu</string>
   <string name="conversation_item__mms_image_description">Multimediální zpráva</string>
-  <string name="conversation_item__play_button_description">Tlačítko Play</string>
   <string name="conversation_item__secure_message_description">Zabezpečená zpráva</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Stažení</string>
@@ -551,6 +561,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="AndroidManifest__media_preview">Náhled dat</string>
   <string name="AndroidManifest__media_overview">Všechny obrázky</string>
   <string name="AndroidManifest__media_overview_named">Všechny obrázky s %1$s</string>
+  <string name="AndroidManifest__message_details">Podrobnosti zprávy</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__my_identity_key">Můj identifikační klíč</string>
@@ -633,6 +644,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__custom">Vlastní</string>
   <string name="preferences__advanced">Rozšířené možnosti</string>
   <string name="preferences__app_protection">Ochrana aplikace</string>
+  <string name="preferences__mms_user_agent">MMS  User Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Manuální nastavení MMS</string>
   <string name="preferences__enable_manual_mms">Použijte manuální nastavení MMS</string>
   <string name="preferences__override_system_mms_settings">Zadat vlastní nastavení MMS</string>
@@ -697,7 +709,6 @@ Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</string>
   <string name="conversation_list__menu_search">Hledat</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Fotografie kontaktu</string>
-  <string name="conversation_list_item_view__attachment_indicator">Indikátor přílohy</string>
   <string name="conversation_list_item_view__error_alert">Upozornění na chybu</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nová konverzace</string>

res/values-da/strings.xml

@@ -185,6 +185,8 @@ Genoprettelse af en krypteret backup vil overskrive eksisterende nøgler, indsti
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Godkend kodeord</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ugyldigt kodeord!</string>
+  <!--PlayServicesProblemFragment-->
+  <!--RatingManager-->
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne udvekslingsnøgle er ikke ens med den som du tidligere modtog fra denne
 kontakt. Det kan enten betyde, at der er nogle som prøver på at kompromitterer din kommunikation eller
@@ -302,8 +304,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="KeyCachingService_passphrase_cached">TextSecure er låst op</string>
   <string name="KeyCachingService_lock">Lås med et kodeord</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">(%d) Nye beskeder</string>
-  <string name="MessageNotifier_most_recent_from_s">Sidst modtaget fra: %s</string>
   <string name="MessageNotifier_encrypted_message">Krypteret besked...</string>
   <string name="MessageNotifier_no_subject">(Intet emne)</string>
   <string name="MessageNotifier_message_delivery_failed">Levering af besked mislykkedes.</string>
@@ -342,7 +342,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="conversation_activity__emoji_toggle_description">Emoji tastatur deaktiver/aktiver</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Multimedie besked</string>
-  <string name="conversation_item__play_button_description">Afspiller knap</string>
   <string name="conversation_item__secure_message_description">Indikator for sikker besked</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Hent</string>

res/values-de/strings.xml

@@ -96,6 +96,9 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_get_with_it">Sicher kommunizieren: %s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Lassen Sie uns diese App zum Unterhalten verwenden: %s</string>
   <string name="ConversationActivity_error_leaving_group">Fehler beim Verlassen der Gruppe...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS nicht unterstützt</string>
+  <string name="ConversationActivity_mms_not_supported_message">Diese Nachricht kann nicht gesendet werden, da Ihr Mobilfunkbetreiber MMS nicht unterstützt.</string>
+  <string name="ConversationActivity_specify_recipient">Bitte einen Kontakt auswählen</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>
@@ -230,6 +233,14 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-Symbol</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Passwort übermitteln</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Passwort ungültig!</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Die derzeit installierte Version der Google Play-Dienste funktioniert nicht korrekt. Bitte installieren Sie die Google Play-Dienste neu und versuchen Sie es noch einmal.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Diese App bewerten</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Helfen Sie uns durch Ihre Bewertung, wenn Ihnen die App gefällt.</string>
+  <string name="RatingManager_rate_now">Jetzt bewerten!</string>
+  <string name="RatingManager_no_thanks">Nein danke</string>
+  <string name="RatingManager_later">Später</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die Signatur dieses Schlüsselaustauschs hat sich geändert. Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleicht hat dieser Kontakt TextSecure aber auch nur neu installiert und benutzt nun einen neuen Schlüssel.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Sie sollten diesen Kontakt ggf. überprüfen.</string>
@@ -341,8 +352,8 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="KeyCachingService_passphrase_cached">TextSecure ist entsperrt</string>
   <string name="KeyCachingService_lock">Mit Passwort sperren</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d neue Nachrichten</string>
-  <string name="MessageNotifier_most_recent_from_s">Letzte Nachricht von: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d Nachrichten in %2$d Unterhaltungen</string>
+  <string name="MessageNotifier_most_recent_from_s">Neueste von: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Verschlüsselte Nachricht...</string>
   <string name="MessageNotifier_media_message_with_text">Mediennachricht: %s</string>
   <string name="MessageNotifier_no_subject">(Kein Betreff)</string>
@@ -384,7 +395,6 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Mediennachricht wird heruntergeladen</string>
   <string name="conversation_item__mms_image_description">Mediennachricht</string>
-  <string name="conversation_item__play_button_description">Wiedergabetaste</string>
   <string name="conversation_item__secure_message_description">Sichere Nachricht</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
@@ -505,7 +515,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="verify_identity_activity__their_identity_they_read">Empfängeridentität:</string>
   <string name="verify_identity_activity__your_identity_you_read">Eigene Identität:</string>
   <!--message_details_header-->
-  <string name="message_details_header__issues_need_your_attention">Einige Probleme bedürfen Ihrer Aufmerksamkeit.</string>
+  <string name="message_details_header__issues_need_your_attention">Einige Vorgänge benötigen Ihre Aufmerksamkeit.</string>
   <string name="message_details_header__sent">Gesendet</string>
   <string name="message_details_header__received">Empfangen</string>
   <string name="message_details_header__via">Über</string>
@@ -524,6 +534,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="AndroidManifest__media_preview">Dateivorschau</string>
   <string name="AndroidManifest__media_overview">Alle Bilder</string>
   <string name="AndroidManifest__media_overview_named">Alle Bilder mit %1$s</string>
+  <string name="AndroidManifest__message_details">Nachrichtendetails</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Datensicherung</string>
   <string name="arrays__my_identity_key">Mein Schlüssel</string>
@@ -603,7 +614,8 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__slow">Langsam</string>
   <string name="preferences__custom">Benutzerdefiniert</string>
   <string name="preferences__advanced">Weitere Einstellungen</string>
-  <string name="preferences__app_protection">App-Schutz</string>
+  <string name="preferences__app_protection">Anwendungsschutz</string>
+  <string name="preferences__mms_user_agent">MMS-Benutzer-Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Manuelle MMS-Einstellungen</string>
   <string name="preferences__enable_manual_mms">Manuelle MMS-Einstellungen</string>
   <string name="preferences__override_system_mms_settings">Statt der Systemeinstellungen für MMS die unten genannten Einstellungen benutzen</string>
@@ -668,7 +680,6 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="conversation_list__menu_search">Suchen</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Kontaktbild</string>
-  <string name="conversation_list_item_view__attachment_indicator">Anhangssymbol</string>
   <string name="conversation_list_item_view__error_alert">Fehlerbenachrichtigung</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Neue Unterhaltung</string>

res/values-el/strings.xml

@@ -89,6 +89,7 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Συγγνώμη, το επιλεγμένο αρχείο ήχου υπερβαίνει το μέγιστο μέγεθος μηνύματος (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ο παραλήπτης δεν είναι έγκυρη διεύθυνση SMS ή email!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Το μήνυμα είναι κενό!</string>
+  <string name="ConversationActivity_group_members">Μέλη ομάδας</string>
   <string name="ConversationActivity_group_conversation">Ομαδική συζήτηση</string>
   <string name="ConversationActivity_unnamed_group">Ανώνυμη ομάδα</string>
   <string name="ConversationActivity_d_recipients_in_group">%d μέλη</string>
@@ -103,7 +104,11 @@
   <string name="ConversationActivity_transport_insecure_mms">Μη ασφαλές MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Αποκτήστε το με αυτό: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Ας χρησιμοποιήσουμε αυτό το chat: %s</string>
   <string name="ConversationActivity_error_leaving_group">Σφάλμα κατα την αποχώρηση από την ομάδα...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS δεν υποστηρίζεται</string>
+  <string name="ConversationActivity_mms_not_supported_message">Αυτό το μήνυμα δεν μπορεί να αποσταλεί δεδομένου ότι φορέας σας δεν υποστηρίζει MMS.</string>
+  <string name="ConversationActivity_specify_recipient">Παρακαλώ επιλέξτε μια επαφή</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Στοιχεία μηνύματος</string>
   <string name="ConversationFragment_transport_s_sent_received_s"> Μέσο μεταφοράς:  %1$s
@@ -228,6 +233,7 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Τα συνθηματικά δε ταιριάζουν!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Λανθασμένο, παλιό συνθηματικό!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Εισάγετε νέα συνθηματική Φράση </string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Σύνδεση αυτής της συσκευής;</string>
   <string name="DeviceProvisioningActivity_cancel">ΑΚΥΡΩΣΗ</string>
@@ -248,6 +254,14 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="PassphrasePromptActivity_watermark_content_description">Εικονίδιο TextSecure</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 Services που έχετε εγκαταστήσει δεν λειτουργεί σωστά. Παρακαλούμε εγκαταστήστε ξανά το Google Play Services και δοκιμάστε ξανά.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Βαθμολογήστε αυτή την εφαρμογή</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Αν σας αρέσει να χρησιμοποιείτε αυτή την εφαρμογή, αφιερώστε λίγο χρόνο για να μας βοηθήσεte βαθμολογωντας την.</string>
+  <string name="RatingManager_rate_now">Βαθμολογήστε Τώρα!</string>
+  <string name="RatingManager_no_thanks">Οχι ευχαριστώ</string>
+  <string name="RatingManager_later">Αργότερα</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Το
         αποτύπωμα αυτής της ανταλλαγής κλειδιών είναι διαφορετικό από αυτό που λάβαμε πρωτύτερα από αυτή την
@@ -371,8 +385,8 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="KeyCachingService_passphrase_cached">Το TextSecure είναι ξεκλειδωμένο</string>
   <string name="KeyCachingService_lock">Κλείδωμα με συνθηματικό</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d νέα μηνύματα</string>
-  <string name="MessageNotifier_most_recent_from_s">Πιο πρόσφατο μήνυμα από: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d μηνύματα σe %2$d συζητήσεις</string>
+  <string name="MessageNotifier_most_recent_from_s">Τελευταίο μήνυμα από: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Κρυπτογραφημένο μήνυμα...</string>
   <string name="MessageNotifier_media_message_with_text">Μήνυμα Πολυμέσων: %s</string>
   <string name="MessageNotifier_no_subject">(Χωρίς Θέμα)</string>
@@ -414,7 +428,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Το μήνυμα πολυμέσων κατεβαίνει</string>
   <string name="conversation_item__mms_image_description">Μήνυμα πολυμέσων</string>
-  <string name="conversation_item__play_button_description">Κουμπί αναπαραγωγής</string>
   <string name="conversation_item__secure_message_description">Ασφαλές μήνυμα</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Λήψη</string>
@@ -574,6 +587,7 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="AndroidManifest__media_preview">Προεπισκόπηση  Πολυμέσων</string>
   <string name="AndroidManifest__media_overview">Όλες οι εικόνες</string>
   <string name="AndroidManifest__media_overview_named">Όλες οι εικόνες με  %1$s</string>
+  <string name="AndroidManifest__message_details">Στοιχεία μηνύματος</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Εισαγωγή / εξαγωγή</string>
   <string name="arrays__my_identity_key">Το Κλειδί Ταυτότητάς Μου</string>
@@ -654,6 +668,7 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="preferences__custom">Προσαρμοσμένο</string>
   <string name="preferences__advanced">Για προχωρημένους</string>
   <string name="preferences__app_protection">Προστασία εφαρμογής</string>
+  <string name="preferences__mms_user_agent">MMS User Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Ρυθμίσεις MMS</string>
   <string name="preferences__enable_manual_mms">Χρήση μη αυτόματων ρυθμίσεων MMS</string>
   <string name="preferences__override_system_mms_settings">Να χρησιμοποιηθούν οι παρακάτω ρυθμίσεις MMS ασχέτως των ρυθμίσεων του συστήματος.</string>
@@ -718,7 +733,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="conversation_list__menu_search">Αναζήτηση</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Φωτογραφία επαφής</string>
-  <string name="conversation_list_item_view__attachment_indicator">Δείκτης Συνημμένων</string>
   <string name="conversation_list_item_view__error_alert">Ειδοποίηση σφάλματος</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Νεα Συζήτηση</string>

res/values-es/strings.xml

@@ -102,6 +102,9 @@ este contacto.
   <string name="ConversationActivity_get_with_it">Hágase con él: %s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Usemos esto para chatear: %s</string>
   <string name="ConversationActivity_error_leaving_group">Error al dejar el grupo...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS no admitidos</string>
+  <string name="ConversationActivity_mms_not_supported_message">Este mensaje no se puede enviar debido a que su proveedor no admite MMS.</string>
+  <string name="ConversationActivity_specify_recipient">Por favor, elija un contacto</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s
@@ -250,6 +253,14 @@ Por favor pida al remitente que actualice a la versión más reciente y reenvíe
   <string name="PassphrasePromptActivity_watermark_content_description">Icono de TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Enviar clave de acceso</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">¡Clave de acceso no válida!</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">La versión de Google Play Services que ha instalado no está funcionando correctamente. Por favor, reinstale Google Play Services e inténtelo de nuevo.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Evalúe esta aplicación</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Si disfruta usando esta aplicación, por favor, tómese un momento para ayudarnos evaluándola.</string>
+  <string name="RatingManager_rate_now">¡Evaluar ahora!</string>
+  <string name="RatingManager_no_thanks">No, gracias</string>
+  <string name="RatingManager_later">Más tarde</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La firma en este intercambio de claves es diferente de lo que previamente ha recibido de este contacto. Esto podría significar que alguien está intentando interceptar las comunicaciones o que este contacto simplemente reinstaló TextSecure y ahora tiene una nueva clave de identidad.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Puede que dese verificar
@@ -378,8 +389,8 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="KeyCachingService_passphrase_cached">TextSecure está desbloqueado</string>
   <string name="KeyCachingService_lock">Bloquear con clave de acceso</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">(%d) nuevos mensajes</string>
-  <string name="MessageNotifier_most_recent_from_s">Mensaje más reciente de: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mensajes en %2$d conversaciones</string>
+  <string name="MessageNotifier_most_recent_from_s">Más recientes desde: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Mensaje cifrado...</string>
   <string name="MessageNotifier_media_message_with_text">Mensaje multimedia: %s</string>
   <string name="MessageNotifier_no_subject">(Sin asunto)</string>
@@ -421,7 +432,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Descargando mensaje multimedia</string>
   <string name="conversation_item__mms_image_description">Mensaje multimedia</string>
-  <string name="conversation_item__play_button_description">Botón de reproducción</string>
   <string name="conversation_item__secure_message_description">Asegurar mensaje</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Descarga</string>
@@ -601,6 +611,7 @@ por SMS.
   <string name="AndroidManifest__media_preview">Previsualización del contenido</string>
   <string name="AndroidManifest__media_overview">Todas las imágenes</string>
   <string name="AndroidManifest__media_overview_named">Todas la imágenes con %1$s</string>
+  <string name="AndroidManifest__message_details">Detalles del mensaje</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar/exportar</string>
   <string name="arrays__my_identity_key">Mi clave de identidad</string>
@@ -681,6 +692,7 @@ por SMS.
   <string name="preferences__custom">Personalizado</string>
   <string name="preferences__advanced">Avanzado</string>
   <string name="preferences__app_protection">Protección de la aplicación</string>
+  <string name="preferences__mms_user_agent">Agente de usuario de MMS</string>
   <string name="preferences__advanced_mms_access_point_names">Configuración manual de MMS</string>
   <string name="preferences__enable_manual_mms">Usar configuración manual de MMS</string>
   <string name="preferences__override_system_mms_settings">Usar la configuración MMS de debajo en lugar de la del sistema.</string>
@@ -745,7 +757,6 @@ Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
   <string name="conversation_list__menu_search">Buscar</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Foto del contacto</string>
-  <string name="conversation_list_item_view__attachment_indicator">Indicador de adjunto</string>
   <string name="conversation_list_item_view__error_alert">Alerta de error</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nueva conversación</string>

res/values-eu/strings.xml

@@ -206,6 +206,8 @@ Babeskopia hau lehenago inportatu baduzu, mezu bikoiztuak sortu daitezke.
   <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-->
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Gako
 elkar-trukatzen honen sinadura kontaktu honengandik aurretik jaso duzunaz desberdina da.
@@ -331,8 +333,6 @@ Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakust
   <string name="KeyCachingService_passphrase_cached">TextSecure desblokeatuta dago</string>
   <string name="KeyCachingService_lock">Blokeatu pasahitz bat erabiliz</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">Mezu berrien kopurua: %d</string>
-  <string name="MessageNotifier_most_recent_from_s">Mezurik berriena bidali duena: %s</string>
   <string name="MessageNotifier_encrypted_message">Enkriptatuko mezua...</string>
   <string name="MessageNotifier_no_subject">(Ez dago gairik)</string>
   <string name="MessageNotifier_message_delivery_failed">Mezuaren banaketak huts egin du.</string>
@@ -371,7 +371,6 @@ Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakust
   <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__play_button_description">Erreproduzitzeko botoia</string>
   <string name="conversation_item__secure_message_description">Mezu segurua</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Behera kargatu</string>

res/values-fa/strings.xml

@@ -23,6 +23,7 @@
   <string name="ApplicationPreferencesActivity_On">روشن</string>
   <string name="ApplicationPreferencesActivity_off">خاموش</string>
   <string name="ApplicationPreferencesActivity_Off">خاموش</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d دقیقه</string>
   <!--DraftDatabase-->
@@ -30,12 +31,15 @@
   <string name="DraftDatabase_Draft_audio_snippet">(صوتی)</string>
   <string name="DraftDatabase_Draft_video_snippet">(ویدئو)</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">امکان یافتن برنامه‌ای برای انتخاب مدیا وجود ندارد.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">تصویر</string>
   <string name="AttachmentTypeSelectorAdapter_video">ویدئو</string>
   <string name="AttachmentTypeSelectorAdapter_audio">صدا</string>
   <string name="AttachmentTypeSelectorAdapter_contact">اطلاعات مخاطب</string>
   <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">شما ممکن است مایل به منظور بررسی
+تماس با ما</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">حجم پیام: %d کیلوبایت</string>
   <string name="ConversationItem_expires_s">انقضا: %s</string>
@@ -50,6 +54,7 @@
   <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>
@@ -58,6 +63,7 @@
   <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_group_members">اعضای گروه</string>
   <string name="ConversationActivity_group_conversation">گروه گفتگو</string>
   <string name="ConversationActivity_unnamed_group">گروه بی نام</string>
   <string name="ConversationActivity_d_recipients_in_group">%d اعضای</string>
@@ -71,7 +77,10 @@
   <string name="ConversationActivity_transport_insecure_sms">پیامک نا امن</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS نا امن</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">بیایید از این برای گفت‌وگو استفاده کنیم: %s</string>
   <string name="ConversationActivity_error_leaving_group">خطا ترک گروه ...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS پشتیبانی نمی شود</string>
+  <string name="ConversationActivity_specify_recipient">لطفا یک تماس را انتخاب کنید</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">جزییات پیام</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">فرستنده: %1$s\nنوع انتقال: %2$s\nزمان ارسال: %3$s\nزمان دریافت: %4$s</string>
@@ -117,6 +126,7 @@
   <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_no_members">شما حداقل یک نفر در گروه خود نیاز دارید!</string>
   <string name="GroupCreateActivity_avatar_content_description">آواتار گروه</string>
   <string name="GroupCreateActivity_menu_create_title">ایجاد گروه</string>
   <string name="GroupCreateActivity_creating_group">ایجاد %1$s…</string>
@@ -160,6 +170,7 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">رمزها با هم نمی‌خوانند!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">رمز قبلی نادرست است!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">کلمه عبور جدید را وارد کنید!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">پیوند این دستگاه؟</string>
   <string name="DeviceProvisioningActivity_cancel">لغو</string>
@@ -177,7 +188,15 @@
   <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-->
+  <string name="RatingManager_rate_this_app">امتیاز به این برنامه</string>
+  <string name="RatingManager_rate_now">اکنون بسنجید!</string>
+  <string name="RatingManager_no_thanks">نه ممنون</string>
+  <string name="RatingManager_later">بعد</string>
   <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">شما ممکن است مایل به منظور بررسی
+تماس با ما</string>
   <string name="ReceiveKeyActivity_processing">در حال پردازش</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">در حال پردازش فرایند تبادل کلید...</string>
   <!--RegistrationActivity-->
@@ -204,7 +223,9 @@
   <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_requesting_call">درخواست تماس</string>
   <string name="RegistrationProgressActivity_requesting_incoming_call">درخواست ورودی تأیید تماس ...</string>
@@ -218,6 +239,8 @@
   <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_secure_session_ended">جلسه امن به پایان رسید.</string>
   <string name="SmsMessageRecord_duplicate_message">تکثیر پیام.</string>
   <!--ThreadRecord-->
@@ -245,6 +268,7 @@
   <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-->
@@ -271,12 +295,12 @@
   <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_d_new_messages">%d پیام های جدید</string>
-  <string name="MessageNotifier_most_recent_from_s">بیشترین از: %s</string>
   <string name="MessageNotifier_encrypted_message">پیام رمزنگاری شده ...</string>
+  <string name="MessageNotifier_media_message_with_text">پیام رسانه ها: %s</string>
   <string name="MessageNotifier_no_subject">(بدون موضوع)</string>
   <string name="MessageNotifier_message_delivery_failed">تحویل پیام شکست خورده است.</string>
   <string name="MessageNotifier_failed_to_deliver_message">ناموفق برای تحویل پیام.</string>
@@ -314,7 +338,6 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">دانلود پیام رسانه</string>
   <string name="conversation_item__mms_image_description">پیام رسانه</string>
-  <string name="conversation_item__play_button_description">دکمه بازی</string>
   <string name="conversation_item__secure_message_description">پیام امن</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">دریافت</string>
@@ -335,11 +358,16 @@
   <!--log_submit_activity-->
   <string name="log_submit_activity__thanks">تشکر از کمک شما!</string>
   <string name="log_submit_activity__submitting">ارسال</string>
+  <string name="log_submit_activity__posting_logs">ارسال سیاهه های مربوط به جان کلام ...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__skip">پرش</string>
   <string name="database_migration_activity__import">وارد کردن</string>
+  <string name="database_migration_activity__importing">وارد کردن</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">به روز رسانی پایگاه داده ...</string>
+  <string name="import_fragment__import_system_sms_database">واردکردن پایگاه داده سیستم SMS</string>
+  <string name="import_fragment__import_encrypted_backup">واردکردن پشتیبان رمزگذاری شده</string>
+  <string name="import_fragment__import_plaintext_backup">وارد کردن پشتیبان ساده</string>
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">بدون تصاویر</string>
   <!--message_recipients_list_item-->
@@ -350,7 +378,9 @@
   <string name="MmsPreferencesFragment__disabled">غیر فعال</string>
   <string name="MmsPreferencesFragment__not_set">تنظیم نشده</string>
   <!--GroupUtil-->
+  <string name="GroupUtil_joined_the_group">%1$s به گروه افزود شد.</string>
   <string name="GroupUtil_group_updated">گروه به روز شد.</string>
+  <string name="GroupUtil_title_is_now">عنوان در حال حاضر \'%1$s\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">قفل باز شود</string>
   <!--prompt_mms_activity-->
@@ -363,6 +393,8 @@
   <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__sms_interceptors">پیامک رهگیر.</string>
   <string name="registration_problems__incorrect_number">تعداد نادرست.</string>
   <string name="registration_problems__google_voice">Google Voice</string>
@@ -372,6 +404,8 @@
   <string name="registration_progress_activity__call_me">تماس با من</string>
   <string name="registration_progress_activity__edit_number">ویرایش شماره</string>
   <string name="registration_progress_activity__connectivity_error">خطای اتصال.</string>
+  <string name="registration_progress_activity__no_network_connectivity">بدون شبکه
+اتصال.</string>
   <string name="registration_progress_activity__restrictive_firewall">محدود کردن دیواره آتش</string>
   <string name="registration_progress_activity__connecting">اتصال ...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">در حال انتظار برای اس ام اس
@@ -390,6 +424,7 @@
   <string name="verify_identity_activity__their_identity_they_read">هویت خود (آنها به عنوان خوانده شده):</string>
   <string name="verify_identity_activity__your_identity_you_read">هویت خود (شما بخوانید):</string>
   <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">برخی از مسائل نیاز به توجه شما دارند.</string>
   <string name="message_details_header__sent">فرستاده</string>
   <string name="message_details_header__received">رسیده</string>
   <string name="message_details_header__via">از طریق</string>
@@ -407,7 +442,10 @@
   <string name="AndroidManifest__log_submit">ارسال گزارش اشکال‌زدایی</string>
   <string name="AndroidManifest__media_preview">پیش نمایش رسانه</string>
   <string name="AndroidManifest__media_overview">همه تصاویر</string>
+  <string name="AndroidManifest__media_overview_named">همه عکس ها با %1$s</string>
+  <string name="AndroidManifest__message_details">جزئیات پیام</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">وارد کردن / خروجی گرفتن</string>
   <string name="arrays__my_identity_key">کلید هویت من</string>
   <string name="arrays__use_default">استفاده از پیش فرض</string>
   <string name="arrays__use_custom">استفاده از سفارشی</string>
@@ -482,6 +520,7 @@
   <string name="preferences__custom">دلخواه</string>
   <string name="preferences__advanced">تنظیمات پیشرفته</string>
   <string name="preferences__app_protection">حفاظت برنامه</string>
+  <string name="preferences__mms_user_agent">عامل کاربر MMS</string>
   <string name="preferences__advanced_mms_access_point_names">تنظیمات MMS دستی</string>
   <string name="preferences__enable_manual_mms">استفاده از کتابچه تنظیمات MMS</string>
   <string name="preferences__mmsc_url">MMSC URL</string>
@@ -541,7 +580,6 @@
   <string name="conversation_list__menu_search">جستجو</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">تماس با عکس تصویر</string>
-  <string name="conversation_list_item_view__attachment_indicator">پیوست شاخص</string>
   <string name="conversation_list_item_view__error_alert">هشدار خطا</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">گفتگوی جدید</string>

res/values-fi/strings.xml

@@ -9,8 +9,8 @@
   <string name="ApplicationPreferencesActivity_currently_s">Tällä hetkellä: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Et ole vielä määritellyt salalausetta!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s viestiä per keskustelu</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Haluatko poistaa kaikki vanhat viestit?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Oletko varma, että haluat rajata kaikki viestiketjut %s viimeisimpään viestiin?</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Poistetaanko kaikki vanhat viestit nyt?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Haluatko varmasti rajata kaikki viestiketjut %s viimeisimpään viestiin?</string>
   <string name="ApplicationPreferencesActivity_delete">Poista</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Poistetaanko tallennustilan salaus käytöstä?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
@@ -21,17 +21,17 @@ jatkavat toimintaansa, mutta kuka tahansa, jolla on fyysinen pääsy laitteesees
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Tietoverkkovälitteiseen viestintään vaadittua rekisteröintiä puretaan</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Poistetaanko pikaviestit käytöstä?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Tämä tulee lopettamaan pikaviestipalvelun poistamalla tietosi palvelimelta.
-Käyttääksesi pikaviestipalvelua tulevaisuudessa sinun täytyy rekisteröityä uudelleen.</string>
+Tämä lopettaa pikaviestipalvelun poistamalla tietosi palvelimelta.
+Jos haluat käyttää pikaviestipalvelua jatkossa, sinun täytyy rekisteröityä uudelleen.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Virhe yhdistettäessä palvelimeen!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Tekstiviestit käytössä</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa muuttaaksesi oletustekstiviestisovellustasi</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa, jos haluat vaihtaa oletustekstiviestisovellustasi</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Tekstiviestit poissa käytöstä</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Kosketa, jos haluat asettaa TextSecuren oletustekstiviestisovellukseksi</string>
   <string name="ApplicationPreferencesActivity_on">päällä</string>
   <string name="ApplicationPreferencesActivity_On">Päällä</string>
   <string name="ApplicationPreferencesActivity_off">pois</string>
-  <string name="ApplicationPreferencesActivity_Off">Pois</string>
+  <string name="ApplicationPreferencesActivity_Off">Poissa päältä</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuuttia</string>
@@ -47,7 +47,10 @@ Käyttääksesi pikaviestipalvelua tulevaisuudessa sinun täytyy rekisteröityä
   <string name="AttachmentTypeSelectorAdapter_audio">Äänitallenne</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Yhteystieto</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Yhteystiedon %1$s identiteettiavaimen tiiviste on vaihtunut. Tämä voi tarkoittaa joko sitä, että joku yrittää kaapata viestiliikennettänne tai että %2$s on uudelleenasentanut TextSecuren, ja siksi käyttää nyt uutta identiteettiavainta.</string>
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Yhteystiedon
+%1$s identiteettiavain on vaihtunut. Tämä voi tarkoittaa joko sitä, että joku yrittää kaapata
+viestiliikennettänne, tai sitä, että %2$s on uudelleenasentanut TextSecuren, ja siksi käyttää nyt
+uutta identiteettiavainta.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa
 tämän yhteystiedon.</string>
   <!--ConversationItem-->
@@ -55,7 +58,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationItem_expires_s">Umpeutuu: %s</string>
   <string name="ConversationItem_error_not_delivered">Ei toimitettu</string>
   <string name="ConversationItem_view_secure_media_question">Tarkastele salattua mediaa?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tämä media on tallennettu salattuun tietokantaan. Ulkoisella ohjelmalla tarkasteleminen vaatii sisällön salauksen purkua ja tallennusta muistiin. Oletko varma, että haluat tehdä tämän?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tämä media on tallennettu salattuun tietokantaan. Ulkoisella ohjelmalla tarkasteleminen vaatii sisällön salauksen purkua ja tallennusta muistiin. Haluatko varmasti tehdä tämän?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Virhe. Vastaanotettiin vanhentunut avaintenvaihtoviesti.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Avaintenvaihtoviesti vastaanotettu. Aloita käsittely napsauttamalla.</string>
   <string name="ConversationItem_group_action_left">%1$s on lähtenyt ryhmästä.</string>
@@ -67,11 +70,11 @@ tämän yhteystiedon.</string>
   <string name="ConversationItem_unable_to_open_media">Median avaamiseen ei löytynyt sovellusta.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Aloita salattu istunto?</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Aloita salattu istunto %s:n kanssa?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Salatun istunnon lopetuksen vahvistus</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Aloita salattu istunto yhteystiedon %s kanssa?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Varmista salatun istunnon lopetus</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Haluatko varmasti lopettaa salatun istunnon?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Viestiketjun poiston vahvistus</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Haluatko varmasti poistaa pysyvästi tämän keskustelun?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Varmista viestiketjun poisto</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Haluatko varmasti poistaa tämän keskustelun pysyvästi?</string>
   <string name="ConversationActivity_add_attachment">Lisää liite</string>
   <string name="ConversationActivity_select_contact_info">Valitse yhteystieto</string>
   <string name="ConversationActivity_compose_message">Kirjoita viesti</string>
@@ -87,7 +90,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 jäsen</string>
   <string name="ConversationActivity_saved_draft">Tallennettu luonnos</string>
   <string name="ConversationActivity_invalid_recipient">Virheellinen vastaanottaja!</string>
-  <string name="ConversationActivity_calls_not_supported">Puhelut eivät ole tuettu</string>
+  <string name="ConversationActivity_calls_not_supported">Puheluita ei tueta</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Tämä laite ei näytä tukevan valintanäppäintoimintoja.</string>
   <string name="ConversationActivity_leave_group">Poistutaanko ryhmästä?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Haluatko varmasti poistua ryhmästä?</string>
@@ -95,8 +98,11 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_transport_insecure_mms">Salaamaton MMS-viesti</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Hae täältä: %s</string>
-  <string name="ConversationActivity_lets_use_this_to_chat">Keskustellaan käyttämällä tätä: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Hei, kokeillaanko keskustella tällä: %s</string>
   <string name="ConversationActivity_error_leaving_group">Virhe ryhmästä lähtiessä...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS ei ole tuettu</string>
+  <string name="ConversationActivity_mms_not_supported_message">Tätä viestiä ei voida lähettää, koska operaattorisi ei tue MMS-viestejä.</string>
+  <string name="ConversationActivity_specify_recipient">Valitse yhteystieto</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Viestin tiedot</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Tyyppi: %1$s
@@ -106,7 +112,7 @@ Tyyppi: %2$s
 Lähetetty: %3$s
 Vastaanotettu: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Varmista viestin poisto</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Oletko varma, että haluat pysyvästi poistaa kaikki valitut viestit?</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Haluatko varmasti poistaa kaikki valitut viestit pysyvästi?</string>
   <string name="ConversationFragment_save_to_sd_card">Tallenna muistiin?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Jos tallennat tämän tiedoston muistiin, niin kaikki muutkin sovellukset voivat käyttää sitä.\n\nHaluatko jatkaa?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Tiedoston tallennuksessa tapahtui virhe!</string>
@@ -128,8 +134,8 @@ Vastaanotettu: %4$s</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Avaintenvaihtoviesti...</string>
   <!--CustomDefaultPreference-->
-  <string name="CustomDefaultPreference_using_custom">Käyttäen mukautettua: %s</string>
-  <string name="CustomDefaultPreference_using_default">Käyttäen oletusta: %s</string>
+  <string name="CustomDefaultPreference_using_custom">Käytä mukautettua: %s</string>
+  <string name="CustomDefaultPreference_using_default">Käytä oletusta: %s</string>
   <string name="CustomDefaultPreference_none">Ei asetettu</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Nyt</string>
@@ -236,11 +242,19 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-kuvake</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Syötä salalause</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Salalause ei kelpaa!</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Käyttämäsi versio Google Play Servicestä ei toimi kunnolla. Asenna Google Play Services uudelleen ja yritä uudestaan.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Arvostele tämä sovellus</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Jos pidät TextSecuresta, voit auttaa meitä arvostelemalla sen.</string>
+  <string name="RatingManager_rate_now">Arvostele nyt!</string>
+  <string name="RatingManager_no_thanks">Ei kiitos</string>
+  <string name="RatingManager_later">Myöhemmin</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Tämän
 avaintenvaihdon sormenjälki eroaa tältä yhteystiedolta aiemmin saadusta sormenjäljestä.
-Tämä voi tarkoittaa että joku yrittää kaapata viestiliikennettäsi tai että yhteystietosi on
-uudelleenasentanut TextSecuren, ja käyttää nyt uutta tunnisteavainta.</string>
+Tämä voi tarkoittaa joko sitä, että joku yrittää kaapata viestiliikennettänne, tai sitä, että yhteystietosi
+on uudelleenasentanut TextSecuren ja käyttää nyt uutta tunnisteavainta.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa
 tämän yhteystiedon.</string>
   <string name="ReceiveKeyActivity_processing">Käsitellään</string>
@@ -256,12 +270,13 @@ puhelinnumero</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Antamasi puhelinnumero
 (%s) on virheellinen.</string>
   <string name="RegistrationActivity_unsupported">Ei tuettu</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Pahoittelemme, 
-Tämä laite ei ole tuettu tietoverkkovälitteiseen viestintään. Laitteilla, joissa on Android vanhempi 
-kuin 4.0 täytyy olla rekisteröity Google-tili. Laitteilla, joissa on Android 4.0 tai uudempi ei 
-tarvitse olla Google-tiliä, mutta täytyy olla Play-kauppa asennettuna. </string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Valitettavasti,
+tämä laite ei tue viestien lähettämistä tietoverkon kautta. Laitteissa, joissa on vanhempi kuin
+Android 4.0, täytyy olla rekisteröity Google-tili. Laitteissa, joissa on Android 4.0 tai uudempi
+ei tarvitse
+olla Google-tiliä, mutta täytyy olla Play-kauppa asennettuna. </string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
-Tarkista uudelleen, että tämä on numerosi! Aiomme vahvistaa sen lähettämällä siihen tekstiviestin.</string>
+Tarkista vielä, että tämä on varmasti numerosi! Aiomme seuraavaksi vahvistaa sen lähettämällä siihen tekstiviestin.</string>
   <string name="RegistrationActivity_continue">Jatka</string>
   <string name="RegistrationActivity_edit">Muokkaa</string>
   <!--RegistrationProblemsActivity-->
@@ -274,7 +289,7 @@ Tarkista uudelleen, että tämä on numerosi! Aiomme vahvistaa sen lähettämäl
   <string name="RegistrationProgressActivity_connecting">Yhdistetään</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Yhdistetään vahvistusta varten...</string>
   <string name="RegistrationProgressActivity_network_error">Verkkovirhe!</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Ei voitu yhdistää. Tarkista verkkoyhteys ja yritä uudelleen.</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Yhteyttä ei voitu muodostaa. Tarkista verkkoyhteytesi ja yritä uudelleen.</string>
   <string name="RegistrationProgressActivity_verification_failed">Vahvistus epäonnistui!</string>
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Lähettämäsi vahvistuskoodi on virheellinen. Yritä uudelleen.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Liian monta yritystä</string>
@@ -290,7 +305,7 @@ Tarkista uudelleen, että tämä on numerosi! Aiomme vahvistaa sen lähettämäl
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Rekisteröinti suoritettu</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecuren rekisteröityminen onnistui.</string>
-  <string name="RegistrationService_registration_error">Rekisteröintivirhe</string>
+  <string name="RegistrationService_registration_error">Rekisteröitymisvirhe</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Rekisteröitymisessä ilmeni ongelma.</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Vastaanotettu avaintenvaihtoviesti 
@@ -299,7 +314,7 @@ on viallinen!</string>
 Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely napsauttamalla.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Vastaanotettiin päivitetty, mutta tuntematon identiteetti. Napsauta tarkistaaksesi.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Vastaanotettiin päivitetty, mutta tuntematon identiteetti. Varmenna identiteetti napsauttamalla.</string>
   <string name="SmsMessageRecord_secure_session_ended">Salattu istunto päättyi</string>
   <string name="SmsMessageRecord_duplicate_message">Viestin kaksoiskappale.</string>
   <!--ThreadRecord-->
@@ -313,9 +328,9 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skannaa vastapuolen avaimen QR-koodi</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Näytä oman avaimeni QR-koodi</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROITUS, skannattu avain EI TÄSMÄÄ! Tarkastakaa sormenjälki huolella.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">Ei vahvistettu!</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">EI varmennettu!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Vastapuolen avain on oikea. Huomaa, että hänen on syytä tarkastaa vastaavasti sinun avaimesi.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Vahvistettu!</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Varmennettu!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sinulla ei ole identiteettiavainta!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sinulla ei ole identiteettiavainta.</string>
@@ -324,11 +339,11 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">VAROITUS: Skannattu avain EI TÄSMÄÄ!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">EI vahvistettu!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Skannattu avain täsmää!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Vahvistettu!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Varmennettu!</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Identiteettini sormenjälki</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Aloita olemassa olevasta pyynnöstä huolimatta?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Olet jo lähettänyt istunnon aloituspyynnön tälle vastaanottajalle. Oletko varma, että haluat lähettää toisen pyynnön? Tämä mitätöi ensimmäisen pyynnön.</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Olet jo lähettänyt istunnon aloituspyynnön tälle vastaanottajalle. Haluatko varmasti lähettää toisen pyynnön? Tämä mitätöi ensimmäisen pyynnön.</string>
   <string name="KeyExchangeInitiator_send">Lähetä</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Viestin salaus on kelvoton...</string>
@@ -358,8 +373,8 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="KeyCachingService_passphrase_cached">TextSecuren lukitus on auki</string>
   <string name="KeyCachingService_lock">Lukitse salalauseella</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d uutta viestiä</string>
-  <string name="MessageNotifier_most_recent_from_s">Uusin lähettäjältä: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d viestiä %2$d keskustelussa</string>
+  <string name="MessageNotifier_most_recent_from_s">Uusin lähettäjältä: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Salattu viesti...</string>
   <string name="MessageNotifier_media_message_with_text">Mediaviesti: %s</string>
   <string name="MessageNotifier_no_subject">(Ei otsikkoa)</string>
@@ -380,7 +395,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="contact_selection_group_activity__no_contacts">Ei yhteystietoja.</string>
   <string name="contact_selection_group_activity__finding_contacts">Ladataan yhteystietoja…</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Et olet rekisteröitynyt pikaviestipalveluun…</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Et ole rekisteröitynyt pikaviestipalveluun…</string>
   <string name="SingleContactSelectionActivity_updating_directory">Päivitetään hakemistoa</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Päivitetään pikaviestihakemistoa…</string>
   <string name="SingleContactSelectionActivity_contact_photo">Yhteystiedon kuva</string>
@@ -401,7 +416,6 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Ladataan mediaviestiä</string>
   <string name="conversation_item__mms_image_description">Mediaviesti</string>
-  <string name="conversation_item__play_button_description">Play -nappi</string>
   <string name="conversation_item__secure_message_description">Salattu viesti</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Lataa</string>
@@ -438,7 +452,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
 Vie salaamaton SMS Backup And Restore -yhteensopiva varmuuskopio SD-muistikortille.</string>
   <string name="import_fragment__import_system_sms_database">Tuo järjestelmän tekstiviestit</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Tuo tietokanta
-järjestelmän oletus viestisovelluksesta.</string>
+järjestelmän oletusviestisovelluksesta.</string>
   <string name="import_fragment__import_encrypted_backup">Tuo salattu varmuuskopio</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
 Tuo aiemmin viety salattu TextSecure-varmuuskopio.</string>
@@ -448,7 +462,7 @@ Tuo salaamaton varmuuskopiotiedosto. Yhteensopiva SMS Backup And Restore:lla.</s
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">Ei kuvia</string>
   <!--message_recipients_list_item-->
-  <string name="message_recipients_list_item__verify">VAHVISTA</string>
+  <string name="message_recipients_list_item__verify">VARMENNA</string>
   <string name="message_recipients_list_item__resend">LÄHETÄ UUDELLEEN</string>
   <!--MmsPreferencesFragment-->
   <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Puhelimesi edellyttää manuaalista MMS-asetusten säätöä.</string>
@@ -467,7 +481,7 @@ Tuo salaamaton varmuuskopiotiedosto. Yhteensopiva SMS Backup And Restore:lla.</s
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Jotta TextSecure voisi lähettää mediatiedostoja ja ryhmäviestejä puhelinoperaattorisi kautta, täytyy MMS-asetusten olla määritelty. Tällä hetkellä nämä asetukset eivät ole saatavilla laitteessasi, mikä voi johtua laitteesi operaattorilukituksesta tai muista rajoittavista asetuksista.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Jotta voit lähettää mediatiedostoja ja ryhmäviestejä, napsauta \"OK\" ja täydennä pyydetyt asetukset. Puhelinoperaattorisi MMS-asetukset yleensä löytyvät, kun haet Internetistä operaattorisi nimellä ja termillä \"APN\". Tämä asetusten säätö tarvitsee tehdä vain kerran.</string>
   <!--receive_key_activity-->
-  <string name="receive_key_activity__complete">Valmis</string>
+  <string name="receive_key_activity__complete">Jatka</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Jotta voit ottaa TextSecuren käyttöön, tulee sinun ensin vahvistaa puhelinnumerosi.</string>
@@ -480,7 +494,7 @@ PUHELINNUMEROSI</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Mahdollisiin ongelmiin
 sisältyvät:</string>
-  <string name="registration_problems__sms_interceptors">Tekstiviestisieppaajia.</string>
+  <string name="registration_problems__sms_interceptors">Tekstiviestisieppaajat.</string>
   <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
 Jotkin kolmansien osapuolten tekstiviestisovellukset, kuten Handcent ja GoSMS, käyttäytyvät
 huonosti ja sieppaavat kaikki saapuvat tekstiviestit. Tarkista että olet saanut tekstiviestin, joka alkaa
@@ -488,12 +502,12 @@ sanoilla \'Your TextSecure verification code:\', jolloin sinun täytyy säätä
 kolmannen osapuolen tekstiviestisovelluksesi päästämään tekstiviestisi läpi.</string>
   <string name="registration_problems__incorrect_number">Virheellinen puhelinnumero.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
-Takista, että olet syöttänyt puhelinnumerosi oikein ja että se on muotoiltu oikein alueellesi.</string>
+Tarkista, että olet syöttänyt puhelinnumerosi oikein, ja että se on muotoiltu oikein alueellesi.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
 TextSecure ei toimi Google Voice -numeroiden kanssa.</string>
   <!--registration_progress_activity-->
-  <string name="registration_progress_activity__voice_verification">Puhevahvistus</string>
+  <string name="registration_progress_activity__voice_verification">Vahvistuspuhelu</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
 TextSecure voi myös soittaa sinulle numerosi vahvistamiseksi. Napsauta \"Soita minulle\" ja syötä kuulemasi kuusinumeroinen koodi alla olevaan kenttään. </string>
   <string name="registration_progress_activity__verify">Vahvista</string>
@@ -501,11 +515,13 @@ TextSecure voi myös soittaa sinulle numerosi vahvistamiseksi. Napsauta \"Soita
   <string name="registration_progress_activity__edit_number">Muokkaa numeroa</string>
   <string name="registration_progress_activity__connectivity_error">Yhteysvirhe.</string>
   <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
-TextSecure ei voinut yhdistää pikaviestipalveluun.</string>
+TextSecure ei saanut yhteyttä pikaviestipalveluun.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Mahdollisiin ongelmiin
 sisältyvät:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ei verkkoyhteyttä.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Laitteesi tarvitsee verkkoyhteyden tämän TextSecuren ominaisuuden käyttämiseen. Tarkista, että se on yhdistettynä 3G- tai WiFi-verkkoon.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Laitteesi
+tarvitsee verkkoyhteyttä tämän TextSecuren ominaisuuden käyttämiseen. Tarkista, että laitteesi
+on yhdistettynä 3G- tai WiFi-verkkoon.</string>
   <string name="registration_progress_activity__restrictive_firewall">Rajoittava palomuuri.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Jos olet yhdistänyt WiFi-verkkoon, on mahdollista että palomuuri estää pääsyn TextSecuren palvelimelle. Kokeille toista verkkoa tai mobiiliverkkoa.</string>
@@ -514,7 +530,7 @@ TextSecure vahvistaa nyt puhelinnumerosi automaattisesti tekstiviestillä.</stri
   <string name="registration_progress_activity__connecting">Yhdistetään...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Odotetaan vahvistustekstiviestiä...</string>
   <string name="registration_progress_activity__registering_with_server">Rekisteröidytään palvelimelle...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Tämä voi viedä hetken. Ole kärsivällinen — ilmoitamme, kun vahvistus on suoritettu.</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Tämä voi kestää hetken. Ole kärsivällinen — ilmoitamme, kun vahvistus on suoritettu.</string>
   <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
 TextSecure ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="registration_progress_activity__sms_verification_failed">SMS-vahvistus
@@ -549,6 +565,7 @@ epäonnistui.</string>
   <string name="AndroidManifest__media_preview">Median esikatselu</string>
   <string name="AndroidManifest__media_overview">Kaikki kuvat</string>
   <string name="AndroidManifest__media_overview_named">%1$s: kaikki kuvat</string>
+  <string name="AndroidManifest__message_details">Viestin tiedot</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Tuo / vie</string>
   <string name="arrays__my_identity_key">Oma identiteettiavaimeni</string>
@@ -603,7 +620,7 @@ epäonnistui.</string>
   <string name="preferences__sound">Ääni</string>
   <string name="preferences__change_notification_sound">Vaihda ilmoitusääni</string>
   <string name="preferences__inthread_notifications">Keskustelun sisäiset ilmoitukset</string>
-  <string name="preferences__play_inthread_notifications">Toista ilmoitusäänet aktiivista keskustelua tarkasteltaessa.</string>
+  <string name="preferences__play_inthread_notifications">Käytä ilmoitusääniä myös silloin, kun olen keskustelussa.</string>
   <string name="preferences__repeat_alerts">Hälytysten toisto</string>
   <string name="preferences__never">Älä toista</string>
   <string name="preferences__one_time">Kerran</string>
@@ -629,6 +646,7 @@ epäonnistui.</string>
   <string name="preferences__custom">Mukautettu</string>
   <string name="preferences__advanced">Lisäasetukset</string>
   <string name="preferences__app_protection">Sovelluksen suojaus</string>
+  <string name="preferences__mms_user_agent">MMS User Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Manuaaliset MMS-asetukset</string>
   <string name="preferences__enable_manual_mms">Käytä manuaalisia MMS-asetuksia</string>
   <string name="preferences__override_system_mms_settings">Korvaa järjestelmän MMS-asetukset alla olevilla tiedoilla.</string>
@@ -640,8 +658,8 @@ epäonnistui.</string>
   <string name="preferences__sms_delivery_reports">SMS toimitusvahvistukset</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä vahvistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Poista vanhemmat viestit automaattisesti, kun ketju ylittää määritetyn pituuden</string>
-  <string name="preferences__delete_old_messages">Poista vanhat viestit</string>
-  <string name="preferences__conversation_length_limit">Keskustelun pituuden raja</string>
+  <string name="preferences__delete_old_messages">Vanhojen viestien poisto</string>
+  <string name="preferences__conversation_length_limit">Keskustelun pituusraja</string>
   <string name="preferences__trim_all_threads_now">Karsi kaikki viestiketjut nyt</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Käy läpi kaikki viestiketjut ja pakota ketjuihin pituusrajat</string>
   <string name="preferences__light_theme">Vaalea</string>
@@ -693,7 +711,6 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="conversation_list__menu_search">Hae</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Yhteystiedon kuva</string>
-  <string name="conversation_list_item_view__attachment_indicator">Liitetiedoston merkki</string>
   <string name="conversation_list_item_view__error_alert">Virheilmoituksen hälytys</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Uusi keskustelu</string>
@@ -726,11 +743,11 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="text_secure_normal__mark_all_as_read">Merkitse kaikki luetuiksi</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Käyttämäsi TextSecure on vanhentunut!</string>
-  <string name="reminder_header_expired_build_details">Viestejä ei enää voida lähettää onnistuneesti. Ole hyvä ja päivitä viimeisimpään versioon.</string>
-  <string name="reminder_header_sms_default_title">Käytä oletus tekstiviestisovelluksena?</string>
+  <string name="reminder_header_expired_build_details">Viestien lähetys ei enää onnistu. Päivitä ohjelma viimeisimpään versioon.</string>
+  <string name="reminder_header_sms_default_title">Käytä oletuksena tekstiviesteille?</string>
   <string name="reminder_header_sms_default_text">Napsauta, jos haluat tehdä TextSecuresta oletustekstiviestisovelluksesi.</string>
-  <string name="reminder_header_sms_import_title">Tuo järjestelmän tekstiviestit TextSecureen?</string>
-  <string name="reminder_header_sms_import_text">Napsauta, jos haluat kopioida puhelimesi tekstiviestit sen salattuun tietokantaan.</string>
+  <string name="reminder_header_sms_import_title">Tuo järjestelmän tekstiviestit?</string>
+  <string name="reminder_header_sms_import_text">Napsauta, jos haluat kopioida puhelimesi tekstiviestit TextSecuren salattuun tietokantaan.</string>
   <string name="reminder_header_push_title">Ota käyttöön TextSecure-pikaviestipalvelu?</string>
   <string name="reminder_header_push_text">Napsauta tästä, jos haluat sanoa ei tekstiviestimaksuille ja kyllä vahvemmalle yksityisyydensuojalle sekä nopeille viesteille.</string>
   <!--MediaPreviewActivity-->

res/values-fr/strings.xml

@@ -67,7 +67,7 @@ vérifier ce contact.</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Appuyez pour utiliser la solution de repli non sécurisée</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Utiliser la solution de repli sur les SMS non chiffrés ?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Utiliser la solution de repli sur les MMS non chiffrés ?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ce message ne sera <b>pas</b> chiffré car une session sécurisée n\'a pu être établie.\n\n Envoyer un message non sécurisé ?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ce message ne sera <b>pas</b> chiffré car le destinataire n\'est plus un utilisateur de TextSecure.\n\n Envoyer un message non sécurisé ?</string>
   <string name="ConversationItem_unable_to_open_media">Impossible de trouver une application pour ouvrir le média.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Initier une session sécurisée ?</string>
@@ -99,7 +99,11 @@ vérifier ce contact.</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS non-sécurisé</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Mettez-vous-y: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Utilisons cela pour chatter : %s</string>
   <string name="ConversationActivity_error_leaving_group">Erreur en quittant le groupe...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS non supportés</string>
+  <string name="ConversationActivity_mms_not_supported_message">Ce message ne peut être envoyé car votre opérateur ne supporte pas les MMS</string>
+  <string name="ConversationActivity_specify_recipient">S\'il vous plait, choisissez un contact</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Détails du message</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nEnvoyé/Reçu: %2$s</string>
@@ -238,6 +242,14 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
   <string name="PassphrasePromptActivity_watermark_content_description">Icône TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Soumettre la phrase de passe</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Phrase de passe incorrecte !</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">La version de Google Play Services installée ne fonctionne pas correctement. Veuillez réinstaller Google Play Services et réessayer.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Notez cette application</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Si vous aimez cette application, aidez-nous en prenant un moment pour la noter.</string>
+  <string name="RatingManager_rate_now">Noter maintenant!</string>
+  <string name="RatingManager_no_thanks">Non merci</string>
+  <string name="RatingManager_later">Plus tard</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La
 signature de cet échange de clé est différente de celle que vous avez précédemment reçue de ce
@@ -361,8 +373,8 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="KeyCachingService_passphrase_cached">TextSecure est déverrouillé</string>
   <string name="KeyCachingService_lock">Verrouiller avec la phrase de passe</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d nouveaux messages</string>
-  <string name="MessageNotifier_most_recent_from_s">Dernier de : %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d messages dans %2$d conversations</string>
+  <string name="MessageNotifier_most_recent_from_s">Plus récent de : %1$s</string>
   <string name="MessageNotifier_encrypted_message">Message chiffré…</string>
   <string name="MessageNotifier_media_message_with_text">Message média : %s</string>
   <string name="MessageNotifier_no_subject">(Aucun sujet)</string>
@@ -404,7 +416,6 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Téléchargement du message média</string>
   <string name="conversation_item__mms_image_description">Message média</string>
-  <string name="conversation_item__play_button_description">Bouton play</string>
   <string name="conversation_item__secure_message_description">Message sécurisé</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Télécharger</string>
@@ -472,8 +483,7 @@ Importer un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup An
   <string name="receive_key_activity__complete">Compléter</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-        Veuillez vérifier votre numéro de téléphone pour vous connecter avec TextSecure.
-    </string>
+Veuillez vérifier votre numéro de téléphone pour vous connecter avec TextSecure.</string>
   <string name="registration_activity__your_country">VOTRE PAYS</string>
   <string name="registration_activity__your_country_code_and_phone_number">VOTRE CODE PAYS ET
 VOTRE NUMÉRO DE TÉLÉPHONE</string>
@@ -559,6 +569,7 @@ par SMS.</string>
   <string name="AndroidManifest__media_preview">Prévisualisation du média.</string>
   <string name="AndroidManifest__media_overview">Toutes les images</string>
   <string name="AndroidManifest__media_overview_named">Toutes les images avec %1$s</string>
+  <string name="AndroidManifest__message_details">Détails du message</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
@@ -578,8 +589,8 @@ par SMS.</string>
   <string name="preferences__sms_mms">SMS et MMS</string>
   <string name="preferences__pref_all_sms_title">Recevoir tous les SMS</string>
   <string name="preferences__pref_all_mms_title">Recevoir tous les MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour tous messages entrants</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour tous les messages média</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour tous les messages textes entrants</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour tous les messages média entrants</string>
   <string name="preferences__input_settings">Paramètres de saisie</string>
   <string name="preferences__enable_enter_key_title">Activer la touche Entrée</string>
   <string name="preferences__replace_smiley_with_enter_key">Remplacer la touche smiley par une touche Entrée</string>
@@ -639,6 +650,7 @@ par SMS.</string>
   <string name="preferences__custom">Personnalisé</string>
   <string name="preferences__advanced">Avancé</string>
   <string name="preferences__app_protection">Protection de l\'application</string>
+  <string name="preferences__mms_user_agent">User Agent MMS</string>
   <string name="preferences__advanced_mms_access_point_names">Paramètres MMS manuels</string>
   <string name="preferences__enable_manual_mms">Utiliser les parametres MMS manuels</string>
   <string name="preferences__override_system_mms_settings">Remplacer les paramètres MMS du système avec les informations ci-dessous.</string>
@@ -704,7 +716,6 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
   <string name="conversation_list__menu_search">Chercher</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Photo de contact</string>
-  <string name="conversation_list_item_view__attachment_indicator">Indicateur de pièce jointe</string>
   <string name="conversation_list_item_view__error_alert">Alerte d\'erreur</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nouvelle conversation</string>

res/values-hr/strings.xml

@@ -82,6 +82,7 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Odabrani audio prelazi ograničenje veličine poruke (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Primatelj nije valjana SMS ili adresa e-pošte!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Poruka je prazna!</string>
+  <string name="ConversationActivity_group_members">Članovi grupe</string>
   <string name="ConversationActivity_group_conversation">Grupni razgovor</string>
   <string name="ConversationActivity_unnamed_group">Neimenovana grupa</string>
   <string name="ConversationActivity_d_recipients_in_group">%d članova</string>
@@ -96,7 +97,11 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_transport_insecure_mms">Nesigurni MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Dohvati s njime: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Koristi ovo za razgovor: %s</string>
   <string name="ConversationActivity_error_leaving_group">Greška prilikom napuštanja grupe...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS nije podržan</string>
+  <string name="ConversationActivity_mms_not_supported_message">Ovu poruku nije moguće poslati jer vaš operater ne podržava MMS.</string>
+  <string name="ConversationActivity_specify_recipient">Odaberite kontakt</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>
@@ -212,6 +217,7 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Lozinka ne odgovara!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Netočna stara lozinka!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Unesite novu lozinku!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Poveži ovaj uređaj?</string>
   <string name="DeviceProvisioningActivity_cancel">ODUSTANI</string>
@@ -232,6 +238,13 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikona</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Pošaljite lozinku</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Neispravna lozinka!</string>
+  <!--PlayServicesProblemFragment-->
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Ocijenite ovu aplikaciju</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Ukoliko volite koristiti ovu aplikaciju, odvojite trenutak kako biste nam pomogli svojom ocjenom.</string>
+  <string name="RatingManager_rate_now">Ocijenite sada!</string>
+  <string name="RatingManager_no_thanks">Ne hvala</string>
+  <string name="RatingManager_later">Kasnije</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Potpis
 na razmjeni ključeva je drugačiji od onoga što ste prethodno primali od ovog kontakta.
@@ -354,8 +367,8 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="KeyCachingService_passphrase_cached">TextSecure je otključan</string>
   <string name="KeyCachingService_lock">Zaključajte sa lozinkom</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d novih poruka</string>
-  <string name="MessageNotifier_most_recent_from_s">Najnovija od: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d poruka u %2$d razgovora</string>
+  <string name="MessageNotifier_most_recent_from_s">Najnovije od: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Kriptirana poruka...</string>
   <string name="MessageNotifier_media_message_with_text">Media poruka: %s</string>
   <string name="MessageNotifier_no_subject">(Bez naslova)</string>
@@ -397,7 +410,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Preuzimanje media poruke</string>
   <string name="conversation_item__mms_image_description">Multimedijalna poruka</string>
-  <string name="conversation_item__play_button_description">Tipka za pokretanje</string>
   <string name="conversation_item__secure_message_description">Sigurna poruka</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Preuzmi</string>
@@ -551,6 +563,7 @@ neuspješno.</string>
   <string name="AndroidManifest__media_preview">Prikaz medija</string>
   <string name="AndroidManifest__media_overview">Sve slike</string>
   <string name="AndroidManifest__media_overview_named">Sve slike sa %1$s</string>
+  <string name="AndroidManifest__message_details">Detalji poruke</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz / izvoz</string>
   <string name="arrays__my_identity_key">Moj ključ identiteta</string>
@@ -633,6 +646,7 @@ neuspješno.</string>
   <string name="preferences__custom">Prilagodi</string>
   <string name="preferences__advanced">Napredno</string>
   <string name="preferences__app_protection">Zaštita aplikacije</string>
+  <string name="preferences__mms_user_agent">MMS korisnički agent</string>
   <string name="preferences__advanced_mms_access_point_names">Ručne MMS postavke</string>
   <string name="preferences__enable_manual_mms">Koristi ručne MMS postavke</string>
   <string name="preferences__override_system_mms_settings">Zaobiđi MMS postavke sustava sa niže navedenim postavkama.</string>
@@ -697,7 +711,6 @@ Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
   <string name="conversation_list__menu_search">Traži</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Slika kontakta</string>
-  <string name="conversation_list_item_view__attachment_indicator">Indikator privitka</string>
   <string name="conversation_list_item_view__error_alert">Upozorenje o grešci</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Novi razgovor</string>

res/values-hu/strings.xml

@@ -7,9 +7,9 @@
   <string name="please_wait">Kérlek várj...</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Jelenleg: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Még nem állítottad be a jelszót!</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Még nem állítottál be jelszót!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s üzenet beszélgetésenként</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Minden régebbi üzenet törlése most?</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Minden régebbi üzenetet szeretnél törölni most?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Biztosan szeretnéd azonnal csonkolni az összes beszélgetésfolyamot a legutóbbi %s üzenetre?</string>
   <string name="ApplicationPreferencesActivity_delete">Törlés</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Letiltod a tároló titkosítását?</string>
@@ -20,19 +20,22 @@ hozzáférhet az üzenetekhez és a kulcsokhoz!
  </string>
   <string name="ApplicationPreferencesActivity_disable">Tiltás</string>
   <string name="ApplicationPreferencesActivity_unregistering">Regisztráció törlése...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Az adat alapú kommunikáció regisztráció törlése.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Az adat alapú kommunikáció regisztrációjának törlése.</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Letiltod az azonnali üzeneteket?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 Ez letiltja az azonnali üzeneteket a regisztrációd törlésével a kiszolgálón.
 A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli használatához.
  </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Hiba a kiszolgálóhoz való kapcsolódáskor!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS engedélyezett</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Érintsd meg az alapértelmezett SMS alkalmazás megváltoztatásához</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS tiltott</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Érintsd meg a TextSecure alapértelmezett SMS alkalmzássá tételéhez</string>
   <string name="ApplicationPreferencesActivity_on">be</string>
   <string name="ApplicationPreferencesActivity_On">Be</string>
   <string name="ApplicationPreferencesActivity_off">ki</string>
   <string name="ApplicationPreferencesActivity_Off">Ki</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d perc</string>
   <!--DraftDatabase-->
@@ -85,6 +88,7 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sajnos a kiválasztott hangállomány mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">A fogadó címe nem érvényes SMS vagy email cím!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Üres az üzenet!</string>
+  <string name="ConversationActivity_group_members">Csoport tagok</string>
   <string name="ConversationActivity_group_conversation">Csoportos beszélgetés</string>
   <string name="ConversationActivity_unnamed_group">Névtelen csoport</string>
   <string name="ConversationActivity_d_recipients_in_group">%d tagok</string>
@@ -99,7 +103,11 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_transport_insecure_mms">Nem biztonságos MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Szerezd be itt: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Használd ezt a csevegéshez: %s</string>
   <string name="ConversationActivity_error_leaving_group">Hiba a csoport elhagyásakor...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS nem támogatott</string>
+  <string name="ConversationActivity_mms_not_supported_message">Ezt az üzenetet nem lehet elküldeni, mivel a szolgáltató nem támogatja az MMS-t.</string>
+  <string name="ConversationActivity_specify_recipient">Válassz egy névjegyet!</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Üzenet részletei</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Átviteli mód: %1$s\nKüldött/Fogadott: %2$s</string>
@@ -219,6 +227,7 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">A jelszavak nem egyeznek!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Hibás korábbi jelszó!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Adj meg egy új jelszót!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Csatlakozzon az eszköz?</string>
   <string name="DeviceProvisioningActivity_cancel">MÉGSEM</string>
@@ -239,6 +248,15 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Jelszó küldése</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Érvénytelen jelszó!</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Az általad használt Google Play Szolgáltatások nem működnek megfelelően.
+Kérlek telepíts újra a Google Play Szolgáltatásokat és próbálkozz újra!</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Értékeld az alkalmazást!</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Ha tetszik ez az alkalmazás, kélek szánj egy kis időt az értékelésére!</string>
+  <string name="RatingManager_rate_now">Értékeld most!</string>
+  <string name="RatingManager_no_thanks">Nem, köszönöm!</string>
+  <string name="RatingManager_later">Később</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Az
 aláírás ezen a csere kulcson különbözik amit korábban kaptál ettől a
@@ -370,8 +388,8 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="KeyCachingService_passphrase_cached">A TextSecure feloldásra került.</string>
   <string name="KeyCachingService_lock">Lezárás jelszóval</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d új üzenet</string>
-  <string name="MessageNotifier_most_recent_from_s">Legutóbbi tőle: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d üzenet %2$d beszélgetésben</string>
+  <string name="MessageNotifier_most_recent_from_s">Legutóbbi tőle: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Biztonságos üzenet...</string>
   <string name="MessageNotifier_media_message_with_text">Média üzenet: %s</string>
   <string name="MessageNotifier_no_subject">(Nincs tárgy)</string>
@@ -413,7 +431,6 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Média üzenet letöltése</string>
   <string name="conversation_item__mms_image_description">Média üzenet</string>
-  <string name="conversation_item__play_button_description">Lejátszás gomb</string>
   <string name="conversation_item__secure_message_description">Biztonságos üzenet</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Letölt</string>
@@ -587,6 +604,7 @@ sikertelen.
   <string name="AndroidManifest__media_preview">Média előnézet</string>
   <string name="AndroidManifest__media_overview">Minden fénykép</string>
   <string name="AndroidManifest__media_overview_named">Minden fénykép vele: %1$s</string>
+  <string name="AndroidManifest__message_details">Üzenet részletei</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__my_identity_key">Saját azonosító kulcs</string>
@@ -606,6 +624,8 @@ sikertelen.
   <string name="preferences__sms_mms">SMS és MMS</string>
   <string name="preferences__pref_all_sms_title">Minden SMS fogadása</string>
   <string name="preferences__pref_all_mms_title">Minden MMS fogadása</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure használata minden bejövő SMS üzenet kezelésére</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure használata minden bejövő MMS üzenet kezelésére</string>
   <string name="preferences__input_settings">Beviteli beállítások</string>
   <string name="preferences__enable_enter_key_title">Enter gomb engedélyezése</string>
   <string name="preferences__replace_smiley_with_enter_key">A mosoly emotikon gomb helyettesítése egy Enter gombbal</string>
@@ -665,6 +685,7 @@ sikertelen.
   <string name="preferences__custom">Egyéni</string>
   <string name="preferences__advanced">Haladó</string>
   <string name="preferences__app_protection">Alkalmazás védelem</string>
+  <string name="preferences__mms_user_agent">MMS felhasználó ügynök</string>
   <string name="preferences__advanced_mms_access_point_names">MMS beállítások manuális megadása</string>
   <string name="preferences__enable_manual_mms">Manuális MMS beállítások használata</string>
   <string name="preferences__override_system_mms_settings">A rendszer MMS beállítások felülírása az alábbi információkkal.</string>
@@ -688,6 +709,9 @@ sikertelen.
   <string name="preferences__default">Alapértelmezett</string>
   <string name="preferences__language">Nyelv</string>
   <string name="preferences__language_summary">Nyelv %s</string>
+  <string name="preferences__textsecure_messages">TextSecure üzenetek</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</string>
   <string name="preferences__submit_debug_log">Hibakeresési napló küldése</string>
   <string name="preferences__support_wifi_calling">\'WiFi hívás\' kompatibilitási mód</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Engedélyezd, ha az eszköz SMS/MMS kézbesítése WiFi-n keresztül végzi (csak akkor engedélyezd ha a \'WiFi hívás\' opció engedélyezve van az eszközön).</string>
@@ -726,7 +750,6 @@ sikertelen.
   <string name="conversation_list__menu_search">Keresés</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Névjegyhez tartozó fénykép</string>
-  <string name="conversation_list_item_view__attachment_indicator">Melléklet jelző</string>
   <string name="conversation_list_item_view__error_alert">Hiba figyelmeztetés</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Új beszélgetés</string>

res/values-in/strings.xml

@@ -1,463 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">Ya</string>
-  <string name="no">Tidak</string>
-  <string name="delete">Hapus</string>
-  <string name="please_wait">Harap tunggu....</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">Sekarang: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Anda belum mengatur kata kunci!</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Hapus seluruh pesan lama?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Apakah anda yakin untuk memangkas seluruh rangkaian percakapan hingga ke %s pesan terakhir?</string>
-  <string name="ApplicationPreferencesActivity_delete">Hapus</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Matikan enkripsi media simpan?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Peringatan, ini akan menonaktifkan penyimpanan terenkripsi untuk semua pesan dan kunci. Sesi enkripsi
-anda selanjutnya akan berfungsi, tapi siapa saja yang mempunyai akses pisik ke perangkat anda
-dapat mengaksesnya</string>
-  <string name="ApplicationPreferencesActivity_disable">non aktif</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Keluar...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Keluar dari komunikasi berbasis data</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Jangan gunakan push message</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kesalahan dalam menghubungkan ke server!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS digunakan</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Sentuh untuk mengubah aplikasi SMS default</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS tidak diaktifkan</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Sentuh untuk membuat TextSecure sebagai aplikasi SMS default</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">Gambar</string>
-  <string name="AttachmentTypeSelectorAdapter_video">Video</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Anda mungkin ingin memverifikasi
-kontak ini.
-</string>
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Ukuran pesan: %d KB</string>
-  <string name="ConversationItem_expires_s">Berakhir: %s</string>
-  <string name="ConversationItem_view_secure_media_question">Tampilkan media aman?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Media ini disimpan dalam basis data terenkripsi. Namun, untuk melihatnya dengan aplikasi eksternal akan memerlukan berkas di deskripsi dan disimpan. Apa anda yakin ingin melakukan ini?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Gagal, menerima pesan pertukaran kunci terhenti.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Menerima pesan pertukaran kunci, klik untuk memproses.</string>
-  <string name="ConversationItem_group_action_left">si %1$s telah meninggalkan grup.</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Inisiasi sesi aman dengan %s?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Apakah anda yakin untuk mengakhiri sesi aman ini?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Apa anda yakin ingin menghapus percakapan ini secara permanen?</string>
-  <string name="ConversationActivity_add_attachment">Tambahkan lampiran</string>
-  <string name="ConversationActivity_select_contact_info">Pilih info kontak</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Maaf, terjadi kesalahan pada pengaturan lampiran anda.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Alamat penerima SMS atau email tidak benar!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">Pesan kosong!</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d anggota</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 anggota</string>
-  <string name="ConversationActivity_invalid_recipient">Penerima tidak lengkap!</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Perangkat ini sepertinya tidak mendukung untuk panggilan.</string>
-  <string name="ConversationActivity_leave_group">Tinggalkan grup?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Anda yakin ingin meninggalkan grup ini?</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">Rincian pesan</string>
-  <string name="ConversationFragment_success_exclamation">Sukses!</string>
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Hapus topik?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Apakah anda yakin ingin menghapus semua topik pembicaraan terpilih?</string>
-  <string name="ConversationListFragment_deleting">Menghapus</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Menghapus percakapan yang dipilih ...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Pesan pertukaran kunci...</string>
-  <!--CustomDefaultPreference-->
-  <string name="CustomDefaultPreference_none">Kosong</string>
-  <!--DateUtils-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">Eksport</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Peringatan, ini akan
-mengeksport konten pesan teks polos TextSecure anda ke kartu SD</string>
-  <string name="ExportFragment_cancel">Batal</string>
-  <string name="ExportFragment_exporting">Mengeksport</string>
-  <string name="ExportFragment_success">Sukses!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_contacts_dont_support_push">Anda telah memilih kontak yang tidak mendukung grup TextSecure, sehingga grup ini akan menggunakan MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Anda tidak terdaftar untuk menggunakan saluran data, sehingga grup TextSecure dimatikan.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">Terjadi kesalahan tidak terduga yang menggagalkan pembuatan grup.</string>
-  <string name="GroupCreateActivity_contacts_no_members">Anda butuh minimal satu orang dalam grup anda!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Salah satu anggota grup anda memiliki nomor yang tidak dapat dibaca, silakan perbaiki atau keluarkan kontak tersebut dan coba lagi.</string>
-  <string name="GroupCreateActivity_creating_group">Membuat %1$s…</string>
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">Import</string>
-  <string name="ImportExportActivity_export">Eksport</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Ini akan mengimport
-pesan dari basis data SMS default ke TextSecure. Jika anda sebelumnya
-telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.
-</string>
-  <string name="ImportFragment_import">Import</string>
-  <string name="ImportFragment_cancel">Batal</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-Memulihkan dari cadangan yang enkripsi akan sepenuhnya mengganti kunci, preferensi dan
-pesan anda. Anda akan kehilangan informasi yang ada di instalasi TextSecure saat ini tetapi
-cadangan anda tetap aman.
-</string>
-  <string name="ImportFragment_restore">Pulihkan</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Ini akan mengimport
-pesan dari basis data SMS standar ke TextSecure. Jika anda sebelumnya
-telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.</string>
-  <string name="ImportFragment_importing">Mengimport</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Mengimport cadangan teks polos...</string>
-  <string name="ImportFragment_no_plaintext_backup_found">Cadangan teks polos tidak ditemukan!</string>
-  <string name="ImportFragment_error_importing_backup">Gagal mengimport cadangan!</string>
-  <string name="ImportFragment_import_complete">Selesai mengimport!</string>
-  <string name="ImportFragment_restoring">Memulihkan</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Memulihkan daru cadangan yang dienkripsi...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Tidak menemukan adanya cadangan yang dienkripsi!</string>
-  <string name="ImportFragment_restore_complete">Pemulihan selesai!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Pemindai kunci tidak ditemukan!</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">Kesalahan dalam menyimpan MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Kesalahan dalam menghubungi penyedia layanan MMS...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Kesalahan dalam membaca pengaturan MMS penyedia...</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Kata kunci lama salah!</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Isi
-tanda tangan dalam pertukaran kunci ini berbeda dengan apa yang telah anda terima sebelumnya dari
-kontak ini. Hal ini bisa berarti bahwa seseorang mencoba mencegat komunikasi anda, atau
-kontak ini telah menginstall ulang TextSecure dan sekarang memiliki kunci identitas baru.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Anda mungkin ingin memverifikasi
-kontak ini.
-</string>
-  <string name="ReceiveKeyActivity_processing">Memproses</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Memproses pertukaran kunci...</string>
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">Hubungkan dengan TextSecure</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Anda harus menetapkan kode
-Negara anda
-</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Anda harus mengisi nomor
-telefon anda
-</string>
-  <string name="RegistrationActivity_invalid_number">Nomor tidak benar</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nomor yang anda
-isikan (%s) tidak tepat.
-</string>
-  <string name="RegistrationActivity_unsupported">Tidak didukung</string>
-  <string name="RegistrationActivity_continue">Lanjutkan</string>
-  <string name="RegistrationActivity_edit">Edit</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Memverifikasi Nomor</string>
-  <string name="RegistrationProgressActivity_edit_s">Edit %s</string>
-  <string name="RegistrationProgressActivity_registration_complete">Pendaftaran selesai!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Anda harus memasukkan kode yang anda terima terlebih dulu...</string>
-  <string name="RegistrationProgressActivity_connecting">Menghubungkan</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Menghubungkan untuk verifikasi</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Tidak dapat menyambung. Mohon periksa koneksi anda dan coba lagi.</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Kode Verifikasi yang anda kirim salah. Silakan coba lagi.</string>
-  <string name="RegistrationProgressActivity_too_many_attempts">Terlalu banyak mencoba</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Anda telah terlalu banyak memasukkan kode yang salah. Silakan tunggu satu menit untuk mencoba lagi</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Meminta verifikasi panggilan masuk...</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Server mengalami gangguan. Silakan coba lagi.</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Anda telah meminta panggilan suara. Anda dapat meminta lagi dalam 20 menit kemudian.</string>
-  <string name="RegistrationProgressActivity_registration_conflict">Konflik pendaftaran</string>
-  <!--RegistrationService-->
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Pendaftaran TextSecure telah berhasil.</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pendaftaran TextSecure mengalami masalah.</string>
-  <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Pesan menerima dan 
-memproses pertukaran kunci korupsi.</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
-Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
-</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan menampilkan.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Menerima pembaharuan atas identitas yang tidak diketahui. Sentuh untuk memvalidasi identitas</string>
-  <string name="SmsMessageRecord_secure_session_ended">Sesi aman berakhir.</string>
-  <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Tinggalkan grup...</string>
-  <string name="TheadRecord_secure_session_ended">Sesi aman berakhir</string>
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Anda tidak memiliki kunci identitas.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Penerima tidak memiliki kunci identitas.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Penerima tidak memiliki kunci identitas!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Pindai kunci untuk dicocokkan</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Pindai kunci saya</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">PERINGATAN, kunci terpindai TIDAK cocok! Mohon periksa teks sidik jari dengan baik.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">TIDAK diverifikasi!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Kunci benar. Diperlukan juga untuk memverifikasi kunci anda.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Terverifikasi!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Anda tidak memiliki kunci identitas!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Anda tidak memiliki kunci identitas.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Pindai untuk dicocokkan</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Pindai kunci untuk dicocokkan</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">PERINGATAN, kunci terpindai tidak cocok!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Kunci terpindai cocok!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Terverifikasi!</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Anda telah mengirimkan permintaan inisiasi sesi untuk penerima ini, apakah anda yakin untuk mengirimkan lagi? Hal ini akan membuat permintaan sesi sebelumnya menjadi tidak sah</string>
-  <string name="KeyExchangeInitiator_send">Kirim</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Enkripsi pada pesan tidak dapat dikenali</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Melakukan dekripsi, mohon tunggu...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Pesan di enkripsi untuk sesi yang tidak ada</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Memulai koneksi ke Server MMS...</string>
-  <string name="MmsDatabase_downloading_mms">Mengunduh MMS...</string>
-  <string name="MmsDatabase_downloading">Mengunduh...</string>
-  <string name="MmsDatabase_mms_pending_download">Sentuh untuk mengkonfigurasi pengaturan MMS untuk lanjut mengunduh.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">Proses deskripsi MMS, mohon tunggu...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Enkripsi pada pesan MMS tidak dapat dikenali</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS di enkripsi untuk sesi yang tidak ada</string>
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Dalam proses mengimport</string>
-  <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Sentuh untuk membuka.</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Sentuh untuk membuka, atau sentuh untuk menutup.</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure tidak dikunci</string>
-  <string name="KeyCachingService_lock">Kunci dengan kata sandi</string>
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d pesan baru</string>
-  <string name="MessageNotifier_most_recent_from_s">Pesan terbaru dari: %s</string>
-  <string name="MessageNotifier_encrypted_message">Mengenkripsi pesan...</string>
-  <string name="MessageNotifier_message_delivery_failed">Pengiriman pesan gagal.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">Gagal mengirimkan pesan.</string>
-  <string name="MessageNotifier_error_delivering_message">Kesalahan dalam mengirimkan pesan.</string>
-  <string name="MessageNotifier_mark_all_as_read">Tandai telah dibaca semuanya</string>
-  <string name="MessageNotifier_mark_as_read">Tandai telah dibaca</string>
-  <!--QuickResponseService-->
-  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Maaf, Jawaban cepat masih belum didukung oleh TextSecure!</string>
-  <!--change_passphrase_activity-->
-  <string name="change_passphrase_activity__old_passphrase">KATA KUNCI LAMA</string>
-  <string name="change_passphrase_activity__new_passphrase">KATA KUNCI BARU</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">ULANG KATA KUNCI BARU</string>
-  <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
-  <string name="contact_selection_group_activity__no_contacts">Tidak ada kontak</string>
-  <string name="contact_selection_group_activity__finding_contacts">Memuat kontak...</string>
-  <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_updating_directory">Memperbaharui direktori</string>
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">Pilih untuk</string>
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">Tidak ada panggilan baru</string>
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">Kirim</string>
-  <string name="conversation_activity__remove">Hapus</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">Unduh</string>
-  <string name="conversation_item_sent__downloading">Mengunduh</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">Unduh</string>
-  <string name="conversation_item_received__downloading">Mengunduh</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Memuat daftar negara...</string>
-  <string name="country_selection_fragment__search">Cari</string>
-  <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Tidak dapat mengambil catatan log dari perangkat anda. Anda masih dapat menggunakan ADB untuk mendapat catatan debug.</string>
-  <string name="log_submit_activity__thanks">Terimakasih atas bantuan anda</string>
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Apakah anda ingin mengimport pesan anda ke dalam basis data terenkripsi TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Basis data sistem standar tidak akan diubah atau dimodifikasi</string>
-  <string name="database_migration_activity__skip">Lewati</string>
-  <string name="database_migration_activity__import">Import</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Ini bisa sedikit memakan waktu. Harap bersabar, kami akan memberi tahu anda ketika proses import selesai</string>
-  <string name="database_migration_activity__importing">MENGIMPORT</string>
-  <!--database_upgrade_activity-->
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-Export cadangan ke teks polos yang kompatibel dengan \'SMSBackup And Restore\'  ke kartu SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Import database
-dari aplikasi perpesan bawaan
-</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
-Pulihkan dari cadangan teracak TextSecure.
-</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">
-Import cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Restore\'.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Telepon Anda membutuhkan pengaturan MMS secara manual.</string>
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">Buka Kunci</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure memerlukan pengaturan MMS untuk mengantar pesan dan media grup melalui operator anda. Perangkan anda tidak menyediakan informasi tersebut, yang biasanya disebabkan oleh perangkat yang dikunci atau pengaturan yang ketat.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Untuk mengirim pesan dan media grup klik \'OK\' dan selesaikan pengaturan yang diminta. Pengaturan MMS untuk operator anda biasanya dapat ditemukan dengan mencari \'APN operator anda\'. Hal ini hanya diperlukan sekali saja.</string>
-  <!--receive_key_activity-->
-  <string name="receive_key_activity__complete">Selesai</string>
-  <!--registration_activity-->
-  <string name="registration_activity__your_country">NEGARA ANDA</string>
-  <string name="registration_activity__your_country_code_and_phone_number">KODE NEGARA ANDA DAN
-NOMOR TELEPON</string>
-  <string name="registration_activity__phone_number">NOMOR TELEPON</string>
-  <string name="registration_activity__register">Daftar</string>
-  <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Beberapa masalah yang mungkin
-termasuk:
-</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
-Beberapa aplikasi sms pihak ketiga seperti Hancent atau GoSMS bekerja dengan agresif dan
-menghadang seluruh pesan SMS masuk. Periksa jika anda menerima pesan yg berawalan
-\'Your TextSecure verification code:\', dalam hal ini anda perlu untuk mengkonfigurasi
-aplikasi SMS pihak ketiga anda untuk memperbolehkan pesan SMS masuk.
-</string>
-  <string name="registration_problems__incorrect_number">nomor salah.</string>
-  <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
-TextSecure tidak akan berfungsi dengan nomor Google Voice
-</string>
-  <!--registration_progress_activity-->
-  <string name="registration_progress_activity__verify">Verifikasi</string>
-  <string name="registration_progress_activity__edit_number">Edit nomor</string>
-  <string name="registration_progress_activity__connectivity_error">Kesalahan konektivitas</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Kemungkinan masalah
-termasuk:
-</string>
-  <string name="registration_progress_activity__no_network_connectivity">Tidak ada konektivitas
-jaringan.
-</string>
-  <string name="registration_progress_activity__restrictive_firewall">Firewall yang ketat.
-</string>
-  <string name="registration_progress_activity__connecting">Menghubungkan...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Menunggu Verifikasi
-SMS...</string>
-  <string name="registration_progress_activity__registering_with_server">Mendaftarkan ke server...</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
-TextSecure kehabisan waktu saat menunggu verifikasi pesan SMS.
-</string>
-  <string name="registration_progress_activity__sms_verification_failed">Verifikasi SMS
-Telah gagal
-</string>
-  <string name="registration_progress_activity__generating_keys">Membuat kunci...</string>
-  <!--recipients_panel-->
-  <string name="recipients_panel__to"><small>Masukkan nama atau nomor</small></string>
-  <string name="recipients_panel__add_member">Tambah Anggota</string>
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Identitas mereka (terbaca):</string>
-  <string name="verify_identity_activity__your_identity_you_read">Identitas anda (terbaca):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">Ganti Kata Kunci</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">Umum</string>
-  <string name="preferences__pref_all_sms_title">Terima semua SMS</string>
-  <string name="preferences__pref_all_mms_title">Terima semua MMS</string>
-  <string name="preferences__input_settings">Seting Masukan</string>
-  <string name="preferences__enable_enter_key_title">Gunakan tombol Enter</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Pilih kontak anda dari daftar kontak yang ada.</string>
-  <string name="preferences__change_passphrase">Ganti Kata Kunci</string>
-  <string name="preferences__change_my_passphrase">Ganti kata kunci saya</string>
-  <string name="preferences__screen_security">Keamanan Layar</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Lupakan kata kunci dari memori setelah beberapa saat</string>
-  <string name="preferences__timeout_passphrase">Kata kunci kadaluarsa</string>
-  <string name="preferences__pref_timeout_interval_title">Interval Kadaluarsa</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Waktu tunggu sebelum melupakan kata kunci dari memori</string>
-  <string name="preferences__notifications">Pemberitahuan</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Tampilkan pemberitahuan pesan di status bar</string>
-  <string name="preferences__led_color">Warna LED</string>
-  <string name="preferences__pref_led_blink_title">Pola kedip LED</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">Set pola kedip LED!</string>
-  <string name="preferences__sound">Bunyi</string>
-  <string name="preferences__change_notification_sound">Ganti suara notofikasi</string>
-  <string name="preferences__inthread_notifications">Pemberitahuan dalam percakapan</string>
-  <string name="preferences__play_inthread_notifications">Bunyikan suara pemberitahuan ketika melihat percakapan yang aktif.</string>
-  <string name="preferences__vibrate">Getar</string>
-  <string name="preferences__also_vibrate_when_notified">Bergetar jika ada pemberitahuan masuk</string>
-  <string name="preferences__minutes">menit</string>
-  <string name="preferences__hours">jam</string>
-  <string name="preferences__green">Hijau</string>
-  <string name="preferences__red">Merah</string>
-  <string name="preferences__blue">Biru</string>
-  <string name="preferences__orange">Oranye</string>
-  <string name="preferences__cyan">Cyan</string>
-  <string name="preferences__magenta">Magenta</string>
-  <string name="preferences__white">Putih</string>
-  <string name="preferences__none">Kosong</string>
-  <string name="preferences__fast">Cepat</string>
-  <string name="preferences__normal">Normal</string>
-  <string name="preferences__slow">Lambat</string>
-  <string name="preferences__custom">Spesifik</string>
-  <string name="preferences__advanced">Lanjutan</string>
-  <string name="preferences__override_system_mms_settings">Ganti pengaturan MMS dengan informasi berikut.</string>
-  <string name="preferences__sms_delivery_reports">Laporan pengiriman SMS</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Minta laporan pengiriman untuk tiap SMS yang dikirim</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Secara otomatis hapus pesan yang lebih lama ketika percakapan telah melebihi jumlah yang ditentukan</string>
-  <string name="preferences__delete_old_messages">Hapus pesan lama</string>
-  <string name="preferences__conversation_length_limit">Batas panjang percakapan</string>
-  <string name="preferences__trim_all_threads_now">Pangkas seluruh percakapan sekarang</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Pindai seluruh rangkaian percakapan dan terapkan batas panjang percakapan</string>
-  <string name="preferences__appearance">Penampilan</string>
-  <string name="preferences__theme">Tema</string>
-  <string name="preferences__default">Default</string>
-  <string name="preferences__language">Bahasa</string>
-  <string name="preferences__submit_debug_log">Kirim debug log</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">Selesai</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">Panggil</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Rincian pesan</string>
-  <string name="conversation_context__menu_copy_text">Salin teks</string>
-  <string name="conversation_context__menu_delete_message">Hapus pesan</string>
-  <string name="conversation_context__menu_forward_message">Teruskan pesan</string>
-  <string name="conversation_context__menu_resend_message">Kirim ulang </string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">Keamanan</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">Cari</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">Keamanan</string>
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">Tambahkan lampiran</string>
-  <string name="conversation__menu_delete_thread">Hapus Percakapan</string>
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Daftar Penerima</string>
-  <string name="conversation_group_options__delivery">Pengiriman</string>
-  <string name="conversation_group_options__conversation">Percakapan</string>
-  <string name="conversation_group_options__broadcast">Siaran</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">Bandingkan</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Pindai kunci untuk dicocokkan</string>
-  <string name="key_scanning__menu_scan_to_compare">Pindai untuk dicocokkan</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">Konfigurasi</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Kunci</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--EOF-->
-</resources>

res/values-it/strings.xml

@@ -25,7 +25,7 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Abilitati</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Premi per cambiare l\'applicazione predefinita per gli SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tocca per cambiare l\'applicazione predefinita per gli SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS Disabilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tocca per rendere TextSecure l\'applicazione predefinita per gli SMS</string>
   <string name="ApplicationPreferencesActivity_on">on</string>
@@ -60,11 +60,11 @@ questo contatto.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Ricevuto messaggio per lo scambio della chiave, cliccare per procedere</string>
   <string name="ConversationItem_group_action_left">%1$s ha lasciato il gruppo.</string>
   <string name="ConversationItem_click_for_details">Tocca per i dettagli</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Selezione per tornare alla comunicazione non sicura</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Ripiegare su SMS non cifrati?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Ripiegare su MMS non cifrati?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Tocca per tornare alla conversazione non cifrata</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Tornare agli SMS non cifrati?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Tornare agli MMS non cifrati?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Questo messaggio <b>non</b> sarà criptato perché il destinatario non usa più TextSecure.\n\nInvio un messaggio non sicuro?</string>
-  <string name="ConversationItem_unable_to_open_media">Impossibile trovare un\'app per aprire questo file.</string>
+  <string name="ConversationItem_unable_to_open_media">Impossibile trovare un\'app per aprire il file.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniziare sessione sicura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniziare una sessione sicura con %s?</string>
@@ -89,7 +89,7 @@ questo contatto.</string>
   <string name="ConversationActivity_invalid_recipient">Destinatario non valido!</string>
   <string name="ConversationActivity_calls_not_supported">Chiamate non supportate</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Il dispositivo non sembra supportare le telefonate.</string>
-  <string name="ConversationActivity_leave_group">Abbandonare il gruppo?</string>
+  <string name="ConversationActivity_leave_group">Vuoi lasciare il gruppo?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Vuoi davvero lasciare questo gruppo?</string>
   <string name="ConversationActivity_transport_insecure_sms">SMS non sicuro</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS non sicuro</string>
@@ -97,6 +97,9 @@ questo contatto.</string>
   <string name="ConversationActivity_get_with_it">Ottienilo con: %s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Vieni a chattare qui: %s</string>
   <string name="ConversationActivity_error_leaving_group">Errore nell\'abbandonare il gruppo...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS non supportati</string>
+  <string name="ConversationActivity_mms_not_supported_message">Questo messaggio non può essere inviato perchè il tuo operatore non supporta gli MMS</string>
+  <string name="ConversationActivity_specify_recipient">Scegli un contatto</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>
@@ -119,7 +122,7 @@ questo contatto.</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Cancellare i threads?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Sei sicuro di voler cancellare TUTTE le conversazioni selezionate?</string>
-  <string name="ConversationListFragment_deleting">Eliminando</string>
+  <string name="ConversationListFragment_deleting">Eliminazione</string>
   <string name="ConversationListFragment_deleting_selected_threads">Eliminazione delle conversazioni selezionate...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Messaggio di scambio della chiave...</string>
@@ -133,7 +136,7 @@ questo contatto.</string>
   <string name="ShareActivity_share_with">Condividi con</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Esporta</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Esportare plaintext nella scheda SD?</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Esportare copia in chiaro su scheda SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attenzione, verranno
         esportati i contenuti dei tuoi messaggi TextSecure in formato plaintext sulla scheda SD.
     </string>
@@ -174,7 +177,7 @@ questo contatto.</string>
 </string>
   <string name="ImportFragment_import">Importa</string>
   <string name="ImportFragment_cancel">Annulla</string>
-  <string name="ImportFragment_restore_encrypted_backup">Ripristinare una copia cifrata?</string>
+  <string name="ImportFragment_restore_encrypted_backup">Ripristinare la copia cifrata?</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
         Il rispristino di una copia cifrata sostituirà completamente le chiavi esistenti, le preferenze e
         i messaggi. Verranno perse tutte le informazioni presenti nell\'installazione attuale di TextSecure ma non
@@ -186,7 +189,7 @@ questo contatto.</string>
 messaggi da una copia. Se hai già importato questa copia,
 una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="ImportFragment_importing">Importazione</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Importo la copia in chiaro...</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importazione copia in chiaro...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nessuna copia in chiaro trovato!</string>
   <string name="ImportFragment_error_importing_backup">Errore durante l\'importazione della copia!</string>
   <string name="ImportFragment_import_complete">Importazione terminata!</string>
@@ -235,6 +238,14 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icona TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Inserisci password</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Password non valida!</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">La versione di Google Play Services installata non funziona correttamente. Reinstallalo e riprova.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Vota questa app!</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Se quest\'applicazione ti piace, ti preghiamo di aiutarci votandola.</string>
+  <string name="RatingManager_rate_now">Vota ora!</string>
+  <string name="RatingManager_no_thanks">No grazie</string>
+  <string name="RatingManager_later">Più tardi</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La
 firma su questo scambio di chiavi è diversa da quella ricevuta precedentemente. Questo potrebbe significare che qualcuno sta cercando di intercettare la tua comunicazione
@@ -359,8 +370,8 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="KeyCachingService_passphrase_cached">TextSecure è sbloccato</string>
   <string name="KeyCachingService_lock">Chiudi con password</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">(%d) nuovi messaggi</string>
-  <string name="MessageNotifier_most_recent_from_s">Più recente da: %s</string>
+  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d messaggi in %2$d conversazioni</string>
+  <string name="MessageNotifier_most_recent_from_s">Il più recente da: %1$s</string>
   <string name="MessageNotifier_encrypted_message">Messaggio cifrato...</string>
   <string name="MessageNotifier_media_message_with_text">Messaggio multimediale: %s</string>
   <string name="MessageNotifier_no_subject">(Nessun oggetto)</string>
@@ -402,7 +413,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Sto scaricando un messaggio multimediale</string>
   <string name="conversation_item__mms_image_description">Messaggio multimediale</string>
-  <string name="conversation_item__play_button_description">Pulsante Play</string>
   <string name="conversation_item__secure_message_description">Messaggio sicuro</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Scarica</string>
@@ -459,14 +469,14 @@ Importo una copia in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
   <string name="MmsPreferencesFragment__invalid_uri">Il testo immesso non è un URI valdio</string>
   <string name="MmsPreferencesFragment__invalid_host">Il testo immesso non è un host valido</string>
   <!--GroupUtil-->
-  <string name="GroupUtil_joined_the_group">%1$s si unisce al gruppo.</string>
+  <string name="GroupUtil_joined_the_group">%1$s si è unito al gruppo.</string>
   <string name="GroupUtil_group_updated">Gruppo aggiornato.</string>
   <string name="GroupUtil_title_is_now">Il titolo ora è \"%1$s\".</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Sblocca</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure ha bisogno delle impostazioni degli MMS, per poter inviare messaggi multimediali e di gruppo con il tuo operatore. Il tuo dispositivo non fornisce queste impostazioni, probabilmente perché ha un operatore bloccato o altre configurazioni restrittive.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per inviare contenuti multimediali e messaggi di gruppo, fare clic su \"OK\" e completare le impostazioni richieste. Le impostazioni MMS del proprio operatore possono essere generalemtne trovate cercando \"APN proprio operatore\". Sarà necessario eseguire una sola volta questa procedura.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure ha bisogno delle impostazioni degli MMS per poter inviare messaggi multimediali e di gruppo con il tuo operatore. Il tuo dispositivo non fornisce queste impostazioni, probabilmente perché ha un operatore bloccato o altre configurazioni restrittive.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per inviare contenuti multimediali e messaggi di gruppo, tocca \"OK\" e completa le impostazioni richieste. Le impostazioni MMS del proprio operatore possono essere trovate generalmente cercando \"APN proprio operatore\". Sarà necessario eseguire una sola volta questa procedura.</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completato</string>
   <!--registration_activity-->
@@ -502,9 +512,9 @@ TextSecure non funzionerà con i numeri Google Voice.
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Verifica vocale</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
-TextSecure può anche chiamarti per verificare il tuo numero. Clicca \'Chiamami\' ed inserisci
-in basso il codice a sei cifre che hai ascoltato.
-</string>
+        TextSecure può anche chiamarti per verificare il tuo numero. Tocca \"Chiamami\" e inserisci qui sotto il codice a sei cifre
+        che hai ascoltato.
+    </string>
   <string name="registration_progress_activity__verify">Verifica</string>
   <string name="registration_progress_activity__call_me">Chiamami</string>
   <string name="registration_progress_activity__edit_number">Modifica numero</string>
@@ -570,6 +580,7 @@ non riuscita.
   <string name="AndroidManifest__media_preview">Anteprima media</string>
   <string name="AndroidManifest__media_overview">Tutte le immagini</string>
   <string name="AndroidManifest__media_overview_named">Tutte le immagini con %1$s</string>
+  <string name="AndroidManifest__message_details">Dettagli messaggio</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importa / Esporta</string>
   <string name="arrays__my_identity_key">La chiave della mia identità</string>
@@ -650,6 +661,7 @@ non riuscita.
   <string name="preferences__custom">Personalizzato</string>
   <string name="preferences__advanced">Avanzate</string>
   <string name="preferences__app_protection">Protezione app</string>
+  <string name="preferences__mms_user_agent">User agent MMS</string>
   <string name="preferences__advanced_mms_access_point_names">Impostazioni manuali MMS</string>
   <string name="preferences__enable_manual_mms">Usa le impostazioni manuali degli MMS</string>
   <string name="preferences__override_system_mms_settings">Sovrascrivi le impostazioni MMS di sistema con le seguenti informazioni</string>
@@ -673,6 +685,7 @@ non riuscita.
   <string name="preferences__default">Predefinito</string>
   <string name="preferences__language">Lingua</string>
   <string name="preferences__language_summary">Lingua %s</string>
+  <string name="preferences__textsecure_messages">Messaggi TextSecure</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="preferences__submit_debug_log">Invia log di debug</string>
@@ -713,7 +726,6 @@ Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="conversation_list__menu_search">Cerca</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Foto del contatto</string>
-  <string name="conversation_list_item_view__attachment_indicator">Indicatore allegato</string>
   <string name="conversation_list_item_view__error_alert">Messaggio di errore</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nuova conversazione</string>

res/values-iw/strings.xml

@@ -4,6 +4,7 @@
   <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>
@@ -107,6 +108,8 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">סיסמה ישנה לא נכונה.</string>
   <!--DeviceProvisioningActivity-->
   <!--PassphrasePromptActivity-->
+  <!--PlayServicesProblemFragment-->
+  <!--RatingManager-->
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">החתימה
 על החלפת המפתח הזאת שונה ממה שקיבלת בעבר מאיש הקשר הזה.
@@ -164,8 +167,6 @@
   <string name="ApplicationMigrationService_import_in_progress">בתהליך ייבוא</string>
   <!--KeyCachingService-->
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">%d הודעות חדשות</string>
-  <string name="MessageNotifier_most_recent_from_s">האחרון מ-: %s</string>
   <string name="MessageNotifier_encrypted_message">הודעה מוצפנת...</string>
   <string name="MessageNotifier_message_delivery_failed">מסירת ההודעה נכשלה.</string>
   <string name="MessageNotifier_failed_to_deliver_message">כישלון במסירת ההודעה.</string>