Bumping version to 2.0.7

fix old code breaking build

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="68"
-      android:versionName="2.0.5">
+      android:versionCode="70"
+      android:versionName="2.0.7">
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
 
@@ -71,7 +71,7 @@
                 <data android:mimeType="image/*" />
                 <data android:mimeType="text/plain" />
                 <data android:mimeType="video/*" />
-            </intent-filter>            
+            </intent-filter>
 
         </activity>
 
@@ -90,14 +90,21 @@
               android:windowSoftInputMode="stateUnchanged"              
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-     <activity android:name=".MmsPreferencesActivity"
+    <activity android:name=".MmsPreferencesActivity"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ConversationListActivity"
-              android:label="@string/app_name"
+    <activity android:name=".ShareActivity"
+              android:excludeFromRecents="true"
               android:launchMode="singleTask"
+              android:noHistory="true"
+              android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".ConversationListActivity"
+          android:label="@string/app_name"
+          android:launchMode="singleTask"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -126,7 +133,7 @@
     <activity android:name=".PassphrasePromptActivity"
               android:label="@string/AndroidManifest__enter_passphrase"
               android:launchMode="singleTop"
-              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"              
+              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -135,15 +142,15 @@
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".SingleContactSelectionActivity"
-              android:label="@string/AndroidManifest__select_contact"
+    <activity android:name=".NewConversationActivity"
+              android:label="@string/AndroidManifest__select_contacts"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PushContactSelectionActivity"
-              android:label="@string/AndroidManifest__select_contacts"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+          android:label="@string/AndroidManifest__select_contacts"
+          android:windowSoftInputMode="stateHidden"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".AutoInitiateActivity"
               android:theme="@style/TextSecure.Light.Dialog"
@@ -205,6 +212,7 @@
     <service android:enabled="true" android:name=".service.SendReceiveService"/>
     <service android:enabled="true" android:name=".service.RegistrationService"/>
     <service android:enabled="true" android:name=".service.DirectoryRefreshService"/>
+    <service android:enabled="true" android:name=".service.PreKeyService"/>
     <service android:enabled="true" android:name=".gcm.GcmIntentService"/>
 
     <service android:name=".service.QuickResponseService"

BUILDING.md

@@ -17,7 +17,7 @@ The following steps should help you (re)build TextSecure from the command line.
         git clone https://github.com/WhisperSystems/TextSecure.git
 
 2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed somewhere on your system.
-3. Ensure the "Android Support Repository" is installed from the Android SDK manager.
+3. Ensure the "Android Support Repository" and "Android SDK Build-tools" are installed from the Android SDK manager.
 4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.
 
         sdk.dir=\<path to your sdk installation\>

build.gradle

@@ -23,6 +23,7 @@ dependencies {
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.android.support:support-v4:19.0.1'
     compile 'com.google.android.gcm:gcm-client:1.0.2'
+    compile 'se.emilsjolander:stickylistheaders:2.2.0'
 
     compile project(':library')
 }

library/jni/curve25519-donna-jni.c

@@ -22,11 +22,16 @@
 #include "curve25519-donna.h"
 
 JNIEXPORT jbyteArray JNICALL Java_org_whispersystems_textsecure_crypto_ecc_Curve25519_generatePrivateKey
-  (JNIEnv *env, jclass clazz, jbyteArray random)
+  (JNIEnv *env, jclass clazz, jbyteArray random, jboolean ephemeral)
 {
   uint8_t* privateKey = (uint8_t*)(*env)->GetByteArrayElements(env, random, 0);
 
   privateKey[0] &= 248;
+
+  if (ephemeral) {
+    privateKey[0] |= 1;
+  }
+
   privateKey[31] &= 127;
   privateKey[31] |= 64;
 

library/jni/curve25519-donna.c

@@ -720,9 +720,6 @@ curve25519_donna(u8 *mypublic, const u8 *secret, const u8 *basepoint) {
   int i;
 
   for (i = 0; i < 32; ++i) e[i] = secret[i];
-  e[0] &= 248;
-  e[31] &= 127;
-  e[31] |= 64;
 
   fexpand(bp, basepoint);
   cmult(x, z, e, bp);

library/protobuf/LocalStorageProtocol.proto

@@ -54,6 +54,13 @@ message SessionStructure {
 
   optional uint32 remoteRegistrationId = 10;
   optional uint32 localRegistrationId  = 11;
+
+  optional bool needsRefresh = 12;
+}
+
+message RecordStructure {
+  optional SessionStructure currentSession   = 1;
+  repeated SessionStructure previousSessions = 2;
 }
 
 message PreKeyRecordStructure {

library/src/org/whispersystems/textsecure/crypto/DuplicateMessageException.java

@@ -0,0 +1,7 @@
+package org.whispersystems.textsecure.crypto;
+
+public class DuplicateMessageException extends Exception {
+  public DuplicateMessageException(String s) {
+    super(s);
+  }
+}

library/src/org/whispersystems/textsecure/crypto/PreKeyUtil.java

@@ -34,7 +34,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
@@ -49,7 +48,7 @@ public class PreKeyUtil {
 
     for (int i=0;i<BATCH_SIZE;i++) {
       int          preKeyId = (preKeyIdOffset + i) % Medium.MAX_VALUE;
-      ECKeyPair    keyPair  = Curve25519.generateKeyPair();
+      ECKeyPair    keyPair  = Curve25519.generateKeyPair(true);
       PreKeyRecord record   = new PreKeyRecord(context, masterSecret, preKeyId, keyPair);
 
       record.save();
@@ -70,7 +69,7 @@ public class PreKeyUtil {
       }
     }
 
-    ECKeyPair    keyPair = Curve25519.generateKeyPair();
+    ECKeyPair    keyPair = Curve25519.generateKeyPair(true);
     PreKeyRecord record  = new PreKeyRecord(context, masterSecret, Medium.MAX_VALUE, keyPair);
 
     record.save();
@@ -78,38 +77,38 @@ public class PreKeyUtil {
     return record;
   }
 
-  public static List<PreKeyRecord> getPreKeys(Context context, MasterSecret masterSecret) {
-    List<PreKeyRecord> records      = new LinkedList<PreKeyRecord>();
-    File               directory    = getPreKeysDirectory(context);
-    String[]           keyRecordIds = directory.list();
-
-    Arrays.sort(keyRecordIds, new PreKeyRecordIdComparator());
-
-    for (String keyRecordId : keyRecordIds) {
-      try {
-        if (!keyRecordId.equals(PreKeyIndex.FILE_NAME) && Integer.parseInt(keyRecordId) != Medium.MAX_VALUE) {
-          records.add(new PreKeyRecord(context, masterSecret, Integer.parseInt(keyRecordId)));
-        }
-      } catch (InvalidKeyIdException e) {
-        Log.w("PreKeyUtil", e);
-        new File(getPreKeysDirectory(context), keyRecordId).delete();
-      } catch (NumberFormatException nfe) {
-        Log.w("PreKeyUtil", nfe);
-        new File(getPreKeysDirectory(context), keyRecordId).delete();
-      }
-    }
-
-    return records;
-  }
-
-  public static void clearPreKeys(Context context) {
-    File     directory  = getPreKeysDirectory(context);
-    String[] keyRecords = directory.list();
-
-    for (String keyRecord : keyRecords) {
-      new File(directory, keyRecord).delete();
-    }
-  }
+//  public static List<PreKeyRecord> getPreKeys(Context context, MasterSecret masterSecret) {
+//    List<PreKeyRecord> records      = new LinkedList<PreKeyRecord>();
+//    File               directory    = getPreKeysDirectory(context);
+//    String[]           keyRecordIds = directory.list();
+//
+//    Arrays.sort(keyRecordIds, new PreKeyRecordIdComparator());
+//
+//    for (String keyRecordId : keyRecordIds) {
+//      try {
+//        if (!keyRecordId.equals(PreKeyIndex.FILE_NAME) && Integer.parseInt(keyRecordId) != Medium.MAX_VALUE) {
+//          records.add(new PreKeyRecord(context, masterSecret, Integer.parseInt(keyRecordId)));
+//        }
+//      } catch (InvalidKeyIdException e) {
+//        Log.w("PreKeyUtil", e);
+//        new File(getPreKeysDirectory(context), keyRecordId).delete();
+//      } catch (NumberFormatException nfe) {
+//        Log.w("PreKeyUtil", nfe);
+//        new File(getPreKeysDirectory(context), keyRecordId).delete();
+//      }
+//    }
+//
+//    return records;
+//  }
+//
+//  public static void clearPreKeys(Context context) {
+//    File     directory  = getPreKeysDirectory(context);
+//    String[] keyRecords = directory.list();
+//
+//    for (String keyRecord : keyRecords) {
+//      new File(directory, keyRecord).delete();
+//    }
+//  }
 
   private static void setNextPreKeyId(Context context, int id) {
     try {
@@ -126,7 +125,7 @@ public class PreKeyUtil {
     try {
       File nextFile = new File(getPreKeysDirectory(context), PreKeyIndex.FILE_NAME);
 
-      if (nextFile.exists()) {
+      if (!nextFile.exists()) {
         return Util.getSecureRandom().nextInt(Medium.MAX_VALUE);
       } else {
         InputStreamReader reader = new InputStreamReader(new FileInputStream(nextFile));

library/src/org/whispersystems/textsecure/crypto/SessionCipher.java

@@ -29,7 +29,7 @@ public abstract class SessionCipher {
   protected static final Object SESSION_LOCK = new Object();
 
   public abstract CiphertextMessage encrypt(byte[] paddedMessage);
-  public abstract byte[] decrypt(byte[] decodedMessage) throws InvalidMessageException;
+  public abstract byte[] decrypt(byte[] decodedMessage) throws InvalidMessageException, DuplicateMessageException;
   public abstract int getRemoteRegistrationId();
 
   public static SessionCipher createFor(Context context,

library/src/org/whispersystems/textsecure/crypto/SessionCipherV2.java

@@ -1,6 +1,7 @@
 package org.whispersystems.textsecure.crypto;
 
 import android.content.Context;
+import android.util.Log;
 import android.util.Pair;
 
 import org.whispersystems.textsecure.crypto.ecc.Curve;
@@ -14,10 +15,12 @@ import org.whispersystems.textsecure.crypto.ratchet.MessageKeys;
 import org.whispersystems.textsecure.crypto.ratchet.RootKey;
 import org.whispersystems.textsecure.storage.RecipientDevice;
 import org.whispersystems.textsecure.storage.SessionRecordV2;
+import org.whispersystems.textsecure.storage.SessionState;
 import org.whispersystems.textsecure.util.Conversions;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
+import java.util.List;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -45,27 +48,28 @@ public class SessionCipherV2 extends SessionCipher {
   public CiphertextMessage encrypt(byte[] paddedMessage) {
     synchronized (SESSION_LOCK) {
       SessionRecordV2 sessionRecord   = getSessionRecord();
-      ChainKey        chainKey        = sessionRecord.getSenderChainKey();
+      SessionState    sessionState    = sessionRecord.getSessionState();
+      ChainKey        chainKey        = sessionState.getSenderChainKey();
       MessageKeys     messageKeys     = chainKey.getMessageKeys();
-      ECPublicKey     senderEphemeral = sessionRecord.getSenderEphemeral();
-      int             previousCounter = sessionRecord.getPreviousCounter();
+      ECPublicKey     senderEphemeral = sessionState.getSenderEphemeral();
+      int             previousCounter = sessionState.getPreviousCounter();
 
       byte[]            ciphertextBody    = getCiphertext(messageKeys, paddedMessage);
       CiphertextMessage ciphertextMessage = new WhisperMessageV2(messageKeys.getMacKey(),
                                                                  senderEphemeral, chainKey.getIndex(),
                                                                  previousCounter, ciphertextBody);
 
-      if (sessionRecord.hasPendingPreKey()) {
-        Pair<Integer, ECPublicKey> pendingPreKey       = sessionRecord.getPendingPreKey();
-        int                        localRegistrationId = sessionRecord.getLocalRegistrationId();
+      if (sessionState.hasPendingPreKey()) {
+        Pair<Integer, ECPublicKey> pendingPreKey       = sessionState.getPendingPreKey();
+        int                        localRegistrationId = sessionState.getLocalRegistrationId();
 
         ciphertextMessage = new PreKeyWhisperMessage(localRegistrationId, pendingPreKey.first,
                                                      pendingPreKey.second,
-                                                     sessionRecord.getLocalIdentityKey(),
+                                                     sessionState.getLocalIdentityKey(),
                                                      (WhisperMessageV2) ciphertextMessage);
       }
 
-      sessionRecord.setSenderChainKey(chainKey.getNextChainKey());
+      sessionState.setSenderChainKey(chainKey.getNextChainKey());
       sessionRecord.save();
 
       return ciphertextMessage;
@@ -73,52 +77,88 @@ public class SessionCipherV2 extends SessionCipher {
   }
 
   @Override
-  public byte[] decrypt(byte[] decodedMessage) throws InvalidMessageException {
+  public byte[] decrypt(byte[] decodedMessage)
+      throws InvalidMessageException, DuplicateMessageException
+  {
     synchronized (SESSION_LOCK) {
-      SessionRecordV2  sessionRecord     = getSessionRecord();
-      WhisperMessageV2 ciphertextMessage = new WhisperMessageV2(decodedMessage);
-      ECPublicKey      theirEphemeral    = ciphertextMessage.getSenderEphemeral();
-      int              counter           = ciphertextMessage.getCounter();
-      ChainKey         chainKey          = getOrCreateChainKey(sessionRecord, theirEphemeral);
-      MessageKeys      messageKeys       = getOrCreateMessageKeys(sessionRecord, theirEphemeral,
-                                                                  chainKey, counter);
+      SessionRecordV2    sessionRecord  = getSessionRecord();
+      SessionState       sessionState   = sessionRecord.getSessionState();
+      List<SessionState> previousStates = sessionRecord.getPreviousSessions();
 
-      ciphertextMessage.verifyMac(messageKeys.getMacKey());
+      try {
+        byte[] plaintext = decrypt(sessionState, decodedMessage);
+        sessionRecord.save();
 
-      byte[] plaintext = getPlaintext(messageKeys, ciphertextMessage.getBody());
+        return plaintext;
+      } catch (InvalidMessageException e) {
+        Log.w("SessionCipherV2", e);
+      }
 
-      sessionRecord.clearPendingPreKey();
-      sessionRecord.save();
+      for (SessionState previousState : previousStates) {
+        try {
+          Log.w("SessionCipherV2", "Attempting decrypt on previous state...");
+          byte[] plaintext = decrypt(previousState, decodedMessage);
+          sessionRecord.save();
 
-      return plaintext;
+          return plaintext;
+        } catch (InvalidMessageException e) {
+          Log.w("SessionCipherV2", e);
+        }
+      }
+
+      throw new InvalidMessageException("No valid sessions.");
     }
   }
 
+  public byte[] decrypt(SessionState sessionState, byte[] decodedMessage)
+      throws InvalidMessageException, DuplicateMessageException
+  {
+    if (!sessionState.hasSenderChain()) {
+      throw new InvalidMessageException("Uninitialized session!");
+    }
+
+    WhisperMessageV2 ciphertextMessage = new WhisperMessageV2(decodedMessage);
+    ECPublicKey      theirEphemeral    = ciphertextMessage.getSenderEphemeral();
+    int              counter           = ciphertextMessage.getCounter();
+    ChainKey         chainKey          = getOrCreateChainKey(sessionState, theirEphemeral);
+    MessageKeys      messageKeys       = getOrCreateMessageKeys(sessionState, theirEphemeral,
+                                                                chainKey, counter);
+
+    ciphertextMessage.verifyMac(messageKeys.getMacKey());
+
+    byte[] plaintext = getPlaintext(messageKeys, ciphertextMessage.getBody());
+
+    sessionState.clearPendingPreKey();
+
+    return plaintext;
+
+  }
+
   @Override
   public int getRemoteRegistrationId() {
     synchronized (SESSION_LOCK) {
       SessionRecordV2 sessionRecord = getSessionRecord();
-      return sessionRecord.getRemoteRegistrationId();
+      return sessionRecord.getSessionState().getRemoteRegistrationId();
     }
   }
 
-  private ChainKey getOrCreateChainKey(SessionRecordV2 sessionRecord, ECPublicKey theirEphemeral)
+  private ChainKey getOrCreateChainKey(SessionState sessionState, ECPublicKey theirEphemeral)
       throws InvalidMessageException
   {
     try {
-      if (sessionRecord.hasReceiverChain(theirEphemeral)) {
-        return sessionRecord.getReceiverChainKey(theirEphemeral);
+      if (sessionState.hasReceiverChain(theirEphemeral)) {
+        return sessionState.getReceiverChainKey(theirEphemeral);
       } else {
-        RootKey                 rootKey         = sessionRecord.getRootKey();
-        ECKeyPair               ourEphemeral    = sessionRecord.getSenderEphemeralPair();
+        RootKey                 rootKey         = sessionState.getRootKey();
+        ECKeyPair               ourEphemeral    = sessionState.getSenderEphemeralPair();
         Pair<RootKey, ChainKey> receiverChain   = rootKey.createChain(theirEphemeral, ourEphemeral);
-        ECKeyPair               ourNewEphemeral = Curve.generateKeyPairForType(Curve.DJB_TYPE);
+        ECKeyPair               ourNewEphemeral = Curve.generateKeyPairForType(Curve.DJB_TYPE, true);
         Pair<RootKey, ChainKey> senderChain     = receiverChain.first.createChain(theirEphemeral, ourNewEphemeral);
 
-        sessionRecord.setRootKey(senderChain.first);
-        sessionRecord.addReceiverChain(theirEphemeral, receiverChain.second);
-        sessionRecord.setPreviousCounter(sessionRecord.getSenderChainKey().getIndex()-1);
-        sessionRecord.setSenderChain(ourNewEphemeral, senderChain.second);
+        sessionState.setRootKey(senderChain.first);
+        sessionState.addReceiverChain(theirEphemeral, receiverChain.second);
+        sessionState.setPreviousCounter(sessionState.getSenderChainKey().getIndex()-1);
+        sessionState.setSenderChain(ourNewEphemeral, senderChain.second);
 
         return receiverChain.second;
       }
@@ -127,30 +167,31 @@ public class SessionCipherV2 extends SessionCipher {
     }
   }
 
-  private MessageKeys getOrCreateMessageKeys(SessionRecordV2 sessionRecord,
+  private MessageKeys getOrCreateMessageKeys(SessionState sessionState,
                                              ECPublicKey theirEphemeral,
                                              ChainKey chainKey, int counter)
-      throws InvalidMessageException
+      throws InvalidMessageException, DuplicateMessageException
   {
     if (chainKey.getIndex() > counter) {
-      if (sessionRecord.hasMessageKeys(theirEphemeral, counter)) {
-        return sessionRecord.removeMessageKeys(theirEphemeral, counter);
+      if (sessionState.hasMessageKeys(theirEphemeral, counter)) {
+        return sessionState.removeMessageKeys(theirEphemeral, counter);
       } else {
-        throw new InvalidMessageException("Received message with old counter!");
+        throw new DuplicateMessageException("Received message with old counter: " +
+                                                chainKey.getIndex() + " , " + counter);
       }
     }
 
-    if (chainKey.getIndex() - counter > 500) {
-      throw new InvalidMessageException("Over 500 messages into the future!");
+    if (chainKey.getIndex() - counter > 2000) {
+      throw new InvalidMessageException("Over 2000 messages into the future!");
     }
 
     while (chainKey.getIndex() < counter) {
       MessageKeys messageKeys = chainKey.getMessageKeys();
-      sessionRecord.setMessageKeys(theirEphemeral, messageKeys);
+      sessionState.setMessageKeys(theirEphemeral, messageKeys);
       chainKey = chainKey.getNextChainKey();
     }
 
-    sessionRecord.setReceiverChainKey(theirEphemeral, chainKey.getNextChainKey());
+    sessionState.setReceiverChainKey(theirEphemeral, chainKey.getNextChainKey());
     return chainKey.getMessageKeys();
   }
 

library/src/org/whispersystems/textsecure/crypto/ecc/Curve.java

@@ -25,9 +25,9 @@ public class Curve {
   private static final int NIST_TYPE2 = 0x03;
   public  static final int DJB_TYPE   = 0x05;
 
-  public static ECKeyPair generateKeyPairForType(int keyType) {
+  public static ECKeyPair generateKeyPairForType(int keyType, boolean ephemeral) {
     if (keyType == DJB_TYPE) {
-      return Curve25519.generateKeyPair();
+      return Curve25519.generateKeyPair(ephemeral);
     } else if (keyType == NIST_TYPE || keyType == NIST_TYPE2) {
       return CurveP256.generateKeyPair();
     } else {
@@ -35,11 +35,11 @@ public class Curve {
     }
   }
 
-  public static ECKeyPair generateKeyPairForSession(int messageVersion) {
+  public static ECKeyPair generateKeyPairForSession(int messageVersion, boolean ephemeral) {
     if (messageVersion <= CiphertextMessage.LEGACY_VERSION) {
-      return generateKeyPairForType(NIST_TYPE);
+      return generateKeyPairForType(NIST_TYPE, ephemeral);
     } else {
-      return generateKeyPairForType(DJB_TYPE);
+      return generateKeyPairForType(DJB_TYPE, ephemeral);
     }
   }
 

library/src/org/whispersystems/textsecure/crypto/ecc/Curve25519.java

@@ -37,10 +37,10 @@ public class Curve25519 {
 
   private static native byte[] calculateAgreement(byte[] ourPrivate, byte[] theirPublic);
   private static native byte[] generatePublicKey(byte[] privateKey);
-  private static native byte[] generatePrivateKey(byte[] random);
+  private static native byte[] generatePrivateKey(byte[] random, boolean ephemeral);
 
-  public static ECKeyPair generateKeyPair() {
-    byte[] privateKey = generatePrivateKey();
+  public static ECKeyPair generateKeyPair(boolean ephemeral) {
+    byte[] privateKey = generatePrivateKey(ephemeral);
     byte[] publicKey  = generatePublicKey(privateKey);
 
     return new ECKeyPair(new DjbECPublicKey(publicKey), new DjbECPrivateKey(privateKey));
@@ -65,11 +65,11 @@ public class Curve25519 {
     return new DjbECPublicKey(keyBytes);
   }
 
-  private static byte[] generatePrivateKey() {
+  private static byte[] generatePrivateKey(boolean ephemeral) {
     byte[] privateKey = new byte[32];
     random.nextBytes(privateKey);
 
-    return generatePrivateKey(privateKey);
+    return generatePrivateKey(privateKey, ephemeral);
   }
 
 }

library/src/org/whispersystems/textsecure/crypto/ratchet/RatchetingSession.java

@@ -10,14 +10,14 @@ import org.whispersystems.textsecure.crypto.ecc.ECKeyPair;
 import org.whispersystems.textsecure.crypto.ecc.ECPublicKey;
 import org.whispersystems.textsecure.crypto.kdf.DerivedSecrets;
 import org.whispersystems.textsecure.crypto.kdf.HKDF;
-import org.whispersystems.textsecure.storage.SessionRecordV2;
+import org.whispersystems.textsecure.storage.SessionState;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 public class RatchetingSession {
 
-  public static void initializeSession(SessionRecordV2 sessionRecord,
+  public static void initializeSession(SessionState sessionState,
                                        ECKeyPair ourBaseKey,
                                        ECPublicKey theirBaseKey,
                                        ECKeyPair ourEphemeralKey,
@@ -27,48 +27,48 @@ public class RatchetingSession {
       throws InvalidKeyException
   {
     if (isAlice(ourBaseKey.getPublicKey(), theirBaseKey, ourEphemeralKey.getPublicKey(), theirEphemeralKey)) {
-      initializeSessionAsAlice(sessionRecord, ourBaseKey, theirBaseKey, theirEphemeralKey,
+      initializeSessionAsAlice(sessionState, ourBaseKey, theirBaseKey, theirEphemeralKey,
                                ourIdentityKey, theirIdentityKey);
     } else {
-      initializeSessionAsBob(sessionRecord, ourBaseKey, theirBaseKey,
+      initializeSessionAsBob(sessionState, ourBaseKey, theirBaseKey,
                              ourEphemeralKey, ourIdentityKey, theirIdentityKey);
     }
   }
 
-  private static void initializeSessionAsAlice(SessionRecordV2 sessionRecord,
+  private static void initializeSessionAsAlice(SessionState sessionState,
                                                ECKeyPair ourBaseKey, ECPublicKey theirBaseKey,
                                                ECPublicKey theirEphemeralKey,
                                                IdentityKeyPair ourIdentityKey,
                                                IdentityKey theirIdentityKey)
       throws InvalidKeyException
   {
-    sessionRecord.setRemoteIdentityKey(theirIdentityKey);
-    sessionRecord.setLocalIdentityKey(ourIdentityKey.getPublicKey());
+    sessionState.setRemoteIdentityKey(theirIdentityKey);
+    sessionState.setLocalIdentityKey(ourIdentityKey.getPublicKey());
 
-    ECKeyPair               sendingKey     = Curve.generateKeyPairForType(ourIdentityKey.getPublicKey().getPublicKey().getType());
+    ECKeyPair               sendingKey     = Curve.generateKeyPairForType(ourIdentityKey.getPublicKey().getPublicKey().getType(), true);
     Pair<RootKey, ChainKey> receivingChain = calculate3DHE(true, ourBaseKey, theirBaseKey, ourIdentityKey, theirIdentityKey);
     Pair<RootKey, ChainKey> sendingChain   = receivingChain.first.createChain(theirEphemeralKey, sendingKey);
 
-    sessionRecord.addReceiverChain(theirEphemeralKey, receivingChain.second);
-    sessionRecord.setSenderChain(sendingKey, sendingChain.second);
-    sessionRecord.setRootKey(sendingChain.first);
+    sessionState.addReceiverChain(theirEphemeralKey, receivingChain.second);
+    sessionState.setSenderChain(sendingKey, sendingChain.second);
+    sessionState.setRootKey(sendingChain.first);
   }
 
-  private static void initializeSessionAsBob(SessionRecordV2 sessionRecord,
+  private static void initializeSessionAsBob(SessionState sessionState,
                                              ECKeyPair ourBaseKey, ECPublicKey theirBaseKey,
                                              ECKeyPair ourEphemeralKey,
                                              IdentityKeyPair ourIdentityKey,
                                              IdentityKey theirIdentityKey)
       throws InvalidKeyException
   {
-    sessionRecord.setRemoteIdentityKey(theirIdentityKey);
-    sessionRecord.setLocalIdentityKey(ourIdentityKey.getPublicKey());
+    sessionState.setRemoteIdentityKey(theirIdentityKey);
+    sessionState.setLocalIdentityKey(ourIdentityKey.getPublicKey());
 
     Pair<RootKey, ChainKey> sendingChain = calculate3DHE(false, ourBaseKey, theirBaseKey,
                                                          ourIdentityKey, theirIdentityKey);
 
-    sessionRecord.setSenderChain(ourEphemeralKey, sendingChain.second);
-    sessionRecord.setRootKey(sendingChain.first);
+    sessionState.setSenderChain(ourEphemeralKey, sendingChain.second);
+    sessionState.setRootKey(sendingChain.first);
   }
 
   private static Pair<RootKey, ChainKey> calculate3DHE(boolean isAlice,

library/src/org/whispersystems/textsecure/push/PreKeyStatus.java

@@ -0,0 +1,12 @@
+package org.whispersystems.textsecure.push;
+
+public class PreKeyStatus {
+
+  private int count;
+
+  public PreKeyStatus() {}
+
+  public int getCount() {
+    return count;
+  }
+}

library/src/org/whispersystems/textsecure/push/PushServiceSocket.java

@@ -1,3 +1,19 @@
+/**
+ * Copyright (C) 2014 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.whispersystems.textsecure.push;
 
 import android.content.Context;
@@ -10,6 +26,7 @@ import org.apache.http.conn.ssl.StrictHostnameVerifier;
 import org.whispersystems.textsecure.crypto.IdentityKey;
 import org.whispersystems.textsecure.storage.PreKeyRecord;
 import org.whispersystems.textsecure.util.Base64;
+import org.whispersystems.textsecure.util.BlacklistingTrustManager;
 import org.whispersystems.textsecure.util.Util;
 
 import java.io.File;
@@ -32,14 +49,22 @@ import java.util.Set;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
+/**
+ *
+ * Network interface to the TextSecure server API.
+ *
+ * @author Moxie Marlinspike
+ */
 public class PushServiceSocket {
 
   private static final String CREATE_ACCOUNT_SMS_PATH   = "/v1/accounts/sms/code/%s";
   private static final String CREATE_ACCOUNT_VOICE_PATH = "/v1/accounts/voice/code/%s";
   private static final String VERIFY_ACCOUNT_PATH       = "/v1/accounts/code/%s";
   private static final String REGISTER_GCM_PATH         = "/v1/accounts/gcm/";
+  private static final String PREKEY_METADATA_PATH      = "/v1/keys/";
   private static final String PREKEY_PATH               = "/v1/keys/%s";
   private static final String PREKEY_DEVICE_PATH        = "/v1/keys/%s/%s";
 
@@ -50,20 +75,20 @@ public class PushServiceSocket {
 
   private static final boolean ENFORCE_SSL = true;
 
-  private final Context context;
-  private final String serviceUrl;
-  private final String localNumber;
-  private final String password;
-  private final TrustManagerFactory trustManagerFactory;
+  private final Context        context;
+  private final String         serviceUrl;
+  private final String         localNumber;
+  private final String         password;
+  private final TrustManager[] trustManagers;
 
   public PushServiceSocket(Context context, String serviceUrl, TrustStore trustStore,
                            String localNumber, String password)
   {
-    this.context             = context.getApplicationContext();
-    this.serviceUrl          = serviceUrl;
-    this.localNumber         = localNumber;
-    this.password            = password;
-    this.trustManagerFactory = initializeTrustManagerFactory(trustStore);
+    this.context       = context.getApplicationContext();
+    this.serviceUrl    = serviceUrl;
+    this.localNumber   = localNumber;
+    this.password      = password;
+    this.trustManagers = initializeTrustManager(trustStore);
   }
 
   public void createAccount(boolean voice) throws IOException {
@@ -123,6 +148,13 @@ public class PushServiceSocket {
                 PreKeyList.toJson(new PreKeyList(lastResortEntity, entities)));
   }
 
+  public int getAvailablePreKeys() throws IOException {
+    String       responseText = makeRequest(PREKEY_METADATA_PATH, "GET", null);
+    PreKeyStatus preKeyStatus = new Gson().fromJson(responseText, PreKeyStatus.class);
+
+    return preKeyStatus.getCount();
+  }
+
   public List<PreKeyEntity> getPreKeys(PushAddress destination) throws IOException {
     try {
       String deviceId = String.valueOf(destination.getDeviceId());
@@ -348,7 +380,7 @@ public class PushServiceSocket {
   private HttpURLConnection getConnection(String urlFragment, String method) throws IOException {
     try {
       SSLContext context = SSLContext.getInstance("TLS");
-      context.init(null, trustManagerFactory.getTrustManagers(), null);
+      context.init(null, trustManagers, null);
 
       URL url = new URL(String.format("%s%s", serviceUrl, urlFragment));
       Log.w("PushServiceSocket", "Push service URL: " + serviceUrl);
@@ -386,7 +418,7 @@ public class PushServiceSocket {
     }
   }
 
-  private TrustManagerFactory initializeTrustManagerFactory(TrustStore trustStore) {
+  private TrustManager[] initializeTrustManager(TrustStore trustStore) {
     try {
       InputStream keyStoreInputStream = trustStore.getKeyStoreInputStream();
       KeyStore    keyStore            = KeyStore.getInstance("BKS");
@@ -396,7 +428,7 @@ public class PushServiceSocket {
       TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("X509");
       trustManagerFactory.init(keyStore);
 
-      return trustManagerFactory;
+      return BlacklistingTrustManager.createFor(trustManagerFactory.getTrustManagers());
     } catch (KeyStoreException kse) {
       throw new AssertionError(kse);
     } catch (CertificateException e) {

library/src/org/whispersystems/textsecure/storage/LocalKeyRecord.java

@@ -70,7 +70,7 @@ public class LocalKeyRecord extends Record {
 
       this.localCurrentKeyPair = this.localNextKeyPair;
       this.localNextKeyPair    = new KeyPair((this.localNextKeyPair.getId()+1) % Medium.MAX_VALUE,
-                                             Curve.generateKeyPairForType(keyType),
+                                             Curve.generateKeyPairForType(keyType, true),
                                              masterSecret);
     }
   }

library/src/org/whispersystems/textsecure/storage/Session.java

@@ -35,6 +35,27 @@ public class Session {
     return hasV1Session(context, recipient) || hasV2Session(context, masterSecret, recipient);
   }
 
+  public static boolean hasEncryptCapableSession(Context context,
+                                                 MasterSecret masterSecret,
+                                                 CanonicalRecipient recipient)
+  {
+    RecipientDevice device = new RecipientDevice(recipient.getRecipientId(),
+                                                 RecipientDevice.DEFAULT_DEVICE_ID);
+
+    return hasEncryptCapableSession(context, masterSecret, recipient, device);
+  }
+
+  public static boolean hasEncryptCapableSession(Context context,
+                                                 MasterSecret masterSecret,
+                                                 CanonicalRecipient recipient,
+                                                 RecipientDevice device)
+  {
+    return
+        hasV1Session(context, recipient) ||
+            (hasV2Session(context, masterSecret, recipient) &&
+             !SessionRecordV2.needsRefresh(context, masterSecret, device));
+  }
+
   public static boolean hasRemoteIdentityKey(Context context,
                                              MasterSecret masterSecret,
                                              CanonicalRecipient recipient)
@@ -49,7 +70,6 @@ public class Session {
     return SessionRecordV2.hasSession(context, masterSecret, recipient.getRecipientId(),
                                       RecipientDevice.DEFAULT_DEVICE_ID);
   }
-
   private static boolean hasV1Session(Context context, CanonicalRecipient recipient) {
     return SessionRecordV1.hasSession(context, recipient)   &&
            RemoteKeyRecord.hasRecord(context, recipient)    &&
@@ -70,7 +90,8 @@ public class Session {
                                    RecipientDevice.DEFAULT_DEVICE_ID))
     {
       return new SessionRecordV2(context, masterSecret, recipientId,
-                                 RecipientDevice.DEFAULT_DEVICE_ID).getRemoteIdentityKey();
+                                 RecipientDevice.DEFAULT_DEVICE_ID).getSessionState()
+                                                                   .getRemoteIdentityKey();
     } else if (SessionRecordV1.hasSession(context, recipientId)) {
       return new SessionRecordV1(context, masterSecret, recipientId).getIdentityKey();
     } else {

library/src/org/whispersystems/textsecure/storage/SessionRecordV2.java

@@ -18,26 +18,10 @@ package org.whispersystems.textsecure.storage;
 
 import android.content.Context;
 import android.util.Log;
-import android.util.Pair;
 
-import com.google.protobuf.ByteString;
-
-import org.whispersystems.textsecure.crypto.IdentityKey;
-import org.whispersystems.textsecure.crypto.IdentityKeyPair;
-import org.whispersystems.textsecure.crypto.InvalidKeyException;
 import org.whispersystems.textsecure.crypto.InvalidMessageException;
 import org.whispersystems.textsecure.crypto.MasterCipher;
 import org.whispersystems.textsecure.crypto.MasterSecret;
-import org.whispersystems.textsecure.crypto.ecc.Curve;
-import org.whispersystems.textsecure.crypto.ecc.ECKeyPair;
-import org.whispersystems.textsecure.crypto.ecc.ECPrivateKey;
-import org.whispersystems.textsecure.crypto.ecc.ECPublicKey;
-import org.whispersystems.textsecure.crypto.ratchet.ChainKey;
-import org.whispersystems.textsecure.crypto.ratchet.MessageKeys;
-import org.whispersystems.textsecure.crypto.ratchet.RootKey;
-import org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Chain;
-import org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.PendingKeyExchange;
-import org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.PendingPreKey;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -45,11 +29,11 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.crypto.spec.SecretKeySpec;
+import static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure;
+import static org.whispersystems.textsecure.storage.StorageProtos.SessionStructure;
 
 /**
  * A disk record representing a current session.
@@ -60,11 +44,15 @@ import javax.crypto.spec.SecretKeySpec;
 public class SessionRecordV2 extends Record {
 
   private static final Object FILE_LOCK = new Object();
-  private static final int CURRENT_VERSION = 1;
+
+  private static final int SINGLE_STATE_VERSION   = 1;
+  private static final int ARCHIVE_STATES_VERSION = 2;
+  private static final int CURRENT_VERSION        = 2;
 
   private final MasterSecret masterSecret;
-  private StorageProtos.SessionStructure sessionStructure =
-      StorageProtos.SessionStructure.newBuilder().build();
+
+  private SessionState       sessionState   = new SessionState(SessionStructure.newBuilder().build());
+  private List<SessionState> previousStates = new LinkedList<SessionState>();
 
   public SessionRecordV2(Context context, MasterSecret masterSecret, RecipientDevice peer) {
     this(context, masterSecret, peer.getRecipientId(), peer.getDeviceId());
@@ -80,6 +68,15 @@ public class SessionRecordV2 extends Record {
     return recipientId + (deviceId == RecipientDevice.DEFAULT_DEVICE_ID ? "" : "." + deviceId);
   }
 
+  public SessionState getSessionState() {
+    return sessionState;
+  }
+
+
+  public List<SessionState> getPreviousSessions() {
+    return previousStates;
+  }
+
   public static List<Integer> getSessionSubDevices(Context context, CanonicalRecipient recipient) {
     List<Integer> results  = new LinkedList<Integer>();
     File          parent   = getParentDirectory(context, SESSIONS_DIRECTORY_V2);
@@ -129,404 +126,49 @@ public class SessionRecordV2 extends Record {
                                    long recipientId, int deviceId)
   {
     return hasRecord(context, SESSIONS_DIRECTORY_V2, getRecordName(recipientId, deviceId)) &&
-        new SessionRecordV2(context, masterSecret, recipientId, deviceId).hasSenderChain();
+        new SessionRecordV2(context, masterSecret, recipientId, deviceId).sessionState.hasSenderChain();
+  }
+
+  public static boolean needsRefresh(Context context, MasterSecret masterSecret,
+                                     RecipientDevice recipient)
+  {
+    return new SessionRecordV2(context, masterSecret,
+                               recipient.getRecipientId(),
+                               recipient.getDeviceId()).getSessionState()
+                                                       .getNeedsRefresh();
   }
 
   public void clear() {
-    this.sessionStructure = StorageProtos.SessionStructure.newBuilder().build();
+    this.sessionState = new SessionState(SessionStructure.newBuilder().build());
+    this.previousStates = new LinkedList<SessionState>();
   }
 
-  public void setSessionVersion(int version) {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setSessionVersion(version)
-                                                 .build();
-  }
-
-  public int getSessionVersion() {
-    return this.sessionStructure.getSessionVersion();
-  }
-
-  public void setRemoteIdentityKey(IdentityKey identityKey) {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setRemoteIdentityPublic(ByteString.copyFrom(identityKey.serialize()))
-                                                 .build();
-  }
-
-  public void setLocalIdentityKey(IdentityKey identityKey) {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setLocalIdentityPublic(ByteString.copyFrom(identityKey.serialize()))
-                                                 .build();
-  }
-
-  public IdentityKey getRemoteIdentityKey() {
-    try {
-      if (!this.sessionStructure.hasRemoteIdentityPublic()) {
-        return null;
-      }
-
-      return new IdentityKey(this.sessionStructure.getRemoteIdentityPublic().toByteArray(), 0);
-    } catch (InvalidKeyException e) {
-      Log.w("SessionRecordV2", e);
-      return null;
-    }
-  }
-
-  public IdentityKey getLocalIdentityKey() {
-    try {
-      return new IdentityKey(this.sessionStructure.getLocalIdentityPublic().toByteArray(), 0);
-    } catch (InvalidKeyException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  public int getPreviousCounter() {
-    return sessionStructure.getPreviousCounter();
-  }
-
-  public void setPreviousCounter(int previousCounter) {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setPreviousCounter(previousCounter)
-                                                 .build();
-  }
-
-  public RootKey getRootKey() {
-    return new RootKey(this.sessionStructure.getRootKey().toByteArray());
-  }
-
-  public void setRootKey(RootKey rootKey) {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setRootKey(ByteString.copyFrom(rootKey.getKeyBytes()))
-                                                 .build();
-  }
-
-  public ECPublicKey getSenderEphemeral() {
-    try {
-      return Curve.decodePoint(sessionStructure.getSenderChain().getSenderEphemeral().toByteArray(), 0);
-    } catch (InvalidKeyException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  public ECKeyPair getSenderEphemeralPair() {
-    ECPublicKey publicKey = getSenderEphemeral();
-    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getType(),
-                                                       sessionStructure.getSenderChain()
-                                                                       .getSenderEphemeralPrivate()
-                                                                       .toByteArray());
-
-    return new ECKeyPair(publicKey, privateKey);
-  }
-
-  public boolean hasReceiverChain(ECPublicKey senderEphemeral) {
-    return getReceiverChain(senderEphemeral) != null;
-  }
-
-  public boolean hasSenderChain() {
-    return sessionStructure.hasSenderChain();
-  }
-
-  private Pair<Chain,Integer> getReceiverChain(ECPublicKey senderEphemeral) {
-    List<Chain> receiverChains = sessionStructure.getReceiverChainsList();
-    int         index          = 0;
-
-    for (Chain receiverChain : receiverChains) {
-      try {
-        ECPublicKey chainSenderEphemeral = Curve.decodePoint(receiverChain.getSenderEphemeral().toByteArray(), 0);
-
-        if (chainSenderEphemeral.equals(senderEphemeral)) {
-          return new Pair<Chain,Integer>(receiverChain,index);
-        }
-      } catch (InvalidKeyException e) {
-        Log.w("SessionRecordV2", e);
-      }
-
-      index++;
-    }
-
-    return null;
-  }
-
-  public ChainKey getReceiverChainKey(ECPublicKey senderEphemeral) {
-    Pair<Chain,Integer> receiverChainAndIndex = getReceiverChain(senderEphemeral);
-    Chain               receiverChain         = receiverChainAndIndex.first;
-
-    if (receiverChain == null) {
-      return null;
-    } else {
-      return new ChainKey(receiverChain.getChainKey().getKey().toByteArray(),
-                          receiverChain.getChainKey().getIndex());
-    }
-  }
-
-  public void addReceiverChain(ECPublicKey senderEphemeral, ChainKey chainKey) {
-    Chain.ChainKey chainKeyStructure = Chain.ChainKey.newBuilder()
-                                            .setKey(ByteString.copyFrom(chainKey.getKey()))
-                                            .setIndex(chainKey.getIndex())
-                                            .build();
-
-    Chain chain = Chain.newBuilder()
-                       .setChainKey(chainKeyStructure)
-                       .setSenderEphemeral(ByteString.copyFrom(senderEphemeral.serialize()))
-                       .build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder().addReceiverChains(chain).build();
-
-    if (this.sessionStructure.getReceiverChainsList().size() > 5) {
-      this.sessionStructure = this.sessionStructure.toBuilder()
-                                                   .removeReceiverChains(0)
-                                                   .build();
-    }
-  }
-
-  public void setSenderChain(ECKeyPair senderEphemeralPair, ChainKey chainKey) {
-    Chain.ChainKey chainKeyStructure = Chain.ChainKey.newBuilder()
-                                            .setKey(ByteString.copyFrom(chainKey.getKey()))
-                                            .setIndex(chainKey.getIndex())
-                                            .build();
-
-    Chain senderChain = Chain.newBuilder()
-                             .setSenderEphemeral(ByteString.copyFrom(senderEphemeralPair.getPublicKey().serialize()))
-                             .setSenderEphemeralPrivate(ByteString.copyFrom(senderEphemeralPair.getPrivateKey().serialize()))
-                             .setChainKey(chainKeyStructure)
-                             .build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder().setSenderChain(senderChain).build();
-  }
-
-  public ChainKey getSenderChainKey() {
-    Chain.ChainKey chainKeyStructure = sessionStructure.getSenderChain().getChainKey();
-    return new ChainKey(chainKeyStructure.getKey().toByteArray(), chainKeyStructure.getIndex());
-  }
-
-
-  public void setSenderChainKey(ChainKey nextChainKey) {
-    Chain.ChainKey chainKey = Chain.ChainKey.newBuilder()
-                                   .setKey(ByteString.copyFrom(nextChainKey.getKey()))
-                                   .setIndex(nextChainKey.getIndex())
-                                   .build();
-
-    Chain chain = sessionStructure.getSenderChain().toBuilder()
-                                  .setChainKey(chainKey).build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder().setSenderChain(chain).build();
-  }
-
-  public boolean hasMessageKeys(ECPublicKey senderEphemeral, int counter) {
-    Pair<Chain,Integer> chainAndIndex = getReceiverChain(senderEphemeral);
-    Chain               chain         = chainAndIndex.first;
-
-    if (chain == null) {
-      return false;
-    }
-
-    List<Chain.MessageKey> messageKeyList = chain.getMessageKeysList();
-
-    for (Chain.MessageKey messageKey : messageKeyList) {
-      if (messageKey.getIndex() == counter) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  public MessageKeys removeMessageKeys(ECPublicKey senderEphemeral, int counter) {
-    Pair<Chain,Integer> chainAndIndex = getReceiverChain(senderEphemeral);
-    Chain               chain         = chainAndIndex.first;
-
-    if (chain == null) {
-      return null;
-    }
-
-    List<Chain.MessageKey>     messageKeyList     = new LinkedList<Chain.MessageKey>(chain.getMessageKeysList());
-    Iterator<Chain.MessageKey> messageKeyIterator = messageKeyList.iterator();
-    MessageKeys                result             = null;
-
-    while (messageKeyIterator.hasNext()) {
-      Chain.MessageKey messageKey = messageKeyIterator.next();
-
-      if (messageKey.getIndex() == counter) {
-        result = new MessageKeys(new SecretKeySpec(messageKey.getCipherKey().toByteArray(), "AES"),
-                                 new SecretKeySpec(messageKey.getMacKey().toByteArray(), "HmacSHA256"),
-                                 messageKey.getIndex());
-
-        messageKeyIterator.remove();
-        break;
-      }
-    }
-
-    Chain updatedChain = chain.toBuilder().clearMessageKeys()
-                              .addAllMessageKeys(messageKeyList)
-                              .build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setReceiverChains(chainAndIndex.second, updatedChain)
-                                                 .build();
-
-    return result;
-  }
-
-  public void setMessageKeys(ECPublicKey senderEphemeral, MessageKeys messageKeys) {
-    Pair<Chain,Integer> chainAndIndex       = getReceiverChain(senderEphemeral);
-    Chain               chain               = chainAndIndex.first;
-    Chain.MessageKey    messageKeyStructure = Chain.MessageKey.newBuilder()
-                                                   .setCipherKey(ByteString.copyFrom(messageKeys.getCipherKey().getEncoded()))
-                                                   .setMacKey(ByteString.copyFrom(messageKeys.getMacKey().getEncoded()))
-                                                   .setIndex(messageKeys.getCounter())
-                                                   .build();
-
-    Chain updatedChain = chain.toBuilder()
-                              .addMessageKeys(messageKeyStructure)
-                              .build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setReceiverChains(chainAndIndex.second, updatedChain)
-                                                 .build();
-  }
-
-  public void setReceiverChainKey(ECPublicKey senderEphemeral, ChainKey chainKey) {
-    Pair<Chain,Integer> chainAndIndex = getReceiverChain(senderEphemeral);
-    Chain               chain         = chainAndIndex.first;
-
-    Chain.ChainKey chainKeyStructure = Chain.ChainKey.newBuilder()
-                                            .setKey(ByteString.copyFrom(chainKey.getKey()))
-                                            .setIndex(chainKey.getIndex())
-                                            .build();
-
-    Chain updatedChain = chain.toBuilder().setChainKey(chainKeyStructure).build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setReceiverChains(chainAndIndex.second, updatedChain)
-                                                 .build();
-  }
-
-  public void setPendingKeyExchange(int sequence,
-                                    ECKeyPair ourBaseKey,
-                                    ECKeyPair ourEphemeralKey,
-                                    IdentityKeyPair ourIdentityKey)
-  {
-    PendingKeyExchange structure =
-        PendingKeyExchange.newBuilder()
-            .setSequence(sequence)
-            .setLocalBaseKey(ByteString.copyFrom(ourBaseKey.getPublicKey().serialize()))
-            .setLocalBaseKeyPrivate(ByteString.copyFrom(ourBaseKey.getPrivateKey().serialize()))
-            .setLocalEphemeralKey(ByteString.copyFrom(ourEphemeralKey.getPublicKey().serialize()))
-            .setLocalEphemeralKeyPrivate(ByteString.copyFrom(ourEphemeralKey.getPrivateKey().serialize()))
-            .setLocalIdentityKey(ByteString.copyFrom(ourIdentityKey.getPublicKey().serialize()))
-            .setLocalIdentityKeyPrivate(ByteString.copyFrom(ourIdentityKey.getPrivateKey().serialize()))
-            .build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setPendingKeyExchange(structure)
-                                                 .build();
-  }
-
-  public int getPendingKeyExchangeSequence() {
-    return sessionStructure.getPendingKeyExchange().getSequence();
-  }
-
-  public ECKeyPair getPendingKeyExchangeBaseKey() throws InvalidKeyException {
-    ECPublicKey publicKey   = Curve.decodePoint(sessionStructure.getPendingKeyExchange()
-                                                                .getLocalBaseKey().toByteArray(), 0);
-
-    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getType(),
-                                                       sessionStructure.getPendingKeyExchange()
-                                                                       .getLocalBaseKeyPrivate()
-                                                                       .toByteArray());
-
-    return new ECKeyPair(publicKey, privateKey);
-  }
-
-  public ECKeyPair getPendingKeyExchangeEphemeralKey() throws InvalidKeyException {
-    ECPublicKey publicKey   = Curve.decodePoint(sessionStructure.getPendingKeyExchange()
-                                                                .getLocalEphemeralKey().toByteArray(), 0);
-
-    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getType(),
-                                                       sessionStructure.getPendingKeyExchange()
-                                                                       .getLocalEphemeralKeyPrivate()
-                                                                       .toByteArray());
-
-    return new ECKeyPair(publicKey, privateKey);
-  }
-
-  public IdentityKeyPair getPendingKeyExchangeIdentityKey() throws InvalidKeyException {
-    IdentityKey publicKey = new IdentityKey(sessionStructure.getPendingKeyExchange()
-                                                            .getLocalIdentityKey().toByteArray(), 0);
-
-    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getPublicKey().getType(),
-                                                       sessionStructure.getPendingKeyExchange()
-                                                                       .getLocalIdentityKeyPrivate()
-                                                                       .toByteArray());
-
-    return new IdentityKeyPair(publicKey, privateKey);
-  }
-
-  public boolean hasPendingKeyExchange() {
-    return sessionStructure.hasPendingKeyExchange();
-  }
-
-  public void setPendingPreKey(int preKeyId, ECPublicKey baseKey) {
-    PendingPreKey pending = PendingPreKey.newBuilder()
-                                         .setPreKeyId(preKeyId)
-                                         .setBaseKey(ByteString.copyFrom(baseKey.serialize()))
-                                         .build();
-
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setPendingPreKey(pending)
-                                                 .build();
-  }
-
-  public boolean hasPendingPreKey() {
-    return this.sessionStructure.hasPendingPreKey();
-  }
-
-  public Pair<Integer, ECPublicKey> getPendingPreKey() {
-    try {
-      return new Pair<Integer, ECPublicKey>(sessionStructure.getPendingPreKey().getPreKeyId(),
-                                            Curve.decodePoint(sessionStructure.getPendingPreKey()
-                                                                              .getBaseKey()
-                                                                              .toByteArray(), 0));
-    } catch (InvalidKeyException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  public void clearPendingPreKey() {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .clearPendingPreKey()
-                                                 .build();
-  }
-
-  public void setRemoteRegistrationId(int registrationId) {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setRemoteRegistrationId(registrationId)
-                                                 .build();
-  }
-
-  public int getRemoteRegistrationId() {
-    return this.sessionStructure.getRemoteRegistrationId();
-  }
-
-  public void setLocalRegistrationId(int registrationId) {
-    this.sessionStructure = this.sessionStructure.toBuilder()
-                                                 .setLocalRegistrationId(registrationId)
-                                                 .build();
-  }
-
-  public int getLocalRegistrationId() {
-    return this.sessionStructure.getLocalRegistrationId();
+  public void archiveCurrentState() {
+    this.previousStates.add(sessionState);
+    this.sessionState = new SessionState(SessionStructure.newBuilder().build());
   }
 
   public void save() {
     synchronized (FILE_LOCK) {
       try {
+        List<SessionStructure> previousStructures = new LinkedList<SessionStructure>();
+
+        for (SessionState previousState : previousStates) {
+          previousStructures.add(previousState.getStructure());
+        }
+
+        RecordStructure record = RecordStructure.newBuilder()
+                                                .setCurrentSession(sessionState.getStructure())
+                                                .addAllPreviousSessions(previousStructures)
+                                                .build();
+
         RandomAccessFile file = openRandomAccessFile();
         FileChannel out       = file.getChannel();
         out.position(0);
 
         MasterCipher cipher = new MasterCipher(masterSecret);
         writeInteger(CURRENT_VERSION, out);
-        writeBlob(cipher.encryptBytes(sessionStructure.toByteArray()), out);
+        writeBlob(cipher.encryptBytes(record.toByteArray()), out);
 
         out.truncate(out.position());
         file.close();
@@ -549,11 +191,26 @@ public class SessionRecordV2 extends Record {
         MasterCipher cipher = new MasterCipher(masterSecret);
         byte[] encryptedBlob = readBlob(in);
 
+        if (versionMarker == SINGLE_STATE_VERSION) {
+          byte[]           plaintextBytes   = cipher.decryptBytes(encryptedBlob);
+          SessionStructure sessionStructure = SessionStructure.parseFrom(plaintextBytes);
+          this.sessionState = new SessionState(sessionStructure);
+        } else if (versionMarker == ARCHIVE_STATES_VERSION) {
+          byte[]          plaintextBytes  = cipher.decryptBytes(encryptedBlob);
+          RecordStructure recordStructure = RecordStructure.parseFrom(plaintextBytes);
 
-        this.sessionStructure = StorageProtos.SessionStructure
-                                             .parseFrom(cipher.decryptBytes(encryptedBlob));
+          this.sessionState   = new SessionState(recordStructure.getCurrentSession());
+          this.previousStates = new LinkedList<SessionState>();
+
+          for (SessionStructure sessionStructure : recordStructure.getPreviousSessionsList()) {
+            this.previousStates.add(new SessionState(sessionStructure));
+          }
+        } else {
+          throw new AssertionError("Unknown version: " + versionMarker);
+        }
 
         in.close();
+
       } catch (FileNotFoundException e) {
         Log.w("SessionRecordV2", "No session information found.");
         // XXX

library/src/org/whispersystems/textsecure/storage/SessionState.java

@@ -0,0 +1,436 @@
+package org.whispersystems.textsecure.storage;
+
+import android.util.Log;
+import android.util.Pair;
+
+import com.google.protobuf.ByteString;
+
+import org.whispersystems.textsecure.crypto.IdentityKey;
+import org.whispersystems.textsecure.crypto.IdentityKeyPair;
+import org.whispersystems.textsecure.crypto.InvalidKeyException;
+import org.whispersystems.textsecure.crypto.ecc.Curve;
+import org.whispersystems.textsecure.crypto.ecc.ECKeyPair;
+import org.whispersystems.textsecure.crypto.ecc.ECPrivateKey;
+import org.whispersystems.textsecure.crypto.ecc.ECPublicKey;
+import org.whispersystems.textsecure.crypto.ratchet.ChainKey;
+import org.whispersystems.textsecure.crypto.ratchet.MessageKeys;
+import org.whispersystems.textsecure.crypto.ratchet.RootKey;
+import org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Chain;
+import org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.PendingKeyExchange;
+import org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.PendingPreKey;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.crypto.spec.SecretKeySpec;
+
+import static org.whispersystems.textsecure.storage.StorageProtos.SessionStructure;
+
+public class SessionState {
+
+  private SessionStructure sessionStructure;
+
+  public SessionState(SessionStructure sessionStructure) {
+    this.sessionStructure = sessionStructure;
+  }
+
+  public SessionStructure getStructure() {
+    return sessionStructure;
+  }
+
+  public void setNeedsRefresh(boolean needsRefresh) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setNeedsRefresh(needsRefresh)
+                                                 .build();
+  }
+
+  public boolean getNeedsRefresh() {
+    return this.sessionStructure.getNeedsRefresh();
+  }
+
+  public void setSessionVersion(int version) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setSessionVersion(version)
+                                                 .build();
+  }
+
+  public int getSessionVersion() {
+    return this.sessionStructure.getSessionVersion();
+  }
+
+  public void setRemoteIdentityKey(IdentityKey identityKey) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setRemoteIdentityPublic(ByteString.copyFrom(identityKey.serialize()))
+                                                 .build();
+  }
+
+  public void setLocalIdentityKey(IdentityKey identityKey) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setLocalIdentityPublic(ByteString.copyFrom(identityKey.serialize()))
+                                                 .build();
+  }
+
+  public IdentityKey getRemoteIdentityKey() {
+    try {
+      if (!this.sessionStructure.hasRemoteIdentityPublic()) {
+        return null;
+      }
+
+      return new IdentityKey(this.sessionStructure.getRemoteIdentityPublic().toByteArray(), 0);
+    } catch (InvalidKeyException e) {
+      Log.w("SessionRecordV2", e);
+      return null;
+    }
+  }
+
+  public IdentityKey getLocalIdentityKey() {
+    try {
+      return new IdentityKey(this.sessionStructure.getLocalIdentityPublic().toByteArray(), 0);
+    } catch (InvalidKeyException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  public int getPreviousCounter() {
+    return sessionStructure.getPreviousCounter();
+  }
+
+  public void setPreviousCounter(int previousCounter) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setPreviousCounter(previousCounter)
+                                                 .build();
+  }
+
+  public RootKey getRootKey() {
+    return new RootKey(this.sessionStructure.getRootKey().toByteArray());
+  }
+
+  public void setRootKey(RootKey rootKey) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setRootKey(ByteString.copyFrom(rootKey.getKeyBytes()))
+                                                 .build();
+  }
+
+  public ECPublicKey getSenderEphemeral() {
+    try {
+      return Curve.decodePoint(sessionStructure.getSenderChain().getSenderEphemeral().toByteArray(), 0);
+    } catch (InvalidKeyException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  public ECKeyPair getSenderEphemeralPair() {
+    ECPublicKey publicKey = getSenderEphemeral();
+    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getType(),
+                                                       sessionStructure.getSenderChain()
+                                                                       .getSenderEphemeralPrivate()
+                                                                       .toByteArray());
+
+    return new ECKeyPair(publicKey, privateKey);
+  }
+
+  public boolean hasReceiverChain(ECPublicKey senderEphemeral) {
+    return getReceiverChain(senderEphemeral) != null;
+  }
+
+  public boolean hasSenderChain() {
+    return sessionStructure.hasSenderChain();
+  }
+
+  private Pair<Chain,Integer> getReceiverChain(ECPublicKey senderEphemeral) {
+    List<Chain> receiverChains = sessionStructure.getReceiverChainsList();
+    int         index          = 0;
+
+    for (Chain receiverChain : receiverChains) {
+      try {
+        ECPublicKey chainSenderEphemeral = Curve.decodePoint(receiverChain.getSenderEphemeral().toByteArray(), 0);
+
+        if (chainSenderEphemeral.equals(senderEphemeral)) {
+          return new Pair<Chain,Integer>(receiverChain,index);
+        }
+      } catch (InvalidKeyException e) {
+        Log.w("SessionRecordV2", e);
+      }
+
+      index++;
+    }
+
+    return null;
+  }
+
+  public ChainKey getReceiverChainKey(ECPublicKey senderEphemeral) {
+    Pair<Chain,Integer> receiverChainAndIndex = getReceiverChain(senderEphemeral);
+    Chain               receiverChain         = receiverChainAndIndex.first;
+
+    if (receiverChain == null) {
+      return null;
+    } else {
+      return new ChainKey(receiverChain.getChainKey().getKey().toByteArray(),
+                          receiverChain.getChainKey().getIndex());
+    }
+  }
+
+  public void addReceiverChain(ECPublicKey senderEphemeral, ChainKey chainKey) {
+    Chain.ChainKey chainKeyStructure = Chain.ChainKey.newBuilder()
+                                                     .setKey(ByteString.copyFrom(chainKey.getKey()))
+                                                     .setIndex(chainKey.getIndex())
+                                                     .build();
+
+    Chain chain = Chain.newBuilder()
+                       .setChainKey(chainKeyStructure)
+                       .setSenderEphemeral(ByteString.copyFrom(senderEphemeral.serialize()))
+                       .build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder().addReceiverChains(chain).build();
+
+    if (this.sessionStructure.getReceiverChainsList().size() > 5) {
+      this.sessionStructure = this.sessionStructure.toBuilder()
+                                                   .removeReceiverChains(0)
+                                                   .build();
+    }
+  }
+
+  public void setSenderChain(ECKeyPair senderEphemeralPair, ChainKey chainKey) {
+    Chain.ChainKey chainKeyStructure = Chain.ChainKey.newBuilder()
+                                                     .setKey(ByteString.copyFrom(chainKey.getKey()))
+                                                     .setIndex(chainKey.getIndex())
+                                                     .build();
+
+    Chain senderChain = Chain.newBuilder()
+                             .setSenderEphemeral(ByteString.copyFrom(senderEphemeralPair.getPublicKey().serialize()))
+                             .setSenderEphemeralPrivate(ByteString.copyFrom(senderEphemeralPair.getPrivateKey().serialize()))
+                             .setChainKey(chainKeyStructure)
+                             .build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder().setSenderChain(senderChain).build();
+  }
+
+  public ChainKey getSenderChainKey() {
+    Chain.ChainKey chainKeyStructure = sessionStructure.getSenderChain().getChainKey();
+    return new ChainKey(chainKeyStructure.getKey().toByteArray(), chainKeyStructure.getIndex());
+  }
+
+
+  public void setSenderChainKey(ChainKey nextChainKey) {
+    Chain.ChainKey chainKey = Chain.ChainKey.newBuilder()
+                                            .setKey(ByteString.copyFrom(nextChainKey.getKey()))
+                                            .setIndex(nextChainKey.getIndex())
+                                            .build();
+
+    Chain chain = sessionStructure.getSenderChain().toBuilder()
+                                  .setChainKey(chainKey).build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder().setSenderChain(chain).build();
+  }
+
+  public boolean hasMessageKeys(ECPublicKey senderEphemeral, int counter) {
+    Pair<Chain,Integer> chainAndIndex = getReceiverChain(senderEphemeral);
+    Chain               chain         = chainAndIndex.first;
+
+    if (chain == null) {
+      return false;
+    }
+
+    List<Chain.MessageKey> messageKeyList = chain.getMessageKeysList();
+
+    for (Chain.MessageKey messageKey : messageKeyList) {
+      if (messageKey.getIndex() == counter) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  public MessageKeys removeMessageKeys(ECPublicKey senderEphemeral, int counter) {
+    Pair<Chain,Integer> chainAndIndex = getReceiverChain(senderEphemeral);
+    Chain               chain         = chainAndIndex.first;
+
+    if (chain == null) {
+      return null;
+    }
+
+    List<Chain.MessageKey>     messageKeyList     = new LinkedList<Chain.MessageKey>(chain.getMessageKeysList());
+    Iterator<Chain.MessageKey> messageKeyIterator = messageKeyList.iterator();
+    MessageKeys                result             = null;
+
+    while (messageKeyIterator.hasNext()) {
+      Chain.MessageKey messageKey = messageKeyIterator.next();
+
+      if (messageKey.getIndex() == counter) {
+        result = new MessageKeys(new SecretKeySpec(messageKey.getCipherKey().toByteArray(), "AES"),
+                                 new SecretKeySpec(messageKey.getMacKey().toByteArray(), "HmacSHA256"),
+                                 messageKey.getIndex());
+
+        messageKeyIterator.remove();
+        break;
+      }
+    }
+
+    Chain updatedChain = chain.toBuilder().clearMessageKeys()
+                              .addAllMessageKeys(messageKeyList)
+                              .build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setReceiverChains(chainAndIndex.second, updatedChain)
+                                                 .build();
+
+    return result;
+  }
+
+  public void setMessageKeys(ECPublicKey senderEphemeral, MessageKeys messageKeys) {
+    Pair<Chain,Integer> chainAndIndex       = getReceiverChain(senderEphemeral);
+    Chain               chain               = chainAndIndex.first;
+    Chain.MessageKey    messageKeyStructure = Chain.MessageKey.newBuilder()
+                                                              .setCipherKey(ByteString.copyFrom(messageKeys.getCipherKey().getEncoded()))
+                                                              .setMacKey(ByteString.copyFrom(messageKeys.getMacKey().getEncoded()))
+                                                              .setIndex(messageKeys.getCounter())
+                                                              .build();
+
+    Chain updatedChain = chain.toBuilder()
+                              .addMessageKeys(messageKeyStructure)
+                              .build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setReceiverChains(chainAndIndex.second, updatedChain)
+                                                 .build();
+  }
+
+  public void setReceiverChainKey(ECPublicKey senderEphemeral, ChainKey chainKey) {
+    Pair<Chain,Integer> chainAndIndex = getReceiverChain(senderEphemeral);
+    Chain               chain         = chainAndIndex.first;
+
+    Chain.ChainKey chainKeyStructure = Chain.ChainKey.newBuilder()
+                                                     .setKey(ByteString.copyFrom(chainKey.getKey()))
+                                                     .setIndex(chainKey.getIndex())
+                                                     .build();
+
+    Chain updatedChain = chain.toBuilder().setChainKey(chainKeyStructure).build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setReceiverChains(chainAndIndex.second, updatedChain)
+                                                 .build();
+  }
+
+  public void setPendingKeyExchange(int sequence,
+                                    ECKeyPair ourBaseKey,
+                                    ECKeyPair ourEphemeralKey,
+                                    IdentityKeyPair ourIdentityKey)
+  {
+    PendingKeyExchange structure =
+        PendingKeyExchange.newBuilder()
+                          .setSequence(sequence)
+                          .setLocalBaseKey(ByteString.copyFrom(ourBaseKey.getPublicKey().serialize()))
+                          .setLocalBaseKeyPrivate(ByteString.copyFrom(ourBaseKey.getPrivateKey().serialize()))
+                          .setLocalEphemeralKey(ByteString.copyFrom(ourEphemeralKey.getPublicKey().serialize()))
+                          .setLocalEphemeralKeyPrivate(ByteString.copyFrom(ourEphemeralKey.getPrivateKey().serialize()))
+                          .setLocalIdentityKey(ByteString.copyFrom(ourIdentityKey.getPublicKey().serialize()))
+                          .setLocalIdentityKeyPrivate(ByteString.copyFrom(ourIdentityKey.getPrivateKey().serialize()))
+                          .build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setPendingKeyExchange(structure)
+                                                 .build();
+  }
+
+  public int getPendingKeyExchangeSequence() {
+    return sessionStructure.getPendingKeyExchange().getSequence();
+  }
+
+  public ECKeyPair getPendingKeyExchangeBaseKey() throws InvalidKeyException {
+    ECPublicKey publicKey   = Curve.decodePoint(sessionStructure.getPendingKeyExchange()
+                                                                .getLocalBaseKey().toByteArray(), 0);
+
+    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getType(),
+                                                       sessionStructure.getPendingKeyExchange()
+                                                                       .getLocalBaseKeyPrivate()
+                                                                       .toByteArray());
+
+    return new ECKeyPair(publicKey, privateKey);
+  }
+
+  public ECKeyPair getPendingKeyExchangeEphemeralKey() throws InvalidKeyException {
+    ECPublicKey publicKey   = Curve.decodePoint(sessionStructure.getPendingKeyExchange()
+                                                                .getLocalEphemeralKey().toByteArray(), 0);
+
+    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getType(),
+                                                       sessionStructure.getPendingKeyExchange()
+                                                                       .getLocalEphemeralKeyPrivate()
+                                                                       .toByteArray());
+
+    return new ECKeyPair(publicKey, privateKey);
+  }
+
+  public IdentityKeyPair getPendingKeyExchangeIdentityKey() throws InvalidKeyException {
+    IdentityKey publicKey = new IdentityKey(sessionStructure.getPendingKeyExchange()
+                                                            .getLocalIdentityKey().toByteArray(), 0);
+
+    ECPrivateKey privateKey = Curve.decodePrivatePoint(publicKey.getPublicKey().getType(),
+                                                       sessionStructure.getPendingKeyExchange()
+                                                                       .getLocalIdentityKeyPrivate()
+                                                                       .toByteArray());
+
+    return new IdentityKeyPair(publicKey, privateKey);
+  }
+
+  public boolean hasPendingKeyExchange() {
+    return sessionStructure.hasPendingKeyExchange();
+  }
+
+  public void setPendingPreKey(int preKeyId, ECPublicKey baseKey) {
+    PendingPreKey pending = PendingPreKey.newBuilder()
+                                         .setPreKeyId(preKeyId)
+                                         .setBaseKey(ByteString.copyFrom(baseKey.serialize()))
+                                         .build();
+
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setPendingPreKey(pending)
+                                                 .build();
+  }
+
+  public boolean hasPendingPreKey() {
+    return this.sessionStructure.hasPendingPreKey();
+  }
+
+  public Pair<Integer, ECPublicKey> getPendingPreKey() {
+    try {
+      return new Pair<Integer, ECPublicKey>(sessionStructure.getPendingPreKey().getPreKeyId(),
+                                            Curve.decodePoint(sessionStructure.getPendingPreKey()
+                                                                              .getBaseKey()
+                                                                              .toByteArray(), 0));
+    } catch (InvalidKeyException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  public void clearPendingPreKey() {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .clearPendingPreKey()
+                                                 .build();
+  }
+
+  public void setRemoteRegistrationId(int registrationId) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setRemoteRegistrationId(registrationId)
+                                                 .build();
+  }
+
+  public int getRemoteRegistrationId() {
+    return this.sessionStructure.getRemoteRegistrationId();
+  }
+
+  public void setLocalRegistrationId(int registrationId) {
+    this.sessionStructure = this.sessionStructure.toBuilder()
+                                                 .setLocalRegistrationId(registrationId)
+                                                 .build();
+  }
+
+  public int getLocalRegistrationId() {
+    return this.sessionStructure.getLocalRegistrationId();
+  }
+
+  public byte[] serialize() {
+    return sessionStructure.toByteArray();
+  }
+}

library/src/org/whispersystems/textsecure/storage/StorageProtos.java

@@ -63,6 +63,10 @@ public final class StorageProtos {
     // optional uint32 localRegistrationId = 11;
     boolean hasLocalRegistrationId();
     int getLocalRegistrationId();
+    
+    // optional bool needsRefresh = 12;
+    boolean hasNeedsRefresh();
+    boolean getNeedsRefresh();
   }
   public static final class SessionStructure extends
       com.google.protobuf.GeneratedMessage
@@ -2992,6 +2996,16 @@ public final class StorageProtos {
       return localRegistrationId_;
     }
     
+    // optional bool needsRefresh = 12;
+    public static final int NEEDSREFRESH_FIELD_NUMBER = 12;
+    private boolean needsRefresh_;
+    public boolean hasNeedsRefresh() {
+      return ((bitField0_ & 0x00000400) == 0x00000400);
+    }
+    public boolean getNeedsRefresh() {
+      return needsRefresh_;
+    }
+    
     private void initFields() {
       sessionVersion_ = 0;
       localIdentityPublic_ = com.google.protobuf.ByteString.EMPTY;
@@ -3004,6 +3018,7 @@ public final class StorageProtos {
       pendingPreKey_ = org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.PendingPreKey.getDefaultInstance();
       remoteRegistrationId_ = 0;
       localRegistrationId_ = 0;
+      needsRefresh_ = false;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -3050,6 +3065,9 @@ public final class StorageProtos {
       if (((bitField0_ & 0x00000200) == 0x00000200)) {
         output.writeUInt32(11, localRegistrationId_);
       }
+      if (((bitField0_ & 0x00000400) == 0x00000400)) {
+        output.writeBool(12, needsRefresh_);
+      }
       getUnknownFields().writeTo(output);
     }
     
@@ -3103,6 +3121,10 @@ public final class StorageProtos {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(11, localRegistrationId_);
       }
+      if (((bitField0_ & 0x00000400) == 0x00000400)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, needsRefresh_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -3269,6 +3291,8 @@ public final class StorageProtos {
         bitField0_ = (bitField0_ & ~0x00000200);
         localRegistrationId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000400);
+        needsRefresh_ = false;
+        bitField0_ = (bitField0_ & ~0x00000800);
         return this;
       }
       
@@ -3368,6 +3392,10 @@ public final class StorageProtos {
           to_bitField0_ |= 0x00000200;
         }
         result.localRegistrationId_ = localRegistrationId_;
+        if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
+          to_bitField0_ |= 0x00000400;
+        }
+        result.needsRefresh_ = needsRefresh_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -3440,6 +3468,9 @@ public final class StorageProtos {
         if (other.hasLocalRegistrationId()) {
           setLocalRegistrationId(other.getLocalRegistrationId());
         }
+        if (other.hasNeedsRefresh()) {
+          setNeedsRefresh(other.getNeedsRefresh());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -3539,6 +3570,11 @@ public final class StorageProtos {
               localRegistrationId_ = input.readUInt32();
               break;
             }
+            case 96: {
+              bitField0_ |= 0x00000800;
+              needsRefresh_ = input.readBool();
+              break;
+            }
           }
         }
       }
@@ -4157,6 +4193,27 @@ public final class StorageProtos {
         return this;
       }
       
+      // optional bool needsRefresh = 12;
+      private boolean needsRefresh_ ;
+      public boolean hasNeedsRefresh() {
+        return ((bitField0_ & 0x00000800) == 0x00000800);
+      }
+      public boolean getNeedsRefresh() {
+        return needsRefresh_;
+      }
+      public Builder setNeedsRefresh(boolean value) {
+        bitField0_ |= 0x00000800;
+        needsRefresh_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearNeedsRefresh() {
+        bitField0_ = (bitField0_ & ~0x00000800);
+        needsRefresh_ = false;
+        onChanged();
+        return this;
+      }
+      
       // @@protoc_insertion_point(builder_scope:textsecure.SessionStructure)
     }
     
@@ -4168,6 +4225,703 @@ public final class StorageProtos {
     // @@protoc_insertion_point(class_scope:textsecure.SessionStructure)
   }
   
+  public interface RecordStructureOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+    
+    // optional .textsecure.SessionStructure currentSession = 1;
+    boolean hasCurrentSession();
+    org.whispersystems.textsecure.storage.StorageProtos.SessionStructure getCurrentSession();
+    org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder getCurrentSessionOrBuilder();
+    
+    // repeated .textsecure.SessionStructure previousSessions = 2;
+    java.util.List<org.whispersystems.textsecure.storage.StorageProtos.SessionStructure> 
+        getPreviousSessionsList();
+    org.whispersystems.textsecure.storage.StorageProtos.SessionStructure getPreviousSessions(int index);
+    int getPreviousSessionsCount();
+    java.util.List<? extends org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder> 
+        getPreviousSessionsOrBuilderList();
+    org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder getPreviousSessionsOrBuilder(
+        int index);
+  }
+  public static final class RecordStructure extends
+      com.google.protobuf.GeneratedMessage
+      implements RecordStructureOrBuilder {
+    // Use RecordStructure.newBuilder() to construct.
+    private RecordStructure(Builder builder) {
+      super(builder);
+    }
+    private RecordStructure(boolean noInit) {}
+    
+    private static final RecordStructure defaultInstance;
+    public static RecordStructure getDefaultInstance() {
+      return defaultInstance;
+    }
+    
+    public RecordStructure getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+    
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.whispersystems.textsecure.storage.StorageProtos.internal_static_textsecure_RecordStructure_descriptor;
+    }
+    
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.whispersystems.textsecure.storage.StorageProtos.internal_static_textsecure_RecordStructure_fieldAccessorTable;
+    }
+    
+    private int bitField0_;
+    // optional .textsecure.SessionStructure currentSession = 1;
+    public static final int CURRENTSESSION_FIELD_NUMBER = 1;
+    private org.whispersystems.textsecure.storage.StorageProtos.SessionStructure currentSession_;
+    public boolean hasCurrentSession() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure getCurrentSession() {
+      return currentSession_;
+    }
+    public org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder getCurrentSessionOrBuilder() {
+      return currentSession_;
+    }
+    
+    // repeated .textsecure.SessionStructure previousSessions = 2;
+    public static final int PREVIOUSSESSIONS_FIELD_NUMBER = 2;
+    private java.util.List<org.whispersystems.textsecure.storage.StorageProtos.SessionStructure> previousSessions_;
+    public java.util.List<org.whispersystems.textsecure.storage.StorageProtos.SessionStructure> getPreviousSessionsList() {
+      return previousSessions_;
+    }
+    public java.util.List<? extends org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder> 
+        getPreviousSessionsOrBuilderList() {
+      return previousSessions_;
+    }
+    public int getPreviousSessionsCount() {
+      return previousSessions_.size();
+    }
+    public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure getPreviousSessions(int index) {
+      return previousSessions_.get(index);
+    }
+    public org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder getPreviousSessionsOrBuilder(
+        int index) {
+      return previousSessions_.get(index);
+    }
+    
+    private void initFields() {
+      currentSession_ = org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.getDefaultInstance();
+      previousSessions_ = java.util.Collections.emptyList();
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+      
+      memoizedIsInitialized = 1;
+      return true;
+    }
+    
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeMessage(1, currentSession_);
+      }
+      for (int i = 0; i < previousSessions_.size(); i++) {
+        output.writeMessage(2, previousSessions_.get(i));
+      }
+      getUnknownFields().writeTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+    
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, currentSession_);
+      }
+      for (int i = 0; i < previousSessions_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, previousSessions_.get(i));
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+    
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+    
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data).buildParsed();
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data).buildParsed();
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static org.whispersystems.textsecure.storage.StorageProtos.RecordStructure parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(org.whispersystems.textsecure.storage.StorageProtos.RecordStructure prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+    
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.whispersystems.textsecure.storage.StorageProtos.RecordStructureOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.whispersystems.textsecure.storage.StorageProtos.internal_static_textsecure_RecordStructure_descriptor;
+      }
+      
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.whispersystems.textsecure.storage.StorageProtos.internal_static_textsecure_RecordStructure_fieldAccessorTable;
+      }
+      
+      // Construct using org.whispersystems.textsecure.storage.StorageProtos.RecordStructure.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+      
+      private Builder(BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getCurrentSessionFieldBuilder();
+          getPreviousSessionsFieldBuilder();
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+      
+      public Builder clear() {
+        super.clear();
+        if (currentSessionBuilder_ == null) {
+          currentSession_ = org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.getDefaultInstance();
+        } else {
+          currentSessionBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        if (previousSessionsBuilder_ == null) {
+          previousSessions_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          previousSessionsBuilder_.clear();
+        }
+        return this;
+      }
+      
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+      
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.whispersystems.textsecure.storage.StorageProtos.RecordStructure.getDescriptor();
+      }
+      
+      public org.whispersystems.textsecure.storage.StorageProtos.RecordStructure getDefaultInstanceForType() {
+        return org.whispersystems.textsecure.storage.StorageProtos.RecordStructure.getDefaultInstance();
+      }
+      
+      public org.whispersystems.textsecure.storage.StorageProtos.RecordStructure build() {
+        org.whispersystems.textsecure.storage.StorageProtos.RecordStructure result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+      
+      private org.whispersystems.textsecure.storage.StorageProtos.RecordStructure buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        org.whispersystems.textsecure.storage.StorageProtos.RecordStructure result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
+      public org.whispersystems.textsecure.storage.StorageProtos.RecordStructure buildPartial() {
+        org.whispersystems.textsecure.storage.StorageProtos.RecordStructure result = new org.whispersystems.textsecure.storage.StorageProtos.RecordStructure(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        if (currentSessionBuilder_ == null) {
+          result.currentSession_ = currentSession_;
+        } else {
+          result.currentSession_ = currentSessionBuilder_.build();
+        }
+        if (previousSessionsBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) == 0x00000002)) {
+            previousSessions_ = java.util.Collections.unmodifiableList(previousSessions_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.previousSessions_ = previousSessions_;
+        } else {
+          result.previousSessions_ = previousSessionsBuilder_.build();
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+      
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.whispersystems.textsecure.storage.StorageProtos.RecordStructure) {
+          return mergeFrom((org.whispersystems.textsecure.storage.StorageProtos.RecordStructure)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+      
+      public Builder mergeFrom(org.whispersystems.textsecure.storage.StorageProtos.RecordStructure other) {
+        if (other == org.whispersystems.textsecure.storage.StorageProtos.RecordStructure.getDefaultInstance()) return this;
+        if (other.hasCurrentSession()) {
+          mergeCurrentSession(other.getCurrentSession());
+        }
+        if (previousSessionsBuilder_ == null) {
+          if (!other.previousSessions_.isEmpty()) {
+            if (previousSessions_.isEmpty()) {
+              previousSessions_ = other.previousSessions_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensurePreviousSessionsIsMutable();
+              previousSessions_.addAll(other.previousSessions_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.previousSessions_.isEmpty()) {
+            if (previousSessionsBuilder_.isEmpty()) {
+              previousSessionsBuilder_.dispose();
+              previousSessionsBuilder_ = null;
+              previousSessions_ = other.previousSessions_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              previousSessionsBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getPreviousSessionsFieldBuilder() : null;
+            } else {
+              previousSessionsBuilder_.addAllMessages(other.previousSessions_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+      
+      public final boolean isInitialized() {
+        return true;
+      }
+      
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder(
+            this.getUnknownFields());
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              this.setUnknownFields(unknownFields.build());
+              onChanged();
+              return this;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                this.setUnknownFields(unknownFields.build());
+                onChanged();
+                return this;
+              }
+              break;
+            }
+            case 10: {
+              org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder subBuilder = org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.newBuilder();
+              if (hasCurrentSession()) {
+                subBuilder.mergeFrom(getCurrentSession());
+              }
+              input.readMessage(subBuilder, extensionRegistry);
+              setCurrentSession(subBuilder.buildPartial());
+              break;
+            }
+            case 18: {
+              org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder subBuilder = org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.newBuilder();
+              input.readMessage(subBuilder, extensionRegistry);
+              addPreviousSessions(subBuilder.buildPartial());
+              break;
+            }
+          }
+        }
+      }
+      
+      private int bitField0_;
+      
+      // optional .textsecure.SessionStructure currentSession = 1;
+      private org.whispersystems.textsecure.storage.StorageProtos.SessionStructure currentSession_ = org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          org.whispersystems.textsecure.storage.StorageProtos.SessionStructure, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder, org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder> currentSessionBuilder_;
+      public boolean hasCurrentSession() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure getCurrentSession() {
+        if (currentSessionBuilder_ == null) {
+          return currentSession_;
+        } else {
+          return currentSessionBuilder_.getMessage();
+        }
+      }
+      public Builder setCurrentSession(org.whispersystems.textsecure.storage.StorageProtos.SessionStructure value) {
+        if (currentSessionBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          currentSession_ = value;
+          onChanged();
+        } else {
+          currentSessionBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      public Builder setCurrentSession(
+          org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder builderForValue) {
+        if (currentSessionBuilder_ == null) {
+          currentSession_ = builderForValue.build();
+          onChanged();
+        } else {
+          currentSessionBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      public Builder mergeCurrentSession(org.whispersystems.textsecure.storage.StorageProtos.SessionStructure value) {
+        if (currentSessionBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) == 0x00000001) &&
+              currentSession_ != org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.getDefaultInstance()) {
+            currentSession_ =
+              org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.newBuilder(currentSession_).mergeFrom(value).buildPartial();
+          } else {
+            currentSession_ = value;
+          }
+          onChanged();
+        } else {
+          currentSessionBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      public Builder clearCurrentSession() {
+        if (currentSessionBuilder_ == null) {
+          currentSession_ = org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.getDefaultInstance();
+          onChanged();
+        } else {
+          currentSessionBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder getCurrentSessionBuilder() {
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return getCurrentSessionFieldBuilder().getBuilder();
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder getCurrentSessionOrBuilder() {
+        if (currentSessionBuilder_ != null) {
+          return currentSessionBuilder_.getMessageOrBuilder();
+        } else {
+          return currentSession_;
+        }
+      }
+      private com.google.protobuf.SingleFieldBuilder<
+          org.whispersystems.textsecure.storage.StorageProtos.SessionStructure, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder, org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder> 
+          getCurrentSessionFieldBuilder() {
+        if (currentSessionBuilder_ == null) {
+          currentSessionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              org.whispersystems.textsecure.storage.StorageProtos.SessionStructure, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder, org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder>(
+                  currentSession_,
+                  getParentForChildren(),
+                  isClean());
+          currentSession_ = null;
+        }
+        return currentSessionBuilder_;
+      }
+      
+      // repeated .textsecure.SessionStructure previousSessions = 2;
+      private java.util.List<org.whispersystems.textsecure.storage.StorageProtos.SessionStructure> previousSessions_ =
+        java.util.Collections.emptyList();
+      private void ensurePreviousSessionsIsMutable() {
+        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+          previousSessions_ = new java.util.ArrayList<org.whispersystems.textsecure.storage.StorageProtos.SessionStructure>(previousSessions_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      
+      private com.google.protobuf.RepeatedFieldBuilder<
+          org.whispersystems.textsecure.storage.StorageProtos.SessionStructure, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder, org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder> previousSessionsBuilder_;
+      
+      public java.util.List<org.whispersystems.textsecure.storage.StorageProtos.SessionStructure> getPreviousSessionsList() {
+        if (previousSessionsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(previousSessions_);
+        } else {
+          return previousSessionsBuilder_.getMessageList();
+        }
+      }
+      public int getPreviousSessionsCount() {
+        if (previousSessionsBuilder_ == null) {
+          return previousSessions_.size();
+        } else {
+          return previousSessionsBuilder_.getCount();
+        }
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure getPreviousSessions(int index) {
+        if (previousSessionsBuilder_ == null) {
+          return previousSessions_.get(index);
+        } else {
+          return previousSessionsBuilder_.getMessage(index);
+        }
+      }
+      public Builder setPreviousSessions(
+          int index, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure value) {
+        if (previousSessionsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePreviousSessionsIsMutable();
+          previousSessions_.set(index, value);
+          onChanged();
+        } else {
+          previousSessionsBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      public Builder setPreviousSessions(
+          int index, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder builderForValue) {
+        if (previousSessionsBuilder_ == null) {
+          ensurePreviousSessionsIsMutable();
+          previousSessions_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          previousSessionsBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      public Builder addPreviousSessions(org.whispersystems.textsecure.storage.StorageProtos.SessionStructure value) {
+        if (previousSessionsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePreviousSessionsIsMutable();
+          previousSessions_.add(value);
+          onChanged();
+        } else {
+          previousSessionsBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      public Builder addPreviousSessions(
+          int index, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure value) {
+        if (previousSessionsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePreviousSessionsIsMutable();
+          previousSessions_.add(index, value);
+          onChanged();
+        } else {
+          previousSessionsBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      public Builder addPreviousSessions(
+          org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder builderForValue) {
+        if (previousSessionsBuilder_ == null) {
+          ensurePreviousSessionsIsMutable();
+          previousSessions_.add(builderForValue.build());
+          onChanged();
+        } else {
+          previousSessionsBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      public Builder addPreviousSessions(
+          int index, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder builderForValue) {
+        if (previousSessionsBuilder_ == null) {
+          ensurePreviousSessionsIsMutable();
+          previousSessions_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          previousSessionsBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      public Builder addAllPreviousSessions(
+          java.lang.Iterable<? extends org.whispersystems.textsecure.storage.StorageProtos.SessionStructure> values) {
+        if (previousSessionsBuilder_ == null) {
+          ensurePreviousSessionsIsMutable();
+          super.addAll(values, previousSessions_);
+          onChanged();
+        } else {
+          previousSessionsBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      public Builder clearPreviousSessions() {
+        if (previousSessionsBuilder_ == null) {
+          previousSessions_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          previousSessionsBuilder_.clear();
+        }
+        return this;
+      }
+      public Builder removePreviousSessions(int index) {
+        if (previousSessionsBuilder_ == null) {
+          ensurePreviousSessionsIsMutable();
+          previousSessions_.remove(index);
+          onChanged();
+        } else {
+          previousSessionsBuilder_.remove(index);
+        }
+        return this;
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder getPreviousSessionsBuilder(
+          int index) {
+        return getPreviousSessionsFieldBuilder().getBuilder(index);
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder getPreviousSessionsOrBuilder(
+          int index) {
+        if (previousSessionsBuilder_ == null) {
+          return previousSessions_.get(index);  } else {
+          return previousSessionsBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      public java.util.List<? extends org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder> 
+           getPreviousSessionsOrBuilderList() {
+        if (previousSessionsBuilder_ != null) {
+          return previousSessionsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(previousSessions_);
+        }
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder addPreviousSessionsBuilder() {
+        return getPreviousSessionsFieldBuilder().addBuilder(
+            org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.getDefaultInstance());
+      }
+      public org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder addPreviousSessionsBuilder(
+          int index) {
+        return getPreviousSessionsFieldBuilder().addBuilder(
+            index, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.getDefaultInstance());
+      }
+      public java.util.List<org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder> 
+           getPreviousSessionsBuilderList() {
+        return getPreviousSessionsFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilder<
+          org.whispersystems.textsecure.storage.StorageProtos.SessionStructure, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder, org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder> 
+          getPreviousSessionsFieldBuilder() {
+        if (previousSessionsBuilder_ == null) {
+          previousSessionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              org.whispersystems.textsecure.storage.StorageProtos.SessionStructure, org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder, org.whispersystems.textsecure.storage.StorageProtos.SessionStructureOrBuilder>(
+                  previousSessions_,
+                  ((bitField0_ & 0x00000002) == 0x00000002),
+                  getParentForChildren(),
+                  isClean());
+          previousSessions_ = null;
+        }
+        return previousSessionsBuilder_;
+      }
+      
+      // @@protoc_insertion_point(builder_scope:textsecure.RecordStructure)
+    }
+    
+    static {
+      defaultInstance = new RecordStructure(true);
+      defaultInstance.initFields();
+    }
+    
+    // @@protoc_insertion_point(class_scope:textsecure.RecordStructure)
+  }
+  
   public interface PreKeyRecordStructureOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
@@ -4656,6 +5410,11 @@ public final class StorageProtos {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_textsecure_SessionStructure_PendingPreKey_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_textsecure_RecordStructure_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_textsecure_RecordStructure_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_textsecure_PreKeyRecordStructure_descriptor;
   private static
@@ -4671,7 +5430,7 @@ public final class StorageProtos {
   static {
     java.lang.String[] descriptorData = {
       "\n\032LocalStorageProtocol.proto\022\ntextsecure" +
-      "\"\205\010\n\020SessionStructure\022\026\n\016sessionVersion\030" +
+      "\"\233\010\n\020SessionStructure\022\026\n\016sessionVersion\030" +
       "\001 \001(\r\022\033\n\023localIdentityPublic\030\002 \001(\014\022\034\n\024re" +
       "moteIdentityPublic\030\003 \001(\014\022\017\n\007rootKey\030\004 \001(" +
       "\014\022\027\n\017previousCounter\030\005 \001(\r\0227\n\013senderChai" +
@@ -4682,25 +5441,28 @@ public final class StorageProtos {
       "e.PendingKeyExchange\022A\n\rpendingPreKey\030\t ",
       "\001(\0132*.textsecure.SessionStructure.Pendin" +
       "gPreKey\022\034\n\024remoteRegistrationId\030\n \001(\r\022\033\n" +
-      "\023localRegistrationId\030\013 \001(\r\032\253\002\n\005Chain\022\027\n\017" +
-      "senderEphemeral\030\001 \001(\014\022\036\n\026senderEphemeral" +
-      "Private\030\002 \001(\014\022=\n\010chainKey\030\003 \001(\0132+.textse" +
-      "cure.SessionStructure.Chain.ChainKey\022B\n\013" +
-      "messageKeys\030\004 \003(\0132-.textsecure.SessionSt" +
-      "ructure.Chain.MessageKey\032&\n\010ChainKey\022\r\n\005" +
-      "index\030\001 \001(\r\022\013\n\003key\030\002 \001(\014\032>\n\nMessageKey\022\r" +
-      "\n\005index\030\001 \001(\r\022\021\n\tcipherKey\030\002 \001(\014\022\016\n\006macK",
-      "ey\030\003 \001(\014\032\321\001\n\022PendingKeyExchange\022\020\n\010seque" +
-      "nce\030\001 \001(\r\022\024\n\014localBaseKey\030\002 \001(\014\022\033\n\023local" +
-      "BaseKeyPrivate\030\003 \001(\014\022\031\n\021localEphemeralKe" +
-      "y\030\004 \001(\014\022 \n\030localEphemeralKeyPrivate\030\005 \001(" +
-      "\014\022\030\n\020localIdentityKey\030\007 \001(\014\022\037\n\027localIden" +
-      "tityKeyPrivate\030\010 \001(\014\0322\n\rPendingPreKey\022\020\n" +
-      "\010preKeyId\030\001 \001(\r\022\017\n\007baseKey\030\002 \001(\014\"J\n\025PreK" +
-      "eyRecordStructure\022\n\n\002id\030\001 \001(\r\022\021\n\tpublicK" +
-      "ey\030\002 \001(\014\022\022\n\nprivateKey\030\003 \001(\014B6\n%org.whis" +
-      "persystems.textsecure.storageB\rStoragePr",
-      "otos"
+      "\023localRegistrationId\030\013 \001(\r\022\024\n\014needsRefre" +
+      "sh\030\014 \001(\010\032\253\002\n\005Chain\022\027\n\017senderEphemeral\030\001 " +
+      "\001(\014\022\036\n\026senderEphemeralPrivate\030\002 \001(\014\022=\n\010c" +
+      "hainKey\030\003 \001(\0132+.textsecure.SessionStruct" +
+      "ure.Chain.ChainKey\022B\n\013messageKeys\030\004 \003(\0132" +
+      "-.textsecure.SessionStructure.Chain.Mess" +
+      "ageKey\032&\n\010ChainKey\022\r\n\005index\030\001 \001(\r\022\013\n\003key" +
+      "\030\002 \001(\014\032>\n\nMessageKey\022\r\n\005index\030\001 \001(\r\022\021\n\tc",
+      "ipherKey\030\002 \001(\014\022\016\n\006macKey\030\003 \001(\014\032\321\001\n\022Pendi" +
+      "ngKeyExchange\022\020\n\010sequence\030\001 \001(\r\022\024\n\014local" +
+      "BaseKey\030\002 \001(\014\022\033\n\023localBaseKeyPrivate\030\003 \001" +
+      "(\014\022\031\n\021localEphemeralKey\030\004 \001(\014\022 \n\030localEp" +
+      "hemeralKeyPrivate\030\005 \001(\014\022\030\n\020localIdentity" +
+      "Key\030\007 \001(\014\022\037\n\027localIdentityKeyPrivate\030\010 \001" +
+      "(\014\0322\n\rPendingPreKey\022\020\n\010preKeyId\030\001 \001(\r\022\017\n" +
+      "\007baseKey\030\002 \001(\014\"\177\n\017RecordStructure\0224\n\016cur" +
+      "rentSession\030\001 \001(\0132\034.textsecure.SessionSt" +
+      "ructure\0226\n\020previousSessions\030\002 \003(\0132\034.text",
+      "secure.SessionStructure\"J\n\025PreKeyRecordS" +
+      "tructure\022\n\n\002id\030\001 \001(\r\022\021\n\tpublicKey\030\002 \001(\014\022" +
+      "\022\n\nprivateKey\030\003 \001(\014B6\n%org.whispersystem" +
+      "s.textsecure.storageB\rStorageProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -4712,7 +5474,7 @@ public final class StorageProtos {
           internal_static_textsecure_SessionStructure_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_SessionStructure_descriptor,
-              new java.lang.String[] { "SessionVersion", "LocalIdentityPublic", "RemoteIdentityPublic", "RootKey", "PreviousCounter", "SenderChain", "ReceiverChains", "PendingKeyExchange", "PendingPreKey", "RemoteRegistrationId", "LocalRegistrationId", },
+              new java.lang.String[] { "SessionVersion", "LocalIdentityPublic", "RemoteIdentityPublic", "RootKey", "PreviousCounter", "SenderChain", "ReceiverChains", "PendingKeyExchange", "PendingPreKey", "RemoteRegistrationId", "LocalRegistrationId", "NeedsRefresh", },
               org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.class,
               org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.Builder.class);
           internal_static_textsecure_SessionStructure_Chain_descriptor =
@@ -4755,8 +5517,16 @@ public final class StorageProtos {
               new java.lang.String[] { "PreKeyId", "BaseKey", },
               org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.PendingPreKey.class,
               org.whispersystems.textsecure.storage.StorageProtos.SessionStructure.PendingPreKey.Builder.class);
-          internal_static_textsecure_PreKeyRecordStructure_descriptor =
+          internal_static_textsecure_RecordStructure_descriptor =
             getDescriptor().getMessageTypes().get(1);
+          internal_static_textsecure_RecordStructure_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_textsecure_RecordStructure_descriptor,
+              new java.lang.String[] { "CurrentSession", "PreviousSessions", },
+              org.whispersystems.textsecure.storage.StorageProtos.RecordStructure.class,
+              org.whispersystems.textsecure.storage.StorageProtos.RecordStructure.Builder.class);
+          internal_static_textsecure_PreKeyRecordStructure_descriptor =
+            getDescriptor().getMessageTypes().get(2);
           internal_static_textsecure_PreKeyRecordStructure_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_textsecure_PreKeyRecordStructure_descriptor,

library/src/org/whispersystems/textsecure/util/BlacklistingTrustManager.java

@@ -0,0 +1,87 @@
+/**
+ * Copyright (C) 2014 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.whispersystems.textsecure.util;
+
+import java.math.BigInteger;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+/**
+ * Trust manager that defers to a system X509 trust manager, and
+ * additionally rejects certificates if they have a blacklisted
+ * serial.
+ *
+ * @author Moxie Marlinspike
+ */
+public class BlacklistingTrustManager implements X509TrustManager {
+
+  private static final List<BigInteger> BLACKLIST = new LinkedList<BigInteger>() {{
+    add(new BigInteger("4098"));
+  }};
+
+  public static TrustManager[] createFor(TrustManager[] trustManagers) {
+    for (TrustManager trustManager : trustManagers) {
+      if (trustManager instanceof X509TrustManager) {
+        TrustManager[] results = new BlacklistingTrustManager[1];
+        results[0] = new BlacklistingTrustManager((X509TrustManager)trustManager);
+
+        return results;
+      }
+    }
+
+    throw new AssertionError("No X509 Trust Managers!");
+  }
+
+  private final X509TrustManager trustManager;
+
+  public BlacklistingTrustManager(X509TrustManager trustManager) {
+    this.trustManager = trustManager;
+  }
+
+  @Override
+  public void checkClientTrusted(X509Certificate[] chain, String authType)
+      throws CertificateException
+  {
+    trustManager.checkClientTrusted(chain, authType);
+  }
+
+  @Override
+  public void checkServerTrusted(X509Certificate[] chain, String authType)
+      throws CertificateException
+  {
+    trustManager.checkServerTrusted(chain, authType);
+
+    for (X509Certificate certificate : chain) {
+      for (BigInteger blacklistedSerial : BLACKLIST) {
+        if (certificate.getSerialNumber().equals(blacklistedSerial)) {
+          throw new CertificateException("Blacklisted Serial: " + certificate.getSerialNumber());
+        }
+      }
+    }
+
+  }
+
+  @Override
+  public X509Certificate[] getAcceptedIssuers() {
+    return trustManager.getAcceptedIssuers();
+  }
+}

res/anim/fade_scale_in.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+    <scale
+        android:duration="150"
+        android:fromXScale="0.85"
+        android:fromYScale="0.85"
+        android:toXScale="1.0"
+        android:toYScale="1.0"
+        android:pivotX="50%"
+        android:pivotY="50%" />
+    <alpha
+        android:duration="150"
+        android:fromAlpha="0.6"
+        android:toAlpha="1.0" />
+</set>

res/anim/fade_scale_out.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+    <scale
+        android:duration="150"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:toXScale="0.85"
+        android:toYScale="0.85"
+        android:pivotX="50%"
+        android:pivotY="50%" />
+    <alpha
+        android:duration="150"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.6" />
+</set>

res/anim/slide_from_right.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:anim/decelerate_interpolator">
+    <translate
+        android:duration="150"
+        android:fromXDelta="100%"
+        android:toXDelta="0%" />
+</set>

res/anim/slide_to_right.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:anim/decelerate_interpolator">
+    <translate
+        android:duration="150"
+        android:fromXDelta="0%"
+        android:toXDelta="100%" />
+</set>

res/drawable/share_list_divider_shape.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/conversation_list_item_background_read_light" />
+        </shape>
+    </item>
+    <item android:left="73dp" android:right="10dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/conversation_list_divider_light" />
+        </shape>
+    </item>
+</layer-list>

res/drawable/share_list_divider_shape_dark.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/conversation_list_item_background_read_dark" />
+        </shape>
+    </item>
+    <item android:left="73dp" android:right="10dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/conversation_list_divider_dark" />
+        </shape>
+    </item>
+</layer-list>

res/drawable/textlines.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#33000000" />
+        </shape>
+    </item>
+
+    <item android:bottom="1dp">
+        <shape
+            android:shape="rectangle">
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/textlines_dark.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#33ffffff" />
+        </shape>
+    </item>
+
+    <item android:bottom="1dp">
+        <shape
+            android:shape="rectangle">
+            <solid android:color="@color/black" />
+        </shape>
+    </item>
+
+</layer-list>

res/layout/conversation_activity.xml

@@ -6,12 +6,6 @@
     android:background="?conversation_background"
     android:orientation="vertical">
 
-    <org.thoughtcrime.securesms.components.RecipientsPanel
-            android:id="@+id/recipients"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
     <RelativeLayout
             android:id="@+id/layout_container"
             android:layout_width="fill_parent"
@@ -111,7 +105,7 @@
                     android:contentDescription="@string/conversation_activity__send"
                     android:nextFocusLeft="@+id/embedded_text_editor"
                     android:padding="12dp"
-                    android:src="?conversation_send_button"
+                    android:src="?conversation_send_button_sms_insecure"
                     android:clickable="false"
                     android:enabled="false" />
 

res/layout/conversation_item_received.xml

@@ -48,47 +48,37 @@
             android:background="?conversation_item_received_background"
             android:orientation="vertical">
 
-            <LinearLayout
+            <TextView android:id="@+id/conversation_item_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="5dip"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:orientation="horizontal">
-                <ImageView android:id="@+id/key_exchange_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_menu_login"
-                    android:contentDescription="Key Exchange Indicator"
-                    android:visibility="gone" />
-                <TextView android:id="@+id/conversation_item_body"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?conversation_received_text_primary_color"
-                    android:textSize="16sp"
-                    android:autoLink="all"
-                    android:linksClickable="true" />
-            </LinearLayout>
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?conversation_received_text_primary_color"
+                android:textSize="16sp"
+                android:autoLink="all"
+                android:linksClickable="true" />
 
             <FrameLayout android:id="@+id/mms_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone">
+
                 <ImageView android:id="@+id/image_view"
                     android:layout_width="230dip"
                     android:layout_height="174dip"
                     android:layout_gravity="center"
                     android:scaleType="centerInside"
                     android:adjustViewBounds="true"
-                    android:contentDescription="Message Media"
+                    android:contentDescription="@string/conversation_item__mms_image_description"
                     android:visibility="gone" />
                 <ImageButton android:id="@+id/play_slideshow_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:src="@drawable/mms_play_btn"
-                    android:contentDescription="Play Button"
+                    android:contentDescription="@string/conversation_item__play_button_description"
                     android:visibility="gone" />
             </FrameLayout>
 
@@ -130,7 +120,7 @@
                     android:layout_height="wrap_content"
                     android:paddingRight="3dip"
                     android:src="?conversation_delivered_indicator"
-                    android:contentDescription="Delivered Indicator"
+                    android:contentDescription="@string/conversation_item_sent__delivered_description"
                     android:visibility="gone" />
 
                 <ImageView android:id="@+id/sms_secure_indicator"
@@ -140,7 +130,7 @@
                     android:paddingRight="4dp"
                     android:paddingTop="2dp"
                     android:src="?menu_lock_icon_small"
-                    android:contentDescription="Secure Message Indicator"
+                    android:contentDescription="@string/conversation_item__secure_message_description"
                     android:visibility="gone" />
 
                 <TextView android:id="@+id/conversation_item_date"
@@ -168,7 +158,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_list_alert_sms_failed"
-                android:contentDescription="Send Failed Indicator"
+                android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description"
                 android:visibility="gone" />
         </LinearLayout>
 

res/layout/conversation_item_sent.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_list_alert_sms_failed"
                 android:visibility="gone"
-                android:contentDescription="Send Failed Indicator"/>
+                android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description"/>
 
             <ImageView
                 android:id="@+id/pending_approval_indicator"
@@ -38,7 +38,7 @@
                 android:src="@drawable/ic_dialog_info_holo_light"
                 android:visibility="gone"
                 android:layout_gravity="center_vertical"
-                android:contentDescription="Pending Approval"/>
+                android:contentDescription="@string/conversation_item_sent__pending_approval_description"/>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/conversation_item_parent"
@@ -52,30 +52,16 @@
                       android:layout_marginRight="12dp"
                       android:orientation="vertical">
 
-            <LinearLayout android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:orientation="horizontal"
-                          android:paddingTop="5dip">
-
-                <TextView android:id="@+id/conversation_item_body"
-                    android:autoLink="all"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:linksClickable="true"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:gravity="right"
-                    android:textColor="?conversation_sent_text_primary_color"
-                    android:textColorLink="?conversation_sent_text_primary_color"
-                    android:textSize="16sp" />
-
-                <ImageView
-                    android:id="@+id/key_exchange_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_menu_login"
-                    android:visibility="gone"
-                    android:contentDescription="Key Exchange Indicator"/>
-            </LinearLayout>
+            <TextView android:id="@+id/conversation_item_body"
+                android:autoLink="all"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dip"
+                android:linksClickable="true"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?conversation_sent_text_primary_color"
+                android:textColorLink="?conversation_sent_text_primary_color"
+                android:textSize="16sp" />
 
             <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/mms_view"
@@ -91,7 +77,7 @@
                         android:scaleType="centerInside"
                         android:adjustViewBounds="true"
                         android:visibility="gone"
-                        android:contentDescription="Media Message"/>
+                        android:contentDescription="@string/conversation_item__mms_image_description"/>
 
                 <ImageButton
                     android:id="@+id/play_slideshow_button"
@@ -100,7 +86,7 @@
                     android:src="@drawable/mms_play_btn"
                     android:layout_gravity="center"
                     android:visibility="gone"
-                    android:contentDescription="Play Button"/>
+                    android:contentDescription="@string/conversation_item__play_button_description"/>
 
             </FrameLayout>
 
@@ -140,7 +126,7 @@
                          android:paddingRight="3dip"
                          android:src="?conversation_delivered_indicator"
                          android:visibility="gone"
-                         android:contentDescription="Delivered Indicator"/>
+                         android:contentDescription="@string/conversation_item_sent__delivered_description"/>
 
 		      <TextView android:id="@+id/group_message_status"
 		                android:layout_width="wrap_content"
@@ -175,7 +161,7 @@
                     android:visibility="gone"
                     android:paddingLeft="4dp"
                     android:paddingBottom="3dp"
-                    android:contentDescription="Secure Message Indicator" />
+                    android:contentDescription="@string/conversation_item__secure_message_description" />
 
             </LinearLayout>
 
@@ -189,17 +175,6 @@
             android:layout_alignParentRight="true"
             />
 
-        <ImageView  xmlns:android="http://schemas.android.com/apk/res/android"
-               android:id="@id/contact_photo"
-               android:layout_alignParentRight="true"
-               android:layout_width="40dp"
-               android:layout_height="40dp"
-               android:cropToPadding="true"
-               android:layout_marginRight="0dip"
-               android:padding="0dip"
-               android:scaleType="centerCrop"
-               android:visibility="gone" />
-
         <TextView android:id="@+id/indicator_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

res/layout/conversation_list_fragment.xml

@@ -7,7 +7,7 @@
 
         <ListView android:id="@android:id/list"
                   android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
+                  android:layout_height="match_parent"
                   android:drawSelectorOnTop="false"
                   android:scrollbarStyle="insideOverlay"
                   android:fadingEdgeLength="16dip"

res/layout/new_conversation_activity.xml

@@ -8,9 +8,9 @@
     <fragment
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:id="@+id/contact_selection_list_fragment"
-        android:name="org.thoughtcrime.securesms.SingleContactSelectionListFragment">
+        android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
         </fragment>
 
 </LinearLayout>

res/layout/push_contact_selection_activity.xml

@@ -8,7 +8,7 @@
     <fragment
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:id="@+id/contact_selection_list_fragment"
         android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
         </fragment>

res/layout/push_contact_selection_list_activity.xml

@@ -1,20 +1,31 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <ListView android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:fastScrollEnabled="true" />
+    <EditText android:id="@+id/filter"
+        android:inputType="textPersonName"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/recipients_panel__to"
+        android:paddingRight="45dip"
+        android:paddingLeft="15dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:textColor="?conversation_editor_text_color"
+        android:background="?conversation_editor_background" />
+
+    <se.emilsjolander.stickylistheaders.StickyListHeadersListView android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
     <TextView android:id="@android:id/empty"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center|center_vertical"
-            android:layout_marginTop="15dp"
-            android:text="@string/contact_selection_group_activity__finding_contacts"
-            android:textSize="20sp" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center|center_vertical"
+        android:layout_marginTop="15dp"
+        android:text="@string/contact_selection_group_activity__finding_contacts"
+        android:textSize="20sp" />
 
 </LinearLayout>

res/layout/push_contact_selection_list_header.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="32sp"
+    android:paddingLeft="10dp"
+    android:paddingRight="25dp">
+
+    <TextView android:id="@+id/text"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="marquee"
+              android:layout_centerVertical="true"
+              android:layout_alignParentLeft="true"
+              android:textSize="15sp"
+              android:textColor="?conversation_sent_text_secondary_color"
+              android:textStyle="bold" />
+
+    <View android:layout_width="match_parent"
+          android:layout_height="3dp"
+          android:layout_alignParentBottom="true"
+          android:layout_marginTop="2dp"
+          android:background="?conversation_received_text_secondary_color" />
+</RelativeLayout>

res/layout/push_contact_selection_list_item.xml

@@ -1,65 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:paddingRight="25dip">
 
-    <View android:id="@+id/push_support_label"
-          android:layout_height="fill_parent"
-          android:layout_width="3dip"
-          android:layout_alignParentLeft="true"
-          android:background="#ff64a926"
-          android:visibility="visible"
-          />
-
-    <TextView android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <ImageView android:id="@+id/contact_photo_image"
+        android:layout_width="@dimen/contact_selection_photo_size"
+        android:layout_height="@dimen/contact_selection_photo_size"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="8dip"
-        android:layout_marginTop="-8dip"
-        android:layout_marginLeft="14dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textStyle="bold"
-        android:visibility = "gone"
-    />
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="10dp"
+        android:cropToPadding="true"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
 
     <TextView android:id="@+id/number"
-    	android:visibility = "visible"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dip"
         android:layout_marginTop="-8dip"
         android:layout_marginLeft="14dip"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentBottom="true"
         android:singleLine="true"
         android:ellipsize="marquee"
+        android:layout_toRightOf="@id/contact_photo_image"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:fontFamily="sans-serif-light"
-    />
+        android:fontFamily="sans-serif-light" />
 
     <TextView android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/number"
         android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
         android:layout_marginBottom="1dip"
         android:layout_marginLeft="14dip"
 	    android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:singleLine="true"
         android:ellipsize="marquee"
+        android:layout_toRightOf="@id/contact_photo_image"
         android:gravity="center_vertical|left"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-    />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <CheckBox
-        android:id="@+id/check_box"
+    <CheckBox android:id="@+id/check_box"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"

res/layout/share_activity.xml

@@ -0,0 +1,13 @@
+<?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">
+
+    <fragment android:id="@+id/fragment_content"
+        android:name="org.thoughtcrime.securesms.ShareFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>

res/layout/share_fragment.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
+
+        <ListView android:id="@android:id/list"
+                  android:layout_width="fill_parent"
+                  android:layout_height="match_parent"
+                  android:drawSelectorOnTop="false"
+                  android:scrollbarStyle="insideOverlay"
+                  android:fadingEdgeLength="16dip"
+                  android:divider="?share_list_item_divider"
+                  android:dividerHeight="1px" />
+
+</LinearLayout>

res/layout/share_list_item_view.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.ShareListItem
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    <org.thoughtcrime.securesms.components.ForegroundImageView
+        android:id="@+id/contact_photo_image"
+        android:foreground="@drawable/contact_photo_background"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:cropToPadding="true"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dip"
+        android:layout_marginLeft="4dip"
+        android:layout_marginRight="8dip"
+        android:layout_marginBottom="4dip"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/contact_photo_image"
+        android:orientation="vertical">
+
+        <TextView android:id="@+id/from"
+            android:layout_weight="1"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?attr/conversation_list_item_contact_color"
+            android:singleLine="true"
+            android:gravity="bottom"
+            android:ellipsize="marquee" />
+
+    </LinearLayout>
+</org.thoughtcrime.securesms.ShareListItem>

res/layout/single_contact_selection_list_activity.xml

@@ -1,26 +0,0 @@
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-    <org.thoughtcrime.securesms.components.SingleRecipientPanel android:id="@+id/recipients"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp" />
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fastScrollEnabled="true" />
-
-    <TextView android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|center_vertical"
-        android:layout_marginTop="15dp"
-        android:text="@string/contact_selection_group_activity__finding_contacts"
-        android:textSize="20sp" />
-
-</LinearLayout>

res/layout/single_contact_selection_list_item.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingRight="25dip">
-
-    <View android:id="@+id/push_support_label"
-          android:layout_height="fill_parent"
-          android:layout_width="3dip"
-          android:layout_alignParentLeft="true"
-          android:background="#ff64a926"
-          android:visibility="visible"
-        />
-
-    <TextView android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="8dip"
-        android:layout_marginTop="-8dip"
-        android:layout_marginLeft="14dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textStyle="bold"
-        android:visibility = "gone"
-    />
-
-    <TextView android:id="@+id/number"
-    	android:visibility = "visible"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dip"
-        android:layout_marginTop="-8dip"
-        android:layout_marginLeft="14dip"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:fontFamily="sans-serif-light"
-    />
-
-    <TextView android:id="@+id/name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/number"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_marginBottom="1dip"
-        android:layout_marginLeft="14dip"
-	    android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical|left"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-    />
-
-</RelativeLayout>

res/layout/single_recipient_panel.xml

@@ -13,7 +13,11 @@
             android:singleLine="true"
             android:hint="@string/recipients_panel__to"
             android:paddingRight="45dip"
+            android:paddingLeft="15dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
             android:textColor="?conversation_editor_text_color"
+            android:background="?conversation_editor_background"
             android:layout_width="fill_parent"/>
 
     </RelativeLayout>

res/menu/share.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/text_secure_normal__menu_new_message"
+          android:id="@+id/menu_new_message"
+          android:icon="?attr/menu_new_conversation_icon"
+          android:showAsAction="always" />
+
+</menu>

res/values-ar/strings.xml

@@ -53,13 +53,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">عذراً، حجم هذا التسجيل يزيد عن الحد المسموح بالرسالة.</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_forward_message_prefix">إعادة إرسال</string>
   <string name="ConversationActivity_group_conversation_recipients">مستقبلي رسائل المحادثة الجماعية</string>
   <string name="ConversationActivity_group_conversation">محادثة جماعية</string>
   <string name="ConversationActivity_unnamed_group">مجموعة لا اسم لها</string>
   <string name="ConversationActivity_d_recipients_in_group">أعضاء %d </string>
   <string name="ConversationActivity_d_recipients_in_group_singular">عضو 1</string>
-  <string name="ConversationActivity_saving_draft">حفظ مسودة</string>
   <string name="ConversationActivity_invalid_recipient">جهة اتصال غير صحيحة!</string>
   <string name="ConversationActivity_calls_not_supported">خاصية الاتصال غير متوفرة</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">هذا الجهاز لا يدعم خاصية الاتصال.</string>
@@ -78,6 +76,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">مسح المحادثات المختارة</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">رسالة تبادل المفاتيح</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">تصديرإلى كرت الذاكرة؟</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">هذه الخاصية تصدر مفاتيحك المشفرة و إعداداتك و رسائلك لكرت الذاكرة.</string>
@@ -259,7 +258,6 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">لا توجد جهات اتصال.</string>
-  <string name="contact_selection_group_activity__finding_contacts">جاري العثورعلى جهات إتصال...</string>
   <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">اختيار من أجل</string>
@@ -269,6 +267,7 @@
   <string name="conversation_activity__type_message"><small>ارسل رسالة</small></string>
   <string name="conversation_activity__send">ارسال</string>
   <string name="conversation_activity__remove">إزالة</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">تحميل</string>
   <string name="conversation_item_sent__downloading">تحميل</string>
@@ -345,7 +344,6 @@
   <string name="registration_progress_activity__registering_with_server">جاري التسجيل مع الخادم...</string>
   <string name="registration_progress_activity__generating_keys">جارِ انشاء المفتاح...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">إلى</string>
   <string name="recipients_panel__add_member">إضافة عضو</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">لا يوجد لديك أي مفاتيح هوية مسجلة</string>
@@ -380,6 +378,7 @@
   <string name="preferences__general">عام</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">استخدم تكست سيكيور لمشاهدة و حفظ كل الرسائل القصيرة الواردة</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">استخدم تكست سيكيور لمشاهدة وحفظ كل رسائل الوسائط المتعددة الواردة</string>
+  <string name="preferences__input_settings">خيارات الادخال</string>
   <string name="preferences__enable_enter_key_title">تفعيل مفتاح الرجوع</string>
   <string name="preferences__pref_enter_sends_title">زر الرجوع Enter يرسل الرسالة</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">ضغط مفتاح الرجوع Enter سيرسل الرسالة</string>

res/values-bg/strings.xml

@@ -46,10 +46,8 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">За съжаление, тази музика е много голяма.</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_forward_message_prefix">Напред</string>
   <string name="ConversationActivity_group_conversation_recipients">Група от получатели</string>
   <string name="ConversationActivity_group_conversation">Група за разговори</string>
-  <string name="ConversationActivity_saving_draft">Запазване на чернова...</string>
   <string name="ConversationActivity_invalid_recipient">Невалиден получател!</string>
   <string name="ConversationActivity_calls_not_supported">Повикването не се поддържа</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Това устройство не поддържа повиквания.</string>
@@ -66,6 +64,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Изтриване на маркираните теми...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Съобщение за обмяна на ключовете...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Експорт на SD карта?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Това⏎\nще изнесе вашите ключове, настройки и съобщения на  SD картата.⏎</string>
@@ -212,6 +211,7 @@
   <!--conversation_activity-->
   <string name="conversation_activity__send">Изпрати</string>
   <string name="conversation_activity__remove">Премахни</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Изтегляне</string>
   <string name="conversation_item_sent__downloading">Изтегля се</string>
@@ -264,7 +264,6 @@
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <string name="recipients_panel__to">До</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Нямате никакви лични ключове в базата данни.</string>
   <!--verify_identity_activity-->

res/values-bo/strings.xml

@@ -41,10 +41,8 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">ཁྱོད་ཀྱིས་བདམས་པའི་སྒྲ་ཟློས་དེ་འཕྲིན་ཐུང་གི་ཚད་ལས་བརྒལ་འདུག</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_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">མཉམ་འདུས་གླེང་མོལ་གྱི་ཁོངས་མི་དག </string>
   <string name="ConversationActivity_group_conversation">མཉམ་འདུས་གླེང་མོལ། </string>
-  <string name="ConversationActivity_saving_draft">ཟིན་བྲིས་ཉར་ཚགས་བྱེད་བཞིན་ཡོད།</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
   <string name="ConversationFragment_confirm_message_delete">འཕྲིན་ཐུང་གསུབ་པ་ངེས་བརྟན་བཟོས། </string>
@@ -58,6 +56,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">འཕྲིན་ཐུང་སྐུད་རིམ་རྣམས་གསུབ་བཞིན་ཡོད།</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">ལྡེ་མིག་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན།</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export">ཕྱི་འདྲེན་བྱོས། </string>
   <string name="ExportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
@@ -174,6 +173,7 @@
   <!--conversation_activity-->
   <string name="conversation_activity__send">ཐོངས། </string>
   <string name="conversation_activity__remove">ཕྱིར་ཕུད། </string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">ཕབ་ལེན་བྱོས། </string>
   <string name="conversation_item_sent__downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད། </string>
@@ -214,7 +214,6 @@
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <string name="recipients_panel__to">གཏོང་ཡུལ།</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">གནས་སྐབས་རིང་ཁྱེད་ཀྱི་ཡིད་ཆེས་མཛོད་ཀྱི་ཁོངས་སུ་ཁྱེད་ལ་ངོས་འཛིན་ལྡེ་མིག་མི་འདུག  </string>
   <!--verify_identity_activity-->
@@ -243,6 +242,7 @@
   <!--preferences.xml-->
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">ནང་ཡོང་འཕྲིན་ཐུང་ཚང་མར་བལྟ་བ་དང་ཉར་བ་ལ་གཡག་འཕྲིན་བེད་སྤྱོད་ཐོངས།</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">ནང་ཡོང་སྣ་མང་འཕྲིན་ཐུང་རིགས་ལ་ཉར་ཚགས་དང་ཞིབ་ལྟའི་ཆེད་དུ་གཡག་འཕྲིན་བེད་སྤྱོད་ཐོངས།</string>
+  <string name="preferences__input_settings">ནང་འཇུག་སྒྲིག་བཟོ། </string>
   <string name="preferences__pref_enter_sends_title">གཏོང་བ་ནང་འཇུག་བྱོས། </string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">ནང་འཛུལ་ལྡེ་མིག་ལ་བསྣུན་ན་འཕྲིན་ཐུང་གཏོང་། </string>
   <string name="preferences__display_settings">སྒྲིག་བཟོ་སྟོན། </string>

res/values-ca/strings.xml

@@ -65,13 +65,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ho sento, el clip de so seleccionat excedeix els límits de mida del missatge.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">El recipient no és una adreça de correu electrònic o SMS vàlid!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">El missatge és buit!</string>
-  <string name="ConversationActivity_forward_message_prefix">RV</string>
   <string name="ConversationActivity_group_conversation_recipients">Recipients de converses de grup</string>
   <string name="ConversationActivity_group_conversation">Conversa de grup</string>
   <string name="ConversationActivity_unnamed_group">Grup Sensenom</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membres</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 membre</string>
-  <string name="ConversationActivity_saving_draft">Desant borrador...</string>
   <string name="ConversationActivity_invalid_recipient">Destinatari invàlid!</string>
   <string name="ConversationActivity_calls_not_supported">Trucades no suportades</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Aquest dispositiu no sembla suportar accions de trucada.</string>
@@ -92,6 +90,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Esborrant els fils de conversa seleccionats...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Missatge d\'intercanvi de clau...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportar a la targeta SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Això exportarà les teves claus encriptades, ajustaments, i missatges a la targeta SD.</string>
@@ -112,7 +111,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Nou grup MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Has seleccionat un contacte que no suporta grups de TextSecure, això farà que aquest grup sigui de MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">No estàs registrat per utilitzar el canal de dades, això farà que els grups de TextSecure estiguin desactivats.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">No ets el propietari d\'aquest grup, per tant no pots editar el títol o la fotografia.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ha passat un error inesperat que ha fet que la creació del grup hagi fallat.</string>
   <string name="GroupCreateActivity_contacts_no_members">Necessites almenys una persona dins el teu grup!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Un dels membres del teu grup té un número que no pot ser llegit correctament. Si us plau corregeix o treu aquest contacte i intenta-ho de nou.</string>
@@ -305,12 +303,9 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sense contactes.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Buscant contactes…</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Escriu un nom per filtrar...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">No estàs registrat al servei push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualitzant directori</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Actualitzant el Directori Push...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecciona per</string>
   <!--contact_selection_recent_activity-->
@@ -319,6 +314,7 @@
   <string name="conversation_activity__type_message"><small>Envia un missatge</small></string>
   <string name="conversation_activity__send">Envia</string>
   <string name="conversation_activity__remove">Treu</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Descàrrega</string>
   <string name="conversation_item_sent__downloading">Descarregant</string>
@@ -420,7 +416,6 @@
   <string name="registration_progress_activity__sms_verification_failed">La verificació SMS ha fallat.</string>
   <string name="registration_progress_activity__generating_keys">Generant claus...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Per a</string>
   <string name="recipients_panel__add_member">Afegeix membre</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Actualment no tens cap clau d\'identitat a la teva base de dades de confiança.</string>

res/values-cs/strings.xml

@@ -57,13 +57,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Omlouváme se, ale zvolený audio soubor je příliš velký.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Adresa příjemce není ve správném tvaru! (sms či email)</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Zpráva je prázdná!</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Příjemci skupinové konverzace</string>
   <string name="ConversationActivity_group_conversation">Skupinová konverzace</string>
   <string name="ConversationActivity_unnamed_group">Nepojmenovaná Skupina</string>
   <string name="ConversationActivity_d_recipients_in_group">Počet členů: %d</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 člen</string>
-  <string name="ConversationActivity_saving_draft">Ukládám koncept...</string>
   <string name="ConversationActivity_invalid_recipient">Chybný příjemce!</string>
   <string name="ConversationActivity_calls_not_supported">Vytáčení čísel není podporováno!</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Toto zařízení zřejmě neumí vytáčet telefonní čísla</string>
@@ -82,6 +80,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Mažu označené konverzace...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Předávání klíčů...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportovat na SD kartu?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Tímto exportujete šifrované klíče, nastavení a zprávy na SD kartu.</string>
@@ -102,7 +101,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Název MMS Skupiny</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Zvolený kontakt nepodporuje skupiny TextSecure. Tato skupina bude MMS Skupina.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Nejste registrováni k používání datového kanálu, tudíž nejsou skupiny TextSecure povoleny.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Nejsi vlastníkem skupiny, takže nemůžeš měnit název a obrázek.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Došlo k neočekávané chybě, která znemožnila vytvoření skupiny.</string>
   <string name="GroupCreateActivity_contacts_no_members">Ve vaší skupině musí být alespoň jeden kontakt.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jeden z členů tvojí skupiny má číslo, které se nedaří správně zpracovat. Prosím opravte jej nebo odstraňte a zkuste znovu.</string>
@@ -293,7 +291,6 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Žádný kontakt</string>
-  <string name="contact_selection_group_activity__finding_contacts">Hledat kontakty...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Napište jméno pro vyfiltrování...</string>
   <!--ContactSelectionListFragment-->
@@ -304,6 +301,7 @@
   <string name="conversation_activity__type_message"><small>Odešli zprávu</small></string>
   <string name="conversation_activity__send">Odeslat</string>
   <string name="conversation_activity__remove">Odebrat</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Stažení</string>
   <string name="conversation_item_sent__downloading">Stahuji</string>
@@ -401,7 +399,6 @@
   <string name="registration_progress_activity__sms_verification_failed">Ověření pomocí SMS\n        selhalo.\n    </string>
   <string name="registration_progress_activity__generating_keys">Probíhá generování klíčů...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Komu</string>
   <string name="recipients_panel__add_member">Přidat člena</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Aktuálně nemáte žádné cizí identifikační klíče v databázi.</string>

res/values-da/strings.xml

@@ -47,12 +47,10 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Beklager, den valgte lydfil overskrider grænsen på beskedstørrelsen</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Modtageren har ikke en gyldig SMS- eller e-mail adresse!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Beskeden er tom!</string>
-  <string name="ConversationActivity_forward_message_prefix">Videresend beskeden</string>
   <string name="ConversationActivity_group_conversation_recipients">Modtagere i gruppen</string>
   <string name="ConversationActivity_group_conversation">Gruppe beskeder</string>
   <string name="ConversationActivity_d_recipients_in_group">%d modtagere</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 medlem</string>
-  <string name="ConversationActivity_saving_draft">Gemmer kladde...</string>
   <string name="ConversationActivity_invalid_recipient">Ugyldig modtager!</string>
   <string name="ConversationActivity_calls_not_supported">Opkald er ikke understøttet</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Din enhed understøtter ikke initieret opkald.</string>
@@ -71,6 +69,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Sletter valgte tråde</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Udvekslingsnøgle...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Eksporter til SD-kort?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dette vil eksportere dine krypteringsnøgler, indstillinger og beskeder til SD-kortet.</string>
@@ -89,7 +88,6 @@
   <string name="GroupCreateActivity_actionbar_update_title">Opdater Gruppe</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Ny MMS Gruppe</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Du er ikke ejer af denne gruppe, så du kan ikke ændre titlen eller billedet.</string>
   <string name="GroupCreateActivity_contacts_no_members">Der skal være mindst én person i gruppen!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En af medlemmerne i gruppen har et nummer der ikke kan læses. Ret nummeret eller slet kontakten, og prøv igen.</string>
   <string name="GroupCreateActivity_menu_create_title">Opret Gruppe</string>
@@ -251,7 +249,6 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Finder kontakter...</string>
   <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vælg</string>
@@ -261,6 +258,7 @@
   <string name="conversation_activity__type_message"><small>Send en besked</small></string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slet</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Hent</string>
   <string name="conversation_item_sent__downloading">Henter</string>
@@ -331,7 +329,6 @@
   <string name="registration_progress_activity__waiting_for_sms_verification">Venter på SMS\ngodkendelse...\n</string>
   <string name="registration_progress_activity__sms_verification_failed">SMS godkendelse\nfejlede.\n</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Til</string>
   <string name="recipients_panel__add_member">Tilføj medlem</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Du har ingen ID-nøgler i din sikret database.</string>

res/values-de/strings.xml

@@ -14,7 +14,7 @@
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_my">Mein</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Speicherverschlüsselung deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Warnung: Dies wird die Speicherverschlüsselung für alle Nachrichten und Schlüssel deaktivieren.\nIhre verschlüsselten Unterhaltungen werden weiterhin funktionieren, aber jemand mit physischem Zugriff auf Ihr Gerät kann dann auf sie zugreifen.</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Warnung: Dies wird die verschlüsselte Speicherung für alle Nachrichten und Schlüssel deaktivieren.\n\nIhre verschlüsselten Unterhaltungen werden weiterhin funktionieren, aber jemand mit physischem Zugriff auf Ihr Gerät kann dann auf sie zugreifen.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <string name="ApplicationPreferencesActivity_unregistering">Lösche Push-Account...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Account für Push-Nachrichten löschen</string>
@@ -39,12 +39,12 @@
   <string name="ConversationItem_saving_attachment">Anhang wird gespeichert</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Anhang wird auf die SD-Karte gespeichert...</string>
   <string name="ConversationItem_save_to_sd_card">Auf SD-Karte speichern?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Diese Datei wurde in einer verschlüsselten Datenbank gespeichert. Die Version, die Sie auf der SD Karte speichern, wird hingegen nicht mehr verschlüsselt sein. Möchten Sie trotzdem fortfahren?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Diese Datei ist in einer verschlüsselten Datenbank gespeichert. Die Version, die Sie auf der SD-Karte speichern, wird hingegen nicht mehr verschlüsselt sein. Möchten Sie dennoch fortfahren?</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Fehler beim Speichern des Anhangs auf die SD-Karte!</string>
   <string name="ConversationItem_success_exclamation">Erfolgreich!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Es kann nicht auf die SD-Karte geschrieben werden!</string>
-  <string name="ConversationItem_view_secure_media_question">Sichere Datei anzeigen?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Datei wurde in einer verschlüsselten Datenbank gespeichert. Damit die Datei mit einem anderen Anzeigeprogramm geöffnet werden kann, muss die Datei zuvor entschlüsselt und vorübergehend im Speicher abgelegt werden. Sind Sie sicher, dass Sie fortfahren wollen?</string>
+  <string name="ConversationItem_view_secure_media_question">Verschlüsselte Datei anzeigen?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Datei ist in einer verschlüsselten Datenbank gespeichert. Zur Anzeige muss sie vorübergehend entschlüsselt abgespeichert werden. Möchten Sie dennoch fortfahren?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Schlüsselaustausch-Nachricht empfangen und verarbeitet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fehler: Abgelaufene Schlüsselaustausch-Nachricht empfangen.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Schlüsselaustausch-Nachricht empfangen. Drücken um fortzufahren.</string>
@@ -52,12 +52,15 @@
   <string name="ConversationItem_group_action_left">%1$s hat die Gruppe verlassen.</string>
   <string name="ConversationItem_group_action_joined">%1$s sind der Gruppe beigetreten.</string>
   <string name="ConversationItem_group_action_modify">%1$s hat die Gruppe aktualisiert.</string>
-  <string name="ConversationItem_click_to_approve">Für Rückgriff auf SMS drücken</string>
+  <string name="ConversationItem_click_to_approve">Für Rückgriff auf SMS antippen</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Für Rückgriff auf unsicheren Versand antippen</string>
   <string name="ConversationItem_click_to_approve_dialog_title">Rückgriff auf SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">Rückgriff auf unverschlüsselte SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Diese Nachricht wird <b>nicht</b> verschlüsselt sein, da keine sichere Unterhaltung aufgebaut werden konnte.\n\nUnsichere Nachricht senden?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Sichere Unterhaltung starten?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Sichere Unterhaltung mit %s starten?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Beenden der sicheren Unterhaltung bestätigen </string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Beenden der sicheren Unterhaltung bestätigen</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Wollen Sie die sichere Unterhaltung wirklich beenden?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Löschen der Unterhaltung bestätigen</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Soll diese Unterhaltung unwiderruflich gelöscht werden?</string>
@@ -69,13 +72,12 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Die ausgewählte Audiodatei überschreitet leider die maximal mögliche Nachrichtengröße.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Die Empfängeradresse ist keine gültige SMS- oder E-Mail-Adresse!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Die Nachricht ist leer!</string>
-  <string name="ConversationActivity_forward_message_prefix">Weiterleiten</string>
   <string name="ConversationActivity_group_conversation_recipients">Gruppenmitglieder</string>
   <string name="ConversationActivity_group_conversation">Gruppenunterhaltung</string>
   <string name="ConversationActivity_unnamed_group">Unbenannte Gruppe</string>
   <string name="ConversationActivity_d_recipients_in_group">%d Mitglieder</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 Mitglied</string>
-  <string name="ConversationActivity_saving_draft">Entwurf speichern...</string>
+  <string name="ConversationActivity_saved_draft">Entwurf gespeichert</string>
   <string name="ConversationActivity_invalid_recipient">Ungültiger Empfänger!</string>
   <string name="ConversationActivity_calls_not_supported">Anrufe werden nicht unterstützt</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dieses Gerät scheint keine Wahlvorgänge zu unterstützen.</string>
@@ -91,11 +93,13 @@
   <string name="ConversationListAdapter_key_exchange_message">Schlüsselaustausch-Nachricht...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Unterhaltungen löschen?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Sind Sie sicher, dass Sie ALLE ausgewählten Unterhaltungen löschen möchten?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Möchten Sie wirklich ALLE ausgewählten Unterhaltungen löschen?</string>
   <string name="ConversationListFragment_deleting">Löschen</string>
   <string name="ConversationListFragment_deleting_selected_threads">Lösche ausgewählte Unterhaltungen...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch-Nachricht...</string>
+  <!--ShareActivity-->
+  <string name="ShareActivity_share_with">Teilen mit</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Auf SD-Karte exportieren?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dies wird Ihre verschlüsselten Schlüssel, Einstellungen und Nachrichten auf die SD-Karte exportieren.</string>
@@ -116,7 +120,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Neue MMS-Gruppe</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der TextSecure-Gruppen nicht unterstützt, deshalb wird dies eine MMS-Gruppe sein.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Sie sind nicht für Nachrichten über den Datenkanal registriert. TextSecure-Gruppen sind deshalb deaktiviert. </string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Sie sind nicht der Besitzer dieser Gruppe, deshalb können Sie den Titel oder das Bild nicht bearbeiten.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ein unerwarteter Fehler ist aufgetreten, der das Erstellen der Gruppe verhindert hat.</string>
   <string name="GroupCreateActivity_contacts_no_members">Sie brauchen mindestens eine Person in Ihrer Gruppe!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Eines der Mitglieder Ihrer Gruppe hat eine Nummer, die nicht richtig gelesen werden kann. Bitte beheben oder Kontakt entfernen und erneut versuchen.</string>
@@ -124,6 +127,7 @@
   <string name="GroupCreateActivity_avatar_content_description">Gruppen-Avatar</string>
   <string name="GroupCreateActivity_menu_create_title">Gruppe erstellen</string>
   <string name="GroupCreateActivity_creating_group">Erstelle %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Es können keine Kontakte ohne TextSecure-Push zu einer existierenden TextSecure-Push-Gruppe hinzugefügt werden</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Soll die SMS-Systemdatenbank importiert werden?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Dies wird die SMS aus der Systemdatenbank in TextSecure importieren.\n\nWenn Sie dies schon einmal gemacht haben, kommt es zu doppelten Nachrichten.</string>
@@ -165,9 +169,9 @@
   <string name="PromptMmsActivity_mms_settings_updated">MMS-Einstellungen aktualisiert</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kannst diese Werte jederzeit im TextSecure Einstellungsmenü ändern.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die Signatur dieses Schlüsselaustauschs hat sich geändert.\nDas könnte bedeuten, dass jemand versucht, Ihr Gespräch abzufangen oder\nauch nur, dass dieser Kontakt TextSecure neu installiert hat und nun einen neuen Schlüssel benutzt.</string>
+  <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 möchten diesen Kontakt vielleicht überprüfen.</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Die Signatur dieses Schlüsselaustauschs ist vertrauenswürdig, aber die Einstellung „Automatischer Schlüsselaustausch“ ist deaktiviert.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Die Signatur dieses Schlüsselaustauschs ist vertrauenswürdig, aber die Einstellung \"Automatischer Schlüsselaustausch\" ist deaktiviert.</string>
   <string name="ReceiveKeyActivity_processing">Verarbeitung</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Führe Schlüsselaustausch durch...</string>
   <!--RegistrationActivity-->
@@ -218,6 +222,7 @@
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nNachricht mit unbekanntem Schlüssel empfangen. Klicken um fortzufahren und ihn anzuzeigen.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Veränderte, aber unbekannte Identitäts-Information empfangen. Tippen um die Identität zu prüfen.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sichere Unterhaltung beendet.</string>
+  <string name="SmsMessageRecord_duplicate_message">Doppelte Nachricht.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Gruppe verlassen...</string>
   <string name="TheadRecord_secure_session_ended">Sichere Unterhaltung beendet.</string>
@@ -225,33 +230,33 @@
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen Schlüssel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Der Empfänger hat keinen Schlüssel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Der Empfänger hat keinen Schlüssel!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Kontaktschlüssel einscannen</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Empfängerschlüssel einscannen</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Eigenen Schlüssel einscannen lassen</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ACHTUNG: Der eingescannte Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Text des Schlüssels sorgfältig.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">NICHT verifiziert!</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">NICHT überprüft!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Der Schlüssel des Empfängers ist korrekt. Lassen Sie ihn auch Ihren eigenen Schlüssel überprüfen.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Verifiziert!</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Überprüft!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sie haben keinen eigenen Schlüssel!</string>
   <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Eigenen Schlüssel einscannen lassen</string>
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Meinen Schlüssel einscannen lassen</string>
   <string name="VerifyKeysActivity_scan_their_fingerprint">Kontaktschlüssel einscannen</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ACHTUNG: Der eingescannte Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Text des Schlüssels sorgfältig.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NICHT verifiziert!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Der Schlüssel des Empfängers ist korrekt. Es ist notwendig, dass auch der Empfänger Ihren Schlüssel überprüft.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verifiziert!</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">NICHT überprüft!</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Der Empfängerschlüssel ist korrekt. Es ist notwendig, dass auch Ihr Schlüssel geprüft wird.</string>
+  <string name="VerifyKeysActivity_verified_exclamation">Überprüft!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen eigenen Schlüssel.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Zum Vergleich einscannen</string>
   <string name="ViewIdentityActivity_get_scanned_to_compare">Zum Vergleich einscannen lassen</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ACHTUNG: Der eingescannte Schlüssel stimmt NICHT überein!</string>
-  <string name="ViewIdentityActivity_not_verified_exclamation">NICHT verifiziert!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">NICHT überprüft!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Der eingescannte Schlüssel stimmt überein!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Verifiziert!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Überprüft!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Schlüssel</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mein Schlüssel</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Trotz vorhandener Anfragen initiieren?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Unterhaltungsanfrage an den Empfänger gesendet. Sind Sie sicher, dass Sie eine Weitere senden wollen? Dies macht die erste Anfrage ungültig.</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Unterhaltungsanfrage an den Empfänger gesendet. Sind Sie sicher, dass Sie eine weitere senden wollen? Dies macht die erste Anfrage ungültig.</string>
   <string name="KeyExchangeInitiator_send">Senden</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Fehlerhaft verschlüsselte Nachricht...</string>
@@ -309,12 +314,13 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Keine Kontakte.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Suche Kontakte...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Kontakte werden geladen …</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Namen eingeben um zu filtern...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim Push-Dienst registriert...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim Push-Dienst registriert…</string>
   <string name="SingleContactSelectionActivity_updating_directory">Aktualisiere Kontaktliste</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Aktualisiere Kontaktliste...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Kontaktbild</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Auswählen für</string>
   <!--contact_selection_recent_activity-->
@@ -323,9 +329,16 @@
   <string name="conversation_activity__type_message"><small>Sende eine Nachricht</small></string>
   <string name="conversation_activity__send">Senden</string>
   <string name="conversation_activity__remove">Löschen</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Multimedia-Nachricht</string>
+  <string name="conversation_item__play_button_description">Wiedergabeknopf</string>
+  <string name="conversation_item__secure_message_description">Verschlüsselte Nachricht Icon</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
   <string name="conversation_item_sent__downloading">Herunterladen</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Senden fehlgeschlagen Icon</string>
+  <string name="conversation_item_sent__pending_approval_description">Bestätigung ausstehend</string>
+  <string name="conversation_item_sent__delivered_description">Empfangsbenachrichtigunganzeige</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Download</string>
   <string name="conversation_item_received__downloading">Herunterladen</string>
@@ -348,11 +361,13 @@
   <string name="log_submit_activity__button_ok">Absenden</string>
   <string name="log_submit_activity__log_fetch_failed">Konnte keine Protokolle vom Gerät lesen. Sie können stattdessen ADB nutzen um die Fehler-Protokolle zu erhalten.</string>
   <string name="log_submit_activity__log_submit_success_title">Erfolgreich!</string>
-  <string name="log_submit_activity__log_got_it">Erhalten</string>
+  <string name="log_submit_activity__log_got_it">Erledigt</string>
   <string name="log_submit_activity__your_pastebin_url">Bitte kopieren Sie diese URL und fügen Sie sie Ihrem Fehlerbericht hinzu (lange drücken um in die Zwischenablage zu kopieren):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">In die Zwischenablage kopiert</string>
   <string name="log_submit_activity__loading_logcat">Lade Protokoll...</string>
   <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
+  <string name="log_submit_activity__submitting">Versenden</string>
+  <string name="log_submit_activity__posting_logs">Protokolle zu Pastebin senden …</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Möchten Sie Ihre vorhandenen Nachrichten in TextSecures verschlüsselte Datenbank importieren?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Die System-Datenbank des Geräts wird in keiner Weise verändert.</string>
@@ -379,13 +394,13 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE-PASSWORT</string>
   <string name="prompt_passphrase_activity__unlock">Entsperren</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure benötigt MMS-Einstellungen um Medien- und Gruppennachrichten zu senden. Das Telefon stellt diese Informationen nicht zur Verfügung, was daran liegen kann, dass manche Geräte blockiert sind oder anderweitig restriktiv konfiguriert sind.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure benötigt MMS-Einstellungen, um Medien- und Gruppennachrichten zu versenden. Ihr Gerät stellt diese Informationen nicht zur Verfügung, was gelegentlich bei gesperrten oder anderweitig restriktiv konfigurierten Geräten der Fall ist.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Um Medien- und Gruppennachrichten zu senden, bitte auf \"OK\" klicken und die Einstellungen ausfüllen. Die MMS-Einstellungen des Anbieters können gefunden werden, indem man nach dem \"APN\" des Anbieters sucht. Diese Operation muss nur einmal ausgeführt werden.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMS-CENTER-URL (ERFORDERLICH):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMS-PROXY-HOST (FREIWILLIG):</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS-PROXY-PORT (FREIWILLIG):</string>
   <!--receive_key_activity-->
-  <string name="receive_key_activity__complete">Vollständig</string>
+  <string name="receive_key_activity__complete">Fortfahren</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure kann die Datenverbindung benutzen um Kosten für SMS bei der Kommunikation mit anderen TextSecure-Nutzern zu vermeiden. Um dies zu aktivieren, bestätigen Sie bitte ihre Landesvorwahl und Telefonnummer.</string>
   <string name="registration_activity__your_country">IHR LAND</string>
@@ -404,7 +419,7 @@
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure funktioniert nicht mit Google-Voice-Rufnummern.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Überprüfung durch Anruf</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure kann Sie auch anrufen um Ihre Nummer zu überprüfen. Drücken Sie \'Anrufen\'\nund geben dann die sechs Ziffern ein, die Sie gehört haben.</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure kann Sie auch anrufen um Ihre Nummer zu überprüfen. Tippen Sie auf \"Anrufen\" und geben dann die sechs Ziffern ein, die Sie gehört haben. </string>
   <string name="registration_progress_activity__verify">Überprüfen</string>
   <string name="registration_progress_activity__call_me">Anrufen</string>
   <string name="registration_progress_activity__edit_number">Nummer bearbeiten</string>
@@ -424,7 +439,7 @@
   <string name="registration_progress_activity__sms_verification_failed">SMS-Überprüfung\nfehlgeschlagen.</string>
   <string name="registration_progress_activity__generating_keys">Erzeuge Schlüssel...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">An</string>
+  <string name="recipients_panel__to"><small>Name oder Nummer eingeben</small></string>
   <string name="recipients_panel__add_member">Mitglied hinzufügen</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Sie haben momentan keine Kontaktschlüssel in Ihrer Datenbank.</string>
@@ -434,7 +449,7 @@
   <!--verify_import_identity_activity-->
   <string name="verify_import_identity_activity__identity_name_n">Name der Identität:\\n</string>
   <string name="verify_import_identity_activity__imported_identity_n">Importierte Identität:\\n</string>
-  <string name="verify_import_identity_activity__verified">Verifiziert!</string>
+  <string name="verify_import_identity_activity__verified">Überprüft!</string>
   <string name="verify_import_identity_activity__compare">Vergleichen</string>
   <!--verify_keys_activity-->
   <string name="verify_keys_activity__they_read_this">Die lesen dies:</string>
@@ -451,18 +466,19 @@
   <string name="AndroidManifest__verify_identity">Empfänger überprüfen</string>
   <string name="AndroidManifest__manage_identity_keys">Schlüssel verwalten</string>
   <string name="AndroidManifest__complete_key_exchange">Automatischer Schlüsselaustausch</string>
-  <string name="AndroidManifest__log_submit">Übermittle Fehlerprotokolle</string>
+  <string name="AndroidManifest__log_submit">Fehlerprotokoll übermitteln</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importieren / Exportieren</string>
+  <string name="arrays__import_export">Datensicherung</string>
   <string name="arrays__my_identity_key">Mein Schlüssel</string>
   <string name="arrays__contact_keys">Kontaktschlüssel</string>
   <!--preferences.xml-->
   <string name="preferences__general">Allgemein</string>
   <string name="preferences__push_sms_category">Push-Nachrichten und SMS</string>
-  <string name="preferences__pref_all_sms_title">Für alle eingehenden SMS benutzen</string>
-  <string name="preferences__pref_all_mms_title">Für alle eingehenden SMS benutzen</string>
+  <string name="preferences__pref_all_sms_title">Für SMS-Empfang benutzen</string>
+  <string name="preferences__pref_all_mms_title">Für MMS-Empfang benutzen</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure zur Anzeige und Speicherung aller eingehenden SMS verwenden</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure zur Anzeige und Speicherung aller eingehenden MMS verwenden</string>
+  <string name="preferences__input_settings">Eingabe-Einstellungen</string>
   <string name="preferences__enable_enter_key_title">Enter-Taste einschalten</string>
   <string name="preferences__replace_smiley_with_enter_key">Smiley-Taste durch Enter-Taste ersetzen</string>
   <string name="preferences__pref_enter_sends_title">Enter-Taste schickt ab</string>
@@ -478,11 +494,11 @@
   <string name="preferences__screen_security">Bildschirmschutz</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatischer Schlüsselaustausch für neue oder bestehende Unterhaltungen mit demselben Schlüssel</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bildschirmschutz deaktivieren um Screenshots zuzulassen</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Passwort im Speicher nach einer gewissen Zeit vergessen</string>
-  <string name="preferences__timeout_passphrase">Passwort im Speicher vergessen</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Passwort nach einer gewissen Zeit vergessen</string>
+  <string name="preferences__timeout_passphrase">Passwort vergessen</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Passwort-Timeout auswählen</string>
   <string name="preferences__pref_timeout_interval_title">Zeitüberschreitung</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Länge des Zeitraums, währenddessen das Passwort im Speicher nicht vergessen wird</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Wartezeit, nach deren Ablauf das Passwort vergessen wird</string>
   <string name="preferences__identity_key_settings">Schlüssel</string>
   <string name="preferences__view_my_identity_key">Meinen eigenen Schlüssel anzeigen</string>
   <string name="preferences__manage_identity_keys">Schlüssel verwalten</string>
@@ -519,7 +535,7 @@
   <string name="preferences__passphrase">Passwort</string>
   <string name="preferences__advanced_mms_access_point_names">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>
+  <string name="preferences__override_system_mms_settings">Statt der Systemeinstellungen für MMS die unten genannten Einstellungen benutzen</string>
   <string name="preferences__mmsc_url_required">MMS-Center-URL (erforderlich)</string>
   <string name="preferences__mms_proxy_host_optional">MMS-Proxy-Host (freiwillig)</string>
   <string name="preferences__mms_proxy_port_optional">MMS-Proxy-Port (freiwillig)</string>
@@ -541,11 +557,11 @@
   <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure als Standard-SMS/MMS-Anwendung einrichten.</string>
   <string name="preferences__use_data_channel">Push-Nachrichten</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Mehr Privatsphäre und keine SMS-Kosten durch Nutzung der Datenverbindung zur Kommunikation mit anderen TextSecure-Nutzern</string>
-  <string name="preferences__allow_sms_fallback">Erlaube SMS-Versand an</string>
+  <string name="preferences__allow_sms_fallback">Erlaube SMS-Versand an:</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure ist aktuell Ihre Standard-SMS-App. Bitte wählen Sie zuerst eine andere Standard-SMS-App um diese Einstellung ändern zu können.</string>
   <string name="preferences__refresh_push_directory">Kontaktliste aktualisieren</string>
   <string name="preferences__submit_debug_log">Fehlerprotokoll übermitteln</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure Push-Kontakte</string>
+  <string name="preferences__sms_outgoing_push_users">Kontakte mit TextSecure-Push</string>
   <string name="preferences__sms_fallback_push_users_ask">(vorher fragen)</string>
   <string name="preferences__sms_outgoing_push_users_description">Verschlüsselte SMS senden, falls kein Internetzugriff möglich ist</string>
   <string name="preferences__sms_fallback_ask_fallback">Vor SMS-Versand fragen</string>
@@ -557,6 +573,9 @@
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">Alle auswählen</string>
   <string name="contact_selection_list__menu_unselect_all">Alle abwählen</string>
+  <string name="contact_selection_list__header_textsecure_users">TEXTSECURE-KONTAKTE</string>
+  <string name="contact_selection_list__header_other">ALLE KONTAKTE</string>
+  <string name="contact_selection_list__unknown_contact">Neue Nachricht an …</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Fertig</string>
   <!--refreshing push directory from menu-->
@@ -589,7 +608,7 @@
   <string name="conversation__menu_add_attachment">Anhang hinzufügen</string>
   <string name="conversation__menu_update_group">Gruppe bearbeiten</string>
   <string name="conversation__menu_leave_group">Gruppe verlassen</string>
-  <string name="conversation__menu_add_contact_info">Kontaktinfo hinzufügen</string>
+  <string name="conversation__menu_add_contact_info">Kontaktinfo einfügen</string>
   <string name="conversation__menu_delete_thread">Unterhaltung löschen</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Teilnehmerliste</string>
@@ -609,6 +628,6 @@
   <string name="text_secure_normal__menu_clear_passphrase">TextSecure sperren</string>
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
   <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verifiziert</string>
+  <string name="verify_keys__menu_verified">Überprüft!</string>
   <!--EOF-->
 </resources>

res/values-el/strings.xml

@@ -60,13 +60,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Συγγνώμη, το επιλεγμένο αρχείο ήχου υπερβαίνει το μέγιστο μέγεθος μηνύματος.</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_forward_message_prefix">ΠΡΘ</string>
   <string name="ConversationActivity_group_conversation_recipients">Παραλήπτες Ομαδικής Συζήτησης</string>
   <string name="ConversationActivity_group_conversation">Ομαδική Συζήτηση</string>
   <string name="ConversationActivity_unnamed_group">Ανώνυμη ομάδα</string>
   <string name="ConversationActivity_d_recipients_in_group">%d μέλη</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 μέλος</string>
-  <string name="ConversationActivity_saving_draft">Αποθηκεύεται προχείρο...</string>
   <string name="ConversationActivity_invalid_recipient">Άκυρος παραλήπτης!</string>
   <string name="ConversationActivity_calls_not_supported">Δεν Υποστηρίζονται Κλήσεις</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Αυτή η συσκευή δε φαίνεται να υποστηρίζει ενέργειες κλήσης.</string>
@@ -85,6 +83,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Διαγραφή επιλεγμένων συζητήσεων...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Μήνυμα ανταλλαγής κλειδιών...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Εξαγωγή Σε Κάρτα Μνήμης;</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Αυτό\n        θα εξάγει τα κρυπτογραφημένα κλειδιά, τις ρυθμίσεις και τα μηνύματά σας στη κάρτα μνήμης.\n    </string>
@@ -105,7 +104,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Νέα ομάδα MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Επιλέξατε μια επαφή που δεν υποστηρίζει ομάδες TextSecure, γι αυτό η ομάδα θα γίνει MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Είστε εγγεγραμένος για χρήση του καναλιού δεδομένων, γι αυτό το οι ομάδες TextSecure είναι απενεργοποιημένες. </string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Δεν είστε ο κάτοχος αυτής της ομάδας και γι αυτο δεν μπορείτε να επεξεργαστείτε τον τίτλο ή την εικόνα.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Προέκυψε ένα απρόσμενο σφάλμα και η δημιουργία ομάδας απέτυχε.</string>
   <string name="GroupCreateActivity_contacts_no_members">Χρειάζεστε έστω ένα άτομο στην ομάδα σας!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Έχετε ένα μέλος στην ομάδα σας που ο αριθμός του δεν μπορεί να διαβαστεί σωστά. Παρακαλώ διορθώστε το ή διαγράψτε την επαφή και δοκιμάστε ξανά. </string>
@@ -297,12 +295,9 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Δεν υπάρχουν επαφές.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Εύρεση επαφών...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Πληκτρολογήστε όνομα για φιλτράρισμα...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Δεν είστε εγγεγραμμένος για ειδοποιήσεις push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Ενημέρωση καταλόγου</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Ενημέρωση καταλόγου push...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Επιλογή για</string>
   <!--contact_selection_recent_activity-->
@@ -311,6 +306,7 @@
   <string name="conversation_activity__type_message"><small>Στείλτε το μηνυμά σας</small></string>
   <string name="conversation_activity__send">Αποστολή</string>
   <string name="conversation_activity__remove">Αφαίρεση</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Λήψη</string>
   <string name="conversation_item_sent__downloading">Γίνεται λήψη</string>
@@ -406,7 +402,6 @@
   <string name="registration_progress_activity__sms_verification_failed">Η επιβεβαίωση SMS\n        απέτυχε.\n    </string>
   <string name="registration_progress_activity__generating_keys">Δημιουργία κλειδιών σε εξέλιξη...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Προς</string>
   <string name="recipients_panel__add_member">Προσθέστε ένα μέλος</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Δεν έχετε κλειδιά ταυτότητας στη λίστα έμπιστών σας.</string>

res/values-es/strings.xml

@@ -24,7 +24,9 @@
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">No está registrado con el servicio de mensajería activa...,</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Actualizando directorio</string>
   <string name="ApplicationPreferencesActivity_updating_push_directory">Actualizando directorio de mensajería activa...</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS entrantes habilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pulse para cambiar la aplicación de SMS predeterminada</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS entrantes deshabilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pulse para que TextSecure sea su aplicación de SMS predeterminada</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Fotografía</string>
@@ -50,6 +52,11 @@
   <string name="ConversationItem_group_action_left">%1$s ha abandonado el grupo.</string>
   <string name="ConversationItem_group_action_joined">%1$s se ha unido al grupo.</string>
   <string name="ConversationItem_group_action_modify">%1$s ha actualizado el grupo.</string>
+  <string name="ConversationItem_click_to_approve">Pulse para recurrir al SMS</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Pulse para usar recurso de emergencia no seguro </string>
+  <string name="ConversationItem_click_to_approve_dialog_title">¿Recurrir al SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">¿Recurrir a SMS no cifrado?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque no pudo establecerse una sesión segura.\n\n¿Enviar mensaje no seguro?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">¿Iniciar una sesión segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">¿Iniciar sesión segura con %s?</string>
@@ -65,13 +72,12 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lo sentimos, el audio seleccionado excede las restricciones de tamaño del mensaje.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">El destinatario no es un SMS o correo electrónico válido</string>
   <string name="ConversationActivity_message_is_empty_exclamation">¡El mensaje está vacío!</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Receptores de Conversación en Grupo</string>
   <string name="ConversationActivity_group_conversation">Conversación en Grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo sin nombre</string>
   <string name="ConversationActivity_d_recipients_in_group">%d miembros</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 miembro</string>
-  <string name="ConversationActivity_saving_draft">Guardando borrador...</string>
+  <string name="ConversationActivity_saved_draft">Guardar borrador</string>
   <string name="ConversationActivity_invalid_recipient">Receptor inválido!</string>
   <string name="ConversationActivity_calls_not_supported">Llamadas no soportadas</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este dispositivo no es compatible con la función de realizar llamadas.</string>
@@ -92,6 +98,8 @@
   <string name="ConversationListFragment_deleting_selected_threads">Eliminando hilos seleccionados...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensaje de intercambio de claves...</string>
+  <!--ShareActivity-->
+  <string name="ShareActivity_share_with">Compartir con</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">¿Exportar a tarjeta SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Esto\n        exportará sus claves cifradas, configuración y mensajes a la tarjeta SD.\n    </string>
@@ -112,7 +120,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Nuevo grupo de MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Ha seleccionado un contacto que no soporta grupos TextSecure, así que este grupo será de MMS (mensajería multimedia).</string>
   <string name="GroupCreateActivity_you_dont_support_push">No está registrado para usar el canal de datos, así que tiene los grupos TextSecure deshabilitados.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Usted no es el propietario de este grupo, así que no puede editar el título ni la imagen.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ocurrió un error inesperado que ha hecho fallar la creación del grupo.</string>
   <string name="GroupCreateActivity_contacts_no_members">¡Necesita al menos una persona en su grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Uno de los miembros de su grupo tiene un número que no puede ser leído correctamente. Por favor arréglelo o elimine ese contacto, e inténtelo de nuevo.</string>
@@ -120,6 +127,7 @@
   <string name="GroupCreateActivity_avatar_content_description">Avatar del grupo</string>
   <string name="GroupCreateActivity_menu_create_title">Crear grupo</string>
   <string name="GroupCreateActivity_creating_group">Creando %1$s…</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">No se pudieron añadir contactos no-TextSecure a un grupo TextSecure existente</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">¿Importar base de datos de SMS del sistema?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Esto importará\n        los mensajes desde la base de datos de SMS del sistema a TextSecure. Si la ha importado\n        anteriormente, obtendrá mensajes duplicados.\n    </string>
@@ -214,6 +222,7 @@
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nSe recibió un mensaje con una clave de identidad desconocida. Haga clic para procesar y mostrar.\n</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Recibí actualizado pero con información de identidad desconocida. Pulse para validar identidad.</string>
   <string name="SmsMessageRecord_secure_session_ended">La sesión segura finalizó.</string>
+  <string name="SmsMessageRecord_duplicate_message">Duplicar mensaje.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Ha dejado el grupo...</string>
   <string name="TheadRecord_secure_session_ended">La sesión segura finalizó.</string>
@@ -305,12 +314,13 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">No hay contactos.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Buscando contactos...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Cargando contactos...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Escriba un nombre a filtrar...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">No está registrado con el servicio de mensajería activa...,</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Usted no está registrado con el servicio de actualizaciones activas (push)...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualizando directorio</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando directorio de mensajería activa...</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando el directorio de actualizaciones activas (push)...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Foto del contacto</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--contact_selection_recent_activity-->
@@ -319,9 +329,16 @@
   <string name="conversation_activity__type_message"><small>Enviar un mensaje</small></string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Eliminar</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Mensaje audiovisual</string>
+  <string name="conversation_item__play_button_description">Boton de reproducción</string>
+  <string name="conversation_item__secure_message_description">Indicador de mensaje seguro</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Descarga</string>
   <string name="conversation_item_sent__downloading">Descargando</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Indicador de envío fallido</string>
+  <string name="conversation_item_sent__pending_approval_description">Pendiente de aprobación</string>
+  <string name="conversation_item_sent__delivered_description">Indicador de entregado</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Descarga</string>
   <string name="conversation_item_received__downloading">Descargando</string>
@@ -349,6 +366,8 @@
   <string name="log_submit_activity__copied_to_clipboard">Copiado al portapapeles</string>
   <string name="log_submit_activity__loading_logcat">Cargando registro...</string>
   <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
+  <string name="log_submit_activity__submitting">Enviando</string>
+  <string name="log_submit_activity__posting_logs">Enviando registros (logs) a pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">¿Te gustaría importar los mensajes de texto existentes en la base de datos cifrada de TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de datos de sistema por defecto no será modificada o alterada de ningún modo.</string>
@@ -420,7 +439,7 @@
   <string name="registration_progress_activity__sms_verification_failed">Fallo de la\n        verificación SMS.\n    </string>
   <string name="registration_progress_activity__generating_keys">Generando claves...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Para</string>
+  <string name="recipients_panel__to"><small>Introduzca un nombre o número</small></string>
   <string name="recipients_panel__add_member">Añadir miembro</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">En este momento no tiene ninguna clave de identidad en su base de datos de confianza.</string>
@@ -454,8 +473,12 @@
   <string name="arrays__contact_keys">Claves de contacto</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
+  <string name="preferences__push_sms_category">Mensajes activos (push) y SMS</string>
+  <string name="preferences__pref_all_sms_title">Recibir todos los SMS</string>
+  <string name="preferences__pref_all_mms_title">Recibir todos los MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usar TextSecure para ver y guardar todos los mensajes de texto entrantes</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usar TextSecure para ver y guardar todos los mensajes multimedia entrantes</string>
+  <string name="preferences__input_settings">Preferencias de escritura</string>
   <string name="preferences__enable_enter_key_title">Habilitar tecla Intro</string>
   <string name="preferences__replace_smiley_with_enter_key">Reemplazar tecla de emoticón con una tecla Intro</string>
   <string name="preferences__pref_enter_sends_title">Envío con la tecla de entrada</string>
@@ -534,15 +557,25 @@
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Hace de TextSecure la aplicación SMS/MMS predeterminada para su sistema.</string>
   <string name="preferences__use_data_channel">Mensajes activos (\'push\')</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nIncremente la privacidad y evite tarifas SMS al usar el canal de datos para la comunicación con otros usuarios de TextSecure\n</string>
+  <string name="preferences__allow_sms_fallback">Permitir SMS salientes hacia</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure es actualmente su aplicación SMS por defecto. Por favor configure primero otra aplicación SMS por defecto antes de cambiar esta preferencia.</string>
   <string name="preferences__refresh_push_directory">Refrescar directorio de mensajería activa</string>
   <string name="preferences__submit_debug_log">Enviar registro de depuración</string>
+  <string name="preferences__sms_outgoing_push_users">Usuarios de TextSecure</string>
+  <string name="preferences__sms_fallback_push_users_ask">(preguntar primero)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Enviar SMS seguros si se perdió la conectividad de datos</string>
+  <string name="preferences__sms_fallback_ask_fallback">Preguntar antes de enviar SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Usuarios no-de-TextSecure</string>
+  <string name="preferences__sms_fallback_nobody">Nadie</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">Seleccionar todo</string>
   <string name="contact_selection_list__menu_unselect_all">Deseleccionar todo</string>
+  <string name="contact_selection_list__header_textsecure_users">USUARIOS DE TEXTSECURE</string>
+  <string name="contact_selection_list__header_other">TODOS LOS CONTACTOS</string>
+  <string name="contact_selection_list__unknown_contact">Nuevo mensaje a...</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Terminado</string>
   <!--refreshing push directory from menu-->

res/values-fi/strings.xml

@@ -7,10 +7,10 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Tällä hetkellä: %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">On annettava salasana ennen avainten hallinointia...</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Et ole vielä määritellyt salasanaa!</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ette ole vielä määritellyt salasanaa!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">viestiä yhdessä keskustelussa</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_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Oletteko varma, että haluatte rajata kaikki viestiketjut %s viimeisimpään viestiin?</string>
   <string name="ApplicationPreferencesActivity_delete">Poista</string>
   <string name="ApplicationPreferencesActivity_my">Minun</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Poistetaanko tallennustilan salaus käytöstä?</string>
@@ -19,12 +19,14 @@
   <string name="ApplicationPreferencesActivity_unregistering">Puretaan rekisteröintiä...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Tietoverkkovälitteiseen viestintään vaadittua rekisteröintiä puretaan</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Poistetaanko push-viestit käytöstä?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nTämä tulee lopettamaan push-palvelun poistamalla tietosi palvelimelta.\nKäyttääksesi push-palvelua tulevaisuudessa sinun täytyy rekisteröityä uudelleen.</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nTämä tulee lopettamaan push-palvelun poistamalla tietosi palvelimelta.\nKäyttääksenne push-palvelua tulevaisuudessa teidän täytyy rekisteröityä uudelleen.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Virhe yhdistettäessä palvelimeen!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Et olet rekisteröitynyt push-palveluun...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Päivitetään hakemistoa</string>
   <string name="ApplicationPreferencesActivity_updating_push_directory">Päivitetään push-hakemistoa...</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Saapuvat tekstiviestit sallittu</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa muuttaaksesi oletus tekstiviestisovellusta</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Saapuvat tekstiviestit kielletty</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Kosketa asettaaksesi TextSecuren oletus tekstiviestisovellukseksi</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Kuva</string>
@@ -37,12 +39,12 @@
   <string name="ConversationItem_saving_attachment">Liitettä tallennetaan</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Liitettä tallennetaan SD-muistikortille...</string>
   <string name="ConversationItem_save_to_sd_card">Tallenna SD-muistikortille?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Valittu media on tallennettuna salattuun tietokantaan. Olet tallentamassa sitä SD-muistikortille salaamattomana. Haluatko varmasti jatkaa?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Valittu media on tallennettuna salattuun tietokantaan. Olette tallentamassa sitä SD-muistikortille salaamattomana. Haluatteko varmasti jatkaa?</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Virhe SD-muistikorttiin tallennuksessa!</string>
   <string name="ConversationItem_success_exclamation">Onnistuimme!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">SD-muistikortille kirjoittaminen ei onnistunut!</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 kirjoitamista levylle. 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 kirjoitamista levylle. Oletteko varma, että haluatte tehdä tämän?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Avainvaihtoviesti vastaanotettu ja käsitelty.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Virhe. Vastaanotettu avainvaihtoviesti on vanhentunut.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Avainvaihtolähetys vastaanotettu, napsauta aloittaaksesi käsittelyn.</string>
@@ -50,6 +52,11 @@
   <string name="ConversationItem_group_action_left">%1$s on lähtenyt ryhmästä.</string>
   <string name="ConversationItem_group_action_joined">%1$s ovat liittyneet ryhmään.</string>
   <string name="ConversationItem_group_action_modify">%1$s on päivittänyt ryhmää.</string>
+  <string name="ConversationItem_click_to_approve">Aktivoi SMS varajärjestelmä</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Aktivoi salaamaton varajärjestelmä</string>
+  <string name="ConversationItem_click_to_approve_dialog_title">Käytä SMS varajärjestelmää?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">Käytä salaamattomia SMS -viestejä?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tätä viestiä <b>ei</b> voitu salata, koska turvattua istuntoa ei voitu muodostaa. \n\nLähetä salaamaton viesti?</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>
@@ -65,13 +72,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Äänitallenne ylittää viestin kokorajan.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Annettu numero tai sähköpostiosoite ei ole kelvollinen!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Viesti on tyhjä!</string>
-  <string name="ConversationActivity_forward_message_prefix">VL</string>
   <string name="ConversationActivity_group_conversation_recipients">Ryhmäkeskustelun vastaanottajat</string>
   <string name="ConversationActivity_group_conversation">Ryhmäkeskustelu</string>
   <string name="ConversationActivity_unnamed_group">Nimeämätön ryhmä</string>
   <string name="ConversationActivity_d_recipients_in_group">%d jäsentä</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 jäsen</string>
-  <string name="ConversationActivity_saving_draft">Luonnosta tallennetaan...</string>
   <string name="ConversationActivity_invalid_recipient">Virheellinen vastaanottaja!</string>
   <string name="ConversationActivity_calls_not_supported">Puhelut eivät ole tuettu</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Tämä laite ei näytä tukevan valintanäppäintoimintoja.</string>
@@ -92,6 +97,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Valittuja viestiketjuja poistetaan...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Avainvaihtoviesti...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Viedäänkö SD-muistikortille?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Tämä toiminto \ntulee viemään salatut avaimet, asetukset ja viestit SD-muistikortille.</string>
@@ -107,12 +113,11 @@
   <string name="ExportFragment_exporting_keys_settings_and_messages">Viedään salattuja avaimia,\nasetuksia ja viestejä...</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Uusi ryhmä</string>
-  <string name="GroupCreateActivity_actionbar_update_title">Päivitä ryhmä</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Päivitä ryhmää</string>
   <string name="GroupCreateActivity_group_name_hint">Ryhmän nimi</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Uusi MMS-ryhmä</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Olet valinnut yhteyshenkilön, joka ei tue TextSecuren ryhmäkeskusteluja. Tämä istunto tulee olemaan MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Et ole rekisteröitynyt käyttämään tietoverkkokanavaa, joten ryhmäkeskustelut ovat poissa käytöstä.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Et ole ryhmän omistaja, joten et voi muokata sen otsikkoa tai kuvaketta.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Et ole rekisteröitynyt käyttämään tiedonsiirtokanavaa, joten ryhmäkeskustelut ovat poissa käytöstä.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ryhmän luonti epäonnistui odottamattoman virheen takia.</string>
   <string name="GroupCreateActivity_contacts_no_members">Ryhmässä täytyy olla vähintään yksi henkilö!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Yhdellä ryhmän jäsenistä on puhelinnumero, jota ei voida lukea. Olkaa hyvä ja korjatkaa tämän henkilön yhteystietoja tai poistakaa hänet ryhmästä ja yritäkää uudelleen.</string>
@@ -158,7 +163,7 @@
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Salasana ei ole kelvollinen!</string>
   <!--PromptMmsActivity-->
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Operaattorisi MMSC URL täytyy määritellä.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS-asetukset päivitetty</string>
+  <string name="PromptMmsActivity_mms_settings_updated">MMS-asetuksia päivitetty</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Voit muokata näitä arvoja milloin tahansa TextSecuren asetusvalikosta.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Tämän avaintenvaihto-operaation allekirjoitus eroaa tältä kontaktilta aiemmin saaduista allekirjoituksista. Tämä voi tarkoittaa että joku yrittää kaapata viestiliikennettäsi tai että kontaktisi on uudelleenasentanut TextSecuren, ja käyttää nyt uutta tunnisteavainta.</string>
@@ -185,7 +190,7 @@
   <string name="RegistrationProgressActivity_edit_s">Muokkaa %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Rekisteröinti suoritettu!</string>
   <string name="RegistrationProgressActivity_possible_problems">Mahdollisia ongelmia.</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Sinun tulee ensiksi syöttää vastaanottamasi koodi...</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Teidän tulee ensiksi syöttää vastaanottamanne koodi...</string>
   <string name="RegistrationProgressActivity_connecting">Yhdistetään</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Yhdistetään varmennusta varten...</string>
   <string name="RegistrationProgressActivity_network_error">Verkkovirhe!</string>
@@ -202,18 +207,19 @@
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Olet äskettäin pyytänyt puhelua. Voit pyytää uutta puhelua 20 minuutin kuluttua.</string>
   <string name="RegistrationProgressActivity_verifying_voice_code">Tarkistetaan puhekoodia...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Rekisteröintiristiriita</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Tämä numero on jo rekisteröitynä toisella TextSecure-palvelimella (CyanogenMod?). Sinun täytyy purkaa rekisteröityminen siellä ennen kuin voit rekisteröityä.</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Tämä numero on jo rekisteröity toisella TextSecure-palvelimella (CyanogenMod?). Teidän täytyy purkaa rekisteröityminen siellä ennen kuin voitte rekisteröityä.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Rekisteröinti suoritettu</string>
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecureen rekisteröityminen suoritettiin onnistuneesti.</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Rekisteröityminen suoritettiin onnistuneesti.</string>
   <string name="RegistrationService_registration_error">Rekisteröintivirhe</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecureen rekisteröitymisessä ilmeni ongelma.</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 avainvaihtolähetys \non viallinen!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nVastaanotettu avainvaihtolähetys kuuluu väärälle protokollan versiolle.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nVastaanotettiin viesti tuntemattomalla tunnisteavaimella. Napsauta käsitelläksesi ja näyttääksesi.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Vastaanotettiin päivitetty, mutta tuntematon tunnistetieto. Napsauta tarkistaaksesi identiteetin.</string>
   <string name="SmsMessageRecord_secure_session_ended">Salattu istunto päättyi</string>
+  <string name="SmsMessageRecord_duplicate_message">Monistettu viesti.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Poistui ryhmästä...</string>
   <string name="TheadRecord_secure_session_ended">Salattu istunto päättyi</string>
@@ -233,7 +239,7 @@
   <string name="VerifyKeysActivity_scan_their_fingerprint">Skannaa heidän tunnisteensa</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">VAROITUS, skannattu avain EI TÄSMÄÄ! Tarkastakaa tunnisteteksti huolella.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">EI varmennettu!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Vastaanottajan tunnisteavain on oikein. Tunnisteteksti tulee myös tarkistaa.</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Vastaanottajan tunnisteavain on oikein. Tunnistetekstinne tulee myös tarkistaa.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Varmennettu!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Tunnisteavaimenne puuttuu.</string>
@@ -247,7 +253,7 @@
   <string name="ViewIdentityActivity_my_identity_fingerprint">Identiteettitunnisteeni</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">Olette jo lähettänyt istunnon aloituspyynnön tälle vastaanottajalle. Oletteko varma, että haluatte 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>
@@ -288,7 +294,7 @@
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Luodaan uutta \ntunnisteavainta...</string>
   <string name="ViewLocalIdentityActivity_regenerated">Luotu!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Vaihdetaanko tunnisteavain?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nVaroitus! Kun luot uuden tunnisteavaimen, nykyiset kontaktisi näkevät varoituksen aloittaessaan uuden salatun istunnon kanssasi.\nHaluatko varmasti jatkaa?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nVaroitus! Kun luotte uuden tunnisteavaimen, menetätte nykyisen tunnisteavaimenne pysyvästi \nja nykyiset kontaktinne tulevat näkemään varoituksen aloittaessaan uuden salatun istunnon kanssanne.\nHaluatteko varmasti jatkaa?</string>
   <string name="ViewLocalIdentityActivity_cancel">Peruuta</string>
   <string name="ViewLocalIdentityActivity_continue">Jatka</string>
   <!--SmsReceiver-->
@@ -296,7 +302,7 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Pahoittelemme. \"Quick Response\" ei ole vielä tuettu TextSecuressa!</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Olette saanut viestin henkilöltä, jolla on mahdollisuus TextSecuren salattuihin istuntoihin. Haluatteko aloittaa salatun istunnon?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Olette saaneet viestin henkilöltä, jolla on mahdollisuus TextSecuren salattuihin istuntoihin. Haluatteko aloittaa salatun istunnon?</string>
   <string name="auto_initiate_activity__initiate_exchange">Aloita avaintenvaihto</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">VANHA SALASANA:</string>
@@ -305,12 +311,13 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ei kontakteja.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Etsitään kontakteja...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Ladataan kontakteja…</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Kirjoita nimi suodattaaksesi...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Et olet rekisteröitynyt push-palveluun...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Et olet rekisteröitynyt push-palvelussa…</string>
   <string name="SingleContactSelectionActivity_updating_directory">Päivitetään hakemistoa</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Päivitetään push-hakemistoa...</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Päivitetään push-hakemistoa…</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Kontaktin kuva</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Valitse</string>
   <!--contact_selection_recent_activity-->
@@ -319,9 +326,16 @@
   <string name="conversation_activity__type_message"><small>Lähetä viesti</small></string>
   <string name="conversation_activity__send">Lähetä</string>
   <string name="conversation_activity__remove">Poista</string>
+  <!--conversation_item-->
+  <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 indikaattori</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Lataa</string>
   <string name="conversation_item_sent__downloading">Ladataan</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Lähetys epäonnistui indikaattori</string>
+  <string name="conversation_item_sent__pending_approval_description">Odottaa hyväksyntää</string>
+  <string name="conversation_item_sent__delivered_description">Toimitettu indikaattori</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Lataa</string>
   <string name="conversation_item_received__downloading">Ladataan</string>
@@ -339,7 +353,7 @@
   <string name="create_passphrase_activity__skip">Ohita</string>
   <string name="create_passphrase_activity__create">Luo</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Tämä loki julkaistaan internetissä TextSecuren kehittäjien tarkasteltavaksi. Voit tutkia ja muokkata alla olevaa lokia vapaasti ennen kuin painat lähetä.</string>
+  <string name="log_submit_activity__confirmation">Tämä loki julkaistaan internetissä TextSecuren kehittäjien tarkasteltavaksi. Voit tutkia ja muokata alla olevaa lokia vapaasti ennen kuin painat lähetä.</string>
   <string name="log_submit_activity__button_cancel">Älä lähetä</string>
   <string name="log_submit_activity__button_ok">Lähetä</string>
   <string name="log_submit_activity__log_fetch_failed">Lokien hakeminen laitteesta epäonnistui. Voit sen sijaan käyttää ADB-työkalua virheenkorjauslokien noutamiseen.</string>
@@ -349,8 +363,10 @@
   <string name="log_submit_activity__copied_to_clipboard">Kopioitu leikepöydälle</string>
   <string name="log_submit_activity__loading_logcat">Ladataan logcatia...</string>
   <string name="log_submit_activity__thanks">Kiitos avustasi!</string>
+  <string name="log_submit_activity__submitting">Lähetetään</string>
+  <string name="log_submit_activity__posting_logs">Lokeja lähetetään pastebin-palveluun…</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Haluatko tuoda olemassa olevat tekstiviestisi TextSecuren suojattuun tietokantaan?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Haluatteko tuoda olemassa olevat tekstiviestisinne TextSecuren suojattuun tietokantaan?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Järjestelmän oletustietokantaa ei tulla muuttamaan millään tavalla.</string>
   <string name="database_migration_activity__skip">Ohita</string>
   <string name="database_migration_activity__import">Tuo</string>
@@ -376,7 +392,7 @@
   <string name="prompt_passphrase_activity__unlock">Avaa</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure edellyttää MMS-asetuksia lähettääkseen mediaa ja ryhmäviestejä verkko-operaattorisi kautta. Laitettasi ei ole konfiguroitu antamaan näitä tietoja itsestään, mikä voi johtua laitteen lukituksesta operaattoriin tai muusta rajoitetusta kokoonpanosta.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Lähettääksesi mediatiedostoja ja ryhmäviestejä, napsauta \"OK\" ja täydennä pyydetyt asetukset. Verkko-operaattorisi MMS-asetukset voi yleensä paikantaa etsimällä termiä \"APN\". Sinun tarvitsee tehdä tämän vain kerran.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Lähettääksenne mediatiedostoja ja ryhmäviestejä, napsauttakaa \"OK\" ja täydentäkää pyydetyt asetukset. Verkko-operaattorinne MMS-asetukset voi yleensä paikantaa etsimällä termiä \"APN\". Teidän tarvitsee tehdä tämän vain kerran.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (vaadittu)</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMS-välityspalvelimen osoite (valinnainen)</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS-välityspalvelimen portti (valinnainen)</string>
@@ -393,14 +409,14 @@
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Mahdollisiin ongelmiin\nsisältyvät:</string>
   <string name="registration_problems__sms_interceptors">SMS -sieppajia.</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nJotkin kolmannen osapuolen tekstiviestisovellukset, kuten Handcent ja GoSMS, käyttäytyvät huonosti ja\nsieppaavat kaikki saapuvat tekstiviestit. Tarkista, jos olet saanut tekstiviestin, joka alkaa\nsanoilla \"TextSecure varmennuskoodisi: \', jolloin sinun täytyy säätää\nkolmannen osapuolen tekstiviestisovelluksesi päästämään tekstiviestisi läpi.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nJotkin kolmannen osapuolen tekstiviestisovellukset, kuten Handcent ja GoSMS, käyttäytyvät huonosti ja\nsieppaavat kaikki saapuvat tekstiviestit. Tarkistakaa, jos olette saaneet tekstiviestin, joka alkaa\nsanoilla \'Your TextSecure verification code:\', jolloin teidän täytyy säätää\nkolmannen osapuolen tekstiviestisovelluksenne päästämään tekstiviestinne 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">\nTakista, 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">\nTextSecure ei toimi Google Voice -numeroiden kanssa.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Puhevarmennus</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure voi myös soittaa sinulle numeron varmistamiseksi. Napsauta \"Soita minulle\" ja syötä kuulemasi kuusinumeroinen koodi alle. </string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure voi myös soittaa teille numeronne varmistamiseksi. Napsauttakaa \"Soita minulle\" ja syöttäkää kuulemanne kuusinumeroinen koodi alla olevaan kenttään. </string>
   <string name="registration_progress_activity__verify">Varmenna</string>
   <string name="registration_progress_activity__call_me">Soita minulle</string>
   <string name="registration_progress_activity__edit_number">Muokkaa numeroa</string>
@@ -420,10 +436,10 @@
   <string name="registration_progress_activity__sms_verification_failed">SMS-varmennus\nepäonnistui.</string>
   <string name="registration_progress_activity__generating_keys">Luodaan avaimia...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Vastaanottaja</string>
+  <string name="recipients_panel__to"><small>Syötä nimi tai numero</small></string>
   <string name="recipients_panel__add_member">Lisää jäsen</string>
   <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Tietokannassa ei tällä hetkellä ole luotettuja tunnisteavaimia.</string>
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Tietokannassanne ei tällä hetkellä ole luotettuja tunnisteavaimia.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Vastaanottajan tunniste (he lukevat):</string>
   <string name="verify_identity_activity__your_identity_you_read">Tunnisteenne (luette):</string>
@@ -455,15 +471,18 @@
   <!--preferences.xml-->
   <string name="preferences__general">Yleistä</string>
   <string name="preferences__push_sms_category">Push- ja tekstiviestit</string>
+  <string name="preferences__pref_all_sms_title">Vastaanota kaikki tekstiviestit</string>
+  <string name="preferences__pref_all_mms_title">Vastaanota kaikki multimediaviestit</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Käytä TextSecurea kaikkien saapuvien tekstiviestien katselemiseen ja tallentamiseen</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Käytä TextSecurea kaikkien saapuvien multimediaviestien katselemiseen ja tallentamiseen</string>
+  <string name="preferences__input_settings">Syöttöasetukset</string>
   <string name="preferences__enable_enter_key_title">Ota rivinvaihto käyttöön</string>
   <string name="preferences__replace_smiley_with_enter_key">Korvaa hymiönäppäin rivinvaihtonäppäimellä</string>
   <string name="preferences__pref_enter_sends_title">Rivinvaihto lähettää</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Rivinvaihdon painallus lähettää tekstiviestin</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Rivinvaihdon painallus lähettää viestin</string>
   <string name="preferences__display_settings">Näytön asetukset</string>
   <string name="preferences__choose_identity">Valitse tunniste</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Valitse kontakti osoitekirjasta.</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Valitkaa kontakti osoitekirjasta.</string>
   <string name="preferences__change_passphrase">Vaihda salasana</string>
   <string name="preferences__change_my_passphrase">Vaihda salasanani</string>
   <string name="preferences__complete_key_exchanges">Suorita avaimenvaihdot</string>
@@ -534,18 +553,25 @@
   <string name="preferences__make_default_sms_app">Aseta oletus tekstiviestisovellukseksi</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Tee TextSecuresta järjestelmäsi oletus SMS/MMS -sovellus.</string>
   <string name="preferences__use_data_channel">Push-viestit</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nKasvata yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tietoverkkokanavaa muiden TextSecuren käyttäjien kanssa.</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nParanna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsiirtokanavaa muiden TextSecuren käyttäjien kanssa.</string>
+  <string name="preferences__allow_sms_fallback">Salli lähtevät tekstiviestit</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure on tällä hetkellä oletus tekstiviestisovelluksesi. Aseta ensin toinen sovellus oletukseksi muuttaaksesi tätä asetusta.</string>
   <string name="preferences__refresh_push_directory">Päivitä push-hakemisto</string>
   <string name="preferences__submit_debug_log">Lähetä virheenkorjausloki</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecuren käyttäjät</string>
+  <string name="preferences__sms_outgoing_push_users">TextSecuren käyttäjille</string>
+  <string name="preferences__sms_fallback_push_users_ask">(kysy ensin)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Lähetä salattuja tekstiviestejä jos verkkoyhteys katkeaa</string>
   <string name="preferences__sms_fallback_ask_fallback">Kysy ennen tekstiviestien lähettämistä</string>
+  <string name="preferences__sms_fallback_non_push_users">Muille</string>
+  <string name="preferences__sms_fallback_nobody">Ei kenellekkään</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">Valitse kaikki</string>
   <string name="contact_selection_list__menu_unselect_all">Poista valinnat</string>
+  <string name="contact_selection_list__header_textsecure_users">TEXTSECUREN KÄYTTÄJÄT</string>
+  <string name="contact_selection_list__header_other">KAIKKI KONTAKTIT</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Valmis</string>
   <!--refreshing push directory from menu-->
@@ -576,7 +602,7 @@
   <string name="conversation_secure_verified__menu_abort_secure_session">Lopeta salattu istunto</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Lisää liite</string>
-  <string name="conversation__menu_update_group">Päivitä ryhmä</string>
+  <string name="conversation__menu_update_group">Päivitä ryhmää</string>
   <string name="conversation__menu_leave_group">Poistu ryhmästä</string>
   <string name="conversation__menu_add_contact_info">Lisää yhteystieto</string>
   <string name="conversation__menu_delete_thread">Poista viestiketju</string>

res/values-fr/strings.xml

@@ -53,7 +53,10 @@
   <string name="ConversationItem_group_action_joined">%1$s ont rejoint le groupe.</string>
   <string name="ConversationItem_group_action_modify">%1$s a mis à jour le groupe.</string>
   <string name="ConversationItem_click_to_approve">Appuyez pour utiliser la solution de repli SMS</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_dialog_title">Utiliser solution de repli SMS ?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">Se replier sur les SMS non chiffrés ?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ce message <b>ne</b> sera <b>pas</b> chiffré, car une session sécurisée n\'a pas pu être établie.\n\nEnvoyer un message non sécurisé ?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Initier une session sécurisée ?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initier une session sécurisée avec %s ?</string>
@@ -69,13 +72,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Désolé, le fichier audio sélectionné dépasse les restrictions de taille du message.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse SMS ou e-mail valide !</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Le message est vide !</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Destinataires de la Conversation de Groupe</string>
   <string name="ConversationActivity_group_conversation">Conversation de Groupe</string>
   <string name="ConversationActivity_unnamed_group">Groupe sans nom</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membres</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 membre</string>
-  <string name="ConversationActivity_saving_draft">Sauvegarde du brouillon…</string>
   <string name="ConversationActivity_invalid_recipient">Destinataire invalide !</string>
   <string name="ConversationActivity_calls_not_supported">Appels non pris en charge</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Cet appareil ne semble pas prendre en charge les actions de numérotation.</string>
@@ -96,6 +97,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Suppression des fils sélectionnés…</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Message d’échange des clés…</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exporter vers la carte SD ?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ceci ⏎\nexportera vos clés chiffrées, les paramètres et les messages sur la carte SD.</string>
@@ -116,7 +118,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Nouveau groupe MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Vous avez sélectionné un contact qui ne supporte pas les groupes TextSecure, ce groupe sera donc converti en groupe MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Vous n\'êtes pas enregistré pour utiliser la transmission de données, les groupes TextSecure sont donc désactivés.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Vous n’êtes pas le propriétaire de ce groupe, et ne pouvez donc pas modifier son titre ou son image.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Une erreur inattendue s\'est produite, ce qui a empêché la création du groupe.</string>
   <string name="GroupCreateActivity_contacts_no_members">Il vous faut au moins une personne dans votre groupe !</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Un des membres de votre groupe a un numéro illisible. Veuillez réparer ou enlever ce contact et essayer à nouveau.</string>
@@ -218,6 +219,7 @@
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nUn message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'accepter et l\'afficher.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Nouvelle information d\'identité mise à jour mais inconnue reçue. Appuyez pour valider l\'identité.</string>
   <string name="SmsMessageRecord_secure_session_ended">La session sécurisée s’est terminée.</string>
+  <string name="SmsMessageRecord_duplicate_message">Message doublon.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Groupe quitté…</string>
   <string name="TheadRecord_secure_session_ended">La session sécurisée s’est terminée.</string>
@@ -309,12 +311,13 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Aucun contact.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Recherche des contacts en cours...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Chargement des contacts...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Taper un nom à filtrer...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Vous n’êtes pas abonné au service push…</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Vous n\'êtes pas enregistré avec le service push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Mise à jour du répertoire</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Mise à jour du répertoire push…</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Mise à jour du dossier push...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Photo de contact</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Sélectionner pour</string>
   <!--contact_selection_recent_activity-->
@@ -323,9 +326,16 @@
   <string name="conversation_activity__type_message"><small>Envoyer un message</small></string>
   <string name="conversation_activity__send">Envoyer</string>
   <string name="conversation_activity__remove">Supprimer</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Message Multimédia</string>
+  <string name="conversation_item__play_button_description">Bouton Play</string>
+  <string name="conversation_item__secure_message_description">Indicateur de Message Sécurisé</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Télécharger</string>
   <string name="conversation_item_sent__downloading">Téléchargement</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Indicateur d\'Échec d’Envoi</string>
+  <string name="conversation_item_sent__pending_approval_description">En Attente d’Acceptation</string>
+  <string name="conversation_item_sent__delivered_description">Indicateur de Réception</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Télécharger</string>
   <string name="conversation_item_received__downloading">Téléchargement</string>
@@ -353,6 +363,8 @@
   <string name="log_submit_activity__copied_to_clipboard">Copié dans le presse-papier</string>
   <string name="log_submit_activity__loading_logcat">Chargement de logcat…</string>
   <string name="log_submit_activity__thanks">Merci pour votre aide !</string>
+  <string name="log_submit_activity__submitting">Soumission</string>
+  <string name="log_submit_activity__posting_logs">Enregistre les logs sur pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Voulez-vous importer vos messages textes existant dans la base de données chiffrée de TextSecure ?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de données par défaut du système ne sera en aucune façon modifiée ou altérée.</string>
@@ -424,7 +436,7 @@
   <string name="registration_progress_activity__sms_verification_failed">Échec de la vérification\npar SMS.</string>
   <string name="registration_progress_activity__generating_keys">Création des clés...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">À</string>
+  <string name="recipients_panel__to"><small>Entrez un nom ou un numéro</small></string>
   <string name="recipients_panel__add_member">Ajouter un membre</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Vous n\'avez pour l’instant  aucune clé d\'identité dans votre base de données de confiance.</string>
@@ -463,6 +475,7 @@
   <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 consulter et stocker tous les messages textes entrants</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour consulter et stocker tous les messages multimé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 émoticône par une touche Entrée</string>
   <string name="preferences__pref_enter_sends_title">La touche Entrée envoie</string>
@@ -557,6 +570,8 @@
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">Sélectionner tout</string>
   <string name="contact_selection_list__menu_unselect_all">Désélectionner tout</string>
+  <string name="contact_selection_list__header_textsecure_users">UTILISATEURS TEXTSECURE</string>
+  <string name="contact_selection_list__header_other">TOUS LES CONTACTS</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Terminé</string>
   <!--refreshing push directory from menu-->

res/values-he/strings.xml

@@ -48,10 +48,8 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">סליחה, קובץ השמע שנבחר חורג מגבולות גודל ההודעה.</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_forward_message_prefix">העבר</string>
   <string name="ConversationActivity_group_conversation_recipients">נמעני שיחה קבוצתית</string>
   <string name="ConversationActivity_group_conversation">שיחה קבוצתית</string>
-  <string name="ConversationActivity_saving_draft">שומר טיוטה...</string>
   <string name="ConversationActivity_invalid_recipient">נמען שגוי!</string>
   <string name="ConversationActivity_calls_not_supported">שיחות אינן נתמכות</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">נראה כי מכשיר זה אינו תומך בפעולות חיוג.</string>
@@ -68,6 +66,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">מוחק שרשורים שנבחרו...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">הודעת החלפת מפתח...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">לייצא לכרטיס ה-SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">פעולה זו\nתייצא את המפתחות, ההגדרות וההודעות המוצפנות שלך לכרטיס ה-SD.\n</string>
@@ -222,6 +221,7 @@
   <!--conversation_activity-->
   <string name="conversation_activity__send">שלח</string>
   <string name="conversation_activity__remove">הסר</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">הורד</string>
   <string name="conversation_item_sent__downloading">מוריד</string>
@@ -278,7 +278,6 @@
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <string name="recipients_panel__to">אל</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">אין לך מפתחות זהויות בבסיס הנתונים של המפתחות שאתה בוטח בהם.</string>
   <!--verify_identity_activity-->
@@ -311,6 +310,7 @@
   <string name="preferences__general">כללי</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">השתמש ב-TextSecure לצפייה ואחסון של כל הודעות הטקסט</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">השתמש ב-TextSecure לצפייה ואחסון של כל הודעות המולטימדיה</string>
+  <string name="preferences__input_settings">הכנס הגדרות</string>
   <string name="preferences__pref_enter_sends_title">\"אנטר\" שולח</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">לחיצה על כפתור ה-\"Enter\" תשלח הודעות טקסט</string>
   <string name="preferences__display_settings">הצג הגדרות</string>

res/values-id/strings.xml

@@ -14,6 +14,7 @@
   <string name="ApplicationPreferencesActivity_delete">Hapus</string>
   <string name="ApplicationPreferencesActivity_my">Saya</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Matikan enkripsi media simpan?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nPeringatan, ini akan menonaktifkan penyimpanan terenkripsi untuk semua pesan dan kunci. Sesi enkripsi\nanda selanjutnya akan berfungsi, tapi siapa saja yang mempunyai akses pisik ke perangkat anda\ndapat mengaksesnya</string>
   <string name="ApplicationPreferencesActivity_disable">Dinon aktifkan</string>
   <string name="ApplicationPreferencesActivity_unregistering">Keluar...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Keluar dari komunikasi berbasis data</string>
@@ -63,13 +64,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Maaf, audio terpilih melebihi batas ukuran pesan.</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_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Penerima Percakapan Grup</string>
   <string name="ConversationActivity_group_conversation">Percakapan Grup</string>
   <string name="ConversationActivity_unnamed_group">Grup tak bernama</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_saving_draft">Menyimpan draft...</string>
   <string name="ConversationActivity_invalid_recipient">Penerima tidak lengkap!</string>
   <string name="ConversationActivity_calls_not_supported">Panggilan Tidak Didukung</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Perangkat ini sepertinya tidak mendukung untuk panggilan.</string>
@@ -90,6 +89,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Menghapus percakapan yang dipilih ...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Pesan pertukaran kunci...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Export ke Kartu SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ini\nakan mengeksport kunci terenkripsi, dan pesan ke kartu SD    </string>
@@ -110,7 +110,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Grup MMS Baru</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Anda telah memilih kontak yang tidak mendukung grup 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_you_dont_own_this_group">Anda bukan pemilik grup ini, sehingga anda tidak dapat mengubah judul atau gambar.</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>
@@ -169,9 +168,11 @@
   <string name="RegistrationActivity_select_your_country">Pilih Negara Anda</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Anda harus menetapkan kode\nNegara anda\n</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Anda harus mengisi nomor\ntelefon anda\n</string>
-  <string name="RegistrationActivity_invalid_number">Nomor tidak lengkap</string>
+  <string name="RegistrationActivity_invalid_number">Nomor tidak benar</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nomor yang anda\nisikan (%s) tidak tepat.\n</string>
   <string name="RegistrationActivity_unsupported">Tidak didukung</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Maaf,\nperangkat ini tidak mendukung pesan data. Perangkat berjalan pada Android versi lama\ndari 4.0 harus registrasi Akun Google. Perangkat berjalan pada Android 4.0 atau lebih baru\ntidak memerlukan Akun Google, tetapi harus terpasang aplikasi Play Store</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nKami sekarang akan memverifikasi bahwa nomor berikut dikaitkan dengan perangkat ini:\n\n%s\n\n\nApakah nomor ini benar, apakah ingin merubahnya sebelum melanjutkan?</string>
   <string name="RegistrationActivity_continue">Lanjutkan</string>
   <string name="RegistrationActivity_edit">Edit</string>
   <!--RegistrationProblemsActivity-->
@@ -196,7 +197,7 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Server mengalami gangguan. Silakan coba lagi.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Terlalu Banyak Permintaan!</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_verifying_voice_code">Memverifikasi kode suara</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Memverifikasi kode suara...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Konflik pendaftaran</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Nomor ini telah didaftarkan di server TextSecure lainnya (CyanogenMod?). Anda harus keluar dari sana sebelum mendaftar ke server ini.</string>
   <!--RegistrationService-->
@@ -205,6 +206,8 @@
   <string name="RegistrationService_registration_error">Pendaftaran Gagal</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 \nmemproses pertukaran kunci korupsi.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nMenerima 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-->
@@ -298,12 +301,9 @@
   <!--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">Temukan kontak...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Ketik nama untuk memfilter...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Anda tidak terdaftar dengan layanan push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Memperbaharui direktori</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Sedang memperbaharui direktori...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Pilih untuk</string>
   <!--contact_selection_recent_activity-->
@@ -312,6 +312,7 @@
   <string name="conversation_activity__type_message"><small>Kirim pesan</small></string>
   <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>
@@ -354,7 +355,7 @@
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksport cadangan dienkripsi\nke kartu SD.</string>
   <string name="export_fragment__export_plaintext_backup">Eksport Cadangan Teks Polos</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExport cadangan ke teks polos yang kompatibel dengan \'SMSBackup And Restore\'  ke kartu SD.</string>
-  <string name="import_fragment__import_system_sms_database">Import Database SMS Sistem</string>
+  <string name="import_fragment__import_system_sms_database">Import Basis data SMS Sistem</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Import database\ndari aplikasi perpesan bawaan\n</string>
   <string name="import_fragment__import_encrypted_backup">Import Cadangan yang Diacak</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nPulihkan dari cadangan teracak TextSecure.\n</string>
@@ -403,7 +404,6 @@
   <string name="registration_progress_activity__sms_verification_failed">Verifikasi SMS\nTelah gagal\n</string>
   <string name="registration_progress_activity__generating_keys">Membuat kunci...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Kepada</string>
   <string name="recipients_panel__add_member">Tambah Anggota</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Saat ini anda tidak memiliki kunci identitas di database yang dipercaya</string>
@@ -437,8 +437,11 @@
   <string name="arrays__contact_keys">Kunci Kontak</string>
   <!--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__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gunakan TextSecure untuk melihat dan menyimpan semua pesan teks yang masuk</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gunakan TextSecure untuk melihat dan menyimpan semua pesan multimedia yang masuk</string>
+  <string name="preferences__input_settings">Seting Masukan</string>
   <string name="preferences__enable_enter_key_title">Gunakan tombol Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Ganti tombol smiley dengan tombol enter</string>
   <string name="preferences__pref_enter_sends_title">Tekan enter untuk mengirim</string>
@@ -519,6 +522,11 @@
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure saat ini sebagai aplikasi SMS default. Silakan tentukan aplikasi SMS default yang lain untuk mengganti nilai ini.</string>
   <string name="preferences__refresh_push_directory">Muat ulang direktori Push</string>
   <string name="preferences__submit_debug_log">Kirim debug log</string>
+  <string name="preferences__sms_outgoing_push_users">Pengguna TextSecure</string>
+  <string name="preferences__sms_fallback_push_users_ask">(tanya dulu)</string>
+  <string name="preferences__sms_fallback_ask_fallback">Tanyakan sebelum kirim SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Bukan pengguna TextSecure</string>
+  <string name="preferences__sms_fallback_nobody">Tak seorangpun</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-it/strings.xml

@@ -14,15 +14,19 @@
   <string name="ApplicationPreferencesActivity_delete">Elimina</string>
   <string name="ApplicationPreferencesActivity_my">Il mio</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Disabilitare la cifratura dei dati salvati?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAttenzione, così facendo interromperai la cifratura di tutti i messaggi e le chiavi che hai salvato. Le tue sessioni cifrate continueranno a funzionare, ma chiunque avrà accesso fisico al tuo dispositivo sarà in grado di accedere ad esse.</string>
   <string name="ApplicationPreferencesActivity_disable">Disabilita</string>
   <string name="ApplicationPreferencesActivity_unregistering">Annullamento della registrazione ...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Annullamento della registrazione dei dati di base della Comunicazione</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Disattivare messaggi push?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nQuesto disabiliterà i messaggi push e annullerà la tua registrazione sul server.\nAvrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messaggi push in futuro.\n</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Non sei registrato con il servizio push...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Aggiornamento directory</string>
   <string name="ApplicationPreferencesActivity_updating_push_directory">Aggiornamento directory push...</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS in entrata abilitati</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 in entrata disabilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tocca per rendere TextSecure l\'applicazione predefinita per gli SMS</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Immagine</string>
@@ -44,9 +48,12 @@
   <string name="ConversationItem_received_and_processed_key_exchange_message">Contrattazione della chiave ricevuta e completata.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Errore, ricevuto messaggio per la contrattazione della chiave scaduto.</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_received_plaintext_message_click_to_terminate">Ricevuto un SMS in chiaro durante una tua sessione sicura aperta. Se i destinatari non hanno una sessione aperta, i messaggi che manderai appariranno come testo incomprensibile. Clicca per terminare la sessione sicura.</string>
   <string name="ConversationItem_group_action_left">%1$s ha lasciato il gruppo.</string>
   <string name="ConversationItem_group_action_joined">%1$s è entrato nel gruppo.</string>
   <string name="ConversationItem_group_action_modify">%1$s ha aggiornato il gruppo.</string>
+  <string name="ConversationItem_click_to_approve">Tocca per ripiegare sugli SMS</string>
+  <string name="ConversationItem_click_to_approve_dialog_title">Ripiegare sugli SMS?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniziare una sessione sicura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniziare una sessione sicura con %s?</string>
@@ -62,13 +69,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Attenzione, il file audio selezionato supera la grandezza massima consentita.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Il destinatario non è un indirizzo valido per l\'SMS o per l\'email!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Il messaggio è vuoto!</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Conversazione di Gruppo Destinatari</string>
   <string name="ConversationActivity_group_conversation">Conversazione di Gruppo</string>
   <string name="ConversationActivity_unnamed_group">Gruppo senza nome</string>
   <string name="ConversationActivity_d_recipients_in_group">%d partecipanti</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 partecipante</string>
-  <string name="ConversationActivity_saving_draft">Salvataggio in corso</string>
   <string name="ConversationActivity_invalid_recipient">Destinatario invalido!</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>
@@ -89,6 +94,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Eliminazione delle conversazioni selezionate...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Messaggio di scambio della chiave...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Esporta alla scheda SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Verranno\n        esportate nella scheda SD le tue chiavi crittografiche, le impostazioni ed i messaggi.\n    </string>
@@ -108,8 +114,10 @@
   <string name="GroupCreateActivity_group_name_hint">Nome del gruppo</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nuovo gruppo MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Hai selezionato un contatto senza supporto ai gruppi TextSecure, quindi questo gruppo userà gli MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Non sei registrato per usare la connettività dati, quindi i gruppi TextSecure sono disabilitati.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Si è verificato un errore inatteso e la creazione del gruppo è fallito.</string>
   <string name="GroupCreateActivity_contacts_no_members">Il tuo gruppo deve contenere almeno una persona!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Uno dei membri del tuo gruppo ha un numero che non può essere letto correttamente. Sistema o rimuovi quel contatto e prova di nuovo.</string>
   <string name="GroupCreateActivity_file_io_exception">Errore di I/O, impossibile creare il file temporaneo.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar del gruppo</string>
   <string name="GroupCreateActivity_menu_create_title">Crea gruppo</string>
@@ -119,8 +127,8 @@
   <string name="ImportFragment_this_will_import_messages_from_the_system">In questo modo verranno importati i messaggi dal database predefinito di sitema per gli SMS a TextSecure. Se sono già stati importati in precedenza, la nuova importazione comporterà la duplicazione dei messaggi.\n</string>
   <string name="ImportFragment_import">Importa</string>
   <string name="ImportFragment_cancel">Annulla</string>
-  <string name="ImportFragment_restore_encrypted_backup">Ripristinare il Backup crittato?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n        Il rispristino di un backup cifrato sostiutirà compeltamente le chiavi esistenti, le preferenze e\n        i messaggi. Verranno perse tutte le informazioni presenti nell\'installazione attuale di TextSecure ma non\n        quelle nel backup.\n    </string>
+  <string name="ImportFragment_restore_encrypted_backup">Ripristinare il Backup cifrato?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n        Il rispristino di un backup cifrato sostituirà completamente le chiavi esistenti, le preferenze e\n        i messaggi. Verranno perse tutte le informazioni presenti nell\'installazione attuale di TextSecure ma non\n        quelle nel backup.\n    </string>
   <string name="ImportFragment_restore">Ripristina</string>
   <string name="ImportFragment_import_plaintext_backup">Importare backup in chiaro?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Questo importerà\nmessaggi da un backup. Se hai già effetuato un backup, </string>
@@ -130,8 +138,8 @@
   <string name="ImportFragment_error_importing_backup">Errore durante l\'importazione del backup!</string>
   <string name="ImportFragment_import_complete">Importazione terminata!</string>
   <string name="ImportFragment_restoring">Ripristino</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Ripristino backup crittato...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Nessun backup crittato trovato!</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Ripristino backup cifrato...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Nessun backup cifrato trovato!</string>
   <string name="ImportFragment_restore_complete">Ripristino completato!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nessuna chiave scansionata trovata!</string>
@@ -168,6 +176,8 @@
   <string name="RegistrationActivity_invalid_number">Numero non valido</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Il numero specificato\n(%s) non è valido</string>
   <string name="RegistrationActivity_unsupported">Non supportato</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Attenzione,\nquesto dispositivo non è supportato per i messaggi push. I dispositivi che usano versioni di Android\nprecedenti alla 4.0 devono avere un account Google registrato. I dispositivi che usano Android 4.0 o successivo\nnon richiedono un account Google, ma devono avere l\'applicazione Play Store installata.\n</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nStiamo per verificare che il seguente numero sia associato a questo dispositivo:\n\n%s\n\n\nQuesto numero è corretto, oppure vorresti cambiarlo prima di proseguire?\n\n</string>
   <string name="RegistrationActivity_continue">Continua</string>
   <string name="RegistrationActivity_edit">Modifica</string>
   <!--RegistrationProblemsActivity-->
@@ -201,6 +211,10 @@
   <string name="RegistrationService_registration_error">Errore di registarzione</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Si è verificato un problema durante la registrazione a TextSecure.</string>
   <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ricevuta una chiave corrotta\nscambia un altro messaggio!\n</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nRicevuto un messaggio di scambio chiavi per una versione di protocollo invalida.\n</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nRicevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elaborarla e mostrarla.\n</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Ricevute informazioni di identità aggiornate ma sconosciute. Clicca per validare l\'identità.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sessione sicura terminata.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Gruppo abbandonato...</string>
@@ -293,12 +307,9 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nessun contatto.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Cerco i contatti...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Digita un nome per filtrare...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Non sei registrato con il servizio push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Aggiornamento directory</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Aggiornamento directory push...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleziona per</string>
   <!--contact_selection_recent_activity-->
@@ -307,6 +318,7 @@
   <string name="conversation_activity__type_message"><small>Invia un messaggio</small></string>
   <string name="conversation_activity__send">Invia</string>
   <string name="conversation_activity__remove">Elimina</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Scarica</string>
   <string name="conversation_item_sent__downloading">Caricamento in corso</string>
@@ -346,13 +358,13 @@
   <string name="database_migration_activity__importing">COPIA</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aggiornamento Database...</string>
-  <string name="export_fragment__export_encrypted_backup">Esporta il backup crittato</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Esporta un backup\ncrittato sulla scheda SD</string>
+  <string name="export_fragment__export_encrypted_backup">Esporta il backup cifrato</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Esporta un backup\ncifrato sulla scheda SD</string>
   <string name="export_fragment__export_plaintext_backup">Esporto il backup in chiaro...</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nEsporto un backup in chiaro compatibile con \"SMSBackup And Restore\" sulla SD card.</string>
   <string name="import_fragment__import_system_sms_database">Importo il database SMS del sistema.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importa il database\ndall\'app SMS di default.</string>
-  <string name="import_fragment__import_encrypted_backup">Importa backup crittato</string>
+  <string name="import_fragment__import_encrypted_backup">Importa backup cifrato</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nRipristina un backup cifrato di TextSecure precedentemente esportato.</string>
   <string name="import_fragment__import_plaintext_backup">Importa un backup in chiaro</string>
   <string name="import_fragment__import_a_plaintext_backup_file">\nImporto un backup in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
@@ -363,6 +375,7 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">PASSWORD TEXTSECURE</string>
   <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__mmsc_url_required">MMSC URL ( RICHIESTO )</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMS INDIRIZZO PROXY ( OPZIONALE )</string>
@@ -370,6 +383,7 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completato</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure può usare i messaggi istantanei per aumentare la privacy ed evitare i costi degli SMS quando comunichi\ncon altri utenti TextSecure. Per abilitare questa funzione, verifica il tuo numero di telefono.\n</string>
   <string name="registration_activity__your_country">PAESE</string>
   <string name="registration_activity__your_country_code_and_phone_number">CODICE DEL PAESE E\nNUMERO DI TELEFONO</string>
   <string name="registration_activity__phone_number">NUMERO DI TELEFONO</string>
@@ -377,13 +391,16 @@
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">La registrazione invierà temporaneamente al server alcune informazioni di contatto.</string>
   <string name="registration_activity__skip">Salta</string>
   <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Alcuni possibili problemi\ntra cui:\n</string>
   <string name="registration_problems__sms_interceptors">Intercettori dei SMS </string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nAlcuni client SMS di terze parti, come Handcent o GoSMS, si comportano male e \nintercettano tutti i messaggi SMS in entrata. Verifica in questi client se hai ricevuto un messaggio\nche inizia con \'Your TextSecure verification code:\', nel qual caso avrai bisogno di configurare\nquel client SMS in modo da permettergli di inoltrare i messaggi SMS.\n</string>
   <string name="registration_problems__incorrect_number">Numero errato.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\n        Controlla di aver inserito il tuo numero formattato correttamente per\n        la tua regione.\n    </string>
   <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure non funzionerà con i numeri Google Voice.\n</string>
   <!--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">\nTextSecure può anche chiamarti per verificare il tuo numero. Clicca \'Chiamami\' ed inserisci\nin basso il codice a sei cifre che hai ascoltato.\n</string>
   <string name="registration_progress_activity__verify">Veirifca</string>
   <string name="registration_progress_activity__call_me">Chiamami</string>
   <string name="registration_progress_activity__edit_number">Modifica numero</string>
@@ -393,14 +410,16 @@
   <string name="registration_progress_activity__no_network_connectivity">Nessuna connessione\ndi rete.\n</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Il dispositivo\n        necessita di una connessione di rete per usare questa funzionalità di TextSecure. Verificare di\n        essere connessi a una rete 3G o Wifi.\n    </string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall troppo restrittivo.\n    </string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nSe sei connesso tramite wifi, è possibile che ci sia un firewall che blocchi l\'accesso\nal server TextSecure. Prova un\'altra rete oppure usa la connessione mobile.\n</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure sta per verificare automaticamente il tuo numero con un messaggio SMS di conferma.\n</string>
   <string name="registration_progress_activity__connecting">Connessione in corso...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">In attesa di\n        verifica SMS...\n    </string>
   <string name="registration_progress_activity__registering_with_server">Registrazione con il server...</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Questo\n        potrebbe richiedere del tempo. Attendere, una notifica verrà mostrata quando la verifica sarà completata.\n    </string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure non ha ricevuto in tempo il messaggio SMS di verifica.</string>
   <string name="registration_progress_activity__sms_verification_failed">Verifica SMS\nnon riuscita.\n    </string>
   <string name="registration_progress_activity__generating_keys">Generazione chiavi...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">A</string>
   <string name="recipients_panel__add_member">Aggiungi partecipante</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Attualmente non hai nessuna chiave di identità nel tuo database di fiducia.</string>
@@ -434,11 +453,15 @@
   <string name="arrays__contact_keys">Chiavi dei contatti</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generale</string>
+  <string name="preferences__push_sms_category">Push e SMS</string>
+  <string name="preferences__pref_all_sms_title">Utilizza per tutti gli SMS</string>
+  <string name="preferences__pref_all_mms_title">Utilizza per tutti gli SMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usa TextSecure per vedere e salvare tutti i messaggi in arrivo</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usa TextSecure per vedere e salvare tutti gli MMS in arrivo</string>
-  <string name="preferences__enable_enter_key_title">Abilita il tasto invio</string>
+  <string name="preferences__input_settings">Impostazioni di Input</string>
+  <string name="preferences__enable_enter_key_title">Abilita il tasto Invio</string>
   <string name="preferences__replace_smiley_with_enter_key">Sostituisci il tasto faccina con un tasto invio</string>
-  <string name="preferences__pref_enter_sends_title">Inserisci inviati</string>
+  <string name="preferences__pref_enter_sends_title">Spedisci con Invio</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Premere il tasto Invio manderà i messaggi</string>
   <string name="preferences__display_settings">Impostazioni Display</string>
   <string name="preferences__choose_identity">Scegli un\'identità</string>
@@ -470,7 +493,7 @@
   <string name="preferences__pref_led_blink_custom_pattern_set">Lampeggiamento personalizzato impostato!</string>
   <string name="preferences__sound">Suono</string>
   <string name="preferences__change_notification_sound">Cambia il suono di notifica</string>
-  <string name="preferences__inthread_notifications">notifiche</string>
+  <string name="preferences__inthread_notifications">Notifiche</string>
   <string name="preferences__play_inthread_notifications">Notifiche audio durante la lettura di una conversazione.</string>
   <string name="preferences__vibrate">Vibrazione</string>
   <string name="preferences__also_vibrate_when_notified">Vibra anche durante l\'arrivo di una notifica</string>
@@ -490,8 +513,8 @@
   <string name="preferences__custom">Personalizzato</string>
   <string name="preferences__advanced">Avanzate</string>
   <string name="preferences__passphrase">Passphrase</string>
-  <string name="preferences__advanced_mms_access_point_names">Impostazioni MMS.</string>
-  <string name="preferences__enable_manual_mms">Abilita MMS manuali.</string>
+  <string name="preferences__advanced_mms_access_point_names">Impostazioni MMS</string>
+  <string name="preferences__enable_manual_mms">Abilita MMS manuali</string>
   <string name="preferences__override_system_mms_settings">Sovrascrivi le impostazioni MMS di sistema con le seguenti informazioni</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Richiesto)</string>
   <string name="preferences__mms_proxy_host_optional">MMS - Indirizzo Proxy ( Opzionale )</string>
@@ -513,9 +536,17 @@
   <string name="preferences__make_default_sms_app">Imposta come applicazione SMS predefinita.</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Rendi TextSecure l\'applicazione predefinita per SMS/MMS.</string>
   <string name="preferences__use_data_channel">Messaggi push</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAumenta la privacy ed evita i costi degli SMS usando la connettività dati per comunicare con altri utenti TextSecure\n</string>
+  <string name="preferences__allow_sms_fallback">Permetti gli SMS in uscita a</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure è impostata come app predefinita per gli SMS. Per poter modificare questa preferenza devi prima selezionare un\'altra app come predefinita per gli SMS.</string>
   <string name="preferences__refresh_push_directory">Aggiorna directory push</string>
   <string name="preferences__submit_debug_log">Invia log di debug</string>
+  <string name="preferences__sms_outgoing_push_users">Utenti TextSecure</string>
+  <string name="preferences__sms_fallback_push_users_ask">(chiedi prima)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Manda SMS sicuri se la connettività dati è assente</string>
+  <string name="preferences__sms_fallback_ask_fallback">Chiedi prima di inviare SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Utenti Non-TextSecure</string>
+  <string name="preferences__sms_fallback_nobody">Nessuno</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-ja/strings.xml

@@ -52,13 +52,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">選択された音声ファイルは容量を超えています。</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">受信先のSMS又はEメールアドレスが有効ではありません。</string>
   <string name="ConversationActivity_message_is_empty_exclamation">メッセージが空です。</string>
-  <string name="ConversationActivity_forward_message_prefix">転送：</string>
   <string name="ConversationActivity_group_conversation_recipients">グループ通信の受信者</string>
   <string name="ConversationActivity_group_conversation">グループ通信</string>
   <string name="ConversationActivity_unnamed_group">グループ名なし</string>
   <string name="ConversationActivity_d_recipients_in_group">参加者%d人</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">参加者1人</string>
-  <string name="ConversationActivity_saving_draft">下書き保存中…</string>
   <string name="ConversationActivity_invalid_recipient">受信先が無効です。</string>
   <string name="ConversationActivity_calls_not_supported">通話不可</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">お使いの端末は、ダイヤル機能に対応していないようです。</string>
@@ -75,6 +73,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">選択したスレッドを削除中…</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">鍵交換のメッセージ…</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">SDカードへエクスポートしますか？</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">これで、あなたの暗号化された鍵、設定、及びメッセージはSDカードへエクスポートされますが、よろしいですか？</string>
@@ -251,7 +250,6 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">連絡先はありません。</string>
-  <string name="contact_selection_group_activity__finding_contacts">連絡先を検索中...</string>
   <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">選択</string>
@@ -261,6 +259,7 @@
   <string name="conversation_activity__type_message">メッセージを送信</string>
   <string name="conversation_activity__send">送信</string>
   <string name="conversation_activity__remove">削除</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">ダウンロード</string>
   <string name="conversation_item_sent__downloading">ダウンロード中</string>
@@ -329,7 +328,6 @@
   <string name="registration_progress_activity__registering_with_server">サーバーに登録中...</string>
   <string name="registration_progress_activity__generating_keys">鍵を作成中...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">宛先</string>
   <string name="recipients_panel__add_member">参加者を追加する</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">信用した鍵のデータベースに認証キーは現在ありません。</string>
@@ -364,6 +362,7 @@
   <string name="preferences__general">一般設定</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">受信する全てのSMS（テキストメッセージ）の表示、及び保存にTextSecureを使用します</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">受信する全てのMMS（ファイル付きメッセージ）の表示、及び保存にTextSecureを使用します</string>
+  <string name="preferences__input_settings">設定入力</string>
   <string name="preferences__enable_enter_key_title">エンターキーを使えるようにする</string>
   <string name="preferences__replace_smiley_with_enter_key">顔文字ボタンをエンターキーにする</string>
   <string name="preferences__pref_enter_sends_title">Enterキーで送信</string>

res/values-kn-rIN/strings.xml

@@ -54,10 +54,8 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">ಕ್ಷಮಿಸಿ, ಆಯ್ಕೆ ಶ್ರಾವ್ಯ ಸಂದೇಶ ಗಾತ್ರ ನಿರ್ಬಂಧಗಳನ್ನು ಮೀರಿದೆ.</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_forward_message_prefix">ಎಫ್. ಡಬ್ಲು. ಡಿ</string>
   <string name="ConversationActivity_group_conversation_recipients">ಸಮೂಹ ಸಂವಾದದ ಸ್ವೀಕೃತದಾರರು</string>
   <string name="ConversationActivity_group_conversation">ಸಮೂಹ ಸಂವಾದ</string>
-  <string name="ConversationActivity_saving_draft">ಕರಡು ಉಳಿಸುತ್ತಿದ್ದೇವೆ</string>
   <string name="ConversationActivity_invalid_recipient">ಸ್ವೀಕರಿಸುವವರು ಅಮಾನ್ಯ!</string>
   <string name="ConversationActivity_calls_not_supported">ಕರೆಗಳ ಬೆಂಬಲವಿರುವುದಿಲ್ಲ</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">ಈ ಸಾಧನದಲ್ಲಿ ಡಯಲ್ ಕ್ರಮಗಳ ಬೆಂಬಲ ಕಂಡುಬರುತ್ತಿಲ್ಲ.</string>
@@ -74,6 +72,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">ಆಯ್ದ ವಾದಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶ...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">ಎಸ್.ಡಿ  ಕಾರ್ಡ್ಗೆ ರಫ್ತು ಮಾಡಿ?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">ಇದು\nಏಸ್.ಡಿ ಕಾರ್ಡ್ಗೆ ನಿಮ್ಮ ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಕೀಲಿಗಳನ್ನು, ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮತ್ತು ಸಂದೇಶಗಳ ರಫ್ತು ಮಾಡುತ್ತದೆ.</string>
@@ -272,8 +271,10 @@
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">ಯಾವುದೇ ಇತ್ತೀಚಿನ ಕರೆಗಳಿಲ್ಲ.</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message"><small>ಸಂದೇಶ ಕಳುಹಿಸಲು</small></string>
   <string name="conversation_activity__send">ಕಳುಹಿಸು</string>
   <string name="conversation_activity__remove">ತೆಗೆದುಹಾಕಿ</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">ಡೌನ್ಲೋಡ್</string>
   <string name="conversation_item_sent__downloading">ಡೌನ್ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
@@ -286,6 +287,7 @@
   <string name="country_selection_fragment__loading_countries">ರಾಷ್ಟ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ ...</string>
   <string name="country_selection_fragment__search">ಹುಡುಕಿ</string>
   <!--create_passphrase_activity-->
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">ನೀವು ಸ್ಥಳೀಯವಾಗಿ ನಿಮ್ಮ ದತ್ತಾಂಶವನ್ನು ಗೂಢಲಿಪೀಕರಿಸ ಬಯಸಿದಲ್ಲಿ ಗುಪ್ತವಾಕ್ಯಾಂಶವನ್ನು ಆರಿಸಿ.</string>
   <string name="create_passphrase_activity__passphrase">ಗುಪ್ತಪದ:</string>
   <string name="create_passphrase_activity__repeat">ಪುನರಾವರ್ತಿಸಿ:</string>
   <string name="create_passphrase_activity__continue">ಮುಂದುವರಿಸು</string>
@@ -363,7 +365,7 @@
   <string name="registration_progress_activity__sms_verification_failed">ಎಸ್ ಎಂ ಎಸ್ ಪರಿಶೀಲನೆ \nವಿಫಲವಾಗಿದೆ. </string>
   <string name="registration_progress_activity__generating_keys">ಕೀಲಿಗಳನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">ಗೆ</string>
+  <string name="recipients_panel__to"><small>ಹೆಸರು ಅಥವಾ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</small></string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">ನೀವು ಪ್ರಸ್ತುತ ನಿಮ್ಮ ನಂಬಿಕೆ ದತ್ತಾಂಶ ಸಂಗ್ರಹದಲ್ಲಿ ಯಾವುದೇ ಗುರುತು ಕೀಲಿಗಳನ್ನು ಹೊಂದಿಲ್ಲ.</string>
   <!--verify_identity_activity-->
@@ -394,6 +396,7 @@
   <string name="arrays__contact_keys">ಸಂಪರ್ಕದ ಕೀಲಿಗಳು</string>
   <!--preferences.xml-->
   <string name="preferences__general">ಸಾಮಾನ್ಯ</string>
+  <string name="preferences__pref_all_sms_title">ಎಲ್ಲಾ ಎಸ್ ಎಂ ಎಸ್ ಪಡೆಯುವಿರಿ</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">ಎಲ್ಲಾ ಒಳಬರುವ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಮತ್ತು ಸಂಗ್ರಹಿಸಲು ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬಳಸಿ</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">ಎಲ್ಲಾ ಒಳಬರುವ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಮತ್ತು ಸಂಗ್ರಹಿಸಲು ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬಳಸಿ</string>
   <string name="preferences__enable_enter_key_title">ಎಂಟರ್ ಕೀಲಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>

res/values-my/strings.xml

@@ -41,10 +41,8 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">ရွေးထားသော အသံဖိုင်သည် ကန့်သတ်ထားသော အရွယ်ကျော်နေ</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_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">အစုအဖွဲ့ဖြင့်စကားစမြည်ပြောခြင်းလက်ခံသူများ</string>
   <string name="ConversationActivity_group_conversation">အစုအဖွဲ့ဖြင့်စကားစမြည်ပြောခြင်း</string>
-  <string name="ConversationActivity_saving_draft">အကြမ်းသိမ်း...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
   <string name="ConversationFragment_confirm_message_delete">စာတိုဖျက်ခြင်းကိုအတည်ပြု</string>
@@ -58,6 +56,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">ရွေးချယ်ထားသောစကားဝိုင်းကိုဖျက်နေသည်...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_success">အောင်မြင်!</string>
   <!--GroupCreateActivity-->
@@ -168,6 +167,7 @@
   <!--conversation_activity-->
   <string name="conversation_activity__send">ပို့</string>
   <string name="conversation_activity__remove">ဖယ်ပစ်</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">ကူးဆွဲ</string>
   <string name="conversation_item_sent__downloading">ကူးဆွဲနေသည်</string>
@@ -208,7 +208,6 @@
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <string name="recipients_panel__to">သို့</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">သင်၏စိတ်ချရသော　ဒေတာဘေ့၌　သင့်အသိအမှတ်ပြုကီး　လက်ရှိတွင်　မရှိသေး</string>
   <!--verify_identity_activity-->
@@ -237,6 +236,7 @@
   <!--preferences.xml-->
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">textsecure ကိုဝင်လာသောစာတိုများကိုကြည့်ရန်/သိမ်းရန်အတွက်သုံးပါ</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">textsecure ကိုဝင်လာသောမာတီမီဒီယာစာတိုများကိုကြည့်ရန်/သိမ်းရန်အတွက်သုံးပါ</string>
+  <string name="preferences__input_settings">ကီးဘုတ်ပုံစံသတ်မှတ်ချက်များ</string>
   <string name="preferences__pref_enter_sends_title">ပို့ရန်ကိုနှိပ်ပါ</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter နှိပ်လျှင် စာသားများကို ပို့ပါမည်</string>
   <string name="preferences__display_settings">သတ်မှတ်ချက်များကိုပြပါ</string>

res/values-nl/strings.xml

@@ -24,7 +24,9 @@
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">U bent niet geregistreerd bij de push service...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Contactpersonen updaten</string>
   <string name="ApplicationPreferencesActivity_updating_push_directory">Pushcontactpersonen updaten...</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Inkomende SMS geactiveerd</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Raak aan om uw standaard SMS applicatie te veranderen</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Inkomende SMS uitgeschakeld</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Raak aan om TextSecure uw standaard SMS applicatie te maken</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Afbeelding</string>
@@ -50,6 +52,11 @@
   <string name="ConversationItem_group_action_left">%1$s heeft de groep verlaten.</string>
   <string name="ConversationItem_group_action_joined">%1$s is toegetreden tot de groep.</string>
   <string name="ConversationItem_group_action_modify">%1$s heeft de groep bijgewerkt.</string>
+  <string name="ConversationItem_click_to_approve">Tik voor terugvallen op SMS</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Tik voor terugvallen op onveilige verbinding</string>
+  <string name="ConversationItem_click_to_approve_dialog_title">Terugvallen naar SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">Terugvallen op onversleutelde SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Dit bericht zal <b>niet</b> versleuteld worden, omdat een veilige sessie niet opgezet kon worden.\n\nBericht onveilig versturen?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Initieer Beveiligde Sessie?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initieer beveiligde sessie met %s?</string>
@@ -65,13 +72,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Excuses, de geselecteerde audio overschrijdt de berichtgrootterestricties.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ontvanger is niet een geldig SMS of e-mailadres!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Bericht is leeg!</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Groepsconversatie Ontvangers</string>
   <string name="ConversationActivity_group_conversation">Groepsconversatie</string>
   <string name="ConversationActivity_unnamed_group">Naamloze Groep</string>
   <string name="ConversationActivity_d_recipients_in_group">%d leden</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 lid</string>
-  <string name="ConversationActivity_saving_draft">Concept opslaan...</string>
   <string name="ConversationActivity_invalid_recipient">Ongeldige ontvanger!</string>
   <string name="ConversationActivity_calls_not_supported">Oproepen Niet Ondersteund</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dit apparaat lijkt dial-acties niet te ondersteunen.</string>
@@ -92,6 +97,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Geselecteerde conversaties aan het verwijderen...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Sleuteluitwisselingsbericht...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Opslaan op SD-kaart?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dit exporteert je keys, instellingen en berichten versleuteld naar de SD-kaart</string>
@@ -106,13 +112,12 @@
   <string name="ExportFragment_success">Succesvol!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Keys, instellingen en berichten versleuteld naar de SD-kaart aan het exporteren...</string>
   <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_actionbar_title">Nieuwe Groep</string>
+  <string name="GroupCreateActivity_actionbar_title">Nieuwe groep</string>
   <string name="GroupCreateActivity_actionbar_update_title">Groep Bijwerken</string>
   <string name="GroupCreateActivity_group_name_hint">Groepsnaam</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nieuwe MMS-Groep</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">U hebt een contactpersoon geselecteerd die geen TextSecure-groepen ondersteunt, dus deze groep zal gebruik maken van MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">U bent niet geregistreed om het datakanaal te gebruiken, dus TextSecure groepen zijn uitgeschakeld.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Je bent niet de beheerder van deze groep, dus je de titel of afbeelding niet wijzigen.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Er is een onverwachte fout opgetreden waardoor het aanmaken van een groep is mislukt.</string>
   <string name="GroupCreateActivity_contacts_no_members">Uw groep moet ten minste één persoon bevatten.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Het nummer van een van de leden van uw groep kan niet goed worden gelezen. Corrigeer dit of verwijder deze persoon, en probeer het opnieuw.</string>
@@ -214,8 +219,9 @@
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nBericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en weer te geven.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Bijgewerkte maar onbekende identiteitsgegevens ontvangen. Raak aan om identiteit te bevestigen.</string>
   <string name="SmsMessageRecord_secure_session_ended">Beveiligde sessie beëindigd.</string>
+  <string name="SmsMessageRecord_duplicate_message">Dupliceer bericht.</string>
   <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Heeft de groep verlaten...</string>
+  <string name="ThreadRecord_left_the_group">Je hebt deze groep verlaten...</string>
   <string name="TheadRecord_secure_session_ended">Beveiligde sessie beëindigd.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">U heeft geen identiteitssleutel.</string>
@@ -305,12 +311,13 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Geen contacten.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Contacten zoeken...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Contacten laden...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Type een naam om te zoeken...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">U bent niet geregistreerd bij de push service...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Contactpersonen updaten</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Pushcontactpersonen updaten...</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Pushcontacten aan het updaten...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Contactfoto</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecteer voor</string>
   <!--contact_selection_recent_activity-->
@@ -319,9 +326,16 @@
   <string name="conversation_activity__type_message"><small>Verstuur een bericht</small></string>
   <string name="conversation_activity__send">Verstuur</string>
   <string name="conversation_activity__remove">Verwijder</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Media Bericht</string>
+  <string name="conversation_item__play_button_description">Afspeelknop</string>
+  <string name="conversation_item__secure_message_description">Beveiligd Bericht Indicator</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
   <string name="conversation_item_sent__downloading">Downloaden</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Verzenden Mislukt Indicator</string>
+  <string name="conversation_item_sent__pending_approval_description">In afwachting van goedkeuring</string>
+  <string name="conversation_item_sent__delivered_description">Afgeleverd Indicator</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Download</string>
   <string name="conversation_item_received__downloading">Downloaden</string>
@@ -349,6 +363,8 @@
   <string name="log_submit_activity__copied_to_clipboard">Gekopieerd naar klembord</string>
   <string name="log_submit_activity__loading_logcat">Logcat laden...</string>
   <string name="log_submit_activity__thanks">Bedankt voor uw hulp!</string>
+  <string name="log_submit_activity__submitting">Aan het indienen</string>
+  <string name="log_submit_activity__posting_logs">Logs aan het plaatsen op pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Wilt u uw huidige tekstberichtendatabase importeren naar de versleutelde database van TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">De standaard systeemdatabase zal niet gewijzigd of aangepast worden op enigerlei wijze.</string>
@@ -420,7 +436,7 @@
   <string name="registration_progress_activity__sms_verification_failed">SMS-verificatie mislukt.</string>
   <string name="registration_progress_activity__generating_keys">Sleutels genereren...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Aan</string>
+  <string name="recipients_panel__to"><small>Typ een naam of nummer</small></string>
   <string name="recipients_panel__add_member">Voeg groepslid toe</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">U heeft momenteel geen identiteitssleutels in uw vertrouwensdatabase.</string>
@@ -454,24 +470,28 @@
   <string name="arrays__contact_keys">Sleutels van Contacten</string>
   <!--preferences.xml-->
   <string name="preferences__general">Algemeen</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gebruik TextSecure voor het bekijken en opslaan van alle inkomende tekstberichten</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gebruik TextSecure voor het bekijken en opslaan van alle inkomende multimediaberichten</string>
+  <string name="preferences__push_sms_category">Push en SMS</string>
+  <string name="preferences__pref_all_sms_title">Ontvang alle SMS</string>
+  <string name="preferences__pref_all_mms_title">Ontvang alle MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure gebruiken voor het bekijken en opslaan van alle inkomende tekstberichten</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure gebruiken voor het bekijken en opslaan van alle inkomende multimediaberichten</string>
+  <string name="preferences__input_settings">Invoer Instellingen</string>
   <string name="preferences__enable_enter_key_title">Activeer Enter-toets</string>
-  <string name="preferences__replace_smiley_with_enter_key">Vervang de smiley-toets door een enter-toets</string>
+  <string name="preferences__replace_smiley_with_enter_key">De smiley-toets vervangen door een enter-toets</string>
   <string name="preferences__pref_enter_sends_title">Enter verstuurt</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">De \'Enter\' toets gebruiken voor versturen tekstberichten</string>
   <string name="preferences__display_settings">Beeldscherminstellingen</string>
   <string name="preferences__choose_identity">Kies Identiteit</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Kies uw contactinformatie uit de contactpersonenlijst.</string>
   <string name="preferences__change_passphrase">Verander wachtwoord</string>
-  <string name="preferences__change_my_passphrase">Verander mijn wachtwoord</string>
+  <string name="preferences__change_my_passphrase">Mijn wachtwoord veranderen</string>
   <string name="preferences__complete_key_exchanges">Voltooi sleuteluitwisselingen</string>
   <string name="preferences__disable_passphrase">Wachtwoord uitschakelen</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Lokale versleuteling van berichten en sleutels uitschakelen</string>
-  <string name="preferences__screen_security">Scherm veiligheid</string>
+  <string name="preferences__screen_security">Schermbeveiliging</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatisch sleuteluitwisselingen voltooien voor nieuwe sessies of voor bestaande sessies met dezelfde identiteitssleutel</string>
-  <string name="preferences__disable_screen_security_to_allow_screen_shots">Zet scherm veiligheid uit om screenshots mogelijk te maken</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Vergeet het wachtwoord uit het geheugen na een bepaalde tijd</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Screenshots onmogelijk maken</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Wachtwoord na een bepaalde tijd uit het geheugen vergeten</string>
   <string name="preferences__timeout_passphrase">Time-out wachtwoord</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Selecteer Wachtwoord Time-out</string>
   <string name="preferences__pref_timeout_interval_title">Time-out interval</string>
@@ -481,7 +501,7 @@
   <string name="preferences__manage_identity_keys">Beheer identiteitssleutels</string>
   <string name="preferences__manage_configured_identity_keys">Beheer ingestelde identiteitssleutels</string>
   <string name="preferences__notifications">Notificaties</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Toon berichtmeldingen in notificatiebalk</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Berichtmeldingen in notificatiebalk tonen</string>
   <string name="preferences__led_color">LED-kleur</string>
   <string name="preferences__pref_led_blink_title">LED-knipperpatroon</string>
   <string name="preferences__pref_led_blink_custom_pattern_title">Stel aangepaste LED knipper patroon in</string>
@@ -490,8 +510,8 @@
   <string name="preferences__pref_led_blink_custom_pattern_set">Aangepast LED knipper patroon ingesteld.</string>
   <string name="preferences__sound">Geluid</string>
   <string name="preferences__change_notification_sound">Verander notificatiegeluid</string>
-  <string name="preferences__inthread_notifications">Notificatie binnen een conversatie</string>
-  <string name="preferences__play_inthread_notifications">Speel notificatiegeluid af bij het bekijken van een actieve conversatie.</string>
+  <string name="preferences__inthread_notifications">Notificaties in een gesprek</string>
+  <string name="preferences__play_inthread_notifications">Notificatiegeluid afspelen bij het bekijken van een actieve conversatie.</string>
   <string name="preferences__vibrate">Trillen</string>
   <string name="preferences__also_vibrate_when_notified">Ook trillen bij notificaties</string>
   <string name="preferences__minutes">minuten</string>
@@ -533,20 +553,29 @@
   <string name="preferences__make_default_sms_app">Stel in als standaard SMS-app</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Stel TextSecure in als standaard SMS/MMS-applicatie voor uw systeem.</string>
   <string name="preferences__use_data_channel">Pushberichten</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nVerbeter de privacy en vermijd SMS-kosten door het datakanaal te gebruiken om te communiceren met andere TextSecure gebruikers</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken om te communiceren met andere TextSecure gebruikers</string>
+  <string name="preferences__allow_sms_fallback">SMS versturen naar</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure is momenteel uw standaard SMS applicatie. Selecteer alstublieft een andere SMS applicatie om deze voorkeur te veranderen.</string>
-  <string name="preferences__refresh_push_directory">Ververs pushcontacten</string>
+  <string name="preferences__refresh_push_directory">Pushcontacten verversen</string>
   <string name="preferences__submit_debug_log">Dien debug log in</string>
+  <string name="preferences__sms_outgoing_push_users">TextSecure gebruikers</string>
+  <string name="preferences__sms_fallback_push_users_ask">(eerst vragen)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Stuur een veilige SMS als de dataverbinding niet beschikbaar is</string>
+  <string name="preferences__sms_fallback_ask_fallback">Vragen voor het versturen van SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Niet-TextSecure gebruikers</string>
+  <string name="preferences__sms_fallback_nobody">Niemand</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">Alles Selecteren</string>
   <string name="contact_selection_list__menu_unselect_all">Alles Deselecteren</string>
+  <string name="contact_selection_list__header_textsecure_users">TEXTSECURE GEBRUIKERS</string>
+  <string name="contact_selection_list__header_other">ALLE CONTACTEN</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Voltooid</string>
   <!--refreshing push directory from menu-->
-  <string name="push_directory__menu_refresh">Ververs Contacten Lijst</string>
+  <string name="push_directory__menu_refresh">Contactenlijst verversen</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Verstuur onversleuteld</string>
   <!--conversation_callable-->
@@ -593,7 +622,7 @@
   <string name="text_secure_normal__menu_new_group">Nieuwe Groep</string>
   <string name="text_secure_normal__menu_settings">Instellingen</string>
   <string name="text_secure_normal__menu_clear_passphrase">Vergrendel</string>
-  <string name="text_secure_normal__mark_all_as_read">Markeer Alles Als Gelezen</string>
+  <string name="text_secure_normal__mark_all_as_read">Markeer alles als gelezen</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Geverifieerd</string>
   <!--EOF-->

res/values-no/strings.xml

@@ -17,13 +17,13 @@
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAdvarsel! Dette vil deaktivere kryptert lagring av alle meldinger og nøkler. Dine krypterte sesjoner vil fortsette å fungere, men alle med fysisk tilgang til enheten din vil kunne få tilgang til dem.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktiver</string>
   <string name="ApplicationPreferencesActivity_unregistering">Avregistrerer...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Avregistrerering av data basert melding</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Deaktiver push meldinger?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nDette vil deaktivere push meldinger ved å avregistrere deg fra tjenesten.\nDu må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte push meldinger i fremtiden.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Avregistrerer for kommunikasjon via data kanal</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Deaktiver \'push\' meldinger?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nDette vil deaktivere \'push\' meldinger ved å avregistrere deg fra tjenesten.\nDu må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'push\' meldinger i fremtiden.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Feil ved tilkobling til meldingstjener!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Du er ikke registrert som bruker av push tjenesten...</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Du er ikke registrert som bruker av \'push\' tjenesten...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Oppdaterer katalog</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Oppdaterer push katalogen...</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Oppdaterer \'push\' katalogen...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Innkommende SMS aktivert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Klikk for å endre standard SMS applikasjon</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Innkommende SMS deaktivert</string>
@@ -48,12 +48,15 @@
   <string name="ConversationItem_received_and_processed_key_exchange_message">Nøkkelutvekslingsmelding mottatt og behandlet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Feil, fikk en gammel nøkkelutvekslingsmelding.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Nøkkelutveksling melding mottatt, klikk for å behandle.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Mottok en klartekst SMS mens du hadde en åpen sikker sesjon. Hvis motparten ikke har en åpen sesjon, vil meldinger som du sender vises som uleselig tekst. Klikk for å terminere sikker sesjon.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Mottok en klartekst SMS mens en sikker sesjon var åpen. Hvis motparten ikke har en åpen sesjon, vil meldinger som du sender vises som uleselig tekst. Klikk for å terminere sikker sesjon.</string>
   <string name="ConversationItem_group_action_left">%1$s har forlatt gruppen.</string>
   <string name="ConversationItem_group_action_joined">%1$s har sluttet seg til gruppen.</string>
   <string name="ConversationItem_group_action_modify">%1$s har oppdatert gruppen.</string>
-  <string name="ConversationItem_click_to_approve">Klikk for \"SMS fallback\"</string>
+  <string name="ConversationItem_click_to_approve">Klikk for \'SMS fallback\'</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Tast for usikret \"fallback\"</string>
   <string name="ConversationItem_click_to_approve_dialog_title">Benytte SMS som alternativ?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">\"Fallback\" til ukryptert SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Denne meldingen vil <b>ikke</b> krypteres fordi det ikke var mulig å etablere en sikker sesjon.\n\nSend usikret melding?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Starte sikker sesjon?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Starte sikker sesjon med %s?</string>
@@ -69,18 +72,17 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Beklager, den valgte lydfilen overstiger begrensningene til meldingsstørrelse.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mottakeren er ikke en gyldig SMS- eller e-postadresse!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Meldingen er tom!</string>
-  <string name="ConversationActivity_forward_message_prefix">VS</string>
   <string name="ConversationActivity_group_conversation_recipients">Mottakere i gruppen</string>
   <string name="ConversationActivity_group_conversation">Gruppesamtale</string>
   <string name="ConversationActivity_unnamed_group">Navnløs gruppe</string>
   <string name="ConversationActivity_d_recipients_in_group">%d medlemmer</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 medlem</string>
-  <string name="ConversationActivity_saving_draft">Lagrer utkast...</string>
+  <string name="ConversationActivity_saved_draft">Lagret utkast</string>
   <string name="ConversationActivity_invalid_recipient">Ugyldig mottaker!</string>
   <string name="ConversationActivity_calls_not_supported">Anrop er ikke støttet</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Denne enheten ser ikke ut til å kunne initiere anrop.</string>
   <string name="ConversationActivity_leave_group">Forlat gruppen?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Er du sikker på at du ønsker å forlate gruppen?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Er du sikker på at du ønsker å forlate denne gruppen?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meldingsdetaljer</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSendt/Mottatt: %2$s</string>
@@ -96,6 +98,8 @@
   <string name="ConversationListFragment_deleting_selected_threads">Sletter utvalgte tråder...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Nøkkelutvekslingsmelding...</string>
+  <!--ShareActivity-->
+  <string name="ShareActivity_share_with">Del med</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Eksporter til SD-kort?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dette vil eksportere dine krypteringsnøkler, innstillinger og meldinger til SD-kortet.</string>
@@ -116,14 +120,14 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Ny MMS gruppe</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Du har valgt en kontakt som ikke støtter TextSecure grupper, så dette vil bli en MMS gruppe.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Du har ikke registert deg som bruker av data kanalen, så TextSecure grupper er deaktivert.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Du er ikke eieren av denne gruppen, derfor kan du ikke endre tittel eller bilde.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">En ukjent feil har gjort at gruppeopprettelsen feilet.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">En ukjent feil har ført til at gruppeopprettelsen feilet.</string>
   <string name="GroupCreateActivity_contacts_no_members">Du må ha minst en person i gruppen din!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">En av gruppemedlemmene har et nummer som ikke kan tolkes riktig. Vær vennlig og rett opp eller slett kontakten og prøv igjen. </string>
-  <string name="GroupCreateActivity_file_io_exception">Fil I/O feil, kunne ikke opprette temporær bildefil.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">En av gruppemedlemmene har et nummer som ikke kan tolkes. Vær vennlig og korriger eller slett kontakten og prøv igjen. </string>
+  <string name="GroupCreateActivity_file_io_exception">I/O feil på enheten, kunne ikke opprette temporær bildefil.</string>
   <string name="GroupCreateActivity_avatar_content_description">Gruppeavatar</string>
   <string name="GroupCreateActivity_menu_create_title">Opprett gruppe</string>
   <string name="GroupCreateActivity_creating_group">Oppretter %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Kan ikke legge til ikke-Textsecure kontakter til en eksisterende TextSecure gruppe.</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importer systemets SMS database?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Dette vil importere meldinger fra systemets standard SMS database til TextSecure. Dersom du har gjort en import tidligere, vil dette føre til dupliserte meldinger.</string>
@@ -176,10 +180,10 @@
   <string name="RegistrationActivity_you_must_specify_your_country_code">Du må spesifisere \nlandskoden din</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Du må oppgi\ntelefonnummeret ditt</string>
   <string name="RegistrationActivity_invalid_number">Ugyldig nummer</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nummeret du oppga (%s) er ugylig.</string>
-  <string name="RegistrationActivity_unsupported">Ingen støtte</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Beklager, denne enheten støtter ikke meldinger med data som bærer. Enheter som kjører versjoner av Android lavere enn 4.0 krever en Google konto. Enheter  som kjører versjoner av Android 4.0 eller nyere krever ikke en Google konto, men Play Store applikasjonen må være installert.</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nVi vil nå verifisere om følgende nummer er forbundet med denne enheten:\n\n%s\n\nEr dette nummeret korrekt, eller ønsker du å endre det før du fortsetter? </string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nummeret du \noppga (%s) er ugylig.</string>
+  <string name="RegistrationActivity_unsupported">Ikke støttet</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Beklager, denne enheten støtter ikke meldinger som benytter data som bærer. Enheter som kjører versjoner av Android lavere enn 4.0 krever en Google konto. Enheter  som kjører versjoner av Android 4.0 eller nyere krever ikke en Google konto, men Play Store applikasjonen må være installert.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nVi vil nå verifisere om følgende nummer er tilknyttet denne enheten:\n\n%s\n\nEr dette nummeret korrekt, eller ønsker du å endre det før du fortsetter? </string>
   <string name="RegistrationActivity_continue">Fortsett</string>
   <string name="RegistrationActivity_edit">Endre</string>
   <!--RegistrationProblemsActivity-->
@@ -189,9 +193,9 @@
   <string name="RegistrationProgressActivity_edit_s">Endre %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrering fullført!</string>
   <string name="RegistrationProgressActivity_possible_problems">Mulige problemer.</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Du må angi koden du fikk først...</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Du må angi koden du mottok først...</string>
   <string name="RegistrationProgressActivity_connecting">Kobler til</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Kobler til for verifikasjon</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Kobler til for verifikasjon...</string>
   <string name="RegistrationProgressActivity_network_error">Nettverksfeil!</string>
   <string name="RegistrationProgressActivity_unable_to_connect">Tilkobling ikke mulig. Vær vennlig å sjekke nettverksforbindelsen din og prøv igjen.</string>
   <string name="RegistrationProgressActivity_verification_failed">Verifikasjon feilet!</string>
@@ -201,23 +205,24 @@
   <string name="RegistrationProgressActivity_requesting_call">Forespør anrop</string>
   <string name="RegistrationProgressActivity_requesting_incoming_call">Ber om innkommende anrop for verifikasjon...</string>
   <string name="RegistrationProgressActivity_server_error">Serverfeil</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Det oppstod en feil på serveren. Prøv igjen.</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Det oppstod en feil på serveren. Vær vennlig og prøv igjen.</string>
   <string name="RegistrationProgressActivity_too_many_requests">For mange forespørsler!</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Du har allerede forespurt et voice anrop. Du kan be om et til om 20 minutter.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verifiserer voice kode...</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Du har forespurt om et taleanrop allerede. Du kan be om et nytt anrop om 20 minutter.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Verifiserer tale kode...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Registreringskonflikt</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Dette nummeret er allerede registrert hos en annen TextSecure tjeneste (CyanogenMod?). Du må først avregistrere deg der før du kan registrere her.</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Dette nummeret er allerede registrert hos en annen TextSecure tjeneste (CyanogenMod?). Du må først avregistrere deg der før du kan registrere deg her.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Registrering fullført</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registreringen er fullført.</string>
   <string name="RegistrationService_registration_error">Registreringsfeil</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Det har oppstått en feil ved registeringen til TextSecure.</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Det oppstod en feil under registeringen til TextSecure.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Mottatt korrupt nøkkelutvekslingsmelding!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nMottatt nøkkelutvekslingsmelding for feil protokollversjon.</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Mottok korrupt nøkkelutvekslingsmelding!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nMottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nMottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Mottok oppdatert men ukjent identitetsinformasjon. Trykk for å validere identiteten.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sikker sesjon avsluttet.</string>
+  <string name="SmsMessageRecord_duplicate_message">Duplisert melding.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Forlot gruppen...</string>
   <string name="TheadRecord_secure_session_ended">Sikker sesjon avsluttet.</string>
@@ -309,12 +314,13 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Finner kontakter...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Laster kontakter...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Tast et navn for å filtrere...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du er ikke registrert som bruker av push tjenesten...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du er ikke registrert hos \"push\" tjenesten...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Oppdaterer katalog</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Oppdaterer push katalogen...</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Oppdaterer \"push\" katalogen...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Kontaktbilde</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Velg for</string>
   <!--contact_selection_recent_activity-->
@@ -323,9 +329,16 @@
   <string name="conversation_activity__type_message"><small>Send en melding</small></string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slett</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Media melding</string>
+  <string name="conversation_item__play_button_description">Avspill knapp</string>
+  <string name="conversation_item__secure_message_description">Indikator for sikret melding</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Last ned</string>
   <string name="conversation_item_sent__downloading">Laster ned</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Indikator for feilet melding</string>
+  <string name="conversation_item_sent__pending_approval_description">Avventer godkjenning</string>
+  <string name="conversation_item_sent__delivered_description">Indikator for levert melding</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Last ned</string>
   <string name="conversation_item_received__downloading">Laster ned</string>
@@ -335,7 +348,7 @@
   <string name="country_selection_fragment__loading_countries">Laster land...</string>
   <string name="country_selection_fragment__search">Søk</string>
   <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Velg et passord om du ønsker å kryptere meldinger lokalt.</string>
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Velg et passord om du ønsker å lagre meldingene kryptert på enheten.</string>
   <string name="create_passphrase_activity__passphrase">Passord:</string>
   <string name="create_passphrase_activity__repeat">Repeter:</string>
   <string name="create_passphrase_activity__continue">Gå videre</string>
@@ -343,16 +356,18 @@
   <string name="create_passphrase_activity__skip">Hopp over</string>
   <string name="create_passphrase_activity__create">Opprett</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Denne loggen vil bli lagt ut offentlig på nettet slik at TextSecure bidragsytere kan lese den. Om du ønsker, undersøk eller rediger loggene før du trykker send.</string>
+  <string name="log_submit_activity__confirmation">Denne loggen vil bli lagt ut offentlig på Internett slik at TextSecure bidragsytere kan lese den. Om du ønsker, undersøk eller rediger loggene før du trykker send.</string>
   <string name="log_submit_activity__button_cancel">Ikke send</string>
   <string name="log_submit_activity__button_ok">Send</string>
   <string name="log_submit_activity__log_fetch_failed">Kunne ikke hente loggene fra din enhet. Du kan fremdeles benytte ADB for å hente debug logger.</string>
   <string name="log_submit_activity__log_submit_success_title">Suksess!</string>
   <string name="log_submit_activity__log_got_it">Ok</string>
-  <string name="log_submit_activity__your_pastebin_url">Vær vennlig å kopiere denne URL\'en og legg den til saken din (trykk og hold for å legge den til utklippstavle):\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__your_pastebin_url">Vær vennlig å kopiere denne URL\'en og legg den til saken din (trykk og hold for å kopiere til utklippstavlen):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Kopiert til utklippstavle</string>
   <string name="log_submit_activity__loading_logcat">Laster logcat...</string>
   <string name="log_submit_activity__thanks">Takk for hjelpen!</string>
+  <string name="log_submit_activity__submitting">Sender</string>
+  <string name="log_submit_activity__posting_logs">Sender logger til \"pastebin\"...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ønsker du å importere dine eksisterende meldinger til TextSecures krypterte database?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Den eksisterende systemdatabasen vil ikke på noen måte bli endret.</string>
@@ -387,44 +402,44 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complete</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure can benytte lynmeldinger for å øke personvernet og unngå SMS kostnader ved kommunikasjon med andre TextSecure brukere. For å aktivere denne funksjonen, vær vennlig å verifisere telefonnummeret og landskoden din.</string>
-  <string name="registration_activity__your_country">LANDET DITT</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure can benytte lynmeldinger for å øke personvernet ditt og unngå SMS kostnader når du kommuniserer med andre TextSecure brukere. For å aktivere denne funksjonen, vær vennlig å verifisere telefonnummeret og landskoden din.</string>
+  <string name="registration_activity__your_country">DITT LAND</string>
   <string name="registration_activity__your_country_code_and_phone_number">DIN LANDSKODE OG\nTELEFONNUMMER</string>
   <string name="registration_activity__phone_number">TELEFONNUMMER</string>
   <string name="registration_activity__register">Registrer</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registrering vil overføre hashet kontaktinformasjon til serveren midlertidig.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registreringen vil midlertidig overføre noe kontaktinformasjon til serveren.</string>
   <string name="registration_activity__skip">Hopp over</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Mulige problemer:</string>
-  <string name="registration_problems__sms_interceptors">SMS avlyttere.</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nNoen tredjeparts meldingsklienter, som Handcent eller GoSMS, oppfører seg dårlig og kaprer alle innkommende SMS meldinger. Sjekk for å se om du har mottatt en tekstmelding som starter med \'Your TextSecure verification code:\'. Om så er tilfelle må du konfigurere din tredjeparts meldingsklient til å slippe igjennom tekstmeldinger.</string>
+  <string name="registration_problems__some_possible_problems_include">Noen mulige problemer\ninkluderer:</string>
+  <string name="registration_problems__sms_interceptors">SMS kaprere.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nNoen tredjeparts meldingsklienter, som Handcent eller GoSMS, oppfører seg dårlig og kaprer alle innkommende SMS meldinger. Sjekk om du har mottatt en tekstmelding som begynner med \'Your TextSecure verification code:\'. Om så er tilfelle må du konfigurere din tredjeparts meldingsklient slik at den slipper igjennom tekstmeldinger.</string>
   <string name="registration_problems__incorrect_number">Feil nummer.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nSjekk at du har tastet inn telefonnummeret ditt riktig, og at det er riktig formattert for din region.</string>
-  <string name="registration_problems__google_voice">Google Voice</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nVær vennlig å sjekke at du har tastet inn telefonnummeret ditt korrekt, og at det er riktig formattert for din region.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure virker ikke med Google Voice numre.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Voice verifikasjon</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure can også ringe deg for å verisifere nummeret ditt. Trykk \'Ring meg\' og tast inn de 6 sifferene fra koden du hører nedenfor.</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure kan også ringe deg for å verisifere nummeret ditt. Trykk \'Ring meg\' og tast inn de 6 sifferene fra koden du hører, nedenfor.</string>
   <string name="registration_progress_activity__verify">Verifiser</string>
   <string name="registration_progress_activity__call_me">Ring meg</string>
   <string name="registration_progress_activity__edit_number">Endre nummer</string>
   <string name="registration_progress_activity__connectivity_error">Tilkoblingsfeil.</string>
   <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure var ikke i stand til å opprette en forbindelse til \'push\' tjenesten.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Mulige problemer:</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Noen mulige \nproblemer:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ingen nettverksforbindelse.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Enheten din krever en nettverksforbindelse for å kunne benytte denne TextSecure funksjonen. Sjekk at den er er tilkoblet Edge, 3G, LTE eller et trådløst nett.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Enheten din krever en nettverksforbindelse for å kunne benytte denne TextSecure funksjonen. Sjekk at den er er tilkoblet mobil data eller et trådløst nett.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktiv brannvegg.</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nOm du er tilkoblet til Internett via et trådløst nett, så er det mulig at en brannvegg blokkerer tilgangen til TextSecure serveren. Prøv et annet trådløst nett eller benytt mobil data.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure vil nå automatisk verifisere nummeret ditt med en bekreftelse via SMS.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nOm du er tilkoblet Internett via et trådløst nett, så er det mulig at en brannvegg blokkerer tilgangen til TextSecure serveren. Prøv et annet trådløst nett eller benytt mobil data.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure vil nå automatisk verifisere nummeret ditt ved å sende en bekreftelse via SMS.</string>
   <string name="registration_progress_activity__connecting">Kobler til...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Venter på SMS verifikasjon...</string>
-  <string name="registration_progress_activity__registering_with_server">Registrering mot server pågår...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dette kan ta litt tid. Vær tålmodig; vi vil varsle deg når verifikasjonen er gjennomført.</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Venter på SMS \nverifikasjon...</string>
+  <string name="registration_progress_activity__registering_with_server">Registrering til server pågår...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dette kan ta litt tid. Vær tålmodig, vi vil varsle deg når verifikasjonen er gjennomført.</string>
   <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure timet ut mens den ventet på en verifikasjons-SMS.\n</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS verifikasjon feilet.</string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS verifikasjon\nfeilet.</string>
   <string name="registration_progress_activity__generating_keys">Genererer nøkler...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Til</string>
+  <string name="recipients_panel__to"><small>Tast inn et navn eller nummer</small></string>
   <string name="recipients_panel__add_member">Legg til medlem</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Du har ingen ID-nøkler som du stoler på.</string>
@@ -458,11 +473,12 @@
   <string name="arrays__contact_keys">Kontaktnøkler</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generelt</string>
-  <string name="preferences__push_sms_category">Push og SMS</string>
+  <string name="preferences__push_sms_category">\'Push\' og SMS</string>
   <string name="preferences__pref_all_sms_title">Motta alle SMS</string>
   <string name="preferences__pref_all_mms_title">Motta alle MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Benytt TextSecure for å lese og lagre alle innkommende SMS meldinger.</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Benytt TextSecure for å lese og lagre alle innkommende MMS meldinger.</string>
+  <string name="preferences__input_settings">Innstillinger for inndata</string>
   <string name="preferences__enable_enter_key_title">Aktiver \"Enter\" tasten</string>
   <string name="preferences__replace_smiley_with_enter_key">Bytt ut \"Smiley\" tasten med en \"Enter\" tast</string>
   <string name="preferences__pref_enter_sends_title">\"Enter\" sender</string>
@@ -539,15 +555,15 @@
   <string name="preferences__language">Språk</string>
   <string name="preferences__make_default_sms_app">Sett som standard SMS applikasjon</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">La TextSecure være enhetens standard SMS/MMS applikasjon.</string>
-  <string name="preferences__use_data_channel">Push meldinger</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nØk personvernet og unngå SMS kostnader ved å benytte data kanalen når du kommuniserer med andre TextSecure brukere.</string>
+  <string name="preferences__use_data_channel">\'Push\' meldinger</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nØk personvernet ditt og unngå SMS kostnader ved å benytte mobil data når du kommuniserer med andre TextSecure brukere.</string>
   <string name="preferences__allow_sms_fallback">Tillat utgående SMS til</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure er for tiden din standard SMS applikasjon. Vær vennlig og sett en annen default SMS applikasjon først for å endre denne preferansen.</string>
-  <string name="preferences__refresh_push_directory">Oppdater push katalog</string>
+  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure er for nå din standard SMS applikasjon. Vær vennlig og sett en annen standard SMS applikasjon først for å endre denne preferansen.</string>
+  <string name="preferences__refresh_push_directory">Oppdater \'push\' katalog</string>
   <string name="preferences__submit_debug_log">Send debug logg</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure brukere</string>
   <string name="preferences__sms_fallback_push_users_ask">(spør først)</string>
-  <string name="preferences__sms_outgoing_push_users_description">Send sikker SMS dersom dataforbindelsen er utilgjengelig</string>
+  <string name="preferences__sms_outgoing_push_users_description">Send sikker SMS dersom mobil data er utilgjengelig</string>
   <string name="preferences__sms_fallback_ask_fallback">Spør før SMS benyttes til å sende</string>
   <string name="preferences__sms_fallback_non_push_users">Brukere uten TextSecure</string>
   <string name="preferences__sms_fallback_nobody">Ingen</string>
@@ -557,6 +573,9 @@
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">Merk alt</string>
   <string name="contact_selection_list__menu_unselect_all">Avmarker alt</string>
+  <string name="contact_selection_list__header_textsecure_users">TEXTSECURE BRUKERE</string>
+  <string name="contact_selection_list__header_other">ALLE KONTAKTER</string>
+  <string name="contact_selection_list__unknown_contact">Ny melding til ...</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Avslutt</string>
   <!--refreshing push directory from menu-->

res/values-pl/strings.xml

@@ -3,15 +3,15 @@
   <string name="app_name">TextSecure</string>
   <string name="yes">Tak</string>
   <string name="no">Nie</string>
-  <string name="delete">Skasuj</string>
+  <string name="delete">Usuń</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Obecnie: %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Aby zarządzać kluczami musisz wprowadzić swoje hasło...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nie masz jeszcze ustawionego hasła!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">wiadomości na rozmowę</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">ilość wiadomości na rozmowę</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Usunąć wszystkie stare wiadomości?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Czy na pewno przyciąć wszystkie rozmowy do %s najnowszych wiadomości?</string>
-  <string name="ApplicationPreferencesActivity_delete">Skasuj</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Czy na pewno chcesz przyciąć wszystkie wątki rozmów do %s najnowszych wiadomości?</string>
+  <string name="ApplicationPreferencesActivity_delete">Usuń</string>
   <string name="ApplicationPreferencesActivity_my">Mój</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Wyłączyć lokalne szyfrowanie?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nUwaga, szyfrowanie wszystkich Twoich wiadomości i kluczy zostanie wyłączone. Twoje szyfrowane sesje będą dalej funkcjonować, jednak ktokolwiek z fizycznym dostępem do urządzenia będzie miał dostęp do Twoich danych.</string>
@@ -24,7 +24,9 @@
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Nie jesteś zarejestrowany w usłudze push...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Aktualizowanie katalogu</string>
   <string name="ApplicationPreferencesActivity_updating_push_directory">Aktualizowanie katalogu pchnięcia</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Otrzymywanie SMSów włączone</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotknij aby zmienić swoją domyślną aplikację SMS</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Otrzymywanie SMS wyłączone</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Dotknij aby TextSecure była Twoją domyślną aplikacją SMS</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Zdjęcie</string>
@@ -34,15 +36,15 @@
   <string name="ConversationItem_message_size_d_kb">Rozmiar wiadomości: %d KB </string>
   <string name="ConversationItem_expires_s">Wygasa: %s</string>
   <string name="ConversationItem_error_sending_message">Błąd przy wysyłaniu wiadomości</string>
-  <string name="ConversationItem_saving_attachment">Zapisuje załącznik</string>
-  <string name="ConversationItem_saving_attachment_to_sd_card">Zapisuje załącznik na kartę SD...</string>
+  <string name="ConversationItem_saving_attachment">Zapisuję załącznik</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">Zapisuję załącznik na kartę SD...</string>
   <string name="ConversationItem_save_to_sd_card">Zapisać na kartę SD?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Te media zostały zapisane w zaszyfrowanej bazie danych. Wersja zapisana na karcie SD nie będzie szyfrowana. Czy chcesz kontynuować?</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Błąd podczas zapisywania załącznika na kartę SD!</string>
   <string name="ConversationItem_success_exclamation">Sukces!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Nie udało się zapisać na karcie SD!</string>
   <string name="ConversationItem_view_secure_media_question">Pokazać zabezpieczone media? </string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Te media są obecnie przechowywane w zaszyfrowanej bazie danych. Niestety, żeby zobaczyć je przy użyciu zewnętrznej przeglądarki konieczne jest tymczasowe odszyfrowanie i zapisanie danych na dysk. Czy na pewno chcesz to zrobić?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Te media są obecnie przechowywane w zaszyfrowanej bazie danych. Niestety, aby zobaczyć je przy użyciu zewnętrznej przeglądarki konieczne jest tymczasowe odszyfrowanie i zapisanie tych danych na dysk. Czy na pewno chcesz to zrobić?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Odebrano i przetworzono wiadomość wymiany kluczy.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Błąd, otrzymano nieprawidłową wiadomość wymiany kluczy. </string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Otrzymano wiadomość wymiany kluczy, kliknij żeby kontynuować.</string>
@@ -50,13 +52,18 @@
   <string name="ConversationItem_group_action_left">%1$s opuścił grupę.</string>
   <string name="ConversationItem_group_action_joined">%1$s dołączył do grupy.</string>
   <string name="ConversationItem_group_action_modify">%1$s zaktualizował grupę.</string>
+  <string name="ConversationItem_click_to_approve">Naciśnij dla SMS fallbck</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Dotknij w celu użycia niezabezpieczonej alternatywy</string>
+  <string name="ConversationItem_click_to_approve_dialog_title">Fallback do SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">Użyć nieszyfrowanej wiadomości SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ta wiadomość <b>nie</b> zostanie zaszyfrowana, ponieważ nie można ustanowić szyfrowanego połączenia.\n\nWysłać niezabezpieczoną wiadomość?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Rozpocząć Bezpieczną Sesję?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Rozpocząć Bezpieczną Sesję z %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Potwierdzenie zakończenie bezpiecznej sesji</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Potwierdzenie zakończenia Bezpiecznej Sesji</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Czy na pewno chcesz zakończyć bezpieczną sesję?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Potwierdzenie usunięcia wątku</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Na pewno chcesz całkowicie skasować tą konwersację?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Czy na pewno chcesz permanentnie skasować tą konwersację?</string>
   <string name="ConversationActivity_add_attachment">Dodaj załącznik</string>
   <string name="ConversationActivity_select_contact_info">Wybierz dane kontaktowe</string>
   <string name="ConversationActivity_compose_message">Nowa wiadomość</string>
@@ -65,13 +72,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Przepraszamy, plik audio jest zbyt duży...</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Podany numer lub adres e-mail jest niepoprawny!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Wiadomość jest pusta!</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Grupuj Odbiorców Rozmowy</string>
-  <string name="ConversationActivity_group_conversation">Grupuj Rozmowę</string>
+  <string name="ConversationActivity_group_conversation">Grupowa Rozmowa</string>
   <string name="ConversationActivity_unnamed_group">Grupa bez nazwy</string>
   <string name="ConversationActivity_d_recipients_in_group">%d uczestników</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 uczestnik</string>
-  <string name="ConversationActivity_saving_draft">Zapisuję kopię roboczą...</string>
   <string name="ConversationActivity_invalid_recipient">Nieprawidłowy adresat!</string>
   <string name="ConversationActivity_calls_not_supported">Połączenia nie są obsługiwane</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Wygląda na to, że urządzenie nie wspiera wybierania numeru.</string>
@@ -81,17 +86,18 @@
   <string name="ConversationFragment_message_details">Szczegóły wiadomości</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nWysłano/Otrzymano: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Nadawca: %1$s\nTransport: %2$s\nWysłanych: %3$s\nOtrzymanych: %4$s</string>
-  <string name="ConversationFragment_confirm_message_delete">Potwierdź kasowanie wiadomości</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Czy na pewno chcesz permanentnie skasować tą wiadomość?</string>
+  <string name="ConversationFragment_confirm_message_delete">Potwierdź usunięcie wiadomości</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Czy na pewno chcesz permanentnie skasować daną wiadomość?</string>
   <!--ConversationListAdapter-->
   <string name="ConversationListAdapter_key_exchange_message">Wiadomość wymiany kluczy...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Skasować wątki?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Na pewno chcesz usunąć wszystkie wybrane konwersacje? </string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Czy na pewno chcesz usunąć wszystkie wybrane wątki konwersacji? </string>
   <string name="ConversationListFragment_deleting">Usuwanie...</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Usuwań zaznaczone wątki..</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Usuwanie zaznaczonych wątków..</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Wiadomość wymiany kluczy...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Wyeksportować na kartę SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Wszystkie zaszyfrowane klucze , ustawienia i wiadomości zostaną wyeksportowane na kartę SD.</string>
@@ -99,7 +105,7 @@
   <string name="ExportFragment_export_plaintext_to_sd_card">Wyeksportować jawny tekst na kartę SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Uwaga, wiadomości z Twojej zaszyfrowanej skrzynki odbiorczej TextSecure zostaną wyeksportowane w postaci jawnego tekstu na kartę SD.</string>
   <string name="ExportFragment_cancel">Anuluj</string>
-  <string name="ExportFragment_exporting">Eksport</string>
+  <string name="ExportFragment_exporting">Eksportowanie</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Eksportowanie jawnego tekstu na kartę SD...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Błąd, nie można zapisać na kartę SD!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Błąd podczas zapisu na kartę SD.</string>
@@ -112,7 +118,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Nowa Grupa MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Zaznaczyłeś kontakt, który nie wspiera grup TextSecure, dlatego ta grupa będzie grupą MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Nie jesteś zajerestrowany do urzywania kanału danych, tak więc grupy TextSecure są niedostępne.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Nie jesteś właścicielem tej grupy, nie możesz edytować tytułu lub zdjęcia.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Wystąpił niespodziewany błąd, który wywołał nieudane utworzenie nowej grupy.</string>
   <string name="GroupCreateActivity_contacts_no_members">Potrzebujesz przynajmniej jeden osoby w Twojej grupie.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jeden z Twoich kontaktów z Twojej grupy ma numer który nie może być prawidłowo odczytany. Proszę popraw go, lub usuń ten kontakt i spróbuj ponownie.</string>
@@ -126,12 +131,12 @@
   <string name="ImportFragment_import">Import</string>
   <string name="ImportFragment_cancel">Anulluj</string>
   <string name="ImportFragment_restore_encrypted_backup">Przywrócić z zaszyfrowanej kopii zapasowej?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nPrzywracanie z zaszyfrowanej kopii zapasowej spowoduje nadpisanie Twoich istniejących kluczy, ustawień i wiadomości. Stracisz wszystkie informacje zawarte w aplikacji TextSecure, oprócz informacji zawartych w kopii zapasowej.</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nPrzywracanie z zaszyfrowanej kopii zapasowej spowoduje nadpisanie Twoich istniejących kluczy, ustawień i wiadomości. Stracisz wszystkie informacje zawarte w aplikacji TextSecure, z wyjątkiem tych zawartych w kopii zapasowej.</string>
   <string name="ImportFragment_restore">Przywróć</string>
   <string name="ImportFragment_import_plaintext_backup">Importować z jawnej kopii zapasowej?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Wiadomości z jawnej kopii zapasowej zostaną zaimportowane. Jeżeli wcześniej wykonywałeś już tę czynność, ponowny import spowoduje zduplikowanie się wiadomości.</string>
-  <string name="ImportFragment_importing">Importuje </string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Importowanie tekstu z jawnej kopii zapasowej...</string>
+  <string name="ImportFragment_importing">Importowanie</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importowanie tekstu z niezaszyfrowanej kopii zapasowej...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nie odnaleziono niezaszyfrowanej kopii zapasowej!</string>
   <string name="ImportFragment_error_importing_backup">Błąd podczas importu kopii zapasowej!</string>
   <string name="ImportFragment_import_complete">Importowanie zakończone!</string>
@@ -144,7 +149,7 @@
   <!--MmsDownloader-->
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Brak połączenia aby pobrać MMS, spróbuj ponownie później...</string>
   <string name="MmsDownloader_error_storing_mms">Błąd przechowywania MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Błąd połączenia z dostawcą usługi MMS ...</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Błąd połączenia z dostawcą usługi MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Błąd odczytu ustawień usługi MMS Twojego operatora...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Wiadomość Multimedialna</string>
@@ -152,7 +157,7 @@
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Hasła nie zgadzają się!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Nieprawidłowe stare hasło!</string>
   <!--PassphraseCreateActivity-->
-  <string name="PassphraseCreateActivity_passphrases_dont_match">Hasło niezgodne</string>
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Hasła nie zgadzają się</string>
   <string name="PassphraseCreateActivity_you_must_specify_a_password">Musisz podać hasło</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nieprawidłowe hasło!</string>
@@ -161,8 +166,8 @@
   <string name="PromptMmsActivity_mms_settings_updated">Ustawienia MMS zaktualizowane</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Możesz zmodyfikować te wartości w każdej chwili z menu \'Ustawienia\' aplikacji TextSecure.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pod tą wymianą kluczy jest inny od tego, który otrzymałeś poprzednio od tego kontaktu. Może to oznaczać, że ktoś próbuje przechwycić Twoją komunikację lub Twój kontakt przeinstalował program TextSecure i posiada teraz nowy klucz tożsamości.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Możesz chcieć zweryfikować kontakt.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pod tą wymianą kluczy jest inny od tego, który otrzymałeś poprzednio od tego \nkontaktu. Może to oznaczać, że ktoś próbuje przechwycić Twoją komunikację lub \nTwój kontakt przeinstalował program TextSecure i posiada teraz nowy klucz tożsamości.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Możesz chcieć zweryfikować \nten kontakt.\n</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Podpis pod tą wymianą kluczy jest zaufany, ale masz wyłączoną opcję \'automatyczna wymiana klucza\'.</string>
   <string name="ReceiveKeyActivity_processing">Przetwarzanie</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Przetwarzanie kluczy...</string>
@@ -185,7 +190,7 @@
   <string name="RegistrationProgressActivity_edit_s">Edytuj %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Rejestracja zakończona!</string>
   <string name="RegistrationProgressActivity_possible_problems">Możliwe problemy.</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Musisz najpierw podać otrzymany kod...</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Najpierw musisz podać otrzymany kod...</string>
   <string name="RegistrationProgressActivity_connecting">Łączenie</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Łączenie w celu weryfikacji...</string>
   <string name="RegistrationProgressActivity_network_error">Błąd sieci!</string>
@@ -214,6 +219,7 @@
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nOtrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć i wyświetlić.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Otrzymał zaktualizowany, ale z nieznaną informacją tożsamości. Naciśnij aby potwierdzić tożsamość.</string>
   <string name="SmsMessageRecord_secure_session_ended">Bezpieczna sesja zakończona.</string>
+  <string name="SmsMessageRecord_duplicate_message">Duplikat wiadomości.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Opuścił grupę...</string>
   <string name="TheadRecord_secure_session_ended">Bezpieczna sesja zakończona.</string>
@@ -223,24 +229,24 @@
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Odbiorca nie posiada klucza tożsamości!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skanuj ich klucz aby porównać</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Przeskanuj mój klucz</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">UWAGA, zeskanowane klucze NIE ZGADZAJĄ się! Proszę sprawdź klucz!</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">UWAGA, zeskanowane klucze NIE ZGADZAJĄ się! Proszę sprawdź klucz ostrożnie!</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NIE zweryfikowany!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Klucz poprawny. Niezbędna będzie weryfikacja z odbiorcami.</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ich klucz jest poprawny. Niezbędna będzie także weryfikacja Twojego klucza z odbiorcami.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Zweryfikowano!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nie posiadasz klucza tożsamości!</string>
   <!--VerifyKeysActivity-->
   <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Zeskanuj mój klucz</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skanuj klucz</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Skanuj ich klucz</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">UWAGA, zeskanowany klucz NIE ZGADZA SIĘ! Proszę uważnie sprawdź klucz!</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NIE Zweryfikowany!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ich klucz jest poprawny! Wymagane jest aby Twój klucz także został zeskanowany.</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">NIE Zweryfikowano!</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ich klucz jest poprawny. Niezbędna będzie także weryfikacja Twojego klucza przez odbiorców.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Zweryfikowano!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nie posiadasz klucza tożsamości.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skanuj aby porównać</string>
   <string name="ViewIdentityActivity_get_scanned_to_compare">Weź zeskanowane do porównania</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">UWAGA, zeskanowane klucze NIE ZGADZAJĄ SIĘ!</string>
-  <string name="ViewIdentityActivity_not_verified_exclamation">NIE Zweryfikowany!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">NIE Zweryfikowano!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Zeskanowane klucze zgadzają się!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Zweryfikowano!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Odcisk Klucza</string>
@@ -251,23 +257,23 @@
   <string name="KeyExchangeInitiator_send">Wyślij</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Źle zaszyfrowana wiadomość...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Trwa rozszyfrowanie, proszę czekać...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Trwa odszyfrowywanie, proszę czekać...</string>
   <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Wiadomość zaszyfrowana dla nieistniejącej sesji...</string>
   <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Łączę się z serwerem MMS...</string>
-  <string name="MmsDatabase_downloading_mms">Ściągam MMS...</string>
-  <string name="MmsDatabase_mms_download_failed">Niepowodzenie przy ściąganiu MMSa!</string>
-  <string name="MmsDatabase_downloading">Ściągam...</string>
+  <string name="MmsDatabase_connecting_to_mms_server">Łączenie z serwerem MMS...</string>
+  <string name="MmsDatabase_downloading_mms">Pobieranie MMS...</string>
+  <string name="MmsDatabase_mms_download_failed">Nie udało pobrać się MMSa!</string>
+  <string name="MmsDatabase_downloading">Pobieranie...</string>
   <string name="MmsDatabase_mms_pending_download">Dotknij i skonfiguruj ustawienia MMS aby kontynuować pobieranie.</string>
   <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">Odszyfrowuję MMS, proszę poczekać...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Źle zaszyfrowana wiadomość MMS</string>
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Trwa odszyfrowywanie MMSa, proszę czekać...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Źle zaszyfrowana wiadomość MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Wiadomość MMS zaszyfrowana dla nieistniejącej sesji...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Nie można wysłać wiadomości MMS</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Obecnie nie można wysłać wiadomości MMS.</string>
   <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Trwa import</string>
-  <string name="ApplicationMigrationService_importing_text_messages">Importuje wiadomości tekstowe</string>
+  <string name="ApplicationMigrationService_import_in_progress">Trwa importowanie</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Importowanie wiadomości tekstowych</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">Dotknij, aby otworzyć.</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Dotknij, aby otworzyć lub dotknij zablokuj, aby zamknąć.</string>
@@ -276,11 +282,11 @@
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d nowych wiadomości</string>
   <string name="MessageNotifier_most_recent_from_s">Najnowsze zaczynając od: %s</string>
-  <string name="MessageNotifier_encrypted_message">Zaszyfrowana wiadomość...</string>
-  <string name="MessageNotifier_no_subject">(bez tematu)</string>
+  <string name="MessageNotifier_encrypted_message">Szyfrowana wiadomość...</string>
+  <string name="MessageNotifier_no_subject">(Brak tematu)</string>
   <string name="MessageNotifier_message_delivery_failed">Nie udało się dostarczyć wiadomości.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Dostarczenie wiadomości nie powiodło się.</string>
-  <string name="MessageNotifier_error_delivering_message">Błąd przy wysyłaniu wiadomości</string>
+  <string name="MessageNotifier_error_delivering_message">Błąd przy wysyłaniu wiadomości.</string>
   <string name="MessageNotifier_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
   <string name="MessageNotifier_mark_as_read">Oznacz jako przeczytane</string>
   <!--ViewLocalIdentityActivity-->
@@ -296,7 +302,7 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Przepraszamy, Szybka Odpowiedź nie jest jeszcze wspierana przez TextSecure!</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Dostałeś wiadomość od kogoś kto obsługuje szyfrowane sesje TextSecure. Czy chcesz zacząć bezpieczną sesję?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Dostałeś wiadomość od kogoś kto obsługuje szyfrowane sesje TextSecure. Czy chcesz rozpocząć bezpieczną sesję?</string>
   <string name="auto_initiate_activity__initiate_exchange">Rozpocznij Wymianę</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">STARE HASŁO:</string>
@@ -305,37 +311,45 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Brak kontaktów.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Szukanie kontaktów...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Ładowanie listy kontaktów...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Wpisz imię aby przefiltrować...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nie jesteś zarejestrowany w usłudze push...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nie posiadasz włączonej usługi push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Aktualizowanie katalogu</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualizowanie katalogu pchnięcia</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualizowanie bazy kontaków push...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Obrazek kontaktu</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Wybierz dla</string>
   <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">Brak ostatnich telefonów.</string>
+  <string name="contact_selection_recent_activity__no_recent_calls">Brak ostatnich połączeń.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message"><small>Wyślij wiadomość</small></string>
   <string name="conversation_activity__send">Wyślij</string>
   <string name="conversation_activity__remove">Usuń</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Wiadomość multimedialna</string>
+  <string name="conversation_item__play_button_description">Przycisk Play</string>
+  <string name="conversation_item__secure_message_description">Wskaźnik bezpiecznej wiadomości</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Pobierz</string>
   <string name="conversation_item_sent__downloading">Pobieranie</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Wskaźnik nieudanej próby wysyłki</string>
+  <string name="conversation_item_sent__pending_approval_description">Oczekuję akceptacji</string>
+  <string name="conversation_item_sent__delivered_description">Wskaźnik dostarczenia</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Pobierz</string>
   <string name="conversation_item_received__downloading">Pobieranie</string>
   <!--conversation_fragment_cab-->
-  <string name="conversation_fragment_cab__batch_selection_mode">Wybór trybu Batch</string>
+  <string name="conversation_fragment_cab__batch_selection_mode">Trybu Wyboru Grupy</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Wczytywanie krajów...</string>
   <string name="country_selection_fragment__search">Szukaj</string>
   <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Proszę wybierz hasło które będzie użyte do lokalnego szyfrowania Twoich danych.</string>
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Proszę wybierz hasło jeśli chciałbyś lokalnie szyfrować swoje dane.</string>
   <string name="create_passphrase_activity__passphrase">HASŁO:</string>
-  <string name="create_passphrase_activity__repeat">POWTÓRZ</string>
+  <string name="create_passphrase_activity__repeat">POWTÓRZ:</string>
   <string name="create_passphrase_activity__continue">Kontynuuj</string>
-  <string name="create_passphrase_activity__generating_secrets">GENEROWANIE KLUCZY</string>
+  <string name="create_passphrase_activity__generating_secrets">GENEROWANIE SEKRETNYCH KLUCZY</string>
   <string name="create_passphrase_activity__skip">Pomiń</string>
   <string name="create_passphrase_activity__create">Utwórz</string>
   <!--log_submit_activity-->
@@ -349,9 +363,11 @@
   <string name="log_submit_activity__copied_to_clipboard">Skopiowane do schowka </string>
   <string name="log_submit_activity__loading_logcat">Ładowanie logcat...</string>
   <string name="log_submit_activity__thanks">Dziękujemy za twoją pomoc!</string>
+  <string name="log_submit_activity__submitting">Wysyłanie</string>
+  <string name="log_submit_activity__posting_logs">Wstawianie logów do serwisu pastebin..</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Czy chcesz zaimportować swoje wiadomości do zaszyfrowanej bazy danych TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Domyślna baza danych z wiadomościami nie zostanie zmodyfikowana ani zastąpiona.</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Domyślna baza danych nie zostanie zmodyfikowana ani zastąpiona w żaden sposób.</string>
   <string name="database_migration_activity__skip">Pomiń</string>
   <string name="database_migration_activity__import">Import</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">To może zająć chwilę. Prosimy o cierpliwość, powiadomimy Cię gdy importowanie zostanie ukończone.</string>
@@ -420,10 +436,10 @@
   <string name="registration_progress_activity__sms_verification_failed">Weryfikacja SMS zakończona niepowodzeniem.</string>
   <string name="registration_progress_activity__generating_keys">Generowanie kluczy...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Do</string>
+  <string name="recipients_panel__to">Wprowadź nazwę lub numer kontaktu</string>
   <string name="recipients_panel__add_member">Dodaj uczestnika</string>
   <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Aktualnie nie masz żadnych kluczy tożsamości w swojej bazie danych zaufania.</string>
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Aktualnie nie masz żadnych kluczy tożsamości w swojej zaufanej bazie danych.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Ich identyfikacja (oni widzą):</string>
   <string name="verify_identity_activity__your_identity_you_read">Twoja identyfikacja (Ty widzisz):</string>
@@ -436,17 +452,17 @@
   <string name="verify_keys_activity__they_read_this">Oni widzą to:</string>
   <string name="verify_keys_activity__you_read_this">Ty widzisz to:</string>
   <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__create_passphrase">Stwórz hasło</string>
+  <string name="AndroidManifest__create_passphrase">\nUtwórz hasło</string>
   <string name="AndroidManifest__enter_passphrase">Wprowadź hasło</string>
   <string name="AndroidManifest__select_contacts">Wybierz kontakty</string>
   <string name="AndroidManifest__select_contact">Wybierz Kontakt</string>
   <string name="AndroidManifest__textsecure_detected">Wykryto TextSecure</string>
-  <string name="AndroidManifest__public_identity_key">Publiczny klucz tożsamości</string>
+  <string name="AndroidManifest__public_identity_key">Publiczny Klucz Tożsamości</string>
   <string name="AndroidManifest__change_passphrase">Zmień hasło</string>
   <string name="AndroidManifest__verify_session">Zweryfikuj sesję</string>
   <string name="AndroidManifest__verify_identity">Zweryfikuj tożsamość</string>
   <string name="AndroidManifest__manage_identity_keys">Zarządzaj kluczami tożsamości</string>
-  <string name="AndroidManifest__complete_key_exchange">Ukończono wymianę kluczy</string>
+  <string name="AndroidManifest__complete_key_exchange">Ukończ wymianę kluczy</string>
   <string name="AndroidManifest__log_submit">Wyślij logi debugowania</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / Eksport</string>
@@ -454,34 +470,38 @@
   <string name="arrays__contact_keys">Klucze Kontaktów</string>
   <!--preferences.xml-->
   <string name="preferences__general">Ogólne</string>
+  <string name="preferences__push_sms_category">Push i SMS</string>
+  <string name="preferences__pref_all_sms_title">Otrzymuj wszystkie SMSy</string>
+  <string name="preferences__pref_all_mms_title">Otrzymuj wszystkie MMSy</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Użyj TextSecure do przeglądania i przechowywania wszystkich wiadomości tekstowych.</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Użyj TextSecure do przeglądania i przechowywania wszystkich wiadomości multimedialnych</string>
+  <string name="preferences__input_settings">Ustawienia wprowadzania</string>
   <string name="preferences__enable_enter_key_title">Włącz klawisz Enter</string>
-  <string name="preferences__replace_smiley_with_enter_key">Zastąp emotikonę klawiszem Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Zastąp przycisk emotikon klawiszem Enter</string>
   <string name="preferences__pref_enter_sends_title">Enter wysyła</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Wciśnięcie przycisku enter wyśle wiadomość</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Wciśnięcie przycisku enter spowoduje wysłanie wiadomości</string>
   <string name="preferences__display_settings">Ustawienia wyświetlania</string>
   <string name="preferences__choose_identity">Wybierz tożsamość</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wybierz swój kontakt początkowy z listy kontaktów.</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wybierz swój kontakt z listy kontaktów.</string>
   <string name="preferences__change_passphrase">Zmień hasło</string>
   <string name="preferences__change_my_passphrase">Zmień moje hasło</string>
-  <string name="preferences__complete_key_exchanges">Wymiana kluczy</string>
+  <string name="preferences__complete_key_exchanges">Ukończenie wymiany kluczy</string>
   <string name="preferences__disable_passphrase">Wyłącz lokalne szyfrowanie</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Wyłącz szyfrowanie wiadomości i kluczy przechowywanych w urządzeniu</string>
   <string name="preferences__screen_security">Ochrona ekranu</string>
-  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatycznie wymień klucze dla nowej sesji albo użyj tego samego klucza tożsamości dla istniejącej sesji</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatycznie ukończ wymianę kluczy dla nowej lub obecnej sesji używając tego samego klucza tożsamości</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Wyłącz ochronę ekranu aby pozwolić na rzuty ekranu</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Zapomnij hasło z pamięci systemu po pewnym czasie</string>
   <string name="preferences__timeout_passphrase">Limit czasu dla hasła</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Wybierz czas do automatycznego wylogowania</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Wybierz czas dla zapomnienia hasła</string>
   <string name="preferences__pref_timeout_interval_title">Czas wygaśnięcia</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Ilość czasu do usunięcia hasła z pamięci urządzenia</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Ilość czasu zanim hasło wygaśnie z pamięci urządzenia</string>
   <string name="preferences__identity_key_settings">Klucze tożsamości</string>
   <string name="preferences__view_my_identity_key">Pokaż mój klucz identyfikacyjny</string>
   <string name="preferences__manage_identity_keys">Zarządzaj kluczami tożsamości</string>
-  <string name="preferences__manage_configured_identity_keys">Administruj skonfigurowanymi kluczami identyfikacyjnymi </string>
+  <string name="preferences__manage_configured_identity_keys">Zarządzaj skonfigurowanymi kluczami identyfikacyjnymi </string>
   <string name="preferences__notifications">Powiadomienia</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Wyświetlaj powiadomienia o wiadomości na pasku </string>
+  <string name="preferences__display_message_notifications_in_status_bar">Wyświetlaj powiadomienia wiadomości w pasku statusu</string>
   <string name="preferences__led_color">Kolor LED</string>
   <string name="preferences__pref_led_blink_title">Wzór powiadomień LED</string>
   <string name="preferences__pref_led_blink_custom_pattern_title">Ustaw częstotliwość LED</string>
@@ -493,33 +513,33 @@
   <string name="preferences__inthread_notifications">Powiadomienia \"w rozmowie\"</string>
   <string name="preferences__play_inthread_notifications">Odtwórz dźwięk powiadomienia podczas przeglądania rozmowy.</string>
   <string name="preferences__vibrate">Wibracja</string>
-  <string name="preferences__also_vibrate_when_notified">Wibruj także przy powiadomieniach</string>
+  <string name="preferences__also_vibrate_when_notified">Wibruje także przy powiadomieniach</string>
   <string name="preferences__minutes">minut</string>
   <string name="preferences__hours">godzin</string>
   <string name="preferences__green">Zielony</string>
   <string name="preferences__red">Czerwony</string>
   <string name="preferences__blue">Niebieski</string>
   <string name="preferences__orange">Pomarańczowy</string>
-  <string name="preferences__cyan">Cyan</string>
-  <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__cyan">Błękitny</string>
+  <string name="preferences__magenta">Purpurowy</string>
   <string name="preferences__white">Biały</string>
   <string name="preferences__none">Brak</string>
   <string name="preferences__fast">Szybko</string>
   <string name="preferences__normal">Normalnie</string>
-  <string name="preferences__slow">Powoli</string>
+  <string name="preferences__slow">Wolno</string>
   <string name="preferences__custom">Własne</string>
   <string name="preferences__advanced">Zaawansowane</string>
   <string name="preferences__passphrase">Hasło</string>
   <string name="preferences__advanced_mms_access_point_names">Ustawienia MMS</string>
   <string name="preferences__enable_manual_mms">Włącz ustawienia ręczne MMS</string>
   <string name="preferences__override_system_mms_settings">Zastąp ustawienia systemowe MMS informacjami poniżej.</string>
-  <string name="preferences__mmsc_url_required">Adres MMSC (Wymagane)</string>
+  <string name="preferences__mmsc_url_required">Adres URL dla MMSC (Wymagane)</string>
   <string name="preferences__mms_proxy_host_optional">Host Proxy dla MMS (nieobowiązkowe)</string>
   <string name="preferences__mms_proxy_port_optional">Port Proxy dla MMS (nieobowiązkowe)</string>
   <string name="preferences__sms_delivery_reports">Raporty dostarczenia SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Żądaj raportu dostarczenia każdej wysłanej wiadomości SMS</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatycznie kasuj starsze wiadomości po przekroczeniu określonej długości wątku</string>
-  <string name="preferences__delete_old_messages">Skasuj stare wiadomości</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatycznie usuń starsze wiadomości po przekroczeniu określonej długości wątku</string>
+  <string name="preferences__delete_old_messages">Usuń stare wiadomości</string>
   <string name="preferences__storage">Przechowywanie</string>
   <string name="preferences__conversation_length_limit">Limit długości konwersacji</string>
   <string name="preferences__trim_all_threads_now">Przytnij wszystkie wątki</string>
@@ -534,15 +554,24 @@
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Ustaw TextSecure jako domyślną aplikację SMS/MMS.</string>
   <string name="preferences__use_data_channel">Czat</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nZwiększ swoją prywatność i uniknij opłat za SMS używając transmisji danych do komunikacji z innymi użytkownikami TextSecure.</string>
+  <string name="preferences__allow_sms_fallback">Pozwól wychodzącym SMS-om do</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure obecnie jest Twoją domyślną aplikacją SMS. Aby to zmienić proszę ustaw inną aplikację SMS na pierwszym miejscu we właściwościach.</string>
   <string name="preferences__refresh_push_directory">Odśwież katalogu pchnięcia</string>
   <string name="preferences__submit_debug_log">Wyślij logi debugowania</string>
+  <string name="preferences__sms_outgoing_push_users">użytkownicy TextSecure</string>
+  <string name="preferences__sms_fallback_push_users_ask">(najpierw pytaj)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Wysyłaj bezpieczne SMSy jeśli połączenie jest utracone</string>
+  <string name="preferences__sms_fallback_ask_fallback">Pytaj przed wysłaniem SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Użytkownicy bez-TextSecure</string>
+  <string name="preferences__sms_fallback_nobody">Nikt</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
-  <string name="contact_selection_list__menu_select_all">Wybierz wszystko</string>
-  <string name="contact_selection_list__menu_unselect_all">Anuluj wybór wszystkiego</string>
+  <string name="contact_selection_list__menu_select_all">Zaznacz wszystko</string>
+  <string name="contact_selection_list__menu_unselect_all">Odznacz wszystko</string>
+  <string name="contact_selection_list__header_textsecure_users">UŻYTKOWNICY TEXTSECURE</string>
+  <string name="contact_selection_list__header_other">WSZYSTKIE KONTAKTY</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Zakończono</string>
   <!--refreshing push directory from menu-->
@@ -553,15 +582,15 @@
   <string name="conversation_callable__menu_call">Zadzwoń</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Szczegóły wiadomości</string>
-  <string name="conversation_context__menu_copy_text">Skopiuj tekst</string>
-  <string name="conversation_context__menu_delete_message">Skasuj wiadomość</string>
+  <string name="conversation_context__menu_copy_text">Kopiuj tekst</string>
+  <string name="conversation_context__menu_delete_message">Usuń wiadomość</string>
   <string name="conversation_context__menu_forward_message">Przekaż wiadomość</string>
   <string name="conversation_context__menu_resend_message">Wyślij ponownie</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Rozpocznij bezpieczną sesję</string>
   <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Skasuj zaznaczone</string>
-  <string name="conversation_list_batch__menu_select_all">Wybierz wszystko</string>
+  <string name="conversation_list_batch__menu_delete_selected">Usuń zaznaczone</string>
+  <string name="conversation_list_batch__menu_select_all">Wybierz wszystkie</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Szukaj</string>
   <string name="conversation_list__drawer_open">Otwórz szufladę nawigacji</string>
@@ -593,7 +622,7 @@
   <string name="text_secure_normal__menu_new_group">Nowa Grupa</string>
   <string name="text_secure_normal__menu_settings">Ustawienia</string>
   <string name="text_secure_normal__menu_clear_passphrase">Zablokuj</string>
-  <string name="text_secure_normal__mark_all_as_read">Oznacz jako przeczytane</string>
+  <string name="text_secure_normal__mark_all_as_read">Oznacz wszystkie przeczytane</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Zweryfikowano</string>
   <!--EOF-->

res/values-pt-rBR/strings.xml

@@ -8,7 +8,7 @@
   <string name="ApplicationPreferencesActivity_currently_s">Correntemente: %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">É necessário digitar a frase-chave antes de gerenciar as chaves...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">Mensagens por conversa</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">mensagens por conversa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Deletar todas mensagens antigas agora?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
   <string name="ApplicationPreferencesActivity_delete">Deletar</string>
@@ -53,7 +53,10 @@
   <string name="ConversationItem_group_action_joined">%1$s entrou no grupo.</string>
   <string name="ConversationItem_group_action_modify">%1$s atualizou o grupo.</string>
   <string name="ConversationItem_click_to_approve">Clique para usar SMS como contingência</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Clique para usar contingência insegura</string>
   <string name="ConversationItem_click_to_approve_dialog_title">Contingenciar para SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">Contingenciar para SMS não criptografado?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Esta mensagem <b>não</b> será criptografada pois não foi possível estabelecer uma sessão segura.\n\nEnviar mensagem insegura?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniciar sessão segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar sessão segura com %s?</string>
@@ -69,13 +72,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lamento, o áudio seleccionado excede as restrições de tamanho da mensagem</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatário não é um endereço SMS ou email válido!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">A mensagem está vazia!</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Agrupar destinatários de conversa</string>
   <string name="ConversationActivity_group_conversation">Conversa em grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo sem nome</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membros</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 membro</string>
-  <string name="ConversationActivity_saving_draft">Salvando rascunho...</string>
   <string name="ConversationActivity_invalid_recipient">Destinatário inválido!</string>
   <string name="ConversationActivity_calls_not_supported">Chamadas não suportadas</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este aparelho parece não suportar ações de chamada.</string>
@@ -96,6 +97,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">Deletando conversas selecionadas...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportar para cartão SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Isto\n        exportará suas chaves criptografadas, configurações e mensagens para o cartão SD.\n    </string>
@@ -116,7 +118,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Novo grupo MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Você selecionou um contato que não tem suporte a grupos TextSecure, então este grupo será de MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Você não está cadastrado para usar o canal de dados, então grupos TextSecure estão desabilitados.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Você não é o dono deste grupo, portanto não pode editar o título nem a foto.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Um erro inesperado ocorreu e fez a criação do grupo falhar.</string>
   <string name="GroupCreateActivity_contacts_no_members">Você precisa de pelo menos uma pessoa no seu grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Um dos membros do seu grupo tem um número que não pôde ser lido. Favor consertar ou remover esse contato e tentar novamente.</string>
@@ -218,6 +219,7 @@
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\n        Mensagem recebida com chave de identidade desconhecida. Clique para processar e exibir.\n    </string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Foi recebida atualização mas com informação de identidade desconhecida. Clique para validar a identidade.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sessão segura terminada.</string>
+  <string name="SmsMessageRecord_duplicate_message">Mensagem duplicada.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Saiu do grupo...</string>
   <string name="TheadRecord_secure_session_ended">Sessão segura terminada.</string>
@@ -309,12 +311,13 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Encontrando contatos...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Carregando contatos...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Digite um nome para filtrar...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Você não está cadastrado no serviço push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Atualizando diretório</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Atualizando diretório push...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Foto do contato</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--contact_selection_recent_activity-->
@@ -323,6 +326,7 @@
   <string name="conversation_activity__type_message"><small>Enviar uma mensagem</small></string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Transferir</string>
   <string name="conversation_item_sent__downloading">A transferir</string>
@@ -353,6 +357,8 @@
   <string name="log_submit_activity__copied_to_clipboard">Copiada para a área de transferência</string>
   <string name="log_submit_activity__loading_logcat">Carregando logcat...</string>
   <string name="log_submit_activity__thanks">Obrigado por sua ajuda!</string>
+  <string name="log_submit_activity__submitting">Enviando</string>
+  <string name="log_submit_activity__posting_logs">Postando logs no pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Gostaria de importar suas mensagens de texto existentes para a base de dados criptografada do TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">A base de dados padrão do sistema não será alterada.</string>
@@ -424,7 +430,7 @@
   <string name="registration_progress_activity__sms_verification_failed">Verificação de SMS\nfalhou.</string>
   <string name="registration_progress_activity__generating_keys">Gerando chaves...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Para</string>
+  <string name="recipients_panel__to"><small>Digite um nome ou um número</small></string>
   <string name="recipients_panel__add_member">Adicionar membro</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Não tem, presentemente, nenhuma chave de identidade na sua base de dados de confianças.</string>
@@ -463,6 +469,7 @@
   <string name="preferences__pref_all_mms_title">Receber todos os MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens de texto recebidas</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens multimídia recebidas</string>
+  <string name="preferences__input_settings">Configurações de introdução</string>
   <string name="preferences__enable_enter_key_title">Habilitar tecla Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Troca a tecla smiley por uma tecla enter</string>
   <string name="preferences__pref_enter_sends_title">Tecla de enter envia</string>
@@ -557,6 +564,8 @@
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">Seleccionar tudo</string>
   <string name="contact_selection_list__menu_unselect_all">Desseleccionar tudo</string>
+  <string name="contact_selection_list__header_textsecure_users">USUÁRIOS TEXTSECURE</string>
+  <string name="contact_selection_list__header_other">TODOS OS CONTATOS</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Terminado</string>
   <!--refreshing push directory from menu-->

res/values-pt/strings.xml

@@ -9,9 +9,9 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Necessita de inserir a frase-chave antes de gerir chaves...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Mensagens por conversa</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Deletar todas mensagens antigas agora?</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Apagar todas mensagens antigas?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
-  <string name="ApplicationPreferencesActivity_delete">Deletar</string>
+  <string name="ApplicationPreferencesActivity_delete">Apagar</string>
   <string name="ApplicationPreferencesActivity_my">O meu</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desactivar cifra de armazenamento?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAtenção, isto desativa a encriptação de armazenamento para todas as mensagens e chaves.\nAs suas sessões continuam encriptadas, mas qualquer pessoa com acesso físico ao dispositivo\nterá acesso ás mensagens e chaves.</string>
@@ -24,7 +24,9 @@
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Não está registado com o serviço push...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Actualizando directório</string>
   <string name="ApplicationPreferencesActivity_updating_push_directory">Actualizando directório PUSH...</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Recepção de SMS activa</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Definir como aplicação SMS por omissão</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Recepção de SMS desactivada</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pressione para tornar TextSecure a sua applicação SMS por omissão</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
@@ -50,6 +52,8 @@
   <string name="ConversationItem_group_action_left">%1$s deixou o grupo.</string>
   <string name="ConversationItem_group_action_joined">%1$s juntou-se ao grupo.</string>
   <string name="ConversationItem_group_action_modify">%1$s actualizou o grupo.</string>
+  <string name="ConversationItem_click_to_approve">Pressione para enviar via SMS</string>
+  <string name="ConversationItem_click_to_approve_dialog_title">Recorrer a SMS?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniciar sessão segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar sessão segura com %s?</string>
@@ -65,13 +69,11 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lamento, o áudio seleccionado excede as restrições de tamanho da mensagem</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatário não é um endereço SMS ou email válido!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">A mensagem está vazia!</string>
-  <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Agrupar destinatários de conversa</string>
   <string name="ConversationActivity_group_conversation">Conversa em grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo Sem Nome</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membros</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 membro</string>
-  <string name="ConversationActivity_saving_draft">A guardar rascunho...</string>
   <string name="ConversationActivity_invalid_recipient">Destinatário inválido!</string>
   <string name="ConversationActivity_calls_not_supported">Chamadas não suportadas</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este dispositivo parece não suportar acções de marcação</string>
@@ -92,6 +94,7 @@
   <string name="ConversationListFragment_deleting_selected_threads">A apagar conversas seleccionadas...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportar para cartão SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">As suas\nchaves de segurança, configurações e mensagens serão exportadas para o cartão SD.\n</string>
@@ -112,7 +115,6 @@
   <string name="GroupCreateActivity_actionbar_mms_title">Novo Grupo MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Seleccionou um contacto que não suporta grupos TextSecure, pelo que este grupo será um grupo MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Não está registado para usar o canal de dados, pelo que os grupos TextSecure estão desactivados.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Não tem permissão para alterar o título ou a imagem deste grupo</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Um irro inesperado ocorreu que impossibilitou a criação do grupo.</string>
   <string name="GroupCreateActivity_contacts_no_members">É necessária pelo menos uma pessoa para formar um grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Um dos membros do seu grupo tem um número ilegível. Por favor corrija ou remova esse contacto e tente novamente.</string>
@@ -305,12 +307,9 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Procurando contactos...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Pesquise por nome...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Não está registado com o serviço push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualizando directório</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando directório PUSH...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--contact_selection_recent_activity-->
@@ -319,6 +318,7 @@
   <string name="conversation_activity__type_message"><small>Envie uma mensagem</small></string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
+  <!--conversation_item-->
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Transferir</string>
   <string name="conversation_item_sent__downloading">A transferir</string>
@@ -420,7 +420,6 @@
   <string name="registration_progress_activity__sms_verification_failed">Verificação por SMS\nfalhou.</string>
   <string name="registration_progress_activity__generating_keys">A gerar chaves...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Para</string>
   <string name="recipients_panel__add_member">Adicionar novo membro</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Não tem, presentemente, nenhuma chave de identidade na sua base de dados de confianças.</string>
@@ -454,8 +453,12 @@
   <string name="arrays__contact_keys">Chaves de contacto</string>
   <!--preferences.xml-->
   <string name="preferences__general">Geral</string>
+  <string name="preferences__push_sms_category">Push e SMS</string>
+  <string name="preferences__pref_all_sms_title">Receber todas as SMS</string>
+  <string name="preferences__pref_all_mms_title">Receber todas as MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens de texto recebidas</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens multimédia recebidas</string>
+  <string name="preferences__input_settings">Configurações de introdução</string>
   <string name="preferences__enable_enter_key_title">Habilitar a tecla Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Substituir a tecla \'smiley\' por uma tecla \'Enter\'</string>
   <string name="preferences__pref_enter_sends_title">Tecla de enter envia</string>
@@ -518,8 +521,8 @@
   <string name="preferences__mms_proxy_port_optional">Porta do Proxy MMS (Opcional)</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente deletar mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
-  <string name="preferences__delete_old_messages">Deletar mensagens antigas</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Apagar automaticamente as mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
+  <string name="preferences__delete_old_messages">Apagar mensagens antigas</string>
   <string name="preferences__storage">Armazenamento</string>
   <string name="preferences__conversation_length_limit">Tamanho máximo de conversa</string>
   <string name="preferences__trim_all_threads_now">Apagar todas conversas agora</string>
@@ -534,9 +537,16 @@
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Tornar o TextSecure a aplicação de SMS/MMS padrão do sistema.</string>
   <string name="preferences__use_data_channel">Mensagens Push</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAumente a privacidade e evite custos de SMS ao utilizar o canal de dados para comunicar com outros utilizadores TextSecure.\n</string>
+  <string name="preferences__allow_sms_fallback">Permitir enviar SMS para</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure é a sua aplicação de SMS pré-definida. Por favor defina outra aplicação como pré-definida para alterar esta preferência.</string>
   <string name="preferences__refresh_push_directory">Actualizar Directório PUSH</string>
   <string name="preferences__submit_debug_log">Submeter registo de depuração</string>
+  <string name="preferences__sms_outgoing_push_users">Utilizadores TextSecure</string>
+  <string name="preferences__sms_fallback_push_users_ask">(perguntar primeiro)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Enviar SMS seguro em caso de perda de ligação de dados</string>
+  <string name="preferences__sms_fallback_ask_fallback">Perguntar antes de enviar SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Utilizadores que não usam TextSecure</string>
+  <string name="preferences__sms_fallback_nobody">Ninguém</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-ro/strings.xml

@@ -3,25 +3,28 @@
   <string name="app_name">TextSecure</string>
   <string name="yes">Da</string>
   <string name="no">Nu</string>
-  <string name="delete">Sterge</string>
+  <string name="delete">Șterge</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Acum: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Trebuie sa introduceti parola inainte de putea sa gestionati cheile...</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Trebuie să introduceți parola înainte de a putea gestiona cheile...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nu ai setat inca o parola!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">mesaje per conversatie</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Sterge toate mesajele vechi acum?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Esti sigur ca doresti sa scurtezi toate conversatiile la %s cele mai recente mesaje?</string>
-  <string name="ApplicationPreferencesActivity_delete">Sterge</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">mesaje per conversație</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Şterge toate mesajele vechi acum?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Eşti sigur că doreşti să scurtezi toate conversaţiile la %s cele mai recente mesaje?</string>
+  <string name="ApplicationPreferencesActivity_delete">Şterge</string>
   <string name="ApplicationPreferencesActivity_my">A mea</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Dezactiveaza stocarea incriptata?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Atentie, acesta actiune va dezactiva stocarea incriptata a tuturor mesajelor si cheilor. Sesiunile actuale incriptate vor continua sa functioneze, dar oricine care are acces la dispozitiv va putea sa le acceseze.</string>
-  <string name="ApplicationPreferencesActivity_disable">Dezactiveaza</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Dezactivează stocarea criptata?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAtenție, acestă acțiune va dezactiva stocarea criptata a tuturor mesajelor și cheilor. Sesiunile actuale criptate vor continua să funcționeze, dar oricine care are acces la dispozitiv va putea să le acceseze.</string>
+  <string name="ApplicationPreferencesActivity_disable">Dezactivează</string>
   <string name="ApplicationPreferencesActivity_unregistering">Anulare inregistrarii se afla in desfasurare...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Anulare inregistrarii comunicatiilor de date</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Dezactivează mesajele push?</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Eroare de conectare cu serverul!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Nu sunteti inregistrat cu serviciul \"push\"</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Nu sunteți înregistrat cu serviciul \"push\"</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Actualizare director</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Actualizare director de tip \"push\"...</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Se actualizează directorul \"push\"...</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Atingeţi pentru a schimba aplicaţia SMS implicită</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Atingeţi pentru a seta TextSecure ca şi aplicaţie SMS implicită</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Imagine</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -33,149 +36,153 @@
   <string name="ConversationItem_saving_attachment">Atasamentul se salveaza</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Atasamentul se salveaza pe SD card...</string>
   <string name="ConversationItem_save_to_sd_card">Salvezi pe SD Card?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Aceste date au fost stocate intr-o baza de date incriptata. Versiunea pe care o salvezi pe SD card nu va mai fi incriptata. Doresti sa continui?</string>
-  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">A aparut o eroare in timpul salvarii pe SD card!</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Aceste date au fost stocate într-o baza de date criptată. Versiunea pe care o salvezi pe SD card nu va mai fi criptată. Dorești să continui?</string>
+  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">A apărut o eroare în timpul salvării pe SD card!</string>
   <string name="ConversationItem_success_exclamation">Succes!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Nu pot scrie pe SD Card!</string>
-  <string name="ConversationItem_view_secure_media_question">Afisez datele securizate?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aceste date au fost salvate intr-o baza de date criptata. Din pacate, pentru a putea vizualiza datele cu ajutorul unui viewer de date extern, este necesar ca datele sa fie temporar decripate si salvate pe disc. Esti sigur ca doresti acest lucru?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Mesajul pentru schimbul de chei a fost primit si procesat.</string>
+  <string name="ConversationItem_view_secure_media_question">Afișez datele securizate?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aceste date au fost salvate într-o bază de date criptată. Din păcate, pentru a putea vizualiza datele cu ajutorul unui viewer de date extern, este necesar ca datele să fie temporar decriptate și salvate pe disc. Ești sigur că dorești acest lucru?</string>
+  <string name="ConversationItem_received_and_processed_key_exchange_message">Mesajul pentru schimbul de chei a fost primit și procesat.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Eroare, mesajul pentru schimbul de chei este vechi.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Am receptionat un mesaj \"schimb de cheie\", tastati pentru a il procesa.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Am recepționat un mesaj \"schimb de cheie\", tastați pentru a-l procesa.</string>
   <string name="ConversationItem_received_plaintext_message_click_to_terminate">Ati primit un SMS in text clar in timp ce aveti o sesiune securizata deschisa. In cazul in care ei nu au o sesiune deschisa, mesajele trimise vor aparea ca text deformat. Click pentru a termina sesiunea securizata.</string>
   <string name="ConversationItem_group_action_left">%1$s a iesit din group.</string>
   <string name="ConversationItem_group_action_joined">%1$s a/au intrat in group.</string>
   <string name="ConversationItem_group_action_modify">%1$s a actualizat grupul.</string>
+  <string name="ConversationItem_click_to_approve">Apăsaţi pentru revenirea la SMS ca soluţie de rezervă </string>
+  <string name="ConversationItem_click_to_approve_dialog_title">Reveniţi la SMS ca soluţie de rezervă?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_title">Reveniţi la SMS necriptat ca soluţie de rezervă?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Acest mesaj <b>nu</b> va fi criptat deoarece nu s-a putut realiza o sesiune securizată.\n\nTrimit mesaj nesecurizat?</string>
   <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_question">Initializez Sesiune Securizata?</string>
+  <string name="ConversationActivity_initiate_secure_session_question">Inițializez o Sesiune Securizată?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initializez Sesiune Securizata cu %s?</string>
   <string name="ConversationActivity_abort_secure_session_confirmation">Se confirma terminarea sesiunii securizate</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Sunteti sigur ca doriti terminarea sesiunii securizate ?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Confirma stergerea conversatiei</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Esti sigur ca doresti sa stergi permanent aceasta conversatie?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Confirmă ștergerea conversației</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ești sigur că dorești să ștergi permanent această conversație?</string>
   <string name="ConversationActivity_add_attachment">Adauga atasament</string>
   <string name="ConversationActivity_select_contact_info">Selectează informații de contact</string>
   <string name="ConversationActivity_compose_message">Compune Mesaj</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ne pare rau, a aparut o eroare in setarea atasamentului tau.</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ne pare rău, a apărut o eroare în setarea atașamentului tău.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Ne pare rau, fisierul video selectat depaseste restrictiile de marime pentru mesaje.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ne pare rau, fisierul audio selectat depaseste restrictiile de marime pentru mesaje.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatarul nu este o adresa valida de SMS sau e-mail.</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Mesajul este gol!</string>
-  <string name="ConversationActivity_forward_message_prefix">TMT</string>
-  <string name="ConversationActivity_group_conversation_recipients">Grupeaza destinatarii conversatiei</string>
+  <string name="ConversationActivity_group_conversation_recipients">Grupează destinatarii conversației</string>
   <string name="ConversationActivity_group_conversation">Grupeaza conversatia</string>
   <string name="ConversationActivity_unnamed_group">Grup nedenumit</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membrii</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 membru</string>
-  <string name="ConversationActivity_saving_draft">Se salveaza ciorna...</string>
   <string name="ConversationActivity_invalid_recipient">Destinatar invalid!</string>
   <string name="ConversationActivity_calls_not_supported">Apelurile nu sunt disponibile</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Acest dispozitiv nu pare sa ofere actiuni pentru formarea numarului de telefon</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Acest dispozitiv nu pare să ofere acţiuni pentru formarea numărului de telefon.</string>
   <string name="ConversationActivity_leave_group">Doriti sa parasiti grupul?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Sunteti sigur ca doriti sa parasiti acest grup?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalii mesaj</string>
-  <string name="ConversationFragment_confirm_message_delete">Confirma stergere mesaj</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Esti sigur ca doresti sa stergi permanent acest mesaj?</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nTrimis/Primit: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Expeditor: %1$s\nTransport: %2$s\nTrimis: %3$s\nPrimit: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Confirmă ștergerea mesajului</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Eşti sigur că doreşti să ştergi permanent acest mesaj?</string>
   <!--ConversationListAdapter-->
   <string name="ConversationListAdapter_key_exchange_message">Mesaj pentru schimb de chei...</string>
   <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Sterg conversatii?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Esti sigur ca doresti stergerea TUTUROR conversatiilor selectate?</string>
-  <string name="ConversationListFragment_deleting">Se sterge</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Se sterg conversatiile selectate...</string>
+  <string name="ConversationListFragment_delete_threads_question">Şterg conversaţiile?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Eşti sigur că doreşti ştergerea TUTUROR conversaţiilor selectate?</string>
+  <string name="ConversationListFragment_deleting">Se șterge</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Se şterg conversaţiile selectate...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mesaj pentru schimb de chei...</string>
+  <!--ShareActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Export pe SD card?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Aceasta actiune va exporta cheile criptate, setarile si mesajele pe SD card.</string>
-  <string name="ExportFragment_export">Export</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Export in format text pe SD card?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atentie, aceasta actiune va exporta continutul text al mesajelor TextSecure pe SD card.</string>
-  <string name="ExportFragment_cancel">Anuleaza</string>
-  <string name="ExportFragment_exporting">Se exporta</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Se exporta textul pe SD card...</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Această acțiune va exporta cheile criptate, setările și mesajele pe SD card.</string>
+  <string name="ExportFragment_export">Exportă</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Export în format text pe SD card?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenție, această acțiune va exporta conținutul text al mesajelor TextSecure pe SD card.</string>
+  <string name="ExportFragment_cancel">Anulează</string>
+  <string name="ExportFragment_exporting">Se exportă</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Se exportă textul pe SD card...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Eroare, nu am putut scrie pe SD card!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Eroare in timpul scrierii pe SD card.</string>
   <string name="ExportFragment_success">Succes!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Se exporta cheile incriptate, setarile si mesajele...</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Se exportă cheile criptate, \nsetările și mesajele...</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup nou</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizare grup</string>
   <string name="GroupCreateActivity_group_name_hint">Numele Grupului</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Grup MMS nou</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">Ati selectat un contact care nu accepta grupuri de tip TextSecure, prin urmare acest grup va fi de tip MMS.</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Ați selectat un contact care nu acceptă grupuri de tip TextSecure, prin urmare acest grup va fi de tip MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Nu v-ati inregistrat in prealabil pentru folosirea canalului de date, prin urmare grupurile TextSecure sunt dezactivate.</string>
-  <string name="GroupCreateActivity_you_dont_own_this_group">Nu sunteti detinatorul acestui grup, prin urmare nu puteti sa ii editati titlul sau imaginea.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">A aparut o eroare neprevazuta care dus la imposibilitatea crearii grupului.</string>
   <string name="GroupCreateActivity_contacts_no_members">Este nevoie de cel putin o persoana in grupul dvs.</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Unul dintre membrii grupului dvs. are un numar de telefon ce nu poate fi citit corect. Va rugam sa remediati problema sau sa eliminati acel contact si sa incercati din nou.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Unul dintre membrii grupului dvs. are un număr de telefon ce nu poate fi citit corect. Vă rugăm să remediaţi problema sau să eliminaţi acel contact şi să încercaţi din nou.</string>
   <string name="GroupCreateActivity_file_io_exception">Eroare I/O in fisier, nu s-a putut crea un fisier temporar de imagine.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar de grup</string>
   <string name="GroupCreateActivity_menu_create_title">Creare grup </string>
   <string name="GroupCreateActivity_creating_group">Se creează %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Import baza de date cu SMS-uri?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Aceasta actiune va importa mesajele din baza de date cu SMS-uri a dispozitivului in TextSecure. Daca ai importat anterior aceste mesaje, importarea lor din nou va rezulta in mesaje duplicate.</string>
-  <string name="ImportFragment_import">Importa</string>
-  <string name="ImportFragment_cancel">Anuleaza</string>
-  <string name="ImportFragment_restore_encrypted_backup">Restaureaza backup incriptat?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Restaurarea unui backup incriptat va inlocui complet cheile existente, setarile si mesajele. Vei pierde toate informatiile curente din TextSecure, dar nu cele din backup.</string>
-  <string name="ImportFragment_restore">Restaureaza</string>
-  <string name="ImportFragment_import_plaintext_backup">Importa backup text?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Aceasta actiune va importa mesajele din rezerva necriptata. Daca ati importata aceasta rezerva precedent, importarea curenta va crea mesaje duplicate. </string>
-  <string name="ImportFragment_importing">Se importa</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Importa backup text...</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Această acțiune va importa mesajele din baza de date cu SMS-uri a dispozitivului în TextSecure. Dacă ai importat anterior aceste mesaje, importarea lor din nou va rezulta în mesaje duplicate.</string>
+  <string name="ImportFragment_import">Importă</string>
+  <string name="ImportFragment_cancel">Anulează</string>
+  <string name="ImportFragment_restore_encrypted_backup">Restaurează backup criptat?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nRestaurarea unui backup criptat va înlocui complet cheile existente, setările și mesajele. Vei pierde toate informațiile curente din TextSecure, dar nu și cele din backup.</string>
+  <string name="ImportFragment_restore">Restaurează</string>
+  <string name="ImportFragment_import_plaintext_backup">Importă backup necriptat?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Această acțiune va importa mesajele din backup-ul necriptat. Dacă ați mai importat acest backup atunci importarea curentă va crea mesaje duplicate. </string>
+  <string name="ImportFragment_importing">Se importă</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importă backup text...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nu a fost gasit nci un backup text!</string>
   <string name="ImportFragment_error_importing_backup">Eroare la importul backup-ului!</string>
   <string name="ImportFragment_import_complete">Import complet!</string>
-  <string name="ImportFragment_restoring">Se restaureaza</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Se restaureaza backup-ul incriptat...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Nu a fost gasit nici un backup incriptat!</string>
+  <string name="ImportFragment_restoring">Se restaurează</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Se restaurează backup-ul criptat...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Nu a fost găsit nici un backup criptat!</string>
   <string name="ImportFragment_restore_complete">Restaurare completa!</string>
   <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nu a fost gasita nici o cheie scanata!</string>
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nu a fost găsită nici o cheie scanată!</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Nu exista conectivitate pentru descarcarea MMS, va rugam sa incercati mai tarziu...</string>
   <string name="MmsDownloader_error_storing_mms">Eroare la stocarea MMS-ului!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Eroare de conectare la furnizorul MMS...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Eroare la citirea setarilor MMS ale operatorului wireless...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Eroare la citirea setărilor MMS ale operatorului wireless...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Mesaj multimedia</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Parolele sunt diferite!</string>
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Parola veche este incorecta!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Parola veche este incorectă!</string>
   <!--PassphraseCreateActivity-->
   <string name="PassphraseCreateActivity_passphrases_dont_match">Parolele nu sunt identice</string>
-  <string name="PassphraseCreateActivity_you_must_specify_a_password">Trebuie specificata o parola</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Trebuie specificată o parolă</string>
   <!--PassphrasePromptActivity-->
-  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Parola Incorecta!</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Parolă incorectă!</string>
   <!--PromptMmsActivity-->
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Trebuie sa specifici un URL MMSC pentru operatorul tau.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Setarile MMS au fost actualizate</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Poti modifica aceste valori in orice moment din meniul Setari al TextSecure.</string>
+  <string name="PromptMmsActivity_mms_settings_updated">Setările MMS au fost actualizate</string>
+  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Poți modifica aceste valori în orice moment din meniul Setări al TextSecure.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Semnatura digitala din acest schimb de chei este diferita fata de ce ai primit anterior de la aceasta persoana. Asta poate insemna ca cineva incearca sa intercepteze comunicatia sau ca aceasta persoana a reinstalat TextSecure si acum are o noua cheie de identitate.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Semnătura digitală din acest schimb de chei este diferită fața de ce ai primit anterior de la această persoană. Asta poate însemna că cineva încearcă să intercepteze comunicația sau că această persoană a reinstalat TextSecure și acum are o nouă cheie de identitate.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Probabil ca doresti sa verifici aceasta persoana.</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Semnatura din acest schimb de chei este de incredere, dar optiunea \"incheie automat schimburile de chei\" este dezactivata.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Semnătura din acest schimb de chei este de încredere, dar opțiunea \"încheie automat schimburile de chei\" este dezactivată.</string>
   <string name="ReceiveKeyActivity_processing">Procesare</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Se proceseaza schimbul de chei...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectare prin TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Alegeti tara Dumneavostra</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Trebuie sa specificati\ncodul dvs de tara</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Trebuie sa specificati\nnumarul dvs de telefon</string>
-  <string name="RegistrationActivity_invalid_number">Numar incorect</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Numarul de telefon\nfurnizat (%s) nu este valabil.</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Trebuie să specificaţi\nnumărul dvs. de telefon</string>
+  <string name="RegistrationActivity_invalid_number">Număr invalid</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Numărul de telefon\nfurnizat (%s) este invalid.</string>
   <string name="RegistrationActivity_unsupported">Neacceptat</string>
   <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Ne pare rau,\ndar acest dispozitiv nu este acceptat pentru mesageria de date. Dispozitivele care rulează versiuni de Android mai vechi\ndecat versiunea 4.0 trebuie sa aiba un cont Google inregistrat. Dispozitivele care ruleaza Android versiunea 4.0 sau mai nou\nnu necesita un cont Google, dar trebuie sa aiba instalata aplicatia Play Store.</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nVom verifica acum daca numarul de telefon de mai jos este asociat cu acest aparat:\n\n%s\n\nEste acest numar de telefon corect, sau doriti sa il editati inainte de a continua?</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nVom verifica acum dacă numărul de telefon de mai jos este asociat cu acest aparat:\n\n%s\n\nEste acest număr de telefon corect, sau doriţi să îl editaţi înainte de a continua?</string>
   <string name="RegistrationActivity_continue">Continuă</string>
   <string name="RegistrationActivity_edit">Editeaza</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Probleme posibile</string>
   <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Verificarea numarului</string>
+  <string name="RegistrationProgressActivity_verifying_number">Verificarea numărului</string>
   <string name="RegistrationProgressActivity_edit_s">Editeaza %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Inregistrarea este completa!</string>
   <string name="RegistrationProgressActivity_possible_problems">Probleme posibile.</string>
@@ -195,6 +202,8 @@
   <string name="RegistrationProgressActivity_too_many_requests">Prea multe cereri!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Ati solicitat deja recent un apel vocal. Veti putea solicita un altul dupa 20 de minute.</string>
   <string name="RegistrationProgressActivity_verifying_voice_code">Verificarea codului de voce</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Conflict înregistrare</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Acest număr este deja înregistrat pe un alt server TextSecure (CyanogenMod?).\nTrebuie să vă scoateţi de acolo înainte de a vă înregistra aici.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Inregistrare completa</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Inregistrarea TextSecure a fost finalizata cu succes.</string>
@@ -204,8 +213,9 @@
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Primit mesajul conform caruia\nschimbul de chei este corupt </string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nPrimit mesajul conform caruia schimbul de chei a avut loc pentru o versiune de protocol invalida.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nPrimit mesaj trimis cu o cheie de identitate necunoscuta. Faceti click pentru a-l procesa si afisa.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">S-au primit infomatii de identitate actualizate dar necunoscute. Apasati pentru a valida identitatea.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">S-au primit informații de identitate actualizate dar necunoscute. Apăsați pentru a valida identitatea.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sesiune securizata terminata.</string>
+  <string name="SmsMessageRecord_duplicate_message">Mesaj duplicat.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">A iesit din group...</string>
   <string name="TheadRecord_secure_session_ended">Sesiune securizata terminata.</string>
@@ -213,32 +223,33 @@
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nu ai o cheie de identitate.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Destinatarul nu are o cheie de identitate.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Destinatarul nu are o cheie de identitate!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Scaneaza cheia partenerului pentru comparatie</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Preia cheia mea scanata</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ATENTIE, cheia scanata NU SE POTRIVESTE! Verifica semnatura digitala cu atentie.</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Scanează cheia partenerului pentru comparație</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Preia cheia mea scanată</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ATENȚIE, cheia scanată NU SE POTRIVEȘTE! Verifică semnătura digitală cu atenție.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NU E VERIFICAT!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Cheia partenerului este corecta. Este necesar deasemenea ca si partenerul tau sa verifice cheia ta.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verificat!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nu ai o cheie de identitate!</string>
   <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Scaneaza-mi semnatura digitala</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Scaneaza semnatura digitala a partenerului</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATENTIE, cheia scanata NU SE POTRIVESTE! Verifica semnatura digitala cu atentie.</string>
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Scanează-mi semnătura digitală</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Scanează semnătura digitală a partenerului</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATENȚIE, cheia scanată NU SE POTRIVEȘTE! Verifică semnătura digitală cu atenție.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">NU E VERIFICAT!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Cheia partenerului este corecta. Este nevoie ca si semnatura ta digitala sa fie scanata.</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Cheia partenerului este corectă. Este nevoie ca și semnătura ta digitală să fie scanată.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Verificat!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nu ai o cheie de identitate!</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Scaneaza pentru a compara</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Vei fi scanat pentru comparatie</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ATENTIE, cheia scanata NU SE POTRIVESTE !</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Scanează pentru a compara</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Vei fi scanat pentru comparație</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ATENȚIE, cheia scanată NU SE POTRIVEȘTE !</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NU E VERIFICAT!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Cheia scanata se potriveste!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Cheia scanată se potrivește!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verificat!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Semnatura digitala</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">Semnătura digitală</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Amprenta mea de identitate</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initializeaza in ciuda cererii existente?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ai trimis deja o cerere pentru initializarea sesiunii catre acest destinatar, esti sigur ca doresti sa trimiti inca una? Aceasta actiune va invalida cererea deja trimisa.</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ai trimis deja o cerere pentru inițializarea sesiunii către acest destinatar, ești sigur că dorești să trimiți încă una? Această acțiune va invalida cererea deja trimisă.</string>
   <string name="KeyExchangeInitiator_send">Trimite</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Mesaj criptat incorect...</string>
@@ -249,7 +260,7 @@
   <string name="MmsDatabase_downloading_mms">Se descarca MMS...</string>
   <string name="MmsDatabase_mms_download_failed">Descarcare MMS esuata!</string>
   <string name="MmsDatabase_downloading">Se descarca...</string>
-  <string name="MmsDatabase_mms_pending_download">Atingeti si configurati setarile MMS pentru a continua descarcarea.</string>
+  <string name="MmsDatabase_mms_pending_download">Atingeți și configurați setările MMS pentru a continua descărcarea.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Se decripteaza MMS, te rog asteapta...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mesaj MMS criptat incorect...</string>
@@ -260,9 +271,9 @@
   <string name="ApplicationMigrationService_import_in_progress">Import in progres</string>
   <string name="ApplicationMigrationService_importing_text_messages">Mesajele text sunt importate</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Tasteaza pentru a deschide.</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Tasteaza pentru a deschide, sau tasteaza lacata pentru a inchide.</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure e descuiat/deblocat.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Atingeți pentru a deschide.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Atingeți pentru a deschide, sau atingeți lacătul pentru a închide.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure e deblocat.</string>
   <string name="KeyCachingService_lock">Blocare acces cu parola</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d mesaje noi</string>
@@ -272,14 +283,14 @@
   <string name="MessageNotifier_message_delivery_failed">Trimiterea mesajului a esuat.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Mesajul nu a putut fi trimis.</string>
   <string name="MessageNotifier_error_delivering_message">A aparut o eroare la trimiterea mesajului.</string>
-  <string name="MessageNotifier_mark_all_as_read">Marcheaza tot ca citit</string>
-  <string name="MessageNotifier_mark_as_read">Marcheaza ca citit</string>
+  <string name="MessageNotifier_mark_all_as_read">Marchează tot ca citit</string>
+  <string name="MessageNotifier_mark_as_read">Marchează ca citit</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Se regenerează...</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Se regenerează cheia\nde identitate...</string>
   <string name="ViewLocalIdentityActivity_regenerated">Regenerată!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Resetare cheie de identitate?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nAtentie! Prin regenerarea cheii tale de identitate, actuala cheie de identitate va fi pierduta definitiv iar persoanele din lista ta de contacte vor primi o notificare la momentul initierii unei noi sesiuni sigure cu tine. Esti sigur ca vrei sa continui?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nAtenție! Prin regenerarea cheii tale de identitate, actuala cheie de identitate va fi pierdută definitiv iar persoanele din lista ta de contacte vor primi o notificare la momentul inițierii unei noi sesiuni securizate cu tine. Ești sigur că vrei să continui?</string>
   <string name="ViewLocalIdentityActivity_cancel">Anulează</string>
   <string name="ViewLocalIdentityActivity_continue">Continuă</string>
   <!--SmsReceiver-->
@@ -291,118 +302,137 @@
   <string name="auto_initiate_activity__initiate_exchange">Initializeaza schimb de chei.</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">PAROLA VECHE:</string>
-  <string name="change_passphrase_activity__new_passphrase">NOUA PAROLA:</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">REPETA NOUA PAROLA:</string>
+  <string name="change_passphrase_activity__new_passphrase">NOUA PAROLĂ:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">REPETĂ NOUA PAROLĂ:</string>
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nu exista contacte.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Cautare contacte...</string>
+  <string name="contact_selection_group_activity__finding_contacts">Se încarcă contactele...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Tastati un nume pentru a filtra...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nu sunteti inregistrat cu serviciul \"push\"</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nu sunteţi înregistrat cu serviciul \"push\"...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualizare director</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Actualizare director de tip \"push\"...</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Se actualizează directorul push...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Poză contact</string>
   <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">Selecteaza pentru</string>
+  <string name="ContactSelectionlistFragment_select_for">Selectează pentru</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Nu exista apeluri recente.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message"><small>Trimite un mesaj</small></string>
   <string name="conversation_activity__send">Trimite</string>
-  <string name="conversation_activity__remove">Sterge</string>
+  <string name="conversation_activity__remove">Șterge</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Mesaj media</string>
+  <string name="conversation_item__play_button_description">Buton redare</string>
+  <string name="conversation_item__secure_message_description">Indicator Mesaj Securizat</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Descarca</string>
   <string name="conversation_item_sent__downloading">Se descarca</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Indicator Transmisie Eşuată</string>
+  <string name="conversation_item_sent__pending_approval_description">Aprobare În Curs</string>
+  <string name="conversation_item_sent__delivered_description">Indicator Transmis</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Descarca</string>
   <string name="conversation_item_received__downloading">Se descarca</string>
   <!--conversation_fragment_cab-->
-  <string name="conversation_fragment_cab__batch_selection_mode">Mod selectie multipla</string>
+  <string name="conversation_fragment_cab__batch_selection_mode">Mod selecție multiplă</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Incarcarea tarilor...</string>
-  <string name="country_selection_fragment__search">Cauta</string>
+  <string name="country_selection_fragment__search">Caută</string>
   <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Va rugam sa alegeti o parola daca doriti sa criptati local datele.</string>
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Vă rugăm să alegeți o parolă dacă doriți să criptați datele local.</string>
   <string name="create_passphrase_activity__passphrase">PAROLA:</string>
   <string name="create_passphrase_activity__repeat">REPETA:</string>
   <string name="create_passphrase_activity__continue">Continua</string>
   <string name="create_passphrase_activity__generating_secrets">SE GENEREAZA CHEILE SECRETE</string>
   <string name="create_passphrase_activity__skip">Treci peste</string>
+  <string name="create_passphrase_activity__create">Creează</string>
   <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">Acest log va fi postat public online pentru a fi văzut de contributorii TextSecure. Nu ezitaţi să examinaţi şi să editaţi log-urile înainte de a le trimite.</string>
+  <string name="log_submit_activity__button_cancel">Nu trimite</string>
+  <string name="log_submit_activity__button_ok">Trimite</string>
+  <string name="log_submit_activity__log_fetch_failed">Nu au putut fi obţinute log-urile pentru dispozitiv. Puteţi folosi în schimb ADB pentru a obţine log-urile.</string>
   <string name="log_submit_activity__log_submit_success_title">Succes!</string>
+  <string name="log_submit_activity__log_got_it">Am înțeles</string>
+  <string name="log_submit_activity__copied_to_clipboard">S-a copiat în clipboard</string>
+  <string name="log_submit_activity__loading_logcat">Se încarcă logcat...</string>
+  <string name="log_submit_activity__thanks">Vă mulțumim pentru ajutor!</string>
+  <string name="log_submit_activity__submitting">Se trimite</string>
+  <string name="log_submit_activity__posting_logs">Se trimit log-urile către pastebin...</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Doresti sa importi mesajele text existente in baza de date incriptata a lui TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Baza de date a sistemului nu va fi modificata in nici un fel.</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Dorești să imporți mesajele tale text existente, în baza de date criptată a lui TextSecure?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Baza de date a sistemului nu va fi modificată în nici un fel.</string>
   <string name="database_migration_activity__skip">Treci peste</string>
-  <string name="database_migration_activity__import">Importa</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">S-ar putea sa dureze cateva momente. Va rugam sa aveti rabdare, va vom notifica cand importul este complet.</string>
-  <string name="database_migration_activity__importing">SE IMPORTA</string>
+  <string name="database_migration_activity__import">Importă</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">S-ar putea să dureze câteva momente. Vă rugăm să aveți răbdare, vă vom notifica când importul este complet.</string>
+  <string name="database_migration_activity__importing">SE IMPORTĂ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Actualizare baza de date...</string>
-  <string name="export_fragment__export_encrypted_backup">Exporta backup incriptat</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Un backup incriptat a fost exportat pe SD card.</string>
-  <string name="export_fragment__export_plaintext_backup">Exporta backup text</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporta un backup text compatibil cu \"SMSBackup And Restore\" pe SD card.</string>
-  <string name="import_fragment__import_system_sms_database">Importa baza de date cu SMS-uri a dispozitivului</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importa baza de date din aplicatia de mesaje a dispozitivului.</string>
-  <string name="import_fragment__import_encrypted_backup">Importa backup incriptat</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Restaureaza un backup incriptat exportat anterior din TextSecure.</string>
-  <string name="import_fragment__import_plaintext_backup">Importa backup text</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">Importa un fisier de backup text. Compatibil cu \'SMSBackup And Restore.\'</string>
+  <string name="export_fragment__export_encrypted_backup">Exportă backup criptat</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Un backup criptat a fost exportat pe SD card.</string>
+  <string name="export_fragment__export_plaintext_backup">Exportă backup necriptat</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportă un backup necriptat compatibil cu \"SMSBackup And Restore\" pe SD card.</string>
+  <string name="import_fragment__import_system_sms_database">Importă baza de date cu SMS-uri a dispozitivului</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importă baza de date \ndin aplicația de mesaje a dispozitivului.</string>
+  <string name="import_fragment__import_encrypted_backup">Importă backup criptat</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nRestaurează un backup criptat exportat anterior din TextSecure.</string>
+  <string name="import_fragment__import_plaintext_backup">Importă backup text</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImportă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</string>
   <string name="local_identity__regenerate_key">Regenerează cheie</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Pentru telefonul tău sunt necesare setări MMS manuale.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">PAROLA TEXTSECURE</string>
-  <string name="prompt_passphrase_activity__unlock">Deblocheaza</string>
+  <string name="prompt_passphrase_activity__unlock">Deblochează</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure are nevoie de setari APN pentru a trimite mesaje multimedia prin operatorul wireless. Acest aparat nu ofera informatiile necesare, lucru care se poate intampla uneori pentru dispozitive blocate sau alte configuratii restrictive.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pentru a putea trimite mesaje multimedia cat si mesaje intr-un grup, apasati \'OK\' si completati setarile solicitate. Setarile MMS pentru operatorul dvs. pot fi gasite cautand dupa \'operatorul tau APN\'. Aceasta operatiune este necesara o singura data.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure are nevoie de setările APN pentru a trimite mesaje multimedia prin operatorul wireless. Acest aparat nu oferă informațiile necesare, lucru care se poate întâmpla uneori pentru dispozitive blocate sau alte configurații restrictive.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pentru a putea trimite mesaje multimedia cât și mesaje într-un grup, apăsați \'OK\' și completați setările solicitate. Setările MMS pentru operatorul dvs. pot fi găsite cautând după \'APN operatorul tău\'. Această operațiune este necesară o singură dată.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (Necesar):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">Host proxy MMS (Optional):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">Port proxy MMS (Optional):</string>
+  <string name="prompt_mms_activity__mms_proxy_host_optional">GAZDĂ PROXY MMS (OPŢIONAL):</string>
+  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPŢIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complet</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure poate utiliza mesageria instant pentru a proteja intimitatea si pentru a evita costurile asociate cu SMS-urile atunci cand comunică\ncu alti utilizatorii TextSecure. Pentru a activa aceasta optiune, va rugam sa verificati codul de tara si numărul de telefon.</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure poate utiliza mesageria instant pentru a proteja intimitatea și pentru a evita costurile asociate cu SMS-urile atunci când comunică\ncu alți utilizatori TextSecure. Pentru a activa această opțiune, vă rugăm să verificați codul de țară și numărul de telefon.</string>
   <string name="registration_activity__your_country">TARA DVS.</string>
-  <string name="registration_activity__your_country_code_and_phone_number">CODUL TARII DVS. SI \nNUMARUL DE TELEFON</string>
-  <string name="registration_activity__phone_number">NUMARUL DE TELEFON</string>
+  <string name="registration_activity__your_country_code_and_phone_number">CODUL ŢĂRII DVS. ŞI \nNUMĂRUL DE TELEFON</string>
+  <string name="registration_activity__phone_number">NUMĂRUL DE TELEFON</string>
   <string name="registration_activity__register">Inregistrare</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Operatiunea de inregistrare va transmite unele informatii de contact catre serverul temporar.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Operațiunea de înregistrare va transmite temporar unele informații de contact către serverul.</string>
   <string name="registration_activity__skip">Treci peste</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Unele probleme posibile\nsunt:</string>
   <string name="registration_problems__sms_interceptors">Interceptori SMS.</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nExista alte aplicatii de mesagerie text, cum ar fi Handcent sau GoSMS, care se comporta sub standard si\nintercepteaza toate mesajele SMS primite. Verificati daca ati primit un mesaj de tip text \ncare incepe cu \"Codul dvs. de verificare TextSecure:\", caz in care va trebui sa configurati\ncealalta aplicatie de mesagerie se permita trecerea mesajelor text mai departe catre TextSecure.</string>
-  <string name="registration_problems__incorrect_number">Numar incorect.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nVa rugam sa va asigurati ca ati introdus corect numarul dvs. de telefon si ca acesta este formatat corect pentru\nregiunea dumneavoastra.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nExistă alte aplicații de mesagerie text, cum ar fi Handcent sau GoSMS, care se comportă sub standard și\ninterceptează toate mesajele SMS primite. Verificați dacă ați primit un mesaj de tip text \ncare începe cu \"Codul dvs. de verificare TextSecure:\", caz în care va trebui să configurați\ncealaltă aplicație de mesagerie să permită trecerea mesajelor text mai departe către TextSecure.</string>
+  <string name="registration_problems__incorrect_number">Număr incorect.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nVă rugăm să vă asiguraţi că aţi introdus corect numărul dvs. de telefon şi că acesta este formatat corect pentru\nregiunea dumneavoastră.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure nu functioneaza cu numere Google Voice.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Verificare pe baza de apel vocal</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure poate de asemenea sa va apeleze telefonic pentru a verifica numărul dvs.\nApasati \"Suna-ma\" si introduceti in casuta de mai jos codul din sase cifre pe care il veti auzi</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure poate de asemenea să vă apeleze telefonic pentru a verifica numărul dvs.\nApăsați \"Sună-mă\" și introduceți în căsuța de mai jos codul din șase cifre pe care îl veți auzi.</string>
   <string name="registration_progress_activity__verify">Verifica</string>
-  <string name="registration_progress_activity__call_me">Suna-ma</string>
-  <string name="registration_progress_activity__edit_number">Editeaza numar</string>
+  <string name="registration_progress_activity__call_me">Sună-mă</string>
+  <string name="registration_progress_activity__edit_number">Editează număr</string>
   <string name="registration_progress_activity__connectivity_error">Eroare de conectivitate</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure nu a putut sa se conecteze la serviciul de push</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure nu a putut să se conecteze la serviciul de push.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Probleme posibile\nsunt:</string>
   <string name="registration_progress_activity__no_network_connectivity">Nu exista conexiune la retea</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Dispozitivul Dvs.\nare nevoie de conectiune cu reteaua pentru a utiliza aceasta functie TextSecure. Va rugam\nsa va incredintati ca dispozitivul e conectat la 3G sau WiFi</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall restrictiv.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nDaca sunteti conectat prin wifi, este posibil ca firewall-ul sa blocheze accesul la\nserverul TextSecure. Incercati sa va conectati la o altă retea wifi sau la una date mobile.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure va verifica acum automat numarul de telefon prin trimiterea unui mesaj SMS de confirmare.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure va verifica acum automat numărul de telefon prin trimiterea unui mesaj SMS de confirmare.</string>
   <string name="registration_progress_activity__connecting">Se conecteaza...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Asteptarea verificarii\nprin SMS</string>
   <string name="registration_progress_activity__registering_with_server">Se inregistreaza cu serverul...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">S-ar putea sa dureze cateva momente.\nVa rugam sa aveti rabdare, va vom notifica cand, va vom notifica cand finiseaza verificarea .</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nOperatiunea initiata de TextSecure a expirat in timpul asteptării primirii mesajului SMS de verificare.</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">S-ar putea să dureze câteva momente.\nVă rugăm să aveți răbdare, vă vom notifica când verificarea este completă.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nOperaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii mesajului SMS de verificare.</string>
   <string name="registration_progress_activity__sms_verification_failed">Verificarea prin SMS a esuat.</string>
   <string name="registration_progress_activity__generating_keys">Generarea cheilor...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to">Catre</string>
-  <string name="recipients_panel__add_member">Adaugare membru</string>
+  <string name="recipients_panel__to"><small>Introduceţi un nume sau un număr</small></string>
+  <string name="recipients_panel__add_member">Adăugare membru</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">In acest moment nu ai nici o cheie de identitate in baza ta de date.</string>
   <!--verify_identity_activity-->
@@ -410,75 +440,86 @@
   <string name="verify_identity_activity__your_identity_you_read">Identitatea ta (cum apari tu):</string>
   <!--verify_import_identity_activity-->
   <string name="verify_import_identity_activity__identity_name_n">Numele identitatii:\⏎\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identitate importata:\⏎\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Identitate importată:\\n\n</string>
   <string name="verify_import_identity_activity__verified">Verificat!</string>
   <string name="verify_import_identity_activity__compare">Compara</string>
   <!--verify_keys_activity-->
   <string name="verify_keys_activity__they_read_this">Partenerul vede:</string>
   <string name="verify_keys_activity__you_read_this">Tu vezi:</string>
   <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__create_passphrase">Creeaza parola</string>
-  <string name="AndroidManifest__enter_passphrase">Introdu parola</string>
-  <string name="AndroidManifest__select_contacts">Selecteaza contacte</string>
-  <string name="AndroidManifest__select_contact">Selecteaza contact</string>
+  <string name="AndroidManifest__create_passphrase">Creează parola</string>
+  <string name="AndroidManifest__enter_passphrase">Introduceţi parola</string>
+  <string name="AndroidManifest__select_contacts">Selectează contacte</string>
+  <string name="AndroidManifest__select_contact">Selectează contact</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectat</string>
   <string name="AndroidManifest__public_identity_key">Cheia publica de identitate</string>
-  <string name="AndroidManifest__change_passphrase">Schimba parola</string>
+  <string name="AndroidManifest__change_passphrase">Schimbă parola</string>
   <string name="AndroidManifest__verify_session">Verifica sesiunea</string>
   <string name="AndroidManifest__verify_identity">Verifica identitatea</string>
-  <string name="AndroidManifest__manage_identity_keys">Administreaza cheile de Identitate</string>
+  <string name="AndroidManifest__manage_identity_keys">Administrează cheile de identitate</string>
   <string name="AndroidManifest__complete_key_exchange">Efectueaza schimbul de chei</string>
+  <string name="AndroidManifest__log_submit">Trimite log-urile de depanare</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importa / Exporta</string>
+  <string name="arrays__import_export">Importă / Exportă</string>
   <string name="arrays__my_identity_key">Cheia mea de identitate</string>
   <string name="arrays__contact_keys">Chei de contact</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
+  <string name="preferences__push_sms_category">Push și SMS</string>
+  <string name="preferences__pref_all_sms_title">Recepționează toate SMS-urile</string>
+  <string name="preferences__pref_all_mms_title">Recepționează toate MMS-urile</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Foloseste TextSecure pentru vizualizarea si salvarea tuturor mesajelor text primite</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Foloseste TextSecure pentru vizualizarea si salvarea tuturor mesajelor multimedia primite</string>
-  <string name="preferences__enable_enter_key_title">Activeaza tasta Enter</string>
-  <string name="preferences__replace_smiley_with_enter_key">Inlocuiti tasta smiley cu o tasta enter</string>
+  <string name="preferences__input_settings">Setări de introducere</string>
+  <string name="preferences__enable_enter_key_title">Activează tasta Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Înlocuiţi tasta smiley cu tasta enter</string>
   <string name="preferences__pref_enter_sends_title">Enter trimite</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Apasarea tastei enter va trimite mesajele text</string>
-  <string name="preferences__display_settings">Afiseaza setarile</string>
-  <string name="preferences__choose_identity">Selecteaza identitatea</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Selecteaza persoana din lista de contacte.</string>
-  <string name="preferences__change_passphrase">Schimba parola</string>
-  <string name="preferences__change_my_passphrase">Schimba parola</string>
-  <string name="preferences__complete_key_exchanges">Incheie schimburile de chei</string>
-  <string name="preferences__disable_passphrase">Dezactiveaza parola</string>
-  <string name="preferences__disable_local_encryption_of_messages_and_keys">Dezactiveaza incriptarea locala a mesajelor si cheilor</string>
-  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completeaza in mod automat schimburile de chei pentru sesiunile noi sau existente cu aceeasi cheie de identitate.</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Sterge parolele din memorie dupa un interval de timp</string>
-  <string name="preferences__timeout_passphrase">Expira parola</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Selecteaza expirarea parolei</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Apăsarea tastei enter va trimite mesajele text</string>
+  <string name="preferences__display_settings">Afișează setările</string>
+  <string name="preferences__choose_identity">Selectează identitatea</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Selectează persoana din lista de contacte.</string>
+  <string name="preferences__change_passphrase">Schimbă parola</string>
+  <string name="preferences__change_my_passphrase">Schimbă parola</string>
+  <string name="preferences__complete_key_exchanges">Încheie schimburile de chei</string>
+  <string name="preferences__disable_passphrase">Dezactivează parola</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Dezactivează criptarea locală a mesajelor şi cheilor</string>
+  <string name="preferences__screen_security">Securitate ecran</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completează în mod automat schimburile de chei pentru sesiunile noi sau existente cu aceeaşi cheie de identitate.</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Dezactivează ecranul de securitate pentru a permite captura ecranului</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Şterge parolele din memorie după un interval de timp</string>
+  <string name="preferences__timeout_passphrase">Expiră parola</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Selectează expirarea parolei</string>
   <string name="preferences__pref_timeout_interval_title">Interval expirare</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Perioada de timp de asteptare inainte de a sterge parola din memorie</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Perioada de timp de așteptare înainte de a șterge parola din memorie</string>
   <string name="preferences__identity_key_settings">Chei de identitate</string>
   <string name="preferences__view_my_identity_key">Vezi cheia de identitate</string>
-  <string name="preferences__manage_identity_keys">Administreaza cheile de identitate</string>
-  <string name="preferences__manage_configured_identity_keys">Administreaza cheile de identitate</string>
-  <string name="preferences__notifications">Notificari</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Afiseaza notificarile in bara de stare</string>
+  <string name="preferences__manage_identity_keys">Administrează cheile de identitate</string>
+  <string name="preferences__manage_configured_identity_keys">Administrează cheile de identitate</string>
+  <string name="preferences__notifications">Notificări</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Afișează notificările în bara de stare</string>
   <string name="preferences__led_color">Culoare LED</string>
   <string name="preferences__pref_led_blink_title">Tipar de clipire LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Setează un şablon personalizat de clipire a LED-ului </string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Şablonul personalizat de clipire a LED-ului a fost setat!</string>
   <string name="preferences__sound">Sunet</string>
   <string name="preferences__change_notification_sound">Schimbă sunetul de notificare</string>
-  <string name="preferences__inthread_notifications">Notificari in conversatie</string>
-  <string name="preferences__play_inthread_notifications">Redare sunet de notificare in timp ce vizualizati o conversatie activa.</string>
-  <string name="preferences__vibrate">Vibreaza</string>
-  <string name="preferences__also_vibrate_when_notified">Vibreaza si cand esti notificat</string>
+  <string name="preferences__inthread_notifications">Notificări în conversație</string>
+  <string name="preferences__play_inthread_notifications">Redare sunet de notificare în timp ce vizualizați o conversație activă.</string>
+  <string name="preferences__vibrate">Vibrează</string>
+  <string name="preferences__also_vibrate_when_notified">Vibrează și când ești notificat</string>
   <string name="preferences__minutes">minute</string>
   <string name="preferences__hours">ore</string>
   <string name="preferences__green">Verde</string>
-  <string name="preferences__red">Rosu</string>
+  <string name="preferences__red">Roşu</string>
   <string name="preferences__blue">Albastru</string>
   <string name="preferences__orange">Portocaliu</string>
   <string name="preferences__cyan">Turcoaz</string>
   <string name="preferences__magenta">Purpuriu</string>
+  <string name="preferences__white">Alb</string>
+  <string name="preferences__none">Niciuna</string>
   <string name="preferences__fast">Rapid</string>
   <string name="preferences__normal">Normal</string>
-  <string name="preferences__slow">Incet</string>
+  <string name="preferences__slow">Încet</string>
   <string name="preferences__custom">Specific</string>
   <string name="preferences__advanced">Avansat</string>
   <string name="preferences__passphrase">Parola</string>
@@ -486,66 +527,76 @@
   <string name="preferences__enable_manual_mms">Activează MMS manual</string>
   <string name="preferences__override_system_mms_settings">Suprascrie setările MMS de sistem cu informațiile de mai jos.</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Necesar)</string>
-  <string name="preferences__mms_proxy_host_optional">Host proxy MMS (Optional)</string>
-  <string name="preferences__mms_proxy_port_optional">Port proxy MMS (Optional)</string>
+  <string name="preferences__mms_proxy_host_optional">Gazdă proxy MMS (Opţional)</string>
+  <string name="preferences__mms_proxy_port_optional">Port proxy MMS (Opţional)</string>
   <string name="preferences__sms_delivery_reports">Confirmari de livrare SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Cere o confirmare de livrare pentru fiecare SMS trimis</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Sterge automat mesajele vechi cand conversatia depaseste marimea specificata</string>
-  <string name="preferences__delete_old_messages">Sterge mesajele vechi</string>
-  <string name="preferences__storage">Spatiu stocare</string>
-  <string name="preferences__conversation_length_limit">Limita marime conversatie</string>
-  <string name="preferences__trim_all_threads_now">Scurteaza toate conversatiile acum</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verifica toate conversatiile si aplica limite de marime a conversatiei</string>
-  <string name="preferences__light_theme">Tema deschisa la culoare</string>
-  <string name="preferences__dark_theme">Tema inchisa la culoare</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Șterge automat mesajele vechi când conversația depășește mărimea specificată</string>
+  <string name="preferences__delete_old_messages">Șterge mesajele vechi</string>
+  <string name="preferences__storage">Spaţiu stocare</string>
+  <string name="preferences__conversation_length_limit">Limita mărime conversație</string>
+  <string name="preferences__trim_all_threads_now">Scurtează toate conversaţiile acum</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verifică toate conversațiile și aplică limite de mărime a conversației</string>
+  <string name="preferences__light_theme">Temă deschisă la culoare</string>
+  <string name="preferences__dark_theme">Temă închisă la culoare</string>
   <string name="preferences__appearance">Aspect</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Implicit</string>
   <string name="preferences__language">Limba</string>
   <string name="preferences__make_default_sms_app">Setează ca aplicație implicită SMS</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Alege TextSecure ca aplicație SMS/MMS implicită pentru sistemul tău.</string>
-  <string name="preferences__use_data_channel">Impingere mesaje</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nSporeste protectia intimitatii si evita costurile asociate cu SMS-urile folosind comunicarea prin canal de date cu alti utilizatori de TextSecure.</string>
-  <string name="preferences__refresh_push_directory">Reimprospatare director de tip \"push\"...</string>
+  <string name="preferences__use_data_channel">Mesaje push</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nSporește intimitatea și evită costurile de SMS folosind comunicarea prin canalul de date cu alți utilizatori TextSecure</string>
+  <string name="preferences__refresh_push_directory">Reîmprospătează directorul \"push\"...</string>
+  <string name="preferences__submit_debug_log">Trimite log-urile de depanare</string>
+  <string name="preferences__sms_outgoing_push_users">Utilizatori TextSecure</string>
+  <string name="preferences__sms_fallback_push_users_ask">(întreabă mai întâi)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Trimite SMS securizat dacă conexiunea de dată este pierdută</string>
+  <string name="preferences__sms_fallback_ask_fallback">Întreabă înainte de a trimite SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Utilizatori Non-TextSecure</string>
+  <string name="preferences__sms_fallback_nobody">Nimeni</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
-  <string name="contact_selection_list__menu_select_all">Selecteaza tot</string>
-  <string name="contact_selection_list__menu_unselect_all">Deselecteaza tot</string>
+  <string name="contact_selection_list__menu_select_all">Selectează tot</string>
+  <string name="contact_selection_list__menu_unselect_all">Deselectează tot</string>
+  <string name="contact_selection_list__header_textsecure_users">UTILIZATORI TEXTSECURE</string>
+  <string name="contact_selection_list__header_other">TOATE CONTACTELE</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Terminat</string>
   <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Actualizează lista de contacte</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Trimite necriptat</string>
   <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">Suna</string>
+  <string name="conversation_callable__menu_call">Sună</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Detalii mesaj</string>
-  <string name="conversation_context__menu_copy_text">Copiaza text</string>
-  <string name="conversation_context__menu_delete_message">Sterge mesaj</string>
-  <string name="conversation_context__menu_forward_message">Expediaza mesaj</string>
+  <string name="conversation_context__menu_copy_text">Copiază textul</string>
+  <string name="conversation_context__menu_delete_message">Şterge mesaj</string>
+  <string name="conversation_context__menu_forward_message">Expediază mesajul</string>
   <string name="conversation_context__menu_resend_message">Retrimite mesaj</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Initializeaza Sesiune Securizata</string>
   <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Sterge ce este selectat</string>
-  <string name="conversation_list_batch__menu_select_all">Selecteaza tot</string>
+  <string name="conversation_list_batch__menu_delete_selected">Şterge ce este selectat</string>
+  <string name="conversation_list_batch__menu_select_all">Selectează tot</string>
   <!--conversation_list-->
-  <string name="conversation_list__menu_search">Cauta</string>
+  <string name="conversation_list__menu_search">Caută</string>
   <string name="conversation_list__drawer_open">Deschide sertar de navigare</string>
   <string name="conversation_list__drawer_close">Inchide sertar de navigare</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Securitate</string>
   <string name="conversation_secure_verified__menu_no_identity">Nu exista identitate disponibila</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verifica identitatea</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Incheie Sesiune Securizata</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Încheie Sesiune Securizată</string>
   <!--conversation-->
-  <string name="conversation__menu_add_attachment">Adauga atasament</string>
+  <string name="conversation__menu_add_attachment">Adaugă atașament</string>
   <string name="conversation__menu_update_group">Actualizare grup</string>
   <string name="conversation__menu_leave_group">Paraseste grup</string>
   <string name="conversation__menu_add_contact_info">Adaugă informații de contact</string>
-  <string name="conversation__menu_delete_thread">Sterge conversatie</string>
+  <string name="conversation__menu_delete_thread">Șterge conversația</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Lista recipienti</string>
   <string name="conversation_group_options__delivery">Trimitere</string>
@@ -553,16 +604,16 @@
   <string name="conversation_group_options__broadcast">Difuzare</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Compara</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Permite scanarea pentru comparatie</string>
-  <string name="key_scanning__menu_scan_to_compare">Scaneaza pentru comparatie</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Permite scanarea pentru comparație</string>
+  <string name="key_scanning__menu_scan_to_compare">Scanează pentru comparație</string>
   <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Deblocheaza</string>
+  <string name="text_secure_locked__menu_unlock">Deblochează</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Mesaj nou</string>
   <string name="text_secure_normal__menu_new_group">Grup nou</string>
-  <string name="text_secure_normal__menu_settings">Setari</string>
+  <string name="text_secure_normal__menu_settings">Setări</string>
   <string name="text_secure_normal__menu_clear_passphrase">Blocare</string>
-  <string name="text_secure_normal__mark_all_as_read">Marcheaza tot ca citit</string>
+  <string name="text_secure_normal__mark_all_as_read">Marchează tot ca citit</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificat</string>
   <!--EOF-->