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="66"
-      android:versionName="2.0.3">
+      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>
@@ -188,10 +189,22 @@
               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/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"

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"
@@ -148,6 +157,7 @@
 		                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"
@@ -190,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/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/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 registriert...</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 fortzufahren.</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 Ihre 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 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">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>
@@ -207,66 +216,67 @@
   <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 fortzufahren und ihn anzuzeigen.</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_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__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-Ü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 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__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 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 einrichten</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,10 +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>
@@ -30,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>
@@ -76,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-->
@@ -198,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>
@@ -239,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>
@@ -302,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-->
@@ -327,6 +336,19 @@
   <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>
@@ -367,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>
@@ -382,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>
@@ -424,14 +447,13 @@
   <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>
@@ -446,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>
@@ -460,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>
@@ -474,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>
@@ -504,9 +534,9 @@
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Hace de TextSecure la aplicación SMS/MMS predeterminada para su sistema.</string>
   <string name="preferences__use_data_channel">Mensajes activos (\'push\')</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nIncremente la privacidad y evite tarifas SMS al usar el canal de datos para la comunicación con otros usuarios de TextSecure\n</string>
-  <string name="preferences__allow_sms_fallback">Permitir 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__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-->
   <!--****************************************-->
@@ -515,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-->
@@ -537,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>

res/values-fr/strings.xml

@@ -3,39 +3,44 @@
   <string name="app_name">TextSecure</string>
   <string name="yes">Oui</string>
   <string name="no">Non</string>
-  <string name="delete">Effacer</string>
+  <string name="delete">Supprimer</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Actuellement : %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Il est nécessaire d’avoir entré votre phrase de passe avant de gérer les clés…</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Vous n’avez pas encore défini de phrase de passe !</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Messages par conversation</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Supprimer tous les anciens messages maintenant ?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sur de vouloir réduire toutes les conversations aux %s messages les plus récents ?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sûr de vouloir réduire toutes les conversations aux %s messages les plus récents ?</string>
   <string name="ApplicationPreferencesActivity_delete">Supprimer</string>
   <string name="ApplicationPreferencesActivity_my">Mon</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Désactiver le chiffrement de sauvegarde ?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAttention, ceci désactivera le chiffrement de stockage pour tous les messages et toutes les clés. Vos sessions chiffrées continueront de fonctionner mais une personne ayant un accès physique à votre appareil sera en mesure d’y accéder.</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Désactiver le chiffrement du stockage ?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAttention, ceci désactivera le chiffrement de stockage pour tous les messages et toutes les clés. Vos sessions chiffrées\ncontinueront de fonctionner mais une personne ayant un accès physique à votre appareil sera\nen mesure d’y accéder.</string>
   <string name="ApplicationPreferencesActivity_disable">Désactiver</string>
   <string name="ApplicationPreferencesActivity_unregistering">Déconnexion</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Déconnexion de la communication par données</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Désactiver les messages push ?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nCeci va désactiver les messages push en vous désinscrivant du serveur. Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages push dans le futur.\n</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur distant!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Vous n’êtes pas abonné au service push…</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Mise à jour du répertoire</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Mise à jour du répertoire de push…</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Mise à jour du répertoire push…</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS entrants activés</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Appuyez pour modifier votre application SMS par défaut</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS entrants désactivés</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Appuyez pour faire de TextSecure votre application SMS par défaut</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Image</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vidéo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Taille du message : %d ko</string>
-  <string name="ConversationItem_expires_s">Expiration : %s</string>
-  <string name="ConversationItem_error_sending_message">Erreur d’envoi du message</string>
-  <string name="ConversationItem_sending">Envoi…</string>
-  <string name="ConversationItem_saving_attachment">Sauvegarder la pièce jointe</string>
-  <string name="ConversationItem_saving_attachment_to_sd_card">Enregistrement de pièce jointe sur la carte SD…</string>
+  <string name="ConversationItem_message_size_d_kb">Taille du message : %d Ko</string>
+  <string name="ConversationItem_expires_s">Expire : %s</string>
+  <string name="ConversationItem_error_sending_message">Erreur lors de l\'envoi du message</string>
+  <string name="ConversationItem_saving_attachment">Enregistrement de pièce jointe</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">Enregistrement de la pièce jointe sur la carte SD…</string>
   <string name="ConversationItem_save_to_sd_card">Enregistrer sur la carte SD ?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Ce média est stocké dans une base de données chiffrée. La version que vous sauvez sur carte SD ne sera plus chiffrée. Voulez-vous continuer ?</string>
-  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Erreur d’enregistrement de la pièce jointe sur la carte SD !</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Ce média est stocké dans une base de données chiffrée. La version que vous sauvez sur la carte SD ne sera plus chiffrée. Voulez-vous continuer ?</string>
+  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Erreur lors de l\'enregistrement de la pièce jointe sur la carte SD !</string>
   <string name="ConversationItem_success_exclamation">Réussite !</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Impossible d’écrire sur la carte SD !</string>
   <string name="ConversationItem_view_secure_media_question">Visualiser le média sécurisé ?</string>
@@ -43,27 +48,29 @@
   <string name="ConversationItem_received_and_processed_key_exchange_message">Message d’échange de clés reçu et traité.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erreur, un message d’échange de clés périmé a été reçu.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Message d’échange de clés reçu, cliquez pour le traiter.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Ai reçu un SMS en texte clair pendant que votre session sécurisée était ouverte. S\'ils n\'ont pas ouvert une session, les messages que vous envoyez apparaîtront en tant que texte illisible. Cliquez pour terminer la session.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">SMS en texte clair reçu pendant que votre session sécurisée était ouverte. S\'ils n\'ont pas une session ouverte, les messages que vous envoyez apparaîtront en tant que texte illisible. Cliquez pour terminer la session.</string>
   <string name="ConversationItem_group_action_left">%1$s a quitté le groupe.</string>
   <string name="ConversationItem_group_action_joined">%1$s ont rejoint le groupe.</string>
   <string name="ConversationItem_group_action_modify">%1$s a mis à jour le groupe.</string>
+  <string name="ConversationItem_click_to_approve">Appuyez pour utiliser la solution de repli SMS</string>
+  <string name="ConversationItem_click_to_approve_dialog_title">Utiliser solution de repli SMS ?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Initier une session sécurisée ?</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Initer une session sécurisée avec %s ?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Fin de la confirmation de session sécurisée</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Etes-vous sûr de vouloir terminer cette session sécurisée ?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Initier une session sécurisée avec %s ?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Confirmation de la fin de la session sécurisée</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Êtes-vous sûr de vouloir terminer cette session sécurisée ?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirmation de la suppression du fil</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Êtes-vous sûr de vouloir supprimer définitivement cette conversation ?</string>
   <string name="ConversationActivity_add_attachment">Ajouter une pièce jointe</string>
-  <string name="ConversationActivity_select_contact_info">Sélectionner des informations de contact</string>
-  <string name="ConversationActivity_compose_message">Rédiger le message</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Désolé, il y a eu une erreur en ajoutant votre pièce jointe.</string>
+  <string name="ConversationActivity_select_contact_info">Sélectionner les informations du contact</string>
+  <string name="ConversationActivity_compose_message">Rédiger un message</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Désolé, il y a eu une erreur lors de l\'ajout de votre pièce jointe.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Désolé, la vidéo sélectionnée dépasse les restrictions de taille du message.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Désolé, le fichier audio sélectionné dépasse les restrictions de taille du message.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse SMS ou e-mail valide !</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Le message est vide !</string>
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
-  <string name="ConversationActivity_group_conversation_recipients">Destinataires Conversation de Groupe</string>
+  <string name="ConversationActivity_group_conversation_recipients">Destinataires de la Conversation de Groupe</string>
   <string name="ConversationActivity_group_conversation">Conversation de Groupe</string>
   <string name="ConversationActivity_unnamed_group">Groupe sans nom</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membres</string>
@@ -76,70 +83,70 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Êtes-vous sûr de vouloir quitter ce groupe ?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Détails du message</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Expéditeur : %1$s\nTransport : %2$s\nEnvoyé / Reçu : %3$s</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transport : %1$s\nEnvoyé / Reçu : %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Expéditeur : %1$s\nTransport : %2$s\nEnvoyé : %3$s\nReçu : %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmer la suppression du message</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Êtes-vous sûr de vouloir supprimer définitivement ce message ?</string>
   <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Message d’échange de clés…</string>
+  <string name="ConversationListAdapter_key_exchange_message">Message d’échange des clés…</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Supprimer les fils ?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Êtes-vous sûr de vouloir supprimer TOUS les fils de discussion sélectionnés ?</string>
   <string name="ConversationListFragment_deleting">Suppression</string>
   <string name="ConversationListFragment_deleting_selected_threads">Suppression des fils sélectionnés…</string>
   <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Message d’échange de clés…</string>
+  <string name="ConversationListItem_key_exchange_message">Message d’échange des clés…</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exporter vers la carte SD ?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ceci ⏎\nexportera vos clés chiffrées, les paramètres et les messages sur la carte SD.</string>
   <string name="ExportFragment_export">Exporter</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exporter le contenu en clair sur ​​la carte SD?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attention, ceci ⏎\nexportera le contenu en clair de vos messages TextSecure sur la carte SD. ⏎</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attention, ceci\nexportera le contenu de vos messages TextSecure en clair sur la carte SD.</string>
   <string name="ExportFragment_cancel">Annuler</string>
-  <string name="ExportFragment_exporting">Exporter</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportation du contenu en clair sur la carte SD.</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Impossible d’écrire sur la carte SD !</string>
+  <string name="ExportFragment_exporting">Exportation</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportation du contenu en clair sur la carte SD...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Erreur, impossible d’écrire sur la carte SD !</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Erreur lors de l\'écriture sur la carte SD !</string>
   <string name="ExportFragment_success">Réussite !</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportation des Clés cryptées, ⏎\nparamètres et messages ... ⏎</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportation des clés chiffrées, \nparamètres et messages ... </string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nouveau groupe</string>
-  <string name="GroupCreateActivity_actionbar_update_title">Modifier le Groupe</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Mettre à jour le Groupe</string>
   <string name="GroupCreateActivity_group_name_hint">Nom du groupe</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nouveau groupe MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Vous avez sélectionné un contact qui ne supporte pas les groupes TextSecure, ce groupe sera donc converti en groupe MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Vous n\'êtes pas enregistré pour utiliser la transmission de données, les groupes TextSecure sont donc désactivés.</string>
   <string name="GroupCreateActivity_you_dont_own_this_group">Vous n’êtes pas le propriétaire de ce groupe, et ne pouvez donc pas modifier son titre ou son image.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">Une erreur inattendue s\'est produite et a empêché la création du groupe.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Une erreur inattendue s\'est produite, ce qui a empêché la création du groupe.</string>
   <string name="GroupCreateActivity_contacts_no_members">Il vous faut au moins une personne dans votre groupe !</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Un des membres de votre groupe a un numéro illisible. Veuillez corriger ou enlever ce contact et essayer à nouveau.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Un des membres de votre groupe a un numéro illisible. Veuillez réparer ou enlever ce contact et essayer à nouveau.</string>
   <string name="GroupCreateActivity_file_io_exception">Erreur de fichier I/O, impossible de créer un fichier image temporaire.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar du groupe</string>
-  <string name="GroupCreateActivity_menu_create_title">Nouveau groupe</string>
+  <string name="GroupCreateActivity_menu_create_title">Créer le groupe</string>
   <string name="GroupCreateActivity_creating_group">Création de %1$s en cours…</string>
   <!--ImportFragment-->
-  <string name="ImportFragment_import_system_sms_database">Importer base de données SMS du système?</string>
+  <string name="ImportFragment_import_system_sms_database">Importer la base de données SMS du système ?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Cela importera ⏎\nles messages à partir de la base de données SMS par défaut du système vers TextSecure. Si vous avez déjà ⏎\nimporté la base de données SMS du système, l\'importer à nouveau se traduira par des messages dupliqués. ⏎</string>
   <string name="ImportFragment_import">Importer</string>
   <string name="ImportFragment_cancel">Annuler</string>
-  <string name="ImportFragment_restore_encrypted_backup">Restaurer la sauvegarde cryptée?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">La restauration d\'une sauvegarde cryptée va remplacer complètement vos clés existantes, les préférences et ⏎\nles messages. Vous perdrez toutes les informations qui se trouvent dans votre installation TextSecure actuelle mais pas ⏎\ndans la sauvegarde. ⏎</string>
+  <string name="ImportFragment_restore_encrypted_backup">Restaurer la sauvegarde chiffrée?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">La restauration d\'une sauvegarde chiffrée va remplacer complètement vos clés existantes, les préférences et ⏎\nles messages. Vous perdrez toutes les informations qui se trouvent dans votre installation TextSecure actuelle mais pas ⏎\ndans la sauvegarde. ⏎</string>
   <string name="ImportFragment_restore">Restaurer</string>
   <string name="ImportFragment_import_plaintext_backup">Importer la sauvegarde du contenu en clair ?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Cela importera\nles messages provenant d\'une sauvegarde en clair. Si vous avez déjà importé la base de données SMS du système,\nimporter à nouveau se traduira par des messages dupliqués.</string>
-  <string name="ImportFragment_importing">Importer</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Cela importera\nles messages provenant d\'une sauvegarde en clair. Si vous avez déjà importé la base de données SMS du système,\nl\'importer à nouveau se traduira par des messages dupliqués.</string>
+  <string name="ImportFragment_importing">Importation</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importer la sauvegarde en texte clair ...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Aucune sauvegarde en texte clair trouvée !</string>
-  <string name="ImportFragment_error_importing_backup">Erreur d\'importation de la sauvegarde!</string>
-  <string name="ImportFragment_import_complete">Importation Complète !</string>
+  <string name="ImportFragment_error_importing_backup">Erreur lors de l\'importation de la sauvegarde !</string>
+  <string name="ImportFragment_import_complete">Importation terminée !</string>
   <string name="ImportFragment_restoring">Restauration</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Restauration d\'une sauvegarde cryptée ...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Aucune sauvegarde cryptée trouvé!</string>
-  <string name="ImportFragment_restore_complete">Restauration complète !</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Restauration de la sauvegarde chiffrée...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Aucune sauvegarde chiffrée trouvée!</string>
+  <string name="ImportFragment_restore_complete">Restauration terminée !</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Aucune clé scannée n’a été trouvée !</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Pas de connexion disponible pour le téléchargement MMS, essayez de nouveau plus tard…</string>
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Pas de connexion disponible pour le téléchargement MMS, réessayez plus tard…</string>
   <string name="MmsDownloader_error_storing_mms">Erreur d’enregistrement du MMS !</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erreur de connexion au fournisseur MMS…</string>
   <string name="MmsDownloader_error_reading_mms_settings">Erreur de lecture des paramètres de fournisseur d’accès MMS…</string>
@@ -154,40 +161,40 @@
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Phrase de passe incorrecte !</string>
   <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Vous devez indiquer une URL MMSC de votre opérateur.</string>
+  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Vous devez indiquer une URL MMSC pour votre opérateur.</string>
   <string name="PromptMmsActivity_mms_settings_updated">Paramètres MMS mis à jour</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vous pouvez modifier ces valeurs depuis le menu des paramètres de TextSecure à tout moment.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La\nsignature de cet échange de clé est différente de celle que vous avez précédemment reçue de ce\ncontact. Cela peut signifier soit que quelqu’un essaie d’intercepter votre communication, soit\nque ce contact a simplement réinstallé TextSecure et a maintenant une nouvelle clé d’identité.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Peut-être devriez-vous\nvérifier ce contact.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La\nsignature de cet échange de clé est différente de celle que vous avez précédemment reçue de ce\ncontact. Cela peut signifier que quelqu’un essaie d’intercepter votre communication ou\nque ce contact a simplement réinstallé TextSecure et possède maintenant une nouvelle clé d’identité.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Vous devriez\nvérifier ce contact.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">La\nsignature de cet échange de clé est digne de confiance, mais vous avez le paramètre\n« finaliser automatiquement les échanges de clés » désactivé.</string>
-  <string name="ReceiveKeyActivity_processing">En traitement</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">L\'échange de clés est en traitement...</string>
+  <string name="ReceiveKeyActivity_processing">Traitement</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Traitement de l\'échange de clés...</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">Se connecter à travers TextSecure</string>
+  <string name="RegistrationActivity_connect_with_textsecure">Se connecter avec TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Sélectionnez votre pays</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Vous devez indiquer votre \ncode de pays</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Vous devez introduire\nvotre numéro de téléphone</string>
   <string name="RegistrationActivity_invalid_number">Numéro non valide</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Le numéro que vous avez\nintroduit (%s) n\'est pas valable.</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Le numéro que vous avez\nintroduit (%s) n\'est pas valide.</string>
   <string name="RegistrationActivity_unsupported">Incompatible</string>
   <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Désolé,\ncet appareil n\'est pas pris en charge pour la messagerie par données. Les appareils dont la version d\'Android est plus ancienne\nque 4.0 doivent être enregistrés avec un compte Google. Les appareils sous Android 4.0 ou plus récent n\'ont pas\nbesoin d\'un compte Google, mais requièrent l\'application Play Store.</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nNous allons maintenant vérifier que le numéro qui suit est associé à cet appareil:\n\n%s\n\n\nEst-ce que ce numéro est correct, ou aimeriez-vous le changer avant de continuer?\n</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nNous allons maintenant vérifier que le numéro qui suit est associé à cet appareil:\n\n%s\n\n\nEst-ce que ce numéro est correct, ou aimeriez-vous le modifier avant de continuer?\n</string>
   <string name="RegistrationActivity_continue">Continuer</string>
-  <string name="RegistrationActivity_edit">Editer</string>
+  <string name="RegistrationActivity_edit">Modifier</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Problèmes Possibles</string>
   <!--RegistrationProgressActivity-->
   <string name="RegistrationProgressActivity_verifying_number">Vérification du numéro</string>
-  <string name="RegistrationProgressActivity_edit_s">Editer %s</string>
+  <string name="RegistrationProgressActivity_edit_s">Modifier %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Enregistrement terminé!</string>
   <string name="RegistrationProgressActivity_possible_problems">Problèmes possibles.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Vous devez d\'abord introduire le code que vous avez reçu...</string>
   <string name="RegistrationProgressActivity_connecting">Connexion</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Connexion pour vérification...</string>
   <string name="RegistrationProgressActivity_network_error">Erreur de réseau!</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Impossible d\'effectuer la connexion. Merci de vérifier votre connexion réseau, et de réessayer.</string>
-  <string name="RegistrationProgressActivity_verification_failed">Echec de la vérification !</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Impossible de se connecter. Merci de vérifier votre connexion réseau et de réessayer.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Échec de la vérification !</string>
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Le code de vérification que vous avez introduit est erroné. Veuillez réessayer.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Trop de tentatives</string>
   <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Vous avez introduit un code de vérification incorrect trop de fois. Merci de patienter une minute avant de réessayer.</string>
@@ -196,18 +203,20 @@
   <string name="RegistrationProgressActivity_server_error">Erreur du serveur distant</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Une erreur est survenue sur le serveur distant. Merci de réessayer</string>
   <string name="RegistrationProgressActivity_too_many_requests">Trop De Demandes !</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Vous avez déjà demandé un appel vocal. Vous pouvez en demander un autre dans 20 minutes.</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Vous avez déjà demandé récemment un appel vocal. Vous pouvez en demander un autre dans 20 minutes.</string>
   <string name="RegistrationProgressActivity_verifying_voice_code">Vérification du code voix...</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Conflit d’inscription</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Ce numéro est déjà inscrit sur un autre serveur TextSecure (CyanogenMod ?). Vous devez vous désinscrire de celui-ci avant de vous inscrire ici.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Inscription Terminée</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">L\'inscription de TextSecure s\'est achevée avec succès.</string>
   <string name="RegistrationService_registration_error">Erreur d\'Inscription</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">L\'enregistrement de TextSecure a rencontré un problème</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">L\'enregistrement de TextSecure a rencontré un problème.</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Une clé corrompue a été reçue\nMessage d\'échange!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nRéception d\'un message d\'échange de clés pour une version invalide du protocole.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nUn message avec une clé de cryptage inconnue a été reçu. Cliquer pour l\'accepter et l\'afficher.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Ai reçu de nouvelles informations d\'identité, mais celles-ci sont inconnues. Tapez pour valider l\'identité.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nUn message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'accepter et l\'afficher.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Nouvelle information d\'identité mise à jour mais inconnue reçue. Appuyez pour valider l\'identité.</string>
   <string name="SmsMessageRecord_secure_session_ended">La session sécurisée s’est terminée.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Groupe quitté…</string>
@@ -218,15 +227,15 @@
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Le destinataire n’a pas de clé d’identité !</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Analyser leur clé pour comparer</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Analyser mes clés</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ATTENTION, les clés scannées sont DIFFÉRENTES. Veuillez vérifier scrupuleusement le texte de l\'empreinte.</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ATTENTION, la clé analysée NE correspond PAS ! Veuillez vérifier scrupuleusement le texte de l\'empreinte.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NON vérifié !</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Leur clé est correcte. Il est aussi nécessaire de vérifier votre clé avec la leur</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Leur clé est valide. Il est aussi nécessaire de vérifier votre clé avec eux.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Vérifié !</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Vous n’avez aucune clé d’identité !</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Vous n’avez pas de clé d’identité.</string>
   <!--VerifyKeysActivity-->
   <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Analyser mon empreinte</string>
   <string name="VerifyKeysActivity_scan_their_fingerprint">Analyser leur empreinte</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATTENTION : les clés analysées ne correspondent PAS ! Veuillez vérifier scrupuleusement  le texte de l\'empreinte.</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATTENTION : la clé analysée NE correspond PAS ! Veuillez vérifier scrupuleusement  le texte de l\'empreinte.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">NON vérifié !</string>
   <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Leur clé est valide. Il est aussi nécessaire d\'analyser votre empreinte.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Vérifié !</string>
@@ -234,41 +243,42 @@
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Vous n’avez pas de clé d’identité.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Analyser pour comparer</string>
   <string name="ViewIdentityActivity_get_scanned_to_compare">Être analysé pour comparer</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ATTENTION, les clés analysées ne correspondent PAS !</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ATTENTION, la clé analysée ne correspond PAS !</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NON vérifié !</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Les clés analysées correspondent !</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">La clé analysée correspond !</string>
   <string name="ViewIdentityActivity_verified_exclamation">Vérifié !</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Empreinte d’identité</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Mon Empreinte d\'Identité</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initier malgré la demande existante ?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Vous avez déjà envoyé une demande d’initiation de session à ce destinataire, êtes-vous sûr de vouloir en envoyer une autre ? Cela invalidera la première demande.</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Vous avez déjà envoyé une demande d’initiation de session à ce destinataire, êtes-vous sûr de vouloir en envoyer une autre ? Ceci invalidera la première demande.</string>
   <string name="KeyExchangeInitiator_send">Envoyer</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Message mal chiffré…</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Déchiffrage, veuillez patienter…</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Déchiffrement, veuillez patienter…</string>
   <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Message chiffré pour une session non-existante…</string>
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Connexion au serveur MMS…</string>
   <string name="MmsDatabase_downloading_mms">Téléchargement du MMS…</string>
-  <string name="MmsDatabase_mms_download_failed">Échec de téléchargement du MMS !</string>
-  <string name="MmsDatabase_downloading">Téléchargement</string>
-  <string name="MmsDatabase_mms_pending_download">Configurez les paramètres MMS pour continuer le téléchargement.</string>
+  <string name="MmsDatabase_mms_download_failed">Échec du téléchargement du MMS !</string>
+  <string name="MmsDatabase_downloading">Téléchargement...</string>
+  <string name="MmsDatabase_mms_pending_download">Appuyez et configurez les paramètres MMS pour continuer le téléchargement.</string>
   <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">Déchiffrage du MMS, veuillez patienter…</string>
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Déchiffrement du MMS, veuillez patienter…</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Message MMS mal chiffré…</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Message MMS chiffré pour une session non-existante…</string>
   <!--MmsSender-->
   <string name="MmsSender_currently_unable_to_send_your_mms_message">Impossible d’envoyer votre message MMS actuellement.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importation en cours</string>
-  <string name="ApplicationMigrationService_importing_text_messages">Importation des Messages Texte</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Importation des Messages Textes</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">Touchez pour ouvrir.</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Touchez pour ouvrir, ou touchez le cadenas pour fermer.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure est déverrouillé</string>
   <string name="KeyCachingService_lock">Verrouiller avec la phrase de passe</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages">(%d) Nouveaux messages</string>
+  <string name="MessageNotifier_d_new_messages">%d nouveaux messages</string>
   <string name="MessageNotifier_most_recent_from_s">Dernier de : %s</string>
   <string name="MessageNotifier_encrypted_message">Message chiffré…</string>
   <string name="MessageNotifier_no_subject">(Pas de sujet)</string>
@@ -286,11 +296,11 @@
   <string name="ViewLocalIdentityActivity_cancel">Annuler</string>
   <string name="ViewLocalIdentityActivity_continue">Continuer</string>
   <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Impossible d’envoyer votre message SMS pour le moment. Il sera envoyé  lorsque le service deviendra disponible.</string>
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Impossible d’envoyer votre message SMS pour le moment. Il sera envoyé lorsque le service deviendra disponible.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Désolé, la Réponse Rapide n’est pas encore supportée par 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">Vous avez reçu un message de quelqu\'un qui utilise les sessions chiffrées TextSecure. Voulez vous commencer une session chiffrée avec lui?</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">Vous avez reçu un message de quelqu\'un qui supporte les sessions chiffrées TextSecure. Voulez vous commencer une session chiffrée avec lui?</string>
   <string name="auto_initiate_activity__initiate_exchange">Commencer l\'échange</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Ancienne phrase de passe :</string>
@@ -302,6 +312,9 @@
   <string name="contact_selection_group_activity__finding_contacts">Recherche des contacts en cours...</string>
   <!--single_contact_selection_activity-->
   <string name="single_contact_selection_group_activity__filter">Taper un nom à filtrer...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Vous n’êtes pas abonné au service push…</string>
+  <string name="SingleContactSelectionActivity_updating_directory">Mise à jour du répertoire</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Mise à jour du répertoire push…</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Sélectionner pour</string>
   <!--contact_selection_recent_activity-->
@@ -327,25 +340,38 @@
   <string name="create_passphrase_activity__repeat">Répétez :</string>
   <string name="create_passphrase_activity__continue">Continuer</string>
   <string name="create_passphrase_activity__generating_secrets">GÉNÉRATION DE CLÉS SECRÈTES</string>
+  <string name="create_passphrase_activity__skip">Passer</string>
+  <string name="create_passphrase_activity__create">Créer</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">Ce rapport sera posté en ligne publiquement afin d’être vu par les contributeurs de TextSecure. Vous êtes libre d’examiner ou de modifier les rapports ci-dessous avant d’appuyer sur envoyer.</string>
+  <string name="log_submit_activity__button_cancel">Ne pas envoyer</string>
+  <string name="log_submit_activity__button_ok">Envoyer</string>
+  <string name="log_submit_activity__log_fetch_failed">TextSecure n\'a pas pu obtenir les logs de votre téléphone. Vous pouvez utiliser ADB pour récupérer les logs de debug.</string>
+  <string name="log_submit_activity__log_submit_success_title">Réussite !</string>
+  <string name="log_submit_activity__log_got_it">J’ai compris</string>
+  <string name="log_submit_activity__your_pastebin_url">Veuillez copier cette URL et l’ajouter à votre rapport (appui long pour mettre dans le presse-papiers) :\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__copied_to_clipboard">Copié dans le presse-papier</string>
+  <string name="log_submit_activity__loading_logcat">Chargement de logcat…</string>
+  <string name="log_submit_activity__thanks">Merci pour votre aide !</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Voulez-vous importer vos messages texte existant dans la base de données chiffrée de TextSecure ?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de donnée par défaut du système ne sera en aucune façon modifiée ou altérée.</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Voulez-vous importer vos messages textes existant dans la base de données chiffrée de TextSecure ?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de données par défaut du système ne sera en aucune façon modifiée ou altérée.</string>
   <string name="database_migration_activity__skip">Passer</string>
   <string name="database_migration_activity__import">Importer</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Cela peut prendre un moment. Merci d’être patient, nous vous préviendrons quand l’importation sera achevée.</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Cela peut prendre un moment. Merci d’être patient, nous vous préviendrons lorsque l’importation sera achevée.</string>
   <string name="database_migration_activity__importing">IMPORTATION</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Mise à jour de la base de données…</string>
-  <string name="export_fragment__export_encrypted_backup">Exporter une sauvegarde cryptée</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporter une sauvegarde cryptée</string>
+  <string name="export_fragment__export_encrypted_backup">Exporter une sauvegarde chiffrée</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporter une sauvegarde \nchiffrée sur la carte SD.</string>
   <string name="export_fragment__export_plaintext_backup">Exporter une sauvegarde en texte clair</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporter une sauvegarde en texte clair compatible avec «smsbackup et restaurer» sur la carte SD.</string>
-  <string name="import_fragment__import_system_sms_database">Copier la base de données SMS du système ?</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importer la base de données depuis l\'application SMS par défaut</string>
-  <string name="import_fragment__import_encrypted_backup">Importer la sauvegarde cryptée</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Restaurer une sauvegarde cryptée TextSecure précédemment exporté. ⏎</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporter une sauvegarde en texte clair compatible avec «SMS Backup And Restore» sur la carte SD.</string>
+  <string name="import_fragment__import_system_sms_database">Importer base de données SMS du système?</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importer la base de données\ndepuis l\'application SMS par défaut.</string>
+  <string name="import_fragment__import_encrypted_backup">Importer la sauvegarde chiffrée</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nRestaurer une sauvegarde TextSecure chiffrée précédemment exportée.</string>
   <string name="import_fragment__import_plaintext_backup">Importer une sauvegarde en texte clair</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">Importer un fichier de sauvegarde en texte clair. Compatible avec</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImporter un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup And Restore».</string>
   <string name="local_identity__regenerate_key">Renouveler la clé</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Des paramètres MMS manuels sont nécessaires pour votre téléphone.</string>
@@ -361,12 +387,13 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Compléter</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure peut utiliser les messages instantanés pour augmenter la discrétion et éviter des frais de SMS lors de communications avec d’autres\nutilisateurs de TextSecure. Pour activer cette fonctionnalité, veuillez procéder à la vérification de l’indicatif de votre pays et votre numéro de téléphone.</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure peut utiliser les messages instantanés pour augmenter la confidentialité et éviter des frais de SMS lors de communications avec d’autres\nutilisateurs de TextSecure. Pour activer cette fonctionnalité, veuillez procéder à la vérification de l’indicatif de votre pays et votre numéro de téléphone.</string>
   <string name="registration_activity__your_country">VOTRE PAYS</string>
-  <string name="registration_activity__your_country_code_and_phone_number">VOTRE CODE PAYS ET\nVOTRE NUMERO DE TELEPHONE</string>
-  <string name="registration_activity__phone_number">NUMERO DE TELEPHONE</string>
+  <string name="registration_activity__your_country_code_and_phone_number">VOTRE CODE PAYS ET\nVOTRE NUMÉRO DE TÉLÉPHONE</string>
+  <string name="registration_activity__phone_number">NUMÉRO DE TÉLÉPHONE</string>
   <string name="registration_activity__register">S\'enregistrer</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">L\'enregistrement transmettra des informations de contact au serveur bientôt.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">L\'enregistrement transmettra temporairement des informations de contact au serveur.</string>
+  <string name="registration_activity__skip">Passer</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Certains des problèmes possibles\nsont:</string>
   <string name="registration_problems__sms_interceptors">Intercepteurs de SMS</string>
@@ -377,30 +404,30 @@
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure ne peut pas fonctionner avec des numéros Google Voice.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Vérification vocale</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure peut aussi vous appeler pour vérifier votre numéro. Après avoir cliqué \"Appelez-Moi\",\nentrez ci-dessous le code à six chiffres que vous entendrez.</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure peut aussi vous appeler pour vérifier votre numéro. Après avoir appuyé sur \'Appelez-Moi\',\nentrez ci-dessous le code à six chiffres que vous entendrez.</string>
   <string name="registration_progress_activity__verify">Vérifier</string>
   <string name="registration_progress_activity__call_me">Appelez-Moi</string>
   <string name="registration_progress_activity__edit_number">Modifier le numéro</string>
   <string name="registration_progress_activity__connectivity_error">Erreur de connectivité.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure a été incapable de se connecter au service push.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure n\'a pas pu se connecter au service push.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Certains des problèmes\npossibles sont:</string>
-  <string name="registration_progress_activity__no_network_connectivity">Pas de connection\nau réseau.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Votre\nappareil a besoin d\'une connection à un réseau de données pour utiliser cette fonction de TextSecure. Assurez-vous\nqu\'il est connecté à la 3G ou au WiFi.</string>
-  <string name="registration_progress_activity__restrictive_firewall">Parre-feu restrictif.</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nSi vous êtes connecté par WiFi, il est possible qu\'il y ait un pare-feu qui bloque l\'accès\nau serveur distant TextSecure. Essayez un autre réseau, ou les données mobiles.</string>
+  <string name="registration_progress_activity__no_network_connectivity">Pas de connexion\nau réseau.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Votre\nappareil a besoin d\'une connexion à un réseau de données pour utiliser cette fonction de TextSecure.\nAssurez-vous\nqu\'il est connecté à la 3G ou au Wifi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Pare-feu restrictif.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nSi vous êtes connecté par Wifi, il est possible qu\'il y ait un pare-feu qui bloque l\'accès au\nserveur distant TextSecure. Essayez un autre réseau, ou les données mobiles.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure va maintenant automatiquement vérifier votre numéro par un SMS de confirmation.</string>
   <string name="registration_progress_activity__connecting">Connexion...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Attente du SMS\nvérification...</string>
   <string name="registration_progress_activity__registering_with_server">Enregistrement sur le serveur distant...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Ceci\npourrait prendre un moment. Merci d\'être patient, nous vous dirons quand la vérification s\'est achevée.</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nLa connection de TextSecure s\'est interrompue en attendant un SMS de vérification.</string>
-  <string name="registration_progress_activity__sms_verification_failed">Echec de la vérification\npar SMS.</string>
-  <string name="registration_progress_activity__generating_keys">Création des clés de cryptage...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Ceci pourrait prendre un instant.\nMerci d\'être patient, nous vous préviendrons lorsque la vérification sera terminée.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nLa connexion de TextSecure s\'est interrompue en attendant un SMS de vérification.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Échec de la vérification\npar SMS.</string>
+  <string name="registration_progress_activity__generating_keys">Création des clés...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">À</string>
   <string name="recipients_panel__add_member">Ajouter un membre</string>
   <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Vous n\'avez pour l’instant pas de clé d\'identité dans votre base de données de confiance.</string>
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Vous n\'avez pour l’instant  aucune clé d\'identité dans votre base de données de confiance.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Leur identité (ce qu\'ils lisent) :</string>
   <string name="verify_identity_activity__your_identity_you_read">Votre identité (ce que vous lisez) :</string>
@@ -424,34 +451,38 @@
   <string name="AndroidManifest__verify_identity">Vérifier l’identité</string>
   <string name="AndroidManifest__manage_identity_keys">Gérer les clés d\'identité</string>
   <string name="AndroidManifest__complete_key_exchange">Finaliser l\'échange de clés</string>
+  <string name="AndroidManifest__log_submit">Envoyer les Rapports de Débogage</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / Exporter</string>
-  <string name="arrays__my_identity_key">Ma clé d\'identité</string>
+  <string name="arrays__my_identity_key">Ma Clé d\'Identité</string>
   <string name="arrays__contact_keys">Clés du contact</string>
   <!--preferences.xml-->
   <string name="preferences__general">Général</string>
-  <string name="preferences__pref_all_sms_title">Utiliser pour tous les SMS</string>
-  <string name="preferences__pref_all_mms_title">Utiliser pour tous les MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour consulter et stocker tous les messages texte entrant ?</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour consulter et stocker tous les messages multimédia entrant ?</string>
+  <string name="preferences__push_sms_category">Push et SMS</string>
+  <string name="preferences__pref_all_sms_title">Recevoir tous les SMS</string>
+  <string name="preferences__pref_all_mms_title">Recevoir tous les MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour consulter et stocker tous les messages textes entrants</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour consulter et stocker tous les messages multimédia entrants</string>
   <string name="preferences__enable_enter_key_title">Activer la touche Entrée</string>
   <string name="preferences__replace_smiley_with_enter_key">Remplacer la touche émoticône par une touche Entrée</string>
   <string name="preferences__pref_enter_sends_title">La touche Entrée envoie</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">La touche entrée enverra les messages texte</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Presser la touche entrée enverra les messages textes</string>
   <string name="preferences__display_settings">Paramètres d\'affichage</string>
   <string name="preferences__choose_identity">Choisir une identité</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Choisissez votre entrée de contact dans le répertoire</string>
   <string name="preferences__change_passphrase">Modifier la phrase de passe</string>
-  <string name="preferences__change_my_passphrase">Modifier mon mot de passe</string>
+  <string name="preferences__change_my_passphrase">Modifier ma phrase de passe</string>
   <string name="preferences__complete_key_exchanges">Finaliser l’échange de clés</string>
   <string name="preferences__disable_passphrase">Désactiver la phrase de passe</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Désactiver le chiffrement local des messages et des clés</string>
-  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Finaliser automatiquement les échanges de clés pour les sessions, nouvelles ou existantes, avec la même clé d\'identité.</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Oublier le mot de passe en mémoire après une certaine durée</string>
+  <string name="preferences__screen_security">Sécurité d’écran</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Finaliser automatiquement les échanges de clés pour les sessions, nouvelles ou existantes  avec la même clé d\'identité.</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Désactiver la sécurité d’écran pour autoriser les captures d’écran</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Oublier la phrase de passe en mémoire après une certaine durée</string>
   <string name="preferences__timeout_passphrase">Expiration du mot de passe</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Choisir la durée de validité du mot de passe</string>
-  <string name="preferences__pref_timeout_interval_title">Durée d\'expiration</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Durée avant d’oublier le mot de passe en mémoire</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Choisir la durée de validité de la phrase de passe</string>
+  <string name="preferences__pref_timeout_interval_title">Délai d\'expiration</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Délai avant l\'oubli de la phrase de passe en mémoire</string>
   <string name="preferences__identity_key_settings">Clés d’identité</string>
   <string name="preferences__view_my_identity_key">Afficher ma clé d\'identité</string>
   <string name="preferences__manage_identity_keys">Gérer les clés d’identité</string>
@@ -460,6 +491,10 @@
   <string name="preferences__display_message_notifications_in_status_bar">Afficher les notifications dans la barre de statut</string>
   <string name="preferences__led_color">Couleur de la LED</string>
   <string name="preferences__pref_led_blink_title">Rythme de clignotement de la LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Définir un rythme de clignotement de la LED personnalisé</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Allumée Pendant :</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Éteinte pendant :</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Rythme de clignotement de la LED personnalisé défini !</string>
   <string name="preferences__sound">Son</string>
   <string name="preferences__change_notification_sound">Modifier le son de notification</string>
   <string name="preferences__inthread_notifications">Notifications dans la discussion</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">Blanc</string>
+  <string name="preferences__none">Aucun</string>
   <string name="preferences__fast">Rapide</string>
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Lent</string>
@@ -482,31 +519,38 @@
   <string name="preferences__passphrase">Phrase de passe</string>
   <string name="preferences__advanced_mms_access_point_names">Préférences MMS</string>
   <string name="preferences__enable_manual_mms">Activer les MMS manuels</string>
-  <string name="preferences__override_system_mms_settings">Outrepasser les paramètres MMS du système avec les informations ci-dessous.</string>
+  <string name="preferences__override_system_mms_settings">Remplacer les paramètres MMS du système avec les informations ci-dessous.</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Obligatoire)</string>
   <string name="preferences__mms_proxy_host_optional">Hôte Proxy MMS (Optionnel)</string>
   <string name="preferences__mms_proxy_port_optional">Port Proxy MMS (Optionnel)</string>
   <string name="preferences__sms_delivery_reports">Accusés de réception SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatiquement les anciens messages lorsque la conversation dépasse un certaine taille d\'échange.</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatiquement les anciens messages lorsque la conversation dépasse un certaine taille.</string>
   <string name="preferences__delete_old_messages">Supprimer les anciens messages</string>
   <string name="preferences__storage">Stockage</string>
