Bump version to 2.0.5

//FREEBIE

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs
+lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs
 
 
 [textsecure-official.master]

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="63"
-      android:versionName="2.0">
+      android:versionCode="68"
+      android:versionName="2.0.5">
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
 
@@ -69,7 +69,8 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="audio/*" />
                 <data android:mimeType="image/*" />
-                <data android:mimeType="text/*" />
+                <data android:mimeType="text/plain" />
+                <data android:mimeType="video/*" />
             </intent-filter>            
 
         </activity>
@@ -183,10 +184,27 @@
     <activity android:name=".RegistrationProgressActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".LogSubmitActivity"
+              android:label="@string/AndroidManifest__log_submit"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DummyActivity"
+              android:theme="@android:style/Theme.NoDisplay"
+              android:enabled="true"
+              android:allowTaskReparenting="true"
+              android:noHistory="true"
+              android:excludeFromRecents="true"
+              android:alwaysRetainTaskState="false"
+              android:stateNotNeeded="true"
+              android:clearTaskOnLaunch="true"
+              android:finishOnTaskLaunch="true" />
+
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:name=".service.KeyCachingService"/>
     <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=".gcm.GcmIntentService"/>
 
     <service android:name=".service.QuickResponseService"

BUILDING.md

@@ -1,8 +1,67 @@
 Building TextSecure
-===================
+=====================
 
-1. Ensure the 'Android Support Repository' is installed from the Android SDK manager.
+Basics
+------
 
