Bump version to 2.26.2

// 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="136"
-      android:versionName="2.23.0">
+      android:versionCode="148"
+      android:versionName="2.26.2">
 
-    <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.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"/>
@@ -155,7 +162,6 @@
     <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"
@@ -235,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"

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

@@ -26,56 +26,62 @@
                        android:background="@drawable/circle_touch_highlight_background"
                        android:src="@drawable/ic_search_white_24dp" />
 
-            <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="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"/>
+            <LinearLayout android:id="@+id/toggle_container"
+                          android:layout_width="match_parent"
+                          android:layout_height="match_parent"
+                          android:orientation="horizontal">
 
-            <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">
+                <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"/>
 
-                <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" />
+                <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_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_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" />
+                    <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>
+                </org.thoughtcrime.securesms.components.AnimatingToggle>
+
+            </LinearLayout>
 
         </LinearLayout>
 

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,35 +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: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"
@@ -138,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/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/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>
@@ -52,6 +52,7 @@
   <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>
@@ -78,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>
@@ -141,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>
@@ -238,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>
@@ -376,7 +378,7 @@
   <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_media_message_with_text">رسالة وسائط متعددة: %s</string>
   <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
@@ -384,23 +386,25 @@
   <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,6 +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_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>
@@ -624,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>
@@ -635,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>
@@ -693,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>
@@ -219,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>
@@ -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>
@@ -561,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>
@@ -56,6 +54,7 @@
 този контакт. ⏎</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>
@@ -82,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>
@@ -145,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>
@@ -249,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>
@@ -393,8 +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_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,6 +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_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>
@@ -661,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>
@@ -729,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

@@ -128,12 +128,13 @@
   <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>
@@ -205,15 +203,15 @@
   <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>
@@ -86,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>
@@ -133,7 +132,7 @@ kontakt</string>
   <string name="ConversationFragment_deleting">Mažu</string>
   <string name="ConversationFragment_deleting_messages">Mažu zprávy...</string>
   <!--ConversationListActivity-->
-  <string name="ConversationListActivity_search">Vyhhledávám...</string>
+  <string name="ConversationListActivity_search">Vyhledávám...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Smazat konverzace?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Opravdu chcete smazat VŠECHNY označené konverzace?</string>
@@ -149,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>
@@ -248,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>
@@ -386,7 +385,7 @@ 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_locked_message">Zamčená zpráva</string>
   <string name="MessageNotifier_media_message_with_text">Multimediální zpráva: %s</string>
@@ -401,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>
@@ -454,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>
@@ -607,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>
@@ -620,6 +620,12 @@ 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>
+  <string name="arrays__images">Obrázky</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hodina</item>
@@ -655,7 +661,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>
@@ -705,6 +711,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">U každé odeslané zprávy požadovat potvrzení o doručení</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticky mazat starší zprávy jakmile konverzace přesáhne určitou délku</string>
   <string name="preferences__delete_old_messages">Smazat staré zprávy</string>
+  <string name="preferences__chats">Konverzace a media</string>
   <string name="preferences__conversation_length_limit">Limit délky konverzací</string>
   <string name="preferences__trim_all_threads_now">Zkrátit konverzace</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Pohledat všechny konverzace a uplatnit limit délky.</string>
@@ -722,7 +729,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>
@@ -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

@@ -12,17 +12,15 @@
   <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">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">Kamera</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>
@@ -75,13 +73,14 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <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">Sichere Unterhaltung beenden?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Wollen Sie diese sichere Unterhaltung wirklich 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">Wollen Sie diese Unterhaltung wirklich unwiderruflich 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 ungültig!</string>
@@ -107,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">Wollen Sie diesen Kontakt wirklich nicht mehr blockieren?</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">Nachrichten löschen?</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Wollen Sie alle ausgewählten Nachrichten wirklich unwiderruflich 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>
@@ -132,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">Wollen Sie ALLE ausgewählten Unterhaltungen wirklich 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-->
@@ -145,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">Klartextsicherung 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_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>
@@ -178,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>
@@ -194,7 +193,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ImportExportActivity_export">Exportieren</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">System-SMS importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Dies wird die Nachrichten aus der Standard-SMS-App in TextSecure importieren. Falls Sie dies schon einmal gemacht haben, wird es zu doppelten Nachrichten kommen.</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>
@@ -203,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>
@@ -216,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>
@@ -237,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>
@@ -245,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>
@@ -266,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">Kontakt 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">Wollen Sie diesen Kontakt wirklich nicht mehr blockieren?</string>
+  <string name="RecipientPreferenceActivity_block">Blockieren</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>
@@ -333,7 +331,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</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>
@@ -342,12 +340,12 @@ 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. Wollen Sie wirklich eine weitere senden? Dies wird die erste Anfrage ungültig machen.</string>
@@ -382,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_locked_message">Gesperrte 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>
@@ -395,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>
@@ -450,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>
@@ -467,7 +466,7 @@ 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>
+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 wiederherstellen</string>
@@ -475,7 +474,7 @@ Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung exportieren</stri
 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-->
@@ -491,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-->
@@ -520,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>
@@ -530,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>
@@ -557,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>
@@ -583,10 +583,10 @@ 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>
@@ -596,6 +596,12 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</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>
+  <string name="arrays__images">Bilder</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d Stunde</item>
@@ -617,10 +623,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_lock_screen_for_messages">Vorschau im gesperrten Modus sperren</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>
@@ -630,14 +636,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>
@@ -680,6 +686,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald die Unterhaltung eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
+  <string name="preferences__chats">Unterhaltungen und Medien</string>
   <string name="preferences__conversation_length_limit">Höchstzahl an Nachrichten</string>
   <string name="preferences__trim_all_threads_now">Alle Unterhaltungen jetzt kürzen</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Unterhaltungen prüfen und deren Längenbegrenzung sicherstellen</string>
@@ -698,6 +705,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Bei mobiler Datenverbindung</string>
+  <string name="preferences_chats__when_using_wifi">Bei WLAN-Verbindung</string>
+  <string name="preferences_chats__when_roaming">Bei Roaming</string>
+  <string name="preferences_chats__media_auto_download">Automatisches Herunterladen von Medien</string>
+  <string name="preferences_chats__message_trimming">Kürzen von Unterhaltungen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -756,13 +769,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">Teilnehmerliste</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>
@@ -246,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>
@@ -378,7 +368,6 @@ 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_media_message_with_text">Μήνυμα Πολυμέσων: %s</string>
   <string name="MessageNotifier_no_subject">(Χωρίς Θέμα)</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>
@@ -619,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>
@@ -87,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>
@@ -154,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>
@@ -265,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>
@@ -417,7 +416,7 @@ 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_locked_message">Mensaje bloqueado...</string>
   <string name="MessageNotifier_media_message_with_text">Mensaje multimedia: %s</string>
@@ -432,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>
@@ -485,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>
@@ -658,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>
@@ -671,6 +671,12 @@ 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>
+  <string name="arrays__images">Imágenes</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Vídeo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -705,7 +711,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>
@@ -773,6 +779,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-->
   <!--****************************************-->
@@ -825,7 +832,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>
@@ -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>
@@ -525,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>
@@ -46,6 +47,7 @@
 تماس با ما</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>
@@ -56,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>
@@ -93,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>
@@ -121,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-->
@@ -192,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>
@@ -209,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>
@@ -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>
@@ -514,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>
@@ -628,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>
@@ -72,7 +71,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Napsauta, jos haluat lähettää viestin salaamattomana</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Käytä salaamattomia tekstiviestejä?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Käytä salaamattomia MMS-viestejä?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tätä viestiä <b>ei</b> tulla salaamaan, koska vastaanottaja ei enää käytä TextSecurea.\n\nLähetä salaamaton viesti?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tätä viestiä <b>ei</b> voida salata, koska vastaanottaja ei enää käytä TextSecurea.\n\nLähetetäänkö salaamattomana?</string>
   <string name="ConversationItem_unable_to_open_media">Median avaamiseen ei löytynyt sovellusta.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Aloita salattu istunto?</string>
@@ -85,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>
@@ -152,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>
@@ -255,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>
@@ -400,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_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>
@@ -446,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>
@@ -468,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>
@@ -611,19 +612,25 @@ 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>
+  <string name="arrays__images">Kuvat</string>
+  <string name="arrays__audio">Äänitallenteet</string>
+  <string name="arrays__video">Videot</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d tunti</item>
@@ -648,7 +655,7 @@ epäonnistui.</string>
   <string name="preferences__change_my_passphrase">Vaihda salalauseeni</string>
   <string name="preferences__enable_passphrase">Käytä salalausetta</string>
   <string name="preferences__passphrase_summary">Salalause %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">Salaa viestit ja lukitse näyttö salalauseella</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>
@@ -658,7 +665,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>
@@ -708,6 +715,7 @@ epäonnistui.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä vahvistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Poista vanhimpia viestejä automaattisesti, kun keskustelu ylittää määritetyn pituusrajan</string>
   <string name="preferences__delete_old_messages">Vanhojen viestien poisto</string>
+  <string name="preferences__chats">Keskustelut ja media</string>
   <string name="preferences__conversation_length_limit">Keskustelun pituusraja</string>
   <string name="preferences__trim_all_threads_now">Karsi kaikki keskustelut nyt</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Käy läpi kaikki keskustelut ja pakota niihin pituusrajat</string>
@@ -726,6 +734,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Mobiilitiedonsiirtoverkossa</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi-verkossa</string>
+  <string name="preferences_chats__when_roaming">Roaming-verkossa</string>
+  <string name="preferences_chats__media_auto_download">Liitetiedostojen automaattinen lataus</string>
+  <string name="preferences_chats__message_trimming">Viestien karsiminen</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>
@@ -60,6 +59,7 @@ clé d’identité.</string>
 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>
@@ -86,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>
@@ -149,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>
@@ -254,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>
@@ -399,8 +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_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,6 +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_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>
@@ -658,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>
@@ -725,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-->
   <!--****************************************-->
@@ -781,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-->
@@ -823,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>
@@ -57,6 +55,7 @@ ili da je %2$s jednostavno ponovno instalirao TextSecure i sada ima novi identif
 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>
@@ -83,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>
@@ -146,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>
@@ -248,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>
@@ -392,31 +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_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,6 +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_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>
@@ -648,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>
@@ -716,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-->
   <!--****************************************-->
@@ -768,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-->
@@ -811,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>
@@ -89,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>
@@ -112,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>
@@ -147,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>
@@ -252,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>
@@ -285,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-->
@@ -304,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.
@@ -412,7 +410,7 @@ 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_locked_message">Zárolt üzenet...</string>
   <string name="MessageNotifier_media_message_with_text">Média üzenet: %s</string>
@@ -427,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>
@@ -458,7 +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 csatolmányfelvétel</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>
@@ -480,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>
@@ -644,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>
@@ -660,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>
@@ -668,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>
@@ -694,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>
@@ -704,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>
@@ -762,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>
@@ -792,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-->
@@ -813,7 +816,7 @@ 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>
@@ -833,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>

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>
@@ -81,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>
@@ -144,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>
@@ -249,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>
@@ -395,7 +396,7 @@ 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_locked_message">Messaggio bloccato...</string>
   <string name="MessageNotifier_media_message_with_text">Messaggio multimediale: %s</string>
@@ -410,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>
@@ -462,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>
@@ -623,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>
@@ -636,6 +638,12 @@ 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>
+  <string name="arrays__images">Immagini</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ora</item>
@@ -670,7 +678,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>
@@ -720,6 +728,7 @@ non riuscita.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Richiedi un rapporto di consegna per ogni SMS inviato</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automaticamente i messaggi più vecchi quando un thread di conversazione supera una certa lunghezza</string>
   <string name="preferences__delete_old_messages">Elimina i messaggi vecchi</string>
+  <string name="preferences__chats">Chat e download</string>
   <string name="preferences__conversation_length_limit">Limite di lunghezza conversazione</string>
   <string name="preferences__trim_all_threads_now">Riduci immediatamente tutti i thread</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Analizza tutti i thread e applica il limite di lunghezza delle conversazioni.</string>
@@ -738,6 +747,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-->
   <!--****************************************-->

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-->
@@ -168,12 +162,13 @@
   <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>
@@ -58,6 +58,7 @@
 照合することが推奨されています。</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>
@@ -84,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>
@@ -147,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-->
@@ -235,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>
@@ -372,28 +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_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,6 +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_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>
@@ -613,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>
@@ -682,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-->
   <!--****************************************-->
@@ -734,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-->
@@ -776,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,7 +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>
@@ -114,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>
@@ -129,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>
@@ -220,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>
@@ -239,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>
@@ -352,7 +357,6 @@
   <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_media_message_with_text">ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ: %s</string>
   <string name="MessageNotifier_no_subject">(ವಿಷಯವಸ್ತು ಇಲ್ಲ)</string>
@@ -360,20 +364,19 @@
   <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>
@@ -576,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>
@@ -720,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>
@@ -50,6 +50,7 @@
   <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>
@@ -76,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>
@@ -139,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-->
@@ -217,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>
@@ -357,8 +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_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>
@@ -424,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>
@@ -484,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>
@@ -504,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>
@@ -543,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>
@@ -555,6 +573,12 @@
   <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>
+  <string name="arrays__images">이미지</string>
+  <string name="arrays__audio">오디오</string>
+  <string name="arrays__video">동영상</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d시간 전</item>
@@ -578,6 +602,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_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 +612,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>
@@ -637,6 +662,7 @@
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">SMS 메시지 보낼 때마다 전송 확인 요청</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">대화 메시지 저장한도가 초과되면 이전 메시지 자동 삭제</string>
   <string name="preferences__delete_old_messages">이전 메시지 삭제</string>
+  <string name="preferences__chats">대화 및 미디어</string>
   <string name="preferences__conversation_length_limit">대화 메시지 저장한도</string>
   <string name="preferences__trim_all_threads_now">모든 대화 줄이기</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">모든 대화에 메시지 저장한도 적용</string>
@@ -654,6 +680,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-->
   <!--****************************************-->

res/values-mk/strings.xml

@@ -12,12 +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_unregistering">Одјавување</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Одвјавување од TextSecure пораки...</string>
@@ -45,7 +39,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>
@@ -243,9 +236,6 @@
         - Чита сите ваши пораки
         \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_no_device">Уредот не е пронајден.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Мрежна грешка.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Погрешен QR код.</string>
@@ -387,7 +377,6 @@
   <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_most_recent_from_s">Најнови од: %1$s</string>
   <string name="MessageNotifier_media_message_with_text">Медиа порака: %s</string>
   <string name="MessageNotifier_no_subject">(Без наслов)</string>
@@ -397,18 +386,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">Не сте регистрирани за TextSecure услугата.</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>
@@ -640,7 +627,6 @@ 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-my/strings.xml

@@ -126,12 +126,13 @@
   <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-->
@@ -192,7 +193,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">null</string>
   <string name="preferences__vibrate">တုန်ခါမှု</string>
   <string name="preferences__also_vibrate_when_notified">အချက်ပြစဉ်တုန်ခါပါ</string>
   <string name="preferences__minutes">မိနစ်</string>

res/values-nl/strings.xml

@@ -12,9 +12,10 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Nu alle oude berichten verwijderen?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Weet je zeker dat je alle gesprekken wil inkorten tot de laatste %s berichten?</string>
   <string name="ApplicationPreferencesActivity_delete">Verwijderen</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Opslagversleuteling uitschakelen?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Let op, dit schakelt opslagversleuteling uit voor alle berichten en sleutels. Je versleutelde sessies zullen blijven werken, maar iedereen met fysieke toegang tot je apparaat zal er toegang toe hebben.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Wachtwoord uitschakelen?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+        Voorbeeldvenster uitschakelen voor berichten?
+    </string>
   <string name="ApplicationPreferencesActivity_disable">Uitschakelen</string>
   <string name="ApplicationPreferencesActivity_unregistering">Af aan het melden</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Aan het afmelden voor TextSecure berichten...</string>
@@ -41,7 +42,7 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Geen app gevonden om media te selecteren.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Foto nemen</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Camera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Afbeelding</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -80,6 +81,7 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <string name="ConversationActivity_select_contact_info">Selecteer contactinformatie</string>
   <string name="ConversationActivity_compose_message">Bericht opstellen</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Excuses, er trad een fout op bij het instellen van uw bijlage.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">De gif die u geselecteerd hebt is te groot!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Excuses, het videobestand overschrijdt de maximale berichtgrootte (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Excuses, het audiobestand overschrijdt de maximale berichtgrootte (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ontvanger is niet een geldig SMS of e-mailadres!</string>
@@ -143,16 +145,16 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <string name="DateUtils_now">Nu</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">\'%s\' ontkoppelen?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Door dit apparaat te ontkoppelen zal het niet langer berichten kunnen verzenden en ontvangen.</string>
+  <string name="DeviceListActivity_unlink_s">Ontkoppel \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Door het ontkoppelen van dit apparaat kan het niet langer berichten verzenden of ontvangen.</string>
   <string name="DeviceListActivity_network_connection_failed">Netwerkverbinding mislukt..</string>
   <string name="DeviceListActivity_try_again">Probeer opnieuw</string>
-  <string name="DeviceListActivity_disconnecting_device">Toestel aan het loskoppelen...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Apparaat aan het loskoppelen</string>
+  <string name="DeviceListActivity_unlinking_device">Apparaat ontkoppelen...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Apparaat ontkoppelen</string>
   <string name="DeviceListActivity_network_failed">Netwerkfout!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Naamloos apparaat</string>
-  <string name="DeviceListItem_created_s">Aangemaakt %s</string>
+  <string name="DeviceListItem_linked_s">Gekoppeld %s</string>
   <string name="DeviceListItem_last_active_s">Laatst actief %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Delen met</string>
@@ -241,13 +243,13 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
         - Al je berichten lezen
         \n- Berichten versturen namens jou
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Apparaat aan het toevoegen...</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Nieuw apparaat aan het toevoegen...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Apparaat toegevoegd!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Apparaat koppelen</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Koppelen nieuw apparaat...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Apparaat gekoppeld!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Geen apparaat gevonden.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netwerkfout!</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ongeldige QR code.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sorry, je hebt te veel apparaten geregistreerd, probeer er enkele te verwijderen...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, u hebt teveel gekoppelde apparaten, probeer er te verwijderen...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Voer wachtwoord in</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure icoon</string>
@@ -383,7 +385,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="KeyCachingService_passphrase_cached">TextSecure is ontgrendeld</string>
   <string name="KeyCachingService_lock">Vergrendelen met wachtwoord</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d berichten in %2$d gesprekken</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nieuwe berichten in %2$d gesprekken</string>
   <string name="MessageNotifier_most_recent_from_s">Meest recente van: %1$s</string>
   <string name="MessageNotifier_locked_message">Vergrendeld bericht...</string>
   <string name="MessageNotifier_media_message_with_text">Mediabericht: %s</string>