-  <string name="preferences__conversation_length_limit">Limite de taille de conversation</string>
+  <string name="preferences__conversation_length_limit">Limite de taille de la conversation</string>
   <string name="preferences__trim_all_threads_now">Réduire toutes les conversations maintenant</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Chercher à travers toutes les conversations et appliquer la limite de taille de conversation</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Parcourir toutes les conversations et appliquer la limite de taille de conversation</string>
   <string name="preferences__light_theme">Thème Clair</string>
-  <string name="preferences__dark_theme">Thème Foncé</string>
+  <string name="preferences__dark_theme">Thème Sombre</string>
   <string name="preferences__appearance">Apparence</string>
   <string name="preferences__theme">Thème</string>
   <string name="preferences__default">Par défaut</string>
   <string name="preferences__language">Langue</string>
-  <string name="preferences__make_default_sms_app">Régler comme app SMS par défaut</string>
+  <string name="preferences__make_default_sms_app">Définir comme application SMS par défaut</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Faire de TextSecure l’application SMS/MMS par défaut de votre système.</string>
-  <string name="preferences__use_data_channel">Pousser les messages</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAugmenter la discrétion et éviter les frais de SMS en utilisant le canal de données pour les communications avec d’autres utilisateurs de TextSecure</string>
-  <string name="preferences__allow_sms_fallback">Autoriser solution de repli SMS</string>
-  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Envoyer et recevoir des SMS quand push n\'est pas disponible</string>
-  <string name="preferences__refresh_push_directory">Actualiser le Répertoire de Push</string>
+  <string name="preferences__use_data_channel">Messages PUSH</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAugmenter la confidentialité et éviter les frais de SMS en utilisant le canal de données pour les communications avec d’autres utilisateurs de TextSecure</string>
+  <string name="preferences__allow_sms_fallback">Autoriser les SMS sortants à </string>
+  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure est actuellement votre application SMS par défaut. Veuillez d’abord définir une autre application SMS par défaut pour changer cette préférence.</string>
+  <string name="preferences__refresh_push_directory">Actualiser le Répertoire Push</string>
+  <string name="preferences__submit_debug_log">Envoyer un rapport de débogage</string>
+  <string name="preferences__sms_outgoing_push_users">Utilisateurs de TextSecure</string>
+  <string name="preferences__sms_fallback_push_users_ask">(demander d\'abord)</string>
+  <string name="preferences__sms_outgoing_push_users_description">Envoyer des SMS sécurisés si aucune connexion de données n\'est disponible</string>
+  <string name="preferences__sms_fallback_ask_fallback">Demander avant d\'envoyer des SMS</string>
+  <string name="preferences__sms_fallback_non_push_users">Utilisateurs sans TextSecure</string>
+  <string name="preferences__sms_fallback_nobody">Personne</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -515,6 +559,8 @@
   <string name="contact_selection_list__menu_unselect_all">Désélectionner tout</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Terminé</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Rafraîchir la liste des contacts</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Envoyer en clair</string>
   <!--conversation_callable-->
@@ -524,7 +570,7 @@
   <string name="conversation_context__menu_copy_text">Copier le texte</string>
   <string name="conversation_context__menu_delete_message">Supprimer le message</string>
   <string name="conversation_context__menu_forward_message">Faire suivre le message</string>
-  <string name="conversation_context__menu_resend_message">Réenvoyer le message</string>
+  <string name="conversation_context__menu_resend_message">Renvoyer le message</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Commencer une session sécurisée</string>
   <!--conversation_list_batch-->
@@ -537,8 +583,8 @@
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sécurité</string>
   <string name="conversation_secure_verified__menu_no_identity">Pas d\'Identité Disponible</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Vérifier le Destinataire</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Fin de la session sécurisée</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Vérifier l\'identité</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Mettre fin à la session sécurisée</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Ajouter une pièce jointe</string>
   <string name="conversation__menu_update_group">Modifier le Groupe</string>
@@ -549,13 +595,13 @@
   <string name="convesation_group_options__recipients_list">Liste des destinataires</string>
   <string name="conversation_group_options__delivery">Distribution</string>
   <string name="conversation_group_options__conversation">Conversation</string>
-  <string name="conversation_group_options__broadcast">Diffuser</string>
+  <string name="conversation_group_options__broadcast">Diffusion</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Comparer</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Être analysé pour comparer</string>
   <string name="key_scanning__menu_scan_to_compare">Analyser pour comparer</string>
   <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Débloquer</string>
+  <string name="text_secure_locked__menu_unlock">Déverrouiller</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nouveau Message</string>
   <string name="text_secure_normal__menu_new_group">Nouveau groupe</string>

res/values-he/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>
@@ -58,8 +57,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-->
@@ -240,6 +237,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>
@@ -274,6 +274,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-->
@@ -308,8 +309,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>
@@ -383,6 +382,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-->
@@ -402,7 +402,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_add_contact_info">הוסף מידע לאיש הקשר</string>

res/values-id/strings.xml

@@ -0,0 +1,582 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">Ya</string>
+  <string name="no">Tidak</string>
+  <string name="delete">Hapus</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Sekarang: %s</string>
+  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Anda perlu memasukkan kata kunci sebelum mengelola kunci</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Anda belum mengatur kata kunci!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">pesan per percakapan</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Hapus seluruh pesan lama?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Apakah anda yakin untuk memangkas seluruh rangkaian percakapan hingga ke %s pesan terakhir?</string>
+  <string name="ApplicationPreferencesActivity_delete">Hapus</string>
+  <string name="ApplicationPreferencesActivity_my">Saya</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Matikan enkripsi media simpan?</string>
+  <string name="ApplicationPreferencesActivity_disable">Dinon aktifkan</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Keluar...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Keluar dari komunikasi berbasis data</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Jangan gunakan push message</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kesalahan dalam menghubungkan ke server!</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Anda tidak terdaftar dengan layanan push...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Memperbaharui direktori</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Sedang memperbaharui direktori...</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Sentuh untuk mengubah aplikasi SMS default</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Sentuh untuk membuat TextSecure sebagai aplikasi SMS default</string>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">Gambar</string>
+  <string name="AttachmentTypeSelectorAdapter_video">Video</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">Ukuran pesan: %d KB</string>
+  <string name="ConversationItem_expires_s">Berakhir: %s</string>
+  <string name="ConversationItem_error_sending_message">Gagal mengirim pesan</string>
+  <string name="ConversationItem_saving_attachment">Menyimpan Lampiran</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">Menyimpan lampiran ke kartu SD...</string>
+  <string name="ConversationItem_save_to_sd_card">Simpan ke kartu SD?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Media ini telah disimpan dalam basis data terenkripsi. Versi yang anda simpan ke kartu SD tidak akan lagi dienkripsi. Apakah anda ingin melanjutkan?</string>
+  <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Gagal menyimpan lampiran ke kartu SD!</string>
+  <string name="ConversationItem_success_exclamation">Sukses!</string>
+  <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Tidak dapat menyimpan ke kartu SD!</string>
+  <string name="ConversationItem_view_secure_media_question">Tampilkan media aman?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Media ini disimpan dalam basis data terenkripsi. Namun, untuk melihatnya dengan aplikasi eksternal akan memerlukan berkas di deskripsi dan disimpan. Apa anda yakin ingin melakukan ini?</string>
+  <string name="ConversationItem_received_and_processed_key_exchange_message">Menerima dan memproses pesan pertukaran kunci.</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Gagal, menerima pesan pertukaran kunci terhenti.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Menerima pesan pertukaran kunci, klik untuk memproses.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Menerima SMS teks polos dalam sesi aman . Jika pengirim tidak menggunakan sesi aman, pesan yang anda kirim akan berantakan. Klik untuk menghentikan sesi aman.</string>
+  <string name="ConversationItem_group_action_left">si %1$s telah meninggalkan grup.</string>
+  <string name="ConversationItem_group_action_joined">%1$s telah bergabung dengan grup.</string>
+  <string name="ConversationItem_group_action_modify">%1$s telah memperbarui grup.</string>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Inisiasi Sesi Aman?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Inisiasi sesi aman dengan %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Konfirmasi mengakhiran sesi aman</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Apakah anda yakin untuk mengakhiri sesi aman ini?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Konfirmasi Penghapusan Topik</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Apa anda yakin ingin menghapus percakapan ini secara permanen?</string>
+  <string name="ConversationActivity_add_attachment">Tambahkan lampiran</string>
+  <string name="ConversationActivity_select_contact_info">Pilih info kontak</string>
+  <string name="ConversationActivity_compose_message">Tulis Pesan</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Maaf, terjadi kesalahan pada pengaturan lampiran anda.</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Maaf, video terpilih melebihi batas ukuran pesan.</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Maaf, audio terpilih melebihi batas ukuran pesan.</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Alamat penerima SMS atau email tidak benar!</string>
+  <string name="ConversationActivity_message_is_empty_exclamation">Pesan kosong!</string>
+  <string name="ConversationActivity_forward_message_prefix">FWD</string>
+  <string name="ConversationActivity_group_conversation_recipients">Penerima Percakapan Grup</string>
+  <string name="ConversationActivity_group_conversation">Percakapan Grup</string>
+  <string name="ConversationActivity_unnamed_group">Grup tak bernama</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d anggota</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 anggota</string>
+  <string name="ConversationActivity_saving_draft">Menyimpan draft...</string>
+  <string name="ConversationActivity_invalid_recipient">Penerima tidak lengkap!</string>
+  <string name="ConversationActivity_calls_not_supported">Panggilan Tidak Didukung</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Perangkat ini sepertinya tidak mendukung untuk panggilan.</string>
+  <string name="ConversationActivity_leave_group">Tinggalkan grup?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Anda yakin ingin meninggalkan grup ini?</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">Rincian pesan</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transpor: %1$s\nTerkirim/Diterima: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Pengirim: %1$s\nTranspor: %2$s\nTerkirim: %3$s\nDiterima: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Konfirmasi Penghapusan Pesan</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Apakah anda yakin akan menghapus pesan ini secara permanen?</string>
+  <!--ConversationListAdapter-->
+  <string name="ConversationListAdapter_key_exchange_message">Pesan pertukaran kunci...</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">Hapus topik?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Apakah anda yakin ingin menghapus semua topik pembicaraan terpilih?</string>
+  <string name="ConversationListFragment_deleting">Menghapus</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Menghapus percakapan yang dipilih ...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Pesan pertukaran kunci...</string>
+  <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">Export ke Kartu SD?</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ini\nakan mengeksport kunci terenkripsi, dan pesan ke kartu SD    </string>
+  <string name="ExportFragment_export">Eksport</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Eksport Tek Polos ke Kartu SD?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Peringatan, ini akan\nmengeksport konten pesan teks polos TextSecure anda ke kartu SD</string>
+  <string name="ExportFragment_cancel">Batal</string>
+  <string name="ExportFragment_exporting">Mengeksport</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Mengeksport teks polos ke kartu SD...\n</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Tidak dapat menyimpan ke kartu\nSD!\n</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Gagal ketika menyimpan ke kartu SD.\n</string>
+  <string name="ExportFragment_success">Sukses!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Mengeksport kunci yang dienkripsi,\npengaturan, dan pesan...</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Grup Baru</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Perbarui Grup</string>
+  <string name="GroupCreateActivity_group_name_hint">Nama Grup</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Grup MMS Baru</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Anda telah memilih kontak yang tidak mendukung grup TextSecure, sehingga grup ini akan menggunakan MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Anda tidak terdaftar untuk menggunakan saluran data, sehingga grup TextSecure dimatikan.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Anda bukan pemilik grup ini, sehingga anda tidak dapat mengubah judul atau gambar.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Terjadi kesalahan tidak terduga yang menggagalkan pembuatan grup.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Anda butuh minimal satu orang dalam grup anda!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Salah satu anggota grup anda memiliki nomor yang tidak dapat dibaca, silakan perbaiki atau keluarkan kontak tersebut dan coba lagi.</string>
+  <string name="GroupCreateActivity_file_io_exception">Kesalahan I/O file, tidak dapat membuat file gambar temporer.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar Grup</string>
+  <string name="GroupCreateActivity_menu_create_title">Buat Grup</string>
+  <string name="GroupCreateActivity_creating_group">Membuat %1$s…</string>
+  <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">Import dari Basis data sistem SMS?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Ini akan mengimport\npesan dari basis data SMS default ke TextSecure. Jika anda sebelumnya\ntelah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.\n</string>
+  <string name="ImportFragment_import">Import</string>
+  <string name="ImportFragment_cancel">Batal</string>
+  <string name="ImportFragment_restore_encrypted_backup">Pulihkan dari cadangan yang dienkripsi?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nMemulihkan dari cadangan yang enkripsi akan sepenuhnya mengganti kunci, preferensi dan\npesan anda. Anda akan kehilangan informasi yang ada di instalasi TextSecure saat ini tetapi\ncadangan anda tetap aman.\n</string>
+  <string name="ImportFragment_restore">Pulihkan</string>
+  <string name="ImportFragment_import_plaintext_backup">Import Cadangan Teks polos?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Ini akan mengimport\npesan dari basis data SMS standar ke TextSecure. Jika anda sebelumnya\ntelah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.</string>
+  <string name="ImportFragment_importing">Mengimport</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Mengimport cadangan teks polos...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Cadangan teks polos tidak ditemukan!</string>
+  <string name="ImportFragment_error_importing_backup">Gagal mengimport cadangan!</string>
+  <string name="ImportFragment_import_complete">Selesai mengimport!</string>
+  <string name="ImportFragment_restoring">Memulihkan</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Memulihkan daru cadangan yang dienkripsi...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Tidak menemukan adanya cadangan yang dienkripsi!</string>
+  <string name="ImportFragment_restore_complete">Pemulihan selesai!</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Pemindai kunci tidak ditemukan!</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Tidak tersedia konektivitas untuk mengunduh MMS, coba lagi nanti...</string>
+  <string name="MmsDownloader_error_storing_mms">Kesalahan dalam menyimpan MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Kesalahan dalam menghubungi penyedia layanan MMS...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Kesalahan dalam membaca pengaturan MMS penyedia...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Pesan Multimedia</string>
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Kata Kunci Tidak Cocok!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Kata kunci lama salah!</string>
+  <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Kata Kunci tidak cocok</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Anda harus menentukan kata sandi</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Kata Kunci Salah!</string>
+  <!--PromptMmsActivity-->
+  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Anda harus mengisi URL MMSC operator anda.</string>
+  <string name="PromptMmsActivity_mms_settings_updated">Pengaturan MMS diperbaharui</string>
+  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Anda dapat memodifikasi nilai ini kapan saja dari pengaturan TextSecure.</string>
+  <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Isi\ntanda tangan dalam pertukaran kunci ini berbeda dengan apa yang telah anda terima sebelumnya dari\nkontak ini. Hal ini bisa berarti bahwa seseorang mencoba mencegat komunikasi anda, atau\nkontak ini telah menginstall ulang TextSecure dan sekarang memiliki kunci identitas baru.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Anda mungkin ingin memverifikasi\nkontak ini.\n</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Isi\ntanda tangan pertukaran kunci ini dipercaya, tetapi anda\nmenonaktifkan \'selesaikan perturakan kunci\nsecara otomatis\'</string>
+  <string name="ReceiveKeyActivity_processing">Memproses</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Memproses pertukaran kunci...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Hubungkan dengan TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Pilih Negara Anda</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Anda harus menetapkan kode\nNegara anda\n</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Anda harus mengisi nomor\ntelefon anda\n</string>
+  <string name="RegistrationActivity_invalid_number">Nomor tidak lengkap</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nomor yang anda\nisikan (%s) tidak tepat.\n</string>
+  <string name="RegistrationActivity_unsupported">Tidak didukung</string>
+  <string name="RegistrationActivity_continue">Lanjutkan</string>
+  <string name="RegistrationActivity_edit">Edit</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Kemungkinan Masalah</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Memverifikasi Nomor</string>
+  <string name="RegistrationProgressActivity_edit_s">Edit %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Pendaftaran selesai!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Kemungkinan Masalah</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Anda harus memasukkan kode yang anda terima terlebih dulu...</string>
+  <string name="RegistrationProgressActivity_connecting">Menghubungkan</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Menghubungkan untuk verifikasi</string>
+  <string name="RegistrationProgressActivity_network_error">Jaringan Error!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Tidak dapat menyambung. Mohon periksa koneksi anda dan coba lagi.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Verifikasi Gagal!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Kode Verifikasi yang anda kirim salah. Silakan coba lagi.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Terlalu banyak mencoba</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Anda telah terlalu banyak memasukkan kode yang salah. Silakan tunggu satu menit untuk mencoba lagi</string>
+  <string name="RegistrationProgressActivity_requesting_call">Meminta Panggilan</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Meminta verifikasi panggilan masuk...</string>
+  <string name="RegistrationProgressActivity_server_error">Kesalahan pada Server</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Server mengalami gangguan. Silakan coba lagi.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Terlalu Banyak Permintaan!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Anda telah meminta panggilan suara. Anda dapat meminta lagi dalam 20 menit kemudian.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Memverifikasi kode suara</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Konflik pendaftaran</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Nomor ini telah didaftarkan di server TextSecure lainnya (CyanogenMod?). Anda harus keluar dari sana sebelum mendaftar ke server ini.</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registrasi Selesai</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Pendaftaran TextSecure telah berhasil.</string>
+  <string name="RegistrationService_registration_error">Pendaftaran Gagal</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pendaftaran TextSecure mengalami masalah.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Menerima pembaharuan atas identitas yang tidak diketahui. Sentuh untuk memvalidasi identitas</string>
+  <string name="SmsMessageRecord_secure_session_ended">Sesi aman berakhir.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Tinggalkan grup...</string>
+  <string name="TheadRecord_secure_session_ended">Sesi aman berakhir</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Anda tidak memiliki kunci identitas.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Penerima tidak memiliki kunci identitas.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Penerima tidak memiliki kunci identitas!</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Pindai kunci untuk dicocokkan</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Pindai kunci saya</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">PERINGATAN, kunci terpindai TIDAK cocok! Mohon periksa teks sidik jari dengan baik.</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">TIDAK diverifikasi!</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Kunci benar. Diperlukan juga untuk memverifikasi kunci anda.</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Terverifikasi!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Anda tidak memiliki kunci identitas!</string>
+  <!--VerifyKeysActivity-->
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Pindai sidik jari saya</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Pindai sidik jari mereka</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">PERINGATAN, kunci terpindai TIDAK cocok! Mohon periksa teks sidik jari dengan baik.</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">Tidak terverifikasi!</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Kunci mereka benar. Juga diperlukan untuk memindai sidik jari anda</string>
+  <string name="VerifyKeysActivity_verified_exclamation">Terverifikasi!</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Anda tidak memiliki kunci identitas.</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Pindai untuk dicocokkan</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Pindai kunci untuk dicocokkan</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">PERINGATAN, kunci terpindai tidak cocok!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">TIDAK terverifikasi!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Kunci terpindai cocok!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Terverifikasi!</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">Identitas Sidik Jari</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Sidik Jari Identitas Saya</string>
+  <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Inisiasi Permintaan Menimpa Yang Telah Ada?</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Anda telah mengirimkan permintaan inisiasi sesi untuk penerima ini, apakah anda yakin untuk mengirimkan lagi? Hal ini akan membuat permintaan sesi sebelumnya menjadi tidak sah</string>
+  <string name="KeyExchangeInitiator_send">Kirim</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Enkripsi pada pesan tidak dapat dikenali</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Melakukan dekripsi, mohon tunggu...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Pesan di enkripsi untuk sesi yang tidak ada</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">Memulai koneksi ke Server MMS...</string>
+  <string name="MmsDatabase_downloading_mms">Mengunduh MMS...</string>
+  <string name="MmsDatabase_mms_download_failed">MMS gagal diunduh!</string>
+  <string name="MmsDatabase_downloading">Mengunduh...</string>
+  <string name="MmsDatabase_mms_pending_download">Sentuh untuk mengkonfigurasi pengaturan MMS untuk lanjut mengunduh.</string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Proses deskripsi MMS, mohon tunggu...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Enkripsi pada pesan MMS tidak dapat dikenali</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS di enkripsi untuk sesi yang tidak ada</string>
+  <!--MmsSender-->
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Saat ini tidak dapat mengirimkan MMS Anda.</string>
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Dalam proses mengimport</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Mengimport Pesan Teks</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">Sentuh untuk membuka.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Sentuh untuk membuka, atau sentuh untuk menutup.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure tidak dikunci</string>
+  <string name="KeyCachingService_lock">Kunci dengan kata sandi</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">%d pesan baru</string>
+  <string name="MessageNotifier_most_recent_from_s">Pesan terbaru dari: %s</string>
+  <string name="MessageNotifier_encrypted_message">Mengenkripsi pesan...</string>
+  <string name="MessageNotifier_no_subject">(Tanpa Judul)</string>
+  <string name="MessageNotifier_message_delivery_failed">Pengiriman pesan gagal.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Gagal mengirimkan pesan.</string>
+  <string name="MessageNotifier_error_delivering_message">Kesalahan dalam mengirimkan pesan.</string>
+  <string name="MessageNotifier_mark_all_as_read">Tandai telah dibaca semuanya</string>
+  <string name="MessageNotifier_mark_as_read">Tandai telah dibaca</string>
+  <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_regenerating">Meregenerasi...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Meregenerasi kunci\nidentitas...\n</string>
+  <string name="ViewLocalIdentityActivity_regenerated">Teregenerasi!</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Reset Kunci Identitas?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nPerhatian! Dengan meregenerasi kunci identitas akan menghilangkan kunci identitas saat ini\ndan seluruh kontak anda akan mendapat peringatan ketika membuat sesi aman yang baru dengan Anda.\nApakah Anda yakin untuk melanjutkan?\n</string>
+  <string name="ViewLocalIdentityActivity_cancel">Batal</string>
+  <string name="ViewLocalIdentityActivity_continue">Lanjutkan</string>
+  <!--SmsReceiver-->
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Saat ini tidak dapat mengirimkan SMS anda. Ketika layanan telah tersedia SMS akan dikirim.</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Maaf, Jawaban cepat masih belum didukung oleh 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">Anda telah menerima pesan dari perangkat yang mendukung sesi terenkripsi oleh TextSecure. Apakah anda ingin memulai koneksi aman?</string>
+  <string name="auto_initiate_activity__initiate_exchange">Memulai Pertukaran Kunci</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">KATA KUNCI LAMA</string>
+  <string name="change_passphrase_activity__new_passphrase">KATA KUNCI BARU</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">ULANG KATA KUNCI BARU</string>
+  <!--contact_selection_group_activity-->
+  <!--contact_selection_list_activity-->
+  <string name="contact_selection_group_activity__no_contacts">Tidak ada kontak</string>
+  <string name="contact_selection_group_activity__finding_contacts">Temukan kontak...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Ketik nama untuk memfilter...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Anda tidak terdaftar dengan layanan push...</string>
+  <string name="SingleContactSelectionActivity_updating_directory">Memperbaharui direktori</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Sedang memperbaharui direktori...</string>
+  <!--ContactSelectionListFragment-->
+  <string name="ContactSelectionlistFragment_select_for">Pilih untuk</string>
+  <!--contact_selection_recent_activity-->
+  <string name="contact_selection_recent_activity__no_recent_calls">Tidak ada panggilan baru</string>
+  <!--conversation_activity-->
+  <string name="conversation_activity__type_message"><small>Kirim pesan</small></string>
+  <string name="conversation_activity__send">Kirim</string>
+  <string name="conversation_activity__remove">Hapus</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">Unduh</string>
+  <string name="conversation_item_sent__downloading">Mengunduh</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Unduh</string>
+  <string name="conversation_item_received__downloading">Mengunduh</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Mode Pilihan Jamak</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Memuat daftar negara...</string>
+  <string name="country_selection_fragment__search">Cari</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">Silakan tentukan kata kunci jika ingin mengenkripsi data lokal anda.</string>
+  <string name="create_passphrase_activity__passphrase">KATA KUNCI:</string>
+  <string name="create_passphrase_activity__repeat">ULANGI:</string>
+  <string name="create_passphrase_activity__continue">Lanjutkan</string>
+  <string name="create_passphrase_activity__generating_secrets">MEMBUAT KUNCI RAHASIA</string>
+  <string name="create_passphrase_activity__skip">Lewati</string>
+  <string name="create_passphrase_activity__create">Buat</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">Catatan ini akan dikirim secara online untuk kontributor TextSecure secara terbuka. Silakan periksa atau edit catatan tersebut sebelum anda kirim.</string>
+  <string name="log_submit_activity__button_cancel">Jangan Kirim</string>
+  <string name="log_submit_activity__button_ok">Kirim</string>
+  <string name="log_submit_activity__log_fetch_failed">Tidak dapat mengambil catatan log dari perangkat anda. Anda masih dapat menggunakan ADB untuk mendapat catatan debug.</string>
+  <string name="log_submit_activity__log_submit_success_title">Sukses!</string>
+  <string name="log_submit_activity__log_got_it">Paham</string>
+  <string name="log_submit_activity__copied_to_clipboard">Disalin ke clipboard</string>
+  <string name="log_submit_activity__loading_logcat">Memuat logcat...</string>
+  <string name="log_submit_activity__thanks">Terimakasih atas bantuan anda</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Apakah anda ingin mengimport pesan anda ke dalam basis data terenkripsi TextSecure?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Basis data sistem standar tidak akan diubah atau dimodifikasi</string>
+  <string name="database_migration_activity__skip">Lewati</string>
+  <string name="database_migration_activity__import">Import</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Ini bisa sedikit memakan waktu. Harap bersabar, kami akan memberi tahu anda ketika proses import selesai</string>
+  <string name="database_migration_activity__importing">MENGIMPORT</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Memperbarui Basis Data...</string>
+  <string name="export_fragment__export_encrypted_backup">Eksport Cadangan yang Dienkripsi</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksport cadangan dienkripsi\nke kartu SD.</string>
+  <string name="export_fragment__export_plaintext_backup">Eksport Cadangan Teks Polos</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExport cadangan ke teks polos yang kompatibel dengan \'SMSBackup And Restore\'  ke kartu SD.</string>
+  <string name="import_fragment__import_system_sms_database">Import Database SMS Sistem</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Import database\ndari aplikasi perpesan bawaan\n</string>
+  <string name="import_fragment__import_encrypted_backup">Import Cadangan yang Diacak</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nPulihkan dari cadangan teracak TextSecure.\n</string>
+  <string name="import_fragment__import_plaintext_backup">Import Cadangan Teks Polos</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImport cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Restore\'.</string>
+  <string name="local_identity__regenerate_key">Meregenerasi Kunci</string>
+  <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">Telepon Anda membutuhkan pengaturan MMS secara manual.</string>
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">KATA KUNCI TEXTSECURE</string>
+  <string name="prompt_passphrase_activity__unlock">Buka Kunci</string>
+  <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure memerlukan pengaturan MMS untuk mengantar pesan dan media grup melalui operator anda. Perangkan anda tidak menyediakan informasi tersebut, yang biasanya disebabkan oleh perangkat yang dikunci atau pengaturan yang ketat.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Untuk mengirim pesan dan media grup klik \'OK\' dan selesaikan pengaturan yang diminta. Pengaturan MMS untuk operator anda biasanya dapat ditemukan dengan mencari \'APN operator anda\'. Hal ini hanya diperlukan sekali saja.</string>
+  <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (Diperlukan):</string>
+  <string name="prompt_mms_activity__mms_proxy_host_optional">HOST PROXY MMS (OPSIONAL):</string>
+  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPSIONAL):</string>
+  <!--receive_key_activity-->
+  <string name="receive_key_activity__complete">Selesai</string>
+  <!--registration_activity-->
+  <string name="registration_activity__your_country">NEGARA ANDA</string>
+  <string name="registration_activity__your_country_code_and_phone_number">KODE NEGARA ANDA DAN\nNOMOR TELEPON</string>
+  <string name="registration_activity__phone_number">NOMOR TELEPON</string>
+  <string name="registration_activity__register">Daftar</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registrasi akan mengirim beberapa info kontak ke server untuk sementara.</string>
+  <string name="registration_activity__skip">Lewati</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Beberapa masalah yang mungkin\ntermasuk:\n</string>
+  <string name="registration_problems__sms_interceptors">Pencegat SMS.</string>
+  <string name="registration_problems__incorrect_number">nomor salah.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure tidak akan berfungsi dengan nomor Google Voice\n</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Verifikasi Suara</string>
+  <string name="registration_progress_activity__verify">Verifikasi</string>
+  <string name="registration_progress_activity__call_me">Hubungi Saya</string>
+  <string name="registration_progress_activity__edit_number">Edit nomor</string>
+  <string name="registration_progress_activity__connectivity_error">Kesalahan konektivitas</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Kemungkinan masalah\ntermasuk:\n</string>
+  <string name="registration_progress_activity__no_network_connectivity">Tidak ada konektivitas\njaringan.\n</string>
+  <string name="registration_progress_activity__restrictive_firewall">Firewall yang ketat.\n</string>
+  <string name="registration_progress_activity__connecting">Menghubungkan...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Menunggu Verifikasi\nSMS...</string>
+  <string name="registration_progress_activity__registering_with_server">Mendaftarkan ke server...</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure kehabisan waktu saat menunggu verifikasi pesan SMS.\n</string>
+  <string name="registration_progress_activity__sms_verification_failed">Verifikasi SMS\nTelah gagal\n</string>
+  <string name="registration_progress_activity__generating_keys">Membuat kunci...</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to">Kepada</string>
+  <string name="recipients_panel__add_member">Tambah Anggota</string>
+  <!--review_identities-->
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Saat ini anda tidak memiliki kunci identitas di database yang dipercaya</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">Identitas mereka (terbaca):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Identitas anda (terbaca):</string>
+  <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">Nama identitas:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Identitas yang diimpor:\\n</string>
+  <string name="verify_import_identity_activity__verified">Terverifikasi!</string>
+  <string name="verify_import_identity_activity__compare">Bandingkan</string>
+  <!--verify_keys_activity-->
+  <string name="verify_keys_activity__they_read_this">Yang terbaca oleh mereka:</string>
+  <string name="verify_keys_activity__you_read_this">Yang terbaca oleh anda:</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Buat Kata Kunci</string>
+  <string name="AndroidManifest__enter_passphrase">Masukkan Kata Kunci</string>
+  <string name="AndroidManifest__select_contacts">Pilih Kontak</string>
+  <string name="AndroidManifest__select_contact">Pilih Kontak</string>
+  <string name="AndroidManifest__textsecure_detected">Mendeteksi Aplikasi TextSecure</string>
+  <string name="AndroidManifest__public_identity_key">Identitas Kunci Publik</string>
+  <string name="AndroidManifest__change_passphrase">Ganti Kata Kunci</string>
+  <string name="AndroidManifest__verify_session">Verifikasi Sesi</string>
+  <string name="AndroidManifest__verify_identity">Verifikasi Identitas</string>
+  <string name="AndroidManifest__manage_identity_keys">Kelola Kunci Identitas</string>
+  <string name="AndroidManifest__complete_key_exchange">Pertukaran Kunci Berhasil</string>
+  <string name="AndroidManifest__log_submit">Kirimkan catatan debug</string>
+  <!--arrays.xml-->
+  <string name="arrays__import_export">Import / Export</string>
+  <string name="arrays__my_identity_key">Kunci Identitas Saya</string>
+  <string name="arrays__contact_keys">Kunci Kontak</string>
+  <!--preferences.xml-->
+  <string name="preferences__general">Umum</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gunakan TextSecure untuk melihat dan menyimpan semua pesan teks yang masuk</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gunakan TextSecure untuk melihat dan menyimpan semua pesan multimedia yang masuk</string>
+  <string name="preferences__enable_enter_key_title">Gunakan tombol Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Ganti tombol smiley dengan tombol enter</string>
+  <string name="preferences__pref_enter_sends_title">Tekan enter untuk mengirim</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Menekan tombol enter akan mengirimkan pesan teks</string>
+  <string name="preferences__display_settings">Tampilkan Konfigurasi Layar</string>
+  <string name="preferences__choose_identity">Pilih Identitas</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Pilih kontak anda dari daftar kontak yang ada.</string>
+  <string name="preferences__change_passphrase">Ganti Kata Kunci</string>
+  <string name="preferences__change_my_passphrase">Ganti kata kunci saya</string>
+  <string name="preferences__complete_key_exchanges">Pertukaran kunci berhasil</string>
+  <string name="preferences__disable_passphrase">Non aktifkan kata sandi</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Jangan gunakan pengacakan atas pesan-pesan dan kunci-kunci</string>
+  <string name="preferences__screen_security">Keamanan Layar</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Secara otomatis lakukan pertukaran kunci untuk sesi yang baru atau untuk sesi yang sudah ada dengan kunci identitas yang sama</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Matikan Keamanan Layar untuk mengijinkan screen shot</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Lupakan kata kunci dari memori setelah beberapa saat</string>
+  <string name="preferences__timeout_passphrase">Kata kunci kadaluarsa</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Pilih Waktu Kadaluarsa Kata Kunci</string>
+  <string name="preferences__pref_timeout_interval_title">Interval Kadaluarsa</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Waktu tunggu sebelum melupakan kata kunci dari memori</string>
+  <string name="preferences__identity_key_settings">Identitas kunci</string>
+  <string name="preferences__view_my_identity_key">Tampilkan identitas saya</string>
+  <string name="preferences__manage_identity_keys">Kelola Kunci Identitas</string>
+  <string name="preferences__manage_configured_identity_keys">Kelola konfigurasi kunci identitas</string>
+  <string name="preferences__notifications">Pemberitahuan</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Tampilkan pemberitahuan pesan di status bar</string>
+  <string name="preferences__led_color">Warna LED</string>
+  <string name="preferences__pref_led_blink_title">Pola kedip LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Tentukan pola kedip LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Hidup Untuk:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Mati Untuk:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Set pola kedip LED!</string>
+  <string name="preferences__sound">Bunyi</string>
+  <string name="preferences__change_notification_sound">Ganti suara notofikasi</string>
+  <string name="preferences__inthread_notifications">Pemberitahuan dalam percakapan</string>
+  <string name="preferences__play_inthread_notifications">Bunyikan suara pemberitahuan ketika melihat percakapan yang aktif.</string>
+  <string name="preferences__vibrate">Getar</string>
+  <string name="preferences__also_vibrate_when_notified">Bergetar jika ada pemberitahuan masuk</string>
+  <string name="preferences__minutes">menit</string>
+  <string name="preferences__hours">jam</string>
+  <string name="preferences__green">Hijau</string>
+  <string name="preferences__red">Merah</string>
+  <string name="preferences__blue">Biru</string>
+  <string name="preferences__orange">Oranye</string>
+  <string name="preferences__cyan">Cyan</string>
+  <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Putih</string>
+  <string name="preferences__none">Kosong</string>
+  <string name="preferences__fast">Cepat</string>
+  <string name="preferences__normal">Normal</string>
+  <string name="preferences__slow">Lambat</string>
+  <string name="preferences__custom">Spesifik</string>
+  <string name="preferences__advanced">Lanjutan</string>
+  <string name="preferences__passphrase">Kata kunci</string>
+  <string name="preferences__advanced_mms_access_point_names">Preferensi MMS</string>
+  <string name="preferences__enable_manual_mms">Gunakan MMS Manual</string>
+  <string name="preferences__override_system_mms_settings">Ganti pengaturan MMS dengan informasi berikut.</string>
+  <string name="preferences__mmsc_url_required">URL MMSC (Diperlukan)</string>
+  <string name="preferences__mms_proxy_host_optional">Host Proxy MMS (Opsional)</string>
+  <string name="preferences__mms_proxy_port_optional">Port Proxy MMS (Opsional)</string>
+  <string name="preferences__sms_delivery_reports">Laporan pengiriman SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Minta laporan pengiriman untuk tiap SMS yang dikirim</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Secara otomatis hapus pesan yang lebih lama ketika percakapan telah melebihi jumlah yang ditentukan</string>
+  <string name="preferences__delete_old_messages">Hapus pesan lama</string>
+  <string name="preferences__storage">Penyimpanan</string>
+  <string name="preferences__conversation_length_limit">Batas panjang percakapan</string>
+  <string name="preferences__trim_all_threads_now">Pangkas seluruh percakapan sekarang</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Pindai seluruh rangkaian percakapan dan terapkan batas panjang percakapan</string>
+  <string name="preferences__light_theme">Tampilan Terang</string>
+  <string name="preferences__dark_theme">Tampilan Gelap</string>
+  <string name="preferences__appearance">Penampilan</string>
+  <string name="preferences__theme">Tema</string>
+  <string name="preferences__default">Default</string>
+  <string name="preferences__language">Bahasa</string>
+  <string name="preferences__make_default_sms_app">Jadikan sebagai aplikasi SMS default</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Jadikan TextSecure sebagai palikasi default untuk SMS/MMS.</string>
+  <string name="preferences__use_data_channel">Pesan Push</string>
+  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure saat ini sebagai aplikasi SMS default. Silakan tentukan aplikasi SMS default yang lain untuk mengganti nilai ini.</string>
+  <string name="preferences__refresh_push_directory">Muat ulang direktori Push</string>
+  <string name="preferences__submit_debug_log">Kirim debug log</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">Pilih Semua</string>
+  <string name="contact_selection_list__menu_unselect_all">Jangan Pilih Semua</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">Selesai</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Segarkan Daftar Kontak</string>
+  <!--conversation_button_context-->
+  <string name="conversation_button_context__menu_send_unencrypted">Kirim tanpa enkripsi</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">Panggil</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">Rincian pesan</string>
+  <string name="conversation_context__menu_copy_text">Salin teks</string>
+  <string name="conversation_context__menu_delete_message">Hapus pesan</string>
+  <string name="conversation_context__menu_forward_message">Teruskan pesan</string>
+  <string name="conversation_context__menu_resend_message">Kirim ulang </string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">Mulai Sesi Aman</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Hapus yang terpilih</string>
+  <string name="conversation_list_batch__menu_select_all">Pilih Semua</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">Cari</string>
+  <string name="conversation_list__drawer_open">Buka peringkas navigasi</string>
+  <string name="conversation_list__drawer_close">Tutup peringkas navigasi</string>
+  <!--conversation_secure_verified-->
+  <string name="conversation_secure_verified__menu_security">Keamanan</string>
+  <string name="conversation_secure_verified__menu_no_identity">Tidak ada identitas</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Verifikasi Identitas</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Akhiri Sesi Aman</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">Tambahkan lampiran</string>
+  <string name="conversation__menu_update_group">Perbarui Grup</string>
+  <string name="conversation__menu_leave_group">Tinggalkan Grup</string>
+  <string name="conversation__menu_add_contact_info">Tambahkan info kontak</string>
+  <string name="conversation__menu_delete_thread">Hapus Percakapan</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Daftar Penerima</string>
+  <string name="conversation_group_options__delivery">Pengiriman</string>
+  <string name="conversation_group_options__conversation">Percakapan</string>
+  <string name="conversation_group_options__broadcast">Siaran</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">Bandingkan</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Pindai kunci untuk dicocokkan</string>
+  <string name="key_scanning__menu_scan_to_compare">Pindai untuk dicocokkan</string>
+  <!--text_secure_locked-->
+  <string name="text_secure_locked__menu_unlock">Buka Kunci</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Pesan Baru</string>
+  <string name="text_secure_normal__menu_new_group">Grup Baru</string>
+  <string name="text_secure_normal__menu_settings">Konfigurasi</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Kunci</string>
+  <string name="text_secure_normal__mark_all_as_read">Tandai semua telah dibaca</string>
+  <!--verify_keys-->
+  <string name="verify_keys__menu_verified">Terverifikasi</string>
+  <!--EOF-->
+</resources>

