Bump version to 2.26.0

// FREEBIE

AndroidManifest.xml

@@ -2,16 +2,23 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="135"
-      android:versionName="2.22.2">
+      android:versionCode="146"
+      android:versionName="2.26.0">
 
-    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots"/>
+    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
                 android:protectionLevel="signature" />
 
-    <!--<uses-feature android:name="android.hardware.camera" android:required="false" />-->
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
+    <uses-feature android:name="android.hardware.location" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+
     <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
     <uses-permission android:name="android.permission.WRITE_PROFILE"/>
@@ -34,47 +41,47 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <!--<uses-permission android:name="android.permission.CAMERA" />-->
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
-    <!--&lt;!&ndash; For sending location tiles in the future &ndash;&gt;-->
-    <!--<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>-->
-    <!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>-->
+    <!-- For sending location tiles in the future -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
-    <!--&lt;!&ndash; So we can add a TextSecure 'Account' &ndash;&gt;-->
-    <!--<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />-->
-    <!--<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />-->
-    <!--<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />-->
-    <!--<uses-permission android:name="android.permission.USE_CREDENTIALS"/>-->
+    <!-- So we can add a TextSecure 'Account' -->
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
 
-    <!--&lt;!&ndash; For conversation 'shortcuts' on the desktop &ndash;&gt;-->
-    <!--<uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>-->
+    <!-- For conversation 'shortcuts' on the desktop -->
+    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
 
-    <!--&lt;!&ndash; For sending/receiving events &ndash;&gt;-->
-    <!--<uses-permission android:name="android.permission.WRITE_CALENDAR"/>-->
-    <!--<uses-permission android:name="android.permission.READ_CALENDAR"/>-->
+    <!-- For sending/receiving events -->
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
 
-    <!--&lt;!&ndash; For fixing MMS &ndash;&gt;-->
-    <!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->
-    <!--<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>-->
+    <!-- For fixing MMS -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
-    <!--&lt;!&ndash; Set image as wallpaper &ndash;&gt;-->
-    <!--<uses-permission android:name="android.permission.SET_WALLPAPER"/>-->
-    <!-- -->
-    <!--&lt;!&ndash; Permissions from RedPhone &ndash;&gt;-->
-    <!--<uses-permission android:name="android.permission.RECORD_AUDIO" />-->
-    <!--<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />-->
-    <!--<uses-permission android:name="android.permission.BLUETOOTH" />-->
-    <!--<uses-permission android:name="android.permission.BROADCAST_STICKY" />-->
-    <!--<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />-->
-    <!--<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />-->
-    <!--<uses-permission android:name="android.permission.CALL_PHONE" />-->
-    <!--<uses-permission android:name="android.permission.CALL_PRIVILEGED" />-->
-    <!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />-->
-    <!--<uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />-->
-    <!--<uses-permission android:name="android.permission.READ_CALL_STATE"/>-->
-    <!--<uses-permission android:name="android.permission.READ_LOGS"/>-->
-    <!--<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>-->
+    <!-- Set image as wallpaper -->
+    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+
+    <!-- Permissions from RedPhone -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
+    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
 
     <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
                 android:protectionLevel="signature" />
@@ -148,12 +155,13 @@
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
 
+
+
     </activity-alias>
 
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".ConversationPopupActivity"
@@ -199,8 +207,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:label="@string/AndroidManifest__select_contacts"
-              android:windowSoftInputMode="stateVisible"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PushContactSelectionActivity"
@@ -234,7 +241,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
      <activity android:name=".DeviceListActivity"
-               android:label="@string/AndroidManifest_manage_paired_devices"
+               android:label="@string/AndroidManifest_manage_linked_devices"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".LogSubmitActivity"
@@ -278,6 +285,11 @@
             <data android:scheme="mms" />
             <data android:scheme="mmsto" />
         </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact" />
+        </intent-filter>
     </activity>
 
     <activity android:name=".RecipientPreferenceActivity"
@@ -308,6 +320,20 @@
         </intent-filter>
     </service>
 
+    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.accounts.AccountAuthenticator" />
+        </intent-filter>
+        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
+    </service>
+
+    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.content.SyncAdapter"/>
+        </intent-filter>
+        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
+        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
+    </service>
 
     <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
         <intent-filter>

BUILDING.md

@@ -38,8 +38,8 @@ Source assets tend to be large binary blobs, which are best stored outside of gi
 Sample command for generating our audio placeholder image:
 
 ```bash
-pngs_from_svg.py ic_audio.svg /path/to/TextSecure/res/ 150 "#000" 0.54 _light
-pngs_from_svg.py ic_audio.svg /path/to/TextSecure/res/ 150 "#fff" 1.0 _dark
+pngs_from_svg.py ic_audio.svg /path/to/TextSecure/res/ 150 --color #000 --opacity 0.54 --suffix _light
+pngs_from_svg.py ic_audio.svg /path/to/TextSecure/res/ 150 --color #fff --opacity 1.00 --suffix _light
 ```
 
 Setting up a development environment

README.md

@@ -16,11 +16,9 @@ https://github.com/WhisperSystems/TextSecure/issues
 ## Joining the Beta
 Want to live life on the bleeding edge and help out with testing?
 
-You can subscribe to TextSecure Beta releases in two steps:
+You can subscribe to TextSecure Beta releases here:
+https://play.google.com/apps/testing/org.thoughtcrime.securesms
  