@@ -398,18 +400,19 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Snel reageren niet beschikbaar als TextSecure vergrendeld is!</string>
   <string name="QuickResponseService_problem_sending_message">Fout bij het bericht versturen!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nieuw TextSecuer bericht</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Inhoud verborgen</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Oud wachtwoord:</string>
   <string name="change_passphrase_activity__new_passphrase">Nieuw wachtwoord:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">Herhaal nieuw wachtwoord:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Typ naam of nummer</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Geen contacten.</string>
   <string name="contact_selection_group_activity__finding_contacts">Contacten laden...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Je bent niet geregistreerd bij de push service...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Contactpersonen updaten</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Pushcontacten aan het updaten...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Contactfoto</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecteer voor</string>
@@ -451,7 +454,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="country_selection_fragment__loading_countries">Landen laden...</string>
   <string name="country_selection_fragment__search">Zoeken</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Geen apparaten gekoppeld...</string>
+  <string name="device_list_fragment__no_devices_linked">Geen apparaten gekoppeld...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kan geen logs van je apparaat verzamelen. Je kan nog steeds ADB gebruiken om debug logs te verzamelen.</string>
   <string name="log_submit_activity__thanks">Bedankt voor uw hulp!</string>
@@ -595,7 +598,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="AndroidManifest__media_overview">Alle afbeeldingen</string>
   <string name="AndroidManifest__media_overview_named">Alle afbeeldingen met %1$s</string>
   <string name="AndroidManifest__message_details">Bericht Details</string>
-  <string name="AndroidManifest_manage_paired_devices">Gekoppelde apparaten beheren</string>
+  <string name="AndroidManifest_manage_linked_devices">Beheer gekoppelde apparaten</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importeren / exporteren</string>
   <string name="arrays__my_identity_key">Mijn identiteitssleutel</string>
@@ -608,6 +611,12 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="arrays__settings_default">Standaardinstellingen</string>
   <string name="arrays__enabled">Ingeschakeld</string>
   <string name="arrays__disabled">Uitgeschakeld</string>
+  <string name="arrays__name_and_message">Naam en bericht</string>
+  <string name="arrays__name_only">Alleen naam</string>
+  <string name="arrays__neither">Geen van alle</string>
+  <string name="arrays__images">Afbeeldingen</string>
+  <string name="arrays__audio">Geluid</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d uur</item>
@@ -642,7 +651,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__pref_timeout_interval_title">Time-out interval</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hoe lang te wachten voor het vergeten van het wachtwoord uit het geheugen</string>
   <string name="preferences__notifications">Notificaties</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Berichtmeldingen in notificatiebalk tonen</string>
+  <string name="preferences__enable_message_notifications">Toon bericht notificaties</string>
   <string name="preferences__led_color">LED-kleur</string>
   <string name="preferences__led_color_unknown">Onbekend</string>
   <string name="preferences__pref_led_blink_title">LED-knipperpatroon</string>
@@ -692,6 +701,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Verzoeken om een ontvangstbevestiging voor ieder verzonden SMS bericht</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatisch oudere berichten verwijderen wanneer een gesprek meer dan een bepaald aantal berichten bevat</string>
   <string name="preferences__delete_old_messages">Verwijder oude berichten</string>
+  <string name="preferences__chats">Gesprekken en media</string>
   <string name="preferences__conversation_length_limit">Gesprekslengte limiet</string>
   <string name="preferences__trim_all_threads_now">Oude berichten nu verwijderen</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle gesprekken scannen en de maximale gesprekslengte toepassen</string>
@@ -711,6 +721,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__support_wifi_calling">\'Bellen via WiFi\' compatibiliteitsmodus</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Inschakelen als je toestel SMS/MMS over WiFi gebruikt (alleen inschakelen als \'WiFi Bellen\' is ingeschakeld op je toestel)</string>
   <string name="preferences_app_protection__blocked_contacts">Geblokkeerde contacten</string>
+  <string name="preferences_notifications__display_in_notifications">Toon in notificaties</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-no/strings.xml

@@ -12,9 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slette alle gamle meldinger nå?</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 ønsker å umiddelbart trimme alle samtaletrådene til de siste %s meldinger?</string>
   <string name="ApplicationPreferencesActivity_delete">Slett</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktivere kryptert lagring?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Advarsel! Dette vil deaktivere kryptert lagring av alle meldinger og nøkler. Dine krypterte sesjoner vil fortsette å fungere, men alle med fysisk tilgang til enheten din vil kunne få tilgang til dem.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Deaktivere passord?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Deaktivere skjermlås for meldinger?</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktiver</string>
   <string name="ApplicationPreferencesActivity_unregistering">Avregistrerer</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Avregistrerer fra TextSecure meldinger...</string>
@@ -41,7 +41,7 @@ Om du vil benytte TextSecure meldinger igjen i fremtiden må du registrere telef
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Finner ikke en applikasjon for å velge media.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Ta bilde</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Bilde</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -54,6 +54,7 @@ Om du vil benytte TextSecure meldinger igjen i fremtiden må du registrere telef
 denne kontakten.</string>
   <string name="ConfirmIdentityDialog_accept">Godta</string>
   <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Melding %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Meldingsstørrelse: %d KB</string>
   <string name="ConversationItem_expires_s">Utløper: %s</string>
@@ -80,6 +81,7 @@ denne kontakten.</string>
   <string name="ConversationActivity_select_contact_info">Velg kontaktinformasjon</string>
   <string name="ConversationActivity_compose_message">Skriv melding</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Beklager, en feil oppstod ved behandling av vedlegg.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">GIF-bildet du valgte var for stort!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Beklager, den valgte videofilen overstiger restriksjonene på meldingsstørrelse (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Beklager, den valgte lydfilen overstiger restriksjonene på meldingsstørrelse (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mottakeren er ikke en gyldig SMS- eller e-postadresse!</string>
@@ -143,16 +145,16 @@ denne kontakten.</string>
   <string name="DateUtils_now">Nå</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Frakoble «%s»?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ved å frakoble denne enheten vil den ikke lenger være i stand til å sende eller motta meldinger.</string>
+  <string name="DeviceListActivity_unlink_s">Frakoble \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ved å frakoble denne enheten vil den ikke lenger være i stand til å sende eller motta meldinger.</string>
   <string name="DeviceListActivity_network_connection_failed">Nettverksforbindelse feilet...</string>
   <string name="DeviceListActivity_try_again">Prøv igjen</string>
-  <string name="DeviceListActivity_disconnecting_device">Frakobler enhet...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Frakobler enhet</string>
+  <string name="DeviceListActivity_unlinking_device">Frakobler enhet...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Frakobler enhet</string>
   <string name="DeviceListActivity_network_failed">Nettverk feilet!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Ikke navngitt enhet</string>
-  <string name="DeviceListItem_created_s">Opprettet %s</string>
+  <string name="DeviceListItem_linked_s">%s tilkoblet</string>
   <string name="DeviceListItem_last_active_s">Sist aktiv %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Del med</string>
@@ -241,13 +243,13 @@ Gjenoppretting av en kryptert backup vil overskrive eksisterende nøkler, innsti
 - Lese alle meldingene dine
 \n- Sende meldinger i ditt navn
  </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Legger til enhet</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Legger til ny enhet...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Enhet lagt til!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Kobler enhet</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Kobler til ny enhet...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Enhet tilkoblet!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ingen enhet funnet.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Nettverksfeil.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ugyldig QR-kode.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Beklager, du har for mange enheter registrert allerede, forsøk å fjerne noen...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Beklager, du har for mange enheter koblet til allerede, forsøk å fjerne noen...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Tast inn passord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
@@ -382,8 +384,9 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure er ulåst</string>
   <string name="KeyCachingService_lock">Lås med passord</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d meldinger i %2$d samtaler</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nye meldinger i %2$d samtaler</string>
   <string name="MessageNotifier_most_recent_from_s">Nyeste fra: %1$s</string>
+  <string name="MessageNotifier_locked_message">Låst melding...</string>
   <string name="MessageNotifier_media_message_with_text">Media melding: %s</string>
   <string name="MessageNotifier_no_subject">(Mangler emne)</string>
   <string name="MessageNotifier_message_delivery_failed">Levering av meldingen mislyktes.</string>
@@ -396,18 +399,19 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Rask tilbakemelding ikke tilgjengelig når TextSecure er låst!</string>
   <string name="QuickResponseService_problem_sending_message">Kunne ikke sende melding!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Ny TextSecure melding</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Innhold skjult</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Gammelt passord:</string>
   <string name="change_passphrase_activity__new_passphrase">Nytt passord:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">Gjenta nytt passord:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Tast inn et navn eller nummer</string>
   <!--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">Laster kontakter...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du er ikke registrert hos \"push\" tjenesten...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Oppdaterer katalog</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Oppdaterer «push»-katalogen …</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktbilde</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Velg for</string>
@@ -449,7 +453,7 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="country_selection_fragment__loading_countries">Laster land...</string>
   <string name="country_selection_fragment__search">Søk</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Ingen sammenkoblede enheter...</string>
+  <string name="device_list_fragment__no_devices_linked">Ingen enheter tilkoblet...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kunne ikke hente loggene fra din enhet. Du kan fremdeles benytte ADB for å hente debug logger.</string>
   <string name="log_submit_activity__thanks">Takk for hjelpen!</string>
@@ -588,7 +592,7 @@ feilet.</string>
   <string name="AndroidManifest__media_overview">Alle bilder</string>
   <string name="AndroidManifest__media_overview_named">Alle bilder med %1$s</string>
   <string name="AndroidManifest__message_details">Meldingsdetaljer</string>
-  <string name="AndroidManifest_manage_paired_devices">Administrer sammenkoblede enheter</string>
+  <string name="AndroidManifest_manage_linked_devices">Administrer tilkoblede enheter</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importere / eksportere</string>
   <string name="arrays__my_identity_key">Min ID-nøkkel</string>
@@ -601,6 +605,12 @@ feilet.</string>
   <string name="arrays__settings_default">Standardinstillinger</string>
   <string name="arrays__enabled">Aktivert</string>
   <string name="arrays__disabled">Deaktivert</string>
+  <string name="arrays__name_and_message">Navn og melding</string>
+  <string name="arrays__name_only">Kun navn</string>
+  <string name="arrays__neither">Ingen</string>
+  <string name="arrays__images">Bilder</string>
+  <string name="arrays__audio">Lyd</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d time</item>
@@ -625,6 +635,7 @@ feilet.</string>
   <string name="preferences__change_my_passphrase">Velg et nytt passord</string>
   <string name="preferences__enable_passphrase">Aktiver passord</string>
   <string name="preferences__passphrase_summary">Passord %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">Aktiver skjermlås for meldinger</string>
   <string name="preferences__screen_security">Skjermsikkerhet</string>
   <string name="preferences__screen_security_summary">Skjermsikkerhet %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokker skjermbilde i listen over siste applikasjoner og inni applikasjonen</string>
@@ -634,7 +645,7 @@ feilet.</string>
   <string name="preferences__pref_timeout_interval_title">Timeoutintervall</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tiden det skal gå før passordet slettes fra minnet på enheten</string>
   <string name="preferences__notifications">Varsling</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Vis varsel om meldinger i status feltet</string>
+  <string name="preferences__enable_message_notifications">Aktiver meldingsvarling</string>
   <string name="preferences__led_color">LED farge</string>
   <string name="preferences__led_color_unknown">Ukjent</string>
   <string name="preferences__pref_led_blink_title">LED blinkemønster</string>
@@ -684,6 +695,7 @@ feilet.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Be om en leveringsrapport for hver SMS-melding du sender</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slett eldre meldinger automatisk når en samtaletråd overskrider en spesifisert lengde</string>
   <string name="preferences__delete_old_messages">Slett gamle meldinger</string>
+  <string name="preferences__chats">Samtaler og media</string>
   <string name="preferences__conversation_length_limit">Grense på samtalelengde</string>
   <string name="preferences__trim_all_threads_now">Trimme alle samtaletråder nå</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Gjennomgå alle samtaletrådene og håndhev grensen på samtalelengde </string>
@@ -703,6 +715,7 @@ Gratis og private meldinger til TextSecure- og Signal-brukere
   <string name="preferences__support_wifi_calling">\'WiFi anrop\' kompatibilititetsmodus</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktiver dersom enheten din bruker WiFi for å sende SMS/MMS (brukes bare hvis \'WiFi anrop\' er aktivert på enheten din)</string>
   <string name="preferences_app_protection__blocked_contacts">Blokkerte kontakter</string>
+  <string name="preferences_notifications__display_in_notifications">Vis i varslingslisten</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-pl/strings.xml

@@ -12,9 +12,10 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Usunąć wszystkie stare wiadomości?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Czy na pewno chcesz przyciąć wszystkie wątki rozmów do %s najnowszych wiadomości?</string>
   <string name="ApplicationPreferencesActivity_delete">Usuń</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Wyłączyć lokalne szyfrowanie?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Uwaga, szyfrowanie wszystkich Twoich wiadomości i kluczy zostanie wyłączone. Twoje szyfrowane sesje będą dalej funkcjonować, jednak każdy z fizycznym dostępem do Twojego telefonu będzie mógł uzyskać dostęp do Twoich wiadomości.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Wyłączyć hasło?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Wyłączyć blokadę ekranu dla wiadomości?
+</string>
   <string name="ApplicationPreferencesActivity_disable">Wyłącz</string>
   <string name="ApplicationPreferencesActivity_unregistering">Wyrejestrowanie </string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Trwa wyrejestrowanie od używania wiadomości TextSecure</string>
@@ -41,7 +42,7 @@ Aby ponownie zacząć używać wiadomości TextSecure, będziesz musiał/a ponow
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nie można znaleźć aplikacji, aby wybrać media.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Zrób zdjęcie</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Zdjęcie</string>
   <string name="AttachmentTypeSelectorAdapter_video">Film</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Dźwięk</string>
@@ -55,6 +56,7 @@ ten kontakt.
 </string>
   <string name="ConfirmIdentityDialog_accept">Akceptuj</string>
   <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Wiadomość %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Rozmiar wiadomości: %d KB </string>
   <string name="ConversationItem_expires_s">Wygasa: %s</string>