res/values-it/strings.xml

@@ -10,10 +10,20 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Non hai ancora impostato una password!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">messagi per conversazione</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Elimina tutti i messagi vecchi ora?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Sei sicuro che vorresti ritagliare subito tutte le thread delle conversazioni ai %s piu\' recenti messagi?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Vuoi davvero ridurre tutti i thread delle conversazioni ai %s messaggi più recenti?</string>
   <string name="ApplicationPreferencesActivity_delete">Elimina</string>
   <string name="ApplicationPreferencesActivity_my">Il mio</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Disabilitare la cifratura dei dati salvati?</string>
   <string name="ApplicationPreferencesActivity_disable">Disabilita</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Annullamento della registrazione ...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Annullamento della registrazione dei dati di base della Comunicazione</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Disattivare messaggi push?</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Non sei registrato con il servizio push...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Aggiornamento directory</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Aggiornamento directory push...</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tocca per cambiare l\'applicazione predefinita per gli SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tocca per rendere TextSecure l\'applicazione predefinita per gli SMS</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Immagine</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -22,7 +32,6 @@
   <string name="ConversationItem_message_size_d_kb">Dimensione Messaggio: %d KB</string>
   <string name="ConversationItem_expires_s">Scadenza: %s</string>
   <string name="ConversationItem_error_sending_message">Errore durante l\'invio del messaggio</string>