-1. Join the [TextSecure Beta Google+ Community](https://plus.google.com/communities/114424213916773497091).
-1. After you've joined the community, [subscribe to the beta](https://play.google.com/apps/testing/org.thoughtcrime.securesms).
-
 If you're interested in a life of peace and tranquility, stick with the standard releases.
 
 ## Contributing Translations
@@ -47,7 +45,7 @@ whispersystems@lists.riseup.net
 https://lists.riseup.net/www/info/whispersystems
 
 ## Contributing Funds
-[![Donate](https://www.coinbase.com/assets/buttons/donation_large-36ee936185fdf9a88e3a28cc685fb9b7.png)](https://coinbase.com/checkouts/d29fd4c37ca442393e32fdcb95304701)
+[![Donate](https://www.coinbase.com/assets/buttons/donation_large-5e1b50d6490970e32b80023f3070b1d77afc621b9e64ac996596a67a4671967b.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b)
 
 You can add funds to BitHub to directly help further development efforts.
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         classpath files('libs/gradle-witness.jar')
     }
 }
@@ -44,7 +44,7 @@ dependencies {
     compile 'org.w3c:smil:1.0.0'
     compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
     compile 'com.github.chrisbanes.photoview:library:1.2.3'
-    compile 'com.github.bumptech.glide:glide:3.6.0'
+    compile 'com.github.bumptech.glide:glide:3.6.1'
     compile 'com.makeramen:roundedimageview:2.1.0'
     compile 'com.pnikosis:materialish-progress:1.5'
     compile 'de.greenrobot:eventbus:2.4.0'
@@ -78,7 +78,8 @@ dependencies {
     compile 'org.whispersystems:jobmanager:0.11.0'
     compile 'org.whispersystems:libpastelog:1.0.6'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'org.whispersystems:textsecure-android:1.6.1'
+    compile 'org.whispersystems:textsecure-android:1.6.2'
+    compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0'
 
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
@@ -108,7 +109,7 @@ dependencyVerification {
             'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
             'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
             'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc',
-            'com.github.bumptech.glide:glide:adf657e6bddccb168a29e18ab0954043af46a9b5c736d8c3193c9783fd83d69e',
+            'com.github.bumptech.glide:glide:4718ac4c57ebabe56e673dc3265950b9dbf940d1c43c0adc363e8b95c0abdf75',
             'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1',
             'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54',
             'de.greenrobot:eventbus:61d743a748156a372024d083de763b9e91ac2dcb3f6a1cbc74995c7ddab6e968',
@@ -128,11 +129,11 @@ dependencyVerification {
             'org.whispersystems:jobmanager:ea9cb943c4892fb90c1eea1be30efeb85cefca213d52c788419553b58d0ed70d',
             'org.whispersystems:libpastelog:550d33c565380d90f4c671e7b8ed5f3a6da55a9fda468373177106b2eb5220b2',
             'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
-            'org.whispersystems:textsecure-android:843d4483e9c3b3414373ddd70df19895b3ee7ef559eeb15e60926e1b07fcecf3',
+            'org.whispersystems:textsecure-android:6fc3a127b4ab63533e571066a8c6686e82d071d804f4563eee66a3773dd094e0',
             'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
             'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
             'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
-            'org.whispersystems:textsecure-java:f161c5d5be5a0ba52ede273692ef17982b2af270c6af5c3666bc2adb289a3f61',
+            'org.whispersystems:textsecure-java:9167ae6cbc34b62b5d51b2dd687306ca94eab6cf5fa7cf426f40ec32d3d37cf8',
             'org.whispersystems:axolotl-android:40d3db5004a84749a73f68d2f0d01b2ae35a73c54df96d8c6c6723b96efb6fc0',
             'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab',
             'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
@@ -152,7 +153,6 @@ dependencyVerification {
 android {
     compileSdkVersion 22
     buildToolsVersion '22.0.1'
-    testBuildType "automation"
 
     dexOptions {
         javaMaxHeapSize "4g"
@@ -208,11 +208,6 @@ android {
             proguardFiles = buildTypes.debug.proguardFiles
             signingConfig signingConfigs.release
         }
-        automation.initWith(buildTypes.debug)
-        automation {
-            proguardFile 'proguard-automation.pro'
-            buildConfigField "String", "PUSH_URL", "\"https://textsecure-service-staging.whispersystems.org\""
-        }
         dev.initWith(buildTypes.debug)
         dev {
             buildConfigField "boolean", "DEV_BUILD", "true"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Nov 28 10:03:17 PST 2014
+#Wed Jul 22 14:31:11 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip

res/drawable-v21/conversation_list_item_background.xml

@@ -7,4 +7,4 @@
             <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
         </selector>
     </item>
-</ripple>
+</ripple>

res/drawable-v21/conversation_list_item_unread_background.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/textsecure_primary">
+    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+    <item>
+        <selector>
+            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/conversation_list_item_background_unread_light" />
+        </selector>
+    </item>
+</ripple>

res/drawable-v21/conversation_list_item_unread_background_dark.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/textsecure_primary">
+    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+    <item>
+        <selector>
+            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/conversation_list_item_background_unread_dark" />
+        </selector>
+    </item>
+</ripple>

res/drawable/blocked_indicator_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="4dp" />
+</shape>

res/drawable/conversation_attachment_close_circle.xml

@@ -9,7 +9,7 @@
     <item>
         <shape android:shape="oval">
             <size android:height="21dp" android:width="21dp"/>
-            <solid android:color="@color/textsecure_primary_dark"/>
+            <solid android:color="@color/red_600"/>
             <stroke android:color="@android:color/transparent"
                     android:width="3dp"/>
         </shape>

res/drawable/conversation_list_item_unread_background.xml

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

res/drawable/conversation_list_item_unread_background_dark.xml

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

res/layout/color_preference_items.xml

@@ -11,11 +11,21 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                      xmlns:app="http://schemas.android.com/apk/res-auto"
-                                      android:id="@+id/color_grid"
-                                      android:padding="16dp"
-                                      android:layout_width="wrap_content"
-                                      android:layout_height="wrap_content"
-                                      app:orientation="horizontal"
-                                      app:columnCount="5"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_gravity="center"
+             android:gravity="center">
+
+    <android.support.v7.widget.GridLayout
+            android:id="@+id/color_grid"
+            android:padding="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            app:orientation="horizontal"
+            app:columnCount="5"/>
+</FrameLayout>
+

res/layout/contact_selection_activity.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_gravity="center"
+              android:layout_height="fill_parent"
+              android:layout_width="fill_parent"
+              android:orientation="vertical"
+              xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_width="match_parent"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:theme="@style/TextSecure.LightActionBar">
+
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="match_parent"
+                      android:orientation="horizontal">
+
+            <ImageView android:id="@+id/action_icon"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_gravity="center_vertical"
+                       android:gravity="center_vertical"
+                       android:clickable="true"
+                       android:background="@drawable/circle_touch_highlight_background"
+                       android:src="@drawable/ic_search_white_24dp" />
+
+            <LinearLayout android:id="@+id/toggle_container"
+                          android:layout_width="match_parent"
+                          android:layout_height="match_parent"
+                          android:orientation="horizontal">
+
+                <EditText android:id="@+id/search_view"
+                          android:layout_height="wrap_content"
+                          android:layout_width="0px"
+                          android:layout_weight="1"
+                          android:layout_marginLeft="5dp"
+                          android:hint="@string/contact_selection_activity__enter_name_or_number"
+                          android:inputType="textPersonName"
+                          style="@style/TextSecure.TitleTextStyle"
+                          android:background="@android:color/transparent"
+                          android:layout_gravity="center_vertical"
+                          android:gravity="center_vertical"/>
+
+                <org.thoughtcrime.securesms.components.AnimatingToggle
+                        android:id="@+id/button_toggle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center">
+
+                    <ImageView android:id="@+id/search_dialpad"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:layout_gravity="center_vertical"
+                               android:gravity="center_vertical"
+                               android:clickable="true"
+                               android:background="@drawable/circle_touch_highlight_background"
+                               android:src="@drawable/ic_dialpad_white_24dp" />
+
+                    <ImageView android:id="@+id/search_keyboard"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:layout_gravity="center_vertical"
+                               android:gravity="center_vertical"
+                               android:clickable="true"
+                               android:visibility="gone"
+                               android:background="@drawable/circle_touch_highlight_background"
+                               android:src="@drawable/ic_keyboard_white_24dp" />
+
+                    <ImageView android:id="@+id/search_clear"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:layout_gravity="center_vertical"
+                               android:gravity="center_vertical"
+                               android:clickable="true"
+                               android:visibility="gone"
+                               android:background="@drawable/circle_touch_highlight_background"
+                               android:src="@drawable/ic_clear_white_24dp" />
+
+                </org.thoughtcrime.securesms.components.AnimatingToggle>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.Toolbar>
+
+    <fragment
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/contact_selection_list_fragment"
+        android:name="org.thoughtcrime.securesms.ContactSelectionListFragment">
+        </fragment>
+
+</LinearLayout>

res/layout/contact_selection_list_fragment.xml

@@ -0,0 +1,26 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+    
+    <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <TextView android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center|center_vertical"
+            android:layout_marginTop="15dp"
+            android:text="@string/contact_selection_group_activity__finding_contacts"
+            android:textSize="20sp" />
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+</LinearLayout>

res/layout/contact_selection_list_header.xml

@@ -14,12 +14,7 @@
               android:layout_centerVertical="true"
               android:layout_alignParentLeft="true"
               android:textSize="15sp"
-              android:textColor="?conversation_selection_header_text"
+              android:textColor="?contact_selection_header_text"
               android:textStyle="bold" />
 
-    <View android:layout_width="match_parent"
-          android:layout_height="3dp"
-          android:layout_alignParentBottom="true"
-          android:layout_marginTop="2dp"
-          android:background="?conversation_selection_header_text" />
 </RelativeLayout>

res/layout/contact_selection_list_item.xml

@@ -48,7 +48,8 @@
 
     </LinearLayout>
 
-    <TextView android:id="@+id/name"
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/number_container"

res/layout/conversation_activity.xml

@@ -1,87 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
+<org.thoughtcrime.securesms.components.InputAwareLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/quick_attachment_drawer"
+    android:id="@+id/layout_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
-<org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
-        android:id="@+id/layout_container"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+<org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
+        android:id="@+id/quick_attachment_drawer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <RelativeLayout android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:background="?conversation_background"
-                    android:paddingTop="?attr/actionBarSize"
-                    android:gravity="bottom">
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:orientation="vertical"
+                  android:paddingTop="?attr/actionBarSize"
+                  android:gravity="bottom">
 
         <FrameLayout android:id="@+id/fragment_content"
                      android:layout_width="match_parent"
-                     android:layout_height="match_parent"
-                     android:layout_above="@+id/bottom_container" />
+                     android:layout_height="0dp"
+                     android:layout_weight="1" />
 
-        <LinearLayout
-                android:layout_alignParentBottom="true"
-                android:id="@id/bottom_container"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+        <FrameLayout android:id="@+id/attachment_editor"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     android:gravity="center_horizontal"
+                     android:background="?android:windowBackground"
+                     android:visibility="gone">
 
-            <ScrollView android:layout_width="fill_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1">
-                <FrameLayout
-                        android:id="@+id/attachment_editor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:visibility="gone">
+            <org.thoughtcrime.securesms.components.ThumbnailView
+                android:id="@+id/attachment_thumbnail"
+                android:layout_width="230dp"
+                android:layout_height="150dp"
+                android:layout_gravity="center_horizontal"
+                android:contentDescription="@string/conversation_activity__attachment_thumbnail"
+                app:backgroundColorHint="?conversation_background" />
 
-                    <FrameLayout
-                            android:paddingLeft="10dp"
-                            android:paddingTop="10dp"
-                            android:layout_width="fill_parent"
-                            android:layout_height="fill_parent">
+        </FrameLayout>
 
-                        <org.thoughtcrime.securesms.components.ThumbnailView
-                                android:id="@+id/attachment_thumbnail"
-                                android:layout_width="230dp"
-                                android:layout_height="150dp"
-                                app:riv_corner_radius="3dp"
-                                android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
-                    </FrameLayout>
+        <LinearLayout android:id="@+id/bottom_panel"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:gravity="center_vertical"
+                      android:orientation="horizontal"
+                      android:clickable="true"
+                      android:background="?android:windowBackground"
+                      android:padding="5dp">
 
-                    <ImageView android:id="@+id/remove_image_button"
-                               android:layout_width="wrap_content"
-                               android:layout_height="wrap_content"
-                               android:src="@drawable/conversation_attachment_close_circle"
-                               android:layout_gravity="top|left"/>
-
-               </FrameLayout>
-            </ScrollView>
-
-            <LinearLayout android:id="@+id/bottom_panel"
-                          android:layout_width="fill_parent"
+            <LinearLayout android:id="@+id/compose_bubble"
+                          android:layout_width="0dp"
                           android:layout_height="wrap_content"
-                          android:gravity="center_vertical"
-                          android:orientation="horizontal"
-                          android:padding="5dp">
+                          android:layout_weight="1"
+                          android:background="@drawable/sent_bubble">
 
-                <LinearLayout android:id="@+id/compose_bubble"
-                              android:layout_width="0dp"
-                              android:layout_height="wrap_content"
-                              android:layout_weight="1"
-                              android:background="@drawable/sent_bubble">
-
-                    <org.thoughtcrime.securesms.components.emoji.EmojiToggle
+                <org.thoughtcrime.securesms.components.emoji.EmojiToggle
                         android:id="@+id/emoji_toggle"
                         android:layout_width="37dp"
                         android:layout_height="37dp"
@@ -89,7 +65,7 @@
                         android:background="@drawable/touch_highlight_background"
                         android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
 
-                    <org.thoughtcrime.securesms.components.ComposeText
+                <org.thoughtcrime.securesms.components.ComposeText
                         style="@style/ComposeEditText"
                         android:id="@+id/embedded_text_editor"
                         android:layout_width="0dp"
@@ -101,36 +77,34 @@
                         android:nextFocusRight="@+id/send_button"
                         tools:hint="Send TextSecure message" />
 
-                    <org.thoughtcrime.securesms.components.camera.HidingImageButton
-                            android:id="@+id/quick_attachment_toggle"
-                            android:layout_width="37dp"
-                            android:layout_height="37dp"
-                            android:layout_gravity="bottom"
-                            android:src="?quick_camera_icon"
-                            android:background="@drawable/touch_highlight_background"
-                            android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
-                            android:visibility="gone"
-                            android:padding="10dp" />
-                </LinearLayout>
+                <org.thoughtcrime.securesms.components.camera.HidingImageButton
+                        android:id="@+id/quick_attachment_toggle"
+                        android:layout_width="37dp"
+                        android:layout_height="37dp"
+                        android:layout_gravity="bottom"
+                        android:src="?quick_camera_icon"
+                        android:background="@drawable/touch_highlight_background"
+                        android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
+                        android:padding="10dp" />
+            </LinearLayout>
 
-                <org.thoughtcrime.securesms.components.AnimatingToggle
+            <org.thoughtcrime.securesms.components.AnimatingToggle
                     android:id="@+id/button_toggle"
                     android:layout_width="50dp"
                     android:layout_height="50dp"
                     android:background="@drawable/circle_tintable"
                     android:layout_gravity="bottom">
 
-                    <ImageButton
-                        android:id="@+id/attach_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle_touch_highlight_background"
-                        android:src="@drawable/ic_attach_white_24dp"
-                        android:contentDescription="@string/ConversationActivity_add_attachment"
-                        android:nextFocusLeft="@+id/embedded_text_editor" />
+                <ImageButton android:id="@+id/attach_button"
+                             android:layout_width="match_parent"
+                             android:layout_height="match_parent"
+                             android:layout_gravity="center"
+                             android:background="@drawable/circle_touch_highlight_background"
+                             android:src="@drawable/ic_attach_white_24dp"
+                             android:contentDescription="@string/ConversationActivity_add_attachment"
+                             android:nextFocusLeft="@+id/embedded_text_editor" />
 
-                    <org.thoughtcrime.securesms.components.SendButton
+                <org.thoughtcrime.securesms.components.SendButton
                         android:id="@+id/send_button"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -139,31 +113,32 @@
                         android:src="?conversation_transport_sms_indicator"
                         android:background="@drawable/circle_touch_highlight_background" />
 
-                </org.thoughtcrime.securesms.components.AnimatingToggle>
-
-            </LinearLayout>
-
-            <Button android:id="@+id/unblock_button"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="20dp"
-                    android:text="@string/ConversationActivity_unblock"
-                    android:visibility="gone"/>
-
-           <TextView android:id="@+id/space_left"
-                     android:paddingLeft="5dip"
-                     android:layout_width="fill_parent"
-                     android:layout_height="wrap_content"
-                     android:visibility="gone"
-                     android:text="160/160 (1)" />
+            </org.thoughtcrime.securesms.components.AnimatingToggle>
 
         </LinearLayout>
-    </RelativeLayout>
-    
-    <ViewStub android:id="@+id/emoji_drawer_stub"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:inflatedId="@+id/emoji_drawer"
-              android:layout="@layout/emoji_drawer_stub" />
-</org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout>
+
+        <Button android:id="@+id/unblock_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/ConversationActivity_unblock"
+                android:visibility="gone"/>
+
+        <TextView android:id="@+id/space_left"
+                  android:paddingLeft="5dip"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:visibility="gone"
+                  android:background="?android:windowBackground"
+                  android:text="160/160 (1)" />
+
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
+                android:id="@+id/emoji_drawer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone" />
+
+    </LinearLayout>
 </org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>
+</org.thoughtcrime.securesms.components.InputAwareLayout>

res/layout/conversation_fragment.xml

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

res/layout/conversation_item_received.xml

@@ -54,8 +54,6 @@
                     android:adjustViewBounds="true"
                     android:contentDescription="@string/conversation_item__mms_image_description"
                     android:visibility="gone"
-                    app:riv_corner_radius="@dimen/message_bubble_corner_radius"
-                    app:riv_border_width="0dp"
                     tools:src="@drawable/ic_video_light"
                     tools:visibility="visible" />
 

res/layout/conversation_item_sent.xml

@@ -65,8 +65,6 @@
                     android:adjustViewBounds="true"
                     android:contentDescription="@string/conversation_item__mms_image_description"
                     android:visibility="gone"
-                    app:riv_corner_radius="@dimen/message_bubble_corner_radius"
-                    app:riv_border_width="0dp"
                     tools:src="@drawable/ic_video_light"
                     tools:visibility="visible" />
 

res/layout/device_list_fragment.xml

@@ -27,7 +27,7 @@
               android:gravity="center|center_vertical"
               android:textSize="20sp"
               android:visibility="gone"
-              android:text="@string/device_list_fragment__no_devices_paired"/>
+              android:text="@string/device_list_fragment__no_devices_linked"/>
 
     <ListView android:id="@id/android:list"
               android:layout_width="match_parent"

res/layout/emoji_drawer.xml

@@ -40,7 +40,6 @@
             android:id="@+id/emoji_pager"
             android:visibility="visible"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?emoji_background" />
+            android:layout_height="match_parent" />
 
 </merge>

res/layout/emoji_drawer_stub.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.emoji.EmojiDrawer
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_weight="1.1" />

res/layout/group_create_activity.xml

@@ -25,7 +25,6 @@
                 android:layout_width="70dp"
                 android:layout_height="70dp"
                 position="bottom_right"
-                app:riv_oval="true"
                 android:layout_marginRight="10dp"
                 android:src="@drawable/ic_group_photo"
                 android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />

res/layout/new_conversation_activity.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_gravity="center"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              android:orientation="vertical"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <fragment
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/contact_selection_list_fragment"
-        android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
-        </fragment>
-
-</LinearLayout>

res/layout/push_contact_selection_activity.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_gravity="center"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              android:orientation="vertical"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <fragment
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/contact_selection_list_fragment"
-        android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
-        </fragment>
-
-</LinearLayout>

res/layout/push_contact_selection_list_activity.xml

@@ -1,27 +0,0 @@
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-    <EditText android:id="@+id/filter"
-              android:inputType="textPersonName"
-              android:layout_width="match_parent"
-              android:layout_height="45sp"
-              android:hint="@string/recipients_panel__to"
-              android:textColor="?conversation_editor_text_color" />
-
-    <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <TextView android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|center_vertical"
-        android:layout_marginTop="15dp"
-        android:text="@string/contact_selection_group_activity__finding_contacts"
-        android:textSize="20sp" />
-
-</LinearLayout>

res/layout/quick_attachment_drawer.xml

@@ -5,6 +5,6 @@
         android:id="@+id/quick_camera"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone" />
+        android:visibility="invisible" />
 
 </merge>

res/layout/recipient_filter_item.xml

@@ -30,7 +30,8 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <TextView android:id="@+id/name"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/name"
             style="?android:attr/dropDownItemStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

res/layout/recipient_preference_activity.xml

@@ -32,7 +32,8 @@
                           android:orientation="vertical"
                           android:paddingLeft="10dp">
 
-                <TextView android:id="@+id/name"
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                          android:id="@+id/name"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:ellipsize="end"
@@ -48,6 +49,12 @@
                           android:textStyle="bold"
                           android:textColor="?recipient_preference_blocked"
                           android:textAllCaps="true"
+                          android:background="@drawable/blocked_indicator_background"
+                          android:paddingTop="3dp"
+                          android:paddingBottom="3dp"
+                          android:paddingLeft="5dp"
+                          android:paddingRight="5dp"
+                          android:layout_marginTop="2dp"
                           tools:ignore="UnusedAttribute" />
 
             </LinearLayout>

res/layout/thumbnail_view.xml

@@ -1,26 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.makeramen.roundedimageview.RoundedImageView
-            android:id="@+id/thumbnail_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="fitCenter"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/conversation_item__mms_image_description"
-            android:layout_margin="@dimen/media_bubble_border_width"
-            app:riv_corner_radius="@dimen/message_bubble_corner_radius" />
+    <ImageView android:id="@+id/thumbnail_image"
+               android:layout_width="match_parent"
+               android:layout_height="match_parent"
+               android:adjustViewBounds="true"
+               android:scaleType="fitCenter"
+               android:contentDescription="@string/conversation_item__mms_image_description"
+               android:layout_margin="@dimen/media_bubble_border_width" />
 
-    <com.pnikosis.materialishprogress.ProgressWheel
-            android:id="@+id/progress_wheel"
-            android:layout_width="70dp"
-            android:layout_height="70dp"
-            android:layout_gravity="center"
-            android:background="@drawable/progress_background"
-            android:visibility="gone"
-            app:matProg_barColor="@color/white"
-            app:matProg_linearProgress="true"
-            app:matProg_spinSpeed="0.333" />
+    <ViewStub android:id="@+id/progress_wheel_stub"
+              android:layout_width="70dp"
+              android:layout_height="70dp"
+              android:layout_gravity="center"
+              android:layout="@layout/thumbnail_view_progress_wheel" />
 
+    <ViewStub android:id="@+id/remove_button_stub"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="top|right"
+              android:layout="@layout/thumbnail_view_remove_button" />
+
+    <ImageButton android:id="@+id/download_button"
+                 android:layout_width="70dp"
+                 android:layout_height="70dp"
+                 android:layout_gravity="center"
+                 android:background="@drawable/progress_background"
+                 android:src="@drawable/ic_file_download_white_36dp"
+                 android:visibility="gone" />
 </merge>

res/layout/thumbnail_view_progress_wheel.xml

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

res/layout/thumbnail_view_remove_button.xml

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

res/menu/push_directory.xml

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

res/values-ar/strings.xml

@@ -10,11 +10,11 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">لم تقم بتحديد عبارة سرية بعد!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s رسائل في المحادثة</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">احذف جميع الرسائل القديمة الآن؟</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من حذف جميع الرسائل بالمحادثات وابقاء أحدث %s رسالة فقط؟</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من حذف جميع الرسائل بالمحادثات وإبقاء أحدث %s رسالة فقط؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">إلغاء تشفير مساحة التخزين؟</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-تحذير: سيتم إلغاء تشفير مساحة تخزين الرسائل والمفاتيح. سوف تستمر محادثاتك المشفرة في العمل، ولكن سيكون أي شخص قادر على النفاذ إليهم إذا تمكن من الوصول إلى الهاتف.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">تعطيل العبارة السرية؟</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+إلغاء قفل الشاشة للرسائل؟</string>
   <string name="ApplicationPreferencesActivity_disable">تعطيل</string>
   <string name="ApplicationPreferencesActivity_unregistering">جارٍ إلغاء التسجيل</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">جارٍ إلغاء التسجيل من رسائل تيكست سيكيور...</string>
@@ -40,7 +40,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">لم يتم العثور على تطبيق لاختيار ملف.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">التقط صورة</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">كاميرا</string>
   <string name="AttachmentTypeSelectorAdapter_picture">صورة</string>
   <string name="AttachmentTypeSelectorAdapter_video">فيديو</string>
   <string name="AttachmentTypeSelectorAdapter_audio">صوت</string>
@@ -51,6 +51,8 @@
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">لقد تغير المفتاح التعريفي الخاص بـ%1$s. وهذا يعني أن شخص ما يحاول اعتراض المحادثة أو %2$s  قام بإعادة تثبيت تيكست سيكيور وأصبح لديه مفتاح تعريفي جديد.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال.</string>
   <string name="ConfirmIdentityDialog_accept">موافقة</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">رسالة %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">حجم الرسالة: %d كيلوبايت</string>
   <string name="ConversationItem_expires_s">تاريخ الانتهاء: %s</string>
@@ -77,6 +79,7 @@
   <string name="ConversationActivity_select_contact_info">أختر بيانات جهة الاتصال</string>
   <string name="ConversationActivity_compose_message">إنشاء رسالة</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">عذراً، حصل خطأ أثناء رفع المرفق.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">حجم الملف كبير للغاية!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">عذرا، حجم الفيديو يتجاوز الحد المسموح (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">عذرا، حجم ملف الصوت يتجاوز الحد المسموح (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">الطرف الآخر ليس رقم هاتف أو عنوان بريد الكتروني صحيح!</string>
@@ -140,16 +143,16 @@
   <string name="DateUtils_now">الآن</string>
   <string name="DateUtils_minutes_ago">%d دقيقة</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">قطع اتصال \'%s\'؟</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">الجهاز لن يتمكن من إرسال أو استقبال رسائل بعد قطع الاتصال.</string>
+  <string name="DeviceListActivity_unlink_s">إلغاء ربط  \'%s\'؟</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">لن يكون إرسال واستقبال الرسائل ممكنا بمجرد إلغاء ربط الجهاز.</string>
   <string name="DeviceListActivity_network_connection_failed">فشل في اتصال الشبكة...</string>
   <string name="DeviceListActivity_try_again">حاول مجددا</string>
-  <string name="DeviceListActivity_disconnecting_device">جارٍ فصل الجهاز...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">جارٍ فصل الجهاز</string>
+  <string name="DeviceListActivity_unlinking_device">جارٍ إلغاء ربط الجهاز...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">جارٍ إلغاء ربط الجهاز</string>
   <string name="DeviceListActivity_network_failed">فشل في الشبكة!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">جهاز غير مسمى</string>
-  <string name="DeviceListItem_created_s">أُنُشِئْتُ %s</string>
+  <string name="DeviceListItem_linked_s">متصل %s</string>
   <string name="DeviceListItem_last_active_s">آخر مرة %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">شارك مع</string>
@@ -237,13 +240,13 @@
   <string name="DeviceProvisioningActivity_content_bullets">
 قراءة كل رسائلك.
 \n- استخدام أسمك للإرسال</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">إضافة جهاز</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">جارٍ إضافة جهاز جديد...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">تم إضافة الجهاز!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">ربط الجهاز</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">جارٍ ربط الجهاز...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">الجهاز متصل!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">لم يتم العثور على جهاز.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">خطأ في الشبكة.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">الرمز غير سليم.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">نأسف، لديك العديد من الأجهزة المسجلة مسبقا. حاول فصل بعضهم...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">عذرا، لديك بالفعل أجهزة عديدة متصلة. حاول إزالة بعضهم...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_watermark_content_description">أيقونة تيكست سيكيور</string>
@@ -375,32 +378,33 @@
   <string name="KeyCachingService_passphrase_cached">تيكست سيكيور غير مقفل</string>
   <string name="KeyCachingService_lock">أقفل بالعبارة السرية</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d رسالة في %2$d محادثات</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d رسائل جديدة في %2$d محادثات</string>
   <string name="MessageNotifier_most_recent_from_s">الأحدث من: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">رسالة مشفرة...</string>
   <string name="MessageNotifier_media_message_with_text">رسالة وسائط متعددة: %s</string>
   <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
   <string name="MessageNotifier_message_delivery_failed">فشل توصيل الرسالة.</string>
   <string name="MessageNotifier_failed_to_deliver_message">فشل توصيل الرسالة.</string>
   <string name="MessageNotifier_error_delivering_message">خطأ بالارسال</string>
   <string name="MessageNotifier_mark_all_as_read">اعتبر جميع الرسائل مقروءة</string>
+  <string name="MessageNotifier_mark_read">اعتبرها مقروءة</string>
   <string name="MessageNotifier_media_message">رسالة وسائط متعددة</string>
   <string name="MessageNotifier_reply">رَدّ</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">الردود السريعة غير متاحة عند قفل تيكست سيكيور</string>
   <string name="QuickResponseService_problem_sending_message">مشكلة في الإرسال!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">رسالة تيكست سيكيور جديدة</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">المحتويات مخفية</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">العبارة السرية القديمة:</string>
   <string name="change_passphrase_activity__new_passphrase">العبارة السرية الجديدة:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">تكرار العبارة السرية الجديدة:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">أدخل أسم أو رقم</string>
   <!--contact_selection_group_activity-->
-  <!--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="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">أنت غير مسجل في خدمة دفع الوصول إلى الرسائل...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">تحديث القائمة</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">تحديث قائمة دفع وصول الرسائل</string>
   <string name="SingleContactSelectionActivity_contact_photo">صورة جهة الاتصال</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">اختيار من أجل</string>
@@ -441,7 +445,7 @@
   <string name="country_selection_fragment__loading_countries">تحميل البلدان جارٍ ...</string>
   <string name="country_selection_fragment__search">بحث</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">لا يوجد أجهزة مقترنة...</string>
+  <string name="device_list_fragment__no_devices_linked">لا توجد أجهزة متصلة...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">تعذر التقاط سجلات التصحيح من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
   <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
@@ -506,6 +510,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__powered_by_twilio">مدعم بواسطة Twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">بعض المشاكل المحتملة
 وتتضمن:</string>
@@ -575,9 +580,9 @@
   <string name="AndroidManifest__media_overview">جميع الصور</string>
   <string name="AndroidManifest__media_overview_named">جميع الصور مع %1$s</string>
   <string name="AndroidManifest__message_details">تفاصيل الرسالة</string>
-  <string name="AndroidManifest_manage_paired_devices">إدارة الأجهزة المقترنة</string>
+  <string name="AndroidManifest_manage_linked_devices">إدارة الأجهزة المتصلة</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">استيراد \ تصدير</string>
+  <string name="arrays__import_export">استيراد / تصدير</string>
   <string name="arrays__my_identity_key">مفتاح هويتي</string>
   <string name="arrays__use_default">استخدم الافتراضي</string>
   <string name="arrays__use_custom">تخصيص</string>
@@ -588,6 +593,8 @@
   <string name="arrays__settings_default">الإعدادات الافتراضية</string>
   <string name="arrays__enabled">مفعل</string>
   <string name="arrays__disabled">معطل</string>
+  <string name="arrays__name_and_message">الاسم والرسالة</string>
+  <string name="arrays__name_only">الاسم فقط</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="zero">%d صفر</item>
@@ -616,7 +623,7 @@
   <string name="preferences__change_my_passphrase">غير عبارتي السرية</string>
   <string name="preferences__enable_passphrase">تفعيل العبارة السرية</string>
   <string name="preferences__passphrase_summary">عبارة سرية %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">تفعيل تشفير تخزين الرسائل والمفاتيح</string>
+  <string name="preferences__enable_lock_screen_for_messages">تفعيل قفل الشاشة للرسائل</string>
   <string name="preferences__screen_security">تأمين الشاشة</string>
   <string name="preferences__screen_security_summary">تأمين الشاشة %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">منع لقطات الشاشة داخل التطبيق</string>
@@ -625,8 +632,8 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">تحديد مهلة العبارة السرية</string>
   <string name="preferences__pref_timeout_interval_title">مدة الصلاحية</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">الوقت اللازم ليتم مسح العبارة السرية من الذاكرة</string>
-  <string name="preferences__notifications">التنبيهات</string>
-  <string name="preferences__display_message_notifications_in_status_bar">عرض تنبيهات الرسائل بشريط التنبيهات</string>
+  <string name="preferences__notifications">الإشعارات</string>
+  <string name="preferences__enable_message_notifications">تفعيل إشعارات الرسالة</string>
   <string name="preferences__led_color">لون ضوء التنبيه LED</string>
   <string name="preferences__led_color_unknown">مجهول</string>
   <string name="preferences__pref_led_blink_title">نمط وميض LED</string>
@@ -636,7 +643,7 @@
   <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__inthread_notifications">إشعارات داخل المحادثة</string>
   <string name="preferences__play_inthread_notifications">تفعيل تنبيه صوتي أثناء مطالعة محادثة نشطة</string>
   <string name="preferences__repeat_alerts">تكرار التنبيهات</string>
   <string name="preferences__never">أبدا</string>
@@ -694,6 +701,7 @@
   <string name="preferences__support_wifi_calling">وضع التوافق مع \'مكالمات الواي فاي\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">يمكنك تفعيل الخاصية إذا كان هاتفك يستخدم الواي فاي لتسليم الرسائل النصية والوسائط المتعددة ( قم بالتفعيل فقط في حال تفعيل الاتصال عبر الواي فاي بهاتفك)</string>
   <string name="preferences_app_protection__blocked_contacts">جهات الاتصال المحظورة</string>
+  <string name="preferences_notifications__display_in_notifications">أظهر في الإشعارات </string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-be/strings.xml

@@ -12,10 +12,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Выдаліць усе старыя паведамленні зараз?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы ўпэўненыя, што хочаце адразу абрэзаць усе гутаркі у %s самых апошніх паведамленняў?</string>
   <string name="ApplicationPreferencesActivity_delete">Выдаліць</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Адключыць шыфраванне захаванай інфармацыі?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Увага, гэта адключыць шыфраванне захаванай інфармацыі для ўсіх паведамленняў ды ключоў. Шыфраванне вашых дадзеных пры перадачы будзе працягвацца, але любы хто атрымае фізічны доступ да вашага смартфона, будзе мець доступ і да перапіскі.
-    </string>
   <string name="ApplicationPreferencesActivity_disable">Выключыць</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Памылка падлучэння да сервера!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS уключаны</string>
@@ -45,6 +41,7 @@
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Ідэнтыфікацыйны ключ для %1$s быў зменены. Гэта можа вызначаць, што нехта спрабуе перахапіць вашыя паведамленні, альбо проста %2$s пераўсталяваў па-новай TextSecure і зараз мае новы ідэнтыфікацыйны ключ.
     </string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Магчыма Вы жадаеце верыфікаваць гэты кантакт?</string>
+  <!--ContactsDatabase-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Аб\'ём паведамлення: %d KB</string>
   <string name="ConversationItem_expires_s">Заканчваецца: %s</string>
@@ -218,8 +215,6 @@
         - Прачытаць усе вашыя паведамленні
         \n- Даслаць паведамленне на Ваша імя
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Дабаўленне новага дэвайса...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Дэвайс дададзены!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ня знойдзена дэвайсаў.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Памылка сеткі.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Няправільны QR код.</string>
@@ -337,7 +332,6 @@
   <string name="KeyCachingService_passphrase_cached">TextSecure разблакіравана</string>
   <string name="KeyCachingService_lock">Замкнуць гэты пароль</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_encrypted_message">Разшыфраванае паведамленне...</string>
   <string name="MessageNotifier_media_message_with_text">Мультымедыя паведамленне: %s</string>
   <string name="MessageNotifier_no_subject">(Няма тэмы)</string>
   <string name="MessageNotifier_message_delivery_failed">Памылка дастаўкі паведамлення.</string>
@@ -346,18 +340,16 @@
   <string name="MessageNotifier_mark_all_as_read">Пазначыць усе як прачытаныя</string>
   <string name="MessageNotifier_media_message">Мультымедыя паведамленне</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРЫ ПАРОЛЬ:</string>
   <string name="change_passphrase_activity__new_passphrase">НОВЫ ПАРОЛЬ:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">ПАЎТАРЫЦЕ НОВЫ ПАРОЛЬ:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--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="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>
   <string name="SingleContactSelectionActivity_contact_photo">Фота кантакта</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Абраць для</string>
@@ -552,7 +544,6 @@ TextSecure не дачакаўся параверачная SMS.</string>
   <string name="preferences__change_my_passphrase">Змяніць мой пароль</string>
   <string name="preferences__enable_passphrase">Уключыць пароль</string>
   <string name="preferences__passphrase_summary">Пароль %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Уключыць лакальнае шыфраванне паведамленняў і ключоў</string>
   <string name="preferences__screen_security">Бяспека экрана</string>
   <string name="preferences__screen_security_summary">Бяспека экрана %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Блакіраваць магчымасць рабіць скрыншоты ўнутры праграмы</string>
@@ -562,7 +553,6 @@ TextSecure не дачакаўся параверачная SMS.</string>
   <string name="preferences__pref_timeout_interval_title">Інтэрвал часу запамінання</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Значэнне часу, праз які пароль будзе выдалены з памяці</string>
   <string name="preferences__notifications">Апавяшчэнні</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Адлюстроўваць апавяшчэнні пра паведамленні на статуснай панэлі</string>
   <string name="preferences__led_color">колер святлодыёда</string>
   <string name="preferences__led_color_unknown">Невядома</string>
   <string name="preferences__pref_led_blink_title">Узор міргацення светладыёда</string>

res/values-bg/strings.xml

@@ -12,11 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Изтрий всички стари съобщения сега?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Сигурен ли си, че искаш скъсиш всички разговори до %s съобщения във всяка?</string>
   <string name="ApplicationPreferencesActivity_delete">Изтрий</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Изключи шифроването на паметта?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Внимание, това ще спре шифроването за всички съобщения и ключове. Твоите шифровани
-сесии ще продължат да функционират, но всеки, който има физически достъп до твоето устройство ще
-има достъп до тях. </string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Изключи паролата?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Изключи заключен екран за съобщения?</string>
   <string name="ApplicationPreferencesActivity_disable">Изключи</string>
   <string name="ApplicationPreferencesActivity_unregistering">Отписване</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Отписване от TextSecure съобщения...</string>
@@ -43,7 +41,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Неуспешно откирване на папка за избор на файл.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Направи снимка</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Камера</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Картина</string>
   <string name="AttachmentTypeSelectorAdapter_video">Видео</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Аудио</string>
@@ -55,6 +53,8 @@
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Може би е добре да се провери ⏎
 този контакт. ⏎</string>
   <string name="ConfirmIdentityDialog_accept">Приемам</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Съобщение %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Размер на съобщението: %d KB</string>
   <string name="ConversationItem_expires_s">Изтича: %s</string>
@@ -81,6 +81,7 @@
   <string name="ConversationActivity_select_contact_info">Посочи информация за контакта</string>
   <string name="ConversationActivity_compose_message">Ново съобщение</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">За съжаление, настъпи грешка при прикачването.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Gif-ът, който избра е твърде голям</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">За съжеление, избраното видео надвишава допустимия максимален размер (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">За съжеление, избраното audio надвишава допустимия максимален размер (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Получателя не е с валиден SMS или имейл!</string>
@@ -144,16 +145,16 @@
   <string name="DateUtils_now">Сега</string>
   <string name="DateUtils_minutes_ago">%d мин</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Прекрати връзка с \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ако прекратиш връзката с това устройство, няма да можеш да изпращаш и получаваш съобщения от него.</string>
+  <string name="DeviceListActivity_unlink_s">Премахни връзката \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ако прекратиш връзката с това устройство, няма да можеш да изпращаш и получаваш съобщения от него.</string>
   <string name="DeviceListActivity_network_connection_failed">Неуспешна връзка с интернет...</string>
   <string name="DeviceListActivity_try_again">Опитай отново</string>
-  <string name="DeviceListActivity_disconnecting_device">Прекратяване на връзката с устройството</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Прекратяване на връзката с устройството</string>
+  <string name="DeviceListActivity_unlinking_device">Прекратяване на връзката с устройството...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Прекратяване на връзката с устройството</string>
   <string name="DeviceListActivity_network_failed">Грешка в мрежата!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Некръстено устройство</string>
-  <string name="DeviceListItem_created_s">Създанено %s</string>
+  <string name="DeviceListItem_linked_s">Свързан с %s</string>
   <string name="DeviceListItem_last_active_s">Последна активност %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Сподели с</string>
@@ -248,13 +249,13 @@ SMS съобщенията от системната базата данни в
   <string name="DeviceProvisioningActivity_content_bullets">
 Чете всичките ти съобщения
 \n - Изпраща съобщения от твое име</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Добавяне на устройство</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Добавяне на ново устройство...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Устройството добавено!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Свързване с устройството</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Свързване с ново устройство...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Устройството е свързано!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Не е открито устройство.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Проблем с мобилната мрежа.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Невалиден QR код.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">За съжалние имаш твърде много регистрирани устройства, опитай да премахнеш някои от тях...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">За съжалние имаш твърде много регистрирани устройства, опитай да премахнеш някои от тях...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Въведи паролата</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Икона на TextSecure</string>
@@ -392,9 +393,9 @@ SMS съобщенията от системната базата данни в
   <string name="KeyCachingService_passphrase_cached">TextSecure е отключен</string>
   <string name="KeyCachingService_lock">Заключи паролата</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d съобщения в %2$d чата</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d нови съобщения в %2$d чата</string>
   <string name="MessageNotifier_most_recent_from_s">Най-скорошно от: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Шифровано съобщение...</string>
+  <string name="MessageNotifier_locked_message">Заключено съобщение...</string>
   <string name="MessageNotifier_media_message_with_text">Медийно съобщение: %s</string>
   <string name="MessageNotifier_no_subject">(Няма зададена тема)</string>
   <string name="MessageNotifier_message_delivery_failed">Изпращането на съобщението неуспешно.</string>
@@ -407,18 +408,19 @@ SMS съобщенията от системната базата данни в
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Бърз отговор не е възможен, когато TextSecure е заключен!</string>
   <string name="QuickResponseService_problem_sending_message">Проблем при изпрашане на съобщение!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Ново TextSecure съобщение</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Съдържанието е скрито</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРА ПАРОЛА: </string>
   <string name="change_passphrase_activity__new_passphrase">НОВА ПАРОЛА: </string>
   <string name="change_passphrase_activity__repeat_new_passphrase">ПОВТОРИ НОВАТА ПАРОЛА: </string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Въведи име или номер</string>
   <!--contact_selection_group_activity-->
-  <!--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="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Не си регистриран за интернет съобщения...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Обновяване на списъка с контакти</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Обновяване на списъка с контакти за интернет съобщения...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Снимка на Контактът</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Избери за</string>
@@ -460,7 +462,7 @@ SMS съобщенията от системната базата данни в
   <string name="country_selection_fragment__loading_countries">Зареждане на държавите...</string>
   <string name="country_selection_fragment__search">Търси</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Няма свързани устройства...</string>
+  <string name="device_list_fragment__no_devices_linked">Няма свързани устройства...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не успешен опит да се сдобием с доклада от устройството ти. Въпреки това можеш да ползваш ADB, за да се добиеш с доклада.</string>
   <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
@@ -615,7 +617,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="AndroidManifest__media_overview">Всички изображения</string>
   <string name="AndroidManifest__media_overview_named">Всички изображения с %1$s</string>
   <string name="AndroidManifest__message_details">Информаця за съобщението</string>
-  <string name="AndroidManifest_manage_paired_devices">Управление на свързани устройства</string>
+  <string name="AndroidManifest_manage_linked_devices">Управление на свързани устройства</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__my_identity_key">Моят ключ за самоличност</string>
@@ -628,6 +630,9 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="arrays__settings_default">Настройки по подразбиране</string>
   <string name="arrays__enabled">Включено</string>
   <string name="arrays__disabled">Изключено</string>
+  <string name="arrays__name_and_message">Име и съобщение</string>
+  <string name="arrays__name_only">Само име</string>
+  <string name="arrays__neither">Нито едното</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d час</item>
@@ -652,7 +657,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__change_my_passphrase">Смени паролата ми</string>
   <string name="preferences__enable_passphrase">Включи парола</string>
   <string name="preferences__passphrase_summary">Парола %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Включи локално криптиране на съобщения и ключове</string>
+  <string name="preferences__enable_lock_screen_for_messages">Включи заключен екран за съобщения</string>
   <string name="preferences__screen_security">Сигурност на екрана</string>
   <string name="preferences__screen_security_summary">Защита на екрана %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Забрани автоматично копиране на екрана в списка с често използвани програми и в самата програма.</string>
@@ -662,7 +667,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__pref_timeout_interval_title">Продължителност на помненето</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Продължителнос от време, преди да забравя паролата от памета</string>
   <string name="preferences__notifications">Известия</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Покажи известия за съобщения в лентата за известия</string>
+  <string name="preferences__enable_message_notifications">Разреши известия за съобщения</string>
   <string name="preferences__led_color">LED цвят</string>
   <string name="preferences__led_color_unknown">Непознат</string>
   <string name="preferences__pref_led_blink_title">LED известяване</string>
@@ -730,6 +735,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__support_wifi_calling">Съвместим режим \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включи ако устройството ти използва WiFi за SMS/MMS(само ако \'Wifi Calling\' е включен на устройството ти)</string>
   <string name="preferences_app_protection__blocked_contacts">Блокирани контакти</string>
+  <string name="preferences_notifications__display_in_notifications">Покажи в полето с известия</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-bo/strings.xml

@@ -19,6 +19,7 @@
   <string name="AttachmentTypeSelectorAdapter_audio">སྒྲ་ཟློས། </string>
   <!--BlockedContactsActivity-->
   <!--ConfirmIdentityDialog-->
+  <!--ContactsDatabase-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">འཕྲིན་ཐུང་ཆེ་ཆུང་།%d KB</string>
   <string name="ConversationItem_expires_s">དུས་ཚོད་རྫོགས།%s</string>
@@ -123,17 +124,17 @@
   <string name="ApplicationMigrationService_import_in_progress">ནང་འདྲེན་བྱེད་བཞིན་ཡོད། </string>
   <!--KeyCachingService-->
   <!--MessageNotifier-->
-  <string name="MessageNotifier_encrypted_message">གསང་སྡོམ་འཕྲིན་ཐུང་། </string>
   <string name="MessageNotifier_message_delivery_failed">འཕྲིན་ཐུང་བཏང་བ་དེ་འགྲོ་མི་འདུག </string>
   <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>
   <string name="MessageNotifier_error_delivering_message">འཕྲིན་ཐུང་གཏོང་བར་སྐྱོན་ཤོར་འདུག </string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">གསང་ཚིག་རྙིང་པ།</string>
   <string name="change_passphrase_activity__new_passphrase">གསང་ཚིག་གསར་པ།</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">གསང་ཚིག་གསར་པ་བསྐྱར་དུ་ཕྲིས། </string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">འབྲེལ་མིང་མི་འདུག</string>
   <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
@@ -196,7 +197,6 @@
   <string name="preferences__pref_timeout_interval_title">བར་སེང་མཚམས་ཞོག </string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">དྲན་ཐོ་ནས་གསང་ཚིག་མ་བརྗེད་གོང་སྒུག་ཡུན་དུས་ཚོད།</string>
   <string name="preferences__notifications">བརྡ་གཏོང་།</string>
-  <string name="preferences__display_message_notifications_in_status_bar">འཕྲིན་ཐུང་གི་བརྡ་ཁྱབ་དེ་རྣམ་པའི་ཚན་བྱང་གི་ནང་དུ་བཀྲམས། </string>
   <string name="preferences__vibrate"> འདར་བཅུག</string>
   <string name="preferences__also_vibrate_when_notified">བརྡ་གཏོང་སྐབས་འདར་བཅུག</string>
   <string name="preferences__minutes">སྐར་མ།</string>

res/values-ca/strings.xml

@@ -10,8 +10,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Esborrar ara els missatges antics?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Estàs segur que vols retallar immediatament tots els fils de conversa deixant només els %s missatges més recents?</string>
   <string name="ApplicationPreferencesActivity_delete">Esborra</string>
-  <string name="ApplicationPreferencesActivity_disable_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_error_connecting_to_server">Error connectant amb el servidor!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Habilitats</string>
@@ -28,6 +26,7 @@
   <!--BlockedContactsActivity-->
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Pot ser que vulguis verificar aquest contacte.</string>
+  <!--ContactsDatabase-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Mida del missatge: %d KB</string>
   <string name="ConversationItem_expires_s">Expira: %s</string>
@@ -199,21 +198,20 @@
   <string name="KeyCachingService_passphrase_cached">TextSecure està desbloquejat</string>
   <string name="KeyCachingService_lock">Bloqueja amb una frase contrasenya</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_encrypted_message">Missatge encriptat...</string>
   <string name="MessageNotifier_message_delivery_failed">Entrega del missatge fallida.</string>
   <string name="MessageNotifier_failed_to_deliver_message">No s\'ha pogut entregar el missatge.</string>
   <string name="MessageNotifier_error_delivering_message">Error entregant el missatge.</string>
   <string name="MessageNotifier_mark_all_as_read">Marca-ho tot com a llegit</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">FRASE CONTRASENYA ANTIGA:</string>
   <string name="change_passphrase_activity__new_passphrase">NOVA FRASE CONTRASENYA:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">REPETEIX LA NOVA FRASE CONTRASENYA:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sense contactes.</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_updating_directory">Actualitzant directori</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecciona per</string>
   <!--blocked_contacts_fragment-->
@@ -314,7 +312,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <string name="preferences__pref_timeout_interval_title">Interval del temps d\'espera</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantitat de temps que s\'esperarà abans d\'oblidar la frase contrasenya de la memòria</string>
   <string name="preferences__notifications">Notificacions</string>
-  <string name="preferences__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_set">S\'ha fixat un patró de parpalleig del LED personalitzat!</string>

res/values-cs/strings.xml

@@ -12,11 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Smazat všechny staré zprávy?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Opravdu chcete všechny konverzace zkrátit na posledních %s zpráv?</string>
   <string name="ApplicationPreferencesActivity_delete">Smazat</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktivovat šifrování lokálně uložených zpráv?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Varování: Tímto znemožníte šifrování všech uložených zpráv a klíčů. Vaše komunikace
-bude i nadále šifrována, ale bude si ji moci přečíst kdokoliv s fyzickým přístupem
-k vašemu zařízení.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Zakázat heslo?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Zakázat uzamčení obrazovky zpráv?</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivovat</string>
   <string name="ApplicationPreferencesActivity_unregistering">Rušení registrace</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Odregistrace TextSecure zpráv</string>
@@ -43,7 +41,7 @@ Abyste mohli v budoucnu používat TextSecure zprávy, bude nutno toto telefonn
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nemohu nalézt aplikaci pro vybraný typ dat</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Vyfotit</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Foto</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -58,6 +56,8 @@ identifikační klíč.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Možná budete chtít ověřit tento
 kontakt</string>
   <string name="ConfirmIdentityDialog_accept">Akceptovat</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Zpráva %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Délka zprávy: %d KB</string>
   <string name="ConversationItem_expires_s">Vyprší: %s</string>
@@ -84,6 +84,7 @@ kontakt</string>
   <string name="ConversationActivity_select_contact_info">Vybrat informace o kontaktu</string>
   <string name="ConversationActivity_compose_message">Napište zprávu</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Omlouváme se, ale došlo k chybě při zpracování přílohy</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Vybraný gif je příliš velký!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Omlouvám se, vybrané video překračuje maximální povolenou velikost (%1$skB)</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Omlouvám se, vybrané audio překračuje maximální povolenou velikost (%1$skB)</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Adresa příjemce není ve správném tvaru! (sms či email)</string>
@@ -147,16 +148,16 @@ kontakt</string>
   <string name="DateUtils_now">Teď</string>
   <string name="DateUtils_minutes_ago">%d minuta</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Odpojit \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Po odpojení toho zařízení již nebude možno přijímat nebo odesílat zprávy.</string>
+  <string name="DeviceListActivity_unlink_s">Rozpojit \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Rozpojením toho zařízení nebude dále možno posílat a přijímat zprávy.</string>
   <string name="DeviceListActivity_network_connection_failed">Síťové spojení slehalo...</string>
   <string name="DeviceListActivity_try_again">Zkusit znovu</string>
-  <string name="DeviceListActivity_disconnecting_device">Odpojuji zařízení...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odpojuji zařízení</string>
+  <string name="DeviceListActivity_unlinking_device">Rozpojování zařízení...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Rozpojuji zařízení</string>
   <string name="DeviceListActivity_network_failed">Síť selhala</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nepojmenované zřízení</string>
-  <string name="DeviceListItem_created_s">Vytvořeno %s</string>
+  <string name="DeviceListItem_linked_s">Propojeno %s</string>
   <string name="DeviceListItem_last_active_s">Naposled aktivní %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Sdílet s</string>
@@ -246,13 +247,13 @@ tuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string
   <string name="DeviceProvisioningActivity_content_bullets">
 Přečíst všechny zprávy
 Poslat zprávy Vaším jménem.</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Přidat zařízení</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Přidává se nové zařízení</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Zařízení přidáno.</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Propojuji zařízení</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Propojuji nové zařízení...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Zařízení propojena!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nenalezeno žádné zařízení.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Chyba sítě.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Omlouváme se, ale máte zaregistrováno příliš mnoho zařízení, pokuste se některé odebrat...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Omlouváme se, ale máte propojeno příliš mnoho zařízení, pokuste se některé odpojit...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Zadat heslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@@ -384,9 +385,9 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="KeyCachingService_passphrase_cached">TextSecure je odemčený</string>
   <string name="KeyCachingService_lock">Uzamknout heslem</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d zpráv v %2$d konverzacích</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nových zpráv v %2$d konverzacích</string>
   <string name="MessageNotifier_most_recent_from_s">Poslední od: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Šifrovaná zpráva...</string>
+  <string name="MessageNotifier_locked_message">Zamčená zpráva</string>
   <string name="MessageNotifier_media_message_with_text">Multimediální zpráva: %s</string>
   <string name="MessageNotifier_no_subject">(Předmět neuveden)</string>
   <string name="MessageNotifier_message_delivery_failed">Selhalo doručení zprávy.</string>
@@ -399,18 +400,19 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Rychlá dopověď není dostupná pokud je TextSecure uzamčen!</string>
   <string name="QuickResponseService_problem_sending_message">Problém při odesílání zprávy!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nová TextSecure zpráva</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Obsah skrytý</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">STARÉ HESLO</string>
   <string name="change_passphrase_activity__new_passphrase">NOVÉ HESLO</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">ZNOVU NOVÉ HESLO</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Zadejte jméno nebo číslo</string>
   <!--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">Načítám kontakty...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nejste zaregistrován na službě TextSecure</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Aktualizuji adresář</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualizuji TextSecure adresář</string>
   <string name="SingleContactSelectionActivity_contact_photo">Fotografie kotaktu</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vybrat</string>
@@ -452,7 +454,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="country_selection_fragment__loading_countries">Načítám země...</string>
   <string name="country_selection_fragment__search">Hledat</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Žádné zařízení není spárováno</string>
+  <string name="device_list_fragment__no_devices_linked">Žádná zařízení nejsou propojena...</string>
   <!--log_submit_activity-->
   <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__thanks">Díky za Vaši pomoc!</string>
@@ -605,7 +607,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="AndroidManifest__media_overview">Všechny obrázky</string>
   <string name="AndroidManifest__media_overview_named">Všechny obrázky s %1$s</string>
   <string name="AndroidManifest__message_details">Podrobnosti zprávy</string>
-  <string name="AndroidManifest_manage_paired_devices">Spravovat spárovaná zařízení</string>
+  <string name="AndroidManifest_manage_linked_devices">Spravovat propojená zařízení</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__my_identity_key">Můj identifikační klíč</string>
@@ -618,6 +620,9 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="arrays__settings_default">Výchozí nastavení</string>
   <string name="arrays__enabled">Povoleno</string>
   <string name="arrays__disabled">Zakázáno</string>
+  <string name="arrays__name_and_message">Jméno a zpráva</string>
+  <string name="arrays__name_only">Pouze jméno</string>
+  <string name="arrays__neither">Ani</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hodina</item>
@@ -643,7 +648,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__change_my_passphrase">Změnit své heslo</string>
   <string name="preferences__enable_passphrase">Povolit přístupové heslo</string>
   <string name="preferences__passphrase_summary">Heslo %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Povolit lokální šifrování zpráv a klíčů</string>
+  <string name="preferences__enable_lock_screen_for_messages">Povolit uzamčení obrazovky zpráv</string>
   <string name="preferences__screen_security">Zabezpečení obrazovky</string>
   <string name="preferences__screen_security_summary">Zabezpečení obrazovky %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Zablokovat náhled v seznamu aplikací</string>
@@ -653,7 +658,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__pref_timeout_interval_title">Limit čekání</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Doba po kterou si pamatovat vyplněné heslo</string>
   <string name="preferences__notifications">Upozornění</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Zobrazovat upozornění v oznamovacím panelu</string>
+  <string name="preferences__enable_message_notifications">Povolit upozornění na zprávy</string>
   <string name="preferences__led_color">Barva LED</string>
   <string name="preferences__led_color_unknown">Neznámý</string>
   <string name="preferences__pref_led_blink_title">Schéma blikání LED</string>
@@ -720,7 +725,8 @@ Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</string>
   <string name="preferences__submit_debug_log">Odeslat ladící log</string>
   <string name="preferences__support_wifi_calling">\'Wifi volání\' kompatibilní mód</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Povolit pokud vaše zařízení používá doručování SMS/MMS přes Wifi (povoleno pouze když je na zařízení povoleno \'Wifi volání\')</string>
-  <string name="preferences_app_protection__blocked_contacts">Blokované kontakt</string>
+  <string name="preferences_app_protection__blocked_contacts">Blokované kontakty</string>
+  <string name="preferences_notifications__display_in_notifications">Zobrazit v upozornění</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-da/strings.xml

@@ -12,12 +12,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slet alle gamle beskeder?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på at du vil trimme ALLE samtaletråde til de sidste %s beskeder?</string>
   <string name="ApplicationPreferencesActivity_delete">Slet</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktiverer kryptering af lager?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Advarsel! Dette vil deaktiverer kryptering af lager for alle beskeder og nøgler.
-Dine krypterede sessioner vil fortsætte med at fungere,
-men alle med fysisk adgang til din enhed kan få adgang til dem.
-</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivere</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kunne ikke oprette forbindelse til serveren!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS slået til</string>
@@ -41,6 +35,7 @@ men alle med fysisk adgang til din enhed kan få adgang til dem.
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Du bør verificere
 denne kontakt.</string>
+  <!--ContactsDatabase-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Besked størrelse: %d KB</string>
   <string name="ConversationItem_expires_s">Udløber: %s</string>
@@ -293,7 +288,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="KeyCachingService_passphrase_cached">TextSecure er låst op</string>
   <string name="KeyCachingService_lock">Lås med et kodeord</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_encrypted_message">Krypteret besked...</string>
   <string name="MessageNotifier_no_subject">(Intet emne)</string>
   <string name="MessageNotifier_message_delivery_failed">Levering af besked mislykkedes.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Kunne ikke sende besked.</string>
@@ -301,18 +295,16 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="MessageNotifier_mark_all_as_read">Marker alle som læst</string>
   <string name="MessageNotifier_media_message">Multimedie besked</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">GAMMELT KODEORD:</string>
   <string name="change_passphrase_activity__new_passphrase">NYT KODEORD:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">GENTAG NYT KODEORD:</string>
+  <!--contact_selection_activity-->
   <!--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">Indlæser kontaktpersoner...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du er ikke registreret som bruger af \"push\" tjenesten...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Opdaterer bibliotek</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Opdaterer \"push\" bibliotek</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktbillede</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vælg</string>
@@ -477,7 +469,6 @@ fejlede.
   <string name="preferences__pref_timeout_interval_title">Timeout tidsinterval</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hvor lang tid skal der gå før kodeordet slettes fra hukommelsen</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__pref_led_blink_custom_pattern_title">Tilpas LED blinkemønster</string>

res/values-de/strings.xml

@@ -10,19 +10,17 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s Nachrichten pro Unterhaltung</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Sind Sie sicher, dass Sie alle Unterhaltungen 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">Wollen Sie alle Unterhaltungen bis auf die letzten %s Nachrichten wirklich löschen?</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Speicherverschlüsselung deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Warnung: Dies wird die verschlüsselte Speicherung für alle Nachrichten und Schlüssel deaktivieren.
-Ihre 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_passphrase">Passwort deaktivieren?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+TextSecure und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <string name="ApplicationPreferencesActivity_unregistering">Registrierung löschen</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">TextSecure-Registrierung wird gelöscht …</string>
   <string name="ApplicationPreferencesActivity_disable_textsecure_messages">TextSecure-Nachrichten deaktivieren?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
-Dies wird TextSecure-Nachrichten deaktivieren, indem Ihre Registrierung vom Server gelöscht wird.
-Sie werden Ihre Rufnummer erneut registrieren müssen, um TextSecure-Nachrichten zukünftig wieder nutzen zu können.</string>
+Deaktiviert TextSecure-Nachrichten, indem Ihre Registrierung vom Server gelöscht wird. Sie werden Ihre Rufnummer erneut registrieren müssen, um TextSecure-Nachrichten zukünftig wieder nutzen zu können.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden zum Server!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiviert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Standard-SMS-App ändern</string>
@@ -42,7 +40,7 @@ Sie werden Ihre Rufnummer erneut registrieren müssen, um TextSecure-Nachrichten
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Keine App zur Dateiauswahl auffindbar.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Fotografieren</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -54,6 +52,8 @@ Sie werden Ihre Rufnummer erneut registrieren müssen, um TextSecure-Nachrichten
 Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleicht hat %2$s TextSecure aber auch nur neu installiert und benutzt nun einen neuen Schlüssel.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Sie sollten diesen Kontakt ggf. überprüfen.</string>
   <string name="ConfirmIdentityDialog_accept">OK</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Nachricht %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Nachrichtengröße: %d kB</string>
   <string name="ConversationItem_expires_s">Läuft ab in: %s</string>
@@ -72,17 +72,18 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Sichere Unterhaltung starten?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Sichere Unterhaltung mit %s starten?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Beenden der sicheren Unterhaltung bestätigen </string>
-  <string name="ConversationActivity_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_abort_secure_session_confirmation">Sichere Unterhaltung beenden?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Diese sichere Unterhaltung beenden.</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Unterhaltung löschen?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Diese Unterhaltung unwiderruflich löschen.</string>
   <string name="ConversationActivity_add_attachment">Anhang hinzufügen</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_the_gif_you_selected_was_too_big">Ausgewähltes GIF-Bild ist zu groß!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Die ausgewählte Videodatei überschreitet leider die maximal mögliche Nachrichtengröße (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Die ausgewählte Audiodatei überschreitet leider die maximal mögliche Nachrichtengröße (%1$skB).</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mobilrufnummer oder E-Mail-Adresse des Kontakts ist ungültig!</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mobilrufnummer oder E-Mail-Adresse des Kontakts ungültig!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Die Nachricht ist leer!</string>
   <string name="ConversationActivity_group_members">Gruppenmitglieder</string>
   <string name="ConversationActivity_group_conversation">Gruppenunterhaltung</string>
@@ -94,7 +95,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_calls_not_supported">Anrufe nicht unterstützt</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dieses Gerät scheint keine Wahlvorgänge zu unterstützen.</string>
   <string name="ConversationActivity_leave_group">Gruppe verlassen?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Sind Sie sicher, dass Sie die Gruppe verlassen wollen?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Wollen Sie diese Gruppe wirklich verlassen?</string>
   <string name="ConversationActivity_transport_insecure_sms">Unsichere SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Unsichere MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
@@ -105,16 +106,16 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_mms_not_supported_message">Diese Nachricht kann nicht gesendet werden, da Ihr Mobilfunkanbieter MMS nicht unterstützt.</string>
   <string name="ConversationActivity_specify_recipient">Bitte einen Kontakt auswählen</string>
   <string name="ConversationActivity_unblock_question">Nicht mehr blockieren?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Sind Sie sicher, dass Sie die Blockierung dieses Kontakts aufheben möchten?</string>
-  <string name="ConversationActivity_unblock">Blockierung aufheben</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Diesen Kontakt nicht mehr blockieren.</string>
+  <string name="ConversationActivity_unblock">Nicht mehr blockieren</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</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">Löschen der Nachricht bestätigen</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Sind Sie sicher, dass Sie alle ausgewählten Nachrichten unwiderruflich löschen möchten?</string>
+  <string name="ConversationFragment_confirm_message_delete">Nachrichten löschen?</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Alle ausgewählten Nachrichten unwiderruflich löschen.</string>
   <string name="ConversationFragment_save_to_sd_card">Im Gerätespeicher speichern?</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Das Speichern der Datei im Gerätespeicher ermöglicht allen anderen installierten Apps darauf Zugriff.\n\nMöchten Sie trotzdem fortfahren?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Das Speichern der Datei im Gerätespeicher ermöglicht allen anderen installierten Apps darauf Zugriff.\n\nTrotzdem fortfahren?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Fehler beim Speichern des Anhangs im Gerätespeicher!</string>
   <string name="ConversationFragment_success_exclamation">Erfolgreich!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kein Schreibzugriff auf Gerätespeicher!</string>
@@ -130,7 +131,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationListActivity_search">Suchen …</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">Möchten Sie wirklich ALLE ausgewählten Unterhaltungen löschen?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ALLE ausgewählten Unterhaltungen unwiderruflich löschen.</string>
   <string name="ConversationListFragment_deleting">Löschen</string>
   <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht …</string>
   <!--ConversationListItem-->
@@ -143,32 +144,32 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="DateUtils_now">Jetzt</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">\"%s\" trennen?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Durch Trennung dieses Geräts wird es keine weiteren Nachrichten senden oder empfangen können.</string>
+  <string name="DeviceListActivity_unlink_s">„%s“ entfernen?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Nach Entfernen dieses Geräts wird es keine weiteren Nachrichten senden oder empfangen können.</string>
   <string name="DeviceListActivity_network_connection_failed">Keine Netzwerkverbindung …</string>
   <string name="DeviceListActivity_try_again">Erneut versuchen</string>
-  <string name="DeviceListActivity_disconnecting_device">Gerät wird getrennt …</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Trennen</string>
+  <string name="DeviceListActivity_unlinking_device">Gerät wird entfernt …</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Gerät entfernen</string>
   <string name="DeviceListActivity_network_failed">Netzwerkfehler!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Unbenanntes Gerät</string>
-  <string name="DeviceListItem_created_s">Erstellt %s</string>
+  <string name="DeviceListItem_linked_s">%s verknüpft</string>
   <string name="DeviceListItem_last_active_s">Zuletzt aktiv %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Teilen mit</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exportieren</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Klartext auf 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_export_plaintext_to_sd_card">Klartextsicherung exportieren?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung: Exportiert Ihre TextSecure-Nachrichten unverschlüsselt in den Gerätespeicher.</string>
   <string name="ExportFragment_cancel">Abbruch</string>
   <string name="ExportFragment_exporting">Exportieren</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Klartext wird auf SD-Karte exportiert …</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Fehler: Kein Schreibzugriff auf die SD-Karte!</string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Fehler beim Schreiben auf die SD-Karte.</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Klartext wird in Gerätespeicher exportiert …</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Fehler: Kein Schreibzugriff auf Gerätespeicher!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Fehler beim Schreiben auf Gerätespeicher.</string>
   <string name="ExportFragment_success">Erfolgreich!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Dauerhaftes Problem mit TextSecure-Nachrichten!</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure konnte keine Verbindung zu den Google Play-Diensten herstellen. TextSecure-Nachrichten wurden daher deaktiviert. Bitte über das Menü \"Einstellungen\" erneut registrieren.</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure konnte keine Verbindung zu den Google Play-Diensten herstellen. TextSecure-Nachrichten wurden daher deaktiviert. Bitte über das Menü „Einstellungen“ erneut registrieren.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Gruppe bearbeiten</string>
@@ -176,7 +177,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <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. Daher wird dies eine MMS-Gruppe sein.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Sie sind nicht für TextSecure-Nachrichten registriert. TextSecure-Gruppen sind daher deaktiviert.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">Ein unerwarteter Fehler ist aufgetreten, der das Erstellen der Gruppe verhindert hat.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Gruppe konnte aufgrund eines unerwartet aufgetretenen Fehlers nicht erstellt werden.</string>
   <string name="GroupCreateActivity_contacts_no_members">Sie brauchen mindestens eine Person in Ihrer Gruppe!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Eines der Gruppenmitglieder hat eine nicht korrekt lesbare Rufnummer. Bitte beheben oder Kontakt entfernen und erneut versuchen.</string>
   <string name="GroupCreateActivity_avatar_content_description">Gruppenavatar</string>
@@ -188,12 +189,11 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">Ich</string>
   <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">Import</string>
-  <string name="ImportExportActivity_export">Export</string>
+  <string name="ImportExportActivity_import">Importieren</string>
+  <string name="ImportExportActivity_export">Exportieren</string>
   <!--ImportFragment-->
-  <string name="ImportFragment_import_system_sms_database">SMS-Systemdatenbank importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Dies wird die SMS aus der Systemdatenbank in TextSecure importieren.
-Wenn Sie dies schon einmal gemacht haben, kommt es zu doppelten Nachrichten.</string>
+  <string name="ImportFragment_import_system_sms_database">System-SMS importieren?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Importiert Nachrichten aus der Standard-SMS-App in TextSecure. Falls Sie dies schon einmal gemacht haben, wird es zu doppelten Nachrichten kommen.</string>
   <string name="ImportFragment_import">Importieren</string>
   <string name="ImportFragment_cancel">Abbruch</string>
   <string name="ImportFragment_restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen?</string>
@@ -202,8 +202,7 @@ Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt Ihre bestehen
 Sie 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">Klartextsicherung importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dies wird Nachrichten aus einer Klartext-Datensicherung importieren.
-Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedoppelten Nachrichten führen.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Importiert Nachrichten aus einer Klartext-Datensicherung in TextSecure. Falls Sie bereits zuvor diese Datensicherung importiert haben, wird es zu doppelten Nachrichten kommen.</string>
   <string name="ImportFragment_importing">Importieren</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Klartextsicherung wird importiert …</string>
   <string name="ImportFragment_no_plaintext_backup_found">Keine Klartextsicherung gefunden!</string>
@@ -215,8 +214,8 @@ Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedop
   <string name="ImportFragment_restore_complete">Wiederherstellung abgeschlossen!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Keinen scanbaren Schlüssel gefunden!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">App \"Barcode Scanner\" installieren?</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Für QR-Codes benötigt TextSecure die App \"Barcode Scanner\".</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">App „Barcode Scanner“ installieren?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Für QR-Codes benötigt TextSecure die App „Barcode Scanner“.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Versand fehlgeschlagen</string>
   <string name="MessageDetailsRecipient_new_identity">Neuer Schlüssel</string>
@@ -236,7 +235,7 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Das eingegebene alte Passwort ist falsch!</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Neues Passwort eingeben!</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">Dieses Gerät verbinden?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Dieses Gerät verknüpfen?</string>
   <string name="DeviceProvisioningActivity_cancel">ABBRECHEN</string>
   <string name="DeviceProvisioningActivity_continue">WEITER</string>
   <string name="DeviceProvisioningActivity_title">Gerät verbinden?</string>
@@ -244,13 +243,13 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="DeviceProvisioningActivity_content_bullets">
 - Alle Nachrichten lesen
 \n- Nachrichten in Ihrem Namen senden </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Gerät hinzufügen</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird hinzugefügt …</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Geräte wurde hinzugefügt!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Gerät verknüpfen</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird verknüpft …</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Gerät verknüpft!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Kein Gerät gefunden.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netzwerkfehler.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ungültiger QR-Code.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Es sind bereits zu viele Geräte registriert. Versuchen Sie, mindestens eines zu entfernen …</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Es sind bereits zu viele Geräte verknüpft. Versuchen Sie, mindestens eines zu entfernen …</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Passwort eingeben</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-Symbol</string>
@@ -265,11 +264,11 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="RatingManager_no_thanks">Nein danke</string>
   <string name="RatingManager_later">Später</string>
   <!--RecipientPreferencesActivity-->
-  <string name="RecipientPreferenceActivity_block_this_contact_question">Diesen Kontakt blockieren?</string>
+  <string name="RecipientPreferenceActivity_block_this_contact_question">Kontakt blockieren?</string>
   <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Nachrichten dieses Kontakts werden nicht mehr angezeigt werden.</string>
   <string name="RecipientPreferenceActivity_block">Blockieren</string>
-  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Diesen Kontakt nicht mehr blockieren?</string>
-  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Sind Sie sicher, dass Sie die Blockierung dieses Kontakts aufheben möchten?</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Nicht mehr blockieren?</string>
+  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Diesen Kontakt nicht mehr blockieren.</string>
   <string name="RecipientPreferenceActivity_unblock">Nicht mehr blockieren</string>
   <string name="RecipientPreferenceActivity_enabled">Aktiviert</string>
   <string name="RecipientPreferenceActivity_disabled">Deaktiviert</string>
@@ -329,10 +328,10 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="ThreadRecord_draft">Entwurf:</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen eigenen Schlüssel.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Der Kontakt hat keinen Schlüssel.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Der Kontakt hat keinen Schlüssel!</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Kontakt hat keinen Schlüssel.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Kontakt hat keinen Schlüssel!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">QR-Code einscannen</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Eigenen QR-Code anzeigen</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Ihren QR-Code anzeigen</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 überprüft!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Der Schlüssel des Kontakts ist korrekt. Lassen Sie ihn auch Ihren eigenen Schlüssel überprüfen.</string>
@@ -341,15 +340,15 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen eigenen Schlüssel.</string>
   <string name="ViewIdentityActivity_scan_to_compare">QR-Code einscannen</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Eigenen QR-Code anzeigen</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Ihren QR-Code anzeigen</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 überprüft!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Der eingescannte Schlüssel stimmt überein!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Überprüft!</string>
-  <string name="ViewIdentityActivity_my_identity_fingerprint">Mein Schlüssel</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Ihr Schlüssel</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Trotz bestehender Anfrage starten?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Unterhaltungsanfrage an den Kontakt gesendet. Sind Sie sicher, dass Sie eine weitere senden wollen? Dies wird die erste Anfrage ungültig machen.</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Unterhaltungsanfrage an den Kontakt gesendet. Wollen Sie wirklich eine weitere senden? Dies wird die erste Anfrage ungültig machen.</string>
   <string name="KeyExchangeInitiator_send">Senden</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Fehlerhaft verschlüsselte Nachricht …</string>
@@ -381,9 +380,9 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure ist entsperrt</string>
   <string name="KeyCachingService_lock">Mit Passwort sperren</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d Nachrichten in %2$d Unterhaltungen</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d neue Nachrichten in %2$d Unterhaltungen</string>
   <string name="MessageNotifier_most_recent_from_s">Neueste von: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Verschlüsselte Nachricht …</string>
+  <string name="MessageNotifier_locked_message">Gesperrte Nachricht …</string>
   <string name="MessageNotifier_media_message_with_text">Mediennachricht: %s</string>
   <string name="MessageNotifier_no_subject">(Kein Betreff)</string>
   <string name="MessageNotifier_message_delivery_failed">Nachrichtenübermittlung fehlgeschlagen.</string>
@@ -394,20 +393,21 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="MessageNotifier_media_message">Mediennachricht</string>
   <string name="MessageNotifier_reply">Antworten</string>
   <!--QuickResponseService-->
-  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Schnellantwort nicht verfügbar während TextSecure gesperrt ist!</string>
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Schnellantwort nicht verfügbar, solange TextSecure gesperrt ist!</string>
   <string name="QuickResponseService_problem_sending_message">Problem beim Senden der Nachricht!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Neue TextSecure-Nachricht</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Inhalt verborgen</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">ALTES PASSWORT:</string>
   <string name="change_passphrase_activity__new_passphrase">NEUES PASSWORT:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">NEUES PASSWORT WIEDERHOLEN:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Name/Rufnummer eingeben</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Keine Kontakte.</string>
   <string name="contact_selection_group_activity__finding_contacts">Kontakte werden geladen …</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Sie sind nicht für den TextSecure-Dienst registriert …</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Aktualisieren</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Kontaktliste wird aktualisiert …</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktbild</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Auswählen für</string>
@@ -449,7 +449,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="country_selection_fragment__loading_countries">Länder werden geladen …</string>
   <string name="country_selection_fragment__search">Suchen</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Keine Geräte verbunden …</string>
+  <string name="device_list_fragment__no_devices_linked">Keine Geräte verknüpft …</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Entweder konnte kein Diagnoseprotokoll vom Gerät gelesen werden oder es gab Probleme dieses an den Server zu senden. Wenn Sie sicher sind, dass das Gerät mit dem Internet verbunden ist, können Sie versuchen das Protokoll mit ADB auszulesen.</string>
   <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
@@ -466,15 +466,15 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="database_upgrade_activity__updating_database">Datenbank wird aktualisiert …</string>
   <string name="export_fragment__export_plaintext_backup">Klartextsicherung exportieren</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung exportieren</string>
-  <string name="import_fragment__import_system_sms_database">SMS-Systemdatenbank importieren</string>
+Eine mit „SMS Backup &amp; Restore“ kompatible Klartextsicherung exportieren</string>
+  <string name="import_fragment__import_system_sms_database">System-SMS importieren</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Datenbank aus der Standard-SMS-App importieren</string>
-  <string name="import_fragment__import_encrypted_backup">Verschlüsselte Sicherung importieren</string>
+  <string name="import_fragment__import_encrypted_backup">Verschlüsselte Sicherung wiederherstellen</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
 Eine zuvor exportierte, verschlüsselte TextSecure-Datensicherung wiederherstellen</string>
   <string name="import_fragment__import_plaintext_backup">Klartextsicherung importieren</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
-Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren</string>
+Eine mit „SMS Backup &amp; Restore“ kompatible Klartextsicherung importieren</string>
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">Keine Bilder</string>
   <!--message_recipients_list_item-->
@@ -490,12 +490,12 @@ Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren</stri
   <!--GroupUtil-->
   <string name="GroupUtil_joined_the_group">%1$s ist der Gruppe beigetreten.</string>
   <string name="GroupUtil_group_updated">Gruppe aktualisiert.</string>
-  <string name="GroupUtil_title_is_now">Der Gruppenname lautet jetzt \"%1$s\".</string>
+  <string name="GroupUtil_title_is_now">Der Gruppenname lautet jetzt „%1$s“.</string>
   <!--prompt_passphrase_activity-->
   <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 versenden. Ihr Gerät stellt diese Informationen nicht zur Verfügung, was gelegentlich bei gesperrten oder anderweitig restriktiv konfigurierten Geräten der Fall ist.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Zum Versenden von Medien- und Gruppennachrichten bitte \"OK\" antippen und die geforderten Einstellungen vervollständigen. Die MMS-Einstellungen Ihres Mobilfunkanbieters können normalerweise durch eine Internetsuche nach dem \"APN\" des Anbieters gefunden werden.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Zum Versenden von Medien- und Gruppennachrichten bitte „OK“ antippen und die geforderten Einstellungen vervollständigen. Die MMS-Einstellungen Ihres Mobilfunkanbieters können normalerweise durch eine Internetsuche nach dem „APN“ des Anbieters gefunden werden.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BLOCKIERT</string>
   <!--recipient_preferences-->
@@ -503,7 +503,7 @@ Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren</stri
   <string name="recipient_preferences__disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
   <string name="recipient_preferences__ringtone">Benachrichtigungston</string>
   <string name="recipient_preferences__vibrate">Vibration</string>
-  <string name="recipient_preferences__block">Blockieren</string>
+  <string name="recipient_preferences__block">Kontakt blockieren</string>
   <string name="recipient_preferences__color">Farbe</string>
   <string name="recipient_preferences__color_for_this_contact">Farbe dieses Kontakts</string>
   <!--registration_activity-->
@@ -519,7 +519,8 @@ RUFNUMMER</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Einige mögliche Probleme beinhalten:</string>
   <string name="registration_problems__sms_interceptors">SMS-abfangende Apps.</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__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">Fehlerhafte Rufnummer.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
 Bitte überprüfen Sie die eingegebene Rufnummer auf Richtigkeit und eine Ihrer Region entsprechend korrekte Formatierung.</string>
@@ -529,7 +530,7 @@ TextSecure 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">
-TextSecure kann Sie zur Überprüfung Ihrer Rufnummer auch anrufen. Tippen Sie auf \"Anrufen\" und geben Sie die sechs gehörten Ziffern ein.</string>
+TextSecure kann Sie zur Überprüfung Ihrer Rufnummer auch anrufen. Tippen Sie auf „Anrufen“ und geben Sie die sechs gehörten Ziffern ein.</string>
   <string name="registration_progress_activity__verify">Überprüfen</string>
   <string name="registration_progress_activity__call_me">Mich anrufen</string>
   <string name="registration_progress_activity__edit_number">Rufnummer bearbeiten</string>
@@ -556,11 +557,11 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="registration_progress_activity__telephone">Telefon</string>
   <string name="registration_progress_activity__check">Haken</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to"><small>Name oder Rufnummer eingeben</small></string>
-  <string name="recipients_panel__add_member">Mitglied hinzufügen</string>
+  <string name="recipients_panel__to"><small>Name/Rufnummer eingeben</small></string>
+  <string name="recipients_panel__add_member">Mitglieder hinzufügen</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Kontaktschlüssel:</string>
-  <string name="verify_identity_activity__your_identity_you_read">Eigener Schlüssel:</string>
+  <string name="verify_identity_activity__their_identity_they_read">Schlüssel des Kontakts:</string>
+  <string name="verify_identity_activity__your_identity_you_read">Ihr Schlüssel:</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">Einige Vorgänge benötigen Ihre Aufmerksamkeit.</string>
   <string name="message_details_header__sent">Gesendet</string>
@@ -582,19 +583,22 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="AndroidManifest__media_overview">Alle Bilder</string>
   <string name="AndroidManifest__media_overview_named">Alle Bilder mit %1$s</string>
   <string name="AndroidManifest__message_details">Nachrichtendetails</string>
-  <string name="AndroidManifest_manage_paired_devices">Verbundene Geräte verwalten</string>
+  <string name="AndroidManifest_manage_linked_devices">Verknüpfte Geräte verwalten</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Datensicherung</string>
-  <string name="arrays__my_identity_key">Mein Schlüssel</string>
+  <string name="arrays__my_identity_key">Ihr Schlüssel</string>
   <string name="arrays__use_default">Standard verwenden</string>
   <string name="arrays__use_custom">Benutzerdefiniert verwenden</string>
   <string name="arrays__mute_for_one_hour">Für 1 Stunde</string>
   <string name="arrays__mute_for_two_hours">Für 2 Stunden</string>
   <string name="arrays__mute_for_one_day">Für 1 Tag</string>
   <string name="arrays__mute_for_seven_days">Für 7 Tage</string>
-  <string name="arrays__settings_default">Standardeinstellung</string>
+  <string name="arrays__settings_default">Standard</string>
   <string name="arrays__enabled">Aktiviert</string>
   <string name="arrays__disabled">Deaktiviert</string>
+  <string name="arrays__name_and_message">Name und Nachricht</string>
+  <string name="arrays__name_only">Nur Name</string>
+  <string name="arrays__neither">Weder Name noch Nachricht</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d Stunde</item>
@@ -616,10 +620,10 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__choose_identity">Kontakt 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__change_my_passphrase">Ihr Passwort ändern</string>
   <string name="preferences__enable_passphrase">Passwort aktivieren</string>
   <string name="preferences__passphrase_summary">Passwort %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Lokale Verschlüsselung von Nachrichten und Schlüsseln aktivieren</string>
+  <string name="preferences__enable_lock_screen_for_messages">TextSecure und Benachrichtigungen mit Passwort sperren</string>
   <string name="preferences__screen_security">Bildschirmschutz</string>
   <string name="preferences__screen_security_summary">Bildschirmschutz %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bildschirmfotos in der Anwendung und der Liste der letzten Anwendungen blockieren</string>
@@ -629,14 +633,14 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__pref_timeout_interval_title">Zeitüberschreitung</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Wartezeit, nach deren Ablauf das Passwort vergessen wird</string>
   <string name="preferences__notifications">Benachrichtigungen</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Benachrichtigungen in der Statusleiste anzeigen</string>
+  <string name="preferences__enable_message_notifications">Benachrichtigungen über Nachrichtenempfang aktivieren</string>
   <string name="preferences__led_color">LED-Farbe</string>
   <string name="preferences__led_color_unknown">Unbekannt</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_title">LED-Blinkmuster einstellen</string>
   <string name="preferences__pref_led_blink_custom_pattern_on_for">Aktiviert für:</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Deaktiviert für:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">Eigenes LED-Blinkmuster aktiviert!</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">LED-Blinkmuster eingestellt</string>
   <string name="preferences__sound">Benachrichtigungston</string>
   <string name="preferences__change_notification_sound">Benachrichtigungston ändern</string>
   <string name="preferences__inthread_notifications">Immer benachrichtigen</string>
@@ -697,6 +701,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="preferences__support_wifi_calling">Kompatibilität WLAN-Telefonie</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivieren, falls das Gerät SMS/MMS über WLAN nutzt (nur bei aktivierter WLAN-Telefonie)</string>
   <string name="preferences_app_protection__blocked_contacts">Blockierte Kontakte</string>
+  <string name="preferences_notifications__display_in_notifications">In Benachrichtigungen anzeigen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -715,7 +720,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Nachrichtendetails</string>
   <string name="conversation_context__menu_copy_text">Text kopieren</string>
-  <string name="conversation_context__menu_delete_message">Nachricht löschen</string>
+  <string name="conversation_context__menu_delete_message">Nachrichten löschen</string>
   <string name="conversation_context__menu_forward_message">Nachricht weiterleiten</string>
   <string name="conversation_context__menu_resend_message">Nachricht erneut senden</string>
   <!--conversation_context_image-->
@@ -755,13 +760,13 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Zu Kontakten hinzufügen</string>
   <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Teilnahmeliste</string>
+  <string name="convesation_group_options__recipients_list">Mitgliederliste</string>
   <string name="conversation_group_options__delivery">Zustellung</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">Eigenen QR-Code anzeigen</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Ihren QR-Code anzeigen</string>
   <string name="key_scanning__menu_scan_to_compare">QR-Code einscannen</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Neue Unterhaltung</string>

res/values-el/strings.xml

@@ -12,13 +12,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Διαγραφή όλων των παλιών μηνυμάτων τώρα;</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Είστε σίγουροι πως θέλετε να μειωθούν όλες οι συζητήσεις στα %s πιο πρόσφατα μηνύματα;</string>
   <string name="ApplicationPreferencesActivity_delete">Διαγραφή</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Απενεργοποίηση κρυπτογράφησης αποθηκευμένων δεδομένων;</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Προσοχή, αυτό θα απενεργοποιήσει τη κρυπτογράφηση των 
-αποθηκευμένων δεδομένων για όλα ταμηνύματα και τα κλειδιά σας.
-Οι κρυπτογραφημένες συζητήσεις σας θα συνεχίσουν να λειτουργούν, 
-αλλά οποιοσδήποτε με φυσική πρόσβαση στη συσκευή σας θα μπορεί να τα διαβάσει.
-    </string>
   <string name="ApplicationPreferencesActivity_disable">Απενεργοποίηση</string>
   <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Απενεργοποίηση μηνυμάτων του TextSecure;</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
@@ -43,7 +36,6 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Δεν μπορεί να βρεθεί μια εφαρμογή για επιλογή μέσων ενημέρωσης.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Λήψη φωτογραφίας</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Εικόνα</string>
   <string name="AttachmentTypeSelectorAdapter_video">Βίντεο</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Ήχος</string>
@@ -59,6 +51,7 @@
         αυτήν την επαφή.
     </string>
   <string name="ConfirmIdentityDialog_accept">Αποδοχή</string>
+  <!--ContactsDatabase-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Μέγεθος μηνύματος: %d KB</string>
   <string name="ConversationItem_expires_s">Λήγει: %s</string>
@@ -245,8 +238,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="DeviceProvisioningActivity_content_bullets">
 Διαβάσει όλα τα μηνύματά σας
 \n- Στείλει μηνύματα με το όνομά σας</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Προσθήκη νέας συσκευής...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Η συσκευή προστεθηκε!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Δεν βρέθηκε συσκευή.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Σφάλμα δικτύου</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Άκυρος QR κωδικός.</string>
@@ -377,9 +368,7 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="KeyCachingService_passphrase_cached">Το TextSecure είναι ξεκλειδωμένο</string>
   <string name="KeyCachingService_lock">Κλείδωμα με συνθηματικό</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d μηνύματα σe %2$d συζητήσεις</string>
   <string name="MessageNotifier_most_recent_from_s">Τελευταίο μήνυμα από: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Κρυπτογραφημένο μήνυμα...</string>
   <string name="MessageNotifier_media_message_with_text">Μήνυμα Πολυμέσων: %s</string>
   <string name="MessageNotifier_no_subject">(Χωρίς Θέμα)</string>
   <string name="MessageNotifier_message_delivery_failed">Η παράδοση μηνύματος απέτυχε.</string>
@@ -388,18 +377,16 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="MessageNotifier_mark_all_as_read">Επισήμανση όλων ως αναγνωσμένα</string>
   <string name="MessageNotifier_media_message">Μήνυμα πολυμέσων</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">ΠΑΛΙΟ ΣΥΝΘΗΜΑΤΙΚΟ</string>
   <string name="change_passphrase_activity__new_passphrase">ΝΕΟ ΣΥΝΘΗΜΑΤΙΚΟ:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">ΕΠΑΝΑΛΗΨΗ ΝΕΟΥ ΣΥΝΘΗΜΑΤΙΚΟΥ:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--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="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>
   <string name="SingleContactSelectionActivity_contact_photo">Φωτογραφία επαφής</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Επιλογή για</string>
@@ -610,7 +597,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="preferences__change_my_passphrase">Άλλαξε το συνθηματικό μου</string>
   <string name="preferences__enable_passphrase">Ενεργοποίηση συνθηματικού</string>
   <string name="preferences__passphrase_summary">Συνθηματικό %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Ενεργοποίηση τοπικής κρυπτογράφησης όλων των μηνυμάτων και κλειδιών</string>
   <string name="preferences__screen_security">Ασφάλεια οθόνης</string>
   <string name="preferences__screen_security_summary">Ασφάλεια οθόνης %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Να επιτρέπεται η καταγραφή της οθόνης (screenshots)</string>
@@ -620,7 +606,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="preferences__pref_timeout_interval_title">Χρονικό όριο</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Πόση ώρα θα περιμένουμε πριν σβήσουμε το συνθηματικό από τη μνήμη</string>
   <string name="preferences__notifications">Ειδοποιήσεις</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Προβολή ειδοποιήσεων για νέα μηνύματα στη γραμμή κατάστασης</string>
   <string name="preferences__led_color">Χρώμα LED</string>
   <string name="preferences__led_color_unknown">Αγνωστο</string>
   <string name="preferences__pref_led_blink_title">Μοτίβο αναβοσβήματος του LED</string>

res/values-es/strings.xml

@@ -12,11 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">¿Eliminar todos los mensajes antiguos?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">¿Está seguro de que quiere recortar inmediatamente todos los hilos de conversación a los %s últimos mensajes?</string>
   <string name="ApplicationPreferencesActivity_delete">Eliminar</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">¿Deshabilitar cifrado del almacenamiento?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-        Atención, esto deshabilitará el cifrado del almacenamiento para todos los mensajes y claves. Sus sesiones cifradas
-        funcionarán pero cualquiera con acceso físico a su dispositivo podrá acceder a ellas.
-    </string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">¿Deshabilitar clave de acceso?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+¿Deshabilitar pantalla de bloqueo para mensajes?</string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Desregistrándose</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Desregistrándose de los mensajes de Textsecure...</string>
@@ -43,7 +41,7 @@ En el futuro tendrá que volver a registrar su número de teléfono para usar de
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">No se pudo encontrar una aplicación para el contenido seleccionado.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Tomar foto</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Cámara</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Fotografía</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -59,6 +57,8 @@ nueva clave de identidad.</string>
 este contacto.
 </string>
   <string name="ConfirmIdentityDialog_accept">Aceptar</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Mensaje %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Tamaño del mensaje: %d KB</string>
   <string name="ConversationItem_expires_s">Expira: %s</string>
@@ -85,6 +85,7 @@ este contacto.
   <string name="ConversationActivity_select_contact_info">Seleccionar información de contacto</string>
   <string name="ConversationActivity_compose_message">Componer mensaje</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Lo sentimos, hubo un error al adjuntar su archivo.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">¡El GIF que ha seleccionado era demasiado grande!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Lo sentimos, el vídeo seleccionado excede las restricciones de tamaño del mensaje (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lo sentimos, el audio seleccionado excede las restricciones de tamaño del mensaje (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">¡El destinatario no es un número de teléfono SMS o correo electrónico válido!</string>
@@ -152,16 +153,16 @@ Recibido:%4$s</string>
   <string name="DateUtils_now">Ahora</string>
   <string name="DateUtils_minutes_ago">%d mins</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">¿Desconectar \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Al desconectar este dispositivo, ya no podrá enviar y recibir mensajes.</string>
+  <string name="DeviceListActivity_unlink_s">¿Desvincular \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Al desvincular este dispositivo, ya no podrá enviar y recibir mensajes.</string>
   <string name="DeviceListActivity_network_connection_failed">Fallo de conexión a la red...</string>
   <string name="DeviceListActivity_try_again">Intentar de nuevo</string>
-  <string name="DeviceListActivity_disconnecting_device">Desconectar dispositivo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Desconectando dispositivo</string>
+  <string name="DeviceListActivity_unlinking_device">Desvinculando dispositivo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Desvinculando dispositivo</string>
   <string name="DeviceListActivity_network_failed">¡Fallo de red!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo sin nombre</string>
-  <string name="DeviceListItem_created_s">Creado el %s</string>
+  <string name="DeviceListItem_linked_s">Se vinculó %s</string>
   <string name="DeviceListItem_last_active_s">Activo por última vez el %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartir con</string>
@@ -263,13 +264,13 @@ Por favor pida al remitente que actualice a la versión más reciente y reenvíe
         - Leer todos sus mensajes
         \n- Enviar mensajes en su nombre
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Añadiendo dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Añadiendo nuevo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">¡Dispositivo añadido!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Vinculando dispositivo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Vinculando nuevo dispositivo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">¡Dispositivo vinculado!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">No se encontró ningun dispositivo.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Error de red.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR no válido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Lo sentimos, tiene ya registrados demasiados dispositivos. Pruebe a eliminar algunos...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Lo sentimos, ya tiene demasiados dispositivos vinculados, pruebe a eliminar alguno...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduzca clave de acceso</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icono de TextSecure</string>
@@ -415,9 +416,9 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="KeyCachingService_passphrase_cached">TextSecure está desbloqueado</string>
   <string name="KeyCachingService_lock">Bloquear con clave de acceso</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mensajes en %2$d conversaciones</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d mensajes nuevos en %2$d conversaciones</string>
   <string name="MessageNotifier_most_recent_from_s">Más recientes desde: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Mensaje cifrado...</string>
+  <string name="MessageNotifier_locked_message">Mensaje bloqueado...</string>
   <string name="MessageNotifier_media_message_with_text">Mensaje multimedia: %s</string>
   <string name="MessageNotifier_no_subject">(Sin asunto)</string>
   <string name="MessageNotifier_message_delivery_failed">Entrega de mensaje fallida.</string>
@@ -430,18 +431,19 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">¡Respuesta rápida no disponible cuando TextSecure está bloqueado!</string>
   <string name="QuickResponseService_problem_sending_message">¡Hubo un problema al enviar el mensaje!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nuevo mensajes de TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Contenidos ocultos</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">CLAVE DE ACCESO ANTERIOR:</string>
   <string name="change_passphrase_activity__new_passphrase">CLAVE DE ACCESO NUEVA:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">REPITA LA NUEVA CLAVE DE ACCESO:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Introduzca un nombre o número</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">No hay contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">Cargando contactos...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">No está registrado en el servicio push...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Actualizando directorio</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando directorio push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Foto del contacto</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
@@ -483,7 +485,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="country_selection_fragment__loading_countries">Cargando países...</string>
   <string name="country_selection_fragment__search">Buscar</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">No hay dispositivos emparejados...</string>
+  <string name="device_list_fragment__no_devices_linked">No hay dispositivos vinculados...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">No se pudieron obtener los registros de actividad de su dispositivo. En su lugar, aún puede usar ADB para acceder a los registros de depuración.</string>
   <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
@@ -656,7 +658,7 @@ por SMS.
   <string name="AndroidManifest__media_overview">Todas las imágenes</string>
   <string name="AndroidManifest__media_overview_named">Todas la imágenes con %1$s</string>
   <string name="AndroidManifest__message_details">Detalles del mensaje</string>
-  <string name="AndroidManifest_manage_paired_devices">Administrar dispositivos emparejados</string>
+  <string name="AndroidManifest_manage_linked_devices">Administrar dispositivos vinculados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar/exportar</string>
   <string name="arrays__my_identity_key">Mi clave de identidad</string>
@@ -669,6 +671,9 @@ por SMS.
   <string name="arrays__settings_default">Configuración predeterminada</string>
   <string name="arrays__enabled">Habilitado</string>
   <string name="arrays__disabled">Deshabilitado</string>
+  <string name="arrays__name_and_message">Nombre y mensaje</string>
+  <string name="arrays__name_only">Sólo nombre</string>
+  <string name="arrays__neither">Ninguno de los dos</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -693,7 +698,7 @@ por SMS.
   <string name="preferences__change_my_passphrase">Cambiar mi clave de acceso</string>
   <string name="preferences__enable_passphrase">Habilitar clave de acceso</string>
   <string name="preferences__passphrase_summary">Clave de acceso %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Habilitar cifrado local de mensajes y claves</string>
+  <string name="preferences__enable_lock_screen_for_messages">Habilitar pantalla de bloqueo para mensajes</string>
   <string name="preferences__screen_security">Seguridad de la pantalla</string>
   <string name="preferences__screen_security_summary">Seguridad de la pantalla %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bloquear capturas de pantalla en la lista de aplicaciones recientes y dentro de la aplicación</string>
@@ -703,7 +708,7 @@ por SMS.
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiración</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">El intervalo de tiempo a esperar antes de eliminar la clave de acceso de la memoria</string>
   <string name="preferences__notifications">Notificaciones</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Desplegar notificaciones de mensaje en la barra de estado</string>
+  <string name="preferences__enable_message_notifications">Habilitar notificaciones de mensaje</string>
   <string name="preferences__led_color">Color del LED</string>
   <string name="preferences__led_color_unknown">Desconocido</string>
   <string name="preferences__pref_led_blink_title">Patrón de parpadeo del LED</string>
@@ -771,6 +776,7 @@ Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
   <string name="preferences__support_wifi_calling">Modo de compatibilidad \'Llamada por WiFi\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Habilítelo si su dispositivo utiliza entrega de SMS/MMS vía WiFi (actívelo sólo cuando \'Llamada por WiFi\' esté activada en su dispositivo)</string>
   <string name="preferences_app_protection__blocked_contacts">Contactos bloqueados</string>
+  <string name="preferences_notifications__display_in_notifications">Mostrar en notificaciones</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -823,7 +829,7 @@ Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
   <string name="conversation__menu_leave_group">Abandonar grupo</string>
   <string name="conversation__menu_delete_thread">Borrar conversación</string>
   <string name="conversation__menu_view_media">Todas las imágenes</string>
-  <string name="conversation__menu_conversation_settings">Configuración de la conversación</string>
+  <string name="conversation__menu_conversation_settings">Opciones de conversación</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Expandir emergente</string>
   <!--conversation_callable-->

res/values-eu/strings.xml

@@ -12,11 +12,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Mezu zahar guztiak ezabatu orain?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ziur zaude solasaldi hari guztiak berehala azkenengo %s mezuetara murriztu nahi izateaz?</string>
   <string name="ApplicationPreferencesActivity_delete">Ezabatu</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desgaitu biltegiaren enkriptaketa?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Kontuz, honek desgaituko du biltegiaren enkriptaketa mezu eta gako guztietarako.
-Zure enkriptatutako saioek funtzionatzen jarraituko dute, baina zure gailua fisikoki uki dezakeen edonor
-gai izango da saiootan sartzeko.</string>
   <string name="ApplicationPreferencesActivity_disable">Desgaitu</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errorea zerbitzariarekin konektatzerakoan!</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Ukitu zure SMS aplikazio lehenetsia aldatzeko</string>
@@ -41,6 +36,7 @@ gai izango da saiootan sartzeko.</string>
   <!--BlockedContactsActivity-->
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Agian kontaktu hau egiaztatu beharko zenuke.</string>
+  <!--ContactsDatabase-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Mezuaren tamaina: %d KB</string>
   <string name="ConversationItem_expires_s">Iraingutuko da: %s</string>
@@ -320,7 +316,6 @@ Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakust
   <string name="KeyCachingService_passphrase_cached">TextSecure desblokeatuta dago</string>
   <string name="KeyCachingService_lock">Blokeatu pasahitz bat erabiliz</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_encrypted_message">Enkriptatuko mezua...</string>
   <string name="MessageNotifier_no_subject">(Ez dago gairik)</string>
   <string name="MessageNotifier_message_delivery_failed">Mezuaren banaketak huts egin du.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Mezuaren banaketak huts egin du.</string>
@@ -328,18 +323,16 @@ Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakust
   <string name="MessageNotifier_mark_all_as_read">Denak irrakurritako gisa markatu</string>
   <string name="MessageNotifier_media_message">Media mezua</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">PASAHITZ ZAHARRA:</string>
   <string name="change_passphrase_activity__new_passphrase">PASAHITZ BERRIA:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">PASAHITZ BERRIA ERREPIKATU:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Kontakturik ez.</string>
   <string name="contact_selection_group_activity__finding_contacts">Kontaktuak kargatzen...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Ez zaude push zerbitzuarekin erregistratuta...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Direktorioa eguneratzen</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Push direktorioa eguneratzen...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktuaren Argazkia</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Hautatu egiteko...</string>
@@ -517,7 +510,6 @@ huts egin du.
   <string name="preferences__change_passphrase">Pasahitza aldatu</string>
   <string name="preferences__change_my_passphrase">Nire pasahitza aldatu</string>
   <string name="preferences__enable_passphrase">Pasahitza gaitu</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Mezuen eta gakoen enkriptatze lokala gaitu</string>
   <string name="preferences__screen_security">Pantailaren segurtasuna</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokeatu pantailazoak arestikoen zerrendan eta aplikazioaren barruan</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Ahaztu pasahitza memoriatik denbora tarte bat pasa ondoren</string>
@@ -526,7 +518,6 @@ huts egin du.
   <string name="preferences__pref_timeout_interval_title">Iraungitzearen tartea</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Memoriatik pasahitza kentzeko itxaron behar den denbora</string>
   <string name="preferences__notifications">Jakinarazpenak</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Mezuaren jakinarazpenak erakutsi egoera-barran</string>
   <string name="preferences__led_color">LED kolorea</string>
   <string name="preferences__led_color_unknown">Ezezaguna</string>
   <string name="preferences__pref_led_blink_title">LEDaren keinuka eredua</string>

res/values-fa/strings.xml

@@ -12,8 +12,10 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">پیام‌های قدیمی حذف شوند؟</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">مطمئنید که می‌خواهید از هر گفتگو %s پیام جدیدتر را نگه داشته و بقیه را حذف کنید؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">غیر فعال کردن رمزگذاری ذخیره سازی؟</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">عبارت عبور غیر فعال کنم؟</string>
   <string name="ApplicationPreferencesActivity_disable">غیرفعال کردن</string>
+  <string name="ApplicationPreferencesActivity_unregistering">لغو ثبت نام</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">لغو ثبت برای پیامهای TextSecur ...</string>
   <string name="ApplicationPreferencesActivity_disable_textsecure_messages">غیر فعال کردن پیام های TextSecure ؟</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطا در اتصال به سرور!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">اس ام اس فعال</string>
@@ -34,7 +36,6 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">امکان یافتن برنامه‌ای برای انتخاب مدیا وجود ندارد.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">عکس گرفتن</string>
   <string name="AttachmentTypeSelectorAdapter_picture">تصویر</string>
   <string name="AttachmentTypeSelectorAdapter_video">ویدئو</string>
   <string name="AttachmentTypeSelectorAdapter_audio">صدا</string>
@@ -45,6 +46,8 @@
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">شما ممکن است مایل به منظور بررسی
 تماس با ما</string>
   <string name="ConfirmIdentityDialog_accept">پذیرفتن</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">ارسال پیام به  %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">حجم پیام: %d کیلوبایت</string>
   <string name="ConversationItem_expires_s">انقضا: %s</string>
@@ -55,6 +58,7 @@
   <string name="ConversationItem_group_action_left">%1$s گروه را ترک کرده است.</string>
   <string name="ConversationItem_click_for_details">برای جزئیات بیشتر ضربه بزنید</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">مجدد به تکه تکه کردن MMS؟</string>
+  <string name="ConversationItem_unable_to_open_media">برنامه ای برای بازکردن این رسانه وجود ندارد.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">گفتگوی امن آغاز شود؟</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">گفتگوی امن با %s آغاز شود؟</string>
@@ -92,6 +96,7 @@
   <string name="ConversationFragment_message_details">جزییات پیام</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">فرستنده: %1$s\nنوع انتقال: %2$s\nزمان ارسال: %3$s\nزمان دریافت: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">تایید حذف پیام</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">آیا از حذف دایم تمام پیام های انتخاب شده اطمینان دارید؟</string>
   <string name="ConversationFragment_save_to_sd_card">ذخیره در ذخیره سازی؟</string>
   <string name="ConversationFragment_success_exclamation">موفقیت!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">قادر نیست به ارسال به ذخیره سازی!</string>
@@ -120,8 +125,7 @@
   <string name="DateUtils_now">اکنون</string>
   <!--DeviceListActivity-->
   <string name="DeviceListActivity_try_again">دوباره تلاش کن</string>
-  <string name="DeviceListActivity_disconnecting_device">قطع اتصال دستگاه ...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">قطع اتصال دستگاه</string>
+  <string name="DeviceListActivity_network_failed">شکست خوردن در شبکه!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">دستگاهی که نامش ذکر نشده</string>
   <!--ShareActivity-->
@@ -191,8 +195,6 @@
   <string name="DeviceProvisioningActivity_continue">ادامه</string>
   <string name="DeviceProvisioningActivity_title">پیوند این دستگاه؟</string>
   <string name="DeviceProvisioningActivity_content_intro">این قادر خواهد بود به</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">اضافه کردن دستگاه جدید ...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">دستگاه اضافه شده است!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">دستگاه یافت نشد.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">خطای شبکه.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">کد QR نامعتبر است.</string>
@@ -208,7 +210,9 @@
   <string name="RatingManager_no_thanks">نه ممنون</string>
   <string name="RatingManager_later">بعد</string>
   <!--RecipientPreferencesActivity-->
+  <string name="RecipientPreferenceActivity_block_this_contact_question">انسداد این تماس؟</string>
   <string name="RecipientPreferenceActivity_block">بلوک</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">رفع انسداد این تماس؟</string>
   <string name="RecipientPreferenceActivity_unblock">رفع انسداد</string>
   <string name="RecipientPreferenceActivity_enabled">فعال</string>
   <string name="RecipientPreferenceActivity_disabled">غیر فعال</string>
@@ -314,7 +318,6 @@
   <string name="KeyCachingService_passphrase_cached">TextSecure باز است</string>
   <string name="KeyCachingService_lock">قفل با عبارت عبور</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_encrypted_message">پیام رمزنگاری شده ...</string>
   <string name="MessageNotifier_media_message_with_text">پیام رسانه ها: %s</string>
   <string name="MessageNotifier_no_subject">(بدون موضوع)</string>
   <string name="MessageNotifier_message_delivery_failed">تحویل پیام شکست خورده است.</string>
@@ -325,17 +328,18 @@
   <string name="MessageNotifier_media_message">پیام رسانه</string>
   <string name="MessageNotifier_reply">پاسخ</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_problem_sending_message">بروز خطا در ارسال پیام!</string>
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">رمز قبلی:</string>
   <string name="change_passphrase_activity__new_passphrase">رمز جدید:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">تکرار رمز جدید:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">نام یا شماره را وارد کنید</string>
   <!--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="SingleContactSelectionActivity_updating_directory">به روز رسانی دایرکتوری</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">به روز رسانی دایرکتوری فشار ...</string>
   <string name="SingleContactSelectionActivity_contact_photo">تصویر مخاطب</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">انتخاب برای</string>
@@ -506,7 +510,6 @@
   <string name="preferences__change_my_passphrase">تغییر رمز من</string>
   <string name="preferences__enable_passphrase">فعال‌سازی رمز</string>
   <string name="preferences__passphrase_summary">رمز %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">فعال کردن رمزگذاری محلی از پیام ها و کلیدها</string>
   <string name="preferences__screen_security">امنیت صفحه نمایش</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">بلوک کردن عکس گرفتن از صفحه در لیست تازه و در داخل برنامه</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">برنامه پس از مدتی به طور خودکار قفل شود</string>
@@ -515,7 +518,6 @@
   <string name="preferences__pref_timeout_interval_title">فاصله ایست</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">برنامه پس از چه مدت به طور خودکار رمز وارد شده را فراموش کند و قفل شود</string>
   <string name="preferences__notifications">اطلاعیه‌ها</string>
-  <string name="preferences__display_message_notifications_in_status_bar">نمایش اطلاعیه دریافت پیام در نوار وضعیت</string>
   <string name="preferences__led_color">رنگ چراغ ال‌ای‌دی</string>
   <string name="preferences__led_color_unknown">ناشناخته</string>
   <string name="preferences__pref_led_blink_title">الگوی چشمک زدن</string>
@@ -629,7 +631,9 @@
   <string name="conversation__menu_leave_group">مرخص شدن از گروه</string>
   <string name="conversation__menu_delete_thread">حذف موضوع</string>
   <string name="conversation__menu_view_media">همه تصاویر</string>
+  <string name="conversation__menu_conversation_settings">تنظیمات گفتگو</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">ببند پنجره پاپ آپ</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">افزودن به مخاطب‌ها</string>
   <!--conversation_group_options-->

res/values-fi/strings.xml

@@ -12,10 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Poistetaanko kaikki vanhat viestit nyt?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Haluatko varmasti rajata kaikki keskustelut %s viimeisimpään viestiin?</string>
   <string name="ApplicationPreferencesActivity_delete">Poista</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Poistetaanko tallennustilan salaus käytöstä?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Varoitus: 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_passphrase">Poista salalause käytöstä?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Poistetaanko sovelluksen ja viestien lukitus salalauseella käytöstä?</string>
   <string name="ApplicationPreferencesActivity_disable">Poista käytöstä</string>
   <string name="ApplicationPreferencesActivity_unregistering">Puretaan rekisteröintiä</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Puretaan rekisteröintiä TextSecure-viestipalvelusta</string>
@@ -42,7 +41,7 @@ Jos haluat käyttää TextSecure-viestejä jatkossa, sinun täytyy rekisteröity
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Median valintaan ei löytynyt sovellusta.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Ota kuva</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Kuva</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Äänitallenne</string>
@@ -57,6 +56,8 @@ uutta identiteettiavainta.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa
 tämän yhteystiedon.</string>
   <string name="ConfirmIdentityDialog_accept">Hyväksy</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Viesti %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Viestin koko: %d kt</string>
   <string name="ConversationItem_expires_s">Umpeutuu: %s</string>
@@ -83,6 +84,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_select_contact_info">Valitse yhteystieto</string>
   <string name="ConversationActivity_compose_message">Kirjoita viesti</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Virhe liitteen lisäämisessä</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Valitsemasi gif on liian suuri!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Valitettavasti kyseinen video ylittää viesteille asetetun kokorajoituksen (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Valitettavasti kyseinen äänitallenne ylittää viesteille asetetun kokorajoituksen (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Annettu numero tai sähköpostiosoite ei ole kelvollinen!</string>
@@ -150,16 +152,16 @@ Vastaanotettu: %4$s</string>
   <string name="DateUtils_now">Nyt</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Poista \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Jos poistat tämän laitteen, sillä ei voi enää lähettää eikä vastaanottaa viestejä.</string>
+  <string name="DeviceListActivity_unlink_s">Poista \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Jos poistat tämän laitteen, sillä ei voi enää lähettää eikä vastaanottaa viestejä.</string>
   <string name="DeviceListActivity_network_connection_failed">Verkkoyhteyden muodostus epäonnistui...</string>
   <string name="DeviceListActivity_try_again">Yritä uudelleen</string>
-  <string name="DeviceListActivity_disconnecting_device">Poistetaan laitetta...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Poistetaan laitetta</string>
+  <string name="DeviceListActivity_unlinking_device">Poistetaan laitetta...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Poistetaan laitetta</string>
   <string name="DeviceListActivity_network_failed">Verkkoyhteysvirhe!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nimeämätön laite</string>
-  <string name="DeviceListItem_created_s">Luotu %s</string>
+  <string name="DeviceListItem_linked_s">Yhdistetty %s</string>
   <string name="DeviceListItem_last_active_s">Viimeksi käytetty %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Jaa</string>
@@ -253,13 +255,13 @@ seuraa niiden uudelleentuonnista viestien kaksoiskappaleita.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - lukea kaikki viestisi
 \n- lähettää viestejä sinun nimessäsi</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Lisätään laitetta</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Lisätään uutta laitetta...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Laite lisätty!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Yhdistetään laitetta</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Yhdistetään uutta laitetta...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Laite yhdistetty!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Laitetta ei löytynyt.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Verkkovirhe.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Virheellinen QR-koodi.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sinulla on liian monta laitetta rekisteröitynä. Kokeile poistaa joitakin.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sinulla on liian monta laitetta yhdistettynä. Kokeile poistaa joitakin...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Syötä salalause</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-kuvake</string>
@@ -398,33 +400,34 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="KeyCachingService_passphrase_cached">TextSecuren lukitus on auki</string>
   <string name="KeyCachingService_lock">Lukitse salalauseella</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d viestiä %2$d keskustelussa</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d uutta viestiä %2$d keskustelussa</string>
   <string name="MessageNotifier_most_recent_from_s">Uusin lähettäjältä: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Salattu viesti...</string>
+  <string name="MessageNotifier_locked_message">Lukittu viesti...</string>
   <string name="MessageNotifier_media_message_with_text">Mediaviesti: %s</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_failed_to_deliver_message">Viestin lähetys ei onnistunut.</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_read">Merk. luetuksi</string>
+  <string name="MessageNotifier_mark_read">Luettu</string>
   <string name="MessageNotifier_media_message">Mediaviesti</string>
   <string name="MessageNotifier_reply">Vastaa</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Pikavastaus ei toimi, kun TextSecure on lukittu!</string>
   <string name="QuickResponseService_problem_sending_message">Ongelma viestin lähettämisessä!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Uusi TextSecure-viesti</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Sisältö piilotettu</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">VANHA SALALAUSE:</string>
   <string name="change_passphrase_activity__new_passphrase">UUSI SALALAUSE:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">TOISTA UUSI SALALAUSE:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Syötä nimi tai numero</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ei yhteystietoja.</string>
   <string name="contact_selection_group_activity__finding_contacts">Ladataan yhteystietoja…</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Et ole rekisteröitynyt pikaviestipalveluun…</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Päivitetään hakemistoa</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Päivitetään pikaviestihakemistoa…</string>
   <string name="SingleContactSelectionActivity_contact_photo">Yhteystiedon kuva</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Valitse</string>
@@ -444,7 +447,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="conversation_activity__compose_description">Viestin kirjoitus</string>
   <string name="conversation_activity__emoji_toggle_description">Näytä tai piilota emoji-näppäimistö</string>
   <string name="conversation_activity__attachment_thumbnail">Liitteen esikatselu</string>
-  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Näytä tai piilota liitetiedostopaneeli</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Pikakamera</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Ladataan mediaviestiä</string>
   <string name="conversation_item__mms_image_description">Mediaviesti</string>
@@ -466,7 +469,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="country_selection_fragment__loading_countries">Ladataan maita...</string>
   <string name="country_selection_fragment__search">Hae</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Ei yhdistettyjä laitteita...</string>
+  <string name="device_list_fragment__no_devices_linked">Ei yhdistettyjä laitteita...</string>
   <!--log_submit_activity-->
   <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__thanks">Kiitos avustasi!</string>
@@ -609,19 +612,22 @@ epäonnistui.</string>
   <string name="AndroidManifest__media_overview">Kaikki kuvat</string>
   <string name="AndroidManifest__media_overview_named">%1$s: kaikki kuvat</string>
   <string name="AndroidManifest__message_details">Viestin tiedot</string>
-  <string name="AndroidManifest_manage_paired_devices">Hallitse yhdistettyjä laitteita</string>
+  <string name="AndroidManifest_manage_linked_devices">Hallitse yhdistettyjä laitteita</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Varmuuskopiot</string>
   <string name="arrays__my_identity_key">Oma identiteettiavaimeni</string>
   <string name="arrays__use_default">Käytä oletusta</string>
   <string name="arrays__use_custom">Käytä mukautettua</string>
-  <string name="arrays__mute_for_one_hour">Mykistä 1 tunniksi</string>
-  <string name="arrays__mute_for_two_hours">Mykistä 2 tunniksi</string>
-  <string name="arrays__mute_for_one_day">Mykistä 1 päiväksi</string>
-  <string name="arrays__mute_for_seven_days">Mykistä 7 päiväksi</string>
+  <string name="arrays__mute_for_one_hour">1 tunniksi</string>
+  <string name="arrays__mute_for_two_hours">2 tunniksi</string>
+  <string name="arrays__mute_for_one_day">1 päiväksi</string>
+  <string name="arrays__mute_for_seven_days">7 päiväksi</string>
   <string name="arrays__settings_default">Oletus</string>
   <string name="arrays__enabled">Päällä</string>
   <string name="arrays__disabled">Poissa</string>
+  <string name="arrays__name_and_message">Nimi ja viesti</string>
+  <string name="arrays__name_only">Vain nimi</string>
+  <string name="arrays__neither">Ei kumpaakaan</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d tunti</item>
@@ -644,9 +650,9 @@ epäonnistui.</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Valitse yhteystieto osoitekirjasta.</string>
   <string name="preferences__change_passphrase">Salalauseen vaihto</string>
   <string name="preferences__change_my_passphrase">Vaihda salalauseeni</string>
-  <string name="preferences__enable_passphrase">Aseta salalause</string>
+  <string name="preferences__enable_passphrase">Käytä salalausetta</string>
   <string name="preferences__passphrase_summary">Salalause %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Ota käyttöön laitteesi viestien ja avainten salaus</string>
+  <string name="preferences__enable_lock_screen_for_messages">Lukitse sovellus ja viestit salalauseella</string>
   <string name="preferences__screen_security">Näytön suojaus</string>
   <string name="preferences__screen_security_summary">Näytön suojaus %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Estä kuvakaappaukset \"viimeksi käytetyt sovellukset\" -näkymästä sekä sovelluksen sisältä</string>
@@ -656,7 +662,7 @@ epäonnistui.</string>
   <string name="preferences__pref_timeout_interval_title">Salalauseen ajastimen kesto</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Odotusaika, ennen kuin salalause unohdetaan muistista</string>
   <string name="preferences__notifications">Ilmoitukset</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Näytä ilmoitukset viesteistä tilapalkissa</string>
+  <string name="preferences__enable_message_notifications">Näytä ilmoitukset viesteistä</string>
   <string name="preferences__led_color">LED:in väri</string>
   <string name="preferences__led_color_unknown">Tuntematon</string>
   <string name="preferences__pref_led_blink_title">LED:in vilkkumistahti</string>
@@ -724,6 +730,7 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="preferences__support_wifi_calling">\"WiFi Calling\" -yhteensopiva tila</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ota käyttöön, jos laitteesi lähettää SMS- ja MMS-viestit WiFi-yhteyden kautta. (Ota käyttöön vain, kun \"WiFi Calling\" on käytössä laitteessasi.)</string>
   <string name="preferences_app_protection__blocked_contacts">Estetyt yhteystiedot</string>
+  <string name="preferences_notifications__display_in_notifications">Ilmoituksissa näytetään</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-fr/strings.xml

@@ -12,11 +12,10 @@
   <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 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_disable_storage_encryption">Désactiver le chiffrement du stockage ?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Attention, 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_passphrase">Désactiver la phrase de passe ?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Désactiver l\'écran de protection des messages ?
+</string>
   <string name="ApplicationPreferencesActivity_disable">Désactiver</string>
   <string name="ApplicationPreferencesActivity_unregistering">Annulation de l\'enregistrement</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Annulation de l\'enregistrement aux messages TextSecure</string>
@@ -44,7 +43,7 @@ en mesure d’y accéder.</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Impossible de trouver une application pour sélectionner le média.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Prendre une photo</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Appareil photo</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Image</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vidéo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -59,6 +58,8 @@ clé d’identité.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Vous devriez
 vérifier ce contact.</string>
   <string name="ConfirmIdentityDialog_accept">Accepter</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Message %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Taille du message : %d Ko</string>
   <string name="ConversationItem_expires_s">Expire : %s</string>
@@ -85,6 +86,7 @@ vérifier ce contact.</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_the_gif_you_selected_was_too_big">Le gif sélectionné est trop gros !</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 de message (%1$skB).</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 de message (%1$skB).</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>
@@ -148,16 +150,16 @@ vérifier ce contact.</string>
   <string name="DateUtils_now">À l\'instant</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Déconnecter \'%s\' ?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Si vous déconnectez cet appareil, il ne sera plus capable d\'envoyer ou recevoir des messages.</string>
+  <string name="DeviceListActivity_unlink_s">Dissocier \'%s\' ?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Si vous dissociez cet appareil, il ne pourra plus envoyer ou recevoir des messages.</string>
   <string name="DeviceListActivity_network_connection_failed">Erreur de connexion réseau...</string>
-  <string name="DeviceListActivity_try_again">Essayer à nouveau</string>
-  <string name="DeviceListActivity_disconnecting_device">Déconnexion de l\'appareil...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Déconnexion de l\'appareil</string>
+  <string name="DeviceListActivity_try_again">Réessayer</string>
+  <string name="DeviceListActivity_unlinking_device">Dissociation de l\'appareil...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Dissociation de l\'appareil</string>
   <string name="DeviceListActivity_network_failed">Erreur réseau !</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Appareil sans nom</string>
-  <string name="DeviceListItem_created_s">%s créé</string>
+  <string name="DeviceListItem_linked_s">%s associé</string>
   <string name="DeviceListItem_last_active_s">Vu pour la dernière fois %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partager avec</string>
@@ -253,13 +255,13 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
         - Lire tous vos messages
         \n- Envoyer des messages en votre nom
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Ajout de l\'appareil</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Ajout du nouvel appareil...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Appareil ajouté</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Association de l\'appareil</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Association du nouvel appareil...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Appareil associé!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Pas d\'appareil trouvé.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Erreur réseau.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR code invalide.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Désolé, vous avez trop d\'appareils déjà enregistrés, essayez d\'en enlever quelques-uns...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Désolé, vous avez associé trop d\'appareils, essayez d\'en enlever quelques-uns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Entrez la phrase de passe</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icône TextSecure</string>
@@ -398,9 +400,9 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="KeyCachingService_passphrase_cached">TextSecure est déverrouillé</string>
   <string name="KeyCachingService_lock">Verrouiller avec la phrase de passe</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d messages dans %2$d conversations</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nouveaux messages dans %2$d conversations</string>
   <string name="MessageNotifier_most_recent_from_s">Plus récent de : %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Message chiffré…</string>
+  <string name="MessageNotifier_locked_message">Message verrouillé...</string>
   <string name="MessageNotifier_media_message_with_text">Message média : %s</string>
   <string name="MessageNotifier_no_subject">(Aucun sujet)</string>
   <string name="MessageNotifier_message_delivery_failed">La distribution du message a échoué.</string>
@@ -411,20 +413,21 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="MessageNotifier_media_message">Message média</string>
   <string name="MessageNotifier_reply">Répondre</string>
   <!--QuickResponseService-->
-  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Les réponses rapides ne sont pas disponibles quand TextSecure est verrouillé !</string>
-  <string name="QuickResponseService_problem_sending_message">Erreur lors de l\'envoi du message !</string>
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Réponse rapide indisponible lorsque TextSecure est verrouillé !</string>
+  <string name="QuickResponseService_problem_sending_message">Erreur lors de l\'envoi du message !</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nouveau message TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Contenus cachés</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Ancienne phrase de passe :</string>
   <string name="change_passphrase_activity__new_passphrase">Nouvelle phrase de passe :</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">Répéter la nouvelle phrase de passe :</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Entrez un nom ou numéro</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Aucun contact.</string>
   <string name="contact_selection_group_activity__finding_contacts">Chargement des contacts...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Vous n\'êtes pas enregistré avec le service push...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Mise à jour du répertoire</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Mise à jour du dossier push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Photo de contact</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Sélectionner pour</string>
@@ -444,6 +447,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="conversation_activity__compose_description">Composition du message</string>
   <string name="conversation_activity__emoji_toggle_description">Activer le clavier emoji</string>
   <string name="conversation_activity__attachment_thumbnail">Vignette de pièce jointe</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Afficher/cacher la grille des pièces jointes</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Téléchargement du message média</string>
   <string name="conversation_item__mms_image_description">Message média</string>
@@ -465,7 +469,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="country_selection_fragment__loading_countries">Chargement des pays...</string>
   <string name="country_selection_fragment__search">Chercher</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Aucun appareil appairé...</string>
+  <string name="device_list_fragment__no_devices_linked">Aucun appareil associé...</string>
   <!--log_submit_activity-->
   <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__thanks">Merci pour votre aide !</string>
@@ -612,7 +616,7 @@ par SMS.</string>
   <string name="AndroidManifest__media_overview">Toutes les images</string>
   <string name="AndroidManifest__media_overview_named">Toutes les images avec %1$s</string>
   <string name="AndroidManifest__message_details">Détails du message</string>
-  <string name="AndroidManifest_manage_paired_devices">Gérer les appareils appairés</string>
+  <string name="AndroidManifest_manage_linked_devices">Gérer les appareils associés</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
@@ -625,6 +629,9 @@ par SMS.</string>
   <string name="arrays__settings_default">Paramètres par défaut</string>
   <string name="arrays__enabled">Activé</string>
   <string name="arrays__disabled">Désactivé</string>
+  <string name="arrays__name_and_message">Nom et message</string>
+  <string name="arrays__name_only">Nom seulement</string>
+  <string name="arrays__neither">Aucun</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d heure</item>
@@ -649,7 +656,7 @@ par SMS.</string>
   <string name="preferences__change_my_passphrase">Modifier ma phrase de passe</string>
   <string name="preferences__enable_passphrase">Activer la phrase de passe</string>
   <string name="preferences__passphrase_summary">Phrase de passe %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Activer le chiffrement local des messages et des clés</string>
+  <string name="preferences__enable_lock_screen_for_messages">Activer l\'écran de protection pour les messages</string>
   <string name="preferences__screen_security">Sécurité d’écran</string>
   <string name="preferences__screen_security_summary">Sécurité d\'écran %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Désactiver les prises d\'écrans dans la liste des applications récentes et à l\'intérieur de l\'application</string>
@@ -659,7 +666,7 @@ par SMS.</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__notifications">Notifications</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Afficher les notifications dans la barre de statut</string>
+  <string name="preferences__enable_message_notifications">Activer les notifications de messages</string>
   <string name="preferences__led_color">Couleur de la LED</string>
   <string name="preferences__led_color_unknown">Inconnu</string>
   <string name="preferences__pref_led_blink_title">Rythme de clignotement de la LED</string>
@@ -726,8 +733,9 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
 </string>
   <string name="preferences__submit_debug_log">Envoyer un rapport de débogage</string>
   <string name="preferences__support_wifi_calling">Compatibilité \'WiFi Calling\'</string>
-  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activer si votre appareil délivre les SMS/MMS à l\'aide du WiFi (n\'activer que lorsque \"WiFi Calling\" est activé sur votre appareil).</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activer si votre appareil délivre les SMS/MMS à l\'aide du WiFi (n\'activer que si \"WiFi Calling\" est activé sur votre appareil).</string>
   <string name="preferences_app_protection__blocked_contacts">Contacts bloqués</string>
+  <string name="preferences_notifications__display_in_notifications">Afficher dans les notifications</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -782,7 +790,7 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
   <string name="conversation__menu_view_media">Toutes les images</string>
   <string name="conversation__menu_conversation_settings">Préférences de conversation</string>
   <!--conversation_popup-->
-  <string name="conversation_popup__menu_expand_popup">Étendre la popup</string>
+  <string name="conversation_popup__menu_expand_popup">Agrandir la popup</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Ajouter aux contacts</string>
   <!--conversation_group_options-->
@@ -824,6 +832,6 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icône de transport</string>
   <!--quick_attachment_drawer-->
-  <string name="quick_camera_unavailable">Caméra indisponible</string>
+  <string name="quick_camera_unavailable">Appareil photo indisponible</string>
   <!--EOF-->
 </resources>

res/values-hr/strings.xml

@@ -12,11 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Obriši sve stare poruke?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Jeste li sigurni da želite skratiti sve razgovore na %s najnovijih poruka?</string>
   <string name="ApplicationPreferencesActivity_delete">Obriši</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Onemogući kriptiranje memorije?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Ovo će onemogućiti kriptiranje memorije za sve poruke i ključeve. Vaše kriptirane
-sesije će nastaviti raditi, ali svi sa fizičkim pristupom vašem uređaju će
-im moći pristupiti.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Onemogući lozinku?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Onemogući zaključani ekran za poruke?</string>
   <string name="ApplicationPreferencesActivity_disable">Onemogući</string>
   <string name="ApplicationPreferencesActivity_unregistering">Uklanjanje registracije</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Uklanjanje registracije na TextSecure poruke...</string>
@@ -43,7 +41,7 @@ Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili TextSe
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nije moguće pronaći aplikaciju za odabir medija.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Uslikaj fotografiju</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Slika</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -56,6 +54,8 @@ ili da je %2$s jednostavno ponovno instalirao TextSecure i sada ima novi identif
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Možda bi trebali provjeriti
 ovaj kontakt.</string>
   <string name="ConfirmIdentityDialog_accept">Prihvati</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Poruka %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Veličina poruke: %d KB</string>
   <string name="ConversationItem_expires_s">Ističe: %s</string>
@@ -82,6 +82,7 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_select_contact_info">Odaberite informacije kontakta</string>
   <string name="ConversationActivity_compose_message">Sastavi poruku</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Došlo je do greške prilikom postavljanja privitka.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Odabrana gif slika je prevelika!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Odabrani video prelazi ograničenje veličine poruke (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Odabrani audio prelazi ograničenje veličine poruke (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Primatelj nije valjana SMS ili adresa e-pošte!</string>
@@ -145,15 +146,16 @@ ovaj kontakt.</string>
   <string name="DateUtils_now">Sada</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Odspoji \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Odspajanjem ovog uređaja više nećete moći slati ili primati poruke.</string>
+  <string name="DeviceListActivity_unlink_s">Odspoji \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Odspajanjem ovog uređaja više nećete moći slati ili primati poruke.</string>
   <string name="DeviceListActivity_network_connection_failed">Povezivanje na mrežu nije uspjelo...</string>
   <string name="DeviceListActivity_try_again">Pokušajte ponovno</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odspajanje uređaja</string>
+  <string name="DeviceListActivity_unlinking_device">Odspajanje uređaja...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Odspajanje uređaja</string>
   <string name="DeviceListActivity_network_failed">Greška mreže!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Neimenovani uređaj</string>
-  <string name="DeviceListItem_created_s">Stvoreno %s</string>
+  <string name="DeviceListItem_linked_s">Povezan %s</string>
   <string name="DeviceListItem_last_active_s">Zadnje aktivno %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podijeli s</string>
@@ -247,13 +249,13 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Čitati sve vaše poruke
 \n- Slati poruke u vaše ime</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Dodavanje uređaja</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Dodavanje novog uređaja...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Uređaj dodan!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Povezivanje uređaja</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Povezivanje novog uređaja...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Uređaj povezan!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Uređaj nije pronađen.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Mrežna greška.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neispravan QR kod.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Imate previše registriranih uređaja, pokušajte ukloniti neke...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Imate previše povezanih uređaja, pokušajte ukloniti neke...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Unesite lozinku</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikona</string>
@@ -391,32 +393,34 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="KeyCachingService_passphrase_cached">TextSecure je otključan</string>
   <string name="KeyCachingService_lock">Zaključajte sa lozinkom</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d poruka u %2$d razgovora</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d novih poruka u %2$d razgovora</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovije od: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Kriptirana poruka...</string>
+  <string name="MessageNotifier_locked_message">Zaključana poruka...</string>
   <string name="MessageNotifier_media_message_with_text">Media poruka: %s</string>
   <string name="MessageNotifier_no_subject">(Bez naslova)</string>
   <string name="MessageNotifier_message_delivery_failed">Neuspješna isporuka poruke.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Isporuka poruke nije uspjela.</string>
   <string name="MessageNotifier_error_delivering_message">Greška prilikom isporuke poruke.</string>
   <string name="MessageNotifier_mark_all_as_read">Označi sve kao pročitano</string>
+  <string name="MessageNotifier_mark_read">Označi pročitano</string>
   <string name="MessageNotifier_media_message">Multimedijalna poruka</string>
   <string name="MessageNotifier_reply">Odgovori</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Brzi odgovor nije dostupan kada je TextSecure zaključan!</string>
   <string name="QuickResponseService_problem_sending_message">Greška prilikom slanja poruke!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nova TextSecure poruka</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Sadržaj je skriven</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">STARA LOZINKA:</string>
   <string name="change_passphrase_activity__new_passphrase">NOVA LOZINKA:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">PONOVITE NOVU LOZINKU:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Unesite ime ili broj</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nema kontakata.</string>
   <string name="contact_selection_group_activity__finding_contacts">Učitavanje kontakata...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Niste registrirani na instant uslugu...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Ažuriranje direktorija</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Ažuriranje instant direktorija...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Slika kontakta</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Odaberi za</string>
@@ -436,6 +440,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="conversation_activity__compose_description">Sastavljanje poruke</string>
   <string name="conversation_activity__emoji_toggle_description">Uključi/isključi emoji tipkovnicu</string>
   <string name="conversation_activity__attachment_thumbnail">Priložena sličica</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Uključi/isključi ladicu dodataka</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Preuzimanje media poruke</string>
   <string name="conversation_item__mms_image_description">Multimedijalna poruka</string>
@@ -457,7 +462,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="country_selection_fragment__loading_countries">Učitavanje zemalja...</string>
   <string name="country_selection_fragment__search">Traži</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nema uparenih uređaja...</string>
+  <string name="device_list_fragment__no_devices_linked">Nema povezanih uređaja...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nije moguće dohvatiti zapise sa vašeg uređaja. Još uvijek možete koristiti ADB kako biste dohvatili debug zapise.</string>
   <string name="log_submit_activity__thanks">Hvala na pomoći!</string>
@@ -513,6 +518,8 @@ Uvezi nekriptiranu kopiju kompatibilnu s \'SMSBackup And Restore\'.</string>
   <string name="recipient_preferences__ringtone">Melodija</string>
   <string name="recipient_preferences__vibrate">Vibriraj</string>
   <string name="recipient_preferences__block">Blokiraj</string>
+  <string name="recipient_preferences__color">Boja</string>
+  <string name="recipient_preferences__color_for_this_contact">Boja za ovaj kontakt</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Potvrdite svoj broj telefona kako biste se povezali sa TextSecure.</string>
@@ -522,6 +529,7 @@ TELEFONSKI BROJ</string>
   <string name="registration_activity__phone_number">TELEFONSKI BROJ</string>
   <string name="registration_activity__register">Registriraj</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registracija šalje neke informacije o kontaktima na poslužitelj. Podaci se ne pohranjuju trajno.</string>
+  <string name="registration_activity__powered_by_twilio">Pokreće twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Neki mogući problemi
 uključuju:</string>
@@ -601,7 +609,7 @@ neuspješno.</string>
   <string name="AndroidManifest__media_overview">Sve slike</string>
   <string name="AndroidManifest__media_overview_named">Sve slike sa %1$s</string>
   <string name="AndroidManifest__message_details">Detalji poruke</string>
-  <string name="AndroidManifest_manage_paired_devices">Upravljanje uparenim uređajima</string>
+  <string name="AndroidManifest_manage_linked_devices">Upravljanje povezanim uređajima</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz / izvoz</string>
   <string name="arrays__my_identity_key">Moj ključ identiteta</string>
@@ -614,6 +622,9 @@ neuspješno.</string>
   <string name="arrays__settings_default">Zadane postavke</string>
   <string name="arrays__enabled">Omogućeno</string>
   <string name="arrays__disabled">Onemogućeno</string>
+  <string name="arrays__name_and_message">Ime i poruka</string>
+  <string name="arrays__name_only">Samo ime</string>
+  <string name="arrays__neither">Niti jedno</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d sat</item>
@@ -639,7 +650,7 @@ neuspješno.</string>
   <string name="preferences__change_my_passphrase">Izmjeni moju lozinku</string>
   <string name="preferences__enable_passphrase">Omogući lozinku</string>
   <string name="preferences__passphrase_summary">Lozinka %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Omogući lokalno kriptiranje poruka i ključeva</string>
+  <string name="preferences__enable_lock_screen_for_messages">Omogući zaključani ekran za poruke</string>
   <string name="preferences__screen_security">Sigurnost ekrana</string>
   <string name="preferences__screen_security_summary">Sigurnost ekrana %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Onemogući snimanje ekrana na popisu nedavnih i unutar aplikacije</string>
@@ -649,7 +660,7 @@ neuspješno.</string>
   <string name="preferences__pref_timeout_interval_title">Interval vremenskog ograničenja</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Vrijeme nakon kojeg će se obrisati lozinka iz memorije</string>
   <string name="preferences__notifications">Obavijesti</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Prikaži obavijesti o porukama u statusnoj traci</string>
+  <string name="preferences__enable_message_notifications">Omogući obavijesti o poruci</string>
   <string name="preferences__led_color">LED boja</string>
   <string name="preferences__led_color_unknown">Nepoznato</string>
   <string name="preferences__pref_led_blink_title">LED uzorak treptanja</string>
@@ -717,6 +728,7 @@ Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' način kompatibilnosti</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Omogućite ukoliko vaš uređaj koristi SMS/MMS isporuku preko WiFi (omogućite jedino kada je \'WiFi pozivanje\' omogućeno na vašem uređaju)</string>
   <string name="preferences_app_protection__blocked_contacts">Blokirani kontakti</string>
+  <string name="preferences_notifications__display_in_notifications">Prikaži u obavijestima</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -769,6 +781,7 @@ Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
   <string name="conversation__menu_leave_group">Napusti grupu</string>
   <string name="conversation__menu_delete_thread">Obriši temu</string>
   <string name="conversation__menu_view_media">Sve slike</string>
+  <string name="conversation__menu_conversation_settings">Postavke razgovora</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Proširi skočni prozor</string>
   <!--conversation_callable-->
@@ -812,5 +825,6 @@ Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona transporta</string>
   <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera nije dostupna</string>
   <!--EOF-->
 </resources>

res/values-hu/strings.xml

@@ -12,12 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Minden régebbi üzenetet szeretnél törölni most?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Biztosan szeretnéd azonnal csonkolni az összes beszélgetésfolyamot a legutóbbi %s üzenetre?</string>
   <string name="ApplicationPreferencesActivity_delete">Törlés</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Letiltod a tároló titkosítását?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Figyelmeztetés, ez letiltja a titkosított tárolást minden üzenethez és kulcshoz. A titkosított
-üzenetváltásod működni fog ugyan, de bárki aki fizikailag hozzáférhet az eszközödhöz
-hozzáférhet az üzenetekhez és a kulcsokhoz!
- </string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Jelszó tiltása?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Tárolt képernyő engedélyezése az üzeneteknek?</string>
   <string name="ApplicationPreferencesActivity_disable">Tiltás</string>
   <string name="ApplicationPreferencesActivity_unregistering">Leregisztrálás</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Leregisztrálás TextSecure üzenetekről...</string>
@@ -45,7 +42,7 @@ hozzáférhet az üzenetekhez és a kulcsokhoz!
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nem található alkalmazás a média kiválasztásához</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Fénykép készítése</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Kép</string>
   <string name="AttachmentTypeSelectorAdapter_video">Mozgókép</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Hang</string>
@@ -60,6 +57,8 @@ azonosító kulcs %1$s vonatkozásában megváltozott. Ez jelentheti, hogy valak
 ezt a névjegyet.
  </string>
   <string name="ConfirmIdentityDialog_accept">Elfogad</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Üzenet %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Üzenet mérete: %d kB</string>
   <string name="ConversationItem_expires_s">Lejár: %s</string>
@@ -87,10 +86,11 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_add_attachment">Melléklet hozzáadása</string>
   <string name="ConversationActivity_select_contact_info">Válassz névjegy infót!</string>
   <string name="ConversationActivity_compose_message">Üzenetírás</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sajnos nem sikerült a melléklet beállítása.</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sajnáljuk, egy hiba történt a mellékleted beállításában.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Az általad választott gif túl nagy volt!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Sajnos a kiválasztott mozgókép mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sajnos a kiválasztott hangállomány mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">A fogadó címe nem érvényes SMS vagy email cím!</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">A fogadó nem egy érvényes SMS vagy email cím!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Üres az üzenet!</string>
   <string name="ConversationActivity_group_members">Csoport tagok</string>
   <string name="ConversationActivity_group_conversation">Csoportos beszélgetés</string>
@@ -110,20 +110,20 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Használd ezt a csevegéshez: %s</string>
   <string name="ConversationActivity_error_leaving_group">Hiba a csoport elhagyásakor...</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS nem támogatott</string>
-  <string name="ConversationActivity_mms_not_supported_message">Ezt az üzenetet nem lehet elküldeni, mivel a szolgáltató nem támogatja az MMS-t.</string>
+  <string name="ConversationActivity_mms_not_supported_message">Ezt az üzenetet nem lehet elküldeni, mivel a szolgáltatód nem támogatja az MMS-t.</string>
   <string name="ConversationActivity_specify_recipient">Válassz egy névjegyet!</string>
   <string name="ConversationActivity_unblock_question">Tiltás feloldása?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Biztosan feloldod ennek a névjegynek a tiltását?</string>
   <string name="ConversationActivity_unblock">Tiltás feloldása</string>
   <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">Üzenet részletei</string>
+  <string name="ConversationFragment_message_details">Üzenet részletek</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Átviteli mód: %1$s\nKüldött/Fogadott: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Küldő: %1$s\nÁtvitel: %2$s\nKüldött: %3$s\nFogadott: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Üzenettörlés megerősítése</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Biztosan véglegesen törölni szeretnéd a kiválasztott üzeneteket?</string>
   <string name="ConversationFragment_save_to_sd_card">Mentsük a tárolóra?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Ennek a médiának az elmentése más alkalmazások számára lehetővé teszi azok hozzáférését.\n\n Folytassuk?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Hiba történt a csatolmány mentése közben!</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Hiba történt a melléklet mentése közben!</string>
   <string name="ConversationFragment_success_exclamation">Sikerült!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nem lehet a tárolóra írni!</string>
   <string name="ConversationFragment_saving_attachment">Melléklet mentése</string>
@@ -145,22 +145,22 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationListItem_key_exchange_message">Kulcs-csere üzenet...</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Egyéni: %s</string>
-  <string name="CustomDefaultPreference_using_default">Alapértelemezett: %s</string>
+  <string name="CustomDefaultPreference_using_default">Alapértelmezett: %s</string>
   <string name="CustomDefaultPreference_none">Egyik sem</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Most</string>
   <string name="DateUtils_minutes_ago">%d perc</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Lecsatlakoztatod \'%s\'-t?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ennek az eszköznek a lecsatlakoztatásával többé nem lesz alkalmas üzenetek küldésére vagy fogadására.</string>
+  <string name="DeviceListActivity_unlink_s">Társítás megszüntetése ezzel: \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ez az eszköz társításának megszüntetésével ez többé nem lesz képes üzeneteket küldeni vagy fogadni.</string>
   <string name="DeviceListActivity_network_connection_failed">Hálózati csatlakozás sikertelen...</string>
   <string name="DeviceListActivity_try_again">Újrapróbálkozás</string>
-  <string name="DeviceListActivity_disconnecting_device">Eszköz leválasztása...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Eszköz lecsatlakoztatása</string>
+  <string name="DeviceListActivity_unlinking_device">Eszköz társításának megszüntetése...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Eszköz társításának megszüntetése</string>
   <string name="DeviceListActivity_network_failed">Hálózati hiba!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Megnevezetlen eszköz</string>
-  <string name="DeviceListItem_created_s">Készítve %s</string>
+  <string name="DeviceListItem_linked_s">Társítva: %s</string>
   <string name="DeviceListItem_last_active_s">Utoljára aktív %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Megosztás...</string>
@@ -250,21 +250,21 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Hibás korábbi jelszó!</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Adj meg egy új jelszót!</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">Csatlakozzon az eszköz?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Társítod ezt az eszközt?</string>
   <string name="DeviceProvisioningActivity_cancel">MÉGSEM</string>
   <string name="DeviceProvisioningActivity_continue">FOLYTATÁS</string>
-  <string name="DeviceProvisioningActivity_title">Csatlakozzon az eszköz?</string>
+  <string name="DeviceProvisioningActivity_title">Társítod ezt az eszközt?</string>
   <string name="DeviceProvisioningActivity_content_intro">Képes lesz</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Az összes üzenet olvasása
 \n- Üzenetek küldése a nevedben</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Eszköz hozzáadása</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Új eszköz hozzáadása...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Eszköz hozzáadása megtörtént!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Eszköz társítása</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Új eszköz társítása</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Eszköz társítva!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nem található eszköz</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Hálózati hiba</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Érvénytelen QR kód</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sajnálom, túl sok eszközöd van jelenleg regisztrálva, próbálj eltávolítani néhányat...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sajnos túl sok eszközöd van társítva jelenleg, próbálj meg néhányat eltávolítani...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Jelszó megadása</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
@@ -283,9 +283,9 @@ Kérlek telepíts újra a Google Play Szolgáltatásokat és próbálkozz újra!
   <string name="RecipientPreferenceActivity_block_this_contact_question">Letiltod ezt a névjegyet?</string>
   <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Többé nem látod az ettől a felhasználótól érkező üzeneteket.</string>
   <string name="RecipientPreferenceActivity_block">Letiltás</string>
-  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Feloldod ennek a névjegynek a tiltát?</string>
-  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Biztosan feloldod ennek a névjegynek a tiltását?</string>
-  <string name="RecipientPreferenceActivity_unblock">Tiltás feloldása</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Feloldod ezt a névjegyet?</string>
+  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Biztosan fel akarod oldani ezt a névjegyet?</string>
+  <string name="RecipientPreferenceActivity_unblock">Feloldás</string>
   <string name="RecipientPreferenceActivity_enabled">Engedélyezett</string>
   <string name="RecipientPreferenceActivity_disabled">Letiltott</string>
   <!--RegistrationActivity-->
@@ -302,7 +302,7 @@ telefonszámot!
 szám (%s) érvénytelen.
  </string>
   <string name="RegistrationActivity_unsupported">Nem támogatott</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnáljuk, de a jelen
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnos a jelen
 eszköz nem támogatja az adat alapú üzenetküldést. Az Android 4.0-nál régebbi verziót használó eszközök esetén
 rendelkezniük kell Google fiókkal. Az Android 4.0-t vagy frissebb verziót használó eszközök
 nem igénylik a Google fiók meglétét, de a Play Áruház alkalmazásnak telepítve kell lennie.
@@ -410,9 +410,9 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="KeyCachingService_passphrase_cached">A TextSecure feloldásra került.</string>
   <string name="KeyCachingService_lock">Lezárás jelszóval</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d üzenet %2$d beszélgetésben</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d új üzenet %2$d beszélgetésben</string>
   <string name="MessageNotifier_most_recent_from_s">Legutóbbi tőle: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Biztonságos üzenet...</string>
+  <string name="MessageNotifier_locked_message">Zárolt üzenet...</string>
   <string name="MessageNotifier_media_message_with_text">Média üzenet: %s</string>
   <string name="MessageNotifier_no_subject">(Nincs tárgy)</string>
   <string name="MessageNotifier_message_delivery_failed">Üzenet kézbesítése sikertelen!</string>
@@ -425,18 +425,19 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Gyors válasz nem elérhető, amikor a TextSecure zárolva van!</string>
   <string name="QuickResponseService_problem_sending_message">Probléma az üzenetküldésben!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Új TextSecure üzenet</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Tartalmak rejtve</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">RÉGI JELSZÓ:</string>
   <string name="change_passphrase_activity__new_passphrase">ÚJ JELSZÓ:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">ISMÉTELD MEG AZ ÚJ JELSZÓT:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Írj be egy nevet vagy egy számot</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nincsenek névjegyek.</string>
   <string name="contact_selection_group_activity__finding_contacts">Névjegyek betöltése...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nem vagy regisztrálva az azonnali üzenetküldési szolgáltatás használatához...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Könyvtár frissítése</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Azonnali üzenetváltás könyvtár frissítése...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Névjegy fotó</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Kiválasztás...</string>
@@ -456,6 +457,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="conversation_activity__compose_description">Üzenet létrehozása</string>
   <string name="conversation_activity__emoji_toggle_description">Váltás a hangulatjelek beviteléhez</string>
   <string name="conversation_activity__attachment_thumbnail">Melléklet előnézet</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Közvetlen mellékletfelvétel</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Média üzenet letöltése</string>
   <string name="conversation_item__mms_image_description">Média üzenet</string>
@@ -477,7 +479,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="country_selection_fragment__loading_countries">Országok betöltése...</string>
   <string name="country_selection_fragment__search">Keresés</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nincsenek eszközök párosítva...</string>
+  <string name="device_list_fragment__no_devices_linked">Nincsenek társított eszközök...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nem sikerült a naplóbejegyzések elérése az eszközön. Helyettük az ADB használható a hibakeresési naplóbejegyzésekhez.</string>
   <string name="log_submit_activity__thanks">Köszönjük a segítségedet!</string>
@@ -641,10 +643,10 @@ sikertelen.
   <string name="AndroidManifest__verify_identity">Azonosító ellenőrzése</string>
   <string name="AndroidManifest__log_submit">Hibakeresési napló küldése</string>
   <string name="AndroidManifest__media_preview">Média előnézet</string>
-  <string name="AndroidManifest__media_overview">Minden fénykép</string>
-  <string name="AndroidManifest__media_overview_named">Minden fénykép vele: %1$s</string>
+  <string name="AndroidManifest__media_overview">Összes fénykép</string>
+  <string name="AndroidManifest__media_overview_named">Összes fénykép vele: %1$s</string>
   <string name="AndroidManifest__message_details">Üzenet részletei</string>
-  <string name="AndroidManifest_manage_paired_devices">Párosított eszközök kezelése</string>
+  <string name="AndroidManifest_manage_linked_devices">Társított eszközök kezelése</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__my_identity_key">Saját azonosító kulcs</string>
@@ -657,6 +659,9 @@ sikertelen.
   <string name="arrays__settings_default">Alapértelmezett beállítások</string>
   <string name="arrays__enabled">Engedélyezett</string>
   <string name="arrays__disabled">Letiltott</string>
+  <string name="arrays__name_and_message">Név és üzenet</string>
+  <string name="arrays__name_only">Csak név</string>
+  <string name="arrays__neither">Egyik sem</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d óra</item>
@@ -665,8 +670,8 @@ sikertelen.
   <!--preferences.xml-->
   <string name="preferences__general">Általános</string>
   <string name="preferences__sms_mms">SMS és MMS</string>
-  <string name="preferences__pref_all_sms_title">Minden SMS fogadása</string>
-  <string name="preferences__pref_all_mms_title">Minden MMS fogadása</string>
+  <string name="preferences__pref_all_sms_title">Összes SMS fogadása</string>
+  <string name="preferences__pref_all_mms_title">Összes MMS fogadása</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure használata minden bejövő SMS üzenet kezelésére</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure használata minden bejövő MMS üzenet kezelésére</string>
   <string name="preferences__input_settings">Beviteli beállítások</string>
@@ -681,7 +686,7 @@ sikertelen.
   <string name="preferences__change_my_passphrase">A saját jelszó megváltoztatása</string>
   <string name="preferences__enable_passphrase">Kódszó engedélyezése</string>
   <string name="preferences__passphrase_summary">Jelszó %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Helyi üzenetkódolás és kulcsok engedélyezése</string>
+  <string name="preferences__enable_lock_screen_for_messages">Zárolt képernyő engedélyezése az üzeneteknek</string>
   <string name="preferences__screen_security">Képernyő biztonság</string>
   <string name="preferences__screen_security_summary">Képernyő biztonság %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">A képernyőkép mentés tiltása a korábbi listákban és az alkalmazáson belül</string>
@@ -691,7 +696,7 @@ sikertelen.
   <string name="preferences__pref_timeout_interval_title">Érvényességi idő tartama</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">A jelszó memóriából való törlése előtti várakozási idő tartama</string>
   <string name="preferences__notifications">Értesítések</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Üzenet értesítések megjelenítése a státusz sorban</string>
+  <string name="preferences__enable_message_notifications">Üzenet értesítések engedélyezése</string>
   <string name="preferences__led_color">LED színe</string>
   <string name="preferences__led_color_unknown">Ismeretlen</string>
   <string name="preferences__pref_led_blink_title">LED villogás mintázata</string>
@@ -701,7 +706,7 @@ sikertelen.
   <string name="preferences__pref_led_blink_custom_pattern_set">LED villogási mintázat beállításra került!</string>
   <string name="preferences__sound">Hang</string>
   <string name="preferences__change_notification_sound">Értesítési hang megváltoztatása</string>
-  <string name="preferences__inthread_notifications">Értesítések a beszélgetések során.</string>
+  <string name="preferences__inthread_notifications">Értesítések a beszélgetések során</string>
   <string name="preferences__play_inthread_notifications">Értesítési hang lejátszása, amikor aktív beszélgetést nézel</string>
   <string name="preferences__repeat_alerts">Figyelmeztetések megismétlése</string>
   <string name="preferences__never">Soha</string>
@@ -759,14 +764,15 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <string name="preferences__support_wifi_calling">\'WiFi hívás\' kompatibilitási mód</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Engedélyezd, ha az eszközöd az SMS/MMS-t WiFi-n keresztül kézbesíti (csak akkor engedélyezd, ha a \'WiFi hívás\' engedélyezve van az eszközödön)</string>
   <string name="preferences_app_protection__blocked_contacts">Letiltott névjegyek</string>
+  <string name="preferences_notifications__display_in_notifications">Megjelenítés értesítésekben</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
-  <string name="contact_selection_list__menu_select_all">Minden kijelölése</string>
+  <string name="contact_selection_list__menu_select_all">Összes kijelölése</string>
   <string name="contact_selection_list__menu_unselect_all">Az összes elem kijelölésének megszüntetése</string>
   <string name="contact_selection_list__header_textsecure_users">TEXTSECURE FELHASZNÁLÓK</string>
-  <string name="contact_selection_list__header_other">MINDEN NÉVJEGY</string>
+  <string name="contact_selection_list__header_other">ÖSSZES NÉVJEGY</string>
   <string name="contact_selection_list__unknown_contact">Új üzenet...</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Befejezve</string>
@@ -789,7 +795,7 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <string name="conversation_insecure__security">Biztonság</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">A kijelölt elemek törlése</string>
-  <string name="conversation_list_batch__menu_select_all">Minden kijelölése</string>
+  <string name="conversation_list_batch__menu_select_all">Összes kijelölése</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Keresés</string>
   <!--conversation_list_item_view-->
@@ -810,7 +816,8 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <string name="conversation__menu_update_group">Csoport frissítése</string>
   <string name="conversation__menu_leave_group">Csoport elhagyása</string>
   <string name="conversation__menu_delete_thread">Beszélgetésfolyam törlése</string>
-  <string name="conversation__menu_view_media">Minden fénykép</string>
+  <string name="conversation__menu_view_media">Összes fénykép</string>
+  <string name="conversation__menu_conversation_settings">Beszélgetés beállítások</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Felugró kiterjesztése</string>
   <!--conversation_callable-->
@@ -829,7 +836,7 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <string name="text_secure_normal__menu_new_group">Új csoport</string>
   <string name="text_secure_normal__menu_settings">Beállítások</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lezárás</string>
-  <string name="text_secure_normal__mark_all_as_read">Mindegyik megjelölése olvasottként</string>
+  <string name="text_secure_normal__mark_all_as_read">Összes megjelölése olvasottként</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">A TextSecure fordításod érvényességi ideje lejárt!</string>
   <string name="reminder_header_expired_build_details">Az üzenetek küldése nem lesz sikeres, kérlek frissíts a legújabb verzióra!</string>
@@ -854,5 +861,6 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Átvitel ikon</string>
   <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera nem elérhető</string>
   <!--EOF-->
 </resources>

res/values-it/strings.xml

@@ -12,9 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Eliminare tutti i messaggi vecchi ora?</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 tutte conversazioni ai soli %s messaggi più recenti?</string>
   <string name="ApplicationPreferencesActivity_delete">Elimina</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Disabilitare la cifratura dei dati salvati?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Attenzione, così facendo interromperai la cifratura di tutti i messaggi e le chiavi che hai salvato. Le tue sessioni cifrate continueranno a funzionare, ma chiunque avrà accesso fisico al tuo dispositivo sarà in grado di accedere ad esse.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Disabilitare la password?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Disabilitare la schermata di blocco per i messaggi?</string>
   <string name="ApplicationPreferencesActivity_disable">Disabilita</string>
   <string name="ApplicationPreferencesActivity_unregistering">Disiscriviti</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Disicriviti dai messaggi di TextSecure</string>
@@ -41,7 +41,7 @@ Dovrai registrare nuovamente il tuo numero di telefono per poter utilizzare di n
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Impossibile trovare un\'app per selezionare il file.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Scatta foto</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Fotocamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Immagine</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -53,6 +53,8 @@ Dovrai registrare nuovamente il tuo numero di telefono per poter utilizzare di n
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Dovresti verificare
 questo contatto.</string>
   <string name="ConfirmIdentityDialog_accept">Accetta</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Messaggio %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Dimensione Messaggio: %d KB</string>
   <string name="ConversationItem_expires_s">Scadenza: %s</string>
@@ -79,6 +81,7 @@ questo contatto.</string>
   <string name="ConversationActivity_select_contact_info">Seleziona informazioni dei contatti</string>
   <string name="ConversationActivity_compose_message">Componi messaggio</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Attenzione, c\'è stato un errore nell\'inviare il tuo allegato.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">La gif selezionata è troppo grande!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Errore, il video selezionato supera la dimensione massima (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Errore, l\'audio selezionato supera la dimensione massima (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Il destinatario non è un indirizzo valido per l\'SMS o per l\'email!</string>
@@ -142,16 +145,16 @@ questo contatto.</string>
   <string name="DateUtils_now">Adesso</string>
   <string name="DateUtils_minutes_ago">%d minuto</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Disconnettere \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Disconnettendo questo dispositivo, esso non sarà più in grado di ricevere nè inviare messaggi.</string>
+  <string name="DeviceListActivity_unlink_s">Scollegare \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Scollegando questo dispositivo, esso non sarà più in grado di inviare o ricevere messaggi.</string>
   <string name="DeviceListActivity_network_connection_failed">Connessione di rete fallita....</string>
   <string name="DeviceListActivity_try_again">Riprova</string>
-  <string name="DeviceListActivity_disconnecting_device">Disconnessione dispositivo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Scollegamento dispositivo</string>
+  <string name="DeviceListActivity_unlinking_device">Scollegamento dispositivo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Scollegamento dispositivo</string>
   <string name="DeviceListActivity_network_failed">Errore di rete!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo senza nome</string>
-  <string name="DeviceListItem_created_s">Creato %s</string>
+  <string name="DeviceListItem_linked_s">Collegato %s</string>
   <string name="DeviceListItem_last_active_s">Ultima attività %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Condividi con</string>
@@ -247,13 +250,13 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Leggere tutti i tuoi messaggi
 \n- Inviare messaggi col tuo nome</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Aggiunta dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Aggiunta nuovo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo aggiunto!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Collegamento dispositivo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Collegamento nuovo dispositivo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo collegato!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nessun dispositivo trovato.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Errore di rete.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Codice QR non valido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Ci spiace, hai già troppi dispositivi registrati, prova a rimuoverne alcuni...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Siamo spiacenti, hai già troppi dispositivi collegati. Prova a scollegarne qualcuno...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Inserire la password</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icona TextSecure</string>
@@ -393,9 +396,9 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="KeyCachingService_passphrase_cached">TextSecure è sbloccato</string>
   <string name="KeyCachingService_lock">Chiudi con password</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d messaggi in %2$d conversazioni</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nuovi messaggi in %2$d conversazioni</string>
   <string name="MessageNotifier_most_recent_from_s">Il più recente da: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">Messaggio cifrato...</string>
+  <string name="MessageNotifier_locked_message">Messaggio bloccato...</string>
   <string name="MessageNotifier_media_message_with_text">Messaggio multimediale: %s</string>
   <string name="MessageNotifier_no_subject">(Nessun oggetto)</string>
   <string name="MessageNotifier_message_delivery_failed">Non è riuscito l\'invio del messaggio</string>
@@ -408,18 +411,19 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Risposta veloce non disponibile quando TextSecure è bloccato!</string>
   <string name="QuickResponseService_problem_sending_message">Problema nell\'invio del messaggio!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nuovo messaggio di TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Contenuto nascosto</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Vecchia password:</string>
   <string name="change_passphrase_activity__new_passphrase">Nuova password:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">Ripeti nuova password:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Inserisci nome o numero</string>
   <!--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">Caricamento contatti...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Non sei registrato al servizio push...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Aggiornamento directory</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Aggiornamento directory push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Foto del contatto</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleziona per</string>
@@ -460,7 +464,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="country_selection_fragment__loading_countries">Caricamento dei paese...</string>
   <string name="country_selection_fragment__search">Cerca</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nessun dispositivo collegato...</string>
+  <string name="device_list_fragment__no_devices_linked">Nessun dispositivo collegato...</string>
   <!--log_submit_activity-->
   <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__thanks">Grazie dell\'aiuto!</string>
@@ -621,7 +625,7 @@ non riuscita.
   <string name="AndroidManifest__media_overview">Tutte le immagini</string>
   <string name="AndroidManifest__media_overview_named">Tutte le immagini con %1$s</string>
   <string name="AndroidManifest__message_details">Dettagli messaggio</string>
-  <string name="AndroidManifest_manage_paired_devices">Gestisci dispositivi collegati</string>
+  <string name="AndroidManifest_manage_linked_devices">Gestisci dispositivi collegati</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importa / Esporta</string>
   <string name="arrays__my_identity_key">La chiave della mia identità</string>
@@ -634,6 +638,9 @@ non riuscita.
   <string name="arrays__settings_default">Impostazioni di default</string>
   <string name="arrays__enabled">Attivato</string>
   <string name="arrays__disabled">Disattivato</string>
+  <string name="arrays__name_and_message">Nome e messaggio</string>
+  <string name="arrays__name_only">Solo nome</string>
+  <string name="arrays__neither">Nessuno dei due</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ora</item>
@@ -658,7 +665,7 @@ non riuscita.
   <string name="preferences__change_my_passphrase">Cambia la mia password</string>
   <string name="preferences__enable_passphrase">Usa password</string>
   <string name="preferences__passphrase_summary">Password %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">Abilità la cifratura in locale di messaggi e chiavi</string>
+  <string name="preferences__enable_lock_screen_for_messages">Attiva schermata di blocco per i messaggi</string>
   <string name="preferences__screen_security">Sicurezza schermo</string>
   <string name="preferences__screen_security_summary">Sicurezza schermo %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blocca il fotografare dello schermo nella lista recenti e all\'interno dell\'app</string>
@@ -668,7 +675,7 @@ non riuscita.
   <string name="preferences__pref_timeout_interval_title">Intervallo di tempo</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantità di tempo prima di dimenticare la password</string>
   <string name="preferences__notifications">Notifiche</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Mostra messaggio di notifica nella barra di stato</string>
+  <string name="preferences__enable_message_notifications">Attiva notifiche messaggi</string>
   <string name="preferences__led_color">Colore del LED</string>
   <string name="preferences__led_color_unknown">Sconosciuto</string>
   <string name="preferences__pref_led_blink_title">Impostazioni LED</string>
@@ -736,6 +743,7 @@ Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="preferences__support_wifi_calling">Modalità di compatibilità \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Abilitare se il tuo device spedisce gli SMM/MMS  via WiFi ( abilita solo quando \"WiFi Calling\" è abilitato per il tuo dispositivo )</string>
   <string name="preferences_app_protection__blocked_contacts">Contatti bloccati</string>
+  <string name="preferences_notifications__display_in_notifications">Visualizza nelle notifiche</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -788,6 +796,7 @@ Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="conversation__menu_leave_group">Abbandona il gruppo</string>
   <string name="conversation__menu_delete_thread">Cancella conversazione</string>
   <string name="conversation__menu_view_media">Tutte le immagini</string>
+  <string name="conversation__menu_conversation_settings">Impostazioni conversazione</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Espandi popup</string>
   <!--conversation_callable-->
@@ -831,5 +840,6 @@ Chatta gratis con gli utenti TextSecure e Signal</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icona trasporto</string>
   <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Fotocamera non disponibile</string>
   <!--EOF-->
 </resources>

res/values-iw/strings.xml

@@ -11,12 +11,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">למחוק את כל ההודעות הישנות עכשיו?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">אתה בטוח שברצונך לקצץ מיד את כל שרשורי השיחות עד להודעות ה-%s הכי חדשות?</string>
   <string name="ApplicationPreferencesActivity_delete">מחק</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">לבטל הצפנת אחסון?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-אזהרה, פעולה זו תבטל הצפנה מקומית לכל ההודעות והמפתחות. החיבורים
-המאובטחים שלך ימשיכו לתפקד, אבל כל אחד עם גישה פיזית למכשירך יוכל
-לגשת אליהם.
-</string>
   <string name="ApplicationPreferencesActivity_disable">בטל</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">אירעה שגיאה בחיבור לשרת!</string>
   <!--AppProtectionPreferenceFragment-->
@@ -31,6 +25,7 @@
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ייתכן שתרצה לאמת
 את איש הקשר הזה.
 </string>
+  <!--ContactsDatabase-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">גודל ההודעה: %d KB</string>
   <string name="ConversationItem_expires_s">פג: %s</string>
@@ -162,18 +157,18 @@
   <string name="ApplicationMigrationService_import_in_progress">בתהליך ייבוא</string>
   <!--KeyCachingService-->
   <!--MessageNotifier-->
-  <string name="MessageNotifier_encrypted_message">הודעה מוצפנת...</string>
   <string name="MessageNotifier_message_delivery_failed">מסירת ההודעה נכשלה.</string>
   <string name="MessageNotifier_failed_to_deliver_message">כישלון במסירת ההודעה.</string>
   <string name="MessageNotifier_error_delivering_message">שגיאה במסירת ההודעה.</string>
   <string name="MessageNotifier_mark_all_as_read">סמן הכל כנקרא</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">סיסמה ישנה:</string>
   <string name="change_passphrase_activity__new_passphrase">סיסמה חדשה:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">חזור על הסיסמה החדשה:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">אין אנשי קשר.</string>
   <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
@@ -250,7 +245,6 @@
   <string name="preferences__pref_timeout_interval_title">זמן התוקף</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">פרק הזמן שיש להמתין לפני שכיחת הסיסמה מהזיכרון</string>
   <string name="preferences__notifications">התראות</string>
-  <string name="preferences__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>

res/values-ja/strings.xml

@@ -12,10 +12,10 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">全ての古いメッセージを今、削除しますか？</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">今すぐ全ての会話スレッドを最新メッセージ%s通にまで縮小（トリム）しますか？</string>
   <string name="ApplicationPreferencesActivity_delete">削除</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">端末内保存データの暗号化を無効にしますか？</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-警告、この作業によって、携帯端末に保存されるすべてのメッセージと鍵の暗号化が無効になります！
-通信上（セッション）の暗号化は引き続き行われますが、お使いの携帯端末それ自体に、誰かが物理的な接触を試みた場合、メッセージや鍵などの情報が入手されてしまう可能性があります。</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">パスワードを無効にする?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+        ロックスクリーンでのメッセージを無効化する?
+    </string>
   <string name="ApplicationPreferencesActivity_disable">無効</string>
   <string name="ApplicationPreferencesActivity_unregistering">未登録</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">TextSecureメッセージが未登録...</string>
@@ -42,7 +42,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">メディアの選択用アプリが見つかりません。</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">写真を撮影</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">カメラ</string>
   <string name="AttachmentTypeSelectorAdapter_picture">写真</string>
   <string name="AttachmentTypeSelectorAdapter_video">動画</string>
   <string name="AttachmentTypeSelectorAdapter_audio">音声</string>
@@ -57,6 +57,8 @@
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">この連絡先を
 照合することが推奨されています。</string>
   <string name="ConfirmIdentityDialog_accept">受け取り</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">メッセージ %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">メッセージのサイズ： %d KB</string>
   <string name="ConversationItem_expires_s">有効期限： %s</string>
@@ -83,6 +85,7 @@
   <string name="ConversationActivity_select_contact_info">連絡先情報を選択</string>
   <string name="ConversationActivity_compose_message">メッセージ作成</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">添付中にエラーが発生しました。</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">あなたの選択したGIFは大きすぎます!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">選択された映像ファイルはサイズ限度を超えています(%1$skB)。</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">選択された音声ファイルはサイズ限度を超えています(%1$skB)。</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">受信先のSMS又はEメールアドレスが有効ではありません。</string>
@@ -146,7 +149,17 @@
   <string name="DateUtils_now">今</string>
   <string name="DateUtils_minutes_ago">%d 分</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">\'%s\' をリンク解除?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">このデバイスをリンク解除すると、メッセージを送信/受信することはできなくなります。</string>
+  <string name="DeviceListActivity_network_connection_failed">ネットワーク接続が失敗...</string>
+  <string name="DeviceListActivity_try_again">再試行</string>
+  <string name="DeviceListActivity_unlinking_device">デバイスのリンク解除...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">デバイスのリンク解除</string>
+  <string name="DeviceListActivity_network_failed">ネットワークが失敗!</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">無名のデバイス</string>
+  <string name="DeviceListItem_linked_s">%s とリンク</string>
+  <string name="DeviceListItem_last_active_s">最後にアクティブ %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共有</string>
   <!--ExportFragment-->
@@ -234,12 +247,13 @@
         - あなたへのすべてのメッセージを読むこと
         \n- あなたの名前でメッセージを送ること
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">デバイスの追加</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">新規デバイスの追加...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">デバイスを追加!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">デバイスのリンク</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">新しいデバイスのリンク...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">デバイスとリンクした!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">デバイスがありません。</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">ネットワークエラー。</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QRコードが無効。</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">すみません、あなたはすでにとても多数のデバイスをリンクしています、なんらかを削除してください...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">パスワード入力</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecureアイコン</string>
@@ -371,29 +385,34 @@
   <string name="KeyCachingService_passphrase_cached">TextSecureは、アンロックされています</string>
   <string name="KeyCachingService_lock">パスワードでロックする</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%2$d 会話の中の %1$d メッセージ </string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%2$d 会話内の %1$d の新規メッセージ</string>
   <string name="MessageNotifier_most_recent_from_s">最新の受信は次から: %1$s</string>
-  <string name="MessageNotifier_encrypted_message">暗号化されたメッセージ…</string>
+  <string name="MessageNotifier_locked_message">メッセージをロック...</string>
   <string name="MessageNotifier_media_message_with_text">メディアメッセージ: %s</string>
   <string name="MessageNotifier_no_subject">（無題）</string>
   <string name="MessageNotifier_message_delivery_failed">メッセージの配信に失敗しました。</string>
   <string name="MessageNotifier_failed_to_deliver_message">メッセージの配信に失敗しました。</string>
   <string name="MessageNotifier_error_delivering_message">メッセージ配信中にエラーがありました。</string>
   <string name="MessageNotifier_mark_all_as_read">すべて既読にする</string>
+  <string name="MessageNotifier_mark_read">既読にする</string>
   <string name="MessageNotifier_media_message">メディアーメッセージ</string>
+  <string name="MessageNotifier_reply">返信</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">TextSecureがロックされていますので、クイック返信は利用できません!</string>
+  <string name="QuickResponseService_problem_sending_message">送信メッセージでの問題!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">新しいTextSecureメッセージ</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">非表示コンテンツ</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">既存のパスワード：</string>
   <string name="change_passphrase_activity__new_passphrase">新規のパスワード：</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">新規のパスワードを再入力：</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">名前もしくは番号を入力</string>
   <!--contact_selection_group_activity-->
-  <!--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="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">あなたはプッシュサービスに登録していません。</string>
-  <string name="SingleContactSelectionActivity_updating_directory">ディレクトリを更新しています</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">プッシュディレクトリを更新中…</string>
   <string name="SingleContactSelectionActivity_contact_photo">連絡先の写真</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">選択</string>
@@ -413,6 +432,7 @@
   <string name="conversation_activity__compose_description">メッセージ新規作成</string>
   <string name="conversation_activity__emoji_toggle_description">絵文字キーボードを切り替え</string>
   <string name="conversation_activity__attachment_thumbnail">添付のサムネイル</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">添付ドロワーのトグル</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">メディアメッセージダウンロード</string>
   <string name="conversation_item__mms_image_description">メディアーメッセージ</string>
@@ -434,6 +454,7 @@
   <string name="country_selection_fragment__loading_countries">国名を読み込み中...</string>
   <string name="country_selection_fragment__search">検索</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">リンクしたデバイスはありません...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">デバッグログの入手に失敗しました。ADBを使ってログの入手は、可能です。</string>
   <string name="log_submit_activity__thanks">提出どうもありがとうございます！</string>
@@ -489,6 +510,8 @@
   <string name="recipient_preferences__ringtone">着信音</string>
   <string name="recipient_preferences__vibrate">振動</string>
   <string name="recipient_preferences__block">ブロック</string>
+  <string name="recipient_preferences__color">色</string>
+  <string name="recipient_preferences__color_for_this_contact">この連絡先の色</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         あなたの電話番号をTextSecureに接続するための検証。
@@ -498,6 +521,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__powered_by_twilio">Powered by twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">いくつかの問題の可能性があります
 原因:</string>
@@ -568,6 +592,7 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="AndroidManifest__media_overview">すべての画像</string>
   <string name="AndroidManifest__media_overview_named">%1$s とすべての画像</string>
   <string name="AndroidManifest__message_details">メッセージの詳細</string>
+  <string name="AndroidManifest_manage_linked_devices">リンク済みデバイスの管理</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">インポート／エクスポート</string>
   <string name="arrays__my_identity_key">自分の認証キー</string>
@@ -580,6 +605,9 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="arrays__settings_default">デフォルト設定</string>
   <string name="arrays__enabled">有効</string>
   <string name="arrays__disabled">無効</string>
+  <string name="arrays__name_and_message">名前とメッセージ</string>
+  <string name="arrays__name_only">名前のみ</string>
+  <string name="arrays__neither">もしくは</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d 時間</item>
@@ -603,7 +631,7 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__change_my_passphrase">パスワードの変更</string>
   <string name="preferences__enable_passphrase">パスフレーズが有効</string>
   <string name="preferences__passphrase_summary">パスフレーズ %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">メッセージと鍵のローカル暗号化を有効にする</string>
+  <string name="preferences__enable_lock_screen_for_messages">ロックスクリーンでのメッセージを有効化</string>
   <string name="preferences__screen_security">スクリーンセキュリティ</string>
   <string name="preferences__screen_security_summary">スクリーンセキュリティ %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">スクリーンショットをアプリ表示の場合防ぐ</string>
@@ -614,7 +642,7 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__pref_timeout_interval_title">タイムアウトの間隔</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">メモリからパスワードを消去するまでの待ち時間です</string>
   <string name="preferences__notifications">通知</string>
-  <string name="preferences__display_message_notifications_in_status_bar">受信通知をステータスバーに表示</string>
+  <string name="preferences__enable_message_notifications">メッセージ通知を有効に</string>
   <string name="preferences__led_color">LED色</string>
   <string name="preferences__led_color_unknown">不明</string>
   <string name="preferences__pref_led_blink_title">LED点滅パターン</string>
@@ -683,6 +711,7 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' 互換モード</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">あなたのデバイスでSMS/MMSの配送をWi-Fi(Wi-Fi Callingが有効にできるデバイスで有効にしある時のみ)上で行うのを有効にする</string>
   <string name="preferences_app_protection__blocked_contacts">ブロックした連絡先</string>
+  <string name="preferences_notifications__display_in_notifications">画面に通知を表示</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -735,7 +764,9 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="conversation__menu_leave_group">グループを抜ける</string>
   <string name="conversation__menu_delete_thread">スレッドを削除</string>
   <string name="conversation__menu_view_media">すべての画像</string>
+  <string name="conversation__menu_conversation_settings">会話設定</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">ポップアップを拡大</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">連絡帳に追加</string>
   <!--conversation_group_options-->
@@ -777,5 +808,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">転送アイコン</string>
   <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">カメラが利用できません</string>
   <!--EOF-->
 </resources>

res/values-kn-rIN/strings.xml

@@ -12,12 +12,10 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">ಈಗ ಎಲ್ಲಾ ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">ನೀವು ಈ  ಕ್ಷಣ ಎಲ್ಲಾ ಸಂಭಾಷಣೆಯ ಇತ್ತೀಚಿನ %s ಸಂದೇಶಗಳಿಗೆ ಮಿತಗೊಳಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
   <string name="ApplicationPreferencesActivity_delete">ಅಳಿಸಿಹಾಕು</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">ಶೇಖರಣಾ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-ಎಚ್ಚರಿಕೆ, ಇದು ಎಲ್ಲಾ ಸಂದೇಶಗಳ ಮತ್ತು ಕೀಲಿಗಳ ಶೇಖರಣಾ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ.
-ಸೆಷನ್ಸ್ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತವೆ, ಆದರೆ ನಿಮ್ಮ ಸಾಧನದ ಭೌತಿಕ ಪ್ರವೇಶದೊಂದಿಗೆ ಯಾರಿಗಾದರೂ ಅವುಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು 
-ಸಾಧ್ಯವಾಗುತ್ತದೆ.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">ಗುಪ್ತಪದವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
   <string name="ApplicationPreferencesActivity_disable">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+  <string name="ApplicationPreferencesActivity_unregistering">ನೋಂದಣಿಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುತ್ತಿದೆ...</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಸಂದೇಶಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ?</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">ಸರ್ವರ್ಗೆ ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">ಎಸ್.ಎಮ್.ಎಸನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">ನಿಮ್ಮ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್.ಎಮ್.ಎಸ್ ಅಪ್ಲಿಕೇಶನ್ನು ಬದಲಾಯಿಸಲು ಸ್ಪರ್ಶಿಸಿ</string>
@@ -37,6 +35,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">ಈ ಮೀಡಿಯಾ ತೆರೆಯಲು ಸಾಮರ್ಥ್ಯವಿರುವ ಅಪ್ಲಿಕೇಶನ್ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">ಕ್ಯಾಮೆರಾ</string>
   <string name="AttachmentTypeSelectorAdapter_picture">ಚಿತ್ರ</string>
   <string name="AttachmentTypeSelectorAdapter_video">ದೃಶ್ಯ</string>
   <string name="AttachmentTypeSelectorAdapter_audio">ಶ್ರಾವ್ಯ</string>
@@ -46,6 +45,9 @@
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different"> %1$sನ ಗುರುತಿಸುವ ಕೀಲಿಗಳು ಬದಲಾಗಿವೆ. ಇದರ ಆರ್ಥ ನಿಮ್ಮ ಸಂಭಾಷಣೆಯನ್ನು ಯಾರೊ ಕದ್ದು ಕೇಳಲು ಪ್ರಯತ್ನಿಸುತ್ತಿದ್ದಾರೆ ಅಥವ %2$s ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರನ್ನು ಮರು ಸ್ಥಾಪಿಸಿದ ಕಾರಣ ಹೋಗುರುತಿಸುವ ಕೀಲಿಗಳನ್ನು ಹೊಂದಿದ್ದಾರೆ.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ನೀವು ಪರಿಶೀಲಿಸಲು ಇಚ್ಛಿಸಬಹುದಾದ ⏎ 
 ಸಂಪರ್ಕ. ⏎</string>
+  <string name="ConfirmIdentityDialog_accept">ಒಪ್ಪಿಕೊಌ</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">ಸಂದೇಶ %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">ಸಂದೇಶದ ಗಾತ್ರ: %d ಕೆ.ಬಿ</string>
   <string name="ConversationItem_expires_s">ಮುಕ್ತಾಯದ ಅವಧಿ: %s</string>
@@ -113,8 +115,10 @@
   <string name="ConversationFragment_push">ದತ್ತಾಂಶ (ಟೆಕ್ಸ್ಟ್  ಸೆಕ್ಯೂರ್)</string>
   <string name="ConversationFragment_mms">ಎಮ್ ಎಮ್ ಎಸ್</string>
   <string name="ConversationFragment_sms">ಎಸ್ ಎಮ್ ಎಸ್</string>
+  <string name="ConversationFragment_deleting">ಅಳಿಸಲಾಗುತ್ತಿದೆ</string>
   <string name="ConversationFragment_deleting_messages">ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ...</string>
   <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">ಹುಡುಕಿ...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">ಸಂವಾದದ ಎಳೆಗಳನ್ನು ಅಳಿಸು?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ನೀವು ಆಯ್ಕೆ ಮಾಡಲಾದ ಎಲ್ಲಾ ಸಂವಾದವನ್ನು ಎಳೆಗಳನ್ನು ಅಳಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
@@ -128,7 +132,9 @@
   <string name="CustomDefaultPreference_none">ಯಾವುದೂ ಇಲ್ಲ</string>
   <!--DateUtils-->
   <string name="DateUtils_now">ಈಗ</string>
+  <string name="DateUtils_minutes_ago">%d ನಿಮಿಷ</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_try_again">ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ</string>
   <!--DeviceListItem-->
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">ಜೊತೆ ಹಂಚಿಕೊಳ್ಳಿ </string>
@@ -219,8 +225,6 @@
         - ನಿಮ್ಮ ಎಲ್ಲಾ ಸಂದೇಶಗಳನ್ನು ಓದಿ
         \n- ನಿಮ್ಮ ಹೆಸರಿನಲ್ಲಿ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಿ
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_content">ಹೋಸ ಸಾಧನವನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ ...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">ಸಾಧನವನ್ನು ಸೇರಿಸಲಾಯಿತು!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">ಯಾವುದೇ ಸಾಧನವನ್ನು ಕಂಡುಹಿಡಿಯಲಾಗಿಲ್ಲ.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">ನೆಟ್ವರ್ಕ್ ದೋಷ.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">ಮಾನ್ಯವಲ್ಲದ QR ಕೋಡ್.</string>
@@ -238,6 +242,8 @@
   <string name="RatingManager_no_thanks">ಧನ್ಯವಾದಗಳು. ಸಧ್ಯಕ್ಕೆ ಇಲ್ಲ.</string>
   <string name="RatingManager_later">ನಂತರ</string>
   <!--RecipientPreferencesActivity-->
+  <string name="RecipientPreferenceActivity_enabled">ಸಕ್ರಿಯಗೊಳಿಸು</string>
+  <string name="RecipientPreferenceActivity_disabled">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಜೋತೆಗೆ ಸಂಪರ್ಕ</string>
   <string name="RegistrationActivity_select_your_country">ನಿಮ್ಮ ರಾಷ್ಟ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
@@ -351,29 +357,26 @@
   <string name="KeyCachingService_passphrase_cached">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್  ಬೀಗ ತೆಗೆದಿದೆ </string>
   <string name="KeyCachingService_lock">ಗುಪ್ತಪದವನ್ನು ಉಪಯೋಗಿಸಿಕೊಂಡು ಬೀಗ ಹಾಕಿ</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d ಸಂದೇಶಗಳನ್ನು %2$d ಸಂಭಾಷಣೆಗಳಲ್ಲಿ.</string>
   <string name="MessageNotifier_most_recent_from_s">%1$s ನಿಂದ ಇತ್ತೀಚಿನ</string>
-  <string name="MessageNotifier_encrypted_message">ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಸಂದೇಶ...</string>
   <string name="MessageNotifier_media_message_with_text">ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ: %s</string>
   <string name="MessageNotifier_no_subject">(ವಿಷಯವಸ್ತು ಇಲ್ಲ)</string>
   <string name="MessageNotifier_message_delivery_failed">ಸಂದೇಶ ತಲುಪಿಸಲು ವಿಫಲವಾಗಿದೆ.</string>
   <string name="MessageNotifier_failed_to_deliver_message">ಸಂದೇಶ ತಲುಪಿಸಲು ವಿಫಲವಾಗಿದೆ.</string>
   <string name="MessageNotifier_error_delivering_message">ಸಂದೇಶವನ್ನು ತಲುಪಿಸುವುದರಲ್ಲಿದೋಷ ಸಂಭವಿಸಿದೆ</string>
   <string name="MessageNotifier_mark_all_as_read">ಎಲ್ಲವನ್ನು ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
+  <string name="MessageNotifier_mark_read">ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
   <string name="MessageNotifier_media_message">ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">ಹಳೆಯ ಗುಪ್ತಪದ:</string>
   <string name="change_passphrase_activity__new_passphrase">ಹೊಸ ಗುಪ್ತಪದ:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">ಹೊಸ ಗುಪ್ತಪದವನ್ನು ಪುನರಾವರ್ತಿಸಿ:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--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="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">ನೀವು ಪುಶ್ ಸೇವೆಯೊಂದಿಗೆ ನೋಂದಾಯಿಸಿಕೊಂಡಿಲ್ಲ...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">ಡೈರೆಕ್ಟರಿಯನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">ಪುಶ್ ಕೋಶವನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <string name="SingleContactSelectionActivity_contact_photo">ಸಂಪರ್ಕದ ಛಾಯಾಚಿತ್ರ</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">ಗೆ ಆಯ್ಕೆಮಾಡಿ</string>
@@ -548,6 +551,8 @@
   <!--arrays.xml-->
   <string name="arrays__import_export">ಆಮದು / ರಫ್ತು</string>
   <string name="arrays__my_identity_key">ನನ್ನ ಗುರುತಿನ ಕೀಲಿ</string>
+  <string name="arrays__enabled">ಸಕ್ರಿಯಗೊಳಿಸು</string>
+  <string name="arrays__disabled">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d ಗಂಟೆಗಳು</item>
@@ -568,7 +573,6 @@
   <string name="preferences__change_passphrase">ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಿ</string>
   <string name="preferences__change_my_passphrase">ನನ್ನ ಗುಪ್ತಪದವನ್ನು ಬದಲಿಸು</string>
   <string name="preferences__enable_passphrase">ಗುಪ್ತಪದವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">ಸಂದೇಶಗಳ ಮತ್ತು ಕೀಗಳ ಸ್ಥಳೀಯ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
   <string name="preferences__screen_security">ತೆರೆಯ ಸುರಕ್ಷತೆ</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">ಇತ್ತೀಚಿನ ಪಟ್ಟಿಯಲ್ಲಿ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಒಳಗೆ  ಸ್ಕ್ರೀನ್ ಶಾಟ್ ಬ್ಲಾಕ್ ಮಾಡಿ</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">ವಿರಾಮದ ನಂತರ ಸ್ಮರಣೆಯಿಂದ ಗುಪ್ತಪದವನ್ನು ಮರೆತುಬಿಡಿ</string>
@@ -577,7 +581,6 @@
   <string name="preferences__pref_timeout_interval_title">ಕಾಲಾವಧಿ</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">ಸ್ಮರಣೆಯಿಂದ ಗುಪ್ತಪದವನ್ನು ಮರೆಯುವ ಮೊದಲು ಕಾಯಬೇಕಿರುವ ಸಮಯ ಪ್ರಮಾಣ</string>
   <string name="preferences__notifications">ಸೂಚನೆಗಳು</string>
-  <string name="preferences__display_message_notifications_in_status_bar">ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಸಂದೇಶದ ಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
   <string name="preferences__led_color">ಎಲ್. ಇ. ಡಿ ಬಣ್ಣ</string>
   <string name="preferences__led_color_unknown">ತಿಳಿಯದ</string>
   <string name="preferences__pref_led_blink_title">ಎಲ್. ಇ. ಡಿ ಮಿಣುಕುವ ಮಾದರಿ</string>
@@ -721,6 +724,7 @@
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">ಚಿತ್ರ ಮುನ್ನೋಟ</string>
   <!--Trimmer-->
+  <string name="trimmer__deleting">ಅಳಿಸಲಾಗುತ್ತಿದೆ</string>
   <string name="trimmer__deleting_old_messages">ಹಳೆಯ ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ...</string>
   <string name="trimmer__old_messages_successfully_deleted">ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಗಿದೆ</string>
   <!--transport_selection_list_item-->

res/values-ko/strings.xml

@@ -12,8 +12,8 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">지금 모든 이전 메시지를 삭제하시겠습니까?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">지금 모든 대화를 최근 메시지 %s개로 줄이시겠습니까?</string>
   <string name="ApplicationPreferencesActivity_delete">삭제</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">저장소 암호화를 사용 중지하시겠습니까?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">경고: 이렇게 하면 모든 메시지와 키의 저장소 암호화가 사용 중지됩니다. 암호화된 세션들은 계속 기능하지만, 기기를 통해 누구나 그 세션들에 접근할 수도 있습니다.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">암호 사용 중지</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">메시지 화면 잠금을 사용 중지하시겠습니까?</string>
   <string name="ApplicationPreferencesActivity_disable">사용 중지</string>
   <string name="ApplicationPreferencesActivity_unregistering">TextSecure 메시지 서비스 탈퇴</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">TextSecure 메시지 서비스를 탈퇴 중…</string>
@@ -38,7 +38,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">미디어를 선택할 수 있는 앱이 없음</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">사진 촬영</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">카메라</string>
   <string name="AttachmentTypeSelectorAdapter_picture">이미지</string>
   <string name="AttachmentTypeSelectorAdapter_video">동영상</string>
   <string name="AttachmentTypeSelectorAdapter_audio">오디오</string>
@@ -49,6 +49,8 @@
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">%1$s님의 인증 키가 변경되었습니다. 이 경우 누군가 통신을 가로채려고 하거나 %2$s님께서 TextSecure를 다시 설치하여 새 인증 키가 되었습니다.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">인증 키를 확인할 것을 권장합니다.</string>
   <string name="ConfirmIdentityDialog_accept">수락</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">%s에 보내기</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">메시지 크기: %dKB</string>
   <string name="ConversationItem_expires_s">만료일: %s</string>
@@ -75,6 +77,7 @@
   <string name="ConversationActivity_select_contact_info">연락처 선택</string>
   <string name="ConversationActivity_compose_message">메시지 작성</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">첨부에 오류가 있음</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">선택된 이미지 용량 초과</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">선택된 동영상이 메시지 크기 제한 (%1$skB)을 초과하여 전송할 수 없음</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">선택된 오디오가 메시지 크기 제한 (%1$skB)을 초과하여 전송할 수 없음</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">수신 주소는 유효한 SMS 또는 이메일 주소가 아님</string>
@@ -138,7 +141,17 @@
   <string name="DateUtils_now">방금 전</string>
   <string name="DateUtils_minutes_ago">%d분 전</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">%s을(를) 연결 해제하시겠습니까?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">연결 해제를 통해 메시지를 보내거나 받지 못할 수 있습니다.</string>
+  <string name="DeviceListActivity_network_connection_failed">네트워크에 연결되지 않습니다.</string>
+  <string name="DeviceListActivity_try_again">다시 시도</string>
+  <string name="DeviceListActivity_unlinking_device">기기 연결 해제 중…</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">기기 연결 해제</string>
+  <string name="DeviceListActivity_network_failed">네트워크에 연결되지 않음</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">이름이 없는 기기</string>
+  <string name="DeviceListItem_linked_s">연결: %s</string>
+  <string name="DeviceListItem_last_active_s">최근 사용: %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">공유 대상</string>
   <!--ExportFragment-->
@@ -216,19 +229,20 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">기존 암호가 잘못됨</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">새 암호가 입력되지 않음</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">해당 기기를 설정하시겠습니까?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">해당 기기를 연결하시겠습니까?</string>
   <string name="DeviceProvisioningActivity_cancel">취소</string>
   <string name="DeviceProvisioningActivity_continue">확인</string>
-  <string name="DeviceProvisioningActivity_title">해당 기기를 설정하시겠습니까?</string>
+  <string name="DeviceProvisioningActivity_title">해당 기기를 연결하시겠습니까?</string>
   <string name="DeviceProvisioningActivity_content_intro">액세스 권한</string>
   <string name="DeviceProvisioningActivity_content_bullets">- 내 메시지 읽기
 \n- 내 이름으로 메시지 보내기</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">기기 추가</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">새 기기를 추가 중…</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">기기 추가 완료</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">기기 연결</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">새 기기를 연결 중…</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">기기 연결 완료</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">기기 없음</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">네트워크 오류</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR코드가 잘못됨</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">기기 연결 가능 갯수 초과하여 기존의 기기 중 하나 연결 해제 필요</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">암호 입력</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 아이콘</string>
@@ -356,9 +370,9 @@
   <string name="KeyCachingService_passphrase_cached">TextSecure 잠금 해제 됨</string>
   <string name="KeyCachingService_lock">암호로 잠금</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">대화 %2$d개에 있는 메시지 %1$d개</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">대화 %2$d개에 새 메시지 %1$d개</string>
   <string name="MessageNotifier_most_recent_from_s">%1$s님에게서 최근 메시지</string>
-  <string name="MessageNotifier_encrypted_message">암호화된 메시지</string>
+  <string name="MessageNotifier_locked_message">잠겨 있는 메시지</string>
   <string name="MessageNotifier_media_message_with_text">미디어 메시지: %s</string>
   <string name="MessageNotifier_no_subject">(제목 없음)</string>
   <string name="MessageNotifier_message_delivery_failed">메시지 전송 실패</string>
@@ -371,18 +385,19 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">TextSecure 잠겨 있는 경우 빠른 응답 사용할 수 없음</string>
   <string name="QuickResponseService_problem_sending_message">메시지 보내지 못함</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">새 TextSecure 메시지</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">콘텐츠 숨겨짐</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">기존 암호:</string>
   <string name="change_passphrase_activity__new_passphrase">새 암호:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">새 암호 다시 입력:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">이름 또는 전화번호 입력</string>
   <!--contact_selection_group_activity-->
-  <!--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="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">푸시 서비스에 가입되지 않음</string>
-  <string name="SingleContactSelectionActivity_updating_directory">연락처 목록 업데이트</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">푸시 메시지를 사용하는 연락처 목록 업데이트 중…</string>
   <string name="SingleContactSelectionActivity_contact_photo">연락처 사진</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">선택:</string>
@@ -402,6 +417,7 @@
   <string name="conversation_activity__compose_description">메시지 작성</string>
   <string name="conversation_activity__emoji_toggle_description">이모티콘 키보드 전환</string>
   <string name="conversation_activity__attachment_thumbnail">첨부파일 미리보기 이미지</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">첨부 창 전환</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">미디어 메시지 다운로드 중</string>
   <string name="conversation_item__mms_image_description">미디어 메시지</string>
@@ -423,6 +439,7 @@
   <string name="country_selection_fragment__loading_countries">국가 로드 중…</string>
   <string name="country_selection_fragment__search">검색</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">연결된 기기 없음</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">기기에서 로그 가져올 수 없지만 ADB로 수동 가져올 수 있음</string>
   <string name="log_submit_activity__thanks">도와주셔서 감사합니다.</string>
@@ -483,6 +500,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__powered_by_twilio">Powered by twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">잠재적인 문제</string>
   <string name="registration_problems__sms_interceptors">SMS 가로채는 앱</string>
@@ -503,7 +521,7 @@
   <string name="registration_progress_activity__no_network_connectivity">네트워크에 연결되지 않음</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">이 TextSecure 기능을 사용하려면 네트워크 연결이 작동해야 합니다. Wi-Fi나 모바일 데이터 네트워크에 연결 상태를 확인하세요.</string>
   <string name="registration_progress_activity__restrictive_firewall">방화벽</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">Wi-Fi 네트워크에 연결되면 TextSecure 서버에 액세스를 제한하는 방화벽이 있을 수 있습니다.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">Wi-Fi 네트워크에 연결되면 TextSecure 서버에 액세스를 제한하는 방화벽이 있을 수 있습니다. 다른 Wi-Fi 네트워크나 모바일 데이터에 연결하세요.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">TextSecure가 자동 SMS 인증메시지로 전화번호를 확인합니다.</string>
   <string name="registration_progress_activity__connecting">연결 중…</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">SMS 인증메시지 기다리는 중…</string>
@@ -542,6 +560,7 @@
   <string name="AndroidManifest__media_overview">전체 이미지</string>
   <string name="AndroidManifest__media_overview_named">%1$s님이랑 대화의 전체 이미지</string>
   <string name="AndroidManifest__message_details">메시지 세부정보</string>
+  <string name="AndroidManifest_manage_linked_devices">연결된 기기 관리</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">가져오기 / 내보내기</string>
   <string name="arrays__my_identity_key">내 인증 키</string>
@@ -554,6 +573,9 @@
   <string name="arrays__settings_default">기본설정</string>
   <string name="arrays__enabled">사용</string>
   <string name="arrays__disabled">사용 안함</string>
+  <string name="arrays__name_and_message">이름과 메시지</string>
+  <string name="arrays__name_only">이름</string>
+  <string name="arrays__neither">이름이나 메시지 표시하지 않음</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d시간 전</item>
@@ -577,7 +599,7 @@
   <string name="preferences__change_my_passphrase">암호 변경</string>
   <string name="preferences__enable_passphrase">암호 사용</string>
   <string name="preferences__passphrase_summary">암호 %s</string>
-  <string name="preferences__enable_local_encryption_of_messages_and_keys">저장된 메시지 및 키 암호화 사용</string>
+  <string name="preferences__enable_lock_screen_for_messages">메시지 화면 잠금 사용</string>
   <string name="preferences__screen_security">화면 보안</string>
   <string name="preferences__screen_security_summary">화면 보안 %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">최근 사용 목록/개요 및 앱 안에서 스크린샷 차단</string>
@@ -587,7 +609,7 @@
   <string name="preferences__pref_timeout_interval_title">시간 초과 간격</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">메모리에서 암호 삭제되지 않는 기간</string>
   <string name="preferences__notifications">알림</string>
-  <string name="preferences__display_message_notifications_in_status_bar">메시지 알림 표시</string>
+  <string name="preferences__enable_message_notifications">메시지 알림 사용</string>
   <string name="preferences__led_color">알림등 색상</string>
   <string name="preferences__led_color_unknown">알 수 없음</string>
   <string name="preferences__pref_led_blink_title">알림등 반복 패턴</string>
@@ -654,6 +676,7 @@
   <string name="preferences__support_wifi_calling">\'Wi-Fi 통화\' 호환 모드</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">\'Wi-Fi 통화\' 사용 과 SMS/MMS Wi-Fi로 전송 설정되면 사용</string>
   <string name="preferences_app_protection__blocked_contacts">차단된 사용자</string>
+  <string name="preferences_notifications__display_in_notifications">알림에 표시</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -706,6 +729,7 @@
   <string name="conversation__menu_leave_group">그룹 나가기</string>
   <string name="conversation__menu_delete_thread">대화 삭제</string>
   <string name="conversation__menu_view_media">전체 이미지</string>
+  <string name="conversation__menu_conversation_settings">대화 설정</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">팝업 펼치기</string>
   <!--conversation_callable-->
@@ -749,5 +773,6 @@
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">전송 아이콘</string>
   <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">카메라 사용할 수 없음</string>
   <!--EOF-->
 </resources>