@@ -81,6 +83,7 @@ ten kontakt.
   <string name="ConversationActivity_select_contact_info">Wybierz dane kontaktowe</string>
   <string name="ConversationActivity_compose_message">Nowa wiadomość</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Przepraszamy, wystąpił błąd podczas dodawania załącznika.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Obraz gif, który wybrałeś był zbyt duży!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Przepraszamy, ten plik wideo przekracza dozwolony rozmiar (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Przepraszamy, ten plik audio przekracza dozwolony rozmiar (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Podany numer lub adres e-mail jest niepoprawny!</string>
@@ -144,15 +147,16 @@ ten kontakt.
   <string name="DateUtils_now">Teraz</string>
   <string name="DateUtils_minutes_ago">%d minuta</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Rozłączyć \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Poprzez odłączenie tego urządzenia, nie będzie ono otrzymywać wiadomości.</string>
+  <string name="DeviceListActivity_unlink_s">Wyrejestrować \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Wyrejestrowanie tego urządzenia spowoduje, że nie będziesz miał możliwości wysyłania i odbierania wiadomości.</string>
   <string name="DeviceListActivity_network_connection_failed">Brak połączenia internetowego...</string>
   <string name="DeviceListActivity_try_again">Spróbuj ponownie</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Rozłączanie urządzenia</string>
+  <string name="DeviceListActivity_unlinking_device">Wyrejestrowywanie urządzenia...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Wyrejestrowywanie urządzenia</string>
   <string name="DeviceListActivity_network_failed">Błąd sieci!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nieznane urządzenie</string>
-  <string name="DeviceListItem_created_s">Utworzono %s</string>
+  <string name="DeviceListItem_linked_s">Zarejestrowano %s</string>
   <string name="DeviceListItem_last_active_s">Ostatnio aktywny %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podziel się z</string>
@@ -242,13 +246,13 @@ Przywracanie szyfrowanej kopii zapasowej TextSecure spowoduje nadpisanie Twoich
 \n- Wysyłać wiadomości w Twoim imieniu
 
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Dodawanie urządzenia</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Dodawanie nowego urządzenia...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Urządzenie zostało dodane!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Rejestrowanie urządzenia</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Rejestrowanie nowego urządzenia...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Urządzenie zostało zarejestrowane!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nie znaleziono żadnych urządzeń.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Błąd sieci.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Niepoprawny kod QR.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Niestety masz już zbyt wiele zarejestrowanych urządzeń, usuń któryś, aby dodać nowy...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Niestety masz już zbyt dużo zarejestrowanych urządzeń, spróbuj usunąć któreś z nich...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Podaj hasło</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@@ -383,31 +387,34 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="KeyCachingService_passphrase_cached">TextSecure jest odblokowany</string>
   <string name="KeyCachingService_lock">Zablokuj hasłem</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d wiadomości w %2$d wątkach</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nowych wiadomości w %2$d rozmowach</string>
   <string name="MessageNotifier_most_recent_from_s">Najnowsza z: %1$s</string>
+  <string name="MessageNotifier_locked_message">Wiadomość zablokowana...</string>
   <string name="MessageNotifier_media_message_with_text">Wiadomość multimedialna: %s</string>
   <string name="MessageNotifier_no_subject">(Brak tematu)</string>
   <string name="MessageNotifier_message_delivery_failed">Nie udało się dostarczyć wiadomości.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Dostarczenie wiadomości nie powiodło się.</string>
   <string name="MessageNotifier_error_delivering_message">Błąd przy wysyłaniu wiadomości.</string>
   <string name="MessageNotifier_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
+  <string name="MessageNotifier_mark_read">Przeczytane</string>
   <string name="MessageNotifier_media_message">Wiadomość multimedialna</string>
   <string name="MessageNotifier_reply">Odpowiedź</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Szybka odpowiedź jest niedostępna kiedy TextSecure jest zablokowany!</string>
   <string name="QuickResponseService_problem_sending_message">Wystąpił błąd przy wysyłaniu wiadomości!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nowa wiadomość TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Zawartość ukryta</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">STARE HASŁO:</string>
   <string name="change_passphrase_activity__new_passphrase">NOWE HASŁO:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">POWTÓRZ NOWE HASŁO:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Wprowadź nazwę lub numer</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Brak kontaktów.</string>
   <string name="contact_selection_group_activity__finding_contacts">Ładowanie listy kontaktów...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nie jesteś zarejestrowany w usłudze push...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Aktualizowanie katalogu</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualizowanie katalogu push</string>
   <string name="SingleContactSelectionActivity_contact_photo">Obrazek kontaktu</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Wybierz dla</string>
@@ -427,6 +434,7 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="conversation_activity__compose_description">Kompozycja wiadomości</string>
   <string name="conversation_activity__emoji_toggle_description">Przełącz do emoji klawiatury</string>
   <string name="conversation_activity__attachment_thumbnail">Minaturka załącznika</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Bezpośrednie przechwytywanie</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Trwa pobieranie wiadomości multimedialnej</string>
   <string name="conversation_item__mms_image_description">Wiadomość multimedialna</string>
@@ -448,7 +456,7 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="country_selection_fragment__loading_countries">Wczytywanie krajów...</string>
   <string name="country_selection_fragment__search">Szukaj</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Brak połączonych urządzeń...</string>
+  <string name="device_list_fragment__no_devices_linked">Brak zarejestrowanych urządzeń...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nie udało się odczytać logów z Twojego urządzenia. W dalszym ciągu możesz użyć ADB, aby pobrać logi debugowania.</string>
   <string name="log_submit_activity__thanks">Dziękujemy za Twoją pomoc!</string>
@@ -504,6 +512,8 @@ Importuj niezaszyfrowany plik kopii zapasowej, kompatybilny z \'SMSBackup And Re
   <string name="recipient_preferences__ringtone">Dzwonek</string>
   <string name="recipient_preferences__vibrate">Wibracja</string>
   <string name="recipient_preferences__block">Blokuj</string>
+  <string name="recipient_preferences__color">Kolor</string>
+  <string name="recipient_preferences__color_for_this_contact">Kolor tego kontaktu</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Weryfikuj swój numer telefonu, aby połączyć się z TextSecure.</string>
@@ -513,6 +523,7 @@ NUMER TELEFONU</string>
   <string name="registration_activity__phone_number">NUMER TELEFONU</string>
   <string name="registration_activity__register">Rejestracja</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Podczas rejestracji, niektóre informacje o kontakcie zostaną przesłane tymczasowo na serwer. Nie będą one zapisane.</string>
+  <string name="registration_activity__powered_by_twilio">Wspierane przez twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Niektóre możliwe problemy:</string>
   <string name="registration_problems__sms_interceptors">Przechwytywanie SMS.</string>
@@ -580,7 +591,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="AndroidManifest__media_overview">Wszystkie obrazy</string>
   <string name="AndroidManifest__media_overview_named">Wszystkie obrazy z %1$s</string>
   <string name="AndroidManifest__message_details">Szczegóły wiadomości</string>
-  <string name="AndroidManifest_manage_paired_devices">Zarządzaj połączonymi urządzeniami</string>
+  <string name="AndroidManifest_manage_linked_devices">Zarządzaj zarejestrowanymi urządzeniami</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / eksport</string>
   <string name="arrays__my_identity_key">Mój klucz tożsamości</string>
@@ -593,6 +604,12 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="arrays__settings_default">Ustawienia domyślne</string>
   <string name="arrays__enabled">Włączone</string>
   <string name="arrays__disabled">Wyłączone</string>
+  <string name="arrays__name_and_message">Imię i wiadomość</string>
+  <string name="arrays__name_only">Tylko imie</string>
+  <string name="arrays__neither">Żadne</string>
+  <string name="arrays__images">Obrazy</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Wideo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d godzina</item>
@@ -618,6 +635,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__change_my_passphrase">Zmień moje hasło</string>
   <string name="preferences__enable_passphrase">Włącz hasło</string>
   <string name="preferences__passphrase_summary">Hasło %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">Włącz blokadę ekranu dla wiadomości</string>
   <string name="preferences__screen_security">Ochrona ekranu</string>
   <string name="preferences__screen_security_summary">Ochrona ekranu %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokuj rzuty ekranu w obecnej liście oraz w aplikacji</string>
@@ -627,7 +645,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__pref_timeout_interval_title">Wybierz czas wygaśnięcia hasła</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Ilość czasu zanim hasło zostanie wymazane z pamięci urządzenia</string>
   <string name="preferences__notifications">Powiadomienia</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Wyświetlaj powiadomienia wiadomości w pasku statusu</string>
+  <string name="preferences__enable_message_notifications">Włącz powiadomienia wiadomości</string>
   <string name="preferences__led_color">Kolor LED</string>
   <string name="preferences__led_color_unknown">Nieznane</string>
   <string name="preferences__pref_led_blink_title">Wzór powiadomień LED</string>
@@ -677,6 +695,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Żądaj raportu dostarczenia każdej wysłanej wiadomości SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatycznie usuń starsze wiadomości po przekroczeniu określonej długości wątku</string>
   <string name="preferences__delete_old_messages">Usuń stare wiadomości</string>
+  <string name="preferences__chats">Czaty i media</string>
   <string name="preferences__conversation_length_limit">Limit długości konwersacji</string>
   <string name="preferences__trim_all_threads_now">Przytnij wszystkie wątki</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanuj wszystkie rozmowy i przytnij do zdefiniowanej długości</string>
@@ -695,6 +714,7 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
   <string name="preferences__support_wifi_calling">Tryb zgodności \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Włącz jeśli Twoje urządzenie używa dostarczania SMS/MMS przez WiFi (włącz tylko wtedy gdy \'Połączenia WiFi\' jest włączone na Twoim urządzeniu)</string>
   <string name="preferences_app_protection__blocked_contacts">Zablokowane kontakty</string>
+  <string name="preferences_notifications__display_in_notifications">Pokaż w powiadomieniach</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -747,6 +767,7 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
   <string name="conversation__menu_leave_group">Opuść grupę</string>
   <string name="conversation__menu_delete_thread">Usuń wątek</string>
   <string name="conversation__menu_view_media">Wszystkie obrazy</string>
+  <string name="conversation__menu_conversation_settings">Ustawienia rozmowy</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Powiększ okno</string>
   <!--conversation_callable-->
@@ -790,5 +811,6 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona transportu</string>
   <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera jest niedostępna</string>
   <!--EOF-->
 </resources>

res/values-pt-rBR/strings.xml

@@ -12,11 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Excluir todas as mensagens antigas agora?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
   <string name="ApplicationPreferencesActivity_delete">Excluir</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desabilitar criptografia de armazenamento?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-        Atenção, isto irá desabilitar a criptografia de armazenamento para todas as mensagens e chaves. Suas sessões
-        criptografadas continuarão funcionando, mas qualquer um com acesso físico ao seu aparelho
-        conseguirá acessá-las.
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Desabilitar frase-chave?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+        Desabilitar tela de bloqueio para mensagens?
     </string>
   <string name="ApplicationPreferencesActivity_disable">Desabilitar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Descadastrar</string>
@@ -45,7 +43,7 @@
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Não localizei um aplicativo para selecionar o arquivo.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Tirar foto</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Câmera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Áudio</string>
@@ -91,6 +89,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationActivity_select_contact_info">Selecionar informações de contato</string>
   <string name="ConversationActivity_compose_message">Escrever mensagem</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Lamento, ocorreu um erro no envio do seu anexo</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">O gif selecionado é muito grande!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Desculpe, o vídeo selecionado excede as restrições de tamanho da mensagem (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Desculpe, o áudio selecionado excede as restrições de tamanho da mensagem (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatário não é um endereço SMS ou email válido!</string>
@@ -154,16 +153,16 @@ Tem certeza que deseja fazer isto?</string>
   <string name="DateUtils_now">Agora</string>
   <string name="DateUtils_minutes_ago">%d min</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">Ao desconectar este dispositivo, ele não poderá mais enviar ou receber mensagens.</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">Ao desvincular este dispositivo, ele não será mais capaz de enviar ou receber mensagens.</string>
   <string name="DeviceListActivity_network_connection_failed">Conexão de rede falhou...</string>
   <string name="DeviceListActivity_try_again">Tentar de novo</string>
-  <string name="DeviceListActivity_disconnecting_device">Desconectando 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">Rede falhou!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo sem nome</string>
-  <string name="DeviceListItem_created_s">Criado %s</string>
+  <string name="DeviceListItem_linked_s">%s vinculado</string>
   <string name="DeviceListItem_last_active_s">Último ativo %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartilhar com</string>
@@ -263,13 +262,13 @@ Tem certeza que deseja fazer isto?</string>
         - Ler todas as suas mensagens
         \n- Enviar mensagens em seu nome
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Adicionando dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Adicionando novo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo adicionado!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Vinculando dispositivo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Vinculando novo dispositivo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo vinculado!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nenhum dispositivo encontrado.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Erro de rede.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR inválido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Desculpe, você já possui muitos dispositivos registrados, tente remover alguns...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Desculpe, você já possui muitos dispositivos vinculados. Tente remover alguns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Inserir frase-chave</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ícone do TextSecure</string>
@@ -415,7 +414,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure está destrancado</string>
   <string name="KeyCachingService_lock">Trancar com frase-chave</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mensagens em %2$d conversas</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d mensagens novas em %2$d conversas</string>
   <string name="MessageNotifier_most_recent_from_s">Mais recente de: %1$s</string>
   <string name="MessageNotifier_locked_message">Mensagem trancada...</string>
   <string name="MessageNotifier_media_message_with_text">Mensagem multimídia: %s</string>
@@ -430,18 +429,19 @@ Tem certeza que deseja fazer isto?</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Responder rápido não está disponível quando o TextSecure está travado!</string>
   <string name="QuickResponseService_problem_sending_message">Problema ao enviar mensagem!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nova mensagem TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Conteúdo escondido</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Frase-chave anterior:</string>
   <string name="change_passphrase_activity__new_passphrase">Frase-chave nova:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">Repetir a frase-chave nova:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Digite o nome ou número</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">Carregando contatos...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Você não está cadastrado no serviço push...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Atualizando diretório</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Atualizando diretório push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Foto do contato</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecionar para</string>
@@ -483,7 +483,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="country_selection_fragment__loading_countries">Carregando países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nenhum dispositivo pareado...</string>
+  <string name="device_list_fragment__no_devices_linked">Nenhum dispositivo vinculado...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Não foi possível captar logs do seu dispositivo. É possível usar como alternativa o ADB para captar logs de debug.</string>
   <string name="log_submit_activity__thanks">Obrigado por sua ajuda!</string>
@@ -645,7 +645,7 @@ falhou.</string>
   <string name="AndroidManifest__media_overview">Todas as imagens</string>
   <string name="AndroidManifest__media_overview_named">Todas as imagens com %1$s</string>
   <string name="AndroidManifest__message_details">Detalhes da mensagem</string>
-  <string name="AndroidManifest_manage_paired_devices">Gerenciar dispositivos pareados</string>
+  <string name="AndroidManifest_manage_linked_devices">Gerenciar dispositivos vinculados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / exportar</string>
   <string name="arrays__my_identity_key">Minha chave de identidade</string>
@@ -658,6 +658,9 @@ falhou.</string>
   <string name="arrays__settings_default">Padrão de configurações</string>
   <string name="arrays__enabled">Habilitado</string>
   <string name="arrays__disabled">Desabilitado</string>
+  <string name="arrays__name_and_message">Nome e mensagem</string>
+  <string name="arrays__name_only">Apenas nome</string>
+  <string name="arrays__neither">Nenhum</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -692,7 +695,7 @@ falhou.</string>
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
   <string name="preferences__notifications">Notificações</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Apresentar notificações de mensagens na barra de estado</string>
+  <string name="preferences__enable_message_notifications">Habilitar notificações de mensagem</string>
   <string name="preferences__led_color">Cor do LED</string>
   <string name="preferences__led_color_unknown">Desconhecida</string>
   <string name="preferences__pref_led_blink_title">Padrão de piscagem do LED</string>
@@ -761,6 +764,7 @@ falhou.</string>
   <string name="preferences__support_wifi_calling">Modo de compatibilidade \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Habilite se o seu dispositivo usa entrega de SMS/MMS via WiFi (somente habilite quando \'WiFi Calling\' estiver habilitado no seu dispositivo)</string>
   <string name="preferences_app_protection__blocked_contacts">Contatos bloqueados</string>
+  <string name="preferences_notifications__display_in_notifications">Exibir em notificações</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-pt/strings.xml

@@ -10,13 +10,12 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mensagens por conversa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Apagar todas as mensagens antigas?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja eliminar as conversas anteriores às %s mensagens mais recentes?</string>
   <string name="ApplicationPreferencesActivity_delete">Apagar</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desactivar cifra de armazenamento?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Atenção, isto desativa a cifra de armazenamento para todas as mensagens e chaves.
-As suas sessões continuam cifradas, mas qualquer pessoa com acesso físico ao dispositivo
-terá acesso ás mensagens e chaves.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Desabilitar frase-chave?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Desabilitar ecrã de bloqueio para mensagens?
+</string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">A eliminar o registo...</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">A eliminar o registo de mensagens TextSexure...</string>
@@ -44,7 +43,7 @@ Vai ser necessário re-registar o seu número de telefone se pretender utilizar
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar uma aplicação para seleccionar o média.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Tirar Fotografia</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Câmara</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Áudio</string>
@@ -87,6 +86,7 @@ que %2$s reinstalou TextSecure e tem agora uma nova chave de identidade.
   <string name="ConversationActivity_select_contact_info">Selecionar informações de contacto</string>
   <string name="ConversationActivity_compose_message">Compor mensagem</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Lamento, ocorreu um erro no envio do seu anexo.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">O GIF que seleccionou era demasiado grande!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Lamento, o vídeo seleccionado excede as restrições de tamanho da mensagem (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lamento, o áudio seleccionado excede as restrições de tamanho da mensagem (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatário não é um endereço SMS ou email válido!</string>
@@ -150,16 +150,16 @@ que %2$s reinstalou TextSecure e tem agora uma nova chave de identidade.
   <string name="DateUtils_now">Agora</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Desligar \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desligar este dispositivo, vai deixar de enviar ou receber mensagens.</string>
+  <string name="DeviceListActivity_unlink_s">Desinterligar \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desinterligar este dispositivo, vai deixar de enviar ou receber mensagens.</string>
   <string name="DeviceListActivity_network_connection_failed">A ligação à rede falhou!</string>
   <string name="DeviceListActivity_try_again">Tente novamente</string>
-  <string name="DeviceListActivity_disconnecting_device">A desligar dispositivo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">A desligar dispositivo</string>
+  <string name="DeviceListActivity_unlinking_device">A desinterligar dispositivo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">A desinterligar dispositivo</string>
   <string name="DeviceListActivity_network_failed">A rede falhou!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo sem nome</string>
-  <string name="DeviceListItem_created_s">Criado %s</string>
+  <string name="DeviceListItem_linked_s">Interligado %s</string>
   <string name="DeviceListItem_last_active_s">Activo pela última vez %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partilhar com</string>
@@ -257,13 +257,13 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
 - Ler todas as suas mensagens
 \n- Enviar mensagens em seu nome
 </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">A adicionar dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">A adicionar um novo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo adicionado!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">A interligar dispositivo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">A interligar um novo dispositivo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo interligado!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nenhum dispositivo encontrado.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Erro de rede.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR inválido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Lamentamos mas tem demasiados dispositivos registados, tente remover alguns...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Lamentamos mas tem demasiados dispositivos interligados, tente remover alguns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduza palavra-chave</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icon TextSecure</string>
@@ -403,7 +403,7 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="KeyCachingService_passphrase_cached">O TextSecure está desbloqueado</string>
   <string name="KeyCachingService_lock">Bloquear com frase-chave</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mensagens em %2$d conversas</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d novas mensagens em %2$d conversas</string>
   <string name="MessageNotifier_most_recent_from_s">Mais recente de: %1$s</string>
   <string name="MessageNotifier_locked_message">Mensagem bloqueada...</string>
   <string name="MessageNotifier_media_message_with_text">Mensagem media: %s</string>
@@ -418,18 +418,19 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">A resposta rápida encontra-se indisponível quando o TextSecure está bloqueado!</string>
   <string name="QuickResponseService_problem_sending_message">Problema no envio da mensagem!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nova mensagem TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Conteúdos escondidos</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Frase-chave anterior:</string>
   <string name="change_passphrase_activity__new_passphrase">Frase-chave nova:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">Repetir a frase-chave nova:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Introduza nome ou número</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">A carregar contactos…</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Não está registado com o serviço push...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Actualizando directório</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando o directório push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Foto de Contacto</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
@@ -471,7 +472,7 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="country_selection_fragment__loading_countries">A carregar lista de países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nenhum dispositivo emparelhado...</string>
+  <string name="device_list_fragment__no_devices_linked">Nenhum dispositivo interligado...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Não foi possível obter os registos do seu dispositivo. Alternativamente, pode utilizar o ADB para os obter.</string>
   <string name="log_submit_activity__thanks">Obrigado pela sua ajuda!</string>
@@ -624,7 +625,7 @@ falhou.
   <string name="AndroidManifest__media_overview">Todas as imagens</string>
   <string name="AndroidManifest__media_overview_named">Todas as imagens com %1$s</string>
   <string name="AndroidManifest__message_details">Detalhes da mensagem</string>
-  <string name="AndroidManifest_manage_paired_devices">Gerir dispositivos emparelhados</string>
+  <string name="AndroidManifest_manage_linked_devices">Gerir dispositivos interligados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
@@ -637,6 +638,9 @@ falhou.
   <string name="arrays__settings_default">Configurações por omissão</string>
   <string name="arrays__enabled">Activo</string>
   <string name="arrays__disabled">Desactivado</string>
+  <string name="arrays__name_and_message">Nome e mensagem</string>
+  <string name="arrays__name_only">Apenas o nome</string>
+  <string name="arrays__neither">Nenhum</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -671,7 +675,7 @@ falhou.
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
   <string name="preferences__notifications">Notificações</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Apresentar notificações de mensagens na barra de estado</string>
+  <string name="preferences__enable_message_notifications">Activar notificações de mensagens</string>
   <string name="preferences__led_color">Cor do LED</string>
   <string name="preferences__led_color_unknown">Desconhecido</string>
   <string name="preferences__pref_led_blink_title">Padrão de piscar do LED</string>
@@ -734,12 +738,13 @@ falhou.
   <string name="preferences__language_summary">Língua %s</string>
   <string name="preferences__textsecure_messages">Mensagens TextSecure</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Mensagens privadas gratuítas para utiliazadores TextSecure e Signal
+Mensagens privadas gratuítas para utilizadores TextSecure e Signal
 </string>
   <string name="preferences__submit_debug_log">Submeter registo de depuração</string>
   <string name="preferences__support_wifi_calling">Modo de compatibilidade \"Chamada WiFi\"</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Active se o seu dispositivo utiliza entrega de SMS/MMS sobre WiFi (apenas active se \'WiFi Calling\' está activo neste dispositivo)</string>
   <string name="preferences_app_protection__blocked_contacts">Contactos bloqueados</string>
+  <string name="preferences_notifications__display_in_notifications">Apresentar nas notificações</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-ro/strings.xml

@@ -12,10 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Şterge toate mesajele vechi acum?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Eşti sigur că doreşti să scurtezi toate conversaţiile la %s cele mai recente mesaje?</string>
   <string name="ApplicationPreferencesActivity_delete">Şterge</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Dezactivează stocarea criptată?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor și cheilor. Sesiunile actuale criptate vor continua să funcționeze, dar oricine care are acces la dispozitiv va putea să le acceseze.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Dezactivez parola?</string>
   <string name="ApplicationPreferencesActivity_disable">Dezactivează</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Dezactivez mesajele TextSecure?</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Eroare de conectare cu serverul!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS activat</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Atingeţi pentru a schimba aplicaţia SMS implicită</string>
@@ -40,9 +39,12 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Informații contact</string>
   <!--BlockedContactsActivity-->
+  <string name="BlockedContactsActivity_blocked_contacts">Contacte blocate</string>
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Probabil ca doresti sa verifici aceasta persoana.</string>
+  <string name="ConfirmIdentityDialog_accept">Acceptă</string>
   <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Mesaj %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Marimea mesajului: %d KB</string>
   <string name="ConversationItem_expires_s">Expira in: %s</string>
@@ -92,6 +94,9 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationActivity_mms_not_supported_title">MMS-ul nu este suportat</string>
   <string name="ConversationActivity_mms_not_supported_message">Acest mesaj nu poate fi trimis deoarece operatorul de telefonie mobilă nu suportă MMS.</string>
   <string name="ConversationActivity_specify_recipient">Te rog alege un contact</string>
+  <string name="ConversationActivity_unblock_question">Deblochez ?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Sunteți sigur că doriți deblocarea acestui contact?</string>
+  <string name="ConversationActivity_unblock">Deblochează</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalii mesaj</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nTrimis/Primit: %2$s</string>
@@ -108,8 +113,10 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationFragment_push">Date (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
+  <string name="ConversationFragment_deleting">Se șterge</string>
   <string name="ConversationFragment_deleting_messages">Se șterg mesajele...</string>
   <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Caută...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Şterg conversaţiile?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Eşti sigur că doreşti ştergerea TUTUROR conversaţiilor selectate?</string>
@@ -123,8 +130,12 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="CustomDefaultPreference_none">Niciuna</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Acum</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_try_again">Încearcă din nou</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Dispozitiv fără nume</string>
+  <string name="DeviceListItem_last_active_s">Ultima oară activ %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partajează cu</string>
   <!--ExportFragment-->
@@ -171,6 +182,7 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
   <string name="ImportFragment_import_plaintext_backup">Importă backup necriptat?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Această acțiune va importa mesajele din backup-ul necriptat. Dacă ați mai importat acest backup atunci importarea curentă va crea mesaje duplicate. </string>
   <string name="ImportFragment_importing">Se importă</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Se importă un backup necriptat...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nu a fost găsit nici un backup text!</string>
   <string name="ImportFragment_error_importing_backup">Eroare la importul backup-ului!</string>
   <string name="ImportFragment_import_complete">Import complet!</string>
@@ -206,8 +218,6 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
         - Citirea tuturor mesajelor
         \n- Trimiterea mesajelor în numele tău
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Se adaugă un dispozitiv nou...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispozitiv adăugat!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nu a fost gasit niciun dispozitiv.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Eroare reţea.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Cod QR invalid.</string>
@@ -224,6 +234,13 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
   <string name="RatingManager_no_thanks">Nu mulţumesc</string>
   <string name="RatingManager_later">Mai târziu</string>
   <!--RecipientPreferencesActivity-->
+  <string name="RecipientPreferenceActivity_block_this_contact_question">Blochez acest contact?</string>
+  <string name="RecipientPreferenceActivity_block">Blochează</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Deblochez acest contact?</string>
+  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Sunteți sigur că doriți deblocarea acestui contact?</string>
+  <string name="RecipientPreferenceActivity_unblock">Deblochează</string>
+  <string name="RecipientPreferenceActivity_enabled">Activat</string>
+  <string name="RecipientPreferenceActivity_disabled">Dezactivat</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectare prin TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Alegeţi ţara dumneavostră</string>
@@ -335,32 +352,35 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="KeyCachingService_passphrase_cached">TextSecure e deblocat.</string>
   <string name="KeyCachingService_lock">Blocare acces cu parola</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mesaje în %2$d conversaţii</string>
   <string name="MessageNotifier_most_recent_from_s">Cel mai recent de la: %1$s</string>
+  <string name="MessageNotifier_locked_message">Mesaj blocat...</string>
   <string name="MessageNotifier_media_message_with_text">Mesaje media: %s</string>
   <string name="MessageNotifier_no_subject">(Fără subiect)</string>
   <string name="MessageNotifier_message_delivery_failed">Trimiterea mesajului a esuat.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Mesajul nu a putut fi trimis.</string>
   <string name="MessageNotifier_error_delivering_message">A aparut o eroare la trimiterea mesajului.</string>
   <string name="MessageNotifier_mark_all_as_read">Marchează tot ca citit</string>
+  <string name="MessageNotifier_mark_read">Marchează ca citit</string>
   <string name="MessageNotifier_media_message">Mesaj media</string>
+  <string name="MessageNotifier_reply">Răspunde</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_problem_sending_message">Problemă la trimiterea mesajului!</string>
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">PAROLA VECHE:</string>
   <string name="change_passphrase_activity__new_passphrase">NOUA PAROLĂ:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">REPETĂ NOUA PAROLĂ:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Introduceţi un nume sau un număr</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nu exista contacte.</string>
   <string name="contact_selection_group_activity__finding_contacts">Se încarcă contactele...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nu sunteţi înregistrat cu serviciul \"push\"...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Actualizare director</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Se actualizează directorul push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Poză contact</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selectează pentru</string>
   <!--blocked_contacts_fragment-->
+  <string name="blocked_contacts_fragment__no_blocked_contacts">Nu există contacte blocate...</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Nu exista apeluri recente.</string>
   <!--conversation_title_view-->
@@ -443,7 +463,13 @@ Importă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</st
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure are nevoie de setările APN pentru a trimite mesaje multimedia prin operatorul wireless. Acest aparat nu oferă informațiile necesare, lucru care se poate întâmpla uneori pentru dispozitive blocate sau alte configurații restrictive.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pentru a putea trimite mesaje multimedia cât și mesaje într-un grup, apăsați \'OK\' și completați setările solicitate. Setările MMS pentru operatorul dvs. pot fi găsite cautând după \'APN operatorul tău\'. Această operațiune este necesară o singură dată.</string>
   <!--recipient_preferences_activity-->
+  <string name="recipient_preference_activity__blocked">BLOCAT</string>
   <!--recipient_preferences-->
+  <string name="recipient_preferences__ringtone">Sunet de apel</string>
+  <string name="recipient_preferences__vibrate">Vibrează</string>
+  <string name="recipient_preferences__block">Blochează</string>
+  <string name="recipient_preferences__color">Culoare</string>
+  <string name="recipient_preferences__color_for_this_contact">Culoare pentru acest contact</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifică numărul tău de telefon pentru a te conecta la TextSecure.
@@ -454,6 +480,7 @@ NUMĂRUL DE TELEFON</string>
   <string name="registration_activity__phone_number">NUMĂRUL DE TELEFON</string>
   <string name="registration_activity__register">Inregistrare</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Înregistrarea transmite unele informații despre contact către server. Acestea nu sunt stocate.</string>
+  <string name="registration_activity__powered_by_twilio">Cu sprijinul twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Unele probleme posibile
 sunt:</string>
@@ -532,6 +559,12 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="arrays__my_identity_key">Cheia mea de identitate</string>
   <string name="arrays__use_default">Implicit</string>
   <string name="arrays__use_custom">Specific</string>
+  <string name="arrays__mute_for_one_hour">Silenţios pentru o oră</string>
+  <string name="arrays__mute_for_two_hours">Silenţios pentru 2 ore</string>
+  <string name="arrays__mute_for_one_day">Silenţios pentru o zi</string>
+  <string name="arrays__mute_for_seven_days">Silenţios pentru 7 zile</string>
+  <string name="arrays__enabled">Activat</string>
+  <string name="arrays__disabled">Dezactivat</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d oră</item>
@@ -543,6 +576,7 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__sms_mms">SMS și MMS</string>
   <string name="preferences__pref_all_sms_title">Recepționează toate SMS-urile</string>
   <string name="preferences__pref_all_mms_title">Recepționează toate MMS-urile</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Foloseşte TextSecure pentru toate mesajele text</string>
   <string name="preferences__input_settings">Setări de introducere</string>
   <string name="preferences__enable_enter_key_title">Activează tasta Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Inlocuiți tasta smiley cu tasta Enter</string>
@@ -564,7 +598,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__pref_timeout_interval_title">Interval expirare</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Perioada de timp de așteptare înainte de a șterge parola din memorie</string>
   <string name="preferences__notifications">Notificări</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Afișează notificările în bara de stare</string>
   <string name="preferences__led_color">Culoare LED</string>
   <string name="preferences__led_color_unknown">Necunoscut</string>
   <string name="preferences__pref_led_blink_title">Tipar de clipire LED</string>
@@ -599,6 +632,7 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__slow">Încet</string>
   <string name="preferences__custom">Specific</string>
   <string name="preferences__advanced">Avansat</string>
+  <string name="preferences__privacy">Confidenţialitate</string>
   <string name="preferences__mms_user_agent">MMS User Agent</string>
   <string name="preferences__advanced_mms_access_point_names">Setări MMS manuale</string>
   <string name="preferences__enable_manual_mms">Utilizează setări MMS manuale</string>
@@ -624,8 +658,12 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__language">Limba</string>
   <string name="preferences__language_summary">Limba %s</string>
   <string name="preferences__textsecure_messages">Mesaje TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+        Mesagerie privată şi gratuită cu utilizatorii TextSecure şi Signal
+    </string>
   <string name="preferences__submit_debug_log">Trimite log-urile de depanare</string>
   <string name="preferences__support_wifi_calling">Mod compatibilitate \"Apelare WiFi\"</string>
+  <string name="preferences_app_protection__blocked_contacts">Contacte blocate</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -675,6 +713,7 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="conversation__menu_leave_group">Părăseşte grupul</string>
   <string name="conversation__menu_delete_thread">Șterge conversația</string>
   <string name="conversation__menu_view_media">Toate imaginile</string>
+  <string name="conversation__menu_conversation_settings">Setări conversaţie</string>
   <!--conversation_popup-->
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Adaugă la contacte</string>
@@ -710,10 +749,12 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Previzualizare imagine</string>
   <!--Trimmer-->
+  <string name="trimmer__deleting">Se șterge</string>
   <string name="trimmer__deleting_old_messages">Se șterg mesajele vechi...</string>
   <string name="trimmer__old_messages_successfully_deleted">Mesajele vechi au fost șterse cu succes</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icoană transport</string>
   <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Cameră indisponibilă</string>
   <!--EOF-->
 </resources>

res/values-ru/strings.xml

@@ -12,9 +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_unregistering">Отмена регистрации</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Отменяем регистрацию в TextSecure...</string>
@@ -41,7 +38,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>
@@ -143,16 +139,11 @@
   <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_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_network_failed">Ошибка сети!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Устройство без названия</string>
-  <string name="DeviceListItem_created_s">Создано %s</string>
   <string name="DeviceListItem_last_active_s">Было онлайн %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Поделиться с</string>
@@ -240,13 +231,9 @@
   <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_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>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Введите парольную фразу</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Иконка TextSecure</string>
@@ -381,7 +368,6 @@
   <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_most_recent_from_s">Последнее от %1$s</string>
   <string name="MessageNotifier_media_message_with_text">MMS-сообщение: %s</string>
   <string name="MessageNotifier_no_subject">(Нет темы)</string>
@@ -395,18 +381,16 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Быстрые ответы недоступны, когда TextSecure заблокирован!</string>
   <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-->
   <!--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>
@@ -447,7 +431,6 @@
   <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>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не удается получить лог с вашего устройства. Вы можете воспользоваться для этого ADB.</string>
   <string name="log_submit_activity__thanks">Спасибо за помощь!</string>
@@ -595,7 +578,6 @@ 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>
   <!--arrays.xml-->
   <string name="arrays__import_export">Импорт / экспорт</string>
   <string name="arrays__my_identity_key">Мой личный ключ</string>
@@ -643,7 +625,6 @@ 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__led_color">Цвет светодиода</string>
   <string name="preferences__led_color_unknown">Неизвестен</string>
   <string name="preferences__pref_led_blink_title">Мигание светодиода</string>

res/values-sk/strings.xml

@@ -12,13 +12,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Zmazať všetky staré správy?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste naozaj si istí, že chcete skrátiť všetky rozhovory na %s najnovších správ?</string>
   <string name="ApplicationPreferencesActivity_delete">Zmazať</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Vypnúť šifrovanie úložiska?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Varovanie: týmto vypnete šifrovanie úložiska správ a šifrovacích kľúčov.
-Zabezpečenie Vášich propojení bude naďalej fungovať,
-ale hocikto s fyzickým prístupom k Vášmu zariadeniu
-získa aj prístup k týmto odosieaným informáciám.
-</string>
   <string name="ApplicationPreferencesActivity_disable">Vypnúť</string>
   <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Zakázať TextSecure správy?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
@@ -43,7 +36,6 @@ Pokiaľ v budúcnosti budete chcieť používať TextSecure správy, budete sa m
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nepodarilo sa nájsť aplikáciu pre výber médií.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Odfotiť</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Obrázok</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@@ -237,8 +229,6 @@ opätovným importom zduplikujete správy.
 - Čítať všetky Vaše správy\n
 - Odosielať správy vo Vašom mene
 </string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Pridáva sa nové zariadenie...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Zariadenie bolo pridané!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nebolo nájdené žiadne zariadenie!</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Chyba siete.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
@@ -374,7 +364,6 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="KeyCachingService_passphrase_cached">TextSecure je otvorený</string>
   <string name="KeyCachingService_lock">Zamkni s heslom</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d správ v %2$d konverzáciách</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovšie od: %1$s</string>
   <string name="MessageNotifier_media_message_with_text">Multimediálna správa: %s</string>
   <string name="MessageNotifier_no_subject">(bez predmetu)</string>
@@ -384,18 +373,16 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="MessageNotifier_mark_all_as_read">Označ všetko ako prečítané</string>
   <string name="MessageNotifier_media_message">Multimediálna správa</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--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">Zopakujte nové heslo:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Žiadne kontakty.</string>
   <string name="contact_selection_group_activity__finding_contacts">Načítavanie kontaktov...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nie ste registrovaný so službou push...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Aktualizácia zoznamu</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualizuje sa zoznam push...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Fotka kontaktu</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vyber pre</string>
@@ -625,7 +612,6 @@ zlyhalo.
   <string name="preferences__pref_timeout_interval_title">Doba platnosti</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Časový interval po ktorom sa heslo vymaže z pamäte</string>
   <string name="preferences__notifications">Notifikácie</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Zobrazuj hlásenia o správach v stavovom riadku</string>
   <string name="preferences__led_color">LED farba</string>
   <string name="preferences__led_color_unknown">Neznáme</string>
   <string name="preferences__pref_led_blink_title">Sekvencia blikania LED</string>

res/values-sl/strings.xml

@@ -12,9 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Izbrišem stara sporočila?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste prepričani, da želite izbrisati vse stare pogovore, razen najnovejših?</string>
   <string name="ApplicationPreferencesActivity_delete">Izbriši</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Onemogočim šifriranje pomnilnika?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Pozor, s tem boste onemogočili šifriranje sporočil in ključev v pomnilniku naprave. Vaše šifrirane komunikacije bodo še vedno varne, toda vsakdo s fizičnim dostopom do vaše naprave bo lahko dostopal do njih.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Izklopim geslo?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Izklopim zaklep zaslona za sporočila?</string>
   <string name="ApplicationPreferencesActivity_disable">Onemogoči</string>
   <string name="ApplicationPreferencesActivity_unregistering">Odjava poteka</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Odjava od sporočil TextSecure...</string>
@@ -41,7 +41,7 @@ Za ponovno uporabo sporočil TextSecure se boste morali zopet prijaviti s svojo
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Ne najdem aplikacije za izbor datotek.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Posnami fotografijo</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Slika</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Zvok</string>
@@ -81,6 +81,7 @@ preveriti ta stik.</string>
   <string name="ConversationActivity_select_contact_info">Izberi podatke o stiku</string>
   <string name="ConversationActivity_compose_message">Sestavi sporočilo</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Oprostite, pri nastavljanju priponke je prišlo do napake.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Izbrani gif je bil prevelik!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Izbran video posnetek presega omejitev velikosti (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Izbran zvočni posnetek presega omejitev velikosti (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Naslov prejemnika ni veljaven SMS oz. email nalsov!</string>
@@ -144,16 +145,16 @@ preveriti ta stik.</string>
   <string name="DateUtils_now">Ravnokar</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Odstranim \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Z odstranitvijo naprave ta ne bo več mogla pošiljati ali prejemati sporočil.</string>
+  <string name="DeviceListActivity_unlink_s">Odstranim \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Z odstranitvijo naprave ta ne bo več mogla pošiljati ali prejemati sporočil.</string>
   <string name="DeviceListActivity_network_connection_failed">Omrežno povezovanje ni bilo uspešno...</string>
   <string name="DeviceListActivity_try_again">Poskusite znova</string>
-  <string name="DeviceListActivity_disconnecting_device">Odstranjujem napravo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odklapljam napravo...</string>
+  <string name="DeviceListActivity_unlinking_device">Odstranjujem napravo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Odstranjujem napravo</string>
   <string name="DeviceListActivity_network_failed">Povezovanje ni uspelo!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nepoimenovana naprava</string>
-  <string name="DeviceListItem_created_s">Ustvarjena %s</string>
+  <string name="DeviceListItem_linked_s">Povezan z %s</string>
   <string name="DeviceListItem_last_active_s">Zadnja aktivna %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Deli z</string>
@@ -240,13 +241,13 @@ preveriti ta stik.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - prebirala vsa vaša sporočila
 \n- pošiljala sporočila v vašem imenu</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Dodajam napravo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Dodajam novo napravo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Naprava dodana!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Povezujem napravo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Povezujem novo napravo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Naprava povezana!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nobena naprava ni bila najdena.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Napaka omrežja.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neveljavna koda QR.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Imate preveč registriranih naprav, poskusite kakšno odstraniti...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Imate preveč povezanih naprav, poskusite kakšno odstraniti...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Vnesite geslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@@ -378,7 +379,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="KeyCachingService_passphrase_cached">TextSecure je odklenjen</string>
   <string name="KeyCachingService_lock">Zakleni z geslom</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">Sporočil: %1$d, pogovorov: %2$d</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">Novih sporočil: %1$d, pogovorov: %2$d</string>
   <string name="MessageNotifier_most_recent_from_s">Zadnje sporočilo od: %1$s</string>
   <string name="MessageNotifier_locked_message">Zaklenjeno sporočilo...</string>
   <string name="MessageNotifier_media_message_with_text">Multimedijsko sporočilo: %s</string>
@@ -393,18 +394,19 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Ko je TextSecure zaklenjen, hitro odgovarjanje ni mogoče!</string>
   <string name="QuickResponseService_problem_sending_message">Težava pri pošiljanju sporočila</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Novo sporočilo TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Vsebina prikrita</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Staro geslo:</string>
   <string name="change_passphrase_activity__new_passphrase">Novo geslo:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">Ponovi novo geslo:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Vnesite ime ali številko...</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ni stikov.</string>
   <string name="contact_selection_group_activity__finding_contacts">Nalagam stike...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Niste prijavljeni v potisno storitev...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Posodabljam seznam</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Posodabljam potisni seznam...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Fotografija stika</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Izberi za</string>
@@ -424,6 +426,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="conversation_activity__compose_description">Sestavljanje sporočila</string>
   <string name="conversation_activity__emoji_toggle_description">Vklop tipkovnice emoji</string>
   <string name="conversation_activity__attachment_thumbnail">Predogledna sličica priponke</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Vklopi poteznik za priponke</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Nalagam multimedijsko sporočilo</string>
   <string name="conversation_item__mms_image_description">Multiedijsko sporočilo</string>
@@ -445,7 +448,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="country_selection_fragment__loading_countries">Pripravljam države...</string>
   <string name="country_selection_fragment__search">Poišči</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Ni povezanih naprav...</string>
+  <string name="device_list_fragment__no_devices_linked">Ni povezanih naprav...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Ne morem zajeti podatkov iz vaše naprave. Sistemsko zabeležbo lahko zajamete tudi sami preko ADB.</string>
   <string name="log_submit_activity__thanks">Hvala za pomoč!</string>
@@ -586,7 +589,7 @@ bila uspešna.</string>
   <string name="AndroidManifest__media_overview">Vse slike</string>
   <string name="AndroidManifest__media_overview_named">Vse slike z %1$s</string>
   <string name="AndroidManifest__message_details">Podrobnosti sporočila</string>
-  <string name="AndroidManifest_manage_paired_devices">Upravljanje povezanih naprav</string>
+  <string name="AndroidManifest_manage_linked_devices">Upravljanje povezanih naprav</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz/izvoz</string>
   <string name="arrays__my_identity_key">Moja identifikacija</string>
@@ -599,6 +602,12 @@ bila uspešna.</string>
   <string name="arrays__settings_default">Sistemsko privzeto</string>
   <string name="arrays__enabled">Vklopljeno</string>
   <string name="arrays__disabled">Izklopljeno</string>
+  <string name="arrays__name_and_message">Pošiljatelj in sporočilo</string>
+  <string name="arrays__name_only">Samo pošiljatelj</string>
+  <string name="arrays__neither">Brez</string>
+  <string name="arrays__images">Slike</string>
+  <string name="arrays__audio">Zvok</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ura</item>
@@ -635,7 +644,7 @@ bila uspešna.</string>
   <string name="preferences__pref_timeout_interval_title">Čas pomnjenja gesla</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Koliko časa naj bo geslo v pomnilniku, preden bo pozabljeno</string>
   <string name="preferences__notifications">Obvestila</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Prikaz obvestila o sporočilu v statusni vrstici</string>
+  <string name="preferences__enable_message_notifications">Omogoči obvestila o novih sporočilih</string>
   <string name="preferences__led_color">Barva LED</string>
   <string name="preferences__led_color_unknown">Neznano</string>
   <string name="preferences__pref_led_blink_title">Vzorec utripanja LED</string>
@@ -685,6 +694,7 @@ bila uspešna.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Samodejen izbris starih sporočil, ko pogovor preseže določeno dolžino</string>
   <string name="preferences__delete_old_messages">Izbris starih sporočil</string>
+  <string name="preferences__chats">Pogovori in multimedija</string>
   <string name="preferences__conversation_length_limit">Omejitev dolžine pogovorov</string>
   <string name="preferences__trim_all_threads_now">Obreži vse pogovore zdaj</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Preišči vse pogovore in uveljavi omejitve njihove dolžine</string>
@@ -703,6 +713,7 @@ Brezplačno zasebno sporočanje za TextSecure in Signal</string>
   <string name="preferences__support_wifi_calling">Združljivostni način \'Klicanje WiFi\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivirajte, če dostava SMS/MMS sporočil na vaši napravi poteka preko povezave WiFi (samo, če imate vklopljeno \'WiFi klicanje/WiFi Calling)</string>
   <string name="preferences_app_protection__blocked_contacts">Blokirani stiki</string>
+  <string name="preferences_notifications__display_in_notifications">Prikazano v obvestilu</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-sn/strings.xml

@@ -0,0 +1,835 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">Hongu</string>
+  <string name="no">Kwete</string>
+  <string name="delete">Dzimura</string>
+  <string name="please_wait">Tinokumbira umire kanguva....</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Parizvino: %s</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Hausati wagadzira izwi rekudarika!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s tsamba pahutaurwa</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Dzimura tsamba dzekare izvozvi?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Unechokwadi kuti unoda kudimbura shinda dzehutaurwa dzese kusvika pa %s dzetsamba dzamanje here?</string>
+  <string name="ApplicationPreferencesActivity_delete">Dzimura </string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Tadzisa izwi rekudarika?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Tadzisa kuvhara chivhitivhiti chetsamba?
+</string>
+  <string name="ApplicationPreferencesActivity_disable">Tadzisa</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Kubvisa kunyoresa</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Kubvisa kunyoresa kubva patsamba dzeTextSecure....</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Tadzisa tsamba dzeTextSecure here?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+Izvi zvichatadzisa  tsamba dzeTextSecure nekubvisa kunyoreswa kwako kubva pasevha. 
+Uchada kuti unyorese zvakare svumbunuro dzembozha runhare rwako kuti ushandise tsamba TextSecure zvakare muneramangwana.</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kanganiso pakukochekera kusevha!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Tsamba pfupi dzagoneswa</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Bata kuti ushandure hurongwa hwe apu dzetsamba pfupi</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Tsamba pfupi dzatadziswa</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Bata kuti TextSecure ive iri apu yako yehurongwa hwetsamba pfupi</string>
+  <string name="ApplicationPreferencesActivity_on">batidza</string>
+  <string name="ApplicationPreferencesActivity_On">Kubatira</string>
+  <string name="ApplicationPreferencesActivity_off">dzimwa</string>
+  <string name="ApplicationPreferencesActivity_Off">Dzimwa</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">Tsamba pfupi %1$s, Tsamba ine midhiya %2$s</string>
+  <!--AppProtectionPreferenceFragment-->
+  <string name="AppProtectionPreferenceFragment_minutes">maminiti %d</string>
+  <!--DraftDatabase-->
+  <string name="DraftDatabase_Draft_image_snippet">(mufananidzo)</string>
+  <string name="DraftDatabase_Draft_audio_snippet">(izwi)</string>
+  <string name="DraftDatabase_Draft_video_snippet">(vhidhiyo)</string>
+  <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">Hatisi kukwanisa kuwana apu yekusarudza midhiya.</string>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
+  <string name="AttachmentTypeSelectorAdapter_picture">Mufananidzo</string>
+  <string name="AttachmentTypeSelectorAdapter_video">Vhidhiyo</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Izwi</string>
+  <string name="AttachmentTypeSelectorAdapter_contact">Mashoko ezita</string>
+  <!--BlockedContactsActivity-->
+  <string name="BlockedContactsActivity_blocked_contacts">Mazita akadzivirirwa</string>
+  <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Chitupa 
+chesvumbunuro yekutsvagisa mashoko %1$s yashanduka. Izvi zvinogona kureva kuti pane umwe munhu arikuedza
+kumisa hutaurwa hwako, kana kuti %2$s yavakirira TextSecure zvakare uye ikezvino yava 
+nesvumbunuro dzechitupa itsva.</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Unogona kuda kuongorora kururama 
+kwezita iri.</string>
+  <string name="ConfirmIdentityDialog_accept">Bvuma</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Tsamba %s</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">Hukuru hwetsamba: %d KB</string>
+  <string name="ConversationItem_expires_s">Inopfurikidza: %s</string>
+  <string name="ConversationItem_error_not_delivered">Haina kusvitswa</string>
+  <string name="ConversationItem_view_secure_media_question">Wowona midhiya yakakwedekerwa?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Midhiya iyi yakachengetedzwa mupfimbi yedhata yakakwedekerwa. Zvisinei, kuti uione nechioneso chemashoko chekunze parizvino zvinoda kuti dhata rimbobviswa kukwedekerwa kwenguva pfupi uye rinyorerwe padhisiki. Unechokwadi chekuti unoda kuita izvi here?</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Kanganiso, tsamba yekutsinhana kwesvumbunuro iyi yave yekare.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Tatambira tsamba yekutsinhana svumbunuro, baya kuti ipinde mushishi.</string>
+  <string name="ConversationItem_group_action_left">%1$s abuda muboka.</string>
+  <string name="ConversationItem_click_for_details">Bata kuti uwone zvizere</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Bata kuti zvisina kuchengetedzwa zvidzoke </string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Dzokera kutsamba isina kukwedekerwa? </string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Dzokera kutsamba dzemidhiya isina kukwedekerwa? </string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tsamba iyi<b>haikwanise</b> kukwedekerwa nekuda kwekuti anotambira haasisiri mushandisi weTextSecure.\n\nTotumira tsamba isina kukwedekerwa?</string>
+  <string name="ConversationItem_unable_to_open_media">Hatisi kukwanisa kuwana apu inokwanisa kuvhura midhiya iyi.</string>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Totangisa chikamu chakakwedekerwa?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Totangisa chikamu chakakwedekerwa na %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Kutsinhira kuti chikamu chakakwedekerwa chivharwe</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Unechokwadi here kuti unoda kuvhara chikamu chakakwedekerwa?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Kutsinhira kuti shinda idzimurwe</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Unechokwadi here kuti unoda kudzimura hutaurwa uwu zvamuchose?</string>
+  <string name="ConversationActivity_add_attachment">Kuwedzera batanidzwa</string>
+  <string name="ConversationActivity_select_contact_info">Sarudza mashoko ezita</string>
+  <string name="ConversationActivity_compose_message">Nyora shoko</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ruregerero, paita kanganiso pakugadzira batanidzwa yako.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Butiro re\"gif\" rasarudzwa iri rakakurisa!</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Ruregerero, vhidhiyo yasarudzwa inodarika hukuru hwetsamba inobvumirwa (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ruregerero, izwi rasarudzwa rinodarika hukuru hwetsamba inobvumirwa (%1$skB).</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Anotambira haana kero yetsamba pfupi kana tsambambozha inoshanda!</string>
+  <string name="ConversationActivity_message_is_empty_exclamation">Tsamba haina zvirimo!</string>
+  <string name="ConversationActivity_group_members">Nhengo dzemuboka</string>
+  <string name="ConversationActivity_group_conversation">Hutaurwa hwemuboka</string>
+  <string name="ConversationActivity_unnamed_group">Boka risina zita</string>
+  <string name="ConversationActivity_d_recipients_in_group">Nhengo %d</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">Nhengo imwe chete</string>
+  <string name="ConversationActivity_saved_draft">Chirongwa chakachengetedzwa</string>
+  <string name="ConversationActivity_invalid_recipient">Mugamuchiri asinei! </string>
+  <string name="ConversationActivity_calls_not_supported">Kuchaya runhare hakutsigirwe</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Muchina uyu hauwoneke uchitsigira sarudzo yekuchaya.</string>
+  <string name="ConversationActivity_leave_group">Buda muboka?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Unechokwadi kuti unoda kubuda muboka iri?</string>
+  <string name="ConversationActivity_transport_insecure_sms">Tsampa pfupi isina kukwedekerwa</string>
+  <string name="ConversationActivity_transport_insecure_mms">Tsamba ine midhiya isina kukwedekerwa</string>
+  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
+  <string name="ConversationActivity_get_with_it">Tora nayo: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Ngatishandisei nzira iyi kuti titaure: %s</string>
+  <string name="ConversationActivity_error_leaving_group">Kanganiso pakubuda muboka...</string>
+  <string name="ConversationActivity_mms_not_supported_title">Tsamba dzine midhiya hadzitsigirwe</string>
+  <string name="ConversationActivity_mms_not_supported_message">Tsamba iyi haikwanise kutumirwa nemhaka yekuti mutakuri wako haatsigire tsamba dzine midhiya.</string>
+  <string name="ConversationActivity_specify_recipient">Tinokumbira kuti usarudze zita</string>
+  <string name="ConversationActivity_unblock_question">Bvisa dziviriro?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Unechokwadi kuti unoda kubvisa dziviriro pane zita iri?</string>
+  <string name="ConversationActivity_unblock">Bvisa dziviriro</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">Shoko zvizere</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Fambisa: %1$s\nYatumirwa/Yagamuchirwa: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Mutumiri: %1$s\nFambisa: %2$s\nYatumirwa: %3$s\nYagamuchirwa: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Tsinhira shoko zvizere	</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Unechokwadi here kuti unoda kudzimura tsamba dzese dzasarudzwa zvamuchose?</string>
+  <string name="ConversationFragment_save_to_sd_card">Chengetedza ku pfimbi	</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Kuchengetedza midhiya iyi kupfimbi kuchabvumira mamwe maapu aripa runhare rwako kuti ave nehupindwa pairi.\n\nEnderera?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Paita kanganiso pakuchengetedza batanidzwa kupfimbi!</string>
+  <string name="ConversationFragment_success_exclamation">Budiriro</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Hatikwanise kunyorera kupfimbi!</string>
+  <string name="ConversationFragment_saving_attachment">Kuchengetedza</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Kuchengetedza batanidzwa kupfimbi...</string>
+  <string name="ConversationFragment_pending">Kumirira...</string>
+  <string name="ConversationFragment_push">Dhata (TextSecure)</string>
+  <string name="ConversationFragment_mms">Tsamba ye midhiya</string>
+  <string name="ConversationFragment_sms">Tsamba pfupi</string>
+  <string name="ConversationFragment_deleting">Kudzimura</string>
+  <string name="ConversationFragment_deleting_messages">Kudzimura tsamba...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Tsvaga....</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">Todzimura shinda?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Unechokwadi here kuti unoda kudzimura hutaurwa HWOSE hwasarudzwa?</string>
+  <string name="ConversationListFragment_deleting">Kudzimura</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Kudzimura shinda dzasarudzwa...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Svumbunuro tsinha shoko</string>
+  <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Kushandisa gadziro yako: %s</string>
+  <string name="CustomDefaultPreference_using_default">Kushandisa hurongwa: %s</string>
+  <string name="CustomDefaultPreference_none">Hapana</string>
+  <!--DateUtils-->
+  <string name="DateUtils_now">Izvozvi</string>
+  <string name="DateUtils_minutes_ago">maminiti %d</string>
+  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Bvisa kuchochekerwa \"%s\"?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Nekubvisa kukochekerwa kwemuchina uyu, hauchazokwanisa zvakare kutumira kana kugamuchira tsamba. </string>
+  <string name="DeviceListActivity_network_connection_failed">Kukochekera kwemasaisai kwaramba....</string>
+  <string name="DeviceListActivity_try_again">Yedza zvekare</string>
+  <string name="DeviceListActivity_unlinking_device">Kubvisa kukochekerwa kwemuchina… </string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Kubvisa kukochekerwa kwemuchina… </string>
+  <string name="DeviceListActivity_network_failed">Masaisai aramba!</string>
+  <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Muchina usina zita</string>
+  <string name="DeviceListItem_linked_s">Kochekerwa %s</string>
+  <string name="DeviceListItem_last_active_s">Bishi raguma %s</string>
+  <!--ShareActivity-->
+  <string name="ShareActivity_share_with">Gova na..</string>
+  <!--ExportFragment-->
+  <string name="ExportFragment_export">Tumira</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Tumira bomhoremavara ku SD kadhi?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Yambiro, izvi zvichaita 
+kuti zvirimukati mebomhoremavara retsamba dzako dzeTextSecure zvitumirwe ku SD kadhi.</string>
+  <string name="ExportFragment_cancel">Kanzura</string>
+  <string name="ExportFragment_exporting">Kutumira</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Kutumira bomhoremavara ku SD kadhi...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Kanganiso pakunyorera ku SD kadhi!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Paita kanganiso pakati pekunyorera ku SD kadhi!</string>
+  <string name="ExportFragment_success">Budiriro</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Kutaurirana kwaramba zvachose paTextSecure!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure yatadza kunyoresa ne “Google Play Services.” Kutaurirana pamusoro pemuronga wedhata zvatadziswa, rukumbiro edza kunyoresa zvakare kubva kumenyu yegadziro yeTextSecure. </string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Boka nyowani</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Zivisa boka</string>
+  <string name="GroupCreateActivity_group_name_hint">Zita reboka</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Boka nyowani retsamba dze midhiya</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Wasarudza zita risinga tsigire mapoka eTextSecure, naizvozvo boka iri richange riri retsamba dzine midhiya.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Hauna kunyoreswa kuti ushandise muronga wedhata, saka mapoka emuTextSecure akatadziswa.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Paita kanganiso isina kutarisirwa yatadzisa kugadzirwa kweboka.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Panodiwa munhu mumwe chete muboka rako!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Mumwe wenhengo dzemuboka rako anenhamba isiri kukwanisa kuverengwa zvakanaka. Tinokumbira kuti zita iri rigadziriswe kana kubviswa woedza zvekare.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Chimiriro cheboka</string>
+  <string name="GroupCreateActivity_menu_create_title">Gadzira boka</string>
+  <string name="GroupCreateActivity_creating_group">Kugadzira %1$s...</string>
+  <string name="GroupCreateActivity_updating_group">Kuzivisa %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Hatikwanise kuwedzera mazita evasiri kushandisa TextSecure muboka riripo reTextSecure</string>
+  <string name="GroupCreateActivity_loading_group_details">Kugadza zvizere zveboka....</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Ini</string>
+  <!--ImportExportActivity-->
+  <string name="ImportExportActivity_import">Imupota</string>
+  <string name="ImportExportActivity_export">Tumira </string>
+  <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">Imupota gumbapamwe repfimbi yedhata retsamba pfupi?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Izvi zvicha imupota tsamba kubva muhurongwa hwemugumbapamwe retsamba pfupi ku pfimbi yedhata kuTextSecure. Kana uchinge
+wagamuchira 
+tsamba pfupi ye pfimbi yedhata kubva mugumbapamwe, kuimupota zvakare kunozokonzeresa kudzokorodzwa kwetsamba.</string>
+  <string name="ImportFragment_import">Imupota</string>
+  <string name="ImportFragment_cancel">Kanzura</string>
+  <string name="ImportFragment_restore_encrypted_backup">Todzoreredza bhekiapu yakakwedekerwa here?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Kudzorera bhekiapu yakakwedekerwa zvichadzorera svumbunuro dzako zvakazadziswa, zvido, uye  
+tsamba. Ucharasikirwa nemashoko arimu TextSecure yekuvakira yako yarizvino asi kwete 
+irimubhekiapu.</string>
+  <string name="ImportFragment_restore">Dzoreredza</string>
+  <string name="ImportFragment_import_plaintext_backup">Imupota bhekiapu yebomhoremavara?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Izvi zvichaimupota 
+tsamba kubva kubhekiapu yebomhoremavara. Kana wakambotora  bhekiapu iyi, 
+kuiimupota zvakare zvichakonzeresa kudzokororwa kwetsamba.</string>
+  <string name="ImportFragment_importing">Kuimupota</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Kuimupota bhekiapu yebomhoremavara...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Hapana bhekiapu yebomhoremavara rawanikwa!</string>
+  <string name="ImportFragment_error_importing_backup">Kanganiso pakuimupota bhekiapu!</string>
+  <string name="ImportFragment_import_complete">Kuimupota kwazadziswa!</string>
+  <string name="ImportFragment_restoring">Kudzoreredza</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Kudzoreredza bhekiapu yakakwedekerwa...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Hapana bhekiapu yakakwedekerwa yawanikwa!</string>
+  <string name="ImportFragment_restore_complete">Dzoreredza zadzisa!</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Hapana svumbunuro yakaongororwa yawanikwa!</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">Vakirira \"Barcode scanner\"?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure inoda \'\'Barcode Scanner\'\' kuitira mirau yeQR. </string>
+  <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">Yatadza kutumidzira</string>
+  <string name="MessageDetailsRecipient_new_identity">Chitupa chitsva</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_error_storing_mms">Kanganiso pakuchengetedza tsamba ine midhiya!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Kanganiso pakuhakira kumuyananisi wetsamba dzemidhiya....</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Kanganiso pakuverenga muyananisi wegadziro dzetsamba dzine midhiya pasina waya...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Tsamba ine midhiya</string>
+  <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Wagamuchira tsamba yakakwedekerwa neTextSecure yakare isingachatsigirwe. Rukumbiro, kumbira mutumiri kuti akwidze kusvika pavhezheni yamanje otumira tsamba zvakare.</string>
+  <string name="MessageRecord_left_group">Wabuda muboka.</string>
+  <string name="MessageRecord_updated_group">Wazivisa boka.</string>
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Izwi rekudarika harisi kutevedzera riripo!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Izwi rekudarika rekare harisiriro!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Pinza izwi rekudarika ritsva!</string>
+  <!--DeviceProvisioningActivity-->
+  <string name="DeviceProvisioningActivity_link_this_device">Kochekera muchina uyu?</string>
+  <string name="DeviceProvisioningActivity_cancel">KANZURA</string>
+  <string name="DeviceProvisioningActivity_continue">ENDERERA</string>
+  <string name="DeviceProvisioningActivity_title">Kochekera muchina uyu? </string>
+  <string name="DeviceProvisioningActivity_content_intro">Inokwanisa ku</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+-Verenga tsamba dzako dzese
+\n- Tumira tsamba muzita rako</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Kukochekera muchina</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Kukochekera muchina mutsva…</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Muchina wakochekerwa!</string>
+  <string name="DeviceProvisioningActivity_content_progress_no_device">Hapana muchina wawanikwa.</string>
+  <string name="DeviceProvisioningActivity_content_progress_network_error">Masaisai akanganiswa.</string>
+  <string name="DeviceProvisioningActivity_content_progress_key_error">Murau usiwo weQR.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Urombo, wagara unemichina yakakochekerwa yakawanda, edza kubvisa imwe…</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_enter_passphrase">Pinza izwi rekudarika</string>
+  <string name="PassphrasePromptActivity_watermark_content_description">Mufananidzo unomiririra apu yeTextSecure</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">Tera izwi rekudarika</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">izwi rekudarika harina basa!</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Vhezheni ye “Google Play Services’ yawavakirira haisi kushanda zvakanaka. Rukumbiro vakiridza “Google Play Services” uedze zvakare.</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Yera apu iyi</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Kana uchifarira kushandisa apu iyi, tinokumbira mutore kanguva kekutibatsira muyere.</string>
+  <string name="RatingManager_rate_now">Yera ikozvino!</string>
+  <string name="RatingManager_no_thanks">Kwete tinotenda</string>
+  <string name="RatingManager_later">Mbaimbai</string>
+  <!--RecipientPreferencesActivity-->
+  <string name="RecipientPreferenceActivity_block_this_contact_question">Dzivirira zita iri?</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Hauchakwanisi kuwona tsamba kubva kune mushandisi uyu.</string>
+  <string name="RecipientPreferenceActivity_block">Dzivirira</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Bvisa dziviriro pane zita iri?</string>
+  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Unechokwadi kuti unoda kubvisa dziviriro pane zita iri?</string>
+  <string name="RecipientPreferenceActivity_unblock">Bvisa dziviriro</string>
+  <string name="RecipientPreferenceActivity_enabled">Kugoneswa</string>
+  <string name="RecipientPreferenceActivity_disabled">Kutadziswa</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Hakira neTextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Sarudza nyika yako</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Unofanirwa kutaura
+kodhi yenyika yako</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Unofanirwa kutaura 
+svumbunuro dzembozha runhare rwako</string>
+  <string name="RegistrationActivity_invalid_number">Nhamba isina basa</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nhamba dzawataura 
+idzi (%s) hadziite.</string>
+  <string name="RegistrationActivity_unsupported">Haina kutsigirwa</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Ruregerero,
+muchina uyu hauna kutsigirwa kuti uite tsamba dzedhata. Michina irikumhanya nevhezheni dzeAndroid dzakakura 
+kudarika 4.0 dzinofanirwa dziine chitupa cheGoogle chakanyoreswa.  Michina irikumhanya ne “Android” 4.0 kana kuti itsva hadzifanirwi
+kuva nechitupa cheGoogle, asi dzinofanira kuva ne apu ye “Play Store” yakavakirwa. </string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+Ongorora zvakare kuti iyi inhamba dzako! Tava pedyo nekuiongorora netsamba pfupi.</string>
+  <string name="RegistrationActivity_continue">Enderera</string>
+  <string name="RegistrationActivity_edit">Pepeta	</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Bvira matambudziko</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Kururamisa nhamba</string>
+  <string name="RegistrationProgressActivity_edit_s">Pepeta %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Zadzisa!</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Unofanirwa kupinza murau wawatanga kugamuchira… </string>
+  <string name="RegistrationProgressActivity_connecting">Kukochekera</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Kukochekera kuti uongorore kururama…</string>
+  <string name="RegistrationProgressActivity_network_error">Masaisai akanganiswa.</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Kutadza kuhaka. Rukumbiro tarisa masaisai ako ekuhaka uedze zvakare.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Kururamisa kwaramba!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Murau wekuongorora kururama wawatumidzira hausiriwo. Rukumbiro edza zvakare.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Waedza zvakanyanyisa </string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Watumidzira murau wekuongorora kururama usiri iwo kwemikana yakanyanya. Rukumbiro, imbomira kweminiti imwe chete usati waedza zvakare.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Kukumbira kuchayirwa runhare</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Kukumbira kuwuya kwerunhare rwekuongorora...</string>
+  <string name="RegistrationProgressActivity_server_error">Kanganiso pasevha</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Sevha raita kanganiso. Rukumbiro edza zvakare.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Zvikumbiro zvakawandisa!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Wanga wakumbira kuchairwa runhare nechekare. Unokwanisa kukumbira imwe mushure menguva inokwana maniniti 20. </string>
+  <string name="RegistrationProgressActivity_registration_conflict">Paita kupikanisa pakunyoresa</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Nhamba iyi yakanyoreswa panerimwe sevha reTextSecure nechekare (CyanogenMod?). Unofanirwa kubvisa kunyoreswa kwakare usati wanyoresa pano.. </string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Kuregisita kwazadziswa</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Kunyoresa paTextSecure kwabudirira kuzadziswa.</string>
+  <string name="RegistrationService_registration_error">Kanganiso pakunyoresa</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Kuregisita paTextSecure kwasangana nedambudziko.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Tatambira svumbunuro yakaworera
+tsinha tsamba!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Tagamuchira tsamba yekutsinhana svumbunuro, baya kuti zvishishwe nekutaridzwa.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Tatambira tsamba ine chitupa chine svumbunuro isingazivikanwe. Baya kuti zvishishwe nekutaridzwa.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Zvagamuchirwa kuwedzerwa asi pane chitupa chemashoko chisingazivikanwi. Bata kuti utsinhidzire chitupa. </string>
+  <string name="SmsMessageRecord_secure_session_ended">Chikamu chakakwedekerwa chaguma.</string>
+  <string name="SmsMessageRecord_duplicate_message">Tsamba yakafanana</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Kubuda muboka...</string>
+  <string name="TheadRecord_secure_session_ended">Chikamu chakakwedekerwa chaguma.</string>
+  <string name="ThreadRecord_draft">Chirongwa:</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Hauna chitupa chesvumbunuro</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Anotambira haana chitupa chesvumbunuro.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Anotambira haana chitupa chesvumbunuro!</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Wongorora svumbunuro yavo kuti uyenzanise</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Ita kuti svumbunuro yangu iwongororwe</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">YAMBIRO, svumbunururo dzavhenekwa HADZIENDERANI! Rukumbiro tarisa chidhindo chemavara zvakanaka.</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">HAINA Kururama!</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Svumbunuro yavo ndiyo. Zvekare zvakafanirawo kuti uongororese kururama kwesvumbunuro yako navo .</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Yakarurama!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Hauna chitupa chesvumbunuro!</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Hauna chitupa chesvumbunuro</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Wongorora kuti uyenzanise</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Ita kuti iwongororwe kuti uyenzanise</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">YAMBIRO, svumbunuro yawongororwa iyi HAISI kutevedzera iripo!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">HAINA kururama!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Svumbunuro yawongororwa iyi inotevedzera iripo!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Yakarurama! </string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Chidhindo changu  </string>
+  <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Totanga kunyangwe paine chikumbiro chiripo?</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Watumira rukumbiro rwekutangidzwa kwechikamu kumugamuchiri uyu nechekare, unechokwadi here kuti unoda kutumira imwe? Izvi zvinoita kuti rutumiro rwekutanga rwushaye basa.</string>
+  <string name="KeyExchangeInitiator_send">Tumira	</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Tsamba yakakwedekerwa iyi yakaipa...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Kubvisa kukwedekerwa, mira kwekanguva....</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Tsamba yakwedekererwa chikamu chisipo...</string>
+  <!--EncryptingSmsDatabase-->
+  <string name="EncryptingSmsDatabase_error_decrypting_message">Kanganiso pakubvisa kukwedekerwa kwetsamba.</string>
+  <!--ThreadDatabase-->
+  <string name="ThreadDatabase_error_decrypting_message">Kanganiso pakubvisa kukwedekerwa kwetsamba. </string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">Kuhakira kupfimbi yetsamba dzine midhiya...</string>
+  <string name="MmsDatabase_downloading_mms">Kututunura tsamba dzemidhiya....</string>
+  <string name="MmsDatabase_mms_download_failed">Kututunura tsamba dzemidhiya kwaramba!</string>
+  <string name="MmsDatabase_downloading">Kututunura....</string>
+  <string name="MmsDatabase_mms_pending_download">Bata nekuisa gadziro dzetsamba dzemidhiya kuti uenderere nekututunura.</string>
+  <string name="MmsDatabase_error_decrypting_message">Kanganiso pakubvisa kukwedekerwa kwetsamba. </string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Kubvisa kukwedekerwa kwetsamba ine midhiya, chikumbiro mirai...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Tsamba ine midhiya yakakwedekerwa iyi yakaipa...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Tsamba ine midhiya yakakwedekererwa chikamu chisipo....</string>
+  <!--MuteDialog-->
+  <string name="MuteDialog_mute_notifications">Misa zviziviso</string>
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Kuimupota kuri mushishi</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Kuimupota tsamba dzine mavara</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">Gunzva ku vhura</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Bata kuti uvhure, kana kuti bata chihuri kuti uvhare.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure yavhurwa </string>
+  <string name="KeyCachingService_lock">Vhara neizwi rekudarika</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d tsamba nyowani muhutaurwa %2$d</string>
+  <string name="MessageNotifier_most_recent_from_s">Zvamanje kubva ku: %1$s</string>
+  <string name="MessageNotifier_locked_message">Tsamba yakavharwa...</string>
+  <string name="MessageNotifier_media_message_with_text">Tsamba ine midhiya: %s</string>
+  <string name="MessageNotifier_no_subject">(Hapana nhaurwa)</string>
+  <string name="MessageNotifier_message_delivery_failed">Kusvitswa kwetsamba kwaramba.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Tatadza kusvitsa tsamba.</string>
+  <string name="MessageNotifier_error_delivering_message">Kanganiso pakusvitsa tsamba.</string>
+  <string name="MessageNotifier_mark_all_as_read">Mara ose se averengwa</string>
+  <string name="MessageNotifier_mark_read">Mara se averengwa</string>
+  <string name="MessageNotifier_media_message">Tsamba ine midhiya</string>
+  <string name="MessageNotifier_reply">Pindura</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Mhindiro yakachimbidzika haiwanikwe kana TextSecure yakavharwa!</string>
+  <string name="QuickResponseService_problem_sending_message">Dambudziko pakutumira tsamba!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Tsamba yeTextSecure itsva</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Zvirimo zvakavigwa</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">IZWI REKUDARIKA REKARE:</string>
+  <string name="change_passphrase_activity__new_passphrase">IZWI REKUDARIKA RITSVA:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">DZOKORORA IZWI REKUDARIKA RITSVA:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Pinza zita kana nhamba</string>
+  <!--contact_selection_group_activity-->
+  <string name="contact_selection_group_activity__no_contacts">Hapana mazita</string>
+  <string name="contact_selection_group_activity__finding_contacts">kugadza mazita...</string>
+  <!--single_contact_selection_activity-->
+  <string name="SingleContactSelectionActivity_contact_photo">Mufananidzo wezita</string>
+  <!--ContactSelectionListFragment-->
+  <string name="ContactSelectionlistFragment_select_for">Sarudza kuitira</string>
+  <!--blocked_contacts_fragment-->
+  <string name="blocked_contacts_fragment__no_blocked_contacts">Hapana mazita akadzivirirwa...</string>
+  <!--contact_selection_recent_activity-->
+  <string name="contact_selection_recent_activity__no_recent_calls">Hapana kuchaya runhare kwaitika iyezvino.</string>
+  <!--conversation_title_view-->
+  <string name="conversation_title_view__conversation_muted">Hutaurwa hwamiswa</string>
+  <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Tumira tsamba yeTextSecure</string>
+  <string name="conversation_activity__type_message_sms_insecure">Tumira tsamba pfupi isina kukwedekerwa</string>
+  <string name="conversation_activity__type_message_mms_insecure">Tumira tsamba ine midhiya isina kukwedekerwa</string>
+  <string name="conversation_activity__send">Tumira</string>
+  <string name="conversation_activity__remove">Bvisa</string>
+  <string name="conversation_activity__window_description">Hutaurwa na %1$s</string>
+  <string name="conversation_activity__compose_description">Rondedzero yetsamba</string>
+  <string name="conversation_activity__emoji_toggle_description">Saidzira kiibhodhi ye \"emoji\"</string>
+  <string name="conversation_activity__attachment_thumbnail">Mufananidzo webatanidzira</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Saidzira dhirowa yebatanidzira</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Tsamba ine midhiya iri kututunura</string>
+  <string name="conversation_item__mms_image_description">Tsamba ine midhiya </string>
+  <string name="conversation_item__secure_message_description">Tsamba yakakwedekerwa</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">Tutunura</string>
+  <string name="conversation_item_sent__downloading">Kututunura</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Kutumira kwaramba</string>
+  <string name="conversation_item_sent__pending_approval_description">Kumirira mubvumo</string>
+  <string name="conversation_item_sent__delivered_description">Yasvitswa</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Tutunura </string>
+  <string name="conversation_item_received__contact_photo_description">Mufananidzo wezita</string>
+  <string name="conversation_item_received__downloading">Kututunura </string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Mashandiro esarudzo dzezvikwata </string>
+  <string name="conversation_fragment_cab__batch_selection_amount">%s asarudzwa</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Kugadza mazita nyika....</string>
+  <string name="country_selection_fragment__search">Tsvaga</string>
+  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Hapana muchina yakahakirwa....</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__log_fetch_failed">Tatadza kutora bhuku remapindiro amboitwa kubva pamuchina wako.  Asi unogona kushandisa ADB kuti ukwanise kuwana bhuku rekubvisa zvipfukuto. </string>
+  <string name="log_submit_activity__thanks">Tinotenda nerubatsirwo rwako!</string>
+  <string name="log_submit_activity__submitting">Kutumidzira</string>
+  <string name="log_submit_activity__posting_logs">Kutumira bhuku remapindiro amboitwa kuruzororo....</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Unoda kuimupota tsamba dzine mavara dziripo kuenda kupfimbi yedhata yakakwedekerwa yeTextSecure here?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Hurongwa hwegumbapamwe yepfimbi yedhata haizochinjirudzwe  kana kushandurwa neimwe nzira.</string>
+  <string name="database_migration_activity__skip">Darika</string>
+  <string name="database_migration_activity__import">Imupota</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Izvi zvinogona kutora kanguva. Tinokumbira umire zvishoma, tichakuzivisai kana kuimupota kwazadziswa.</string>
+  <string name="database_migration_activity__importing">KUIMUPOTA</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Zivisa pfimbi redhata....</string>
+  <string name="export_fragment__export_plaintext_backup">Tumira bhekiapu yebomhoremavara</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+Tumira bhekiapu rebomhoremavara rinopindirana ne\"Bhekiapu yetsamba pfupi nekudzoreredza\" kuenda kuSD kadhi.</string>
+  <string name="import_fragment__import_system_sms_database">Imupota gumbapamwe yepfimbi redhata retsamba pfupi</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Imupota pfimbi yedhata
+kubva kuhurongwa hwegumbapambwe reapu retsamba.</string>
+  <string name="import_fragment__import_encrypted_backup">Imupota bhekiapu yakakwedekerwa</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Dzorera bhekiapu yakakwedekerwa yeTextSecure yanga yambo tumirwa.</string>
+  <string name="import_fragment__import_plaintext_backup">Imupota bhekiapu yebomhoremavara</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Imupota bhekiapu rebomhoremavara. Rinopindirana ne\"Bhekiapu yetsamba pfupi nekudzoreredza\".</string>
+  <!--media_overview_activity-->
+  <string name="media_overview_activity__no_images">Hapana mifananidzo</string>
+  <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">Ruramisa</string>
+  <string name="message_recipients_list_item__resend">Tumira zvekare</string>
+  <!--MmsPreferencesFragment-->
+  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Mukondo wegadziro yetsamba dzemidhiya dzinodiwa parunharembozha rwako.</string>
+  <string name="MmsPreferencesFragment__enabled">Kugoneswa</string>
+  <string name="MmsPreferencesFragment__disabled">Kutadziswa</string>
+  <string name="MmsPreferencesFragment__not_set">Haina kugadzirwa </string>
+  <string name="MmsPreferencesFragment__invalid_uri">Mavara apinzwa anga asiri eURI inosevenza</string>
+  <string name="MmsPreferencesFragment__invalid_host">Mavara apinzwa anga asiri emuchinguri anosevenza</string>
+  <!--GroupUtil-->
+  <string name="GroupUtil_joined_the_group">%1$s abatana neboka.</string>
+  <string name="GroupUtil_group_updated">Boka raziviswa.</string>
+  <string name="GroupUtil_title_is_now">Musoro ikezvino wave \'%1$s\'.</string>
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__unlock">Zarura</string>
+  <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure inoda gadziro yetsamba dzinemidhiya kuti isvitse midhiya netsamba dzemapoka kupfurikidza nemutakuri wepasina waya. Muchina wako haukwanise kuti mashoko aya avepo, zvinova izvo zvechokwadi panguva zvinji pamichina yakavharwa uye nedzimwe gadziridzo dzakamiswa.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Kuti utumire midhiya netsamba dzemapoka, bata ‘hongu’ uye uzadzikise gadziro dzakumbirwa. Gadziro dzetsamba dzemidhiya kubva kumutakuri wako dzinogona kuwanikwa nekutsvaga ‘mutakuri weAPN.’ Unongoda kuti uite izvi kamwe chete.</string>
+  <!--recipient_preferences_activity-->
+  <string name="recipient_preference_activity__blocked">Yakadzivirirwa</string>
+  <!--recipient_preferences-->
+  <string name="recipient_preferences__mute_conversation">Misa hutaurwa</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">Tadzisa zviziviso zvehutaurwa uwu.</string>
+  <string name="recipient_preferences__ringtone">Mhanzi yekuridza </string>
+  <string name="recipient_preferences__vibrate">Vhaibhureta</string>
+  <string name="recipient_preferences__block">Dzivirira</string>
+  <string name="recipient_preferences__color">Ruvara</string>
+  <string name="recipient_preferences__color_for_this_contact">Ruvara rwezita iri</string>
+  <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Ruramisa nhamba dzako dzenhare kuti ukochekere kuTextSecure.</string>
+  <string name="registration_activity__your_country">NYIKA YAKO</string>
+  <string name="registration_activity__your_country_code_and_phone_number">KODHI YENYIKA YAKO NE
+NHAMBA DZEMBOZHA RUNHARE RWAKO</string>
+  <string name="registration_activity__phone_number">NHAMBA DZENHARE</string>
+  <string name="registration_activity__register">Nyoresa</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Kunyoresa kunotumira mamwe mashoko ezita kuenda kusevha. Haipfimbikwe.</string>
+  <string name="registration_activity__powered_by_twilio">Zvaitiswa natwilio </string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Zvimwe zvimhingamipini 
+zvinosanganisira:</string>
+  <string name="registration_problems__sms_interceptors">Zvibvukiro zvetsamba pfupi.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Umwe mugamuchiri wetsamba wetatu, akaita se ‘Handcent’ kana kuti ‘GoSMS,’ dzinoshanda zvisingafadze uye
+dzinobvukira tsamba pfupi dzese dzirikupinda. Tarisa kuti uone kana wagamuchira tsamba inotangidza
+ichiti “kodhi yako yekuongorora kururama kwako muTextSecure:\', zvisinei unozoda kuti ugadzirise
+apu yetsamba dzako dzemunhu wako wetatu kuti tsamba dzako dzipfuure.</string>
+  <string name="registration_problems__incorrect_number">Nhamba hadzisidzo.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+Rukumbiro tarisa kuti uve nechokwadi kuti wapinzwa nhamba dzako zvakanaka, uye kuti ndiwo muitiro wakanaka
+wekudunhu rako.</string>
+  <string name="registration_problems__google_voice">Izwi re‘Google.’</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure haizosevenzi nenhamba dze izwi re\'Google\'.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Kururamisa nenzira yezwi</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+TextSecure inokwanisa kukuchaira runhare kuti iongorore kururama kwenhamba dzako. Bata ‘Ndichaire’ nekupinza murau wenhamba tanhatu 
+dzaunonzwa pasi.</string>
+  <string name="registration_progress_activity__verify">Ruramisa</string>
+  <string name="registration_progress_activity__call_me">Ndichayire nhare</string>
+  <string name="registration_progress_activity__edit_number">Pepeta nhamba</string>
+  <string name="registration_progress_activity__connectivity_error">Kukanganiswa kwekuhaka masaisai.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
+TextSecure yatadza kuhaka chirango chekusunda.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Zvimwe zvimhingamipini 
+zvinosanganisira:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Hapana masaisai
+ekuhaka.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Muchina wako
+unoda masaisai ekuhaka kuti ukwanise kusevenzesa cherechedzo yeTextSecure iyi. Tarisa kuti uvenechokwadi 
+chekuti yakahaka 3G kana kuti nepfenyuro yepasina waya. </string>
+  <string name="registration_progress_activity__restrictive_firewall">Chidziviriri chemudhuri wemoto.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Kana wakahaka kupfurikidza nenepfenyuro yepasina waya, zvinogona kuti pane mudhuri wemoto urikudzivirira kubatwa
+kwesevha reTextSecure. Edza imwe nepfeyuro kana dhata rinofamba.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+TextSecure ichazviita yega kuti iongorore kururama kwenhamba  dzako netsamba pfupi yekutsinhira.</string>
+  <string name="registration_progress_activity__connecting">Kukochekera.....</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Kumirira tsamba pfupi
+yekururamisa...</string>
+  <string name="registration_progress_activity__registering_with_server">Kunyoresa nesevha....</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Izvi 
+zvinokwanisa kutora chinguva. Rukumbiro iva nemoyo murefu, tichakuudza kana kutsinhira kuchinge kwazadziswa.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+TextSecure yapera nguva yakamirira tsamba pfupi yekutsinhira.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Kururama kuburikidza netsamba pfupi
+kwaramba.</string>
+  <string name="registration_progress_activity__generating_keys">Kugadzira svumbunuro....</string>
+  <string name="registration_progress_activity__alert">Chenjedza</string>
+  <string name="registration_progress_activity__telephone">Runhare</string>
+  <string name="registration_progress_activity__check">Tarisa</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to"><small>Pinza zita kana nhamba</small></string>
+  <string name="recipients_panel__add_member">Wedzera nhengo</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">Chitupa chavo (vaverenga):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Chitupa chako (waverenga):</string>
+  <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Zvimwe zvinhu zvinoda teerero yako. </string>
+  <string name="message_details_header__sent">Kutumira</string>
+  <string name="message_details_header__received">Kutambira</string>
+  <string name="message_details_header__via">Kuburikidza</string>
+  <string name="message_details_header__to">Kuna:</string>
+  <string name="message_details_header__from">Kubva:</string>
+  <string name="message_details_header__with">Na:</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Gadzira izwi rekudarika</string>
+  <string name="AndroidManifest__enter_passphrase">Pinza izwi rekudarika</string>
+  <string name="AndroidManifest__select_contacts">Sarudza mazita</string>
+  <string name="AndroidManifest__textsecure_detected">Tafeya TextSecure</string>
+  <string name="AndroidManifest__public_identity_key">Chitupa chesvumbunuro chepovho</string>
+  <string name="AndroidManifest__change_passphrase">Sandura izwi rekudarika</string>
+  <string name="AndroidManifest__verify_identity">Ruramisa chitupa</string>
+  <string name="AndroidManifest__log_submit">Tumidzira bhuku rekubviswa kwezvipfukuto </string>
+  <string name="AndroidManifest__media_preview">Kuwona midhiya muchidimbu</string>
+  <string name="AndroidManifest__media_overview">Mifananidzo yese</string>
+  <string name="AndroidManifest__media_overview_named">Mifananidzo yese ine %1$s</string>
+  <string name="AndroidManifest__message_details">Zvizere zvetsamba</string>
+  <string name="AndroidManifest_manage_linked_devices">Maneja michina yakakochekerwa </string>
+  <!--arrays.xml-->
+  <string name="arrays__import_export">Imupota/ Tumira</string>
+  <string name="arrays__my_identity_key">Chitupa chesvumbunuro yangu</string>
+  <string name="arrays__use_default">Shandisa hurongwa</string>
+  <string name="arrays__use_custom">Shandisa gadziro yako</string>
+  <string name="arrays__mute_for_one_hour">Misa zve awa 1</string>
+  <string name="arrays__mute_for_two_hours">Misa zve maawa 2</string>
+  <string name="arrays__mute_for_one_day">Misa zve zuva 1</string>
+  <string name="arrays__mute_for_seven_days">Misa zve mazuva 7</string>
+  <string name="arrays__settings_default">Gadziro yehurongwa</string>
+  <string name="arrays__enabled">Kugoneswa</string>
+  <string name="arrays__disabled">Kutadziswa</string>
+  <string name="arrays__name_and_message">Zita netsamba</string>
+  <string name="arrays__name_only">Zita chete</string>
+  <string name="arrays__neither">Isiri </string>
+  <!--plurals.xml-->
+  <plurals name="hours_ago">
+    <item quantity="one">awa %d</item>
+    <item quantity="other">maawa %d</item>
+  </plurals>
+  <!--preferences.xml-->
+  <string name="preferences__general">Zvenguva dzose </string>
+  <string name="preferences__sms_mms">Tsamba pfupi netsamba ine midhiya</string>
+  <string name="preferences__pref_all_sms_title">Tambira tsamba pfupi dzese</string>
+  <string name="preferences__pref_all_mms_title">Tambira tsamba dzine midhiya dzose</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Shandisa TextSecure panopinda tsamba dzine mavara dzose</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Shandisa TextSecure panopinda tsamba dzine midhiya dzose</string>
+  <string name="preferences__input_settings">Gadziro dzekuisa</string>
+  <string name="preferences__enable_enter_key_title">Gonesa svumbunuro yekupinza</string>
+  <string name="preferences__replace_smiley_with_enter_key">Dzorera svumbunuro yemufananidzo nesvumbunuro yekupinda</string>
+  <string name="preferences__pref_enter_sends_title">Svumbunuro yekupinza inotumira</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Kubaya svumbunuro yekupinza kunoita kuti tsamba dzine mavara dzitumirwe</string>
+  <string name="preferences__display_settings">Gadziro dzekuratidza </string>
+  <string name="preferences__choose_identity">Sarudza chitupa</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Sarudza zita rako pane mutsara wemazita.</string>
+  <string name="preferences__change_passphrase">Sandura izwi rekudarika</string>
+  <string name="preferences__change_my_passphrase">Sandura izwi rekudarika rangu</string>
+  <string name="preferences__enable_passphrase">Gonesa izwi rekudarika</string>
+  <string name="preferences__passphrase_summary">Izwi rekudarika %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">Gonesa kuvhara chivhitivhiti chetsamba</string>
+  <string name="preferences__screen_security">Tsivatsaona yepachivhitivhiti</string>
+  <string name="preferences__screen_security_summary">Tsivatsaona yepachivhitivhiti %s</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Dzivirira kutorwa kwemifananidzo yepachivhitivhiti pane rutarwa rwamanje uye mukati meapu.</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Kanganwa izwi rekudarika mupfungwa kana kwapera chimirwa</string>
+  <string name="preferences__timeout_passphrase">Kupera kwenguva inoshanda izwi rekudarika </string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Sarudza panoperera nguva yekushanda kwe izwi rekudarika </string>
+  <string name="preferences__pref_timeout_interval_title">Chimirwa chekupera kwenguva</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Nguva yekumira isati yakanganwa izwi rekudarika mupfungwa </string>
+  <string name="preferences__notifications">Zviziviso</string>
+  <string name="preferences__enable_message_notifications">Gonesa tsamba dzezviziviso</string>
+  <string name="preferences__led_color">Ruvara rweLED</string>
+  <string name="preferences__led_color_unknown">Haizivikanwe</string>
+  <string name="preferences__pref_led_blink_title">Peteni yekubwaira kweLED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Isa gadziro yako yepeteni yekubwaira kweLED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Kubatidza kuitira:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Kudzima kuitira:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Gadziro yekubwaira kwepeteni yeLED yaiswa! </string>
+  <string name="preferences__sound">Ruzha</string>
+  <string name="preferences__change_notification_sound">Sandura ruzha rwezviziviso</string>
+  <string name="preferences__inthread_notifications">Zviziviso zviri mushinda</string>
+  <string name="preferences__play_inthread_notifications">Ridza ruzha rwezviziviso kana ndichiwona hutaurwa huri mubishi</string>
+  <string name="preferences__repeat_alerts">Dzokorodza chenjedzo</string>
+  <string name="preferences__never">Kwete zvamuchose</string>
+  <string name="preferences__one_time">Nguva imwe chete</string>
+  <string name="preferences__two_times">Nguva yepiri</string>
+  <string name="preferences__three_times">Nguva yetatu</string>
+  <string name="preferences__five_times">Nguva yechina</string>
+  <string name="preferences__ten_times">Nguva yegumi</string>
+  <string name="preferences__vibrate">Vhaibhureta</string>
+  <string name="preferences__also_vibrate_when_notified">Itawo ruzha kana waziviswa </string>
+  <string name="preferences__minutes">maminiti</string>
+  <string name="preferences__hours">maawa</string>
+  <string name="preferences__green">Girini</string>
+  <string name="preferences__red">Tsvuku</string>
+  <string name="preferences__blue">Bhuluu</string>
+  <string name="preferences__orange">Ranjisi</string>
+  <string name="preferences__cyan">Cyan</string>
+  <string name="preferences__magenta">Magenta</string>
+  <string name="preferences__white">Chena</string>
+  <string name="preferences__none">Hapana</string>
+  <string name="preferences__fast">Kukurumidza</string>
+  <string name="preferences__normal">Kwesere</string>
+  <string name="preferences__slow">Nono</string>
+  <string name="preferences__custom">Gadziro yako</string>
+  <string name="preferences__advanced">Zviri pamusoro</string>
+  <string name="preferences__privacy">Zvakachengeteka</string>
+  <string name="preferences__mms_user_agent">Mumiriri anoshandisa tsamba dzemidhiya </string>
+  <string name="preferences__advanced_mms_access_point_names">Mukondo wegadziro dzetsamba dzemidhiya </string>
+  <string name="preferences__enable_manual_mms">Shandisa mukondo wegadziro dzetsamba dzemidhiya </string>
+  <string name="preferences__override_system_mms_settings">Darikidza gadziro yegumbapamwe yetsamba dzemidhiya nemashoko aripasi.</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS Proxy Host</string>
+  <string name="preferences__mms_proxy_port">MMS Proxy Port</string>
+  <string name="preferences__mmsc_username">Zita rekushandisa re MMSC</string>
+  <string name="preferences__mmsc_password">Izwi rekudarika re MMSC</string>
+  <string name="preferences__sms_delivery_reports">Kumhan\'ara kwekusvika kwetsamba pfupi  </string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Kumbira kuman\'arwa kwekusvitswa kwetsamba pfupi imwe ne imwe yaunenge watumira </string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Ita kuti tsamba dzakare dzizvidzime pachadzo kana shinda yeutaurwa yapfurikidza hurebu hwakatarwa.</string>
+  <string name="preferences__delete_old_messages">Dzimura tsamba dzekare</string>
+  <string name="preferences__conversation_length_limit">Magumo ehurefu hweutaurwa</string>
+  <string name="preferences__trim_all_threads_now">Nyerenyesa shinda dzese izvozvi</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Tsvagiridza mukati meshinda dzehutaurwa uye manikidzira magumo ehurefu hwehutaurwa.</string>
+  <string name="preferences__light_theme">Chiedza</string>
+  <string name="preferences__dark_theme">Rima</string>
+  <string name="preferences__appearance">Mamiriro  </string>
+  <string name="preferences__theme">Dingindira </string>
+  <string name="preferences__theme_summary">Dingindira %s</string>
+  <string name="preferences__default">Hurongwa</string>
+  <string name="preferences__language">Mutauro</string>
+  <string name="preferences__language_summary">Mutauro %s</string>
+  <string name="preferences__textsecure_messages">Tsamba dze TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Sunungura kutumirwa ketsamba dziri puraivheti kuvashandisi veTextSecure neSignal</string>
+  <string name="preferences__submit_debug_log">Kuendesa bhuku yekubviswa kwaitwa zvipfukuto </string>
+  <string name="preferences__support_wifi_calling">Yanano yemashandiro \"ekuchaya pasina waya\"</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Gonesa kana muchina wako uchishandisa nepfenyuro yepasina waya kusvitsa tsamba pfupi/ tsamba dzine midhiya (gonesa chete kana \"kuchaya pasina waya\" kwakagoneswa pamuchina wako). </string>
+  <string name="preferences_app_protection__blocked_contacts">Mazita akadzivirirwa</string>
+  <string name="preferences_notifications__display_in_notifications">Ratidza zviziviso </string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">Sarudza zvese</string>
+  <string name="contact_selection_list__menu_unselect_all">Bvisa sarudzo pese</string>
+  <string name="contact_selection_list__header_textsecure_users">VASHANDISI VETEXTSECURE</string>
+  <string name="contact_selection_list__header_other">MAZITA OSE</string>
+  <string name="contact_selection_list__unknown_contact">Tsamba itsva kuna...</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">Kupedza</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Gwangunudza mutsara wemazita</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">Chaya runhare</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">Shoko zvizere</string>
+  <string name="conversation_context__menu_copy_text">Kopa mavara</string>
+  <string name="conversation_context__menu_delete_message">Dzimura tsamba</string>
+  <string name="conversation_context__menu_forward_message">Endesa tsamba mberi</string>
+  <string name="conversation_context__menu_resend_message">Tumira tsamba zvekare</string>
+  <!--conversation_context_image-->
+  <string name="conversation_context_image__save_attachment">Chengetedza batanidzwa</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">Koka</string>
+  <!--conversation_insecure_no_push-->
+  <string name="conversation_insecure__menu_start_secure_session">Tanga chikamu chakakwedekera</string>
+  <string name="conversation_insecure__security">Tsivatsaona</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Dzimura zvasarudzwa</string>
+  <string name="conversation_list_batch__menu_select_all">Sarudza zvese </string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">Tsvaga</string>
+  <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">Mufananidzo wezita</string>
+  <string name="conversation_list_item_view__error_alert">Chenjedzo yekanganiso</string>
+  <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">Hutaurwa hutsva</string>
+  <!--conversation_secure_verified-->
+  <string name="conversation_secure_verified__menu_security">Tsivatsaona </string>
+  <string name="conversation_secure_verified__menu_verify_identity">Ruramisa chitupa</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Vhara chikamu chakakwedekerwa </string>
+  <!--conversation_muted-->
+  <string name="conversation_muted__unmute">Kubvisa chimiso </string>
+  <!--conversation_unmuted-->
+  <string name="conversation_unmuted__mute_notifications">Misa zviziviso</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">Kuwedzera batanidzwa</string>
+  <string name="conversation__menu_update_group">Zivisa boka</string>
+  <string name="conversation__menu_leave_group">Buda muboka</string>
+  <string name="conversation__menu_delete_thread">Dzimura shinda</string>
+  <string name="conversation__menu_view_media">Mifananidzo yese</string>
+  <string name="conversation__menu_conversation_settings">Gadziro yehutaurwa</string>
+  <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Wedzera zvinongobuda</string>
+  <!--conversation_callable-->
+  <string name="conversation_add_to_contacts__menu_add_to_contacts">Wedzera kumazita</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Mutsara we vanotambira</string>
+  <string name="conversation_group_options__delivery">Kusvitswa</string>
+  <string name="conversation_group_options__conversation">Hutaurwa</string>
+  <string name="conversation_group_options__broadcast">Tepfenyura</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">Kuyenzanisa</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Ita kuti iwongororwe kuti uyenzanise</string>
+  <string name="key_scanning__menu_scan_to_compare">Wongorora kuti uyenzanise</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Tsamba itsva </string>
+  <string name="text_secure_normal__menu_new_group">Boka nyowani</string>
+  <string name="text_secure_normal__menu_settings">Gadziro</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Vhara</string>
+  <string name="text_secure_normal__mark_all_as_read">Mara ose se averengwa</string>
+  <!--reminder_header-->
+  <string name="reminder_header_expired_build">Chivakirira chako cheTextSecure chapera kushanda!</string>
+  <string name="reminder_header_expired_build_details">Tsamba hadzichazogona kutumirwa zvekare, rukumbiro kwidziridza kuenda kevhezheni remanje. </string>
+  <string name="reminder_header_sms_default_title">Shandisa sehurongwa hwe apu yetsamba pfupi?</string>
+  <string name="reminder_header_sms_default_text">Bata kuti TextSecure ive iri apu yako yehurongwa hwetsamba pfupi</string>
+  <string name="reminder_header_sms_import_title">Kuimupota gumbapamwe retsamba pfupi?</string>
+  <string name="reminder_header_sms_import_text">Bata kuti ikopere tsamba pfupi dzembozha runhare yako kupfimbi redhate rakakwedekerwa.</string>
+  <string name="reminder_header_push_title">Gonesa tsamba dze TextSecure?</string>
+  <string name="reminder_header_push_text">Bata kuitira kutumiridzira kunechichimbi, puraivheti yakanyanya uye pasina kubhadharwa kwetsamba pfupi.</string>
+  <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">Iwewe</string>
+  <string name="MediaPreviewActivity_cant_display">Kutadza kuona mufananidzo uyu muchidimbu </string>
+  <string name="MediaPreviewActivity_unssuported_media_type">Rudzi rwemidhiya rwusina kutsigirwa </string>
+  <!--media_preview-->
+  <string name="media_preview__save_title">Chengetedza</string>
+  <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">Kuona mufananidzo muchidimbu</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Kudzimura</string>
+  <string name="trimmer__deleting_old_messages">Kudzimura tsamba dzekare....</string>
+  <string name="trimmer__old_messages_successfully_deleted">Tsamba dzekare dzabudirira pakudzimurwa</string>
+  <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">Tumidzira chimiriro chemufanidzo </string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera haipo</string>
+  <!--EOF-->
+</resources>

res/values-sr/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">Одјављујем подршку за сигурне поруке...</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>
@@ -86,6 +84,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>
@@ -149,16 +148,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>
@@ -246,7 +245,7 @@
   <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>
@@ -254,13 +253,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>
@@ -398,7 +397,7 @@
   <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_locked_message">Закључана порука...</string>
   <string name="MessageNotifier_media_message_with_text">Мултимедијална порука: %s</string>
@@ -413,18 +412,19 @@
   <!--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>
@@ -466,7 +466,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">Не могу да дохватим дневник са вашег уређаја. Можете да искористите АДБ да бисте добавили дневник исправљања грешака.</string>
   <string name="log_submit_activity__thanks">Хвала вам на помоћи!</string>
@@ -614,7 +614,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_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>
@@ -627,6 +627,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="one">%d сат</item>
@@ -662,7 +665,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>
@@ -730,6 +733,7 @@
   <string name="preferences__support_wifi_calling">Компатибилност са „бежичним позивањем“</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Омогућите ако ваш уређај доставља СМС/ММС преко бежичне мреже (омогућите само ако је „WiFi Calling“ омогућено на вашем уређају)</string>
   <string name="preferences_app_protection__blocked_contacts">Блокирани контакти</string>
+  <string name="preferences_notifications__display_in_notifications">Прикажи у обавештењу</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-sv/strings.xml

@@ -12,11 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Radera alla gamla meddelanden nu?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Är du säker på att du omedelbart vill trimma alla konversationstrådar till de %s senaste meddelandena?</string>
   <string name="ApplicationPreferencesActivity_delete">Radera</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Inaktivera lagringskryptering?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Varning, detta inaktiverar lagringskryptering för alla meddelanden och nycklar. Dina krypterade
-sessioner kommer fortsätta att fungera, men vem som helst med fysisk tillgång till din enhet
-kommer kunna komma åt dem.</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Ta bort lösenordsfras?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Stäng av låsskärm för meddelanden?</string>
   <string name="ApplicationPreferencesActivity_disable">Inaktivera</string>
   <string name="ApplicationPreferencesActivity_unregistering">Avregistrering</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Avregistrerar från TextSecure-meddelanden...</string>
@@ -43,7 +41,7 @@ kommer kunna komma åt dem.</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Kan ej hitta app för att välja media.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Ta foto</string>
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Ljud</string>
@@ -59,6 +57,7 @@ identitetsnyckel.</string>
 verifiera denna kontakt.</string>
   <string name="ConfirmIdentityDialog_accept">Acceptera</string>
   <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Meddelande %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Meddelandestorlek: %d kB</string>
   <string name="ConversationItem_expires_s">Går ut: %s</string>
@@ -85,6 +84,7 @@ verifiera denna kontakt.</string>
   <string name="ConversationActivity_select_contact_info">Välj kontaktinformation</string>
   <string name="ConversationActivity_compose_message">Skriv meddelande</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Tyvärr uppstod det ett fel vid bifogning av din fil.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Gifen du valde är för stor!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Tyvärr, den valda videon överskrider gränsen för meddelandestorlek (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Tyvärr, den valda ljudfilen överskrider gränsen för meddelandestorlek (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mottagare är inte en giltig SMS eller e-postadress!</string>
@@ -148,16 +148,16 @@ verifiera denna kontakt.</string>
   <string name="DateUtils_now">Nu</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Ta bort \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Genom att ta bort denna enhet kommer den inte längre kunna skicka eller få meddelanden.</string>
+  <string name="DeviceListActivity_unlink_s">Koppla bort \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Genom att koppla bort denna enhet kommer den inte längre kunna skicka eller få meddelanden.</string>
   <string name="DeviceListActivity_network_connection_failed">Nätverksuppkoppling misslyckades...</string>
   <string name="DeviceListActivity_try_again">Försök igen</string>
-  <string name="DeviceListActivity_disconnecting_device">Tar bort enhet...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Tar bort enhet</string>
+  <string name="DeviceListActivity_unlinking_device">Kopplar bort enhet...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Kopplar bort enhet</string>
   <string name="DeviceListActivity_network_failed">Nätverket misslyckades</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Namnlös enhet</string>
-  <string name="DeviceListItem_created_s">Skapade %s</string>
+  <string name="DeviceListItem_linked_s">Länkade %s</string>
   <string name="DeviceListItem_last_active_s">Senast aktiv %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Dela med</string>
@@ -250,13 +250,13 @@ som för närvarande finns i TextSecure.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Läsa alla dina meddelanden
 \n- Skicka meddelanden i ditt namn</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Lägg till enhet</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Lägger till ny enhet...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Enhet tillagd!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Länkar enhet</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Länkar ny enhet...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Enhet länkad</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ingen enhet hittades.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Nätverksfel.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ogiltig QR-kod.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Tyvärr har du redan för många registrerade enheter, försök ta bort några...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Tyvärr har du redan för många länkade enheter, försök ta bort några...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Ange lösenord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-ikon</string>
@@ -388,8 +388,9 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="KeyCachingService_passphrase_cached">TextSecure är upplåst</string>
   <string name="KeyCachingService_lock">Lås med lösenord</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d meddelanden i %2$d konversationer</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nya meddelanden i %2$d konversationer</string>
   <string name="MessageNotifier_most_recent_from_s">Senaste från %1$s</string>
+  <string name="MessageNotifier_locked_message">Låst meddelande...</string>
   <string name="MessageNotifier_media_message_with_text">Mediameddelande: %s</string>
   <string name="MessageNotifier_no_subject">(Inget ämne)</string>
   <string name="MessageNotifier_message_delivery_failed">Meddelandeleverans misslyckades.</string>
@@ -402,18 +403,19 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Snabbsvar är ej tillgänglit när TextSecure är låst!</string>
   <string name="QuickResponseService_problem_sending_message">Problem med att skicka meddelandet!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nytt TextSecure-meddelande</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Innehållet dolt</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">GAMMALT LÖSENORD:</string>
   <string name="change_passphrase_activity__new_passphrase">NYTT LÖSENORD:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">UPPREPA NYTT LÖSENORD:</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Skriv in namn eller nummer</string>
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Inga kontakter.</string>
   <string name="contact_selection_group_activity__finding_contacts">Laddar kontakter…</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du är inte registrerad med push-tjänsten...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Uppdaterar katalogen</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Uppdaterar push-katalogen...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktfoto</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Välj för</string>
@@ -455,7 +457,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="country_selection_fragment__loading_countries">Läser in länder...</string>
   <string name="country_selection_fragment__search">Sök</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Inga enheter ihopkopplade</string>
+  <string name="device_list_fragment__no_devices_linked">Inga länkade enheter...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kunde inte plocka loggarna från din enhet, men du kan använda ADB för att hämta debugloggarna istället.</string>
   <string name="log_submit_activity__thanks">Tack för din hjälp!</string>
@@ -593,7 +595,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="AndroidManifest__media_overview">Alla bilder</string>
   <string name="AndroidManifest__media_overview_named">Alla bilder med %1$s</string>
   <string name="AndroidManifest__message_details">Meddelandedetaljer</string>
-  <string name="AndroidManifest_manage_paired_devices">Hantera ihopkopplade enheter</string>
+  <string name="AndroidManifest_manage_linked_devices">Hantera länkade enheter</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importera / exportera</string>
   <string name="arrays__my_identity_key">Min identitetsnyckel</string>
@@ -606,6 +608,12 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="arrays__settings_default">Inställningars standardvärde</string>
   <string name="arrays__enabled">Aktiverad</string>
   <string name="arrays__disabled">Inaktiverad</string>
+  <string name="arrays__name_and_message">Namn och meddelande</string>
+  <string name="arrays__name_only">Endast namn</string>
+  <string name="arrays__neither">Varken eller</string>
+  <string name="arrays__images">Bilder</string>
+  <string name="arrays__audio">Ljud</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d timme</item>
@@ -630,6 +638,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__change_my_passphrase">Ändra mitt lösenord</string>
   <string name="preferences__enable_passphrase">Aktivera lösenordsfras</string>
   <string name="preferences__passphrase_summary">Lösenordsfras %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">Sätt på låsskärm för meddelanden</string>
   <string name="preferences__screen_security">Skärmsäkerhet</string>
   <string name="preferences__screen_security_summary">Skärmsäkerhet %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blockera skärmdumpar i Senaste-listen samt inuti appen</string>
@@ -639,7 +648,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__pref_timeout_interval_title">Timeout intervall</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Väntetiden innan lösenordet glöms från minnet</string>
   <string name="preferences__notifications">Aviseringar</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Visa meddelande-aviseringar i statusraden</string>
+  <string name="preferences__enable_message_notifications">Slå på meddelandeaviseringar</string>
   <string name="preferences__led_color">Färg på ljusindikator</string>
   <string name="preferences__led_color_unknown">Okänd</string>
   <string name="preferences__pref_led_blink_title">Blinkmönster på ljusindikator</string>
@@ -649,7 +658,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Specialanpassat LED-blinkningsmönster valt!</string>
   <string name="preferences__sound">Ljud</string>
   <string name="preferences__change_notification_sound">Ändra aviseringsljud</string>
-  <string name="preferences__inthread_notifications">Inom-tråd aviseringar</string>
+  <string name="preferences__inthread_notifications">Aviseringar i tråden</string>
   <string name="preferences__play_inthread_notifications">Spela aviseringsljud när du tittar på en aktiv konversation</string>
   <string name="preferences__repeat_alerts">Upprepa aviseringar</string>
   <string name="preferences__never">Aldrig</string>
@@ -689,6 +698,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Begär en leveransrapport för varje SMS-meddelande du skickar</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Radera automatiskt gamla meddelanden när en konversationstråd överstiger en specificerad längd</string>
   <string name="preferences__delete_old_messages">Radera gamla meddelanden</string>
+  <string name="preferences__chats">Konversationer och media</string>
   <string name="preferences__conversation_length_limit">Konversationstrådslängd</string>
   <string name="preferences__trim_all_threads_now">Trimma alla trådar nu</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanna igenom alla konversationstrådar och framtvinga konversationstrådslängder.</string>
@@ -707,6 +717,7 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' kompatibilitetsläge</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivera om din enhet använder SMS/MMS sändning över WiFi (aktivera endast när \'WiFi Calling\' är aktiverat på din enhet)</string>
   <string name="preferences_app_protection__blocked_contacts">Blockerade kontakter</string>
+  <string name="preferences_notifications__display_in_notifications">Visa i aviseringar</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-ta/strings.xml

@@ -12,11 +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_touch_to_change_your_default_sms_app">இதை உங்கள் இயல்புநிலை SMS மென்பொருளாக்க தொடவும் </string>
@@ -218,8 +213,6 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <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>
@@ -355,18 +348,16 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <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>
@@ -584,7 +575,6 @@ 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__led_color">LED நிறம்</string>
   <string name="preferences__led_color_unknown">முன் தெரிந்திராத</string>
   <string name="preferences__pref_led_blink_title">LED மிளிரும் முறை</string>

res/values-tr/strings.xml

@@ -12,11 +12,6 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Tüm eski mesajlar silinsin mi?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tüm konuşma başlıklarını hemen  %s en son konuşmaya kırpmak istediğinizden emin misiniz?</string>
   <string name="ApplicationPreferencesActivity_delete">Sil</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Saklama alanı şifrelemesi etkisizleştirilsin mi?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Uyarı, bu tüm mesaj ve anahtarlar için depolama alanı şifrelemesini etkisizleştirir. Şifrelenmiş
-oturumlarınız işlevlerini sürdürür, fakat cihazınıza fiziksel erişimi olan herhangi biri onlara
-erişebilir.</string>
   <string name="ApplicationPreferencesActivity_disable">Etkisizleştir</string>
   <string name="ApplicationPreferencesActivity_unregistering">Kayıt siliniyor</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">TextSecure mesajlarından kaydınız siliniyor</string>
@@ -42,7 +37,6 @@ Gelecekte TextSecure mesajlarını tekrar kullanmak isterseniz telefon numaranı
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Seçtiğiniz medya için bir uygulama bulunamadı.</string>
   <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_take_photo">Foto Çek</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Resim</string>
   <string name="AttachmentTypeSelectorAdapter_video">Görüntü</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Ses</string>
@@ -230,8 +224,6 @@ kurulumunuzda bulunan ancak yüklenecek yedekte bulunmayan tüm bilgiler kaybolu
   <string name="DeviceProvisioningActivity_content_bullets">
 - Tüm mesajlarınızı okuyunuz
 \n-Mesajları adınızla gönderiniz</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Yeni cihaz ekleniyor...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Cihaz eklendi!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Hiç cihaz bulanamadı.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Ağ hatası.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Geçersiz QR kodu.</string>
@@ -365,7 +357,6 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="KeyCachingService_passphrase_cached">TextSecure kilitsiz</string>
   <string name="KeyCachingService_lock">Parola ile kilitle</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%2$d sohbette %1$d mesaj</string>
   <string name="MessageNotifier_most_recent_from_s">En yeni mesaj: %1$s</string>
   <string name="MessageNotifier_media_message_with_text">Medya mesajı: %s</string>
   <string name="MessageNotifier_no_subject">(Konusuz)</string>
@@ -375,18 +366,16 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="MessageNotifier_mark_all_as_read">Tümünü okundu işaretle</string>
   <string name="MessageNotifier_media_message">Medya mesajı</string>
   <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">ESKİ PAROLA:</string>
   <string name="change_passphrase_activity__new_passphrase">YENİ PAROLA:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">YENİ PAROLA TEKRAR:</string>
+  <!--contact_selection_activity-->
   <!--contact_selection_group_activity-->
-  <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Kişi yok.</string>
   <string name="contact_selection_group_activity__finding_contacts">Kişiler yükleniyor...</string>
   <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">İtilen servisine kayıtlı değilsiniz...</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Dizin güncelleniyor</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">İtilen dizini güncelleniyor...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kişi Fotosu</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seç</string>
@@ -602,7 +591,6 @@ başarısız.</string>
   <string name="preferences__pref_timeout_interval_title">Zaman aşımı aralığı</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hafızadaki parolanın unutulması için geçmesi gereken zaman miktarı</string>
   <string name="preferences__notifications">Bildirimler</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Durum çubuğunda mesaj bildirimlerini göster</string>
   <string name="preferences__led_color">LED rengi</string>
   <string name="preferences__led_color_unknown">Bilinmeyen</string>
   <string name="preferences__pref_led_blink_title">LED yanıp sönme şekli</string>