-  <string name="ConversationItem_sending">Invio...</string>
   <string name="ConversationItem_saving_attachment">Salvataggio Allegato</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Salvataggio allegato sulla memoria SD...</string>
   <string name="ConversationItem_save_to_sd_card">Salvare sulla memoria SD?</string>
@@ -31,12 +40,18 @@
   <string name="ConversationItem_success_exclamation">Completato!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Impossibile scrivere nella memoria SD!</string>
   <string name="ConversationItem_view_secure_media_question">Vuoi vedere il file multimediale?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Questo contenuto è stato archiviato in un database cifrato. Sfortunatamente, per aprirlo con un visualizzatore esterno, attualmente è necessario che venga temporaneamente decifrato e scritto sul disco. Si è certi di voler procedere?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Contrattazione della chiave ricevuta e completata.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Errore, ricevuto messaggio per la contrattazione della chiave scaduto.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Ricevuto messaggio per lo scambio della chiave, cliccare per procedere</string>
+  <string name="ConversationItem_group_action_left">%1$s ha lasciato il gruppo.</string>
+  <string name="ConversationItem_group_action_joined">%1$s è entrato nel gruppo.</string>
+  <string name="ConversationItem_group_action_modify">%1$s ha aggiornato il gruppo.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniziare una sessione sicura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniziare una sessione sicura con %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Conferma di conclusione sessione sicura</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Vuoi davvero concludere questa sessione sicura?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confermi di voler cancellare il thread?</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Sei sicuro di voler cancellare permanentemente questa conversazione?</string>
   <string name="ConversationActivity_add_attachment">Aggiungi allegato</string>