-Execute Gradle:
+TextSecure uses [Gradle](http://gradle.org) to build the project and to maintain
+dependencies.
 
-    ./gradlew build
+Building TextSecure
+-------------------
+
+The following steps should help you (re)build TextSecure from the command line.
+
+1. Checkout the source somewhere on your filesystem with 
+
+        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.
+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\>
+
+5. Execute Gradle:
+
+        ./gradlew build
+
+Re-building native components
+-----------------------------
+
+Note: This step is optional; native components are contained as binaries (see [library/libs](library/libs)).
+
+1. Ensure that the Android NDK is installed.
+
+Execute ndk-build:
+
+    cd library
+    ndk-build
+
+Afterwards, execute Gradle as above to re-create the APK.
+
+Setting up a development environment
+------------------------------------
+
+[Android Studio](https://developer.android.com/sdk/installing/studio.html) is the recommended development environment.
+
+1. Install Android Studio
+2. Make sure the "Android Support Repository" is installed in the Android Studio SDK.
+3. Make sure the latest "Android SDK build-tools" is installed in the Android Studio SDK.
+4. Create a new Android Studio project. from the Quickstart pannel (use File > Close Project to see it), choose "Checkout from Version Control" then "git".
+5. Paste the URL for the TextSecure project when prompted (https://github.com/WhisperSystems/TextSecure.git)
+6. Android studio should detect the presence of a project file and ask you wethere to open it. Click "yes".
+7. Default config options should be good enough.
+8. Project initialisation and build should proceed.
+
+Contributing code
+-----------------
+
+Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
+
+Mailing list
+------------
+
+Development discussion happens on the whispersystems mailing list.
+[To join](https://lists.riseup.net/www/info/whispersystems)
+Send emails to whispersystems@lists.riseup.net

README.md

@@ -10,8 +10,11 @@ TextSecure is a replacement for the standard text messaging application, allowin
 
 Current BitHub Payment For Commit:
 =================
-[![Current Price](https://bithub.herokuapp.com/v1/status/payment/commit)](https://whispersystems.org/blog/bithub/)
+[![Current Price](https://bithub.herokuapp.com/v1/status/payment/commit/)](https://whispersystems.org/blog/bithub/)
 
+Building and contributing code
+==============================
+Instructions on how to build TextSecure, as well as on how to setup an IDE to modify it can be found in the "BUILDING.md" file.
 
 Bug tracker
 -----------

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.8.+'
+        classpath 'com.android.tools.build:gradle:0.9.+'
     }
 }
 
@@ -29,7 +29,7 @@ dependencies {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.0'
+    buildToolsVersion '19.0.2'
 
     defaultConfig {
         minSdkVersion 9
@@ -42,7 +42,7 @@ android {
                 manifest.srcFile 'AndroidManifest.xml'
                 java.srcDirs = ['src']
                 resources.srcDirs = ['src']
-                aild.srcDirs = ['src']
+                aidl.srcDirs = ['src']
                 renderscript.srcDirs = ['src']
                 res.srcDirs = ['res']
                 assets.srcDirs = ['assets']

contributing.md

@@ -0,0 +1,3 @@
+##Translations
+
+Please do not submit issues or pull requests for translation fixes. Anyone can update the translations in [Transifex](https://www.transifex.com/projects/p/textsecure-official/). Please submit your corrections there.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Dec 21 23:48:05 PST 2013
+#Mon Mar 10 23:44:05 PDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip

library/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.8.+'
+        classpath 'com.android.tools.build:gradle:0.9.+'
     }
 }
 
@@ -23,12 +23,11 @@ dependencies {
     compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
     compile 'com.googlecode.libphonenumber:libphonenumber:5.3'
     compile 'org.whispersystems:gson:2.2.4'
-    compile fileTree(dir: 'libs', include: 'armeabi.jar')
 }
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.0'
+    buildToolsVersion '19.0.2'
 
     android {
         sourceSets {
@@ -36,10 +35,11 @@ android {
                 manifest.srcFile 'AndroidManifest.xml'
                 java.srcDirs = ['src']
                 resources.srcDirs = ['src']
-                aild.srcDirs = ['src']
+                aidl.srcDirs = ['src']
                 renderscript.srcDirs = ['src']
                 res.srcDirs = ['res']
                 assets.srcDirs = ['assets']
+                jniLibs.srcDirs = ['libs']
             }
         }
     }

library/jni/Application.mk

@@ -0,0 +1 @@
+APP_ABI := armeabi armeabi-v7a x86

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

@@ -0,0 +1,6 @@
+package org.whispersystems.textsecure.push;
+
+import java.io.IOException;
+
+public class ExpectationFailedException extends IOException {
+}

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

@@ -207,7 +207,7 @@ public class PushServiceSocket {
 
   public List<ContactTokenDetails> retrieveDirectory(Set<String> contactTokens) {
     try {
-      ContactTokenList        contactTokenList = new ContactTokenList(new LinkedList(contactTokens));
+      ContactTokenList        contactTokenList = new ContactTokenList(new LinkedList<String>(contactTokens));
       String                  response         = makeRequest(DIRECTORY_TOKENS_PATH, "PUT", new Gson().toJson(contactTokenList));
       ContactTokenDetailsList activeTokens     = new Gson().fromJson(response, ContactTokenDetailsList.class);
 
@@ -334,6 +334,10 @@ public class PushServiceSocket {
       throw new StaleDevicesException(new Gson().fromJson(response, StaleDevices.class));
     }
 
+    if (connection.getResponseCode() == 417) {
+      throw new ExpectationFailedException();
+    }
+
     if (connection.getResponseCode() != 200 && connection.getResponseCode() != 204) {
       throw new IOException("Bad response: " + connection.getResponseCode() + " " + connection.getResponseMessage());
     }

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

@@ -5,6 +5,7 @@ import android.util.Log;
 
 import org.whispersystems.textsecure.crypto.IdentityKey;
 import org.whispersystems.textsecure.crypto.MasterSecret;
+import org.whispersystems.textsecure.crypto.protocol.CiphertextMessage;
 
 /**
  * Helper class for generating key pairs and calculating ECDH agreements.
@@ -84,8 +85,7 @@ public class Session {
                                    recipient.getRecipientId(),
                                    RecipientDevice.DEFAULT_DEVICE_ID))
     {
-      return new SessionRecordV2(context, masterSecret, recipient.getRecipientId(),
-                                 RecipientDevice.DEFAULT_DEVICE_ID).getSessionVersion();
+      return CiphertextMessage.CURRENT_VERSION;
     } else if (SessionRecordV1.hasSession(context, recipient)) {
       return new SessionRecordV1(context, masterSecret, recipient).getSessionVersion();
     }

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

@@ -338,7 +338,7 @@ public class SessionRecordV2 extends Record {
       return null;
     }
 
-    List<Chain.MessageKey>     messageKeyList     = chain.getMessageKeysList();
+    List<Chain.MessageKey>     messageKeyList     = new LinkedList<Chain.MessageKey>(chain.getMessageKeysList());
     Iterator<Chain.MessageKey> messageKeyIterator = messageKeyList.iterator();
     MessageKeys                result             = null;
 

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

@@ -1,6 +1,5 @@
 package org.whispersystems.textsecure.util;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.telephony.TelephonyManager;
 import android.widget.EditText;
@@ -88,14 +87,6 @@ public class Util {
     return value == null || value.length() == 0;
   }
 
-  public static void showAlertDialog(Context context, String title, String message) {
-    AlertDialog.Builder dialog = new AlertDialog.Builder(context);
-    dialog.setTitle(title);
-    dialog.setMessage(message);
-    dialog.setIcon(android.R.drawable.ic_dialog_alert);
-    dialog.setPositiveButton(android.R.string.ok, null);
-    dialog.show();
-  }
 
   public static int generateRegistrationId() {
     try {

res/drawable/clickable_card.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="@color/card_background_active" />
+            <solid android:color="@color/touch_highlight" />
         </shape>
         <bitmap android:src="@drawable/card" />
     </item>

res/drawable/contact_photo_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="oval">
+            <solid android:color="@color/touch_highlight" />
+        </shape>
+    </item>
+
+    <item android:drawable="@android:color/transparent" />
+</selector>

res/drawable/conversation_item_received_shape.xml

@@ -3,14 +3,14 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_received_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
 
     <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
-            <solid android:color="#ffeeeeee" />
+            <solid android:color="@color/conversation_item_received_background_light" />
             <!--stroke android:width="0.5dp" android:color="#03000000" /-->
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>

res/drawable/conversation_item_received_shape_dark.xml

@@ -3,14 +3,14 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#ff222222" />
+            <solid android:color="@color/conversation_item_received_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
 
     <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
-            <solid android:color="#ff333333" />
+            <solid android:color="@color/conversation_item_received_background_dark" />
             <!--stroke android:width="0.5dp" android:color="#03000000" /-->
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>

res/drawable/conversation_item_received_triangle_shape.xml

@@ -9,7 +9,7 @@
             <shape
                 android:shape="rectangle" >
                 <solid
-                    android:color="#ffeeeeee" />
+                    android:color="@color/conversation_item_received_background_light" />
             </shape>
         </rotate>
     </item>

res/drawable/conversation_item_received_triangle_shape_dark.xml

@@ -9,7 +9,7 @@
             <shape
                 android:shape="rectangle" >
                 <solid
-                    android:color="#ff333333" />
+                    android:color="@color/conversation_item_received_background_dark" />
             </shape>
         </rotate>
     </item>

res/drawable/conversation_item_sent_indicator_text_shape.xml

@@ -0,0 +1,18 @@
+<?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="#09000000" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/conversation_item_received_background_light" />
+            <corners android:bottomLeftRadius="@dimen/conversation_item_corner_radius" android:bottomRightRadius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_sent_indicator_text_shape_dark.xml

@@ -0,0 +1,18 @@
+<?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="#09000000" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/conversation_item_received_background_dark" />
+            <corners android:bottomLeftRadius="@dimen/conversation_item_corner_radius" android:bottomRightRadius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_sent_pending_shape.xml

@@ -0,0 +1,19 @@
+<?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_item_sent_shadow_light" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/conversation_item_sent_pending_background_light" />
+            <!--stroke android:width="0.5dp" android:color="#03000000" /-->
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_sent_pending_shape_dark.xml

@@ -0,0 +1,19 @@
+<?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_item_sent_shadow_dark" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/conversation_item_sent_pending_background_dark" />
+            <!--stroke android:width="0.5dp" android:color="#03000000" /-->
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_sent_pending_triangle_shape.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <rotate
+            android:fromDegrees="45"
+            android:toDegrees="45"
+            android:pivotX="0%"
+            android:pivotY="-30%" >
+            <shape
+                android:shape="rectangle" >
+                <solid
+                    android:color="@color/conversation_item_sent_pending_background_light" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>

res/drawable/conversation_item_sent_pending_triangle_shape_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>
+        <rotate
+            android:fromDegrees="45"
+            android:toDegrees="45"
+            android:pivotX="0%"
+            android:pivotY="-30%" >
+            <shape
+                android:shape="rectangle" >
+                <solid
+                    android:color="@color/conversation_item_sent_pending_background_dark" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>

res/drawable/conversation_item_sent_push_pending_shape.xml

@@ -0,0 +1,18 @@
+<?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_item_sent_shadow_light" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/conversation_item_sent_push_pending_background_light" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_sent_push_pending_shape_dark.xml

@@ -0,0 +1,18 @@
+<?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_item_sent_shadow_dark" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/conversation_item_sent_push_pending_background_dark" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/conversation_item_sent_push_pending_triangle_shape.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <rotate
+            android:fromDegrees="45"
+            android:toDegrees="45"
+            android:pivotX="0%"
+            android:pivotY="-30%" >
+            <shape
+                android:shape="rectangle" >
+                <solid
+                    android:color="@color/conversation_item_sent_push_pending_background_light" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>

res/drawable/conversation_item_sent_push_pending_triangle_shape_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>
+        <rotate
+            android:fromDegrees="45"
+            android:toDegrees="45"
+            android:pivotX="0%"
+            android:pivotY="-30%" >
+            <shape
+                android:shape="rectangle" >
+                <solid
+                    android:color="@color/conversation_item_sent_push_pending_background_dark" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>

res/drawable/conversation_item_sent_push_shape.xml

@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>

res/drawable/conversation_item_sent_push_shape_dark.xml

@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>

res/drawable/conversation_item_sent_shape.xml

@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>

res/drawable/conversation_item_sent_shape_dark.xml

@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#ff003c00" />
+            <solid android:color="@color/conversation_item_sent_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>

res/drawable/conversation_list_divider_shape.xml

@@ -7,7 +7,7 @@
     </item>
     <item android:left="83dp" android:right="10dp">
         <shape android:shape="rectangle">
-            <solid android:color="#15000000" />
+            <solid android:color="@color/conversation_list_divider_light" />
         </shape>
     </item>
 </layer-list>

res/drawable/conversation_list_divider_shape_dark.xml

@@ -7,7 +7,7 @@
     </item>
     <item android:left="83dp" android:right="10dp">
         <shape android:shape="rectangle">
-            <solid android:color="#22ffffff" />
+            <solid android:color="@color/conversation_list_divider_dark" />
         </shape>
     </item>
 </layer-list>

res/drawable/emoji_toggle_background.xml

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

res/drawable/send_button_background.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- pressed -->
-    <item android:state_pressed="true" >
-        <shape>
-            <solid android:color="#FF33B5E5" />
-        </shape>
-    </item>
-
-    <!-- focused -->
-    <item android:state_focused="true" >
-        <shape>
-            <solid android:color="#FF33B5E5" />
-        </shape>
-    </item>
-
-    <!-- default -->
-    <item>
-        <shape>
-            <solid android:color="#00ffffff" />
-        </shape>
-    </item>
-
-</selector>

res/drawable/touch_highlight_background.xml

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

res/layout/conversation_activity.xml

@@ -3,6 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:background="?conversation_background"
     android:orientation="vertical">
 
     <org.thoughtcrime.securesms.components.RecipientsPanel
@@ -17,7 +18,6 @@
             android:layout_height="fill_parent"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:background="?conversation_background"
             android:gravity="bottom">
 
         <fragment
@@ -33,8 +33,7 @@
                 android:id="@id/bottom_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:background="?conversation_background">
+                android:orientation="vertical">
 
             <ScrollView android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
@@ -82,7 +81,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:layout_gravity="center_vertical"
-                        android:background="@drawable/emoji_toggle_background"
+                        android:background="@drawable/touch_highlight_background"
                         android:padding="10dp"/>
 
                 <EditText
@@ -108,7 +107,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
                     android:layout_gravity="center_vertical"
-                    android:background="@drawable/send_button_background"
+                    android:background="@drawable/touch_highlight_background"
                     android:contentDescription="@string/conversation_activity__send"
                     android:nextFocusLeft="@+id/embedded_text_editor"
                     android:padding="12dp"

res/layout/conversation_fragment.xml

@@ -18,6 +18,7 @@
               android:fadingEdge="none"
               android:divider="@android:color/transparent"
               android:dividerHeight="0dp"
-              android:layout_marginBottom="1dip"/>
+              android:layout_marginBottom="1dip"
+              android:cacheColorHint="?conversation_background" />
 
 </LinearLayout>

res/layout/conversation_item_activity.xml

@@ -5,7 +5,6 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="?conversation_background"
     android:padding="8dp">
 
     <TextView android:id="@+id/conversation_item_body"

res/layout/conversation_item_received.xml

@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:paddingRight="10dip"
     android:orientation="vertical"
-    android:background="?conversation_background"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView android:id="@+id/group_message_status"
@@ -26,7 +25,9 @@
         android:layout_marginRight="0dp"
         android:orientation="horizontal">
 
-        <ImageView android:id="@+id/contact_photo"
+        <org.thoughtcrime.securesms.components.ForegroundImageView
+            android:id="@+id/contact_photo"
+            android:foreground="@drawable/contact_photo_background"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginRight="10dp"
@@ -150,7 +151,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="?conversation_received_text_secondary_color"
                     android:fontFamily="sans-serif-light"
-                    android:autoLink="all"
+                    android:autoLink="none"
                     android:linksClickable="false" />
 		    </LinearLayout>
         </LinearLayout>

res/layout/conversation_item_sent.xml

@@ -4,8 +4,7 @@
     android:id="@+id/conversation_item"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="?conversation_background">
+    android:orientation="horizontal">
 
     <RelativeLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -19,9 +18,10 @@
                       android:layout_width="wrap_content"
                       android:layout_height="match_parent"
                       android:orientation="vertical"
-                      android:gravity="right"
+                      android:gravity="left|center_vertical"
                       android:layout_marginLeft="6dp"
-                      android:layout_alignParentLeft="true">
+                      android:layout_alignParentLeft="true"
+                      android:layout_centerVertical="true">
 
             <ImageView
                 android:id="@+id/sms_failed_indicator"
@@ -30,6 +30,15 @@
                 android:src="@drawable/ic_list_alert_sms_failed"
                 android:visibility="gone"
                 android:contentDescription="Send Failed Indicator"/>
+
+            <ImageView
+                android:id="@+id/pending_approval_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_dialog_info_holo_light"
+                android:visibility="gone"
+                android:layout_gravity="center_vertical"
+                android:contentDescription="Pending Approval"/>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/conversation_item_parent"
@@ -56,6 +65,7 @@
                     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
@@ -144,9 +154,10 @@
 		                android:paddingTop="1dip"/>
 
 		      <TextView android:id="@+id/conversation_item_date"
-		                android:autoLink="all"
+		                android:autoLink="none"
 		                android:layout_width="wrap_content"
 		                android:layout_height="wrap_content"
+		                android:minWidth="15sp"
 		                android:linksClickable="false"
 		                android:textAppearance="?android:attr/textAppearanceSmall"
 		                android:layout_gravity="right"
@@ -189,5 +200,22 @@
                android:scaleType="centerCrop"
                android:visibility="gone" />
 
+        <TextView android:id="@+id/indicator_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/conversation_item_parent"
+            android:layout_alignParentRight="true"
+            android:paddingRight="5dip"
+            android:paddingLeft="5dip"
+            android:paddingTop="3dp"
+            android:paddingBottom="3dp"
+            android:layout_marginLeft="50dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginTop="-2dp"
+            android:textSize="12sp"
+            android:textColor="?conversation_sent_text_secondary_color"
+            android:background="?conversation_item_sent_indicator_text_background"
+            android:visibility="gone" />
+
     </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationItem>

res/layout/conversation_list_item_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.ConversationListItem
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
     <FrameLayout android:id="@+id/contact_photo_frame"
@@ -15,79 +15,79 @@
                  android:paddingRight="10dp"
                  android:visibility="visible">
 
-	    <ImageView android:id="@+id/contact_photo_image"
-	               android:layout_width="60dp"
-	               android:layout_height="60dp"
-	               android:cropToPadding="true"
-	               android:scaleType="centerCrop"
-	               android:visibility="gone"
-                   android:contentDescription="Contact Photo Image"
-                   android:layout_marginLeft="0dp" />
+        <org.thoughtcrime.securesms.components.ForegroundImageView
+            android:id="@+id/contact_photo_image"
+            android:foreground="@drawable/contact_photo_background"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:cropToPadding="true"
+            android:scaleType="centerCrop"
+            android:visibility="gone"
+            android:contentDescription="Contact Photo Image"
+            android:layout_marginLeft="0dp" />
     </FrameLayout>
 
-    <TextView android:id="@+id/from"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?attr/conversation_list_item_contact_color"
-        android:singleLine="true"
-        android:layout_marginTop="12dip"
-        android:layout_marginRight="5dip"
+        android:layout_marginTop="4dip"
         android:layout_marginLeft="4dip"
-        android:layout_marginBottom="10dip"
-        android:layout_alignTop="@id/contact_photo_frame"
+        android:layout_marginRight="8dip"
+        android:layout_marginBottom="4dip"
+        android:layout_centerVertical="true"
         android:layout_toRightOf="@id/contact_photo_frame"
-        android:layout_alignParentRight="true"
-        android:layout_alignWithParentIfMissing="true"
-        android:ellipsize="marquee" />
-    <!--android:layout_toLeftOf="@id/checkbox"-->
+        android:orientation="vertical">
 
-    <TextView android:id="@+id/date"
-        android:layout_marginTop="12dip"
-        android:layout_marginLeft="5dip"
-        android:paddingRight="10dip"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="13dp"
-        android:textColor="?attr/conversation_list_item_date_color"
-        android:fontFamily="sans-serif-light"
-        android:singleLine="true"
-        android:layout_alignTop="@id/contact_photo_frame"
-        android:layout_alignParentRight="true" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="1"
+            android:gravity="bottom">
 
-    <ImageView android:id="@+id/error"
-        android:layout_marginLeft="3dip"
-        android:visibility="invisible"
-        android:layout_toLeftOf="@id/date"
-        android:layout_alignBottom="@id/date"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:src="@drawable/ic_list_alert_sms_failed"
-        android:contentDescription="Error Alert" />
+            <TextView android:id="@+id/from"
+                      android:layout_weight="1"
+                      android:layout_width="0dp"
+                      android:layout_height="wrap_content"
+                      android:textAppearance="?android:attr/textAppearanceMedium"
+                      android:textColor="?attr/conversation_list_item_contact_color"
+                      android:singleLine="true"
+                      android:ellipsize="marquee" />
 
-     <ImageView android:id="@+id/attachment"
-        android:layout_marginLeft="3dip"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:visibility="gone"
-        android:layout_toLeftOf="@id/error"
-        android:layout_alignBottom="@id/date"
-        android:src="@drawable/ic_attachment_universal_small"
-        android:contentDescription="Attachment Indicator" />
+            <ImageView android:id="@+id/attachment"
+                       android:layout_marginLeft="3dip"
+                       android:layout_height="match_parent"
+                       android:layout_width="20sp"
+                       android:visibility="gone"
+                       android:src="@drawable/ic_attachment_universal_small"
+                       android:contentDescription="Attachment Indicator" />
 
-    <TextView android:id="@+id/subject"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?attr/conversation_list_item_subject_color"
-        android:fontFamily="sans-serif-light"
-        android:singleLine="true"
-        android:layout_marginBottom="12dip"
-        android:layout_marginLeft="4dip"
-        android:layout_alignBottom="@id/contact_photo_frame"
-        android:layout_toRightOf="@id/contact_photo_frame"
-        android:layout_toLeftOf="@id/date"
-        android:ellipsize="end" />
+            <ImageView android:id="@+id/error"
+                       android:layout_marginLeft="3dip"
+                       android:layout_height="match_parent"
+                       android:layout_width="20sp"
+                       android:visibility="gone"
+                       android:src="@drawable/ic_list_alert_sms_failed"
+                       android:contentDescription="Error Alert" />
 
+            <TextView android:id="@+id/date"
+                      android:layout_marginLeft="3dip"
+                      android:layout_height="wrap_content"
+                      android:layout_width="wrap_content"
+                      android:textAppearance="?android:attr/textAppearanceSmall"
+                      android:textColor="?attr/conversation_list_item_date_color"
+                      android:fontFamily="sans-serif-light"
+                      android:singleLine="true" />
+            </LinearLayout>
+
+        <TextView android:id="@+id/subject"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:textAppearance="?android:attr/textAppearanceSmall"
+                  android:textColor="?attr/conversation_list_item_subject_color"
+                  android:fontFamily="sans-serif-light"
+                  android:singleLine="true"
+                  android:ellipsize="end" />
+
+    </LinearLayout>
 </org.thoughtcrime.securesms.ConversationListItem>

res/layout/create_passphrase_activity.xml

@@ -58,7 +58,7 @@
                           android:orientation="horizontal">
 
                 <Button android:id="@+id/skip_button"
-                        android:text="Skip"
+                        android:text="@string/create_passphrase_activity__skip"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="5dip"
@@ -66,7 +66,7 @@
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <Button android:id="@+id/ok_button"
-                        android:text="Create"
+                        android:text="@string/create_passphrase_activity__create"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"

res/layout/led_pattern_dialog.xml

@@ -29,7 +29,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:id="@+id/SeekBarOnLabel"
-          android:text="On For:"
+          android:text="@string/preferences__pref_led_blink_custom_pattern_on_for"
           android:paddingTop="5sp" />
         <TextView
           android:id="@+id/SeekBarOnMsLabel"
@@ -65,7 +65,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/SeekBarOffLabel"
-        android:text="Off For:"
+        android:text="@string/preferences__pref_led_blink_custom_pattern_off_for"
         android:paddingTop="5sp" />
       <TextView
         android:id="@+id/SeekBarOffMsLabel"

res/layout/log_submit_activity.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView android:id="@+id/log_submit_confirmation"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:text="@string/log_submit_activity__confirmation"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp" />
+
+    <ScrollView android:id="@+id/log_preview_container"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="2">
+        <EditText android:id="@+id/log_preview"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  style="?android:attr/textViewStyle"
+                  android:padding="10dp"
+                  android:background="@null"
+                  android:fontFamily="monospace"
+                  android:hint=""
+                  android:inputType="textImeMultiLine|textNoSuggestions|textMultiLine"
+                  android:textSize="10sp" />
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button android:id="@+id/cancel"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/log_submit_activity__button_cancel"
+                android:layout_weight="1"/>
+        <Button android:id="@+id/ok"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/log_submit_activity__button_ok"
+                android:layout_weight="1"/>
+    </LinearLayout>
+
+</LinearLayout>

res/layout/outgoing_sms_preference.xml

@@ -0,0 +1,44 @@
+<?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"
+    android:paddingTop="15dp"
+    android:paddingLeft="15dp"
+    android:paddingBottom="15dp"
+    android:paddingRight="10dp">
+
+    <CheckBox android:id="@+id/data_users"
+        style="@style/TextSecureDialogPrimaryText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+        android:singleLine="true"
+        android:text="@string/preferences__sms_outgoing_push_users" />
+
+    <TextView
+        style="@style/TextSecureDialogSecondaryText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-5dp"
+        android:layout_marginLeft="32dp"
+        android:textSize="12sp"
+        android:text="@string/preferences__sms_outgoing_push_users_description" />
+
+    <CheckBox android:id="@+id/ask_before_fallback_data"
+        style="@style/TextSecureDialogPrimaryText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+        android:text="@string/preferences__sms_fallback_ask_fallback"
+        android:layout_marginLeft="25dp" />
+
+    <CheckBox android:id="@+id/non_data_users"
+        style="@style/TextSecureDialogPrimaryText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+        android:text="@string/preferences__sms_fallback_non_push_users" />
+
+</LinearLayout>

res/layout/registration_activity.xml

@@ -76,7 +76,7 @@
                       android:orientation="horizontal">
 
             <Button android:id="@+id/skipButton"
-                    android:text="Skip"
+                    android:text="@string/registration_activity__skip"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="5dip"

res/menu/conversation_secure_identity.xml

@@ -5,8 +5,8 @@
           android:icon="?menu_lock_icon"
           android:showAsAction="ifRoom">
           <menu>
-              <item android:title="@string/conversation_secure_verified__menu_verify_recipient"
-                    android:id="@+id/menu_verify_recipient"/>
+              <item android:title="@string/conversation_secure_verified__menu_verify_identity"
+                    android:id="@+id/menu_verify_identity"/>
           </menu>
     </item>
-</menu>
+</menu>

res/menu/log_submit.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/preferences__submit_debug_log"
+          android:id="@+id/menu_submit_debug_logs"
+          android:icon="@android:drawable/ic_menu_upload" />
+</menu>

res/menu/push_directory.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/push_directory__menu_refresh"
+          android:id="@+id/menu_refresh_directory"
+          android:icon="?menu_refresh_directory"
+          android:showAsAction="ifRoom"
+        />
+</menu>

res/values-ar/strings.xml

@@ -15,6 +15,7 @@
   <string name="ApplicationPreferencesActivity_my">أنا</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">ايقاف تشفير التخزين؟</string>
   <string name="ApplicationPreferencesActivity_disable">تعطيل</string>
+  <string name="ApplicationPreferencesActivity_unregistering">جاري إلغاء التسجيل...</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطأ في الاتصال مع مزود الخدمة...</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">صورة</string>
@@ -24,7 +25,6 @@
   <string name="ConversationItem_message_size_d_kb">حجم الرسالة: %d كيلوبايت</string>
   <string name="ConversationItem_expires_s">تاريخ الانتهاء: %s</string>
   <string name="ConversationItem_error_sending_message">خطأ بالارسال</string>
-  <string name="ConversationItem_sending">ارسال...</string>
   <string name="ConversationItem_saving_attachment">حفظ الإضافة</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">حفظ الإضافة على كرت الذاكرة</string>
   <string name="ConversationItem_save_to_sd_card">حفظ على كرت الذاكرة؟</string>
@@ -35,9 +35,14 @@
   <string name="ConversationItem_view_secure_media_question">عرض الوسائط المشفرة؟</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">تم استقبال و معالجة رسالة تبادل المفاتيح</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">خطأ، تم استقبال رسالة تبادل مفاتيح غير صالحة</string>
+  <string name="ConversationItem_group_action_left">%1$s تَرك المجموعة.</string>
+  <string name="ConversationItem_group_action_joined">%1$s دخَل الفريق.</string>
+  <string name="ConversationItem_group_action_modify">%1$s حَدث الفريق.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">هل أفتح قناة تشفير؟</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">فتح قناة تشفير مع %s ؟</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">تأكيد انهاء قناة التشفير</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">هل انت متأكد من ان تريد انهاء قناة التشفير؟</string>
   <string name="ConversationActivity_delete_thread_confirmation">تأكيد حذف المحادثة</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">هل تريد حقاَ حذف هذه المحادثة نهائياً؟</string>
   <string name="ConversationActivity_add_attachment">إضافات</string>
@@ -51,14 +56,17 @@
   <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>
+  <string name="ConversationActivity_leave_group">اترك المجموعة؟</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">هل أنت متأكد من ترك المجموعة؟</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">تفاصيل الرسالة</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">المرسل: %1$s\nالاتصال: %2$s\nارسال/استقبال: %3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">المرسل: %1$s\nالارسال: %2$s\nتم ارسال: %3$s\nتم استقبال:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">تأكيد حذف الرسالة</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">هل أنت متأكد من حذف هذه الرسالة نهائياً؟</string>
   <!--ConversationListAdapter-->
@@ -84,6 +92,13 @@
   <string name="ExportFragment_success">نجحت!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">جاري تصدير مفاتيحك المشفرة و إعداداتك و رسائلك</string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">مجموعة جديدة</string>
+  <string name="GroupCreateActivity_actionbar_update_title">حدث المجموعة</string>
+  <string name="GroupCreateActivity_group_name_hint">اسم المجموعة</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">مجموعة MMS جديدة</string>
+  <string name="GroupCreateActivity_avatar_content_description">الصورة الرمزية للمجموعة</string>
+  <string name="GroupCreateActivity_menu_create_title">إنشاء مجموعة</string>
+  <string name="GroupCreateActivity_creating_group">انشاء %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">استيراد الرسائل القصيرة بالنظام؟</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">هذه الخاصية ستستورد الرسائل القصيرة من النظام إلى داخل تكست سيكيور. إذا قمت بعمل هذا من قبل فسيتم تكرار رسائلك القصيرة.</string>
@@ -128,12 +143,39 @@
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال هذه</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">التوقيع لجهة الاتصال هذه معتمد لديك، لكنك قمت بتعطيل خاصية اكمال تبادل المفاتيح اوتوماتيكياً</string>
   <!--RegistrationActivity-->
+  <string name="RegistrationActivity_select_your_country">اختر بلدك</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">يجب عليك تحديد\nرقم الهاتف الخاص بك</string>
+  <string name="RegistrationActivity_invalid_number">رقم غير صالح</string>
+  <string name="RegistrationActivity_unsupported">غير مسنود </string>
   <string name="RegistrationActivity_continue">متابعة</string>
+  <string name="RegistrationActivity_edit">تحرير</string>
   <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">مشاكل ممكنة.</string>
   <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">جاري التحقٌق من الرقم</string>
+  <string name="RegistrationProgressActivity_edit_s">تعديل %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">اكتمال التسجيل!</string>
+  <string name="RegistrationProgressActivity_possible_problems">مشاكل ممكنة.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">يجب عليك إدخال الرمز الذي تلقيته اولاً...</string>
+  <string name="RegistrationProgressActivity_connecting">جاري الاتصال</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">جاري الإتصال للتحقٌق...</string>
+  <string name="RegistrationProgressActivity_network_error">خطأ في الشبكة!</string>
+  <string name="RegistrationProgressActivity_verification_failed">فشل التحقٌق!</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">محاولات كثيرة</string>
+  <string name="RegistrationProgressActivity_requesting_call">جاري طلب الاتصال</string>
+  <string name="RegistrationProgressActivity_server_error">خطأ في الخادم</string>
+  <string name="RegistrationProgressActivity_too_many_requests">طلبات كثيرة!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">لقد طلبت مؤخرا بآجراء مكالمة صوتية. يمكنك طلب مكالمة آخرى في 20 دقيقة. </string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">التحقق من رمز الصوت...</string>
+  <string name="RegistrationProgressActivity_registration_conflict">تعارض في التسجيل</string>
   <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">اكتمال التسجيل</string>
+  <string name="RegistrationService_registration_error">تسجيل خاطئ</string>
   <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_secure_session_ended">قناة التشفير انتهت.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">ترك الفريق...</string>
+  <string name="TheadRecord_secure_session_ended">قناة التشفير انتهت.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">لا يوجد لديك مفتاح هوية!</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">لا يوجد لدى الطرف الاخر مفتاح هوية!</string>
@@ -184,6 +226,9 @@
   <string name="ApplicationMigrationService_import_in_progress">جاري الاستيراد...</string>
   <string name="ApplicationMigrationService_importing_text_messages">جاري استيراد الرسائل النصية</string>
   <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">المس للفتح</string>
+  <string name="KeyCachingService_passphrase_cached">انفتح تكست سيكيور </string>
+  <string name="KeyCachingService_lock">أقفل بعبارة سرية</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) رسائل جديدة</string>
   <string name="MessageNotifier_most_recent_from_s">آخر رسالة من: %s</string>
@@ -214,12 +259,14 @@
   <!--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>
   <!--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_sent-->
@@ -231,12 +278,21 @@
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">وضع الدفعات</string>
   <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">جاري تحميل البلدان...</string>
   <string name="country_selection_fragment__search">بحث</string>
   <!--create_passphrase_activity-->
   <string name="create_passphrase_activity__passphrase">العبارة السرية:</string>
   <string name="create_passphrase_activity__repeat">تكرار:</string>
   <string name="create_passphrase_activity__continue">متابعة</string>
   <string name="create_passphrase_activity__generating_secrets">جاري إنشاء الأسرار</string>
+  <string name="create_passphrase_activity__skip">تجاهل</string>
+  <string name="create_passphrase_activity__create">إنشاء</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__button_cancel">لا تقدم</string>
+  <string name="log_submit_activity__button_ok">قدَم</string>
+  <string name="log_submit_activity__log_submit_success_title">نجحت!</string>
+  <string name="log_submit_activity__copied_to_clipboard">نسخ إلى الحافظة</string>
+  <string name="log_submit_activity__thanks">شكرا لمساعدتك!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">هل تود استيراد الرسائل النصية إلى قواعد بيانات تكست سيكيور المشفرة؟</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">لن يتم تغيير قاعدة البيانات الأساسية بأي طريقة.</string>
@@ -265,10 +321,32 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">انتهاء</string>
   <!--registration_activity-->
+  <string name="registration_activity__your_country">بلدك</string>
+  <string name="registration_activity__phone_number">رقم الهاتف</string>
+  <string name="registration_activity__register">سجل</string>
+  <string name="registration_activity__skip">تجاهل</string>
   <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">بعض المشاكل المحتملة\nوتشمل:</string>
+  <string name="registration_problems__sms_interceptors">رسائل نصية قصيرة</string>
+  <string name="registration_problems__incorrect_number"> رقم غير صحيح.</string>
+  <string name="registration_problems__google_voice">.Google Voice</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure لن يعمل مع أرقام Google Voice</string>
   <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">التحقق الصوتي </string>
+  <string name="registration_progress_activity__verify">تحقق</string>
+  <string name="registration_progress_activity__call_me">اتصل بي</string>
+  <string name="registration_progress_activity__edit_number">تعديل الرقم</string>
+  <string name="registration_progress_activity__connectivity_error">خطأ في الاتصال</string>
+  <string name="registration_progress_activity__some_possible_problems_include">بعض المشاكل \nالمحتملة وتشمل:</string>
+  <string name="registration_progress_activity__no_network_connectivity">لا يوجد شبكة\nتوصيل.</string>
+  <string name="registration_progress_activity__restrictive_firewall">جدار حماية مقيَد.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nسيتم الآن التحقق من رقم هاتفك تلقائيا بواسطة رسالة تأكيد SMS.</string>
+  <string name="registration_progress_activity__connecting">جاري الاتصال...</string>
+  <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>
   <!--verify_identity_activity-->
@@ -286,6 +364,7 @@
   <string name="AndroidManifest__create_passphrase">انشاء عبارة سرية</string>
   <string name="AndroidManifest__enter_passphrase">ادخل العبارة السرية</string>
   <string name="AndroidManifest__select_contacts">اختيار جهات الاتصال</string>
+  <string name="AndroidManifest__select_contact">اختار جهة الاتصال</string>
   <string name="AndroidManifest__textsecure_detected">تم العثور على تكست سيكيور</string>
   <string name="AndroidManifest__public_identity_key">مفتاح الهوية العام</string>
   <string name="AndroidManifest__change_passphrase">غير العبارة السرية</string>
@@ -299,10 +378,9 @@
   <string name="arrays__contact_keys">مفاتيح جهات الاتصال</string>
   <!--preferences.xml-->
   <string name="preferences__general">عام</string>
-  <string name="preferences__pref_all_sms_title">استخدام لكل الرسائل القصيرة</string>
-  <string name="preferences__pref_all_mms_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>
   <string name="preferences__pref_enter_sends_title">زر الرجوع Enter يرسل الرسالة</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">ضغط مفتاح الرجوع Enter سيرسل الرسالة</string>
   <string name="preferences__display_settings">اعدادات العرض</string>
@@ -324,7 +402,10 @@
   <string name="preferences__manage_configured_identity_keys">إدارة مفاتيح الهوية التي تم ضبطها</string>
   <string name="preferences__notifications">التنبيهات</string>
   <string name="preferences__display_message_notifications_in_status_bar">عرض تنبيهات الرسائل بشريط التنبيهات</string>
+  <string name="preferences__led_color">لون ضوء التنبيه LED</string>
+  <string name="preferences__pref_led_blink_title">اسلوب وميض LED</string>
   <string name="preferences__sound">صوت</string>
+  <string name="preferences__change_notification_sound">تغيير صوت التنبيه</string>
   <string name="preferences__inthread_notifications">تنبيهات داخل المحادثة</string>
   <string name="preferences__play_inthread_notifications">تشغيل صوت التنبيهات أثناء متابعة محادثة نشطة.</string>
   <string name="preferences__vibrate">هزاز</string>
@@ -337,12 +418,14 @@
   <string name="preferences__orange">برتقالي</string>
   <string name="preferences__cyan">سماوي</string>
   <string name="preferences__magenta">وردي</string>
+  <string name="preferences__white">أبيض</string>
   <string name="preferences__fast">سريع</string>
   <string name="preferences__normal">طبيعي</string>
   <string name="preferences__slow">بطىء</string>
   <string name="preferences__custom">مخصص</string>
   <string name="preferences__advanced">متقدم</string>
   <string name="preferences__passphrase">العبارة السرية</string>
+  <string name="preferences__advanced_mms_access_point_names">تفضيلات MMS</string>
   <string name="preferences__mmsc_url_required">عنوان مركز رسائل الوسائط المتعددة (الزامي)</string>
   <string name="preferences__mms_proxy_host_optional">عنوان بروكسي رسائل الوسائط المتعددة (غير الزامي)</string>
   <string name="preferences__mms_proxy_port_optional">منفذ او بورت بروكسي  الرسائل الوسائط المتعددة (غير الزامي)</string>
@@ -368,6 +451,8 @@
   <string name="contact_selection_list__menu_unselect_all">إزالة اختيار الكل</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">تم الانتهاء</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">انعش جهات الاتصال</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">أرسل من دون تشفير</string>
   <!--conversation_callable-->
@@ -387,9 +472,14 @@
   <string name="conversation_list__menu_search">بحث</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">الأمن</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">تحقق من مستقبل الرسالة</string>
+  <string name="conversation_secure_verified__menu_no_identity">لا هوية موجودة</string>
+  <string name="conversation_secure_verified__menu_verify_identity">تحقق من الهوية</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">انهاء قناة التشفير</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">إضافات</string>
+  <string name="conversation__menu_update_group">تحديث المجموعة</string>
+  <string name="conversation__menu_leave_group">ترك المجموعة</string>
+  <string name="conversation__menu_add_contact_info">إضافة معلومات الاتصال</string>
   <string name="conversation__menu_delete_thread">مسح المحاذفة</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">قائمة المشاركين</string>
@@ -404,7 +494,9 @@
   <string name="text_secure_locked__menu_unlock">فتح القفل</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">رسالة جديدة</string>
+  <string name="text_secure_normal__menu_new_group">مجموعة جديدة</string>
   <string name="text_secure_normal__menu_settings">الاعدادات</string>
+  <string name="text_secure_normal__menu_clear_passphrase">أقفل</string>
   <string name="text_secure_normal__mark_all_as_read">اعتبارها رسائل مقروءة</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">تم التحقق!</string>

res/values-bg/strings.xml

@@ -24,7 +24,6 @@
   <string name="ConversationItem_message_size_d_kb">Големина на съобщението: %d KB</string>
   <string name="ConversationItem_expires_s">Изтича: %s</string>
   <string name="ConversationItem_error_sending_message">Грешка при изпращане на съобщението</string>
-  <string name="ConversationItem_sending">Праща се...</string>
   <string name="ConversationItem_saving_attachment">Записване на приложение</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Записване на приложение на SD карта</string>
   <string name="ConversationItem_save_to_sd_card">Запази на SD карта?</string>
@@ -56,8 +55,6 @@
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Това устройство не поддържа повиквания.</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Информация за съобщението</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Изпращане: %1$s⏎\nТранспорт: %2$s⏎\nИзпратени/Получени:%3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Изпращач: %1$s⏎\nТранспорт: %2$s⏎\nИзпратено: %3$s⏎\nПолучено:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Потвърдете изтриване на съобщението</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Сигурни ли сте че искате да изтриете съобщението завинаги?</string>
   <!--ConversationListAdapter-->
@@ -230,6 +227,9 @@
   <string name="create_passphrase_activity__repeat">ПОВТОРИ: </string>
   <string name="create_passphrase_activity__continue">Продължи</string>
   <string name="create_passphrase_activity__generating_secrets">ГЕНЕРИРАНЕ НА ТАЙНИ</string>
+  <string name="create_passphrase_activity__skip">Пропусни</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__log_submit_success_title">Успех!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Искате ли да импортирате съществуващи текстови съобщения в криптирана база данни на TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Базата данни на системата  няма да се  променени по някакъв начин.</string>
@@ -260,6 +260,7 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Завършен</string>
   <!--registration_activity-->
+  <string name="registration_activity__skip">Пропусни</string>
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
@@ -294,8 +295,6 @@
   <string name="arrays__contact_keys">Контактни ключове</string>
   <!--preferences.xml-->
   <string name="preferences__general">Общо</string>
-  <string name="preferences__pref_all_sms_title">Използвай за всички SMS-и</string>
-  <string name="preferences__pref_all_mms_title">Използвай за всички MMS-и</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__pref_enter_sends_title">Въведете изпращане</string>
@@ -361,6 +360,7 @@
   <string name="contact_selection_list__menu_unselect_all">Не избирай нищо</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Завършен</string>
+  <!--refreshing push directory from menu-->
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Прати без криптиране</string>
   <!--conversation_callable-->
@@ -379,7 +379,7 @@
   <string name="conversation_list__menu_search">Търси</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Защита</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Провери получателя</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Провери самоличността</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Добави файл</string>
   <string name="conversation__menu_delete_thread">Изтрий темата</string>

res/values-bo/strings.xml

@@ -20,7 +20,6 @@
   <string name="ConversationItem_message_size_d_kb">འཕྲིན་ཐུང་ཆེ་ཆུང་།%d KB</string>
   <string name="ConversationItem_expires_s">དུས་ཚོད་རྫོགས།%s</string>
   <string name="ConversationItem_error_sending_message">གཏོང་བཞིན་པའི་འཕྲིན་ཐུང་དེར་ནོར་འཁྲུལ་ཞིག་འདུག </string>
-  <string name="ConversationItem_sending">གཏོང་བཞིན་ཡོད། </string>
   <string name="ConversationItem_saving_attachment">ཟུར་སྣོན་ཉར་ཚགས་བྱེད་བཞིན་ཡོད།</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">ཉེན་སྲུང་འཕྲུལ་ཆས་ཀྱི་བྱང་བུའི་(SD Card) ནང་ཟུར་སྣོན་ཉར་ཚགས་བྱེད་བཞིན་ཡོད།</string>
   <string name="ConversationItem_save_to_sd_card">ཉེན་སྲུང་འཕྲུལ་ཆས་ཀྱི་བྱང་བུའི་(SD Card) ནང་ཉར་ཚགས་བྱེད་རྒྱུ་ཡིན་ནམ།</string>
@@ -48,8 +47,6 @@
   <string name="ConversationActivity_saving_draft">ཟིན་བྲིས་ཉར་ཚགས་བྱེད་བཞིན་ཡོད།</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">གཏོང་མཁན།:%1$s  དབོར་བ།:%2$s བཏང་ཚར། འབྱོར།:%3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">གཏོང་མཁན: %1$s⏎ སྐྱེལ་འདྲེན: %2$s⏎ བཏང་ཚར: %3$s⏎ འབྱོར་ཚར:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">འཕྲིན་ཐུང་གསུབ་པ་ངེས་བརྟན་བཟོས། </string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">ཁྱོད་ཀྱིས་དངོས་གནས་འཕྲིན་ཐུང་འདི་གཏན་དུ་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
   <!--ConversationListAdapter-->
@@ -192,6 +189,9 @@
   <string name="create_passphrase_activity__repeat">བསྐྱར་དུ་སྤེལ། :</string>
   <string name="create_passphrase_activity__continue">མུ་མཐུད། </string>
   <string name="create_passphrase_activity__generating_secrets">གསང་བ་སྐྱེད་སྒྲུབ་བྱོས། </string>
+  <string name="create_passphrase_activity__skip">བསྐྱུར། </string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__log_submit_success_title">ལེགས་འགྲུབ། </string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">ཁྱེད་ཀྱིས་ད་ཡོད་འཕྲིན་ཐུང་ཡི་གེ་དེ་གཡག་འཕྲིན་གསང་སྡོམ་མཛོད་ཀྱི་ཁོངས་སུ་བཅུག་འདོད་འདུག་གམ། </string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">གཏན་འཇགས་མཛོད་ཀྱི་མ་ལག་དེར་ཕྱོགས་གང་ཅིའི་ཐད་ནས་འགྱུར་བ་གཏོང་ཐུབ་གི་མ་རེད། </string>
@@ -210,6 +210,7 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (གདམ་ཁ་ཅན):</string>
   <!--receive_key_activity-->
   <!--registration_activity-->
+  <string name="registration_activity__skip">བསྐྱུར། </string>
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
@@ -240,8 +241,6 @@
   <string name="AndroidManifest__complete_key_exchange">ལྡེ་མིག་བརྗེ་ལེན་ཚར་བ་བྱོས། </string>
   <!--arrays.xml-->
   <!--preferences.xml-->
-  <string name="preferences__pref_all_sms_title">འཕྲིན་ཐུང་SMSཚང་མའི་ཆེད་དུ་བེད་སྤྱོད་ཐོངས།</string>
-  <string name="preferences__pref_all_mms_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__pref_enter_sends_title">གཏོང་བ་ནང་འཇུག་བྱོས། </string>
@@ -296,6 +295,7 @@
   <string name="contact_selection_list__menu_unselect_all">ཆ་ཚང་མ་འདེམས། </string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">མཇུག་རྫོགས་སོ།</string>
+  <!--refreshing push directory from menu-->
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">གསང་སྡོམ་མ་བྱས་བའི་འཕྲིན་ཐུང་བསྐུར།</string>
   <!--conversation_callable-->
@@ -314,7 +314,7 @@
   <string name="conversation_list__menu_search">འཚོལ།</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">ཉེན་སྲུང་།</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">འཕྲིན་ཐུང་འབྱོར་ཡུལ་དེ་ཁུངས་སྐྱེལ་བྱོས། </string>
+  <string name="conversation_secure_verified__menu_verify_identity">ངོས་འཛིན་ཁུངས་སྐྱེལ་བྱོས། </string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">ཟུར་སྣོན་ཞོག </string>
   <string name="conversation__menu_delete_thread">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ།</string>

res/values-ca/strings.xml

@@ -0,0 +1,598 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">Si</string>
+  <string name="no">No</string>
+  <string name="delete">Esborra</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Actualment: %s</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Necessites haver entrat la teva frase contrasenya abans de gestionar les claus...</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Encara no has establert cap frase contrasenya!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">missatges per conversa</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Esborrar ara els missatges antics?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Estàs segur que vols retallar immediatament tots els fils de conversa deixant només els %s missatges més recents?</string>
+  <string name="ApplicationPreferencesActivity_delete">Esborra</string>
+  <string name="ApplicationPreferencesActivity_my">El meu</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desactivar l\'encriptació del magatzem de dades?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Alerta, això desactivarà l\'emmagatzematge encriptat per a tots els missatges i claus. Les teves sessions continuaran funcionant, però qualsevol persona amb accés físic al teu dispositiu podrà accedir-hi.</string>
+  <string name="ApplicationPreferencesActivity_disable">Desactiva</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Des-registrant...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Des-registrant per les comunicacions basades en dades</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Desactivar els missatges push?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nAixò desactivarà els missatges push des-registran-te del servidor.\nNecessitaràs tornar a registrar el teu número de telèfon per utilitzar els missatges push una altra vegada.</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connectant amb el servidor!</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">No estàs registrat al servei push...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Actualitzant directori</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Actualitzant el Directori Push...</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toca per canviar la teva app d\'SMS predeterminada</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Toca per fer TextSecure la teva app d\'SMS predeterminada</string>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">Fotografia</string>
+  <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">So</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">Mida del missatge: %d KB</string>
+  <string name="ConversationItem_expires_s">Expira: %s</string>
+  <string name="ConversationItem_error_sending_message">Error enviant el missatge</string>
+  <string name="ConversationItem_saving_attachment">Desant Adjunt</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">Desant l\'adjunt a la targeta SD...</string>
+  <string name="ConversationItem_save_to_sd_card">Desar a la targeta SD?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Aquest contingut ha estat emmagatzemant en una base de dades encriptada. La versió que desis a la targeta SD ja no estarà encriptada. Vols continuar?</string>
+  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Error mentre es desava l\'adjunt a la targeta SD!</string>
+  <string name="ConversationItem_success_exclamation">Èxit!</string>
+  <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">No s\'ha pogut escriure a la targeta SD!</string>
+  <string name="ConversationItem_view_secure_media_question">Vols veure continguts segurs?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aquest contingut ha estat emmagatzemant en una base de dades encriptada. Desafortunadament, actualment per veure\'l amb un visor de continguts externs les dades han de ser temporalment desencriptades i escrites al disc. Estàs segur que vols fer això?</string>
+  <string name="ConversationItem_received_and_processed_key_exchange_message">Missatge d\'intercanvi de clau rebut i processat.</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Error, s\'ha rebut un missatge d\'intercanvi de clau viciat.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">S\'ha rebut un missatge d\'intercanvi de clau, clica per processar-lo.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">S\'ha rebut un SMS de text pla mentre tenies una sessió segura oberta. Si no tenen una sessió oberta, els missatges que enviïs apareixeran com a text illegible. Clica per finalitzar la sessió segura.</string>
+  <string name="ConversationItem_group_action_left">%1$s ha deixat el grup.</string>
+  <string name="ConversationItem_group_action_joined">%1$s s\'ha unit al grup.</string>
+  <string name="ConversationItem_group_action_modify">%1$s ha actualitzat el grup.</string>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Iniciar una sessió segura?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar una sessió segura amb %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Confirmació de final de sessió segura</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Estàs segur que vols finalitzar aquesta sessió segura?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Confirmació d\'esborrat de fil de conversa</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Estàs segur que vols esborrar permanentment aquesta conversa?</string>
+  <string name="ConversationActivity_add_attachment">Afegeix un adjunt</string>
+  <string name="ConversationActivity_select_contact_info">Selecciona info del contacte</string>
+  <string name="ConversationActivity_compose_message">Escriu un Missatge</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ho sento, hi ha hagut un error establint el teu adjunt.</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Ho sento, el vídeo seleccionat excedeix els límits de mida del missatge.</string>
+  <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>
+  <string name="ConversationActivity_leave_group">Deixar el grup?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Estàs segur que vols deixar aquest grup?</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">Detalls del missatge</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nEnviat/Rebut:%2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Remitent: %1$s\nTransport: %2$s\nEnviat: %3$s\nRebut:%4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Confirma l\'esborrat del missatge</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Estàs segur que vols esborrar permanentment aquest missatge?</string>
+  <!--ConversationListAdapter-->
+  <string name="ConversationListAdapter_key_exchange_message">Missatge d\'intercanvi de clau...</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">Esborrar fils de conversa?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Estàs segur que vols esborrar TOTS els fils de conversa seleccionats?</string>
+  <string name="ConversationListFragment_deleting">Esborrant</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Esborrant els fils de conversa seleccionats...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Missatge d\'intercanvi de clau...</string>
+  <!--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>
+  <string name="ExportFragment_export">Exporta</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Exportar text pla a la targeta SD?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Alerta, això exportarà els continguts de text pla dels teus missatges TextSecure a la targeta SD.</string>
+  <string name="ExportFragment_cancel">Cancel·la</string>
+  <string name="ExportFragment_exporting">Exportant</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportant text pla a la targeta SD...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Error, no s\'ha pogut escriure a la targeta SD!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Error mentre s\'escrivia a la targeta SD.</string>
+  <string name="ExportFragment_success">Èxit!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportant claus encriptades, ajustaments, i missatges...</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nou grup</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Actualitza el grup</string>
+  <string name="GroupCreateActivity_group_name_hint">Nom del grup</string>
+  <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>
+  <string name="GroupCreateActivity_file_io_exception">Error d\'arxiu E/S, no s\'ha pogut crear un arxiu d\'imatge temporal.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar del grup</string>
+  <string name="GroupCreateActivity_menu_create_title">Crea un grup</string>
+  <string name="GroupCreateActivity_creating_group">Creant %1$s…</string>
+  <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">Importar la base de dades d\'SMS del sistema?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Això importarà els missatges des de la base de dades SMS del sistema a TextSecure. Si has importat prèviament els missatges de la base de dades SMS del sistema, importar-los de nou provocarà tenir missatges duplicats.</string>
+  <string name="ImportFragment_import">Importa</string>
+  <string name="ImportFragment_cancel">Cancel·la</string>
+  <string name="ImportFragment_restore_encrypted_backup">Restaurar la còpia de seguretat encriptada?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Restaurar una còpia de seguretat encriptada provocarà que es substitueixi completament les teves claus existents, preferències, i missatges. Perdràs qualsevol informació que sigui a la teva instal·lació de TextSecure i no hi sigui a la còpia de seguretat.</string>
+  <string name="ImportFragment_restore">Restaura</string>
+  <string name="ImportFragment_import_plaintext_backup">Importar la còpia de seguretat en text pla?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Això importarà els missatges des d\'una còpia de seguretat en text pla. Si has importat prèviament la base de dades SMS del sistema, importar-la de nou provocarà la generació de missatges duplicats.</string>
+  <string name="ImportFragment_importing">Important</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importa còpia de seguretat en text pla...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">No s\'ha trobat la còpia de seguretat en text pla!</string>
+  <string name="ImportFragment_error_importing_backup">Error important la còpia de seguretat!</string>
+  <string name="ImportFragment_import_complete">Importació completada!</string>
+  <string name="ImportFragment_restoring">Restaurant</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Restaurant còpia de seguretat encriptada...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">No s\'ha trobat cap còpia de seguretat encriptada!</string>
+  <string name="ImportFragment_restore_complete">Restauració completa!</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">No s\'ha trobat cap clau escanejada!</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">No hi ha connexió disponible per a descarregar MMS, si us plau intenta-ho més tard...</string>
+  <string name="MmsDownloader_error_storing_mms">Error emmagatzemant MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Error connectant amb l\'operador de MMS...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Error llegint els ajustaments MMS de l\'operador inalàmbric\u2026</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Missatge Multimèdia</string>
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Les contrasenyes no coincideixen!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase contrasenya antiga incorrecta!</string>
+  <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Les frases contrasenya no coincideixen</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Has d\'especificar una contrasenya</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frase contrasenya invàlida!</string>
+  <!--PromptMmsActivity-->
+  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Has d\'especificar una URL MMSC per la teva operadora.</string>
+  <string name="PromptMmsActivity_mms_settings_updated">Ajustaments MMS actualitzats</string>
+  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Pots modificar aquests valors en qualsevol moment des del menú d\'ajustaments de TextSecure.</string>
+  <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La signatura en aquest intercanvi de claus és diferent que el que havies rebut prèviament d\'aquest contacte. Això pot voler dir tant que algú està intentant interceptar la teva comunicació, o que aquest contacte simplement ha re-instal·lat TextSecure i ara té una clau d\'identitat nova.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Pot ser que vulguis verificar aquest contacte.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">La signatura en aquest intercanvi de claus és de confiança, però tens l\'ajustament \'completa els intercanvis de claus automàticament\' desactivat.</string>
+  <string name="ReceiveKeyActivity_processing">Processant</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Processant intercanvi de clau...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Connecta amb TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Selecciona el teu país</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Has d\'especificar el teu codi de país</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Has d\'especificar el teu número de telèfon</string>
+  <string name="RegistrationActivity_invalid_number">Número invàlid</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">El número que has especificat (%s) és invàlid.</string>
+  <string name="RegistrationActivity_unsupported">No suportat</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Ho sento, aquest dispositiu no està suportat pel que fa els missatges de dades. Els dispositius que executin versions d\'Android més antigues que la 4.0 necessiten tenir registrada un compte Google. Els dispositius que executen una versió d\'Android 4.0 o posterior no necessiten un compte Google, però necessiten tenir l\'app de la Play Store instal·lada.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">Ara verificarem que el número següent està associat amb aquest dispositiu:\n\n%s\n\nÉs aquest el número correcte, o vols editar-lo abans de continuar?</string>
+  <string name="RegistrationActivity_continue">Continua</string>
+  <string name="RegistrationActivity_edit">Edita</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Possibles problemes</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Verificant número</string>
+  <string name="RegistrationProgressActivity_edit_s">Edita %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registre complet!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Possibles problemes.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Primer has d\'introduir el codi que has rebut...</string>
+  <string name="RegistrationProgressActivity_connecting">Connectant</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Connectant per verificar...</string>
+  <string name="RegistrationProgressActivity_network_error">Error de xarxa!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">No s\'ha pogut connectar. Si us plau verifica la teva connexió de xarxa i intenta-ho de nou.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Ha fallat la verificació!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">El codi de verificació que has enviat és incorrecte. Si us plau intenta-ho de nou.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Massa intents</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Has enviat un codi de verificació incorrecte massa vegades. Si us plau espera un minut abans d\'intentar-ho de nou.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Demanant Trucada</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Demanant una trucada de verificació...</string>
+  <string name="RegistrationProgressActivity_server_error">Error del Servidor</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">El servidor ha trobat un error. Si us plau intenta-ho de nou.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Hi ha massa sol·licituds!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Ja has demanat recentment una trucada de veu. Pots tornar-la a demanar d\'aquí 20 minuts.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Verificant codi de veu...</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Conflicte de registre</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Aquest número ja està registrat en un servidor TextSecure diferent (CyanogenMod?). T\'has de des-registrar abans de registrar-te aquí.</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registre complet</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">El registre a TextSecure s\'ha completat satisfactòriament.</string>
+  <string name="RegistrationService_registration_error">Error de registre</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">El registre a TextSecure ha trobat un problema.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">S\'ha rebut un missatge d\'intercanvi de claus corromput!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">S\'ha rebut un missatge d\'intercanvi de claus per una versió del protocol invàlida.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">S\'ha rebut un missatge d\'una clau d\'identitat desconeguda. Clica per processar-la i mostrar-la.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">S\'ha rebut informació actualitzada però desconeguda. Pica per validar l\'identitat.</string>
+  <string name="SmsMessageRecord_secure_session_ended">La sessió segura s\'ha acabat.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Ha deixat el grup...</string>
+  <string name="TheadRecord_secure_session_ended">La sessió segura s\'ha acabat.</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Tu no tens una clau d\'identitat.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">El destinatari no té clau d\'identitat.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">El destinatari no té clau d\'identitat!</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Escaneja la seva clau per comparar</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Escaneja la meva clau</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ALERTA, la clau escanejada NO coincideix! Si us plau verifica el text de l\'empremta digital cuidadosament.</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">NO Verificat!</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">La seva clau és correcta, però també és necessari verificar la teva clau.</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Verificat!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Tu no tens una clau d\'identitat!</string>
+  <!--VerifyKeysActivity-->
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Escaneja la meva empremta digital</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Escanejant la seva empremta digital</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ALERTA, la clau escanejada NO coincideix! Si us plau verifica el text de l\'empremta digital cuidadosament.</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">NO Verificat!</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">La seva clau és correcta però també és necessari escanejar la teva empremta digital.</string>
+  <string name="VerifyKeysActivity_verified_exclamation">Verificat!</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Tu no tens una clau d\'identitat.</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Escaneja per comparar</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Sigues escanejat per comparar</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ALERTA, la clau escanejada NO coincideix!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">NO Verificat!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">La clau escanejada coincideix!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Verificat!</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">Empremta digital d\'identitat</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">La meva empremta digital d\'identitat</string>
+  <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Iniciar tot hi la petició existent?</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ja has enviat una petició per iniciar una sessió a aquest destinatari, estàs segur que vols enviar-ne una altra? Això invalidarà la primera petició.</string>
+  <string name="KeyExchangeInitiator_send">Envia</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Missatge mal encriptat...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Desencriptant, si us plau espera...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Missatge encriptat per una sessió no existent...</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">Connectant al servidor MMS...</string>
+  <string name="MmsDatabase_downloading_mms">Descarregant MMS...</string>
+  <string name="MmsDatabase_mms_download_failed">La descàrrega MMS ha fallat!</string>
+  <string name="MmsDatabase_downloading">Descarregant...</string>
+  <string name="MmsDatabase_mms_pending_download">Pica i configura els ajustaments MMS per continuar la descàrrega.</string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Desencriptant MMS, si us plau espera...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Missatge MMS mal encriptat...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Missatge MMS encriptat per una sessió no existent...</string>
+  <!--MmsSender-->
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Actualment no es pot enviar el teu missatge MMS.</string>
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Importació en curs</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Important missatges de text</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">Toca per obrir.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Toca per obrir, o toca el bloqueig per tancar.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure està desbloquejat</string>
+  <string name="KeyCachingService_lock">Bloqueja amb una frase contrasenya</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">%d nous missatges</string>
+  <string name="MessageNotifier_most_recent_from_s">Més recent de: %s</string>
+  <string name="MessageNotifier_encrypted_message">Missatge encriptat...</string>
+  <string name="MessageNotifier_no_subject">(Sense títol)</string>
+  <string name="MessageNotifier_message_delivery_failed">Entrega del missatge fallida.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">No s\'ha pogut entregar el missatge.</string>
+  <string name="MessageNotifier_error_delivering_message">Error entregant el missatge.</string>
+  <string name="MessageNotifier_mark_all_as_read">Marca-ho tot com a llegit</string>
+  <string name="MessageNotifier_mark_as_read">Marca com a llegit</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_regenerating">Regenerant...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenerant clau d\'identitat...</string>
+  <string name="ViewLocalIdentityActivity_regenerated">Regenerada!</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Reiniciar clau d\'identitat?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">Precaució! Regenerant la teva clau d\'identitat, la teva identitat actual es perdrà permanentment, i els teus contactes existents rebran alertes quan estableixin noves sessions segures amb tu. Estàs segur que vols continuar?</string>
+  <string name="ViewLocalIdentityActivity_cancel">Cancel·la</string>
+  <string name="ViewLocalIdentityActivity_continue">Continua</string>
+  <!--SmsReceiver-->
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Actualment no es pot enviar el teu missatge SMS. El missatge serà enviat tant bon punt el servei torni a estar disponible.</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Ho sento, La resposta ràpida encara no està suportada per 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">Has rebut un missatge d\'algú que suporta sessions de TextSecure encriptades. Vols iniciar una sessió segura?</string>
+  <string name="auto_initiate_activity__initiate_exchange">Inicia intercanvi</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">FRASE CONTRASENYA ANTIGA:</string>
+  <string name="change_passphrase_activity__new_passphrase">NOVA FRASE CONTRASENYA:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">REPETEIX LA NOVA FRASE CONTRASENYA:</string>
+  <!--contact_selection_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-->
+  <string name="contact_selection_recent_activity__no_recent_calls">Sense trucades recents.</string>
+  <!--conversation_activity-->
+  <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_sent-->
+  <string name="conversation_item_sent__download">Descàrrega</string>
+  <string name="conversation_item_sent__downloading">Descarregant</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Descàrrega</string>
+  <string name="conversation_item_received__downloading">Descarregant</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Mode de selecció per lots</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Carregant països...</string>
+  <string name="country_selection_fragment__search">Cerca</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">Si us plau escull la frase contrasenya si vols encriptar les teves dades localment.</string>
+  <string name="create_passphrase_activity__passphrase">FRASE CONTRASENYA:</string>
+  <string name="create_passphrase_activity__repeat">REPETEIX:</string>
+  <string name="create_passphrase_activity__continue">Continua</string>
+  <string name="create_passphrase_activity__generating_secrets">GENERANT SECRETS</string>
+  <string name="create_passphrase_activity__skip">Salta</string>
+  <string name="create_passphrase_activity__create">Crea</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">Aquest registre serà publicat públicament perquè el vegin els contribuïdors de TextSecure. Examina i edita els registres abans d\'apretar enviar.</string>
+  <string name="log_submit_activity__button_cancel">No enviïs</string>
+  <string name="log_submit_activity__button_ok">Envia</string>
+  <string name="log_submit_activity__log_fetch_failed">No s\'han pogut recollir els registres del teu dispositiu. Encara pots utilitzar ADB per aconseguir els registres de depuració.</string>
+  <string name="log_submit_activity__log_submit_success_title">Èxit!</string>
+  <string name="log_submit_activity__log_got_it">Ho tinc</string>
+  <string name="log_submit_activity__your_pastebin_url">Si us plau copia aquesta URL i afegeix el teu problema (apretada llarga per posar-ho al portapapers):\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__copied_to_clipboard">Copiat al portapapers</string>
+  <string name="log_submit_activity__loading_logcat">Carregant logcat...</string>
+  <string name="log_submit_activity__thanks">Gràcies per la teva ajuda!</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Vols importar tots el teus missatges de text existents a la base de dades encriptada de TextSecure?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de dades predeterminada del sistema no serà modificada o alterada de cap manera.</string>
+  <string name="database_migration_activity__skip">Salta</string>
+  <string name="database_migration_activity__import">Importa</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Això pot tardar una mica. Si us plau sigues pacient, et notificarem quan la importació estigui completa.</string>
+  <string name="database_migration_activity__importing">IMPORTANT</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Actualitzant base de dades...</string>
+  <string name="export_fragment__export_encrypted_backup">Exporta còpia de seguretat encriptada</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporta una còpia de seguretat\nencriptada a la targeta SD.</string>
+  <string name="export_fragment__export_plaintext_backup">Exporta còpia de seguretat en text pla</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporta una còpia de seguretat en text pla compatible amb \'Còpia de seguretat i restauració d\'SMS\' a la targeta SD.</string>
+  <string name="import_fragment__import_system_sms_database">Importa la base de dades d\'SMS del sistema</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importa la base de dades\ndes de l\'app de missatgeria predeterminada del sistema.</string>
+  <string name="import_fragment__import_encrypted_backup">Importa còpia de seguretat encriptada</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Restaura una còpia de seguretat encriptada de TextSecure prèviament exportada.</string>
+  <string name="import_fragment__import_plaintext_backup">Importa còpia de seguretat en text pla</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Importa un arxiu de còpia de seguretat en text pla. Compatible amb \'Còpia de seguretat i restauració d\'SMS\'.</string>
+  <string name="local_identity__regenerate_key">Regenera la clau</string>
+  <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">En el teu telèfon són necessaris els ajustaments MMS manuals.</string>
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE CONTRASENYA TEXTSECURE</string>
+  <string name="prompt_passphrase_activity__unlock">Desbloqueja</string>
+  <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure necessita ajustaments MMS per entregar missatges de grup i multimèdia a través de l\'operador inalàmbric. El teu dispositiu no fa que aquesta informació estigui disponible, cosa que és certa ocasionalment en dispositius bloquejats o amb altres configuracions restringides.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per enviar missatges multimèdia i de grup, clica \'OK\' i completa els ajustaments demanats. Els ajustaments MMS de la teva operadora normalment poden ser trobats buscant \'latevaoperadora APN\'. Només necessitaràs fer això una vegada.</string>
+  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (REQUERIT):</string>
+  <string name="prompt_mms_activity__mms_proxy_host_optional">SERVIDOR PROXY MMS (OPCIONAL):</string>
+  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPCIONAL):</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 pot utilitzar missatges instantanis per incrementar la privacitat i evitar càrrecs d\'SMS quan es comuniqui amb altres usuaris de TextSecure. Per habilitar aquesta característica, si us plau verifica el teu codi de país i el teu número de telèfon.</string>
+  <string name="registration_activity__your_country">EL TEU PAÍS</string>
+  <string name="registration_activity__your_country_code_and_phone_number">EL TEU CODI DE PAÍS I NÚMERO DE TELÈFON</string>
+  <string name="registration_activity__phone_number">NÚMERO DE TELÈFON</string>
+  <string name="registration_activity__register">Registra</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">El registre transmetrà temporalment alguna informació de contacte al servidor.</string>
+  <string name="registration_activity__skip">Salta</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Alguns possibles problemes inclouen:</string>
+  <string name="registration_problems__sms_interceptors">Interceptadors SMS.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">Alguns clients de missatgeria de text de tercers, com ara Handcent o GoSMS, es comporten inadequadament i intercepten tots els missatges SMS entrants. Verifica per veure si has rebut un missatge de text que comença per \'Your TextSecure verification code:\', en aquest cas necessitaràs configurar la teva app de missatgeria de tercers per deixar passar els missatges de text.</string>
+  <string name="registration_problems__incorrect_number">Número incorrecte.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">Si us plau verifica per estar segur que has introduït el teu número correctament, i està ajustat correctament per la teva regió.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">TextSecure no funcionarà amb números de Google Voice.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Verificació de veu</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">TextSecure també et pot trucar per verificar el teu número de telèfon. Pica \'Truca\'m\' i introdueix a sota el codi de sis dígits que sentis.</string>
+  <string name="registration_progress_activity__verify">Verifica</string>
+  <string name="registration_progress_activity__call_me">Truca\'m</string>
+  <string name="registration_progress_activity__edit_number">Edita número</string>
+  <string name="registration_progress_activity__connectivity_error">Error de connectivitat.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure no s\'ha pogut connectar al servei push.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Alguns possibles problemes inclouen:</string>
+  <string name="registration_progress_activity__no_network_connectivity">No hi ha connexió de xarxa.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">El teu dispositiu necessita connectivitat de xarxa per poder utilitzar aquesta característica de TextSecure. Verifica-ho per assegurar que està connectat a 3G o Wifi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Tallafocs restrictiu.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">Si estàs connectat via wifi, és possible que hi hagi un tallafocs bloquejant l\'accés al servidor TextSecure. Intenta-ho amb una altra xarxa o amb les dades mòbils.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">TextSecure verificarà automàticament el teu número amb un missatge de confirmació SMS.</string>
+  <string name="registration_progress_activity__connecting">Connectant...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Esperant la verificació SMS...</string>
+  <string name="registration_progress_activity__registering_with_server">Registrant-se al servidor...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Això portarà una estona. Si us plau sigues pacient, et notificarem quan la verificació estigui completada.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">S\'ha acabat el temps d\'espera de TextSecure mentre s\'esperava el missatge SMS de verificació.</string>
+  <string name="registration_progress_activity__sms_verification_failed">La verificació SMS ha fallat.</string>
+  <string name="registration_progress_activity__generating_keys">Generant claus...</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__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>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">La seva identitat (ells llegeixen):</string>
+  <string name="verify_identity_activity__your_identity_you_read">La teva identitat (tu llegeixes):</string>
+  <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">Nom de l\'identitat:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Identitat importada:\\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">Han llegit això:</string>
+  <string name="verify_keys_activity__you_read_this">Has llegit això:</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Crea frase contrasenya</string>
+  <string name="AndroidManifest__enter_passphrase">Introdueix frase contrasenya</string>
+  <string name="AndroidManifest__select_contacts">Selecciona contactes</string>
+  <string name="AndroidManifest__select_contact">Selecciona contacte</string>
+  <string name="AndroidManifest__textsecure_detected">TextSecure detectat</string>
+  <string name="AndroidManifest__public_identity_key">Clau d\'identitat pública</string>
+  <string name="AndroidManifest__change_passphrase">Canvia frase contrasenya</string>
+  <string name="AndroidManifest__verify_session">Verifica sessió</string>
+  <string name="AndroidManifest__verify_identity">Verifica identitat</string>
+  <string name="AndroidManifest__manage_identity_keys">Gestiona claus d\'identitat</string>
+  <string name="AndroidManifest__complete_key_exchange">Completa intercanvi de claus</string>
+  <string name="AndroidManifest__log_submit">Envia registres de depuració</string>
+  <!--arrays.xml-->
+  <string name="arrays__import_export">Importa / Exporta</string>
+  <string name="arrays__my_identity_key">La meva clau d\'identitat</string>
+  <string name="arrays__contact_keys">Claus de contactes</string>
+  <!--preferences.xml-->
+  <string name="preferences__general">General</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilitza TextSecure per veure i emmagatzemar tots els missatges de text entrants</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilitza TextSecure per veure i emmagatzemar tots els missatges multimèdia entrants</string>
+  <string name="preferences__enable_enter_key_title">Habilita la tecla Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Substitueix la tecla smiley amb una tecla enter</string>
+  <string name="preferences__pref_enter_sends_title">Enter envia</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Apretant la tecla entrar s\'enviaran els missatges de text</string>
+  <string name="preferences__display_settings">Ajustaments de pantalla</string>
+  <string name="preferences__choose_identity">Escull identitat</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Escull el teu contacte de la llista de contactes</string>
+  <string name="preferences__change_passphrase">Canvia frase contrasenya</string>
+  <string name="preferences__change_my_passphrase">Canvia la meva frase contrasenya</string>
+  <string name="preferences__complete_key_exchanges">Completa intercanvis de claus</string>
+  <string name="preferences__disable_passphrase">Desactiva frase contrasenya</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Desactiva l\'encriptació local dels missatges i claus</string>
+  <string name="preferences__screen_security">Seguretat de pantalla</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completa els intercanvis de claus automàticament en les noves sessions o en les sessions existents amb la mateixa clau d\'identitat</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Desactiva la seguretat de la pantalla per permetre captures de pantalla</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Oblida la frase contrasenya de la memòria després d\'un interval de temps</string>
+  <string name="preferences__timeout_passphrase">Temps d\'espera de la frase contrasenya</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Selecciona el temps d\'espera de la frase contrasenya</string>
+  <string name="preferences__pref_timeout_interval_title">Interval del temps d\'espera</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantitat de temps que s\'esperarà abans d\'oblidar la frase contrasenya de la memòria</string>
+  <string name="preferences__identity_key_settings">Claus d\'identitat</string>
+  <string name="preferences__view_my_identity_key">Veure la meva clau d\'identitat</string>
+  <string name="preferences__manage_identity_keys">Gestiona claus d\'identitat</string>
+  <string name="preferences__manage_configured_identity_keys">Gestiona les claus d\'identitat configurades</string>
+  <string name="preferences__notifications">Notificacions</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Mostra notificacions dels missatges a la barra d\'estat</string>
+  <string name="preferences__led_color">Color del LED</string>
+  <string name="preferences__pref_led_blink_title">Patró d\'intermitència del LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Fixa un patró de parpalleig del LED personalitzat</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Encès per:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Apagat per:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">S\'ha fixat un patró de parpalleig del LED personalitzat!</string>
+  <string name="preferences__sound">So</string>
+  <string name="preferences__change_notification_sound">Canvia el so de notificació</string>
+  <string name="preferences__inthread_notifications">Notificacions dins del fil</string>
+  <string name="preferences__play_inthread_notifications">Reprodueix un so de notificació quan s\'estigui mirant una conversació activa</string>
+  <string name="preferences__vibrate">Vibra</string>
+  <string name="preferences__also_vibrate_when_notified">Vibra també en notificar</string>
+  <string name="preferences__minutes">minuts</string>
+  <string name="preferences__hours">hores</string>
+  <string name="preferences__green">Verd</string>
+  <string name="preferences__red">Vermell</string>
+  <string name="preferences__blue">Blau</string>
+  <string name="preferences__orange">Taronja</string>
+  <string name="preferences__cyan">Cian</string>
+  <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Blanc</string>
+  <string name="preferences__fast">Ràpid</string>
+  <string name="preferences__normal">Normal</string>
+  <string name="preferences__slow">Lent</string>
+  <string name="preferences__custom">Personalitzat</string>
+  <string name="preferences__advanced">Avançat</string>
+  <string name="preferences__passphrase">Frase contrasenya</string>
+  <string name="preferences__advanced_mms_access_point_names">Preferències MMS</string>
+  <string name="preferences__enable_manual_mms">Activa MMS Manuals</string>
+  <string name="preferences__override_system_mms_settings">Sobreescriu els ajustaments MMS del sistema amb la informació següent.</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (Requerit)</string>
+  <string name="preferences__mms_proxy_host_optional">Servidor Proxy MMS (Opcional)</string>
+  <string name="preferences__mms_proxy_port_optional">Port Proxy MMS (Opcional)</string>
+  <string name="preferences__sms_delivery_reports">Informes de lliurament de SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demana un informe de lliurament en cada missatge SMS que enviïs</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Esborra automàticament els missatges antics una vegada el fil de conversa excedeixi la mida especificada</string>
+  <string name="preferences__delete_old_messages">Esborra missatges antics</string>
+  <string name="preferences__storage">Emmagatzematge</string>
+  <string name="preferences__conversation_length_limit">Límit de mida de la conversació</string>
+  <string name="preferences__trim_all_threads_now">Escapça tots els fils ara</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Cerca en tots els fils de conversa i fes respectar els límits de mida de la conversació</string>
+  <string name="preferences__light_theme">Tema clar</string>
+  <string name="preferences__dark_theme">Tema fosc</string>
+  <string name="preferences__appearance">Aparença</string>
+  <string name="preferences__theme">Tema</string>
+  <string name="preferences__default">Predeterminat</string>
+  <string name="preferences__language">Idioma</string>
+  <string name="preferences__make_default_sms_app">Estableix com a app d\'SMS predeterminada</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Fes TextSecure l\'aplicació d\'SMS/MMS predeterminada del teu sistema.</string>
+  <string name="preferences__use_data_channel">Missatges Push</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAugmenta la privacitat i evita els càrrecs d\'SMS utilitzant el canal de dades per comunicar-se amb altres usuaris de TextSecure</string>
+  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure és actualment la teva app d\'SMS predeterminada. Si us plau estableix una altra app d\'SMS abans de canviar aquesta preferència.</string>
+  <string name="preferences__refresh_push_directory">Actualitza el Directori Push</string>
+  <string name="preferences__submit_debug_log">Envia un registre de depuració</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">Selecciona tot</string>
+  <string name="contact_selection_list__menu_unselect_all">Deselecciona tot</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">Finalitzat</string>
+  <!--refreshing push directory from menu-->
+  <!--conversation_button_context-->
+  <string name="conversation_button_context__menu_send_unencrypted">Envia desencriptat</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">Truca</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">Detalls del missatge</string>
+  <string name="conversation_context__menu_copy_text">Copia el text</string>
+  <string name="conversation_context__menu_delete_message">Esborra el missatge</string>
+  <string name="conversation_context__menu_forward_message">Reenvia el missatge</string>
+  <string name="conversation_context__menu_resend_message">Torna a enviar el missatge</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">Comença sessió segura</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Esborra els seleccionats</string>
+  <string name="conversation_list_batch__menu_select_all">Selecciona tot</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">Cerca</string>
+  <string name="conversation_list__drawer_open">Obre el calaix de navegació</string>
+  <string name="conversation_list__drawer_close">Tanca el calaix de navegació</string>
+  <!--conversation_secure_verified-->
+  <string name="conversation_secure_verified__menu_security">Seguretat</string>
+  <string name="conversation_secure_verified__menu_no_identity">No hi ha una identitat disponible</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Verifica identitat</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Finalitza sessió segura</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">Afegeix un adjunt</string>
+  <string name="conversation__menu_update_group">Actualitza el grup</string>
+  <string name="conversation__menu_leave_group">Deixa el grup</string>
+  <string name="conversation__menu_add_contact_info">Afegeix info de contacte</string>
+  <string name="conversation__menu_delete_thread">Esborra fil</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Llista de destinataris</string>
+  <string name="conversation_group_options__delivery">Lliurament</string>
+  <string name="conversation_group_options__conversation">Conversa</string>
+  <string name="conversation_group_options__broadcast">Difusió</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">Compara</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Sigues escanejat per comparar</string>
+  <string name="key_scanning__menu_scan_to_compare">Escaneja per comparar</string>
+  <!--text_secure_locked-->
+  <string name="text_secure_locked__menu_unlock">Desbloqueja</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Nou missatge</string>
+  <string name="text_secure_normal__menu_new_group">Nou grup</string>
+  <string name="text_secure_normal__menu_settings">Configuració</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Bloqueja</string>
+  <string name="text_secure_normal__mark_all_as_read">Marca Tots com a llegits</string>
+  <!--verify_keys-->
+  <string name="verify_keys__menu_verified">Verificat</string>
+  <!--EOF-->
+</resources>

res/values-cs/strings.xml

@@ -27,7 +27,6 @@
   <string name="ConversationItem_message_size_d_kb">Délka zprávy: %d KB</string>
   <string name="ConversationItem_expires_s">Vyprší: %s</string>
   <string name="ConversationItem_error_sending_message">Chyba při odeslání zprávy</string>
-  <string name="ConversationItem_sending">Odesílám...</string>
   <string name="ConversationItem_saving_attachment">Ukládám přílohu</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Ukládám přílohu na SD kartu..</string>
   <string name="ConversationItem_save_to_sd_card">Uložit na SD kartu?</string>
@@ -40,6 +39,9 @@
   <string name="ConversationItem_received_and_processed_key_exchange_message">Došlo k úspěšnému předání klíčů.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Chyba při předávání klíčů.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Byl vám doručen klíč, klepněte pro jeho přijetí</string>
+  <string name="ConversationItem_group_action_left">%1$s opustil(a) skupinu.</string>
+  <string name="ConversationItem_group_action_joined">%1$s se připojil(a) ke skupině.</string>
+  <string name="ConversationItem_group_action_modify">%1$s upravil(a) skupinu.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Zahájit šifrovanou komunikaci?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Zahájit šifrovanou komunikaci s %s?</string>
@@ -58,14 +60,17 @@
   <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>
+  <string name="ConversationActivity_leave_group">Opustit skupinu?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Jsi si jistý, že chceš opustit tuto skupinu?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti zprávy</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Odesilatel: %1$s\nPřenos: %2$s\nOdesláno/Obdrženo:%3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Odesílatel: %1$s\nTyp zprávy: %2$s\nOdesláno: %3$s\nPřijato: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Potvrdit výmaz zpráv</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Opravdu chcete trvale vymazat tyto zprávy?</string>
   <!--ConversationListAdapter-->
@@ -91,6 +96,20 @@
   <string name="ExportFragment_success">Úspěšně dokončeno!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Exportování zašifrovaných klíčů, nastavení a zpráv...</string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nová Skupina</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Uprav Skupinu</string>
+  <string name="GroupCreateActivity_group_name_hint">Název Skupiny</string>
+  <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>
+  <string name="GroupCreateActivity_file_io_exception">Chyba při čtení/zápisu souboru, nelze vytvořit dočasný soubor obrazu.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Obrázek Skupiny</string>
+  <string name="GroupCreateActivity_menu_create_title">Vytvořte Skupinu</string>
+  <string name="GroupCreateActivity_creating_group">Vytvářím %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importovat všechny SMSky v telefonu</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Tímto importujete zprávy z výchozí systémové databáze SMS do TextSecure. Pokud\njste už databázi někdy importovali, některé zprávy se mohou objevit vícekrát.</string>
@@ -133,6 +152,7 @@
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Tyto hodnoty můžete kdykoliv změnit v nastavení TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis na tomto předání je jiný, než jaký jste od tohoto kontaktu obdrželi dříve. To může\nznamenat, že se někdo pokouší zachytit vaši konverzaci, nebo jen že si váš kontakt\npřeinstaloval TextSecure a má teď nový identifikační klíč.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Zkontrolovat tento\nkontakt</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Podpis na tomto předání klíčů je ověřen, ale nemáte nastaveno automatické dokončování předání.</string>
   <string name="ReceiveKeyActivity_processing">Probíhá zpracování</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Probíhá předání klíčů...</string>
@@ -144,6 +164,8 @@
   <string name="RegistrationActivity_invalid_number">Neplatné číslo</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Zadané číslo (%s) je neplatné</string>
   <string name="RegistrationActivity_unsupported">Nepodporováno</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Omlouváme se,\nale vaše zařízení není možné využívat pro zasílání zpráv. Zařízení používající Android 4.0 a starší\nmusí být registrována s Účtem Google. Zařízení s Android 4.0 a novějším, nemusí mít registrovaný účet,\nale musí mít nainstalovanou aplikaci Play Store</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\n        Nyní bude ověřeno, že toto zařízení skutečně používá následující telefonní číslo:\n\n%s\n\n\n        Je toto telefonní číslo správně, nebo jej chcete ještě změnit?\n    </string>
   <string name="RegistrationActivity_continue">Pokračovat</string>
   <string name="RegistrationActivity_edit">Upravit</string>
   <!--RegistrationProblemsActivity-->
@@ -163,25 +185,38 @@
   <string name="RegistrationProgressActivity_too_many_attempts">Příliš mnoho pokusů</string>
   <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Nesprávný ověřovací kód byl odeslán příliš mnohokrát. Před dalším pokusem prosím vyčkejte jednu minutu.</string>
   <string name="RegistrationProgressActivity_requesting_call">Probíhá požadavek na hovor</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Žádám o ověřovací zpětné volání...</string>
   <string name="RegistrationProgressActivity_server_error">Chyba serveru</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Chyba na serveru. Opakujte prosím později.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Příliš mnoho požadavků!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">O ověřovací zpětné volání jste již požádal. Další žádost můžete odeslat až po 20 minutách po předchozí.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Ověřuji hlasový kód</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Konfliktní registrace</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Toto číslo je již registrováno na jiném TextSecure serveru (CyanogenMod?). Abyste se zde mohl zaregistrovat, musíte se nejdřív odregistrovat na původním serveru.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Registrace byla dokončena</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registrace TextSecure byla úspěšně dokončena</string>
   <string name="RegistrationService_registration_error">Chyba registrace</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Při registraci TextSecure došlo k potížím.</string>
   <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Obdržen neplatný požadavek na výměnu klíčů.</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nObdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nObdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zpracování a zobrazení.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Konec zabezpečeného sezení.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Opustil skupinu...</string>
+  <string name="TheadRecord_secure_session_ended">Konec zabezpečeného sezení.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nemáte identifikační klíč.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Příjemce nemá identifikační klíč.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Příjemce nemá identifikační klíč!</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Příjemce nemá identifikační klíč.</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Nasnímat cizí klíč pro srovnání</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Klíč byl nasnímán</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROVÁNÍ, nasnímaný klíč NENÍ SPRÁVNÝ! Zkontrolujte prosím textový otisk.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NEověřeno!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Cizí klíč je správný. Je však ještě potřeba ověřit i vlastní klíč.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Ověřeno!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nemáte identifikační klíč!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nemáte identifikační klíč.</string>
   <!--VerifyKeysActivity-->
   <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Nechat si naskenovat otisk</string>
   <string name="VerifyKeysActivity_scan_their_fingerprint">Naskenovat jejich otisk</string>
@@ -199,6 +234,7 @@
   <string name="ViewIdentityActivity_verified_exclamation">Ověřeno!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Identifikační otisk</string>
   <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Inicializovat Despite Existing Request?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Tomuto příjemci jste již odeslali žádost o zahájení konverzace, opravdu chcete poslat další? Tato žádost zruší platnost předchozí.</string>
   <string name="KeyExchangeInitiator_send">Odeslat</string>
   <!--MessageDisplayHelper-->
@@ -224,7 +260,7 @@
   <string name="KeyCachingService_textsecure_passphrase_cached">Stisknutím otevřete.</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Dotykem otevřete nebo stisknutím zámku uzavřete.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure je odemčený</string>
-  <string name="KeyCachingService_lock">Uzamčeno přístupovým heslem</string>
+  <string name="KeyCachingService_lock">Uzamknout heslem</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d nových zpráv</string>
   <string name="MessageNotifier_most_recent_from_s">Poslední od: %s</string>
@@ -257,12 +293,15 @@
   <!--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-->
   <string name="ContactSelectionlistFragment_select_for">Vybrat</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Žádné nedávné hovory</string>
   <!--conversation_activity-->
+  <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_sent-->
@@ -277,10 +316,23 @@
   <string name="country_selection_fragment__loading_countries">Načítám země...</string>
   <string name="country_selection_fragment__search">Hledat</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">Prosím, zvolte si heslo pro šifrování dat ve vašem zařízení.</string>
   <string name="create_passphrase_activity__passphrase">HESLO:</string>
   <string name="create_passphrase_activity__repeat">ZNOVU:</string>
   <string name="create_passphrase_activity__continue">Pokračovat</string>
   <string name="create_passphrase_activity__generating_secrets">GENERUJI TAJEMSTVÍ</string>
+  <string name="create_passphrase_activity__skip">Přeskočit</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">Tento log bude odeslán a zveřejněn online pro vývojáře TextSecure. Před odesláním si můžete log prohlédnout či editovat.</string>
+  <string name="log_submit_activity__button_cancel">Neodesílat</string>
+  <string name="log_submit_activity__button_ok">Odeslat</string>
+  <string name="log_submit_activity__log_fetch_failed">Nepodařilo se zaznamenat logy z vašeho zařízení. Jěště můžete zkusit použít pro získání debug logů nástroj ADB.</string>
+  <string name="log_submit_activity__log_submit_success_title">Úspěšně dokončeno!</string>
+  <string name="log_submit_activity__log_got_it">Mám to.</string>
+  <string name="log_submit_activity__your_pastebin_url">Prosím zkopírujte tento odkaz a použijte ho u vašeho ticketu na github (zkopírujte do schránky dlouhým stiskem):\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__copied_to_clipboard">Zkopírováno do schránky</string>
+  <string name="log_submit_activity__loading_logcat">Otevírám logcat...</string>
+  <string name="log_submit_activity__thanks">Díky za Vaši pomoc!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Chcete importovat své dosavadní textové zprávy do šifrované databáze TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Původní systémová databáze tím nebude dotčena, ani žádným způsobem modifikována.</string>
@@ -315,16 +367,42 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Hotovo</string>
   <!--registration_activity-->
+  <string name="registration_activity__your_country">Země</string>
+  <string name="registration_activity__your_country_code_and_phone_number">Kód země\n        Telefonní číslo\n    </string>
+  <string name="registration_activity__phone_number">Telefonní číslo</string>
+  <string name="registration_activity__register">Zaregistrovat</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">V průběhu registrace boudou dočasně odeslány na server některé informace o kontaktech.</string>
+  <string name="registration_activity__skip">Přeskočit</string>
   <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Možné příčiny jsou:</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\n        Některé aplikace pro SMS, například Handcent nebo GoSMS, se nechovají správně\n        a mohou narušit přijetí ověřovací zprávy. Ověřte, zda jste neobdrželi SMS zprávu,\n        která začíná textem \'Your TextSecure verification code:\', Pokud ano, musíte překonfigurovat\n        vaši SMS aplikaci, aby nechala ověřovací zprávu projít.\n    </string>
+  <string name="registration_problems__incorrect_number">Nesprávné číslo.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\n        Prosím ověřte, že Vaše číslo je zadáno správně a ve správném\n        národním formátu.\n    </string>
   <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\n        Pro TextSecure nelze použít telefonní čísla Google Voice.\n    </string>
   <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Hlasové ověření</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\n        Je možné také použít telefonní ověření. TextSecure secure vám může zavolat a ověřovací \n        kód nadiktovat. Klikněte na \'Zavolej mi\' a zadejte šestimístný kód, který uslyšíte.\n    </string>
   <string name="registration_progress_activity__verify">Ověřit</string>
+  <string name="registration_progress_activity__call_me">Zavolej mi</string>
   <string name="registration_progress_activity__edit_number">Upravit číslo</string>
+  <string name="registration_progress_activity__connectivity_error">Chyba připojení.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Příčiny mohou být:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Není připojení\n        k síti.\n    </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Vaše\n        zařízení musí být připojeno k síti, jinak nelze tuto funkci využívat.\n        Ověřte, že jste připojen k 3G či WiFi.\n    </string>
+  <string name="registration_progress_activity__restrictive_firewall">Firewall</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\n        Jste li připojen přes WiFi, je pravděpodobnější, že vaše připojení k serveru TextSecure \n        blokuje nějaký firewall. Zkuste jinou síť či mobilní data.\n    </string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzovací SMS zprávy.</string>
   <string name="registration_progress_activity__connecting">Probíhá připojování...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Čekám na ověřovací\n        ověřovací SMS...\n    </string>
+  <string name="registration_progress_activity__registering_with_server">Registruji se na server...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Může\n        to chvíli trvat. Prosíme o trpělivost, upozorníme Vás, až bude ověření dokončeno.\n    </string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\n        TextSecure se nedočkal přijetí ověřovací SMS.\n    </string>
+  <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>
   <!--verify_identity_activity-->
@@ -342,6 +420,7 @@
   <string name="AndroidManifest__create_passphrase">Vytvořit heslo</string>
   <string name="AndroidManifest__enter_passphrase">Zadat heslo</string>
   <string name="AndroidManifest__select_contacts">Výběr kontaktů</string>
+  <string name="AndroidManifest__select_contact">Vyber kontakt</string>
   <string name="AndroidManifest__textsecure_detected">Rozpoznáno použití TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Veřejný identifikační klíč</string>
   <string name="AndroidManifest__change_passphrase">Změna hesla</string>
@@ -349,16 +428,16 @@
   <string name="AndroidManifest__verify_identity">Ověření identity</string>
   <string name="AndroidManifest__manage_identity_keys">Správa identifikačních klíčů</string>
   <string name="AndroidManifest__complete_key_exchange">Dokončení předání klíčů</string>
+  <string name="AndroidManifest__log_submit">Odeslat debugovací logy</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__my_identity_key">Můj identifikační klíč</string>
   <string name="arrays__contact_keys">Klíče kontaktů</string>
   <!--preferences.xml-->
   <string name="preferences__general">Obecné</string>
-  <string name="preferences__pref_all_sms_title">Použít pro všechny SMS</string>
-  <string name="preferences__pref_all_mms_title">Použít pro všechny MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Používat TextSecure k prohlížení a uchování všech SMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Používat TextSecure k prohlížení a uchování všech MMS</string>
+  <string name="preferences__enable_enter_key_title">Používat Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Nahradit klávesu emotikon klávesou enter</string>
   <string name="preferences__pref_enter_sends_title">Klávesa \'Enter\' odesílá</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Stisk tlačítka \'enter\' na klávesnici odešle zprávu</string>
@@ -384,6 +463,8 @@
   <string name="preferences__display_message_notifications_in_status_bar">Zobrazovat upozornění v oznamovacím panelu</string>
   <string name="preferences__led_color">Barva LED</string>
   <string name="preferences__pref_led_blink_title">Schéma blikání LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Změnit způsob blikání LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Způsob blikání LED byl nastaven!</string>
   <string name="preferences__sound">Zvuk</string>
   <string name="preferences__change_notification_sound">Změnit zvuk upozornění</string>
   <string name="preferences__inthread_notifications">Upozornění v konverzaci</string>
@@ -426,6 +507,9 @@
   <string name="preferences__language">Jazyk</string>
   <string name="preferences__make_default_sms_app">Nastavit jako výchozí aplikaci pro SMS</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Učinit TextSecure na tomto systému výchozí aplikací pro SMS a MMS</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\n        Zvyšte úroveň soukromí a vyhněte se poplatkům za SMS používáním datového připojení pro komunikaci s ostatními uživateli TextSecure\n    </string>
+  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure je nyní vaší standardní aplikací pro práci s SMS. Pokud toto nastavení chcete změnit, musíte nejprve zvolit jako standardní jinou aplikaci.</string>
+  <string name="preferences__submit_debug_log">Odeslat debugovací log</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -434,6 +518,7 @@
   <string name="contact_selection_list__menu_unselect_all">Odznačit vše</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Dokončeno</string>
+  <!--refreshing push directory from menu-->
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Odeslat nezašifrovaně</string>
   <!--conversation_callable-->
@@ -455,10 +540,13 @@
   <string name="conversation_list__drawer_close">Zavřít navigační lištu</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Zabezpečení</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Ověřit příjemce</string>
+  <string name="conversation_secure_verified__menu_no_identity">Není dostupná žádná identita</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Ověření identity</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Ukončit zabezpečenou relaci</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Přidat přílohu</string>
+  <string name="conversation__menu_update_group">Uprav Skupinu</string>
+  <string name="conversation__menu_leave_group">Opustit skupinu</string>
   <string name="conversation__menu_add_contact_info">Přidat informace o kontaktu</string>
   <string name="conversation__menu_delete_thread">Vymazt konverzaci</string>
   <!--conversation_group_options-->
@@ -468,13 +556,15 @@
   <string name="conversation_group_options__broadcast">Rozeslat</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Porovnat</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Nechat se naskenovat k porovnání</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Nechat se naskenovat</string>
   <string name="key_scanning__menu_scan_to_compare">Nasnímej a porovnej</string>
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">Odemknout</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nová zpráva</string>
+  <string name="text_secure_normal__menu_new_group">Nová Skupina</string>
   <string name="text_secure_normal__menu_settings">Nastavení</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Uzamknout</string>
   <string name="text_secure_normal__mark_all_as_read">Označit jako přečtené</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Ověřeno</string>

res/values-da/strings.xml

@@ -24,7 +24,6 @@
   <string name="ConversationItem_message_size_d_kb">Besked størrelse: %d KB</string>
   <string name="ConversationItem_expires_s">Udløber: %s</string>
   <string name="ConversationItem_error_sending_message">Kunne ikke sende besked</string>
-  <string name="ConversationItem_sending">Sender...</string>
   <string name="ConversationItem_saving_attachment">Gemmer vedhæftning</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Gemmer vedhæftning til SD-kort...</string>
   <string name="ConversationItem_save_to_sd_card">Gem på SD-kort?</string>
@@ -41,6 +40,7 @@
   <string name="ConversationActivity_delete_thread_confirmation">Bekræft! Slet tråd</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Vil du slette denne samtale permanent?</string>
   <string name="ConversationActivity_add_attachment">Vedhæft fil.</string>
+  <string name="ConversationActivity_select_contact_info">Vælg kontakt information</string>
   <string name="ConversationActivity_compose_message">Opret besked</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Beklager, der opstod en fejl ved vedhæftning af fil.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Beklager, den valgte video overskrider grænsen på beskedstørrelsen</string>
@@ -50,14 +50,16 @@
   <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>
+  <string name="ConversationActivity_leave_group">Forlad gruppe?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Er du sikker at du vil forlade denne gruppe?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Besked detaljer</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s\nTransport: %2$s\nSendt/Modtaget: %3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSendt: %3$s\nModtaget: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Bekræft sletning af besked</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Er du sikker på at du ønsker at slette denne besked?</string>
   <!--ConversationListAdapter-->
@@ -83,6 +85,14 @@
   <string name="ExportFragment_success">Fuldført!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Eksporterer krypterede nøgler, indstillinger og beskeder...</string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Ny Gruppe</string>
+  <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>
   <!--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 beskeder fra systemets standard SMS database til TextSecure.</string>
@@ -126,12 +136,37 @@
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Du bør verificere\ndenne kontakt.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Signaturen på denne udvekslingsnøgle er til at stole på, men du har deaktiveret indstillingen\n\'fuldfør udvekslingsnøgler automatisk\'.</string>
   <!--RegistrationActivity-->
+  <string name="RegistrationActivity_select_your_country">Vælg dit land</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Du skal vælge din\nlandekode</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Du skal skrive dit\ntelefonnummer</string>
+  <string name="RegistrationActivity_invalid_number">Ikke gyldigt nummer</string>
   <string name="RegistrationActivity_continue">Fortsæt</string>
+  <string name="RegistrationActivity_edit">Rediger</string>
   <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Mulige Problemer</string>
   <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Godkender nummer</string>
+  <string name="RegistrationProgressActivity_edit_s">Rediger %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registrering fuldført!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Mulige problemer.</string>
+  <string name="RegistrationProgressActivity_connecting">Forbinder</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Forbinder for godkendelse...</string>
+  <string name="RegistrationProgressActivity_network_error">Netværksfejl!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Kunne ikke skabe forbindelse. Venligst tjek din netværks forbindelse og prøv igen.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Godkendelse fejlet!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Den godkendelses kode du indtastet er forkert. Prøv igen.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">For mange forsøg</string>
+  <string name="RegistrationProgressActivity_server_error">Server fejl</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Serveren stødte på en fejl. Prøv igen.</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Registrerings-konflikt</string>
   <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registrering Fuldført</string>
+  <string name="RegistrationService_registration_error">Registreringsfejl</string>
   <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_secure_session_ended">Sikker session afsluttet.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Forlod gruppen...</string>
+  <string name="TheadRecord_secure_session_ended">Sikker session afsluttet.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Du har ingen ID-nøgle.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Modtageren har ingen ID-nøgle.</string>
@@ -159,6 +194,7 @@
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Den skannede nøgle stemmer overens!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Bekræftet!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Identitet - fingeraftryk</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Mit Identitets-fingeraftryk</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">initialiser til trods for eksisterende forespørgsel?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Du har allerede sendt en forespørgsel om at initialisere en session til denne modtager. Er du sikker på at du vil sende en til? Dette vil gøre en tidligere forespørgsel ugyldig.</string>
@@ -182,6 +218,8 @@
   <string name="ApplicationMigrationService_import_in_progress">Henter...</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerer SMS beskeder</string>
   <!--KeyCachingService-->
+  <string name="KeyCachingService_passphrase_cached">TextSecure er låst op</string>
+  <string name="KeyCachingService_lock">Lås med kode</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nye beskeder</string>
   <string name="MessageNotifier_most_recent_from_s">Sidst modtaget fra: %s</string>
@@ -213,12 +251,14 @@
   <!--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>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Ingen nye samtaler.</string>
   <!--conversation_activity-->
+  <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_sent-->
@@ -230,12 +270,18 @@
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Batch-valg</string>
   <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Indlæser lande...</string>
   <string name="country_selection_fragment__search">Søg</string>
   <!--create_passphrase_activity-->
   <string name="create_passphrase_activity__passphrase">Kodeord:</string>
   <string name="create_passphrase_activity__repeat">Gentag:</string>
   <string name="create_passphrase_activity__continue">Fortsæt</string>
   <string name="create_passphrase_activity__generating_secrets">GENERERER NØGLER</string>
+  <string name="create_passphrase_activity__skip">Spring over</string>
+  <string name="create_passphrase_activity__create">Opret</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__log_submit_success_title">Fuldført!</string>
+  <string name="log_submit_activity__log_got_it">Finno</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ønsker du at importere dine eksisterende beskeder til TextSecures krypterede database?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Den eksisterende systemdatabase vil ikke blive ændret.</string>
@@ -267,10 +313,26 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Udført</string>
   <!--registration_activity-->
+  <string name="registration_activity__your_country">DIT LAND</string>
+  <string name="registration_activity__your_country_code_and_phone_number">DIT LANDE KODE OG\nTELEFONNUMMER</string>
+  <string name="registration_activity__phone_number">TELEFONNUMMER</string>
+  <string name="registration_activity__register">Register</string>
+  <string name="registration_activity__skip">Spring over</string>
   <!--registration_problems-->
+  <string name="registration_problems__incorrect_number">Forkert nummer.</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.\n</string>
   <!--registration_progress_activity-->
+  <string name="registration_progress_activity__verify">Godkend</string>
+  <string name="registration_progress_activity__call_me">Ring til mig</string>
+  <string name="registration_progress_activity__edit_number">Rediger nummer</string>
+  <string name="registration_progress_activity__connectivity_error">Forbindelse fejl.</string>
+  <string name="registration_progress_activity__connecting">Forbinder...</string>
+  <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>
   <!--verify_identity_activity-->
@@ -288,6 +350,7 @@
   <string name="AndroidManifest__create_passphrase">Opret kodeord</string>
   <string name="AndroidManifest__enter_passphrase">Indtast kodeord</string>
   <string name="AndroidManifest__select_contacts">Vælg kontakter</string>
+  <string name="AndroidManifest__select_contact">Vælg kontakt</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure Detekteret</string>
   <string name="AndroidManifest__public_identity_key">Offentlig Identitets Nøgle</string>
   <string name="AndroidManifest__change_passphrase">Skift kodeord</string>
@@ -301,8 +364,6 @@
   <string name="arrays__contact_keys">Kontaktnøgler</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generelt</string>
-  <string name="preferences__pref_all_sms_title">Benyt til alle SMS</string>
-  <string name="preferences__pref_all_mms_title">Benyt til alle MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Benyt TextSecure til at læse og gemme alle indkommende SMS beskeder.</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Benyt TextSecure til at læse og gemme alle indkommende MMS beskeder.</string>
   <string name="preferences__pref_enter_sends_title">\"Enter\" sender</string>
@@ -327,7 +388,10 @@
   <string name="preferences__manage_configured_identity_keys">Administrer konfigurerede ID-nøgler</string>
   <string name="preferences__notifications">Notifikation</string>
   <string name="preferences__display_message_notifications_in_status_bar">Vis notifikation om beskeder i status feltet</string>
+  <string name="preferences__led_color">LED farve</string>
+  <string name="preferences__pref_led_blink_title">LED blinkemønster</string>
   <string name="preferences__sound">Lyd</string>
+  <string name="preferences__change_notification_sound">Ændre notifikations-lyd</string>
   <string name="preferences__vibrate">Vibrér</string>
   <string name="preferences__also_vibrate_when_notified">Vibrér også ved tilbagemelding</string>
   <string name="preferences__minutes">Minutter</string>
@@ -338,6 +402,8 @@
   <string name="preferences__orange">Orange</string>
   <string name="preferences__cyan">Cyan</string>
   <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Hvid</string>
+  <string name="preferences__none">Ingen</string>
   <string name="preferences__fast">Hurtig</string>
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Langsom</string>
@@ -369,6 +435,8 @@
   <string name="contact_selection_list__menu_unselect_all">Fjern markering</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Afslut</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Opdater Kontakt Liste</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Send ukrypteret</string>
   <!--conversation_callable-->
@@ -378,6 +446,7 @@
   <string name="conversation_context__menu_copy_text">Kopier tekst</string>
   <string name="conversation_context__menu_delete_message">Slet besked</string>
   <string name="conversation_context__menu_forward_message">Videresend besked</string>
+  <string name="conversation_context__menu_resend_message">Send besked igen</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Sikker session</string>
   <!--conversation_list_batch-->
@@ -387,9 +456,12 @@
   <string name="conversation_list__menu_search">Søg</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sikkerhed</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Verificer modtager</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Verificer identitet</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Vedhæft fil</string>
+  <string name="conversation__menu_update_group">Opdater Gruppe</string>
+  <string name="conversation__menu_leave_group">Forlad Gruppe</string>
+  <string name="conversation__menu_add_contact_info">Tilføj kontakt information</string>
   <string name="conversation__menu_delete_thread">Slet tråd</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Modtager liste</string>
@@ -404,7 +476,9 @@
   <string name="text_secure_locked__menu_unlock">Åben</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ny Besked</string>
+  <string name="text_secure_normal__menu_new_group">Ny Gruppe</string>
   <string name="text_secure_normal__menu_settings">Indstillinger</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Marker alle som læst</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Bekræftet</string>

res/values-de/strings.xml

@@ -6,65 +6,72 @@
   <string name="delete">Löschen</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Momentan: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Bevor Sie Schlüssel verwalten können, müssen Sie ihr Passwort eingeben...</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Bevor Sie Schlüssel verwalten können, müssen Sie Ihr Passwort eingeben...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">Nachrichten pro Konversation</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">Nachrichten pro Unterhaltung</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Sind Sie sicher, dass Sie alle Konversationen bis auf die letzten %s Nachrichten löschen wollen?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Sind Sie sicher, dass Sie alle Unterhaltungen bis auf die letzten %s Nachrichten löschen wollen?</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
-  <string name="ApplicationPreferencesActivity_my">Meine</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">\nWarnung: Dies wird die Speicherverschlüsselung für alle Nachrichten und Schlüssel deaktivieren. Ihre verschlüsselten Sessions werden weiterhin funktionieren, aber jemand mit physischem Zugriff auf Ihr Gerät kann auch auf die Sessions zugreifen.</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_disable">Deaktivieren</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Abmeldung...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Melde mich von Kommunikation über die Datenverbindung ab</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>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Push-Nachrichten deaktivieren?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">Dies wird Push-Nachrichten deaktivieren, indem es Ihren Push-Account vom Server löscht.\n\nSie werden Ihre Handynummer erneut registrieren müssen, um zukünftig wieder Push-Nachrichten nutzen zu können.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden zum Server!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim Push Dienst regestriert...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Aktualisiere Verzeichnis</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Aktualisiere Push Verzeichnis...</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim Push-Dienst registriert...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Aktualisiere Kontaktliste</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Aktualisiere Kontaktliste...</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Eingehende SMS aktiviert</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Standard-SMS-App ändern</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Eingehende SMS deaktiviert</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">TextSecure als Standard-SMS-App verwenden</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Größe der Nachricht: %d KB</string>
+  <string name="ConversationItem_message_size_d_kb">Nachrichtengröße: %d KB</string>
   <string name="ConversationItem_expires_s">Läuft ab in: %s</string>
   <string name="ConversationItem_error_sending_message">Fehler beim Senden der Nachricht</string>
-  <string name="ConversationItem_sending">Wird gesendet...</string>
-  <string name="ConversationItem_saving_attachment">Anhang speichern</string>
+  <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 der SD-Karte speichern?</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_error_while_saving_attachment_to_sd_card">Fehler beim Speichern des Anhangs auf der SD-Karte!</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_received_and_processed_key_exchange_message">Schlüsselaustausch Nachricht empfangen und verarbeitet.</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Fehler: Es wurde eine abgelaufene Schlüsselaustausch-Nachricht empfangen.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Nachricht zum Schlüssel-Austausch empfangen, drücken um fort zu fahren.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Sie haben eine unverschlüsselte SMS während einer sicheren Sitzung empfangen. Wenn Ihr Gegenüber keine Verschlüsselung mehr aktiviert hat, wird Ihr nächste Nachricht von ihm nicht lesbar sein. Drücken um sichere Session zu beenden. </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>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Sie haben eine unverschlüsselte SMS während einer sicheren Unterhaltung empfangen. Wenn Ihr Gegenüber keine Verschlüsselung mehr aktiviert hat, wird Ihre nächste Nachricht für ihn nicht lesbar sein. Drücken um sichere Unterhaltung zu beenden. </string>
   <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_dialog_title">Rückgriff auf SMS?</string>
   <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_question">Soll eine sichere Sitzung aufgebaut werden?</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Eine sichere Sitzung mit %s aufbauen?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Sichere Sitzung beenden bestätigen</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Wollen sie die sichere Sitzung wirklich beenden?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Bestätigung zum Löschen des Threads</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Sind Sie sicher, dass Sie diese Konversation unwiderruflich löschen möchten?</string>
+  <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_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>
   <string name="ConversationActivity_add_attachment">Anhang hinzufügen</string>
-  <string name="ConversationActivity_select_contact_info">Kontaktinformation auswählen</string>
-  <string name="ConversationActivity_compose_message">Nachricht erstellen</string>
+  <string name="ConversationActivity_select_contact_info">Kontaktinfo wählen</string>
+  <string name="ConversationActivity_compose_message">Nachricht verfassen</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Leider ist ein Fehler beim Hinzufügen des Anhangs aufgetreten.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Das ausgewählte Video überschreitet leider die maximal mögliche Nachrichtengröße.</string>
   <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">Der angegebene Empfänger ist keine gültige SMS- oder E-Mail Adresse!</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">Teilnehmer in Gruppengespräch</string>
-  <string name="ConversationActivity_group_conversation">Gruppengespräch</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>
@@ -76,73 +83,73 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Sind Sie sicher, dass Sie die Gruppe verlassen wollen?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s\nTransport: %2$s\nGesendet/Empfangen:%3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Absender: %1$s⏎\nTransport: %2$s⏎\nGesendet: %3$s⏎\nEmpfangen:%4$s</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Übertragung: %1$s\nGesendet/Empfangen: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Absender: %1$s\nÜbertragung: %2$s\nGesendet: %3$s\nEmpfangen: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Nachricht löschen bestätigen</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Sind Sie sicher, dass Sie diese Nachricht unwiderruflich löschen möchten?</string>
   <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Schlüsselaustausch Nachricht...</string>
+  <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">Sind Sie sicher, dass Sie ALLE ausgewählten Unterhaltungen löschen möchten?</string>
   <string name="ConversationListFragment_deleting">Löschen</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Lösche ausgewählte Threads...</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Lösche ausgewählte Unterhaltungen...</string>
   <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch Nachricht...</string>
+  <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch-Nachricht...</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\nwird Ihre verschlüsselten Keys, Einstellungen und Nachrichten auf die SD-Karte exportieren</string>
-  <string name="ExportFragment_export">Export</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>
+  <string name="ExportFragment_export">Exportieren</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Im Klartext auf SD-Karte exportieren?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung, dies wird\nIhre TextSecure Nachrichten im Klartext auf die SD-Karte exportieren.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung, dies wird Ihre TextSecure-Nachrichten im Klartext auf die SD-Karte exportieren.</string>
   <string name="ExportFragment_cancel">Abbruch</string>
-  <string name="ExportFragment_exporting">Exportieren</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Im Klartext auf die SD-Karte exportieren...</string>
+  <string name="ExportFragment_exporting">Exportiere</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportiere im Klartext auf die SD-Karte...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Fehler, es war nicht möglich auf die\nSD-Karte zu schreiben!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Fehler beim Schreiben auf die SD-Karte.</string>
   <string name="ExportFragment_success">Erfolgreich!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportiere Schlüssel,\nEinstellungen und Nachrichten...</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportiere verschlüsselte Schlüssel,\nEinstellungen und Nachrichten...</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
-  <string name="GroupCreateActivity_actionbar_update_title">Gruppe aktualisieren</string>
-  <string name="GroupCreateActivity_group_name_hint">Gruppen-Name</string>
-  <string name="GroupCreateActivity_actionbar_mms_title">Neue MMS Gruppe</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der nicht TextSecure Gruppen 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">Die 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>
-  <string name="GroupCreateActivity_file_io_exception">Daten E/A Fehler, konnte temporäre Bild-Datei nicht erzeugen. </string>
+  <string name="GroupCreateActivity_actionbar_update_title">Gruppe bearbeiten</string>
+  <string name="GroupCreateActivity_group_name_hint">Gruppenname</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Neue MMS-Gruppe</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der 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>
+  <string name="GroupCreateActivity_file_io_exception">Schreib-/Lese-Fehler, konnte keine temporäre Bild-Datei erzeugen. </string>
   <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>
   <!--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">Es werden jetzt die SMS von der Systemdatenbank in TextSecure importiert.\nWenn Sie dies schon einmal gemacht haben, werden doppelte Nachrichten erzeugt.</string>
-  <string name="ImportFragment_import">Import</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>
+  <string name="ImportFragment_import">Importieren</string>
   <string name="ImportFragment_cancel">Abbruch</string>
-  <string name="ImportFragment_restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nDas Wiederherstellen einer verschlüsselten Sicherung ersetzt Ihre bestehenden Schlüssel, Einstellungen und\nNachrichten. Sie werden jegliche Informationen Ihrer jetzigen TextSecure Installation verlieren, die nicht auch\ndie Sicherung beinhaltet.</string>
+  <string name="ImportFragment_restore_encrypted_backup">Verschlüsselte Datensicherung wiederherstellen?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt Ihre bestehenden Schlüssel, Einstellungen und Nachrichten.\n\nSie werden jegliche Informationen Ihrer jetzigen TextSecure-Installation verlieren, die nicht in dieser Datensicherung enthalten sind.</string>
   <string name="ImportFragment_restore">Wiederherstellen</string>
-  <string name="ImportFragment_import_plaintext_backup">Klartext-Sicherung importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dies wird Nachrichten\naus einem Klartext-Backup importieren. Wenn Sie dies bereits gemacht haben,\nwird das zu doppelten Nachrichten führen.</string>
+  <string name="ImportFragment_import_plaintext_backup">Klartext-Datensicherung importieren?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dies wird Nachrichten aus einer Klartext-Datensicherung importieren.\n\nFalls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedoppelten Nachrichten führen.</string>
   <string name="ImportFragment_importing">Importiere</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Importiere Klartext-Sicherung</string>
-  <string name="ImportFragment_no_plaintext_backup_found">Keine Klartext-Sicherung gefunden!</string>
-  <string name="ImportFragment_error_importing_backup">Fehler beim Importieren der Sicherung!</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importiere Klartext-Datensicherung...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Keine Klartext-Datensicherung gefunden!</string>
+  <string name="ImportFragment_error_importing_backup">Fehler beim Importieren der Datensicherung!</string>
   <string name="ImportFragment_import_complete">Import abgeschlossen!</string>
   <string name="ImportFragment_restoring">Wiederherstellen</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Verschlüsselte Sicherung wiederherstellen ...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Keine verschlüsselte Sicherung gefunden!</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Wiederherstellen der verschlüsselten Datensicherung...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Keine verschlüsselte Datensicherung gefunden!</string>
   <string name="ImportFragment_restore_complete">Wiederherstellung fertig!</string>
   <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Kein eingelesener Schlüssel gefunden!</string>
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Keinen scanbaren Schlüssel gefunden!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Keine Verbindung für MMS-Download verfügbar, versuchen Sie es später noch einmal ...</string>
-  <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMSI</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Fehler beim Verbinden zum MMS Provider...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Die MMS-Einstellungen Ihres Netz-Anbieters konnten nicht gelesen werden...</string>
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Keine Verbindung für MMS-Download verfügbar, versuchen Sie es später noch einmal...</string>
+  <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Verbindung zum MMS-Anbieter fehlgeschlagen...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Die Einstellungen für den MMS-Anbieters enthalten Fehler...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimedianachricht</string>
   <!--PassphraseChangeActivity-->
@@ -154,25 +161,25 @@
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ungültiges Passwort!</string>
   <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Sie müssen eine MMSC URL für Ihren Netz-Anbieter angeben.</string>
+  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Sie müssen eine MMS-Center-URL für Ihren Anbieter angeben.</string>
   <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_">Sie können diese Werte jederzeit in den TextSecure Einstellungen ändern.</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 ist eine andere als die schon von diesem Kontakt erhaltenen.\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_you_may_wish_to_verify_this_contact">Sie können diesen Kontakt ü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 \'Schlüsselaustausch automatisch vervollständigen\' ist nicht aktiv.</string>
+  <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_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_processing">Verarbeitung</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Führe Schlüssel-Austausch durch...</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Führe Schlüsselaustausch durch...</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">Verbinde mit TextSecure</string>
-  <string name="RegistrationActivity_select_your_country">Wähles Sie Ihr Land aus</string>
+  <string name="RegistrationActivity_connect_with_textsecure">Mit TextSecure verbinden</string>
+  <string name="RegistrationActivity_select_your_country">Wählen Sie Ihr Land aus</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Sie müssen Ihren Länder-Code\nangeben</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Sie müssen Ihre Telefonnummer\nangeben</string>
   <string name="RegistrationActivity_invalid_number">Ungültige Nummer</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Die Nummer, die Sie\nangegeben haben (%s) ist ungültig.</string>
   <string name="RegistrationActivity_unsupported">Nicht unterstützt</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Entschuldigung,\ndieses Geräte unterstützt keine Nachrichten über den Datenkanal. Geräte die mit Android vor Version 4.0 laufen,\nmüssen einen Google Account eingerichtet haben. Geräte die mit Android 4.0 und neuer laufen\nbenötigen keinen Google Account, müssen aber die Play Store App installiert haben.</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nEs wird jetzt überprüft ob die folgende Nummer zu diesem Geräte gehört:\n\n%s\n\n\nIst diese Nummer richtig oder wollen Sie sie bearbeiten bevor es weiter geht?</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Entschuldigung, dieses Gerät unterstützt keine Übertragung über den Datenkanal.\nGeräte mit Android vor Version 4.0, müssen einen Google-Account eingerichtet haben.\nGeräte mit Android 4.0 und neuer benötigen keinen Google-Account, müssen aber die \"Play Store\"-App installiert haben.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nEs wird jetzt überprüft, ob die folgende Nummer zu diesem Gerät gehört:\n\n%s\n\n\nIst diese Nummer richtig oder wollen Sie sie bearbeiten, bevor Sie fortfahren?</string>
   <string name="RegistrationActivity_continue">Fortsetzen</string>
   <string name="RegistrationActivity_edit">Bearbeiten</string>
   <!--RegistrationProblemsActivity-->
@@ -186,18 +193,20 @@
   <string name="RegistrationProgressActivity_connecting">Verbinde</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Verbinde zur Überprüfung...</string>
   <string name="RegistrationProgressActivity_network_error">Netzwerkfehler!</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Konnte nicht verbinden. Bitte überprüfen Sie Ihre Verbindung und versuchen es dann erneut.</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Konnte nicht verbinden. Bitte überprüfen Sie Ihre Verbindung und versuchen Sie es dann erneut.</string>
   <string name="RegistrationProgressActivity_verification_failed">Überprüfung fehlgeschlagen!</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Der Code, den Sie eingegeben haben, ist falsch. Bitte versuchen Sie es erneut.</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Der eingegebene Code ist falsch. Bitte versuchen Sie es erneut.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Zu viele Versuche</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Sie haben zu viel falsche Codes eingegeben. Bitte warten Sie eine Minute und versuchen es dann erneut.</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Sie haben zu viele falsche Codes eingegeben. Bitte warten Sie eine Minute und versuchen Sie es dann erneut.</string>
   <string name="RegistrationProgressActivity_requesting_call">Fordere Anruf an</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Fordere Bestätigungs-Anruf an...</string>
-  <string name="RegistrationProgressActivity_server_error">Server Fehler</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Fordere Bestätigungsanruf an...</string>
+  <string name="RegistrationProgressActivity_server_error">Server-Fehler</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Der Server hat einen Fehler festgestellt. Bitte versuchen Sie es erneut.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Zu viele Anfragen!</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Sie haben vor Kurzem schon einen Anruf angefordert. Sie können in 20 Minuten einen Weiteren anfordern.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Überprüfe Code aus dem Anruf...</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Sie haben vor Kurzem schon einen Anruf angefordert. Sie können in 20 Minuten einen weiteren anfordern.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Überprüfe Anrufcode...</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Konflikt bei der Registrierung</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Diese Nummer wurde bereits bei einem anderen TextSecure-Server (CyanogenMod?) registriert. Sie müssen zuerst dort Ihren Push-Account löschen, bevor Sie sich hier anmelden können.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Anmeldung abgeschlossen</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Die Anmeldung bei TextSecure war erfolgreich.</string>
@@ -206,67 +215,68 @@
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Fehlerhafte Schlüsselaustausch-Nachricht \nempfangen!\n</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nEs wurde eine Schlüsselaustausch-Nachricht für eine ungültige Protokoll-Version empfangen.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nNachricht mit unbekanntem Schlüssel empfangen. Klicken um fort zu fahren und ihn an zu zeigen.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Veränderte, aber unbekannte Identitäts-Information empfangen. Tippen um Identität zu bestätigen.</string>
-  <string name="SmsMessageRecord_secure_session_ended">Sichere Sitzung beendet.</string>
+  <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>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Gruppe verlassen...</string>
-  <string name="TheadRecord_secure_session_ended">Sichere Sitzung beendet.</string>
+  <string name="TheadRecord_secure_session_ended">Sichere Unterhaltung beendet.</string>
   <!--VerifyIdentityActivity-->
   <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">Schlüssel zum Vergleich einlesen</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Eigenen Schlüssel einlesen</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ACHTUNG: Der eingelesene Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Fingerabdruck des Schlüssels sorgfältig.</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Kontaktschlü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_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Der Schlüssel ist korrekt. Lassen Sie den Empfänger auch Ihren eigenen Schlüssel überprüfen.</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_you_don_t_have_an_identity_key_exclamation">Sie haben keinen persönlichen Schlüssel!</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 Fingerabdruck einlesen lassen</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Deren Fingerabdruck einlesen </string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ACHTUNG: Der gescannte Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Fingerabdruck des Schlüssels sorgfältig.</string>
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Eigenen 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">Dieser Schlüssel ist korrekt. Sie sollten auch Ihren eigenen Fingerabdruck scannen lassen.</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>
   <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen persönlichen Schlüssel.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Zum Vergleich einlesen</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Zum Vergleich einlesen lassen</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ACHTUNG, der eingelesene Schlüssel stimmt NICHT überein!</string>
+  <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_the_scanned_key_matches_exclamation">Der eingelesene Schlüssel stimmt überein!</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_identity_fingerprint">Fingerabdruck</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 Sitzungsaufbau Nachricht an den Empfänger gesendet, sind Sie sicher, dass Sie eine weitere senden wollen? Dies macht die erste Nachricht 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>
   <string name="MessageDisplayHelper_decrypting_please_wait">Entschlüsselung läuft, bitte warten...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Nachricht wurde für eine nicht existierende Sitzung verschlüsselt...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Nachricht wurde für eine nicht existierende Unterhaltung verschlüsselt...</string>
   <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Verbindung zu MMS Server wird aufgebaut...</string>
-  <string name="MmsDatabase_downloading_mms">MMS werden heruntergeladen...</string>
-  <string name="MmsDatabase_mms_download_failed">MMS Download fehlgeschlagen!</string>
+  <string name="MmsDatabase_connecting_to_mms_server">Verbindung zu MMS-Server wird aufgebaut...</string>
+  <string name="MmsDatabase_downloading_mms">MMS wird heruntergeladen...</string>
+  <string name="MmsDatabase_mms_download_failed">MMS-Download fehlgeschlagen!</string>
   <string name="MmsDatabase_downloading">Herunterladen...</string>
-  <string name="MmsDatabase_mms_pending_download">Antippen und MMS-Einstellungen vornehmen um den Download fortzusetzen.</string>
+  <string name="MmsDatabase_mms_pending_download">Antippen und MMS-Einstellungen konfigurieren um den Download fortzusetzen.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS wird entschlüsselt, bitte warten...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlererhaft verschlüsselte MMS...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht existierende Sitzung verschlüsselt...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlerhaft verschlüsselte MMS...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht existierende Unterhaltung verschlüsselt...</string>
   <!--MmsSender-->
   <string name="MmsSender_currently_unable_to_send_your_mms_message">Ihre MMS kann derzeit nicht gesendet werden.</string>
   <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Import läuft</string>
-  <string name="ApplicationMigrationService_importing_text_messages">NachrichtenImport</string>
+  <string name="ApplicationMigrationService_import_in_progress">Importieren läuft</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Importiere Nachrichten</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Berühren um zu öffnen.</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Berühren um zu öffnen oder Schloss berühren um zu schließen.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Berühren, um zu öffnen.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Berühren, um zu öffnen, oder Schloss berühren, um zu schließen.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure ist entsperrt</string>
-  <string name="KeyCachingService_lock">Mit Passphrase sperren</string>
+  <string name="KeyCachingService_lock">Mit Passwort sperren</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d neue Nachrichten</string>
   <string name="MessageNotifier_most_recent_from_s">Letzte Nachricht von: %s</string>
@@ -278,11 +288,11 @@
   <string name="MessageNotifier_mark_all_as_read">Alle als gelesen markieren</string>
   <string name="MessageNotifier_mark_as_read">Als gelesen markieren</string>
   <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Neuerzeugung...</string>
+  <string name="ViewLocalIdentityActivity_regenerating">Erzeuge neu...</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Schlüssel wird\nneu erzeugt...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Neu erzeugt!</string>
+  <string name="ViewLocalIdentityActivity_regenerated">Schlüssel neu erzeugt!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Schlüssel zurücksetzen?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nVorsicht! Das Neuerzeugen des Schlüssels führt dazu, dass der jetzige Schlüssel permanent gelöscht wird.⏎\nSchon existierende Kontakte erhalten eine Warnung, wenn Sie neue Sitzungen mit Ihnen beginnen.⏎\nMöchten Sie dennoch fortfahren?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nVorsicht! Durch das Neuerzeugen des eigenen Schlüssels geht der aktuelle Schlüssel unwiderruflich verloren. \nSchon existierende Kontakte erhalten eine Warnung, wenn Sie neue Unterhaltungen mit Ihnen beginnen. \nMöchten Sie dennoch fortfahren?</string>
   <string name="ViewLocalIdentityActivity_cancel">Abbruch</string>
   <string name="ViewLocalIdentityActivity_continue">Fortsetzen</string>
   <!--SmsReceiver-->
@@ -290,7 +300,7 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Leider werden Schnellantworten noch nicht von TextSecure unterstützt!</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">Sie haben eine Nachricht von jemandem empfangen, der verschlüsselte Sitzungen über TextSecure unterstützt. Wollen Sie jetzt eine sichere Sitzung aufbauen?</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">Sie haben eine Nachricht von jemandem empfangen, der verschlüsselte Unterhaltungen über TextSecure unterstützt. Wollen Sie jetzt eine sichere Unterhaltung aufbauen?</string>
   <string name="auto_initiate_activity__initiate_exchange">Austausch initiieren</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">ALTES PASSWORT:</string>
@@ -302,6 +312,9 @@
   <string name="contact_selection_group_activity__finding_contacts">Suche Kontakte...</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_updating_directory">Aktualisiere Kontaktliste</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualisiere Kontaktliste...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Auswählen für</string>
   <!--contact_selection_recent_activity-->
@@ -322,59 +335,73 @@
   <string name="country_selection_fragment__loading_countries">Lade Länder...</string>
   <string name="country_selection_fragment__search">Suchen</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">Wählen Sie eine Passphrase, wenn Sie Ihre Daten lokal verschlüsseln wollen.</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">Wählen Sie ein Passwort, wenn Sie Ihre Daten lokal verschlüsseln wollen.</string>
   <string name="create_passphrase_activity__passphrase">PASSWORT:</string>
-  <string name="create_passphrase_activity__repeat">WIEDERHOLEN:</string>
+  <string name="create_passphrase_activity__repeat">PASSWORT WIEDERHOLEN:</string>
   <string name="create_passphrase_activity__continue">Fortsetzen</string>
   <string name="create_passphrase_activity__generating_secrets">GENERIERE SICHERHEITSSCHLÜSSEL</string>
+  <string name="create_passphrase_activity__skip">Überspringen</string>
+  <string name="create_passphrase_activity__create">Erstellen</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">Dieses Protokoll wird öffentlich für die Programmierer von TextSecure einsehbar sein. Bevor Sie es senden, können Sie das Protokoll noch überprüfen und bearbeiten.</string>
+  <string name="log_submit_activity__button_cancel">Nicht absenden</string>
+  <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__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>
   <!--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>
   <string name="database_migration_activity__skip">Überspringen</string>
   <string name="database_migration_activity__import">Importieren</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Dies kann eine Weile dauern. Bitte haben Sie etwas Geduld, Sie werden benachrichtigt, wenn der Import abgeschlossen ist.</string>
-  <string name="database_migration_activity__importing">IMPORT</string>
+  <string name="database_migration_activity__importing">IMPORTIERE</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Datenbank wird aktualisiert...</string>
-  <string name="export_fragment__export_encrypted_backup">Exportiere verschlüsselte Sicherung</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportiere eine verschlüsselte\nSicherung auf die SD-Karte.</string>
-  <string name="export_fragment__export_plaintext_backup">Exportiere Klartext-Sicherung</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportiert ein Klartext-Backup kompatibel mit \'SMS Backup und Wiederherstellung\' auf die SD-Karte</string>
-  <string name="import_fragment__import_system_sms_database">Importiere SMS-Systemdatenbank</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importiere die\nDatenbank der Standard Nachrichten-App des Geräts.</string>
-  <string name="import_fragment__import_encrypted_backup">Importiere verschlüsselte Sicherung</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nWiederherstellen einer zuvor exportierten TextSecure Sicherung.</string>
-  <string name="import_fragment__import_plaintext_backup">Importiere Klartext-Sicherung</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nImportiere eine Klartext-Backupdatei. Kompatibel mit \'SMS Backup und Wiederherstellung\'</string>
-  <string name="local_identity__regenerate_key">Schlüssel neu erstellen</string>
+  <string name="export_fragment__export_encrypted_backup">Verschlüsselte TextSecure-Datensicherung exportieren</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportiere eine verschlüsselte TextSecure-Datensicherung auf die SD-Karte.</string>
+  <string name="export_fragment__export_plaintext_backup">Klartext-Datensicherung exportieren</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exportiere eine Klartext-Datensicherung. Kompatibel mit \"SMS Backup + Restore\"</string>
+  <string name="import_fragment__import_system_sms_database">SMS-Systemdatenbank importieren</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importieren der Datenbank aus der Standard-SMS-App.</string>
+  <string name="import_fragment__import_encrypted_backup">Verschlüsselte TextSecure-Datensicherung importieren</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Wiederherstellen einer zuvor exportierten, verschlüsselten TextSecure-Datensicherung.</string>
+  <string name="import_fragment__import_plaintext_backup">Klartext-Datensicherung importieren</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Importiere eine Klartext-Datensicherung. Kompatibel mit \"SMS Backup + Restore\"</string>
+  <string name="local_identity__regenerate_key">Schlüssel neu erzeugen</string>
   <!--mms_preferences_activity-->
-  <string name="mms_preferences_activity__manual_mms_settings_are_required">Für Ihr Telefon werden manuelle MMS-Einstellungen benötigt.</string>
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">Für dein Telefon werden manuelle MMS-Einstellungen benötigt.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSWORT</string>
+  <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. Ihr Telefon stellt diese Informationen nicht zur Verfügung, was daran liegen kann, dass dies vom Netzbetreiber blockiert wurde oder anderweitig unterbunden wurde.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Um Medien- und Gruppennachrichten zu senden, bitte auf \"OK\" drücken und die Einstellungen vervollständigen. Die MMS-Einstellungen des Anbieters können gefunden werden, indem man nach dem \"APN\" des Anbieters sucht. Diese ist nur ein mal nötig.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (BENÖTIGT):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (OPTIONAL):</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 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__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>
   <!--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 \nzu vermeiden. Um dies zu aktivieren bestätigen Sie bitte ihre Landesvorwahl und Telefonnummer.</string>
+  <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>
   <string name="registration_activity__your_country_code_and_phone_number">IHRE LANDESVORWAHL UND\nTELEFONNUMMER</string>
   <string name="registration_activity__phone_number">TELEFONNUMMER</string>
   <string name="registration_activity__register">Registrieren</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Die Anmeldung wird ein paar Kontakt-Informationen vorübergehend an den Server senden.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Während der Anmeldung werden vorübergehend einige Kontaktinformationen an den Server übertragen.</string>
+  <string name="registration_activity__skip">Überspringen</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Einige mögliche Probleme\nbeinhalten:</string>
   <string name="registration_problems__sms_interceptors">Apps, die SMS abfangen.</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nManche SMS Apps von Drittanbietern, wie z.B. Handcent oder GoSMS, verhalten sich falsch und\nfangen alle eingehenden SMS ab. Überprüfen Sie, ob Sie eine Textnachricht empfangen haben,\ndie mit \"Ihr TextSecure Bestätigungs-Code:\" beginnt. Sollte dies der Fall sein, müssen sie Ihre \nDrittanbieter-App so einstellen, dass sie alle SMS durch lässt.</string>
-  <string name="registration_problems__incorrect_number">Flasche Nummer.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">Manche SMS-Apps von Drittanbietern, z.B. Handcent oder GoSMS, fangen fälschlicherweise alle eingehenden SMS ab. Überprüfen Sie, ob Sie eine Textnachricht empfangen haben, die mit \"Your TextSecure verification code:\" beginnt. In diesem Fall müssen Sie Ihre Drittanbieter-App so einstellen, dass sie SMS durchlässt.</string>
+  <string name="registration_problems__incorrect_number">Falsche Nummer.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nBitte überprüfen Sie die eingegebene Nummer und dass Sie für Ihre Region das\nrichtige Format hat.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure funktioniert nicht mit Google Voice Rufnummern.</string>
+  <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>
@@ -382,28 +409,28 @@
   <string name="registration_progress_activity__call_me">Anrufen</string>
   <string name="registration_progress_activity__edit_number">Nummer bearbeiten</string>
   <string name="registration_progress_activity__connectivity_error">Verbindungsfehler.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure hat es nicht geschafft sich mit dem Push Dienst zu verbinden.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure konnte sich nicht mit dem Push-Dienst verbinden.\n</string>
   <string name="registration_progress_activity__some_possible_problems_include">Einige der möglichen\nProbleme beinhalten:</string>
   <string name="registration_progress_activity__no_network_connectivity">Keine Netzwerk-\nVerbindung.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Ihr\nGeräte benötigt eine Netzverbindung um diese TextSecure Funktion nutzen zu können. Stellen Sie sicher,\ndass Sie eine Mobilfunk- oder Wifi-Verbindung haben.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Ihr\nGeräte benötigt eine Netzverbindung um diese TextSecure-Funktion nutzen zu können. Stellen Sie sicher,\ndass Sie eine mobile Daten- oder WLAN-Verbindung haben.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktive Firewall.</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nWenn Sie über Wifi verbunden sind ist es möglich, dass eine Firewall den Zugang zum\nTextSecure Server blockiert. Versuchen Sie ein anderes Netzwerk oder die mobile Datenverbindung.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nBei Verbindung über WLAN kann eine Firewall den Zugang zum TextSecure-Server blockieren. Versuchen Sie ein anderes Netzwerk oder die mobile Datenverbindung.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure wird Ihre Nummer nun automatisch mit einer SMS überprüfen.</string>
   <string name="registration_progress_activity__connecting">Verbinde...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Warte auf SMS\nÜberprüfung...</string>
-  <string name="registration_progress_activity__registering_with_server">Registriere am Server...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dies\nkann einen Moment dauern. Bitte seinen Sie geduldig, wir benachrichtigen Sie, wenn die Überprüfung abgeschlossen ist.</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nDie Überprüfung der SMS Bestätigung hat zu lange gedauert.</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS Überprüfung\nfehlgeschlagen.</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Warte auf SMS-Überprüfung...</string>
+  <string name="registration_progress_activity__registering_with_server">Am Server registrieren...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dies kann einen Moment dauern. Bitte haben Sie Geduld, wir benachrichtigen Sie, wenn die Überprüfung abgeschlossen ist.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nDie Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
+  <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__add_member">Mitglied hinzu fügen</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 Schlüssel denen Sie vertrauen in Ihrer Datenbank.</string>
+  <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>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Deren Identität (sie lesen):</string>
-  <string name="verify_identity_activity__your_identity_you_read">Ihre Identität (Sie lesen):</string>
+  <string name="verify_identity_activity__their_identity_they_read">Identität des Empfängers:</string>
+  <string name="verify_identity_activity__your_identity_you_read">Eigene Identität:</string>
   <!--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>
@@ -420,52 +447,60 @@
   <string name="AndroidManifest__textsecure_detected">TextSecure erkannt</string>
   <string name="AndroidManifest__public_identity_key">Öffentlicher Schlüssel</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
-  <string name="AndroidManifest__verify_session">Sitzung verifizieren</string>
-  <string name="AndroidManifest__verify_identity">Identität verifizieren</string>
+  <string name="AndroidManifest__verify_session">Unterhaltung überprüfen</string>
+  <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">Vollständiger Schlüsselaustausch</string>
+  <string name="AndroidManifest__complete_key_exchange">Automatischer Schlüsselaustausch</string>
+  <string name="AndroidManifest__log_submit">Übermittle Fehlerprotokolle</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Import / Export</string>
+  <string name="arrays__import_export">Importieren / Exportieren</string>
   <string name="arrays__my_identity_key">Mein Schlüssel</string>
-  <string name="arrays__contact_keys">Schlüssel meiner Kontakte</string>
+  <string name="arrays__contact_keys">Kontaktschlüssel</string>
   <!--preferences.xml-->
   <string name="preferences__general">Allgemein</string>
-  <string name="preferences__pref_all_sms_title">Für alle SMS benutzen</string>
-  <string name="preferences__pref_all_mms_title">Für alle MMS benutzen</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__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__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 schickt ab</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter Taste versendet Nachrichten</string>
+  <string name="preferences__pref_enter_sends_title">Enter-Taste schickt ab</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Drücken der Enter-Taste versendet Nachrichten</string>
   <string name="preferences__display_settings">Anzeige-Einstellungen</string>
   <string name="preferences__choose_identity">Identität auswählen</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wählen Sie den Kontakt aus der Kontaktliste.</string>
   <string name="preferences__change_passphrase">Passwort ändern</string>
   <string name="preferences__change_my_passphrase">Mein Passwort ändern</string>
-  <string name="preferences__complete_key_exchanges">Schlüsselaustausch abschließen</string>
+  <string name="preferences__complete_key_exchanges">Automatischer Schlüsselaustausch</string>
   <string name="preferences__disable_passphrase">Passwort deaktivieren</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Verschlüsselung von Nachrichten und Schlüsseln auf diesem Gerät deaktivieren</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 Sitzungen oder für bestehende Sitzungen mit dem selben persönlichen Schlüssel</string>
+  <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__pref_timeout_interval_dialogtitle">Passwort-Timeout auswählen</string>
-  <string name="preferences__pref_timeout_interval_title">Timeout-Dauer</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Länge des Zeitraums, während dessen das Passwort im Speicher gehalten wird</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__identity_key_settings">Schlüssel</string>
-  <string name="preferences__view_my_identity_key">Meinen persönlichen Schlüssel anzeigen</string>
+  <string name="preferences__view_my_identity_key">Meinen eigenen Schlüssel anzeigen</string>
   <string name="preferences__manage_identity_keys">Schlüssel verwalten</string>
   <string name="preferences__manage_configured_identity_keys">Konfigurierte Schlüssel verwalten</string>
   <string name="preferences__notifications">Benachrichtigungen</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Benachrichtigung in der Statuszeile anzeigen</string>
-  <string name="preferences__led_color">LED Farbe</string>
-  <string name="preferences__pref_led_blink_title">LED Blink-Muster</string>
-  <string name="preferences__sound">Ton</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Benachrichtigungen in der Statusleiste anzeigen</string>
+  <string name="preferences__led_color">LED-Farbe</string>
+  <string name="preferences__pref_led_blink_title">LED-Blinkmuster</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Eigenes LED-Blinkmuster wählen</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Eingeschaltet für:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Ausgeschaltet für:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Eigenes LED-Blinkmuster aktiviert!</string>
+  <string name="preferences__sound">Benachrichtigungston</string>
   <string name="preferences__change_notification_sound">Benachrichtigungston ändern</string>
-  <string name="preferences__inthread_notifications">Benachrichtigungen innerhalb Konversationen</string>
-  <string name="preferences__play_inthread_notifications">Einen Alarmton abspielen während Sie eine aktive Konversation ansehen.</string>
-  <string name="preferences__vibrate">Vibrieren</string>
-  <string name="preferences__also_vibrate_when_notified">Bei Benachrichtigung vibrieren</string>
+  <string name="preferences__inthread_notifications">Immer benachrichtigen</string>
+  <string name="preferences__play_inthread_notifications">Benachrichtigungston während aktiven Unterhaltungen abspielen</string>
+  <string name="preferences__vibrate">Vibration</string>
+  <string name="preferences__also_vibrate_when_notified">Bei Benachrichtigungen vibrieren</string>
   <string name="preferences__minutes">Minuten</string>
   <string name="preferences__hours">Stunden</string>
   <string name="preferences__green">Grün</string>
@@ -474,6 +509,8 @@
   <string name="preferences__orange">Orange</string>
   <string name="preferences__cyan">Cyan</string>
   <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Weiß</string>
+  <string name="preferences__none">Keine</string>
   <string name="preferences__fast">Schnell</string>
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Langsam</string>
@@ -481,32 +518,39 @@
   <string name="preferences__advanced">Weitere Einstellungen</string>
   <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 erlauben</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__mmsc_url_required">MMSC URL (Benötigt)</string>
-  <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Optional)</string>
-  <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (Optional)</string>
-  <string name="preferences__sms_delivery_reports">SMS Zustellungsberichte</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Einen Zustellungsbericht für jede von Ihnen gesendete SMS anfordern</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, falls der Thread eine bestimmte Länge überschreitet</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>
+  <string name="preferences__sms_delivery_reports">SMS-Zustellberichte</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, wenn die Unterhaltung eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
   <string name="preferences__storage">Speicher</string>
-  <string name="preferences__conversation_length_limit">Limit der Konversationslänge</string>
-  <string name="preferences__trim_all_threads_now">Alle Konversationen kürzen</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Konversationen durchgehen und dabei Längenbegrenzungen sicherstellen</string>
+  <string name="preferences__conversation_length_limit">Höchstzahl an Nachrichten</string>
+  <string name="preferences__trim_all_threads_now">Alle Unterhaltungen jetzt kürzen</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Unterhaltungen durchgehen und dabei die Längenbegrenzung sicherstellen</string>
   <string name="preferences__light_theme">Helles Design</string>
   <string name="preferences__dark_theme">Dunkles Design</string>
   <string name="preferences__appearance">Aussehen</string>
   <string name="preferences__theme">Design</string>
   <string name="preferences__default">Voreinstellung</string>
   <string name="preferences__language">Sprache</string>
-  <string name="preferences__make_default_sms_app">Als standard SMS App einstellen</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure als standard SMS/MMS App einrichten.</string>
-  <string name="preferences__use_data_channel">Push Benachrichtigungen</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nMehr Privatsphäre und keine SMS-Kosten durch das Nutzen der Datenverbindung zur Kommunikation mit anderen TextSecure Nutzern.</string>
-  <string name="preferences__allow_sms_fallback">Erlaube Rückgriff auf  SMS</string>
-  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Sende und empfange SMS Nachrichten wenn der Datenkanal nicht verfügbar ist.</string>
-  <string name="preferences__refresh_push_directory">Aktualisiere Push Verzeichnis</string>
+  <string name="preferences__make_default_sms_app">Als Standard-SMS-Anwendung einrichten</string>
+  <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_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_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>
+  <string name="preferences__sms_fallback_non_push_users">Kontakte ohne TextSecure-Push</string>
+  <string name="preferences__sms_fallback_nobody">Niemand</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -515,6 +559,8 @@
   <string name="contact_selection_list__menu_unselect_all">Alle abwählen</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Fertig</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Kontaktliste aktualisieren</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Unverschlüsselt senden</string>
   <!--conversation_callable-->
@@ -526,7 +572,7 @@
   <string name="conversation_context__menu_forward_message">Nachricht weiterleiten</string>
   <string name="conversation_context__menu_resend_message">Nachricht erneut senden</string>
   <!--conversation_insecure-->
-  <string name="conversation_insecure__menu_start_secure_session">Sichere Sitzung starten</string>
+  <string name="conversation_insecure__menu_start_secure_session">Sichere Unterhaltung starten</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Ausgewählte löschen</string>
   <string name="conversation_list_batch__menu_select_all">Alle auswählen</string>
@@ -536,31 +582,31 @@
   <string name="conversation_list__drawer_close">Seitenleiste schließen</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicherheit</string>
-  <string name="conversation_secure_verified__menu_no_identity">Keine Identität verfügbar.</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Empfänger verifizieren</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Sitzung beenden</string>
+  <string name="conversation_secure_verified__menu_no_identity">Keine Identität verfügbar</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Empfänger überprüfen</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Unterhaltung beenden</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Anhang hinzufügen</string>
-  <string name="conversation__menu_update_group">Gruppe aktualisieren</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">Kontaktinformation hinzufügen</string>
-  <string name="conversation__menu_delete_thread">Thread löschen</string>
+  <string name="conversation__menu_add_contact_info">Kontaktinfo hinzufügen</string>
+  <string name="conversation__menu_delete_thread">Unterhaltung löschen</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Teilnehmerliste</string>
   <string name="conversation_group_options__delivery">Zustellung</string>
-  <string name="conversation_group_options__conversation">Konversation</string>
+  <string name="conversation_group_options__conversation">Unterhaltung</string>
   <string name="conversation_group_options__broadcast">Übertragen</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Vergleichen</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Zum Vergleich einlesen lassen</string>
-  <string name="key_scanning__menu_scan_to_compare">Zum Vergleich einlesen</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Zum Vergleich einscannen lassen</string>
+  <string name="key_scanning__menu_scan_to_compare">Zum Vergleich einscannen</string>
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">Entsperren</string>
   <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_new_message">Neue Nachricht</string>
+  <string name="text_secure_normal__menu_new_message">Neue Unterhaltung</string>
   <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
   <string name="text_secure_normal__menu_settings">Einstellungen</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Sperren</string>
+  <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>

res/values-el/strings.xml

@@ -17,7 +17,11 @@
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n        Προσοχή, αυτό θα απενεργοποιήσει τη κρυπτογράφηση αποθήκευσης για όλα τα μηνύματα και τα κλειδιά σας.\n        Οι κρυπτογραφημένες συζητήσεις σας θα συνεχίσουν να λειτουργούν, αλλά όποιος έχει φυσική πρόσβαση στη συσκευή σας θα\n        μπορεί να τις διαβάσει.\n    </string>
   <string name="ApplicationPreferencesActivity_disable">Απενεργοποίηση</string>
   <string name="ApplicationPreferencesActivity_unregistering">Διαγραφή...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Μη εγγεγραμένος για μεταφορά δεδομένων</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Σφάλμα κατά τη σύνδεση με τον διακομιστή!</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Δεν είστε εγγεγραμμένος για ειδοποιήσεις push...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Ενημέρωση καταλόγου</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Ενημέρωση καταλόγου push...</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Εικόνα</string>
   <string name="AttachmentTypeSelectorAdapter_video">Βίντεο</string>
@@ -26,7 +30,6 @@
   <string name="ConversationItem_message_size_d_kb">Μέγεθος μηνύματος: %d KB</string>
   <string name="ConversationItem_expires_s">Παύει να ισχύει: %s</string>
   <string name="ConversationItem_error_sending_message">Σφάλμα κατά την αποστολή μηνύματος</string>
-  <string name="ConversationItem_sending">Αποστολή...</string>
   <string name="ConversationItem_saving_attachment">Αποθήκευση Συνημμένου</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Αποθηκεύεται το συνημμένο στην κάρτα μνήμης...</string>
   <string name="ConversationItem_save_to_sd_card">Να Αποθηκευτεί στην Κάρτα Μνήμης;</string>
@@ -39,6 +42,9 @@
   <string name="ConversationItem_received_and_processed_key_exchange_message">Το μήνυμα ανταλλαγής κλειδιών ελήφθη και επεξεργάστηκε.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Σφάλμα, λάβαμε παλιό μήνυμα ανταλλαγής κλειδιών.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, κάνετε κλικ για να επεξεργαστεί.</string>
+  <string name="ConversationItem_group_action_left">%1$s έφυγαν απο την ομάδα.</string>
+  <string name="ConversationItem_group_action_joined">%1$s μπήκαν στην ομάδα.</string>
+  <string name="ConversationItem_group_action_modify">%1$s ενημέρωσαν την ομάδα.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Έναρξη Ασφαλούς Συζήτησης;</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Έναρξη ασφαλούς συζήτησης με %s;</string>
@@ -57,14 +63,17 @@
   <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>
+  <string name="ConversationActivity_leave_group">Αποχωρείτε απο την ομάδα;</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Είστε σίγουροι πως θέλετε να αποχωρήσετε απο την ομάδα;</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Στοιχεία μηνύματος</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Αποστολέας: %1$s\nΜέσο μεταφοράς: %2$s\nΑπεστάλη/Παραλήφθηκε:%3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Αποστολέας: %1$s\nΜέσο μεταφοράς: %2$s\nΑπεστάλησαν: %3$s\nΠαραλήφθηκαν:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Επιβεβαίωση Διαγραφής Μηνύματος</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Είστε σίγουροι πως θέλετε να διαγράψετε αυτό το μήνυμα για πάντα;</string>
   <!--ConversationListAdapter-->
@@ -90,6 +99,20 @@
   <string name="ExportFragment_success">Επιτυχία!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Γίνεται εξαγωγή κρυπτογραφημένων κλειδιών,\n        ρυθμίσεων και μηνυμάτων...\n    </string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Νέα Ομάδα</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Ενημέρωση Ομάδας</string>
+  <string name="GroupCreateActivity_group_name_hint">Όνομα Ομάδας</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Νέα ομάδα MMS</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Επιλέξατε μια επαφή που δεν υποστηρίζει ομάδες TextSecure, γι αυτό η ομάδα θα γίνει MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Είστε εγγεγραμένος για χρήση του καναλιού δεδομένων, γι αυτό το οι ομάδες TextSecure είναι απενεργοποιημένες. </string>
+  <string name="GroupCreateActivity_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>
+  <string name="GroupCreateActivity_file_io_exception">Σφάλμα αρχείου I/O, αδύνατη δημιουργία προσωρινού αρχείου εικόνας.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Εικόνα ομάδας.</string>
+  <string name="GroupCreateActivity_menu_create_title">Δημιουργήστε Ομάδα</string>
+  <string name="GroupCreateActivity_creating_group">Δημιουργία %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Να εισαχθούν όλα τα προϋπάρχοντα SMS;</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Θα γίνει εισαγωγή όλων των\n        μηνυμάτων από το προκαθορισμένο αρχείο μηνυμάτων SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη εισάγει\n        το αρχείο μηνυμάτων της συσκευής σας, η επανα-εισαγωγή θα έχει ως αποτέλεσμα διπλά μηνύματα.\n    </string>
@@ -144,6 +167,7 @@
   <string name="RegistrationActivity_invalid_number">Άκυρος αριθμός</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Ο αριθμός που καθορίσατε (%s)\nδεν είναι έγκυρος.\n</string>
   <string name="RegistrationActivity_unsupported">Δεν υποστηρίζεται</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Συγνώμμη,\nαυτή η συσκευή δεν υποστηρίζεται για μηνύματα δεδομένων. Οι συσκευές που τρέχουν εκδόσεις παλαιότερες απο\nτην 4.0 πρέπει να έχουν λογαριασμό Google Account. Συσκευές που τρέχουν Android 4.0 ή πιο καινούρια έκδοση δεν\nαπαιτούν λογαριασμό Google Account, αλλά θα πρέπει να έχουν εγκατεστημένο το Play Store.</string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\n        Πρόκειται να επιβεβαιώσουμε πως ο παρακάτω αριθμός ανήκει σε αυτή τη συσκευή:\n\n%s\n\n\n        Είναι σωστός ο αριθμός, ή θέλετε να τον αλλάξετε πριν προχωρήσετε;\n    </string>
   <string name="RegistrationActivity_continue">Συνέχεια</string>
   <string name="RegistrationActivity_edit">Επεξεργασία</string>
@@ -170,6 +194,8 @@
   <string name="RegistrationProgressActivity_too_many_requests">Πάρα Πολλές Αιτήσεις!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Έχετε ζητήσει κλήση επαλήθευσης πρόσφατα. Μπορείτε να ζητήσετε άλλη μία σε 20 λεπτά.</string>
   <string name="RegistrationProgressActivity_verifying_voice_code">Επαλήθευση φωνητικού κωδικού...</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Πρόβλημα με την εγγραφή</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Αυτός ο αριθμός ειναι καταχωρημένος σε έναν άλλο διακομιστή TextSecure (CyanogenMod?). Πρέπει πρώτα να διαγραψετε αυτόν πριν τον καταχωρήσετε εδώ.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Η Εγγραφή Ολοκληρώθηκε</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Η εγγραφή TextSecure ολοκληρώθηκε επιτυχώς.</string>
@@ -179,7 +205,11 @@
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ελήφθη προβληματικό μήνυμα\n        ανταλλαγής κλειδιών!\n    </string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\n        Ελήφθη μήνυμα ανταλλαγής κλειδιών για άκυρη έκδοση του πρωτόκολου.\n    </string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\n        Ελήφθη μήνυμα με άγνωστο κλειδί ταυτότητας. Κλικ για επεξεργασία και προβολή.\n    </string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Λήφθηκε ενημερωμένη αλλά αγνωστη πληρογφορία ταυτότητας. Πατήστε για επιβεβαωση ταυτότητας.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Η Ασφαλής συζήτηση τερματίστηκε.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Έφυγε απο την ομάδα...</string>
+  <string name="TheadRecord_secure_session_ended">Η ασφαλής συζήτηση τερματίστηκε.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Δεν έχετε κλειδί ταυτότητας.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Ο παραλήπτης δεν έχει κλειδί ταυτότητας.</string>
@@ -267,12 +297,18 @@
   <!--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-->
   <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_sent-->
@@ -287,10 +323,21 @@
   <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>
   <string name="create_passphrase_activity__generating_secrets">ΔΗΜΙΟΥΡΓΙΑ ΜΥΣΤΙΚΩΝ</string>
+  <string name="create_passphrase_activity__skip">Παράληψη</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__button_cancel">Να μην αποσταλεί</string>
+  <string name="log_submit_activity__button_ok">Αποστολή</string>
+  <string name="log_submit_activity__log_submit_success_title">Επιτυχία!</string>
+  <string name="log_submit_activity__log_got_it">Λήφθηκε</string>
+  <string name="log_submit_activity__your_pastebin_url">Παρακαλώ αντιγράψτε αυτή την διεύθυνση και προσθέστε την στα θέματά σας (πάτημα διαρκείας για αντιγραφή):\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
+  <string name="log_submit_activity__loading_logcat">Φόρτωση logcat...</string>
+  <string name="log_submit_activity__thanks">Ευχαριστούμε για τη βοήθειά σας!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Να εισαχθούν τα παλιά μηνύματα στη κρυπτογραφημένη βάση δεδομένων του TextSecure;</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Το υπάρχον αρχείο μηνυμάτων δε θα αλλαχθεί.</string>
@@ -329,27 +376,38 @@
   <string name="registration_activity__your_country_code_and_phone_number">Ο ΚΩΔΙΚΟΣ ΧΩΡΑΣ ΣΑΣ\nΚΑΙ ΑΡΙΘΜΟΣ ΚΙΝΗΤΟΥ ΤΗΛΕΦΩΝΟΥ</string>
   <string name="registration_activity__phone_number">ΑΡΙΘΜΟΣ ΚΙΝΗΤΟΥ</string>
   <string name="registration_activity__register">Εγγραφή</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Η εγγραφή θα μεταφέρει προσωρινά μερικά δεδομένα στον διακομιστή.</string>
+  <string name="registration_activity__skip">Παράληψη</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Μερικά ενδεχόμενα προβλήματα\nσυμπεριλαμβάνουν:\n</string>
   <string name="registration_problems__incorrect_number">Λανθασμένος αριθμός.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nΠαρακαλώ σιγουρευτείτε ότι εισάγατε σωστά τον αριθμό σας και ότι αυτός ειναι διαμορφωμένος σωστά\nγια την περιοχή σας.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nΤο TextSecure δεν λειτουργεί με αριθμούς Google Voice.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Επιβεβαίωση Με Φωνή</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nΗ επαλήθευση μπορεί να γίνει και τηλεφωνικά. Πατήστε \"Τηλεφωνησέ μου\" και εισάγετε παρακάτω τον εξαψήφιο κωδικό που θα σας δωθεί.</string>
   <string name="registration_progress_activity__verify">Επιβεβαίωση</string>
   <string name="registration_progress_activity__call_me">Κάλεσέ με</string>
   <string name="registration_progress_activity__edit_number">Επεξεργασία αριθμού</string>
   <string name="registration_progress_activity__connectivity_error">Σφάλμα συνδεσιμότητας.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nΤο TextSecure ήταν αδύνατο να συνδεθεί στην υπηρεσία push.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Πιθανά\n        προβλήματα:\n    </string>
   <string name="registration_progress_activity__no_network_connectivity">Δεν υπάρχει σύνδεση\n        στο Διαδίκτυο.\n    </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Η\nσυσκευή σας χρειάζεται σύνδεση στο δίκτυο για να χρησιμοποιήσετε αυτό χαρακτηριστικό. Σιγουρευτείτε \nότι είναι συνεδεμένη με 3G ή Wifi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Περιοριστικό τοίχος προστασίας.\n</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nΑν είστε συνδεμένοι μεσω Wifi, είναι πιθανόν το τείχος προστασίας να εμποδίζει την πρόσβαση\nστο διακομιστή του TextSecure. Δοκιμάστε ένα άλλο δίλτυο ή κινητά δεδεμένων.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nΤο TextSecure θα επαληθέυσει αυτόματα τον αριθμό σας μεσω μηνύματος SMS.</string>
   <string name="registration_progress_activity__connecting">Γίνεται σύνδεση...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Αναμονή για επιβεβαίωση\n        SMS...\n    </string>
   <string name="registration_progress_activity__registering_with_server">Γίνεται εγγραφή με τον διακομιστή...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Αυτό\nμπορεί να διαρκέσει για λίγο. ΠΑρακαλώ κάντε υπομονή και θα σας ειδοποιήσουμε όταν ολοκληρωθεί η επαλήθευση.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nΤο TextSecure έληξε περιμένοντας την επαλήθευση μέσω μηνύματος SMS.</string>
   <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>
   <!--verify_identity_activity-->
@@ -367,6 +425,7 @@
   <string name="AndroidManifest__create_passphrase">Δημιουργία Συνθηματικής Φράσης</string>
   <string name="AndroidManifest__enter_passphrase">Εισάγετε Συνθηματική Φράση</string>
   <string name="AndroidManifest__select_contacts">Επιλέξτε Επαφές</string>
+  <string name="AndroidManifest__select_contact">Επιλέξτε επαφή</string>
   <string name="AndroidManifest__textsecure_detected">Εντοπίστηκε TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Δημόσιο Κλειδί Ταυτότητας</string>
   <string name="AndroidManifest__change_passphrase">Αλλαγή Συνθηματικής Φράσης</string>
@@ -374,14 +433,13 @@
   <string name="AndroidManifest__verify_identity">Επιβεβαίωση Ταυτότητας</string>
   <string name="AndroidManifest__manage_identity_keys">Διαχείριση Κλειδιών Ταυτότητας</string>
   <string name="AndroidManifest__complete_key_exchange">Ολοκλήρωση Ανταλλαγής Κλειδιών</string>
+  <string name="AndroidManifest__log_submit">Αποστολή αρχείων καταγραφής αποσφαλμάτωσης</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Εισαγωγή / Εξαγωγή</string>
   <string name="arrays__my_identity_key">Το Κλειδί Ταυτότητάς Μου</string>
   <string name="arrays__contact_keys">Κλειδιά Επαφών</string>
   <!--preferences.xml-->
   <string name="preferences__general">Γενικά</string>
-  <string name="preferences__pref_all_sms_title">Χρήση για όλα τα SMS</string>
-  <string name="preferences__pref_all_mms_title">Χρήση για όλα τα MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Χρήση TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων SMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Χρήση TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων MMS</string>
   <string name="preferences__enable_enter_key_title">Ενεργοποίηση πλήκτρου Enter</string>
@@ -396,7 +454,9 @@
   <string name="preferences__complete_key_exchanges">Να ολοκληρώνονται οι ανταλλαγές κλειδιών</string>
   <string name="preferences__disable_passphrase">Απενεργοποίηση συνθηματικής φράσης</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Απενεργοποίηση τοπικής κρυπτογράφησης όλων των μηνυμάτων και κλειδιών</string>
+  <string name="preferences__screen_security">Ασφάλεια οθόνης</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Να χρησιμοποιείται αυτόματα το ίδιο κλειδί ταυτότητας για ανταλλαγές κλειδιών σε νέες ή υπάρχουσες συζητήσεις</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Απενεργοποίηση ασφάλειας οθόνης για να επιτρεαπουν τα στιγμιότυπα οθόνης</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Να σβήνεται η συνθηματική φράση από τη μνήμη μετά από κάποιο διάστημα</string>
   <string name="preferences__timeout_passphrase">Χρονικό όριο συνθηματικής φράσης</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Επιλέξτε Χρονικό Όριο Συνθηματικής Φράσης</string>
@@ -410,6 +470,7 @@
   <string name="preferences__display_message_notifications_in_status_bar">Προβολή ειδοποιήσεων για νέα μηνύματα στη γραμμή κατάστασης</string>
   <string name="preferences__led_color">Χρώμα LED</string>
   <string name="preferences__pref_led_blink_title">Μοτίβο αναβοσβήσματος του LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Ορισμός τρόπου αναβοσβηνόματος του LED</string>
   <string name="preferences__sound">Ήχος</string>
   <string name="preferences__change_notification_sound">Αλλαγή ήχου ειδοποίησης</string>
   <string name="preferences__inthread_notifications">Ειδοποιήσεις εντός συζητήσεων</string>
@@ -452,6 +513,10 @@
   <string name="preferences__language">Γλώσσα</string>
   <string name="preferences__make_default_sms_app">Ανάθεση ως προεπιλεγμένη εφαρμογή για SMS</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Το TextSecure να είναι η προεπιλεγμένη εφαρμογή για SMS/MMS.</string>
+  <string name="preferences__use_data_channel">ΕΙδοποιήσεις Push</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nΑυξήστε την ανωνυμία και αποφύγετε το κόστος του SMS χρησιμοποιώντας το κανάλι δεδομένων για επικοινωνία με τους άλλους χρήστες του TextSecure.</string>
+  <string name="preferences__allow_sms_fallback_disabled_reason">Το TextSecure είναι η προεπιλεγμένη εφαρμογή για SMS. Παρακαλώ επιλέξτε μια άλλη προεπιλεγμένη εφαρμογή για SMS για να αλλάξετε αυτή την προτίμηση.</string>
+  <string name="preferences__submit_debug_log">Αποστολή αρχείων καταγραφής αποσφαλμάτωσης</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -460,6 +525,7 @@
   <string name="contact_selection_list__menu_unselect_all">Εκκαθάριση Όλων</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Ολοκληρώθηκε</string>
+  <!--refreshing push directory from menu-->
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Αποστολή χωρίς κρυπτογράφηση</string>
   <!--conversation_callable-->
@@ -477,13 +543,17 @@
   <string name="conversation_list_batch__menu_select_all">Επιλογή Όλων</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Αναζήτηση</string>
+  <string name="conversation_list__drawer_open">Άνοιγμα συρταριού πλοήγησης</string>
+  <string name="conversation_list__drawer_close">Κλείσιμο συρταριού πλοήγησης</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Ασφάλεια</string>
   <string name="conversation_secure_verified__menu_no_identity">Δεν υπάρχει διαθέσιμη ταυτότητα</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Επικύρωση Παραλήπτη</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Επιβεβαίωση Ταυτότητας</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Τελείωμα Ασφαλούς Συζήτησης</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Προσθήκη συνημμένου</string>
+  <string name="conversation__menu_update_group">Αναβαθμίστε την Ομάδα</string>
+  <string name="conversation__menu_leave_group">Αποχωρήστε απο την ομάδα</string>
   <string name="conversation__menu_add_contact_info">Προσθήκη πληροφοριών επαφής</string>
   <string name="conversation__menu_delete_thread">Διαγραφή συζήτησης</string>
   <!--conversation_group_options-->
@@ -499,6 +569,7 @@
   <string name="text_secure_locked__menu_unlock">Ξεκλείδωμα</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Νέο Μήνυμα</string>
+  <string name="text_secure_normal__menu_new_group">Νέα Ομάδα</string>
   <string name="text_secure_normal__menu_settings">Ρυθμίσεις</string>
   <string name="text_secure_normal__menu_clear_passphrase">Κλείδωμα</string>
   <string name="text_secure_normal__mark_all_as_read">Επισήμανση Όλων Ως Αναγνωσμένα</string>

res/values-es/strings.xml

@@ -18,7 +18,14 @@
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Cancelando registro...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Cancelando registro para comunicación basada en datos</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">¿Deshabilitar mensajes activos?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nEsto deshabilitará los mensajes activos (\'push\') desregistrándole del servidor \nNecesitará volver a registrar su número de teléfono para usar los mensajes activos de nuevo en el futuro.\n    </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Error conectando al servidor!</string>
+  <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_touch_to_change_your_default_sms_app">Pulse para cambiar la aplicación de SMS predeterminada</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>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
@@ -27,7 +34,6 @@
   <string name="ConversationItem_message_size_d_kb">Tamaño del mensaje: %d KB</string>
   <string name="ConversationItem_expires_s">Expira: %s</string>
   <string name="ConversationItem_error_sending_message">Error al enviar el mensaje</string>
-  <string name="ConversationItem_sending">Enviando...</string>
   <string name="ConversationItem_saving_attachment">Guardando el archivo adjunto</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Guardando el archivo adjunto a la tarjeta SD</string>
   <string name="ConversationItem_save_to_sd_card">¿Guardar a la tarjeta SD?</string>
@@ -36,10 +42,10 @@
   <string name="ConversationItem_success_exclamation">¡Éxito!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">No es posible escribir en la tarjeta SD</string>
   <string name="ConversationItem_view_secure_media_question">¿Ver archivos de medios seguros?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este audiovisual ha sido guardado en una base de datos cifrada. Desafortunadamente, para verlo con un visor de contenido externo se requiere que los datos sean descifrados temporalmente y escritos al disco. ¿Está seguro de que desea hacer esto?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este archivo ha sido guardado en una base de datos cifrada. Desafortunadamente, para verlo con un visor de contenido externo se requiere que los datos sean descifrados temporalmente y escritos al disco. ¿Está seguro de que desea hacer esto?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Mensaje de intercambio de claves recibido y procesado.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Error, recibió un mensaje de intercambio de claves expirado.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ha recibido un mensaje de intercambio de claves, haga clic para proceder</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ha recibido un mensaje de intercambio de claves, haga clic para proceder.</string>
   <string name="ConversationItem_received_plaintext_message_click_to_terminate">Se recibió un SMS en texto simple mientra tiene abierta una sesión segura. Si sus interlocutores no tienen una sesión abierta, los mensajes que envíe aparecerán como texto distorsionado. Haga clic para terminar la sesión segura.</string>
   <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>
@@ -73,8 +79,8 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">¿Está seguro de que quiere dejar este grupo?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Remitente: %1$s\nTransporte: %2$s\nEnviado/Recibido:%3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Emisor: %1$s⏎ Transporte: %2$s⏎ Enviado: %3$s⏎ Recibido:%4$s\n</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviado/Recibido: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Emisor: %1$s\nTransporte: %2$s\nEnviado: %3$s\nRecibido:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmar borrado del mensaje</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">¿Está seguro que desea borrar permanentemente este mensaje?</string>
   <!--ConversationListAdapter-->
@@ -195,6 +201,8 @@
   <string name="RegistrationProgressActivity_too_many_requests">¡Demasiadas solicitudes!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Usted ya ha solicitado recientemente una llamada de voz. Puede pedir otra en 20 minutos.</string>
   <string name="RegistrationProgressActivity_verifying_voice_code">Verificando código de voz...</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Confilicto al registrarse</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Este número ya está registrado en un servidor TextSecure diferente (¿CyanogenMod?). Debe desregistrarse allí antes de registrarse aquí.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Proceso de registro completado</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">El proceso de registro de TextSecure ha finalizado con éxito.</string>
@@ -236,6 +244,7 @@
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">¡La clave escaneada coincide!</string>
   <string name="ViewIdentityActivity_verified_exclamation">¡Verificado!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Huella de Identidad</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Mi huella algorítmica de identificación</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">¿Iniciar a pesar de la petición existente?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ya ha enviado una petición de inicio de sesión a este destinatario, ¿está seguro de que quiere enviar otra? Esto invalidará la primera petición. </string>
@@ -299,6 +308,9 @@
   <string name="contact_selection_group_activity__finding_contacts">Buscando 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_updating_directory">Actualizando directorio</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando directorio de mensajería activa...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--contact_selection_recent_activity-->
@@ -319,10 +331,24 @@
   <string name="country_selection_fragment__loading_countries">Cargando países...</string>
   <string name="country_selection_fragment__search">Buscar</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">Por favor elija una frase clave si desea cifrar localmente sus datos.</string>
   <string name="create_passphrase_activity__passphrase">Frase de contraseña:</string>
   <string name="create_passphrase_activity__repeat">Repetir:</string>
   <string name="create_passphrase_activity__continue">Continuar</string>
   <string name="create_passphrase_activity__generating_secrets">GENERANDO SECRETOS</string>
+  <string name="create_passphrase_activity__skip">Saltar</string>
+  <string name="create_passphrase_activity__create">Crear</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">Este registro de actividades (\'log\') será publicado en línea para que los contribuidores de TextSecure lo vean. Tenga la libertad de examinar o editar los registros de actividades antes de pulsar enviar.</string>
+  <string name="log_submit_activity__button_cancel">No enviar</string>
+  <string name="log_submit_activity__button_ok">Enviar</string>
+  <string name="log_submit_activity__log_fetch_failed">No pudieron tomarse los registros de actividad (logs) de su dispositivo. Aún puede usar ADB (Android debug bridge) para obtener los registros de depuración en su lugar.</string>
+  <string name="log_submit_activity__log_submit_success_title">¡Completado!</string>
+  <string name="log_submit_activity__log_got_it">Lo tengo</string>
+  <string name="log_submit_activity__your_pastebin_url">Por favor copie esta URL y añádala a su informe (mantenga pulsado para llevarla al portapapeles):\n\n<b>%1$s</b></string>
+  <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>
   <!--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>
@@ -363,6 +389,7 @@
   <string name="registration_activity__phone_number">NÚMERO DE TELÉFONO</string>
   <string name="registration_activity__register">Registro</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">El registro transmitirá temporalmente cierta información de contacto al servidor.</string>
+  <string name="registration_activity__skip">Saltar</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Algunos posibles problemas\nincluyen:\n</string>
   <string name="registration_problems__sms_interceptors">Interceptadores de SMS.</string>
@@ -378,7 +405,7 @@
   <string name="registration_progress_activity__call_me">Llamarme</string>
   <string name="registration_progress_activity__edit_number">Editar número</string>
   <string name="registration_progress_activity__connectivity_error">Fallo de conectividad.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\n        TextSecure no pudo conectar al servicio push (de actualización en vivo).\n    </string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\n        TextSecure no se pudo conectar al servicio push (de actualización en vivo).\n    </string>
   <string name="registration_progress_activity__some_possible_problems_include">Algunos problemas\n        posibles incluyen:\n    </string>
   <string name="registration_progress_activity__no_network_connectivity">Sin conectividad\n        a la red.\n    </string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Su\n        dispositivo precisa conectividad a la red para usar esta característica de TextSecure. Asegúrese\n        de que está conectado a 3G o wifi.\n    </string>
@@ -420,18 +447,17 @@
   <string name="AndroidManifest__verify_identity">Verificar identidad</string>
   <string name="AndroidManifest__manage_identity_keys">Gestionar claves de identidad</string>
   <string name="AndroidManifest__complete_key_exchange">Completar el intercambio de claves</string>
+  <string name="AndroidManifest__log_submit">Enviar registros de depuración</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">Mi clave de identidad</string>
   <string name="arrays__contact_keys">Claves de contacto</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
-  <string name="preferences__pref_all_sms_title">Usar para todos los SMS</string>
-  <string name="preferences__pref_all_mms_title">Usar para 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__enable_enter_key_title">Habilitar tecla Intro</string>
-  <string name="preferences__replace_smiley_with_enter_key">Reemplazar tecla de emoticono con una 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>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Presionar la tecla de entrada enviará sus mensajes de texto</string>
   <string name="preferences__display_settings">Mostrar preferencias</string>
@@ -442,7 +468,9 @@
   <string name="preferences__complete_key_exchanges">Completar intercambio de claves</string>
   <string name="preferences__disable_passphrase">Desactivar la frase de contraseña</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Desactivar el cifrado local de los mensajes y claves</string>
+  <string name="preferences__screen_security">Seguridad de la pantalla</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completar automáticamente los intercambios de clave para nuevas sesiones o para sesiones existentes con la misma clave de identidad</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Deshabilitar seguridad de la pantalla para permitir capturas de pantalla</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Olvidar la frase de contraseña de la memoria después de un intervalo de tiempo</string>
   <string name="preferences__timeout_passphrase">Expirar la frase de contraseña</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleccionar la expiración de la frase de contraseña</string>
@@ -456,6 +484,10 @@
   <string name="preferences__display_message_notifications_in_status_bar">Desplegar notificaciones de mensaje en la barra de estado</string>
   <string name="preferences__led_color">Color del LED</string>
   <string name="preferences__pref_led_blink_title">Patrón de parpadeo del LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Configure un patrón personalizado de parpadeo de LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Encendido durante:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Apagado durante:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">¡Se ha establecido el patrón de parpadeo personalizado de LED!</string>
   <string name="preferences__sound">Sonido</string>
   <string name="preferences__change_notification_sound">Cambiar sonido de notificación</string>
   <string name="preferences__inthread_notifications">Notificaciones en-el-hilo</string>
@@ -470,6 +502,8 @@
   <string name="preferences__orange">Naranja</string>
   <string name="preferences__cyan">Turquesa</string>
   <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Blanco</string>
+  <string name="preferences__none">Ninguno</string>
   <string name="preferences__fast">Rápido</string>
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Despacio</string>
@@ -499,9 +533,10 @@
   <string name="preferences__make_default_sms_app">Establecer como la aplicación SMS predeterminada</string>
   <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 ususarios de TextSecure\n</string>
-  <string name="preferences__allow_sms_fallback">Permitir recurrir al SMS</string>
-  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Envía y recibe mensajes SMS cuando la actualización activa (\'push\') no está disponible</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_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>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -510,6 +545,8 @@
   <string name="contact_selection_list__menu_unselect_all">Deseleccionar todo</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Terminado</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Refrescar lista de contactos</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Enviar sin cifrado</string>
   <!--conversation_callable-->
@@ -532,7 +569,7 @@
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Seguridad</string>
   <string name="conversation_secure_verified__menu_no_identity">Ninguna identidad disponible</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Verificar destinatario</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Verificar identidad</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Finalizar sesión segura</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Añadir archivo adjunto</string>

res/values-fi/strings.xml

@@ -0,0 +1,603 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">Kyllä</string>
+  <string name="no">Ei</string>
+  <string name="delete">Poista</string>
+  <!--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="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_delete">Poista</string>
+  <string name="ApplicationPreferencesActivity_my">Minun</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Poistetaanko tallennustilan salaus käytöstä?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nVaroitus. Viestiesi ja avaimiesi tallennustilan salaus poistetaan käytöstä. Salatut istuntosi jatkavat toimintaansa, mutta kuka tahansa, jolla on fyysinen pääsy laitteeseesi voi lukea ne.</string>
+  <string name="ApplicationPreferencesActivity_disable">Poista käytöstä</string>
+  <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_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_touch_to_change_your_default_sms_app">Kosketa muuttaaksesi oletus tekstiviestisovellusta</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>
+  <string name="AttachmentTypeSelectorAdapter_video">Video</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Äänitallenne</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">Viestin koko: %d kt</string>
+  <string name="ConversationItem_expires_s">Umpeutuu: %s</string>
+  <string name="ConversationItem_error_sending_message">Virhe viestin lähetyksessä</string>
+  <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_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_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>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Vastaanotettu salaamaton SMS -viesti kesken salattua istuntoa. Jos heillä ei ole salattua istuntoa auki, lähettämäsi viestit eivät tule olemaan luettavia. Napsauta lopettaaksesi istunto.</string>
+  <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>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Aloita salattu istunto?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Aloita salattu istunto %s:n kanssa?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Varmistus salatun istunnon lopetuksesta</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Haluatteko varmasti lopettaa salatun istunnon?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Varmistus viestiketjun poistamisesta</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Haluatteko varmasti poistaa tämän keskustelun pysyvästi?</string>
+  <string name="ConversationActivity_add_attachment">Lisää liite</string>
+  <string name="ConversationActivity_select_contact_info">Valitse yhteystieto</string>
+  <string name="ConversationActivity_compose_message">Uusi viesti</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Virhe liitteen lisäämisessä</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Kuvatallenne ylittää viestin kokorajan.</string>
+  <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>
+  <string name="ConversationActivity_leave_group">Poistutaanko ryhmästä?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Haluatteko varmasti poistua ryhmästä?</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">Viestin tiedot</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Tyyppi: %1$s\nLähetetty/Vastaanotettu: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Lähettäjä: %1$s\nTyyppi: %2$s\nLähetetty: %3$s\nVastaanotettu: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Viestin poiston varmennus</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Haluatteko varmasti poistaa tämän viestin pysyvästi?</string>
+  <!--ConversationListAdapter-->
+  <string name="ConversationListAdapter_key_exchange_message">Avainvaihtoviesti...</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">Poista viestiketjut?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Haluatteko varmasti poistaa KAIKKI valitut viestiketjut?</string>
+  <string name="ConversationListFragment_deleting">Poistetaan</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Valittuja viestiketjuja poistetaan...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Avainvaihtoviesti...</string>
+  <!--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>
+  <string name="ExportFragment_export">Vie</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Viedäänkö salaamattomana SD-muistikortille?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Varoitus,\nTämä toiminto vie TextSecure-viestiesi salaamattoman sisällön SD-muistikortillesi.</string>
+  <string name="ExportFragment_cancel">Peruuta</string>
+  <string name="ExportFragment_exporting">Viedään</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Viedään salaamattomana SD-muistikortille...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Virhe, SD-muistikortille ei\nvoida kirjoittaa!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Virhe SD-muistikortille kirjoitettaessa.</string>
+  <string name="ExportFragment_success">Onnistuimme!</string>
+  <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_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_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>
+  <string name="GroupCreateActivity_file_io_exception">Tiedoston siirräntä virhe. Ei voitu luoda väliaikaista kuvatiedostoa.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Ryhmän kuvake</string>
+  <string name="GroupCreateActivity_menu_create_title">Luo ryhmä</string>
+  <string name="GroupCreateActivity_creating_group">Luodaan %1$s…</string>
+  <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">Tuodaanko järjestelmän tekstiviestitietokanta?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Tämä toiminto kopioi tekstiviestit laitteesi tietokannasta TextSecureen. Jos viestit on tuotu jo aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
+  <string name="ImportFragment_import">Tuo</string>
+  <string name="ImportFragment_cancel">Peruuta</string>
+  <string name="ImportFragment_restore_encrypted_backup">Palautetaanko salattu varmuuskopio?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nSalatun varmuuskopion palauttaminen korvaa kaikki olemassa olevat avaimet, asetukset ja\nviestit.  Menetät kaikki TextSecuressa olevat tiedot, jotka eivät ole osa varmuuskopiota.</string>
+  <string name="ImportFragment_restore">Palauta</string>
+  <string name="ImportFragment_import_plaintext_backup">Tuodaanko salaamaton varmuuskopio?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Tämä toiminto tuo viestit salaamattomasta varmuuskopiosta. Jos viestit on tuotu jo\naiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
+  <string name="ImportFragment_importing">Tuodaan</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Tuo salaamaton varmuuskopio...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Salaamatonta varmuuskopiota ei löytynyt!</string>
+  <string name="ImportFragment_error_importing_backup">Virhe tuotaessa varmuuskopiota!</string>
+  <string name="ImportFragment_import_complete">Tuonti suoritettu!</string>
+  <string name="ImportFragment_restoring">Palautetaan</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Palautetaan salattua varmuuskopiota...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Salattua varmuuskopiota ei löytynyt!</string>
+  <string name="ImportFragment_restore_complete">Palautus suoritettu!</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Skannattuja avaimia ei löytynyt!</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Tiedonsiirtoyhteyttä multimediaviestin lataamiseen ei ole saatavilla. Yritä myöhemmin uudelleen...</string>
+  <string name="MmsDownloader_error_storing_mms">Virhe multimediaviestin tallentamisessa!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Virhe yhdistettäessä MMS palveluntarjoajaan...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Virhe luettaessa operaattorin MMS-asetuksia...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediaviesti</string>
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Salasanat eivät täsmää!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Vanha salasana on väärin!</string>
+  <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Salasanat eivät täsmää</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Teidän täytyy määrittää salasana</string>
+  <!--PassphrasePromptActivity-->
+  <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_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>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa\ntämän kontaktin.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Tämän avaintenvaihto-operaation allekirjoitus on luotettu, mutta \"suorita avaimenvaihdot automaattisesti\"-asetus on poissa käytöstä.</string>
+  <string name="ReceiveKeyActivity_processing">Käsitellään</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Käsitellään avaimenvaihtoa...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Yhdistä TextSecurella</string>
+  <string name="RegistrationActivity_select_your_country">Valitse maasi</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Suuntanumero täytyy määritellä</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Teidän täytyy määritellä \npuhelinnumero</string>
+  <string name="RegistrationActivity_invalid_number">Virheellinen numero</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Antamasi puhelinnumero\n(%s) on virheellinen.</string>
+  <string name="RegistrationActivity_unsupported">Ei tuettu</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Pahoittelemme, \nTämä laite ei ole tuettu tietoverkkovälitteiseen viestintään. Laitteilla, joissa on Android vanhempi \nkuin 4.0 täytyy olla rekisteröity Google-tili. Laitteilla, joissa on Android 4.0 tai uudempi ei \ntarvitse olla Google-tiliä, mutta täytyy olla Play-kauppa asennettuna. </string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nTulemme seuraavaksi tarkistamaan kuuluuko kyseinen numero tähän laitteeseen:\n\n%s\n\n\nOnko kyseinen numero oikein, tai haluaisitko muokata sitä ennen jatkamista?</string>
+  <string name="RegistrationActivity_continue">Jatka</string>
+  <string name="RegistrationActivity_edit">Muokkaa</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Mahdollisia ongelmia</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Numeroa varmennetaan</string>
+  <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_connecting">Yhdistetään</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Yhdistetään varmennusta varten...</string>
+  <string name="RegistrationProgressActivity_network_error">Verkkovirhe!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Ei voitu yhdistää. Tarkista verkkoyhteys ja yritä uudelleen.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Varmennus epäonnistui!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Lähettämäsi varmennuskoodi on virheellinen. Yritä uudelleen.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Liian monta yritystä</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Lähetit virheellisen varmennuskoodin liian monta kertaa. Odota hetki ennen kuin kokeilet uudelleen.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Pyydetään puhelua</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Pyydetään vahvistuspuhelua...</string>
+  <string name="RegistrationProgressActivity_server_error">Palvelinvirhe</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Palvelin havaitsi virheen. Olkaa hyvä ja yrittäkää uudelleen.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Liian monta pyyntöä!</string>
+  <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>
+  <!--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_registration_error">Rekisteröintivirhe</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecureen 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>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Poistui ryhmästä...</string>
+  <string name="TheadRecord_secure_session_ended">Salattu istunto päättyi</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Tunnisteavaimenne puuttuu.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Vastaanottajalta puuttuu tunnisteavain.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Vastaanottajalta puuttuu tunnisteavain!</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skannaa heidän avain vertaillaaksesi</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Skannaa avaimeni</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROITUS, skannattu avain EI TÄSMÄÄ. Tarkastakaa tunnisteteksti huolella.</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">EI varmennettu!</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Vastaanottajan avain on oikea. Tarkastuttakaa myös teidän avaimenne vastaanottajalla.</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Varmennettu!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Teiltä puuttuu tunnisteavain!</string>
+  <!--VerifyKeysActivity-->
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Skannaa tunnisteeni</string>
+  <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_verified_exclamation">Varmennettu!</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Tunnisteavaimenne puuttuu.</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Skannaa vertaillaaksesi</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Skannauta vertaillaaksesi</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">VAROITUS: Skannattu avain ei täsmää!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">EI varmennettu!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Skannattu avain täsmää!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Varmennettu!</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">Identiteetti tunniste</string>
+  <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_send">Lähetä</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Viestin salaus on kelvoton...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Puretaan salausta, odottakaa hetki...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Viesti salattu olemattomalle istunnolle...</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">Yhdistetään MMS-palvelimeen...</string>
+  <string name="MmsDatabase_downloading_mms">Ladataan multimediaviestiä...</string>
+  <string name="MmsDatabase_mms_download_failed">Multimediaviestin lataus epäonnistui!</string>
+  <string name="MmsDatabase_downloading">Ladataan...</string>
+  <string name="MmsDatabase_mms_pending_download">Napsauta ja säädä MMS-asetuksia jatkaaksesi latausta.</string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Puretaan multimediaviestin salausta, odottakaa hetki...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Multimediaviestin salaus on kelvoton...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Multimediaviesti salattu olemattomalle istunnolle...</string>
+  <!--MmsSender-->
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Multimediaviestin lähettäminen ei juuri nyt onnistu.</string>
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Tuonti käynnissä</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Tuo tekstiviestejä</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">Kosketa avataksesi.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Kosketa avataksesi tai kosketa lukkoa sulkeaksesi.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecuren lukitus on auki</string>
+  <string name="KeyCachingService_lock">Lukitse salasanalla</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">%d uutta viestiä</string>
+  <string name="MessageNotifier_most_recent_from_s">Uusin lähettäjältä: %s</string>
+  <string name="MessageNotifier_encrypted_message">Salattu viesti...</string>
+  <string name="MessageNotifier_no_subject">(Ei otsikkoa)</string>
+  <string name="MessageNotifier_message_delivery_failed">Viestin toimitus epäonnistui.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Viestin toimitus epäonnistui.</string>
+  <string name="MessageNotifier_error_delivering_message">Virhe viestiä toimitettaessa.</string>
+  <string name="MessageNotifier_mark_all_as_read">Merkitse kaikki luetuiksi</string>
+  <string name="MessageNotifier_mark_as_read">Merkitse luetuksi</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_regenerating">Luodaan...</string>
+  <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_cancel">Peruuta</string>
+  <string name="ViewLocalIdentityActivity_continue">Jatka</string>
+  <!--SmsReceiver-->
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Tekstiviestin lähettäminen ei juuri nyt onnistu. Viesti lähetetään, kun kuuluvuus palautuu.</string>
+  <!--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__initiate_exchange">Aloita avaintenvaihto</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">VANHA SALASANA:</string>
+  <string name="change_passphrase_activity__new_passphrase">UUSI SALASANA:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">TOISTA UUSI SALASANA:</string>
+  <!--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>
+  <!--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_updating_directory">Päivitetään hakemistoa</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Päivitetään push-hakemistoa...</string>
+  <!--ContactSelectionListFragment-->
+  <string name="ContactSelectionlistFragment_select_for">Valitse</string>
+  <!--contact_selection_recent_activity-->
+  <string name="contact_selection_recent_activity__no_recent_calls">Ei uusia soittoja.</string>
+  <!--conversation_activity-->
+  <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_sent-->
+  <string name="conversation_item_sent__download">Lataa</string>
+  <string name="conversation_item_sent__downloading">Ladataan</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Lataa</string>
+  <string name="conversation_item_received__downloading">Ladataan</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Valitse useampi</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Ladataan maita...</string>
+  <string name="country_selection_fragment__search">Hae</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">Olkaa hyvä ja asettakaa salasana, jos haluatte salata tiedot paikallisesti.</string>
+  <string name="create_passphrase_activity__passphrase">SALASANA:</string>
+  <string name="create_passphrase_activity__repeat">TOISTA:</string>
+  <string name="create_passphrase_activity__continue">Jatka</string>
+  <string name="create_passphrase_activity__generating_secrets">SALAUKSEN LUONTI KÄYNNISSÄ</string>
+  <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__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>
+  <string name="log_submit_activity__log_submit_success_title">Onnistuimme!</string>
+  <string name="log_submit_activity__log_got_it">Ymmärrän</string>
+  <string name="log_submit_activity__your_pastebin_url">Olkaa hyvä ja kopioikaa tämä URL ja liittäkää se asiaanne (pitkä painallus tallentaa sen leikepöydälle):\n\n<b>%1$s</b></string>
+  <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>
+  <!--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__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>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Tämä voi viedä hetken. Olkaa kärsivällinen — ilmoitamme, kun tuonti on valmis.</string>
+  <string name="database_migration_activity__importing">TUONTI KÄYNNISSÄ</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Tietokantaa päivitetään...</string>
+  <string name="export_fragment__export_encrypted_backup">Vie salattu varmuuskopio</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Vie salattu varmuuskopio\nSD-muistikortille.</string>
+  <string name="export_fragment__export_plaintext_backup">Vie salaamaton varmuuskopio</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nVie salaamaton \"SMS Backup And Restore\"-yhteensopiva varmuuskopio SD-muistikortille.</string>
+  <string name="import_fragment__import_system_sms_database">Tuo järjestelmän tekstiviestit</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Tuo tietokanta\njärjestelmän oletus viestisovelluksesta.</string>
+  <string name="import_fragment__import_encrypted_backup">Tuo salattu varmuuskopio</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nTuo aiemmin viety salattu TextSecure-varmuuskopio.</string>
+  <string name="import_fragment__import_plaintext_backup">Tuo salaamaton varmuuskopio</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nTuo salaamaton varmuuskopiotiedosto. Yhteensopiva \"SMS Backup And Restore\":lla.</string>
+  <string name="local_identity__regenerate_key">Luo uusi tunnisteavain</string>
+  <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">Puhelimesi edellyttää manuaalista MMS-asetusten säätöä.</string>
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE SALASANA</string>
+  <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__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>
+  <!--receive_key_activity-->
+  <string name="receive_key_activity__complete">Valmis</string>
+  <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure voi käyttää pikaviestejä yksityisyyden kasvattamiseksi ja tekstiviestilaskujen välttämiseksi\nmuiden TextSecuren käyttäjien kanssa keskusteltaessa. Ottaaksesi tämän toiminnon käyttöön, olkaa hyvä ja varmistakaa suunta- ja puhelinnumeronne.</string>
+  <string name="registration_activity__your_country">MAA</string>
+  <string name="registration_activity__your_country_code_and_phone_number">SUUNTA- JA\nPUHELINNUMEROSI</string>
+  <string name="registration_activity__phone_number">PUHELINNUMERO</string>
+  <string name="registration_activity__register">Rekisteröidy</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Rekisteröityminen tulee siirtämään joitain hajakoodattuja yhteystietoja palvelimelle väliaikaisesti.</string>
+  <string name="registration_activity__skip">Ohita</string>
+  <!--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__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__verify">Varmenna</string>
+  <string name="registration_progress_activity__call_me">Soita minulle</string>
+  <string name="registration_progress_activity__edit_number">Muokkaa numeroa</string>
+  <string name="registration_progress_activity__connectivity_error">Yhteysvirhe.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure ei voinut yhdistää push-palveluun.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Mahdollisiin ongelmiin\nsisältyvät:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Ei verkkoyhteyttä.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Laitteesi tarvitsee verkkoyhteyden tämän TextSecuren ominaisuuden käyttämiseen. Tarkista, että se on yhdistettynä 3G- tai WiFi-verkkoon.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Rajoittava palomuuri.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nJos olet yhdistänyt WiFi-verkkoon, on mahdollista että palomuuri estää pääsyn TextSecuren palvelimelle. Kokeille toista verkkoa tai mobiiliverkkoa.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure varmistaa nyt puhelinnumerosi automaattisesti tekstiviestillä.</string>
+  <string name="registration_progress_activity__connecting">Yhdistetään...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Odotetaan vahvistustekstiviestiä...</string>
+  <string name="registration_progress_activity__registering_with_server">Rekisteröidytään palvelimelle...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Tämä voi viedä hetken. Olkaa kärsivällinen — ilmoitamme, kun vahvistus on suoritettu.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
+  <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__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>
+  <!--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>
+  <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">Tunnistenimi:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Tuotu tunniste:\\n</string>
+  <string name="verify_import_identity_activity__verified">Varmennettu!</string>
+  <string name="verify_import_identity_activity__compare">Vertaile</string>
+  <!--verify_keys_activity-->
+  <string name="verify_keys_activity__they_read_this">He lukevat tämän:</string>
+  <string name="verify_keys_activity__you_read_this">Te luette tämän:</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Luo salasana</string>
+  <string name="AndroidManifest__enter_passphrase">Syötä salasana</string>
+  <string name="AndroidManifest__select_contacts">Valitse kontaktit</string>
+  <string name="AndroidManifest__select_contact">Valitse kontakti</string>
+  <string name="AndroidManifest__textsecure_detected">TextSecure havaittu</string>
+  <string name="AndroidManifest__public_identity_key">Julkinen tunnisteavain</string>
+  <string name="AndroidManifest__change_passphrase">Vaihda salasana</string>
+  <string name="AndroidManifest__verify_session">Varmenna istunto</string>
+  <string name="AndroidManifest__verify_identity">Varmenna tunniste</string>
+  <string name="AndroidManifest__manage_identity_keys">Hallinnoi tunnisteavaimia</string>
+  <string name="AndroidManifest__complete_key_exchange">Suorita avaimenvaihto</string>
+  <string name="AndroidManifest__log_submit">Lähetä virheenkorjauslokit</string>
+  <!--arrays.xml-->
+  <string name="arrays__import_export">Tuonti / Vienti</string>
+  <string name="arrays__my_identity_key">Oma tunnisteavain</string>
+  <string name="arrays__contact_keys">Kontaktien avaimet</string>
+  <!--preferences.xml-->
+  <string name="preferences__general">Yleistä</string>
+  <string name="preferences__push_sms_category">Push- ja tekstiviestit</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__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__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__change_passphrase">Vaihda salasana</string>
+  <string name="preferences__change_my_passphrase">Vaihda salasanani</string>
+  <string name="preferences__complete_key_exchanges">Suorita avaimenvaihdot</string>
+  <string name="preferences__disable_passphrase">Poista salasana käytöstä</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Poista viestien ja avainten paikallinen salaus käytöstä</string>
+  <string name="preferences__screen_security">Näytön suojaus</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Käytä samaa tunnisteavainta suorittamaan avaimenvaihdot automaattisesti uusille istunnoille tai jo oleville istunnoille</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Poista näytön suojaus käytöstä salliaksesi kuvakaappaukset</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Unohda salasana välimuistista tietyn ajan kuluttua</string>
+  <string name="preferences__timeout_passphrase">Ajasta salasana</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Valitse ajastimen pituus</string>
+  <string name="preferences__pref_timeout_interval_title">Ajastimen pituus</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Odotusaika, ennen kuin salasana unohdetaan muistista</string>
+  <string name="preferences__identity_key_settings">Tunnisteavaimet</string>
+  <string name="preferences__view_my_identity_key">Tarkastele tunnisteavaintani</string>
+  <string name="preferences__manage_identity_keys">Hallinnoi tunnisteavaimia</string>
+  <string name="preferences__manage_configured_identity_keys">Hallinnoi säädettyjä tunnisteavaimia</string>
+  <string name="preferences__notifications">Ilmoitukset</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Näytä ilmoitukset palkissa</string>
+  <string name="preferences__led_color">LED:in väri</string>
+  <string name="preferences__pref_led_blink_title">LED:in vilkkumiskuvio</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Aseta mukautettu LED:in vilkkumiskuvio</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Päällä:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Pois päältä:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Mukautettu LED:in vilkkumiskuvio asetettu!</string>
+  <string name="preferences__sound">Ääni</string>
+  <string name="preferences__change_notification_sound">Vaihda ilmoitusääni</string>
+  <string name="preferences__inthread_notifications">Istunnonsisäiset ilmoitukset</string>
+  <string name="preferences__play_inthread_notifications">Toista ilmoitusäänet aktiivista keskustelua tarkasteltaessa.</string>
+  <string name="preferences__vibrate">Värinä</string>
+  <string name="preferences__also_vibrate_when_notified">Värinöi myös ilmoituksista</string>
+  <string name="preferences__minutes">minuuttia</string>
+  <string name="preferences__hours">tuntia</string>
+  <string name="preferences__green">Vihreä</string>
+  <string name="preferences__red">Punainen</string>
+  <string name="preferences__blue">Sininen</string>
+  <string name="preferences__orange">Oranssi</string>
+  <string name="preferences__cyan">Syaani</string>
+  <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Valkoinen</string>
+  <string name="preferences__none">Ei yhtäkään</string>
+  <string name="preferences__fast">Nopea</string>
+  <string name="preferences__normal">Normaali</string>
+  <string name="preferences__slow">Hidas</string>
+  <string name="preferences__custom">Mukautettu</string>
+  <string name="preferences__advanced">Lisäasetukset</string>
+  <string name="preferences__passphrase">Salasana</string>
+  <string name="preferences__advanced_mms_access_point_names">MMS-asetukset</string>
+  <string name="preferences__enable_manual_mms">Ota manuaalinen MMS käyttöön</string>
+  <string name="preferences__override_system_mms_settings">Korvaa järjestelmän MMS-asetukset alla olevilla tiedoilla.</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (vaadittu)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS-välityspalvelimen osoite (valinnainen)</string>
+  <string name="preferences__mms_proxy_port_optional">MMS-välityspalvelimen portti (valinnainen)</string>
+  <string name="preferences__sms_delivery_reports">SMS toimitusvarmistukset</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä varmistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Poista vanhemmat viestit automaattisesti, kun ketju ylittää määritetyn pituuden</string>
+  <string name="preferences__delete_old_messages">Poista vanhat viestit</string>
+  <string name="preferences__storage">Tallennustila</string>
+  <string name="preferences__conversation_length_limit">Keskustelun pituuden raja</string>
+  <string name="preferences__trim_all_threads_now">Rajaa kaikki viestiketjut nyt</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skannaa kaikki viestiketjut ja pakota ketjuihin pituusrajat</string>
+  <string name="preferences__light_theme">Vaalea teema</string>
+  <string name="preferences__dark_theme">Tumma teema</string>
+  <string name="preferences__appearance">Ulkonäkö</string>
+  <string name="preferences__theme">Teema</string>
+  <string name="preferences__default">Oletus</string>
+  <string name="preferences__language">Kieli</string>
+  <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__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_fallback_ask_fallback">Kysy ennen tekstiviestien lähettämistä</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>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">Valmis</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Päivitä yhteystietoluettelo</string>
+  <!--conversation_button_context-->
+  <string name="conversation_button_context__menu_send_unencrypted">Lähetä salaamattomana</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">Soita</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">Viestin tiedot</string>
+  <string name="conversation_context__menu_copy_text">Kopioi teksti</string>
+  <string name="conversation_context__menu_delete_message">Poista viesti</string>
+  <string name="conversation_context__menu_forward_message">Välitä viesti</string>
+  <string name="conversation_context__menu_resend_message">Lähetä viesti uudelleen</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">Aloita salattu istunto</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Poista valitut</string>
+  <string name="conversation_list_batch__menu_select_all">Valitse kaikki</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">Hae</string>
+  <string name="conversation_list__drawer_open">Avaa navigointivalikko</string>
+  <string name="conversation_list__drawer_close">Sulje navigointivalikko</string>
+  <!--conversation_secure_verified-->
+  <string name="conversation_secure_verified__menu_security">Turvallisuus</string>
+  <string name="conversation_secure_verified__menu_no_identity">Identiteettiä ei ole saatavilla</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Varmenna tunniste</string>
+  <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_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>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Vastaanottajalista</string>
+  <string name="conversation_group_options__delivery">Toimitus</string>
+  <string name="conversation_group_options__conversation">Keskustelu</string>
+  <string name="conversation_group_options__broadcast">Lähetä</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">Vertaile</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Skannauta vertaillaaksesi</string>
+  <string name="key_scanning__menu_scan_to_compare">Skannaa vertaillaaksesi</string>
+  <!--text_secure_locked-->
+  <string name="text_secure_locked__menu_unlock">Avaa</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Uusi viesti</string>
+  <string name="text_secure_normal__menu_new_group">Uusi ryhmä</string>
+  <string name="text_secure_normal__menu_settings">Asetukset</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Lukitse</string>
+  <string name="text_secure_normal__mark_all_as_read">Merkitse kaikki luetuiksi</string>
+  <!--verify_keys-->
+  <string name="verify_keys__menu_verified">Varmennettu</string>
+  <!--EOF-->
+</resources>