@@ -50,14 +65,19 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Conversazione di Gruppo Destinatari</string>
   <string name="ConversationActivity_group_conversation">Conversazione di Gruppo</string>
+  <string name="ConversationActivity_unnamed_group">Gruppo senza nome</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d partecipanti</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 partecipante</string>
   <string name="ConversationActivity_saving_draft">Salvataggio in corso</string>
   <string name="ConversationActivity_invalid_recipient">Destinatario invalido!</string>
   <string name="ConversationActivity_calls_not_supported">Chiamate non supportate</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Il dispositivo non sembra supportare le telefonate.</string>
+  <string name="ConversationActivity_leave_group">Abbandonare il gruppo?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Vuoi davvero lasciare questo gruppo?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Dettagli messaggio</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Mittente: %1$s\nTrasportato: %2$s\nInviato/Ricevuto: %3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Mittente: %1$s\nComunicante: %2$s\nInviato: %3$s\nRicevuto: %4$s</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Trasporto: %1$s\nInviato/ricevuto: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Mittente: %1$s\nTrasporto: %2$s\nInviato: %3$s\nRicevuto: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Conferma l\'eliminazione del messaggio</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Sicuro di voler cancellare definitivamente questo messaggio?</string>
   <!--ConversationListAdapter-->
@@ -75,7 +95,7 @@
   <string name="ExportFragment_export">Esporta</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Esporta il testo in formato PlainText nella scheda SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attenzione, verranno\n        esportati i contenuti dei tuoi messaggi TextSecure in formato plaintext nella scheda SD.\n    </string>
-  <string name="ExportFragment_cancel">Cancella</string>
+  <string name="ExportFragment_cancel">Annulla</string>
   <string name="ExportFragment_exporting">In esportazione</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Esporta il testo in formato PlainText nella scheda SD?</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Errore, impossibile scrivere \nnella scheda SD!</string>
@@ -83,13 +103,30 @@
   <string name="ExportFragment_success">Completato!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Esporta le chiavi crittografiche,\nle impostazioni ed i messaggi...</string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nuovo gruppo</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Aggiorna gruppo</string>
+  <string name="GroupCreateActivity_group_name_hint">Nome del gruppo</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Nuovo gruppo MMS</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Hai selezionato un contatto senza supporto ai gruppi TextSecure, quindi questo gruppo userà gli MMS.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Si è verificato un errore inatteso e la creazione del gruppo è fallito.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Il tuo gruppo deve contenere almeno una persona!</string>
+  <string name="GroupCreateActivity_file_io_exception">Errore di I/O, impossibile creare il file temporaneo.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar del gruppo</string>
+  <string name="GroupCreateActivity_menu_create_title">Crea gruppo</string>
+  <string name="GroupCreateActivity_creating_group">Creo %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importare gli SMS dal Database di sistema?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">In questo modo verranno importati i messaggi dal database predefinito di sitema per gli SMS a TextSecure. Se sono già stati importati in precedenza, la nuova importazione comporterà la duplicazione dei messaggi.\n</string>
   <string name="ImportFragment_import">Importa</string>
-  <string name="ImportFragment_cancel">Cancella</string>
+  <string name="ImportFragment_cancel">Annulla</string>
   <string name="ImportFragment_restore_encrypted_backup">Ripristinare il Backup crittato?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n        Il rispristino di un backup cifrato sostiutirà compeltamente le chiavi esistenti, le preferenze e\n        i messaggi. Verranno perse tutte le informazioni presenti nell\'installazione attuale di TextSecure ma non\n        quelle nel backup.\n    </string>
   <string name="ImportFragment_restore">Ripristina</string>
+  <string name="ImportFragment_import_plaintext_backup">Importare backup in chiaro?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Questo importerà\nmessaggi da un backup. Se hai già effetuato un backup, </string>
   <string name="ImportFragment_importing">Importazione</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importo il backup in chiaro...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Nessun backup in chiaro trovato!</string>
   <string name="ImportFragment_error_importing_backup">Errore durante l\'importazione del backup!</string>
   <string name="ImportFragment_import_complete">Importazione terminata!</string>
   <string name="ImportFragment_restoring">Ripristino</string>
@@ -121,13 +158,53 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La\nfirma su questo scambio di chiavi è differente di quella ricevuta precedentemente. Questo potrebbe significare che qualcuno stà cercando di intercettare la tua comunicazione\no\nche il contatto ha reinstallato TextSecure e ora ha una nuova chiave.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Dovresti verificare\nquesto contatto.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">La\nfirma di questa chiave è fidata, ma al momento hai lo scambio automatico della chiave disabilitato.</string>
+  <string name="ReceiveKeyActivity_processing">Elaborazione</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Elaborazione scambio delle chiavi…</string>
   <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Connetti Con TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Seleziona il paese</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">È necessario specificare il\ncodice del propio paese</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">È necessario specificare il\nproprio numero di telefono</string>
+  <string name="RegistrationActivity_invalid_number">Numero non valido</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Il numero specificato\n(%s) non è valido</string>
+  <string name="RegistrationActivity_unsupported">Non supportato</string>
   <string name="RegistrationActivity_continue">Continua</string>
+  <string name="RegistrationActivity_edit">Modifica</string>
   <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Possibili problemi</string>
   <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Verifica del numero</string>
+  <string name="RegistrationProgressActivity_edit_s">Modifica %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registrazione completata!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Possibili problemi.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">È necessario inserire prima il codice ricevuto...</string>
+  <string name="RegistrationProgressActivity_connecting">Connessione</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Connessione per la verifica...</string>
+  <string name="RegistrationProgressActivity_network_error">Errore di rete</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Impossibile connettersi. Controllare la connessione di rete e riprovare.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Verifica non riuscita.</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Il codice di verifica inserito non è corretto. Riprovare.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Troppi tenativi</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">È stato inserito troppe volte un codice di verifica errato. Attendere un minuto prima di effettuare un nuovo tentativo.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Richiedo la chiamata</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Richiesta di telefonata per la verifica...</string>
+  <string name="RegistrationProgressActivity_server_error">Errore del server</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Il server ha riscontrato un errore. Riprovare.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Troppe richieste.</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Hai già richiesto una chiamata recentemente. Devi attendere 20 minuti per richiederne un\'altra.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Verifica del codice vocale...</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Conflitto di registrazione</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Questo numero risulta già registrato su un altro server TextSecure (CyanogenMod?). Devi deregistrarti da lì prima di poterti registrare qui.</string>
   <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registrazione completata</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">La registrazione di TextSecure è stata competata con successo.</string>
+  <string name="RegistrationService_registration_error">Errore di registarzione</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Si è verificato un problema durante la registrazione a TextSecure.</string>
   <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_secure_session_ended">Sessione sicura terminata.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Gruppo abbandonato...</string>
+  <string name="TheadRecord_secure_session_ended">Sessione sicura terminata.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Non hai una chiave di identità.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Il destinatario non ha una chiave di identità.</string>
@@ -155,6 +232,7 @@
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">La chiave scansionata corrisponde!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verificata!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Impronta del contatto</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">La mia impronta identificativa</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Iniziare comunque una richiesta esistente?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Hai giò inviata una richiesta di inizio di sessione a questo contatto, sei sicuro di volerne inviare un\'altra? Questo renderà invalida la precedente.</string>
@@ -168,6 +246,7 @@
   <string name="MmsDatabase_downloading_mms">Download MMS...</string>
   <string name="MmsDatabase_mms_download_failed">Download MMS fallito</string>
   <string name="MmsDatabase_downloading">Scaricamento...</string>
+  <string name="MmsDatabase_mms_pending_download">Tocca e configura le impstazioni MMS per continuare a scaricare.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Decifratura MMS in corso, attendere...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Cifratura MMS invalida..</string>
@@ -178,6 +257,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Importazione in corso</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importazione dei messaggi di testo</string>
   <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">Tocca per aprire</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Tocca per aprire o tocca il lucchetto per chiudere.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure è sbloccato</string>
+  <string name="KeyCachingService_lock">Chiudi con password</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nuovi messaggi</string>
   <string name="MessageNotifier_most_recent_from_s">Più recente da: %s</string>
@@ -190,12 +273,16 @@
   <string name="MessageNotifier_mark_as_read">Segna come già letto</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Rigenerazione...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Rigenero la chiave\n        identificativa...\n    </string>
+  <string name="ViewLocalIdentityActivity_regenerated">Rigenerata!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Reimpostare la chiave d\'identità?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Cancella</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\n        Attenzione! Rigenerando la tua chiave identificativa perderai per sempre la tua chiave attuale\n        e tutti i tuoi contatti riceveranno un avviso la prossima volta che avvieranno una sessione privata con te.\n        Vuoi farlo davvero?\n    </string>
+  <string name="ViewLocalIdentityActivity_cancel">Annulla</string>
   <string name="ViewLocalIdentityActivity_continue">Continua</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">In questo momento non è possibile inviare il tuo messagio SMS. Sarà inviato quando la comunicazione è disponibile</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">La risposta rapida non è ancora supportata in 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">Hai ricevuto un messaggio da qualcuno che supporta una sessione cifrata di TextSecure. Vuoi iniziare una sessione sicura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Inizio scambio delle chiavi</string>
@@ -206,12 +293,18 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nessun contatto.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Cerco i contatti...</string>
   <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Digita un nome per filtrare...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Non sei registrato con il servizio push...</string>
+  <string name="SingleContactSelectionActivity_updating_directory">Aggiornamento directory</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Aggiornamento directory push...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleziona per</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Nessuna chiamata recente.</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message"><small>Invia un messaggio</small></string>
   <string name="conversation_activity__send">Invia</string>
   <string name="conversation_activity__remove">Elimina</string>
   <!--conversation_item_sent-->
@@ -223,12 +316,27 @@
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modalità di selezione di gruppo</string>
   <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Caricamento dei paese...</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">Se vuoi che i tuoi dati locali vengano criptati devi scegliere una password.</string>
   <string name="create_passphrase_activity__passphrase">Password:</string>
   <string name="create_passphrase_activity__repeat">Ripeti:</string>
   <string name="create_passphrase_activity__continue">Continua</string>
   <string name="create_passphrase_activity__generating_secrets">CREAZIONE SEGRETI</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">Questo log verrà pubblicato online a disposizione degli sviluppatori di TextSecure. Prima di inviarlo esamina e modifica il log.</string>
+  <string name="log_submit_activity__button_cancel">Non inviare</string>
+  <string name="log_submit_activity__button_ok">Invia</string>
+  <string name="log_submit_activity__log_fetch_failed">Non riesco a recuperare i log dal tuo dispositivo. Puoi sempre utilizzare ADB per ottenere i log di debug.</string>
+  <string name="log_submit_activity__log_submit_success_title">Completato!</string>
+  <string name="log_submit_activity__log_got_it">Capito</string>
+  <string name="log_submit_activity__your_pastebin_url">Copia l\'indirizzo e inseriscilo nella tua segnalazione (tieni premuto per aggiungerlo agli appunti):\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__copied_to_clipboard">Aggiunto agli appunti</string>
+  <string name="log_submit_activity__loading_logcat">Caricamento logcat...</string>
+  <string name="log_submit_activity__thanks">Grazie dell\'aiuto!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Desderi importare i tuoi SMS esistenti nel database cifrato di TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Il database di default non verrà modificat o alterato in nessun modo.</string>
@@ -240,7 +348,14 @@
   <string name="database_upgrade_activity__updating_database">Aggiornamento Database...</string>
   <string name="export_fragment__export_encrypted_backup">Esporta il backup crittato</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Esporta un backup\ncrittato sulla scheda SD</string>
+  <string name="export_fragment__export_plaintext_backup">Esporto il backup in chiaro...</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nEsporto un backup in chiaro compatibile con \"SMSBackup And Restore\" sulla SD card.</string>
+  <string name="import_fragment__import_system_sms_database">Importo il database SMS del sistema.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importa il database\ndall\'app SMS di default.</string>
   <string name="import_fragment__import_encrypted_backup">Importa backup crittato</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nRipristina un backup cifrato di TextSecure precedentemente esportato.</string>
+  <string name="import_fragment__import_plaintext_backup">Importa un backup in chiaro</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImporto un backup in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
   <string name="local_identity__regenerate_key">Rigenera chiave</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Impostazioni manuali degli MMS sono necessarie per il tuo telefono.</string>
@@ -248,16 +363,45 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">PASSWORD TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Sblocca</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per inviare contenuti multimediali e messaggi di gruppo, fare clic su \"OK\" e completare le impostazioni richieste. Le impostazioni MMS del proprio operatore possono essere generalemtne trovate cercando \"APN proprio operatore\". Sarà necessario eseguire una sola volta questa procedura.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL ( RICHIESTO )</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMS INDIRIZZO PROXY ( OPZIONALE )</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PORTA PROXY ( OPZIONALE )</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completato</string>
   <!--registration_activity-->
+  <string name="registration_activity__your_country">PAESE</string>
+  <string name="registration_activity__your_country_code_and_phone_number">CODICE DEL PAESE E\nNUMERO DI TELEFONO</string>
+  <string name="registration_activity__phone_number">NUMERO DI TELEFONO</string>
+  <string name="registration_activity__register">Registro</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">La registrazione invierà temporaneamente al server alcune informazioni di contatto.</string>
+  <string name="registration_activity__skip">Salta</string>
   <!--registration_problems-->
+  <string name="registration_problems__sms_interceptors">Intercettori dei SMS </string>
+  <string name="registration_problems__incorrect_number">Numero errato.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\n        Controlla di aver inserito il tuo numero formattato correttamente per\n        la tua regione.\n    </string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure non funzionerà con i numeri Google Voice.\n</string>
   <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Verifica vocale</string>
+  <string name="registration_progress_activity__verify">Veirifca</string>
+  <string name="registration_progress_activity__call_me">Chiamami</string>
+  <string name="registration_progress_activity__edit_number">Modifica numero</string>
+  <string name="registration_progress_activity__connectivity_error">Errore di connessione.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\n        TextSecure non è stato in grado di cennettersi al servizio push.\n    </string>
+  <string name="registration_progress_activity__some_possible_problems_include">Alcuni possibili\n        problemi includono:\n    </string>
+  <string name="registration_progress_activity__no_network_connectivity">Nessuna connessione\ndi rete.\n</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Il dispositivo\n        necessita di una connessione di rete per usare questa funzionalità di TextSecure. Verificare di\n        essere connessi a una rete 3G o Wifi.\n    </string>
+  <string name="registration_progress_activity__restrictive_firewall">Firewall troppo restrittivo.\n    </string>
+  <string name="registration_progress_activity__connecting">Connessione in corso...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">In attesa di\n        verifica SMS...\n    </string>
+  <string name="registration_progress_activity__registering_with_server">Registrazione con il server...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Questo\n        potrebbe richiedere del tempo. Attendere, una notifica verrà mostrata quando la verifica sarà completata.\n    </string>
+  <string name="registration_progress_activity__sms_verification_failed">Verifica SMS\nnon riuscita.\n    </string>
+  <string name="registration_progress_activity__generating_keys">Generazione chiavi...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">A</string>
+  <string name="recipients_panel__add_member">Aggiungi partecipante</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Attualmente non hai nessuna chiave di identità nel tuo database di fiducia.</string>
   <!--verify_identity_activity-->
@@ -275,6 +419,7 @@
   <string name="AndroidManifest__create_passphrase">Crea una password</string>
   <string name="AndroidManifest__enter_passphrase">Inserisci la password</string>
   <string name="AndroidManifest__select_contacts">Seleziona i contatti</string>
+  <string name="AndroidManifest__select_contact">Seleziona contatto</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure trovato!</string>
   <string name="AndroidManifest__public_identity_key">Chiave dell\'identità pubblica</string>
   <string name="AndroidManifest__change_passphrase">Cambia password</string>
@@ -282,16 +427,17 @@
   <string name="AndroidManifest__verify_identity">Verifica identità</string>
   <string name="AndroidManifest__manage_identity_keys">Controlla le chiavi di identità</string>
   <string name="AndroidManifest__complete_key_exchange">Completa lo scambio della chiave</string>
+  <string name="AndroidManifest__log_submit">Invia log di debug</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importa/Esporta</string>
   <string name="arrays__my_identity_key">La mia chiave d\'identità</string>
   <string name="arrays__contact_keys">Chiavi dei contatti</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generale</string>
-  <string name="preferences__pref_all_sms_title">Utilizza per tutti gli SMS</string>
-  <string name="preferences__pref_all_mms_title">Utilizza per tutti gli MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usa TextSecure per vedere e salvare tutti i messaggi in arrivo</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usa TextSecure per vedere e salvare tutti gli MMS in arrivo</string>
+  <string name="preferences__enable_enter_key_title">Abilita il tasto invio</string>
+  <string name="preferences__replace_smiley_with_enter_key">Sostituisci il tasto faccina con un tasto invio</string>
   <string name="preferences__pref_enter_sends_title">Inserisci inviati</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Premere il tasto Invio manderà i messaggi</string>
   <string name="preferences__display_settings">Impostazioni Display</string>
@@ -301,7 +447,10 @@
   <string name="preferences__change_my_passphrase">Cambia la mia password</string>
   <string name="preferences__complete_key_exchanges">Scambio di chiavi completato</string>
   <string name="preferences__disable_passphrase">Disabilita passphrase</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Disabilita la crittografia  dei messaggi e delle chiavi sul telefono</string>
+  <string name="preferences__screen_security">Sicurezza schermo</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completa lo scambio della chiave automaticamente per le nuove sessione con la stessa chiave di identità</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Disabilita la sicurezza dello schermo per poter catturare le schermate</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Dimentica la password dalla cache dopo un intervallo di tempo</string>
   <string name="preferences__timeout_passphrase">Tempo per dimenticare la password</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleziona un timeout per la password</string>
@@ -315,8 +464,14 @@
   <string name="preferences__display_message_notifications_in_status_bar">Mostra messaggio di notifica nella barra di stato</string>
   <string name="preferences__led_color">Colore del LED</string>
   <string name="preferences__pref_led_blink_title">Impostazioni LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Lampeggiamento LED personalizzato</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Attivo per:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Spento per:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Lampeggiamento personalizzato impostato!</string>
   <string name="preferences__sound">Suono</string>
   <string name="preferences__change_notification_sound">Cambia il suono di notifica</string>
+  <string name="preferences__inthread_notifications">notifiche</string>
+  <string name="preferences__play_inthread_notifications">Notifiche audio durante la lettura di una conversazione.</string>
   <string name="preferences__vibrate">Vibrazione</string>
   <string name="preferences__also_vibrate_when_notified">Vibra anche durante l\'arrivo di una notifica</string>
   <string name="preferences__minutes">minuti</string>
@@ -327,6 +482,8 @@
   <string name="preferences__orange">Arancione</string>
   <string name="preferences__cyan">Azzurro</string>
   <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Bianco</string>
+  <string name="preferences__none">Nessuna</string>
   <string name="preferences__fast">Veloce</string>
   <string name="preferences__normal">Normale</string>
   <string name="preferences__slow">Lento</string>
@@ -341,12 +498,12 @@
   <string name="preferences__mms_proxy_port_optional">MMS - Porta Proxy ( Opzionale )</string>
   <string name="preferences__sms_delivery_reports">Rapporti di consegna SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Richiedi un rapporto di consegna per ogni SMS inviato</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automaticamente i messaggi più vecchi quando un thread di conversazione supera una lunghezza determinata.</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automaticamente i messaggi più vecchi quando un thread di conversazione supera una certa lunghezza</string>
   <string name="preferences__delete_old_messages">Elimina i messagi vecchi</string>
   <string name="preferences__storage">Stoccaggio</string>
   <string name="preferences__conversation_length_limit">Limite di lunghezza conversazione</string>
-  <string name="preferences__trim_all_threads_now">Ritaglia tutti i thread ora</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Analizza tutti i thread delle conversazioni e far rispettare il limite di lunghezza delle conversazioni.</string>
+  <string name="preferences__trim_all_threads_now">Riduci immediatamente tutti i thread</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Analizza tutti i thread e applica il limite di lunghezza delle conversazioni.</string>
   <string name="preferences__light_theme">Tema Chiaro</string>
   <string name="preferences__dark_theme">Tema Scuro</string>
   <string name="preferences__appearance">Aspetto</string>
@@ -355,6 +512,10 @@
   <string name="preferences__language">Lingua</string>
   <string name="preferences__make_default_sms_app">Imposta come applicazione SMS predefinita.</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Rendi TextSecure l\'applicazione predefinita per SMS/MMS.</string>
+  <string name="preferences__use_data_channel">Messaggi push</string>
+  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure è impostata come app predefinita per gli SMS. Per poter modificare questa preferenza devi prima selezionare un\'altra app come predefinita per gli SMS.</string>
+  <string name="preferences__refresh_push_directory">Aggiorna directory push</string>
+  <string name="preferences__submit_debug_log">Invia log di debug</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -363,6 +524,8 @@
   <string name="contact_selection_list__menu_unselect_all">Deseleziona tutto</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Finito</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Aggiornamento elenco contatti</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__menu_send_unencrypted">Invia in chiaro</string>
   <!--conversation_callable-->
@@ -380,11 +543,18 @@
   <string name="conversation_list_batch__menu_select_all">Seleziona tutto</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Cerca</string>
+  <string name="conversation_list__drawer_open">Apri la barra di navigazione</string>
+  <string name="conversation_list__drawer_close">Chiudi la barra di navigazione</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicurezza</string>
-  <string name="conversation_secure_verified__menu_verify_recipient">Verifica il destinatario</string>
+  <string name="conversation_secure_verified__menu_no_identity">Nessuna identità disponibile</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Verifica identità</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Chiudi sessione sicura</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Aggiungi allegato</string>
+  <string name="conversation__menu_update_group">Aggiorna gruppo</string>
+  <string name="conversation__menu_leave_group">Abbandona il gruppo</string>
+  <string name="conversation__menu_add_contact_info">Aggiungi informazioni sul contatto</string>
   <string name="conversation__menu_delete_thread">Cancella conversazione</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">La lista dei destinatari</string>
@@ -399,7 +569,9 @@
   <string name="text_secure_locked__menu_unlock">Sblocca</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nuovo messaggio</string>
+  <string name="text_secure_normal__menu_new_group">Nuovo gruppo</string>
   <string name="text_secure_normal__menu_settings">Impostazioni</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Blocca</string>
   <string name="text_secure_normal__mark_all_as_read">Segna come già letto</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificato</string>

res/values-ja/strings.xml

@@ -16,6 +16,8 @@
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">端末内保存データの暗号化を無効にしますか？</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n警告、この作業によって、携帯端末に保存されるすべてのメッセージと鍵の暗号化が無効になります！\n通信上（セッション）の暗号化は引き続き行われますが、お使いの携帯端末それ自体に、誰かが物理的な接触を試みた場合、メッセージや鍵などの情報が入手されてしまう可能性があります。</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>
   <string name="AttachmentTypeSelectorAdapter_video">動画</string>
@@ -24,7 +26,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>
@@ -33,14 +34,18 @@
   <string name="ConversationItem_success_exclamation">成功しました。</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">SDカードに書き込めません。</string>
   <string name="ConversationItem_view_secure_media_question">暗号化されたファイルを表示しますか？</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">このファイルは暗号化されたデータベースに保存されています。外部コンテンツのビューアで見るには、データを一時的に復号し、ディスクに書き込まなければなりません。この作業を実行してもいいですか？</string>
   <string name="ConversationItem_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_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_delete_thread_confirmation">スレッド削除の確認</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">この会話を完全に削除してもよろしいですか？</string>
   <string name="ConversationActivity_add_attachment">添付</string>
+  <string name="ConversationActivity_select_contact_info">連絡先情報を選択</string>
   <string name="ConversationActivity_compose_message">メッセージ作成</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">添付中にエラーが発生しました。</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">選択された動画は容量を超えています。</string>
@@ -50,14 +55,15 @@
   <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>
   <!--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-->
@@ -83,6 +89,12 @@
   <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_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">これで、携帯端末の既定SMSデータベースにあるメッセージがTextSecureにインポートされます。以前にこの作業を行ったことがあれば、メッセージが重複する場合があります。</string>
@@ -92,6 +104,7 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n暗号化されたバックアップ・ファイルを復元すると、現在のキー、設定、及びメッセージは完全に上書きされます。現在のTextSecureインストール環境は上書きされますが、バックアップ・ファイルは残ります。</string>
   <string name="ImportFragment_restore">復元</string>
   <string name="ImportFragment_import_plaintext_backup">暗号化されていないテキストのバックアップ・ファイルをインポートしますか？</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">暗号化されていないテキストのバックアップ・ファイルからメッセージをインポートします。以前に同じバックアップ・ファイルをインポートしたことがある場合、メッセージが重複することになります。</string>
   <string name="ImportFragment_importing">インポート中…</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">非暗号テキストのバックアップ・ファイルをインポート中…</string>
   <string name="ImportFragment_no_plaintext_backup_found">非暗号テキストのバックアップ・ファイルが見つかりませんでした。</string>
@@ -125,11 +138,31 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">この\n鍵交換の電子署名は、以前この連絡先から受信したものと違っています。\n誰かがあなたの通信を傍受しようとしているか、もしくは\n単にこの連絡先がTextSecureを再インストールしたため、認証キーが新しくなった可能性があります。</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">この連絡先を\n照合することが推奨されています。</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">この\n鍵交換の電子署名は信用されていますが、「自動で鍵交換を完了する」設定は\n無効になっています。</string>
+  <string name="ReceiveKeyActivity_processing">処理中</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">鍵交換を処理中...</string>
   <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">TextSecureで接続</string>
+  <string name="RegistrationActivity_select_your_country">国を選択</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">国番号を入力して下さい</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">電話番号を入力して下さい</string>
+  <string name="RegistrationActivity_invalid_number">無効な番号</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">指定された番号(%s)はお使いできません。</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">申し訳ありませんが、\nお使いの端末ではデータ送信ができません。4.0より古いバージョンのアンドロイドをお使いの場合、グーグルアカウントに登録する必要があります。4.0または4.0より新しいバージョンをお使いの場合、グーグルアカウントへの登録は必要ありませんが、Google Play ストア アプリをインストールする必要があります。</string>
   <string name="RegistrationActivity_continue">続行</string>
+  <string name="RegistrationActivity_edit">編集</string>
   <!--RegistrationProblemsActivity-->
   <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">番号を確認中...</string>
+  <string name="RegistrationProgressActivity_edit_s">%sを編集</string>
+  <string name="RegistrationProgressActivity_registration_complete">登録完了！</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">まず、もらったコードを入力して下さい</string>
+  <string name="RegistrationProgressActivity_connecting">接続中</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">確認するために接続中...</string>
   <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">登録完了</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure登録が正常に完了しました。</string>
+  <string name="RegistrationService_registration_error">登録エラー</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure登録中にエラーが発生しました。</string>
   <!--SmsMessageRecord-->
   <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
@@ -172,6 +205,7 @@
   <string name="MmsDatabase_downloading_mms">MMSをダウンロード中…</string>
   <string name="MmsDatabase_mms_download_failed">MMSのダウンロードに失敗しました！</string>
   <string name="MmsDatabase_downloading">ダウンロード中…</string>
+  <string name="MmsDatabase_mms_pending_download">ダウンロードを続行するのに、MMS設定を行って下さい。</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSを復号しています。お待ち下さい…</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">MMSメッセージが正しく暗号化されていません…</string>
@@ -182,6 +216,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_textsecure_passphrase_cached_with_lock">タッチして開く、またはロックをタッチして閉じる</string>
+  <string name="KeyCachingService_lock">パスワードでロックする</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d 新しいメッセージ</string>
   <string name="MessageNotifier_most_recent_from_s">最新の送信者： %s</string>
@@ -198,11 +235,12 @@
   <string name="ViewLocalIdentityActivity_regenerated">再生成完了！</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">アイデンティティー鍵をリセットしますか？</string>
   <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\n警告!アイデンティティー鍵を再生成することで、現在の鍵は失われ、\n既存の連絡先はあなたと暗号化されたセッションを開始するときに警告を受けることになります。\n続行しますか？</string>
-  <string name="ViewLocalIdentityActivity_cancel">取り消し</string>
+  <string name="ViewLocalIdentityActivity_cancel">中止</string>
   <string name="ViewLocalIdentityActivity_continue">続行</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">現在、このSMSは送信できません。サービスが利用可能になると、すぐに送信されます。</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">申し訳ありませんが、クイック返信は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">TextSecure暗号化セッションをサポートする人からメッセージが来ています。セキュア・セッションを開始しますか？</string>
   <string name="auto_initiate_activity__initiate_exchange">交換開始</string>
@@ -213,12 +251,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">メッセージを送信</string>
   <string name="conversation_activity__send">送信</string>
   <string name="conversation_activity__remove">削除</string>
   <!--conversation_item_sent-->
@@ -230,12 +270,16 @@
   <!--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>
+  <!--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>
@@ -250,27 +294,43 @@
   <string name="export_fragment__export_plaintext_backup">非暗号テキストのバックアップ・ファイルをエクスポート</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n「SMSバックアップと復元」と互換性のある暗号化されていないテキストのバックアップ・ファイルをSDカードにエクスポートします</string>
   <string name="import_fragment__import_system_sms_database">端末内のSMSデータベースをインポート</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">端末の既定のメッセンジャー・アプリから\nデータベースをインポート</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">端末既定のメッセンジャー・アプリから\nデータベースをインポート</string>
   <string name="import_fragment__import_encrypted_backup">暗号化されたバックアップ・ファイルをインポート</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\n前回エクスポートした暗号化されたTextSecureバックアップ・ファイルを復元</string>
   <string name="import_fragment__import_plaintext_backup">非暗号テキストのバックアップ・ファイルをインポート</string>
   <string name="import_fragment__import_a_plaintext_backup_file">\n暗号化されていないテキストのバックアップ・ファイルをインポートします。「SMSバックアップと復元」と互換可能です。</string>
   <string name="local_identity__regenerate_key">鍵を再生成する</string>
   <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">この端末は、ご自分でMMS設定をする必要があります。</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">TextSecureパスワード</string>
   <string name="prompt_passphrase_activity__unlock">ロック解除</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecureでは、無線通信事業者からファイル付きメッセージを配信するのに、APN設定が必要です。お使いの携帯端末では、この設定のための情報が取得できません。ロックされた端末であるか、その他の制限設定があるとこのような状況が生じます。</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">ファイル付き及びグループ・メッセージを配信するのに、OKをクリックして設定を完了してください。お使いの通信事業者への設定値は通常、\"通信事業者APN”で検索すると設定できます。この作業の実行は一度だけでいいです。</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (必須):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMSプロキシ・ホスト (自由選択):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMSプロキシ・ポート (自由選択)</string>
+  <string name="prompt_mms_activity__mms_proxy_host_optional">MMSプロキシ・ホスト (オプション):</string>
+  <string name="prompt_mms_activity__mms_proxy_port_optional">MMSプロキシ・ポート (オプション)</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">完了</string>
   <!--registration_activity-->
+  <string name="registration_activity__your_country">あなたの国</string>
+  <string name="registration_activity__your_country_code_and_phone_number">あなたの国番号と電話番号</string>
+  <string name="registration_activity__phone_number">電話番号</string>
+  <string name="registration_activity__register">登録</string>
+  <string name="registration_activity__skip">スキップする</string>
   <!--registration_problems-->
+  <string name="registration_problems__incorrect_number">番号が間違っています。</string>
   <!--registration_progress_activity-->
+  <string name="registration_progress_activity__verify">確認する</string>
+  <string name="registration_progress_activity__edit_number">番号を編集</string>
+  <string name="registration_progress_activity__connectivity_error">接続エラー</string>
+  <string name="registration_progress_activity__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-->
@@ -288,6 +348,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>
@@ -301,10 +362,10 @@
   <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">受信する全てのSMS（テキストメッセージ）の表示、及び保存にTextSecureを使用します</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">受信する全てのMMS（ファイル付きメッセージ）の表示、及び保存にTextSecureを使用します</string>
+  <string name="preferences__enable_enter_key_title">エンターキーを使えるようにする</string>
+  <string name="preferences__replace_smiley_with_enter_key">顔文字ボタンをエンターキーにする</string>
   <string name="preferences__pref_enter_sends_title">Enterキーで送信</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enterキーを押すとテキストメッセージが送信されます</string>
   <string name="preferences__display_settings">表示設定</string>
@@ -327,6 +388,15 @@
   <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__pref_led_blink_custom_pattern_title">オリジナルのLED点滅パターンを設定する</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">点灯時間:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">消灯時間:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">オリジナルのLED点滅パターンが設定されました！</string>
+  <string name="preferences__sound">着信音</string>
+  <string name="preferences__change_notification_sound">通知音を変更</string>
+  <string name="preferences__inthread_notifications">スレッド内通知</string>
   <string name="preferences__vibrate">振動</string>
   <string name="preferences__also_vibrate_when_notified">通知する時に振動もする</string>
   <string name="preferences__minutes">分</string>
@@ -343,6 +413,7 @@
   <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">MMSC URL (必須)</string>
   <string name="preferences__mms_proxy_host_optional">MMSプロキシ・ホスト（選択自由）</string>
   <string name="preferences__mms_proxy_port_optional">MMSプロキシ・ポート（選択自由）</string>
@@ -360,6 +431,8 @@
   <string name="preferences__theme">テーマ</string>
   <string name="preferences__default">初期設定の言語</string>
   <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>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -368,6 +441,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-->
@@ -377,6 +451,7 @@
   <string name="conversation_context__menu_copy_text">テキストをコピー</string>
   <string name="conversation_context__menu_delete_message">メッセージの削除</string>
   <string name="conversation_context__menu_forward_message">メッセージの転送</string>
+  <string name="conversation_context__menu_resend_message">メッセージを再送信</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">セキュア・セッションを開始</string>
   <!--conversation_list_batch-->
@@ -386,9 +461,11 @@
   <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">IDを照合</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">添付</string>
+  <string name="conversation__menu_update_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>
@@ -403,7 +480,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-kn-rIN/strings.xml

@@ -27,7 +27,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>
@@ -64,8 +63,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-->
@@ -293,6 +290,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>
@@ -332,6 +332,7 @@
   <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ಇವು ಸೇರಿವೆ: </string>
   <string name="registration_problems__sms_interceptors">ಎಸ್ಎಂಎಸ್ ಅಂತಃಛೇದಕಗಳು.</string>
@@ -393,8 +394,6 @@
   <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>
@@ -473,6 +472,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-->
@@ -493,7 +493,7 @@
   <!--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>

res/values-my/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 ကဒ်သို့သိမ်းဆည်းနေ...</string>
   <string name="ConversationItem_save_to_sd_card">SD ကဒ်သို့သိမ်းမည်လား</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\nTransport: %2$s\nSent/Received:%3$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">ပို့သူ: %1$s\nTransport: %2$s\nSent: %3$s\nReceived:%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-->
@@ -62,6 +59,7 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_success">အောင်မြင်!</string>
   <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <!--KeyScanningActivity-->
@@ -185,6 +183,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>
@@ -203,6 +204,7 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS ပရောက်ဇီ PORT (အရေးမကြီး)</string>
   <!--receive_key_activity-->
   <!--registration_activity-->
+  <string name="registration_activity__skip">ကျော်</string>
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
@@ -233,8 +235,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">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>
@@ -286,6 +286,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-->
@@ -304,7 +305,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>