Bump version to 2.27.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="138"
-      android:versionName="2.23.2">
+      android:versionCode="154"
+      android:versionName="2.27.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

@@ -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,11 +78,19 @@ 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'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.assertj:assertj-core:1.7.1'
+    testCompile 'org.mockito:mockito-core:1.9.5'
+    testCompile 'org.powermock:powermock-api-mockito:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testCompile 'org.powermock:powermock-classloading-xstream:1.6.1'
 
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-
     androidTestCompile ('org.assertj:assertj-core:1.7.1') {
         exclude group: 'org.hamcrest', module: 'hamcrest-core'
     }
@@ -90,13 +98,6 @@ dependencies {
         exclude group: 'org.hamcrest',        module: 'hamcrest-core'
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestCompile ('com.android.support.test:runner:0.2') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    androidTestCompile ('com.android.support.test.espresso:espresso-core:2.1') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-        exclude group: 'javax.inject'
-    }
 }
 
 dependencyVerification {
@@ -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',
@@ -161,7 +162,6 @@ android {
         minSdkVersion 9
         targetSdkVersion 22
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
         buildConfigField "String", "PUSH_URL", "\"https://textsecure-service.whispersystems.org\""
         buildConfigField "boolean", "DEV_BUILD", "false"
@@ -226,6 +226,9 @@ android {
         androidTest {
             java.srcDirs = ['test/androidTest/java']
         }
+        test {
+            java.srcDirs = ['test/unitTest/java']
+        }
     }
 
      lintOptions {
@@ -264,27 +267,3 @@ if (propFile.canRead()){
     android.buildTypes.release.signingConfig = null
 }
 
-if (project.hasProperty('espresso') && System.console() != null) {
-    println "______________________WARNING_______________________"
-    println "ALL YOUR CONTACTS WILL BE DELETED IN THE PROCESS"
-    println "OF RUNNING THESE TESTS, TYPE 'delete all my contacts'"
-    println "TO CONTINUE"
-    println "----------------------------------------------------"
-
-    def input = System.console().readLine(':')
-    if (input == 'delete all my contacts') {
-        android.productFlavors {
-            base {}
-            espresso {
-                testInstrumentationRunner "org.thoughtcrime.securesms.TextSecureWakingTestRunner"
-            }
-        }
-        android.sourceSets.espresso {
-            manifest.srcFile 'test/espresso/AndroidManifest.xml'
-        }
-        android.sourceSets.androidTestEspresso {
-            java.srcDirs = ['test/androidTestEspresso/java']
-            res.srcDirs  = ['test/androidTestEspresso/res']
-        }
-    }
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 22 14:29:31 PDT 2015
+#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.5-bin.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

@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:height="24dp" android:width="24dp"/>
-            <solid android:color="@color/white"/>
-        </shape>
-    </item>
     <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="@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"/>
+            <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/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_activity.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.ConversationItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/conversation_item"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp">
-
-    <TextView android:id="@+id/conversation_item_body"
-        android:autoLink="all"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:linksClickable="true"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center"
-        android:textStyle="italic"
-        android:textColor="?attr/conversation_group_member_name"
-        android:textSize="14sp" />
-    <TextView android:id="@+id/conversation_item_date"
-        android:autoLink="all"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:linksClickable="false"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_gravity="right"
-        android:fontFamily="sans-serif-light"
-        android:textColor="?conversation_item_sent_text_secondary_color"
-        android:text="date"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone"/>
-
-</org.thoughtcrime.securesms.ConversationItem>

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/conversation_item_update.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.ConversationUpdateItem
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/conversation_update_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:padding="20dp">
+
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content">
+
+        <ImageView android:id="@+id/conversation_update_icon"
+                   android:layout_marginRight="7dp"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"/>
+
+        <TextView android:id="@+id/conversation_update_body"
+                  android:autoLink="all"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:linksClickable="true"
+                  android:textAppearance="?android:attr/textAppearanceSmall"
+                  android:textStyle="italic"
+                  android:textColor="?attr/conversation_group_member_name"/>
+
+    </LinearLayout>
+
+</org.thoughtcrime.securesms.ConversationUpdateItem>

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_preference_activity.xml

@@ -49,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,22 @@
 <?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" />
 
-    <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/transfer_controls_stub"
+              android:layout_width="70dp"
+              android:layout_height="70dp"
+              android:layout_gravity="center"
+              android:layout="@layout/transfer_controls_stub" />
 
+    <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" />
 </merge>

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="@dimen/media_bubble_remove_button_size"
+           android:layout_height="@dimen/media_bubble_remove_button_size"
+           android:src="@drawable/conversation_attachment_close_circle" />

res/layout/transfer_controls_stub.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.TransferControlView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/transfer_controls"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+

res/layout/transfer_controls_view.xml

@@ -0,0 +1,25 @@
+<?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">
+
+    <com.pnikosis.materialishprogress.ProgressWheel
+            android:id="@+id/progress_wheel"
+            android:layout_width="@dimen/transfer_controls_contracted_width"
+            android:layout_height="@dimen/transfer_controls_contracted_width"
+            android:visibility="gone"
+            android:layout_gravity="center"
+            app:matProg_barColor="@color/white"
+            app:matProg_linearProgress="true"
+            app:matProg_spinSpeed="0.333" />
+
+    <TextView android:id="@+id/download_details"
+              android:layout_width="@dimen/transfer_controls_expanded_width"
+              android:layout_height="@dimen/transfer_controls_contracted_width"
+              android:padding="15dp"
+              android:gravity="center"
+              android:textColor="?conversation_item_received_text_primary_color"
+              android:drawableLeft="@drawable/ic_file_download_white_36dp"
+              android:textSize="16dp"
+              android:visibility="gone"
+              android:textStyle="bold" />
+</merge>

res/values-ar/strings.xml

@@ -10,12 +10,15 @@
   <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_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>
-  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">تعطيل رسائل تيكست سيكيور؟</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">إلغاء رسائل تيكست سيكيور؟</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
 سوف يتم وقف رسائل تيكست سيكيور بإلغاء تسجيلك من الخدمة. سوف يتعين عليك إعادة تسجيل رقم هاتفك لمعاودة استخدام رسائل تيكست سيكيور في المستقبل.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطأ في الاتصال بالخادم!</string>
@@ -37,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>
@@ -49,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>
@@ -75,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>
@@ -138,23 +143,23 @@
   <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>
   <!--ExportFragment-->
   <string name="ExportFragment_export">تصدير</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">تصدير نص غير مشفر إلي بطاقة الذاكرة الخارجية؟</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">تحذير: سوف يتم تصدير محتوى رسائل تيكست سيكيور في هيئة نص مجرد إلى بطاقة الذاكرة.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">تحذير: سيتم تصدير محتوى رسائل تيكست سيكيور إلى بطاقة الذاكرة بدون تشفير.</string>
   <string name="ExportFragment_cancel">إلغاء</string>
   <string name="ExportFragment_exporting">التصدير جارٍ...</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">جارٍ تصدير غير مشفر إلى بطاقة الذاكرة...</string>
@@ -195,7 +200,7 @@
 استرجاع نسخة احتياطية مشفرة سيستبدل بالكامل المفاتيح حالية والإعدادات والرسائل. ستفقد المعلومات الموجودة الآن في تيكست سيكيور وغير موجودة في النسخة الاحتياطية.</string>
   <string name="ImportFragment_restore">استعادة</string>
   <string name="ImportFragment_import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة؟</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">سيتم استيراد رسائل ظاهرة من نسخة احتياطية. إذا قمت سابقا باستيراد هذه النسخة الاحتياطية فسوف يؤدي اسيترادها مرة أخرى إلى تكرار الرسائل.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">سيتم استيراد رسائل غير مشفرة من نسخة احتياطية. إذا قمت سابقا باستيراد هذا الملف فسوف يؤدي الاستيراد مرة أخرى إلى تكرار الرسائل.</string>
   <string name="ImportFragment_importing">الاستيراد جارٍ...</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">جارٍ استيراد نسخة احتياطية غير مشفرة...</string>
   <string name="ImportFragment_no_plaintext_backup_found">لم يتم العثور على نسخ احتياطية غير مشفرة!</string>
@@ -235,17 +240,17 @@
   <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>
-  <string name="PassphrasePromptActivity_ok_button_content_description">أرسل العبارة السرية </string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">عبارة سرية غير صحيحة!</string>
   <!--PlayServicesProblemFragment-->
   <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">تطبيق Google Play Service الذي قمت بتثبيته لا يعمل بشكل صحيح. رجاء إعادة تثبيته والمحاولة مرة أخرى.</string>
@@ -311,7 +316,7 @@
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 تم استلام رسالة تبادل مفاتيح مع إصدارة بروتوكول غير صحيحة.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-تم استلام رسالة مع مفتاح هوية مجهول. أنقر للمتابعة والإظهار</string>
+تم استلام رسالة بمفتاح هوية غير معلوم. أنقر للمتابعة والإظهار.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">تم استلام تحديث ولكن معلومات الهوية مجهولة. أنقر للتحقق من الهوية.</string>
   <string name="SmsMessageRecord_secure_session_ended">انتهى التشفير.</string>
   <string name="SmsMessageRecord_duplicate_message">رسالة مكررة.</string>
@@ -373,24 +378,30 @@
   <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>
   <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
   <string name="MessageNotifier_message_delivery_failed">فشل توصيل الرسالة.</string>
   <string name="MessageNotifier_failed_to_deliver_message">فشل توصيل الرسالة.</string>
   <string name="MessageNotifier_error_delivering_message">خطأ بالارسال</string>
   <string name="MessageNotifier_mark_all_as_read">اعتبر جميع الرسائل مقروءة</string>
+  <string name="MessageNotifier_mark_read">اعتبرها مقروءة</string>
   <string name="MessageNotifier_media_message">رسالة وسائط متعددة</string>
   <string name="MessageNotifier_reply">رَدّ</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">الردود السريعة غير متاحة عند قفل تيكست سيكيور</string>
   <string name="QuickResponseService_problem_sending_message">مشكلة في الإرسال!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">رسالة تيكست سيكيور جديدة</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">المحتويات مخفية</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">العبارة السرية القديمة:</string>
   <string name="change_passphrase_activity__new_passphrase">العبارة السرية الجديدة:</string>
   <string name="change_passphrase_activity__repeat_new_passphrase">تكرار العبارة السرية الجديدة:</string>
   <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">أدخل أسم أو رقم</string>
   <!--contact_selection_group_activity-->
   <string name="contact_selection_group_activity__no_contacts">لا توجد جهات اتصال.</string>
   <string name="contact_selection_group_activity__finding_contacts">تحميل جهات الاتصال...</string>
@@ -435,7 +446,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>
@@ -452,7 +463,7 @@
   <string name="database_upgrade_activity__updating_database">تحديث قاعدة البيانات...</string>
   <string name="export_fragment__export_plaintext_backup">تصدير نسخة احتياطية غير مشفرة</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-تصدير نسخة غير مشفرة لبطاقة الذاكرة الخارجية بصيغة متوافقة مع SMSBackup And Restore</string>
+تصدير نسخة غير مشفرة لبطاقة الذاكرة الخارجية بصيغة متوافقة مع \"SMSBackup And Restore\".</string>
   <string name="import_fragment__import_system_sms_database">استيراد قاعدة بيانات الرسائل بالنظام</string>
   <string name="import_fragment__import_the_database_from_the_default_system">استيراد قاعدة البيانات
 من تطبيق الرسائل الافتراضي لنظام التشغيل</string>
@@ -460,7 +471,8 @@
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
 استعادة نسخة احتياطية مشفرة من تيكست سيكيور.</string>
   <string name="import_fragment__import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">استيراد نسخة احتياطية غير مشفرة إلى ملف متوافق مع \"نسخ احتياطي واستعادة الرسائل\"</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+استيراد نسخة احتياطية غير مشفرة، متوافقة مع \"SMSBackup And Restore\".</string>
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">لا توجد صور</string>
   <!--message_recipients_list_item-->
@@ -500,6 +512,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>
@@ -569,9 +582,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>
@@ -582,6 +595,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="zero">%d صفر</item>
@@ -610,6 +629,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>
@@ -618,8 +638,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>
@@ -629,7 +649,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>
@@ -669,8 +689,9 @@
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">طلب تقرير تسليم لكل رسالة قصيرة ترسلها</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__trim_all_threads_now">تقليم كل المحادثات الآن</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">افحص كل المحادثات وافرض حد الطول لكل محادثة</string>
   <string name="preferences__light_theme">فاتح</string>
   <string name="preferences__dark_theme">داكن</string>
@@ -685,15 +706,21 @@
 رسائل مجانية وآمنة مع مستخدمي تيكست سيكيور وسيجنال</string>
   <string name="preferences__submit_debug_log">إرسال سجل التصحيح</string>
   <string name="preferences__support_wifi_calling">وضع التوافق مع \'مكالمات الواي فاي\'</string>
-  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">يمكنك تفعيل الخاصية إذا كان هاتفك يستخدم الواي فاي لتسليم الرسائل النصية والوسائط المتعددة ( قم بالتفعيل فقط في حال تفعيل الاتصال عبر الواي فاي بهاتفك)</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">يمكنك تفعيل الخاصية إذا كان هاتفك يدعم خاصية WiFi Calling لتسليم الرسائل النصية والوسائط المتعددة ( قم بالتفعيل فقط في حال تفعيل WiFi Calling بهاتفك)</string>
   <string name="preferences_app_protection__blocked_contacts">جهات الاتصال المحظورة</string>
+  <string name="preferences_notifications__display_in_notifications">أظهر في الإشعارات </string>
+  <string name="preferences_chats__when_using_mobile_data">عند استخدام بيانات الجوّال</string>
+  <string name="preferences_chats__when_using_wifi">عند استخدام واي فاي</string>
+  <string name="preferences_chats__when_roaming">عند استخدام التجوال</string>
+  <string name="preferences_chats__media_auto_download">تنزلي تلقائي للوسائط</string>
+  <string name="preferences_chats__message_trimming">تقليم الرسالة</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">أختر الكل</string>
   <string name="contact_selection_list__menu_unselect_all">إلغاء التحديد</string>
-  <string name="contact_selection_list__header_textsecure_users">مستخدمين تيكست سيكيور</string>
+  <string name="contact_selection_list__header_textsecure_users">مستخدمي تيكست سيكيور</string>
   <string name="contact_selection_list__header_other">جهات الاتصال</string>
   <string name="contact_selection_list__unknown_contact">رسالة جديدة إلى...</string>
   <!--contact_selection-->

res/values-be/strings.xml

@@ -215,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>
@@ -342,6 +340,7 @@
   <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>
@@ -554,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,6 +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_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>
@@ -38,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>
@@ -78,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>
@@ -141,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>
@@ -245,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>
@@ -389,7 +393,7 @@ 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>
@@ -404,11 +408,15 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Няма контакти.</string>
   <string name="contact_selection_group_activity__finding_contacts">Зареждане на контакти...</string>
@@ -454,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>
@@ -609,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>
@@ -622,6 +630,12 @@ 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>
+  <string name="arrays__images">Изображения</string>
+  <string name="arrays__audio">Аудио</string>
+  <string name="arrays__video">Видео</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d час</item>
@@ -656,7 +670,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>
@@ -706,6 +720,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <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>
@@ -724,6 +739,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Когато използвам мобилен интернет</string>
+  <string name="preferences_chats__when_using_wifi">Когато използвам Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Когато ползвам роуминг</string>
+  <string name="preferences_chats__media_auto_download">Автоматично теглене на мултимедия</string>
+  <string name="preferences_chats__message_trimming">Съкращаване на съобщенията</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-bo/strings.xml

@@ -1,269 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">གཡག་འཕྲིན། </string>
-  <string name="yes">ཡིན།</string>
-  <string name="no">མིན། </string>
-  <string name="delete">གསུབ། </string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">ད་ལྟ།:%s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ཁྱོད་ཀྱིས་གསང་ཚིག་བཟོས་མི་འདུག</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">ཁྱེད་ཀྱིས་མྱུར་དུ་ཉེ་འཆར་གྱི་འཕྲིན་ཐུང་དེའི་སླད་དུ་གླེང་མོལ་གྱི་སྐུད་པ་ཚང་མ་གཙང་བཟོ་བྱེད་ཀྱི་ཡིན་ནམ། </string>
-  <string name="ApplicationPreferencesActivity_delete">གསུབ། </string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">འདྲ་པར།</string>
-  <string name="AttachmentTypeSelectorAdapter_video">བརྙན་པར།</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">སྒྲ་ཟློས། </string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">འཕྲིན་ཐུང་ཆེ་ཆུང་།%d KB</string>
-  <string name="ConversationItem_expires_s">དུས་ཚོད་རྫོགས།%s</string>
-  <string name="ConversationItem_view_secure_media_question">ཉེན་སྲུང་ཡོད་པའི་བརྒྱུད་ལམ་ལ་ལྟོས། </string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">ནོར་འཁྲུལ། ལྡེ་མིག་རྙིང་པ་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན་འབྱོར་ཚར། དེ་རུ་ནོར་འཁྲུལ་འདུག </string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">%s དང་ལྷན་དུ་བདེ་འཇགས་ཀྱི་གླེང་མོལ་འགོ་རྩོམ་གྱི་ཡིན་ནམ།</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">ཁྱོད་ཀྱིས་གླེང་མོལ་འདི་གཏན་དུ་གསུབ་རྒྱུ་ཡིན་ནམ། </string>
-  <string name="ConversationActivity_add_attachment">ཟུར་སྣོན་ཁ་སྣོན་བྱོས། </string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">དགོངས་དག ཁྱོད་ཀྱི་ཟུར་སྣོན་ལ་སྒྲིག་བཟོ་བྱེད་པར་ནོར་འཁྲུལ་ཞིག་འདུག </string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">གཏོང་ས་དེར་གློག་འཕྲིན་ཁ་བྱང་ངམ་འཕྲིན་ཐུང་(SMS) ཁ་བྱང་ཚད་ལྡན་མི་འདུག </string>
-  <string name="ConversationActivity_message_is_empty_exclamation">འཕྲིན་ཐུང་སྟོང་པ་རེད་འདུག </string>
-  <string name="ConversationActivity_transport_textsecure">གཡག་འཕྲིན། </string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
-  <string name="ConversationFragment_success_exclamation">ལེགས་འགྲུབ། </string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ཁྱོད་ཀྱིས་དངོས་གནས་འཕྲིན་ཐུང་སྐུད་རིམ་འདེམས་པ་ཆ་ཚང་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
-  <string name="ConversationListFragment_deleting">གསུབ་་བཞིན་ཡོད།</string>
-  <string name="ConversationListFragment_deleting_selected_threads">འཕྲིན་ཐུང་སྐུད་རིམ་རྣམས་གསུབ་བཞིན་ཡོད།</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">ལྡེ་མིག་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན།</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">ཕྱི་འདྲེན་བྱོས། </string>
-  <string name="ExportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
-  <string name="ExportFragment_success">ལེགས་འགྲུབ། </string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">ནང་འདྲེན་བྱོས། </string>
-  <string name="ImportExportActivity_export">ཕྱི་འདྲེན་བྱོས། </string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_import">ནང་འདྲེན་བྱོས། </string>
-  <string name="ImportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་རྙེད་མི་ཐུབ།</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གསོག་ཉར་ལ་སྐྱོན་འདུག </string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་མཁོ་སྤྲོད་བྱེད་མཁན་ལ་འབྲེལ་ཐག་གི་སྐྱོན་འདུག </string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">གསང་ཚིག་རྙིང་པ་དེ་ནོར་འདུག </string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_continue">མུ་མཐུད། </string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <!--RegistrationService-->
-  <!--SmsMessageRecord-->
-  <!--ThreadRecord-->
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">ཁྱེད་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">གཏོང་ཡུལ་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">གཏོང་ཡུལ་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">གཤིབ་བསྡུར་ཆེད་ཁོང་ཚོའི་ལྡེ་མིག་ལ་བརྟག་ཞིབ་བྱོས། </string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">ངའི་ལྡེ་མིག་ཞིབ་བརྟག་ཚར་བ་བྱོས། </string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ཉེན་བརྡ། ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་དེ་མཚུངས་གི་མི་འདུག  མཛུབ་རིས་ཡི་གེ་དེར་གཟབ་ནན་ངང་ཞིབ་བཤེར་བྱོས།</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">ར་སྤྲོད་བྱས་མི་འདུག</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">གཞན་གྱི་ལྡེ་མིག་འགྲིག་འདུག  ཁྱེད་ཀྱི་ལྡེ་མིག་གཞན་དང་མཉམ་དུ་ར་སྤྲོད་བྱེད་དགོས་ངེས་རེད། </string>
-  <string name="VerifyIdentityActivity_verified_exclamation">ར་སྤྲོད་བྱས་ཟིན།</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">ཁྱེད་ལ་ངོ་འཛིན་ལྡེ་མིག་མི་འདུག</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">ཁྱེད་ལ་ངོས་འཛིན་ལྡེ་མིག་མི་འདུག</string>
-  <string name="ViewIdentityActivity_scan_to_compare">འགྲན་ཆེད་ཞིབ་བརྟག་བྱོས། </string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">གཤིབ་སྡུར་ཆེད་ཞིབ་བརྟག་བྱོས། </string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ཉེན་བརྡ། ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་དེ་མི་མཚུངས།</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་དེ་མཚུངས།</string>
-  <string name="ViewIdentityActivity_verified_exclamation">ར་སྤྲོད་བྱས་ཟིན།</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">ཁྱེད་ཀྱིས་གཏོང་ཡུལ་དེར་རེ་སྐུལ་ཞིག་བཏང་ཚར་འདུག ཁྱེད་ཀྱིས་ཡང་བསྐྱར་གཅིག་གཏོང་འདོད་དམ།  འདི་ཡིས་ཁྱེད་ཀྱི་རེ་སྐུལ་དང་པོ་དེ་རྩིས་མེད་གཏོང་གི་རེད། </string>
-  <string name="KeyExchangeInitiator_send">ཐོངས། </string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">གསང་སྡོམ་འཕྲིན་ཐུང་ཕན་མེད་ཞིག </string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">གསང་སྡོམ་བཤིག་བཞིན་ཡོད། ཅུང་སྒུག་དང་།</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">རྙེད་རྒྱུ་མེད་པའི་སྡེ་ཚན་ཞིག་གི་ཆེད་དུ་འཕྲིན་ཐུང་གསང་སྡོམ་བྱས་ཡོད། </string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་ MMS ཞབས་ཞུའི་ཡོ་ཆས་ལ་མཐུད་བཞིན་ཡོད།</string>
-  <string name="MmsDatabase_downloading_mms">བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་ MMS ཕབ་ལེན་བྱེད་བཞིན་ཡོད།</string>
-  <string name="MmsDatabase_downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད།</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS གསང་གྲོལ་བྱེད་བཞིན་ཡོད། ཅུང་སྒུག་རོགས། </string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">མཁོ་མེད་གསང་སྡོམ་བྱས་བའི་བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS </string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">སྡེ་ཚན་མི་མངོན་པ་དེའི་ཆེད་དུ་།  བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS གསང་སྡོམ་བྱས་འདུག </string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">ནང་འདྲེན་བྱེད་བཞིན་ཡོད། </string>
-  <!--KeyCachingService-->
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">འཕྲིན་ཐུང་བཏང་བ་དེ་འགྲོ་མི་འདུག </string>
-  <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>
-  <string name="MessageNotifier_error_delivering_message">འཕྲིན་ཐུང་གཏོང་བར་སྐྱོན་ཤོར་འདུག </string>
-  <!--QuickResponseService-->
-  <!--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-->
-  <string name="contact_selection_group_activity__no_contacts">འབྲེལ་མིང་མི་འདུག</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">ཆེད་དུ་འདེམས།</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">ཉེ་ཆར་ཁ་པར་བཏང་བ་མི་འདུག </string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">ཐོངས། </string>
-  <string name="conversation_activity__remove">ཕྱིར་ཕུད། </string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">ཕབ་ལེན་བྱོས། </string>
-  <string name="conversation_item_sent__downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད། </string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">ཕབ་ལེན་བྱོས། </string>
-  <string name="conversation_item_received__downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད། </string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__search">འཚོལ།</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">ཁྱེད་ཀྱིས་ད་ཡོད་འཕྲིན་ཐུང་ཡི་གེ་དེ་གཡག་འཕྲིན་གསང་སྡོམ་མཛོད་ཀྱི་ཁོངས་སུ་བཅུག་འདོད་འདུག་གམ། </string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">གཏན་འཇགས་མཛོད་ཀྱི་མ་ལག་དེར་ཕྱོགས་གང་ཅིའི་ཐད་ནས་འགྱུར་བ་གཏོང་ཐུབ་གི་མ་རེད། </string>
-  <string name="database_migration_activity__skip">བསྐྱུར། </string>
-  <string name="database_migration_activity__import">ནང་འདྲེན། </string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">འདི་ལ་དུས་ཚོད་ཅུང་ཙམ་འགོར་སྲིད། བཟོད་སྒོམ་གནང་རོགས། ནང་འདྲེན་ལེགས་འགྲུབ་བྱུང་མཚམས་ང་ཚོས་ཁྱོད་ལ་བརྡ་གཏོང་གི་ཡིན། </string>
-  <string name="database_migration_activity__importing">ནང་འདྲེན་བྱེད་བཞིན་པ། </string>
-  <!--database_upgrade_activity-->
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">སྒོ་ཕྱེས། </string>
-  <!--prompt_mms_activity-->
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <!--registration_problems-->
-  <!--registration_progress_activity-->
-  <!--recipients_panel-->
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">གཞན་གྱི་ངོས་འཛིན། (ཁོང་ཚོས་ཀློགས)</string>
-  <string name="verify_identity_activity__your_identity_you_read">ཁྱེད་ཀྱི་ངོས་འཛིན། (ཁྱེད་ཀྱིས་ཀློགས)</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__input_settings">ནང་འཇུག་སྒྲིག་བཟོ། </string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">འབྲེལ་ཐོ་ནས་ཁྱེད་ཀྱིས་འབྲེལ་བ་བྱེད་ས་དེ་གདེམས། </string>
-  <string name="preferences__change_passphrase">གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
-  <string name="preferences__change_my_passphrase">ངའི་གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">དུས་བརྒལ་གྱི་དབར་དྲན་ཐོ་ནས་གསང་ཚིག་བརྗེད། </string>
-  <string name="preferences__timeout_passphrase">གསང་ཚིག་གི་དུས་ཚོད་ཡོལ་འདུག</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__vibrate"> འདར་བཅུག</string>
-  <string name="preferences__also_vibrate_when_notified">བརྡ་གཏོང་སྐབས་འདར་བཅུག</string>
-  <string name="preferences__minutes">སྐར་མ།</string>
-  <string name="preferences__hours">དུས་ཚོད།</string>
-  <string name="preferences__green">ལྗང་ཁུ།</string>
-  <string name="preferences__red">དམར་པོ།</string>
-  <string name="preferences__blue">སྔོན་པོ།</string>
-  <string name="preferences__orange">ལི་ཁྲི།</string>
-  <string name="preferences__cyan">སྔོ་དཀར།</string>
-  <string name="preferences__magenta">རྒྱ་ཚོས་ཀྱི་ཚོས་གཞི།</string>
-  <string name="preferences__fast">མགྱོགས་པོ།</string>
-  <string name="preferences__normal">སྤྱིར་བཏང་། </string>
-  <string name="preferences__slow">དལ་བོ། </string>
-  <string name="preferences__custom">ཡུལ་སྲོལ། </string>
-  <string name="preferences__sms_delivery_reports">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གིས་སྙན་ཐོ་སྐྱེལ། </string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ཁྱེད་ཀྱིས་གཏོང་བའི་འཕྲིན་ཐུང་རེ་རེར་སྙན་ཐོ་སྐྱེལ་བའི་རེ་སྐུལ་བྱོས། </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__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>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">མཇུག་རྫོགས་སོ།</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">ཁ་པར་ཐོངས། </string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
-  <string name="conversation_context__menu_copy_text">ཡི་གེ་འདྲ་བཤུས་བྱོས། </string>
-  <string name="conversation_context__menu_delete_message">འཕྲིན་ཐུང་གསུབ།</string>
-  <string name="conversation_context__menu_forward_message">འཕྲིན་ཐུང་བརྒྱུད་འགྲེམ་བྱོས། </string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">ཉེན་སྲུང་།</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">འཚོལ།</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">ཉེན་སྲུང་།</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">ཟུར་སྣོན་ཞོག </string>
-  <string name="conversation__menu_delete_thread">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ།</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">འཕྲིན་ཐུང་འབྱོར་ཡུལ་གྱི་ཐོ་གཞུང་། </string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">ཞིབ་བསྡུར་བྱོས། </string>
-  <string name="key_scanning__menu_get_scanned_to_compare">ལྡེ་མིག་ཞིབ་བསྡུར་ཆེད་ཞིབ་བརྟག་བྱོས།</string>
-  <string name="key_scanning__menu_scan_to_compare">ཞིབ་བསྡུར་ཆེད་ཆེད་ཞིབ་བརྟག་བྱོས།</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">སྒྲིག་བཟོ།</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-ca/strings.xml

@@ -1,403 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">Si</string>
-  <string name="no">No</string>
-  <string name="delete">Esborra</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">Actualment: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Encara no has establert cap frase contrasenya!</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Esborrar ara els missatges antics?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Estàs segur que vols retallar immediatament tots els fils de conversa deixant només els %s missatges més recents?</string>
-  <string name="ApplicationPreferencesActivity_delete">Esborra</string>
-  <string name="ApplicationPreferencesActivity_disable">Desactiva</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connectant amb el servidor!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Habilitats</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toca per canviar la teva app d\'SMS predeterminada</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Deshabilitats</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Toca per fer TextSecure la teva app d\'SMS predeterminada</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">Fotografia</string>
-  <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">So</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Pot ser que vulguis verificar aquest contacte.</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Mida del missatge: %d KB</string>
-  <string name="ConversationItem_expires_s">Expira: %s</string>
-  <string name="ConversationItem_view_secure_media_question">Vols veure continguts segurs?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aquest contingut ha estat emmagatzemant en una base de dades encriptada. Desafortunadament, actualment per veure\'l amb un visor de continguts externs les dades han de ser temporalment desencriptades i escrites al disc. Estàs segur que vols fer això?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Error, s\'ha rebut un missatge d\'intercanvi de clau viciat.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">S\'ha rebut un missatge d\'intercanvi de clau, clica per processar-lo.</string>
-  <string name="ConversationItem_group_action_left">%1$s ha deixat el grup.</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar una sessió segura amb %s?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Estàs segur que vols finalitzar aquesta sessió segura?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Estàs segur que vols esborrar permanentment aquesta conversa?</string>
-  <string name="ConversationActivity_add_attachment">Afegeix un adjunt</string>
-  <string name="ConversationActivity_select_contact_info">Selecciona info del contacte</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ho sento, hi ha hagut un error establint el teu adjunt.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">El recipient no és una adreça de correu electrònic o SMS vàlid!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">El missatge és buit!</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d membres</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 membre</string>
-  <string name="ConversationActivity_invalid_recipient">Destinatari invàlid!</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Aquest dispositiu no sembla suportar accions de trucada.</string>
-  <string name="ConversationActivity_leave_group">Deixar el grup?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Estàs segur que vols deixar aquest grup?</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">Detalls del missatge</string>
-  <string name="ConversationFragment_success_exclamation">Èxit!</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Esborrar fils de conversa?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Estàs segur que vols esborrar TOTS els fils de conversa seleccionats?</string>
-  <string name="ConversationListFragment_deleting">Esborrant</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Esborrant els fils de conversa seleccionats...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Missatge d\'intercanvi de clau...</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">Exporta</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Alerta, això exportarà els continguts de text pla dels teus missatges TextSecure a la targeta SD.</string>
-  <string name="ExportFragment_cancel">Cancel·la</string>
-  <string name="ExportFragment_exporting">Exportant</string>
-  <string name="ExportFragment_success">Èxit!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_contacts_dont_support_push">Has seleccionat un contacte que no suporta grups de TextSecure, això farà que aquest grup sigui de MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">No estàs registrat per utilitzar el canal de dades, això farà que els grups de TextSecure estiguin desactivats.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">Ha passat un error inesperat que ha fet que la creació del grup hagi fallat.</string>
-  <string name="GroupCreateActivity_contacts_no_members">Necessites almenys una persona dins el teu grup!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Un dels membres del teu grup té un número que no pot ser llegit correctament. Si us plau corregeix o treu aquest contacte i intenta-ho de nou.</string>
-  <string name="GroupCreateActivity_creating_group">Creant %1$s…</string>
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">Importa</string>
-  <string name="ImportExportActivity_export">Exporta</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Això importarà els missatges des de la base de dades SMS del sistema a TextSecure. Si has importat prèviament els missatges de la base de dades SMS del sistema, importar-los de nou provocarà tenir missatges duplicats.</string>
-  <string name="ImportFragment_import">Importa</string>
-  <string name="ImportFragment_cancel">Cancel·la</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Restaurar una còpia de seguretat encriptada provocarà que es substitueixi completament les teves claus existents, preferències, i missatges. Perdràs qualsevol informació que sigui a la teva instal·lació de TextSecure i no hi sigui a la còpia de seguretat.</string>
-  <string name="ImportFragment_restore">Restaura</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Això importarà els missatges des d\'una còpia de seguretat en text pla. Si has importat prèviament la base de dades SMS del sistema, importar-la de nou provocarà la generació de missatges duplicats.</string>
-  <string name="ImportFragment_importing">Important</string>
-  <string name="ImportFragment_no_plaintext_backup_found">No s\'ha trobat la còpia de seguretat en text pla!</string>
-  <string name="ImportFragment_error_importing_backup">Error important la còpia de seguretat!</string>
-  <string name="ImportFragment_import_complete">Importació completada!</string>
-  <string name="ImportFragment_restoring">Restaurant</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Restaurant còpia de seguretat encriptada...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">No s\'ha trobat cap còpia de seguretat encriptada!</string>
-  <string name="ImportFragment_restore_complete">Restauració completa!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">No s\'ha trobat cap clau escanejada!</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">Error emmagatzemant MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Error connectant amb l\'operador de MMS...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Error llegint els ajustaments MMS de l\'operador inalàmbric\u2026</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase contrasenya antiga incorrecta!</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">Connecta amb TextSecure</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Has d\'especificar el teu codi de país</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Has d\'especificar el teu número de telèfon</string>
-  <string name="RegistrationActivity_invalid_number">Número invàlid</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">El número que has especificat (%s) és invàlid.</string>
-  <string name="RegistrationActivity_unsupported">No suportat</string>
-  <string name="RegistrationActivity_continue">Continua</string>
-  <string name="RegistrationActivity_edit">Edita</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Verificant número</string>
-  <string name="RegistrationProgressActivity_edit_s">Edita %s</string>
-  <string name="RegistrationProgressActivity_registration_complete">Registre complet!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Primer has d\'introduir el codi que has rebut...</string>
-  <string name="RegistrationProgressActivity_connecting">Connectant</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Connectant per verificar...</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">No s\'ha pogut connectar. Si us plau verifica la teva connexió de xarxa i intenta-ho de nou.</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">El codi de verificació que has enviat és incorrecte. Si us plau intenta-ho de nou.</string>
-  <string name="RegistrationProgressActivity_too_many_attempts">Massa intents</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Has enviat un codi de verificació incorrecte massa vegades. Si us plau espera un minut abans d\'intentar-ho de nou.</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Demanant una trucada de verificació...</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">El servidor ha trobat un error. Si us plau intenta-ho de nou.</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Ja has demanat recentment una trucada de veu. Pots tornar-la a demanar d\'aquí 20 minuts.</string>
-  <string name="RegistrationProgressActivity_registration_conflict">Conflicte de registre</string>
-  <!--RegistrationService-->
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">El registre a TextSecure s\'ha completat satisfactòriament.</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">El registre a TextSecure ha trobat un problema.</string>
-  <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">S\'ha rebut un missatge d\'intercanvi de claus corromput!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">S\'ha rebut un missatge d\'intercanvi de claus per una versió del protocol invàlida.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">S\'ha rebut un missatge d\'una clau d\'identitat desconeguda. Clica per processar-la i mostrar-la.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">S\'ha rebut informació actualitzada però desconeguda. Pica per validar l\'identitat.</string>
-  <string name="SmsMessageRecord_secure_session_ended">La sessió segura s\'ha acabat.</string>
-  <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Ha deixat el grup...</string>
-  <string name="TheadRecord_secure_session_ended">La sessió segura s\'ha acabat.</string>
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Tu no tens una clau d\'identitat.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">El destinatari no té clau d\'identitat.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">El destinatari no té clau d\'identitat!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Escaneja la seva clau per comparar</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Escaneja la meva clau</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ALERTA, la clau escanejada NO coincideix! Si us plau verifica el text de l\'empremta digital cuidadosament.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">NO Verificat!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">La seva clau és correcta, però també és necessari verificar la teva clau.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Verificat!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Tu no tens una clau d\'identitat!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Tu no tens una clau d\'identitat.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Escaneja per comparar</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Sigues escanejat per comparar</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ALERTA, la clau escanejada NO coincideix!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">La clau escanejada coincideix!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Verificat!</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ja has enviat una petició per iniciar una sessió a aquest destinatari, estàs segur que vols enviar-ne una altra? Això invalidarà la primera petició.</string>
-  <string name="KeyExchangeInitiator_send">Envia</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Missatge mal encriptat...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Desencriptant, si us plau espera...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Missatge encriptat per una sessió no existent...</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Connectant al servidor MMS...</string>
-  <string name="MmsDatabase_downloading_mms">Descarregant MMS...</string>
-  <string name="MmsDatabase_downloading">Descarregant...</string>
-  <string name="MmsDatabase_mms_pending_download">Pica i configura els ajustaments MMS per continuar la descàrrega.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">Desencriptant MMS, si us plau espera...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Missatge MMS mal encriptat...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Missatge MMS encriptat per una sessió no existent...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Importació en curs</string>
-  <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Toca per obrir.</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Toca per obrir, o toca el bloqueig per tancar.</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure està desbloquejat</string>
-  <string name="KeyCachingService_lock">Bloqueja amb una frase contrasenya</string>
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">Entrega del missatge fallida.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">No s\'ha pogut entregar el missatge.</string>
-  <string name="MessageNotifier_error_delivering_message">Error entregant el missatge.</string>
-  <string name="MessageNotifier_mark_all_as_read">Marca-ho tot com a llegit</string>
-  <!--QuickResponseService-->
-  <!--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-->
-  <string name="contact_selection_group_activity__no_contacts">Sense contactes.</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">Selecciona per</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">Sense trucades recents.</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">Envia</string>
-  <string name="conversation_activity__remove">Treu</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">Descàrrega</string>
-  <string name="conversation_item_sent__downloading">Descarregant</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">Descàrrega</string>
-  <string name="conversation_item_received__downloading">Descarregant</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Carregant països...</string>
-  <string name="country_selection_fragment__search">Cerca</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">No s\'han pogut recollir els registres del teu dispositiu. Encara pots utilitzar ADB per aconseguir els registres de depuració.</string>
-  <string name="log_submit_activity__thanks">Gràcies per la teva ajuda!</string>
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Vols importar tots el teus missatges de text existents a la base de dades encriptada de TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de dades predeterminada del sistema no serà modificada o alterada de cap manera.</string>
-  <string name="database_migration_activity__skip">Salta</string>
-  <string name="database_migration_activity__import">Importa</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Això pot tardar una mica. Si us plau sigues pacient, et notificarem quan la importació estigui completa.</string>
-  <string name="database_migration_activity__importing">IMPORTANT</string>
-  <!--database_upgrade_activity-->
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporta una còpia de seguretat en text pla compatible amb \'Còpia de seguretat i restauració d\'SMS\' a la targeta SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importa la base de dades
-des de l\'app de missatgeria predeterminada del sistema.</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Restaura una còpia de seguretat encriptada de TextSecure prèviament exportada.</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">Importa un arxiu de còpia de seguretat en text pla. Compatible amb \'Còpia de seguretat i restauració d\'SMS\'.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">En el teu telèfon són necessaris els ajustaments MMS manuals.</string>
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">Desbloqueja</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure necessita ajustaments MMS per entregar missatges de grup i multimèdia a través de l\'operador inalàmbric. El teu dispositiu no fa que aquesta informació estigui disponible, cosa que és certa ocasionalment en dispositius bloquejats o amb altres configuracions restringides.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per enviar missatges multimèdia i de grup, clica \'OK\' i completa els ajustaments demanats. Els ajustaments MMS de la teva operadora normalment poden ser trobats buscant \'latevaoperadora APN\'. Només necessitaràs fer això una vegada.</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <string name="registration_activity__your_country">EL TEU PAÍS</string>
-  <string name="registration_activity__your_country_code_and_phone_number">EL TEU CODI DE PAÍS I NÚMERO DE TELÈFON</string>
-  <string name="registration_activity__phone_number">NÚMERO DE TELÈFON</string>
-  <string name="registration_activity__register">Registra</string>
-  <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Alguns possibles problemes inclouen:</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">Alguns clients de missatgeria de text de tercers, com ara Handcent o GoSMS, es comporten inadequadament i intercepten tots els missatges SMS entrants. Verifica per veure si has rebut un missatge de text que comença per \'Your TextSecure verification code:\', en aquest cas necessitaràs configurar la teva app de missatgeria de tercers per deixar passar els missatges de text.</string>
-  <string name="registration_problems__incorrect_number">Número incorrecte.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">Si us plau verifica per estar segur que has introduït el teu número correctament, i està ajustat correctament per la teva regió.</string>
-  <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">TextSecure no funcionarà amb números de Google Voice.</string>
-  <!--registration_progress_activity-->
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">TextSecure també et pot trucar per verificar el teu número de telèfon. Pica \'Truca\'m\' i introdueix a sota el codi de sis dígits que sentis.</string>
-  <string name="registration_progress_activity__verify">Verifica</string>
-  <string name="registration_progress_activity__edit_number">Edita número</string>
-  <string name="registration_progress_activity__connectivity_error">Error de connectivitat.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure no s\'ha pogut connectar al servei push.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Alguns possibles problemes inclouen:</string>
-  <string name="registration_progress_activity__no_network_connectivity">No hi ha connexió de xarxa.</string>
-  <string name="registration_progress_activity__restrictive_firewall">Tallafocs restrictiu.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">TextSecure verificarà automàticament el teu número amb un missatge de confirmació SMS.</string>
-  <string name="registration_progress_activity__connecting">Connectant...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Esperant la verificació SMS...</string>
-  <string name="registration_progress_activity__registering_with_server">Registrant-se al servidor...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Això portarà una estona. Si us plau sigues pacient, et notificarem quan la verificació estigui completada.</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">S\'ha acabat el temps d\'espera de TextSecure mentre s\'esperava el missatge SMS de verificació.</string>
-  <string name="registration_progress_activity__sms_verification_failed">La verificació SMS ha fallat.</string>
-  <string name="registration_progress_activity__generating_keys">Generant claus...</string>
-  <!--recipients_panel-->
-  <string name="recipients_panel__add_member">Afegeix membre</string>
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">La seva identitat (ells llegeixen):</string>
-  <string name="verify_identity_activity__your_identity_you_read">La teva identitat (tu llegeixes):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">Canvia frase contrasenya</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">General</string>
-  <string name="preferences__enable_enter_key_title">Habilita la tecla Enter</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Escull el teu contacte de la llista de contactes</string>
-  <string name="preferences__change_passphrase">Canvia frase contrasenya</string>
-  <string name="preferences__change_my_passphrase">Canvia la meva frase contrasenya</string>
-  <string name="preferences__screen_security">Seguretat de pantalla</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Oblida la frase contrasenya de la memòria després d\'un interval de temps</string>
-  <string name="preferences__timeout_passphrase">Temps d\'espera de la frase contrasenya</string>
-  <string name="preferences__pref_timeout_interval_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>
-  <string name="preferences__sound">So</string>
-  <string name="preferences__change_notification_sound">Canvia el so de notificació</string>
-  <string name="preferences__inthread_notifications">Notificacions dins del fil</string>
-  <string name="preferences__vibrate">Vibra</string>
-  <string name="preferences__also_vibrate_when_notified">Vibra també en notificar</string>
-  <string name="preferences__minutes">minuts</string>
-  <string name="preferences__hours">hores</string>
-  <string name="preferences__green">Verd</string>
-  <string name="preferences__red">Vermell</string>
-  <string name="preferences__blue">Blau</string>
-  <string name="preferences__orange">Taronja</string>
-  <string name="preferences__cyan">Cian</string>
-  <string name="preferences__magenta">Magenta</string>
-  <string name="preferences__white">Blanc</string>
-  <string name="preferences__fast">Ràpid</string>
-  <string name="preferences__normal">Normal</string>
-  <string name="preferences__slow">Lent</string>
-  <string name="preferences__custom">Personalitzat</string>
-  <string name="preferences__advanced">Avançat</string>
-  <string name="preferences__override_system_mms_settings">Sobreescriu els ajustaments MMS del sistema amb la informació següent.</string>
-  <string name="preferences__sms_delivery_reports">Informes de lliurament de SMS</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demana un informe de lliurament en cada missatge SMS que enviïs</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Esborra automàticament els missatges antics una vegada el fil de conversa excedeixi la mida especificada</string>
-  <string name="preferences__delete_old_messages">Esborra missatges antics</string>
-  <string name="preferences__conversation_length_limit">Límit de mida de la conversació</string>
-  <string name="preferences__trim_all_threads_now">Escapça tots els fils ara</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Cerca en tots els fils de conversa i fes respectar els límits de mida de la conversació</string>
-  <string name="preferences__appearance">Aparença</string>
-  <string name="preferences__theme">Tema</string>
-  <string name="preferences__default">Predeterminat</string>
-  <string name="preferences__language">Idioma</string>
-  <string name="preferences__submit_debug_log">Envia un registre de depuració</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">Finalitzat</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">Truca</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Detalls del missatge</string>
-  <string name="conversation_context__menu_copy_text">Copia el text</string>
-  <string name="conversation_context__menu_delete_message">Esborra el missatge</string>
-  <string name="conversation_context__menu_forward_message">Reenvia el missatge</string>
-  <string name="conversation_context__menu_resend_message">Torna a enviar el missatge</string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">Seguretat</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">Cerca</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">Seguretat</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">Afegeix un adjunt</string>
-  <string name="conversation__menu_delete_thread">Esborra fil</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Llista de destinataris</string>
-  <string name="conversation_group_options__delivery">Lliurament</string>
-  <string name="conversation_group_options__conversation">Conversa</string>
-  <string name="conversation_group_options__broadcast">Difusió</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">Compara</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Sigues escanejat per comparar</string>
-  <string name="key_scanning__menu_scan_to_compare">Escaneja per comparar</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">Configuració</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Bloqueja</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-cs/strings.xml

@@ -12,6 +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_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>
@@ -38,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>
@@ -81,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>
@@ -128,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>
@@ -144,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>
@@ -243,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>
@@ -381,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>
@@ -396,11 +400,15 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Žádný kontakt</string>
   <string name="contact_selection_group_activity__finding_contacts">Načítám kontakty...</string>
@@ -446,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>
@@ -599,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>
@@ -612,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>
@@ -647,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>
@@ -697,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>
@@ -715,6 +730,7 @@ Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</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é kontakty</string>
+  <string name="preferences_notifications__display_in_notifications">Zobrazit v upozornění</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-de/strings.xml

@@ -10,18 +10,17 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s Nachrichten pro Unterhaltung</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Wollen Sie alle Unterhaltungen bis auf die letzten %s Nachrichten wirklich 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 wirklich alle Nachrichten in sämtlichen Unterhaltungen bis auf die letzten %s Nachrichten löschen?</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
-Nachrichtenvorschau in Benachrichtigungen anzeigen, obwohl Textsecure gesperrt ist</string>
+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>
@@ -41,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>
@@ -81,6 +80,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <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>
@@ -95,7 +95,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_calls_not_supported">Anrufe nicht unterstützt</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dieses Gerät scheint keine Wahlvorgänge zu unterstützen.</string>
   <string name="ConversationActivity_leave_group">Gruppe verlassen?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Wollen Sie diese Gruppe wirklich verlassen?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Wollen Sie wirklich diese Gruppe verlassen?</string>
   <string name="ConversationActivity_transport_insecure_sms">Unsichere SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Unsichere MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
@@ -115,7 +115,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationFragment_confirm_message_delete">Nachrichten löschen?</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Alle ausgewählten Nachrichten unwiderruflich löschen.</string>
   <string name="ConversationFragment_save_to_sd_card">Im Gerätespeicher speichern?</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Das Speichern der Datei im Gerätespeicher ermöglicht allen anderen installierten Apps darauf Zugriff.\n\nMöchten Sie trotzdem fortfahren?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Das Speichern der Datei im Gerätespeicher ermöglicht allen anderen installierten Apps darauf Zugriff.\n\nTrotzdem fortfahren?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Fehler beim Speichern des Anhangs im Gerätespeicher!</string>
   <string name="ConversationFragment_success_exclamation">Erfolgreich!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kein Schreibzugriff auf Gerätespeicher!</string>
@@ -144,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>
@@ -177,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>
@@ -193,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>
@@ -202,8 +202,7 @@ Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt Ihre bestehen
 Sie werden jegliche Informationen Ihrer jetzigen TextSecure-Installation verlieren, die nicht in dieser Datensicherung enthalten sind.</string>
   <string name="ImportFragment_restore">Wiederherstellen</string>
   <string name="ImportFragment_import_plaintext_backup">Klartextsicherung importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dies wird Nachrichten aus einer Klartext-Datensicherung importieren.
-Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedoppelten Nachrichten führen.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Importiert Nachrichten aus einer Klartext-Datensicherung in TextSecure. Falls Sie bereits zuvor diese Datensicherung importiert haben, wird es zu doppelten Nachrichten kommen.</string>
   <string name="ImportFragment_importing">Importieren</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Klartextsicherung wird importiert …</string>
   <string name="ImportFragment_no_plaintext_backup_found">Keine Klartextsicherung gefunden!</string>
@@ -215,8 +214,8 @@ Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedop
   <string name="ImportFragment_restore_complete">Wiederherstellung abgeschlossen!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Keinen scanbaren Schlüssel gefunden!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">App \"Barcode Scanner\" installieren?</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Für QR-Codes benötigt TextSecure die App \"Barcode Scanner\".</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">App „Barcode Scanner“ installieren?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Für QR-Codes benötigt TextSecure die App „Barcode Scanner“.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Versand fehlgeschlagen</string>
   <string name="MessageDetailsRecipient_new_identity">Neuer Schlüssel</string>
@@ -236,7 +235,7 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Das eingegebene alte Passwort ist falsch!</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Neues Passwort eingeben!</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">Dieses Gerät verbinden?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Dieses Gerät verknüpfen?</string>
   <string name="DeviceProvisioningActivity_cancel">ABBRECHEN</string>
   <string name="DeviceProvisioningActivity_continue">WEITER</string>
   <string name="DeviceProvisioningActivity_title">Gerät verbinden?</string>
@@ -244,13 +243,13 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="DeviceProvisioningActivity_content_bullets">
 - Alle Nachrichten lesen
 \n- Nachrichten in Ihrem Namen senden </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Gerät hinzufügen</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird hinzugefügt …</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Geräte wurde hinzugefügt!</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Gerät verknüpfen</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird verknüpft …</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Gerät verknüpft!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Kein Gerät gefunden.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netzwerkfehler.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ungültiger QR-Code.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Es sind bereits zu viele Geräte registriert. Versuchen Sie, mindestens eines zu entfernen …</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Es sind bereits zu viele Geräte verknüpft. Versuchen Sie, mindestens eines zu entfernen …</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Passwort eingeben</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-Symbol</string>
@@ -265,10 +264,10 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="RatingManager_no_thanks">Nein danke</string>
   <string name="RatingManager_later">Später</string>
   <!--RecipientPreferencesActivity-->
-  <string name="RecipientPreferenceActivity_block_this_contact_question">Diesen Kontakt blockieren?</string>
+  <string name="RecipientPreferenceActivity_block_this_contact_question">Kontakt blockieren?</string>
   <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Nachrichten dieses Kontakts werden nicht mehr angezeigt werden.</string>
   <string name="RecipientPreferenceActivity_block">Blockieren</string>
-  <string name="RecipientPreferenceActivity_unblock_this_contact_question">NIcht mehr 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>
@@ -332,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>
@@ -341,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>
@@ -381,7 +380,7 @@ 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_media_message_with_text">Mediennachricht: %s</string>
@@ -396,12 +395,15 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--QuickResponseService-->
   <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 oder Nummer eingeben</string>
+  <string name="contact_selection_activity__enter_name_or_number">Name/Rufnummer eingeben</string>
   <!--contact_selection_group_activity-->
   <string name="contact_selection_group_activity__no_contacts">Keine Kontakte.</string>
   <string name="contact_selection_group_activity__finding_contacts">Kontakte werden geladen …</string>
@@ -447,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>
@@ -464,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>
@@ -472,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-->
@@ -488,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-->
@@ -517,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>
@@ -527,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>
@@ -554,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__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>
@@ -580,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>
@@ -593,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>
@@ -614,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">Nachrichtenvorschau in Benachrichtigungen sperren, solange TextSecure gesperrt ist</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>
@@ -627,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>
@@ -677,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>
@@ -695,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">Multimediainhalte automatisch herunterladen</string>
+  <string name="preferences_chats__message_trimming">Unterhaltungen kürzen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -759,7 +775,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <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

@@ -36,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>
@@ -239,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>
@@ -371,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>
@@ -381,6 +377,7 @@ 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>
@@ -609,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,6 +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_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>
@@ -38,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>
@@ -82,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>
@@ -149,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>
@@ -260,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>
@@ -412,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>
@@ -427,11 +431,15 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">No hay contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">Cargando contactos...</string>
@@ -477,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>
@@ -650,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>
@@ -663,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>
@@ -697,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>
@@ -747,6 +761,7 @@ por SMS.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Solicita la confirmación de entrega de SMS para todos los SMS que envíe.</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Eliminar automáticamente los mensajes más antiguos cuando una conversación exceda el límite de longitud especificado</string>
   <string name="preferences__delete_old_messages">Eliminar mensajes antiguos</string>
+  <string name="preferences__chats">Chats y audiovisuales</string>
   <string name="preferences__conversation_length_limit">Límite de longitud de la conversación</string>
   <string name="preferences__trim_all_threads_now">Recortar todos los hilos ahora</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Escanear todas las conversaciones y forzar los límites de tamaño de conversación</string>
@@ -765,6 +780,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Al usar datos móviles</string>
+  <string name="preferences_chats__when_using_wifi">Al usar Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Al usar roaming</string>
+  <string name="preferences_chats__media_auto_download">Auto-descarga de audiovisuales</string>
+  <string name="preferences_chats__message_trimming">Recortado de mensaje</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -817,7 +838,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

@@ -1,647 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">Bai</string>
-  <string name="no">Ez</string>
-  <string name="delete">Ezabatu</string>
-  <string name="please_wait">Itxaron, mesedez...</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">Une honetan: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Oraindik ez duzu pasahitza ezarri!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mezu solasaldiko</string>
-  <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">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>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Ukitu TextSecure zure SMS aplikazio lehenetsia bihurtzeko</string>
-  <string name="ApplicationPreferencesActivity_on">piztuta</string>
-  <string name="ApplicationPreferencesActivity_On">Aktibatuta</string>
-  <string name="ApplicationPreferencesActivity_off">desaktibatuta</string>
-  <string name="ApplicationPreferencesActivity_Off">Desaktibatuta</string>
-  <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d minutu</string>
-  <!--DraftDatabase-->
-  <string name="DraftDatabase_Draft_image_snippet">(irudia)</string>
-  <string name="DraftDatabase_Draft_audio_snippet">(audioa)</string>
-  <string name="DraftDatabase_Draft_video_snippet">(bideoa)</string>
-  <!--AttchmentManager-->
-  <string name="AttachmentManager_cant_open_media_selection">Ezin dut topatu euskarria aukeratzeko aplikaziorik</string>
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">Irudia</string>
-  <string name="AttachmentTypeSelectorAdapter_video">Bideoa</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">Audioa</string>
-  <string name="AttachmentTypeSelectorAdapter_contact">Kontaktuaren informazioa</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Agian kontaktu hau egiaztatu beharko zenuke.</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">Mezuaren tamaina: %d KB</string>
-  <string name="ConversationItem_expires_s">Iraingutuko da: %s</string>
-  <string name="ConversationItem_view_secure_media_question">Euskarri segurua ikusi?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Media hau enkriptatutako datubase batean gorde da. Tamalez, aplikazioaz kanpoko edukien ikusle bat erabili ahal izateko, datuak tenporalki desenkriptatu behar dira eta diskoan gorde. Ziur zaude hau egin nahi izateaz?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Errorea, jaso da iraungita dagoen datu-trukerako gakoaren mezua.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Jaso da gakoaren datu-trukatzearen mezua, klik egin prozesatzeko</string>
-  <string name="ConversationItem_group_action_left">%1$s taldea utzi du</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Tap egin segurtasunik gabeko alternatibarako</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Enkriptatzerik gabeko SMSra pasatu aukera gisa?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Enkriptatzerik gabeko MMSra pasatu aukera gisa?</string>
-  <string name="ConversationItem_unable_to_open_media">Ezin dut aurkitu euskarri hau irekitzeko gai den aplikaziorik</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_question">Hasi saio segurua?</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">%s-(r)ekin saio segurua abiatu?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Saio segurua bukatzeko berrespena</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ziur zaude saio seguru hau bukatu nahi izateaz?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Haria ezabatzeko berrespena</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ziur zaude solasaldi hau behin betiko ezabatu nahi izateaz?</string>
-  <string name="ConversationActivity_add_attachment">Eranskina gehitu</string>
-  <string name="ConversationActivity_select_contact_info">Kontaktuaren informazioa aukeratu</string>
-  <string name="ConversationActivity_compose_message">Mezua idatzi</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Barkatu, zure eranskina ezartzean errore bat izan da</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Barkatu, aukeratutako bideoak amainaren mugak gainditzen ditu t(%1$skB).</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Barkatu, aukeratutako audioak mezuaren tamaina mugak gainditzen ditu  (%1$skB).</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Hartzailea SMS edo email baliogabea da!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">Mezua hutsik dago!</string>
-  <string name="ConversationActivity_group_conversation">Taldeko solasaldia</string>
-  <string name="ConversationActivity_unnamed_group">Izenik gabeko taldea</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d partaide</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">partaide 1</string>
-  <string name="ConversationActivity_saved_draft">Gordetako zirriborroa</string>
-  <string name="ConversationActivity_invalid_recipient">Hartzaile baliogabea!</string>
-  <string name="ConversationActivity_calls_not_supported">Deiak ez daude onartuta</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Badirudi gailu honek ez duela onartzen telefono deiekin lotutako ekintzak.</string>
-  <string name="ConversationActivity_leave_group">Taldea utzi?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Ziur zaude talde hau utzi nahi izateaz?</string>
-  <string name="ConversationActivity_transport_insecure_sms">SMS ez segurua</string>
-  <string name="ConversationActivity_transport_insecure_mms">MMS ez segurua</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <string name="ConversationActivity_get_with_it">Ondokoa lortu: %s</string>
-  <string name="ConversationActivity_error_leaving_group">Errorea taldea uzterakoan...</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">Mezuaren detaileak</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">Garraioa: %1$s\nBidalita/Jasota: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Bidaltzailea: %1$s\nGarraioa: %2$sIgorrita: %3$s\nJasota: %4$s</string>
-  <string name="ConversationFragment_confirm_message_delete">Berretsi mezuaren ezabaketa</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Ziur zaude aukeratutako mezu guztiak behin betiko ezabatu nahi izateaz?</string>
-  <string name="ConversationFragment_save_to_sd_card">Biltegian gorde?</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Media hau biltegian gordetzeak zure telefonoan dagoen beste edozein aplikazio ahalbidetuko du euskarrirako sarbidea.\n\nJarraitu?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Errorea eranskina biltegian gordetzerakoan!</string>
-  <string name="ConversationFragment_success_exclamation">Arrakasta!</string>
-  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Ezgai biltegian idazteko!</string>
-  <string name="ConversationFragment_saving_attachment">Eranskina gordetzen</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Eranskina biltegian gordetzen...</string>
-  <string name="ConversationFragment_mms">MMS</string>
-  <string name="ConversationFragment_sms">SMS</string>
-  <string name="ConversationFragment_deleting_messages">Mezuak ezabatzen...</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Hariak ezabatu?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ziur zaude aukeratutako solasaldi hari GUZTIAK ezabatu nahi izateaz?</string>
-  <string name="ConversationListFragment_deleting">Ezabatzen</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Aukeratutako hariak ezabatzen...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Gakoaren datu-trukerako mezua...</string>
-  <!--CustomDefaultPreference-->
-  <string name="CustomDefaultPreference_none">Bat ere ez</string>
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <string name="ShareActivity_share_with">Norekin konpartitu</string>
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">Esportatu</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Enkriptatu gabeko testua SD txartel batera esportatu?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Kontuz, ekintza honek
- zure TextSecure mezuen enkriptatu gabeko testua SD txartelera esportatuko du.
-</string>
-  <string name="ExportFragment_cancel">Utzi</string>
-  <string name="ExportFragment_exporting">Esportatzen</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Enkriptatu gabeko testua SD txartelera esportatzen...</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Errorea, ezgai SD txartelean idazteko!</string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Errorea SD txartelean idazterakoan.</string>
-  <string name="ExportFragment_success">Arrakasta!</string>
-  <!--GcmRefreshJob-->
-  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">TextSecuren behin betiko komunikazio akatsa</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure ez da gai izan Google Play Zerbitzuekin erregistratzeko.
-Datu kanalaren bitartezko komunikazioa desgaitu egin da, mesedez saiatu bererregistratzen TextSecure-eko ezarpenen menutik.</string>
-  <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_actionbar_title">Talde berria</string>
-  <string name="GroupCreateActivity_actionbar_update_title">Taldea eguneratu</string>
-  <string name="GroupCreateActivity_group_name_hint">Taldearen izena</string>
-  <string name="GroupCreateActivity_actionbar_mms_title">MMS talde berria</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">TextSecure taldeak onartzen ez duen kontaktu bat aukeratu duzu; beraz, talde hau MMS izango da.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Ez zaude erregistratuta datuen kanala erabiltzeko, hortaz TextSecure-eko taldeak ezgaituta daude.</string>
-  <string name="GroupCreateActivity_contacts_mms_exception">Ustekabeko errorea gertatu da eta eragin du taldea sortu ezin izatea.</string>
-  <string name="GroupCreateActivity_contacts_no_members">Gutxienez pertsona bat behar duzu zure taldean!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Zure taldeko partaide batek ondo irakurri ezin daitekeen zenbaki bat dauka. Mesedez, konpondu edo ezabatu kontaktua eta saiatu berriro.</string>
-  <string name="GroupCreateActivity_avatar_content_description">Taldearen abatarra</string>
-  <string name="GroupCreateActivity_menu_create_title">Taldea sortu</string>
-  <string name="GroupCreateActivity_creating_group">Sortzen %1$s...</string>
-  <string name="GroupCreateActivity_updating_group">Eguneratzen: %1$s...</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Ezin duzu TextSecurekoak ez diren kontaktuak gehitu TextSecureko talde batera</string>
-  <string name="GroupCreateActivity_loading_group_details">Taldearen detaileak kargatzen...</string>
-  <!--GroupMembersDialog-->
-  <string name="GroupMembersDialog_me">Ni</string>
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">Inportatu</string>
-  <string name="ImportExportActivity_export">Esportatu</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_import_system_sms_database">Inportatu sistemaren SMS datubasea?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Zure sisteman lehenetsitako SMS datubasearen mezuak inportatuko dira TextSecure-era. Lehenago inportatu baduzu sistemaren SMS datubasea, berriro egiteak mezu bikoiztuak sor ditzake.</string>
-  <string name="ImportFragment_import">Inportatu</string>
-  <string name="ImportFragment_cancel">Utzi</string>
-  <string name="ImportFragment_restore_encrypted_backup">Enkriptatutako babeskopia leheneratu?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-Enkriptatutako babeskopia bat leheneratzeak zure gakoak, ezapenak eta mezuak erabat 
-ordezkatuko ditu. Galduko duzu zure egungo TextSecure instalazioan dagoen edozein informazio, 
-baina ez babeskopian
-</string>
-  <string name="ImportFragment_restore">Leheneratu</string>
-  <string name="ImportFragment_import_plaintext_backup">Inportatu enkriptatu gabeko babeskopia?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Enkriptatu gabeko babeskopia
-batetik mezuak inportatuko dira. 
-Babeskopia hau lehenago inportatu baduzu, mezu bikoiztuak sortu daitezke.
-</string>
-  <string name="ImportFragment_importing">Inportatzen</string>
-  <string name="ImportFragment_no_plaintext_backup_found">Ez da enkriptatu gabeko babeskopiarik topatu!</string>
-  <string name="ImportFragment_error_importing_backup">Errorea babeskopia inportatzerakoan!</string>
-  <string name="ImportFragment_import_complete">Inportaketa bukatuta!</string>
-  <string name="ImportFragment_restoring">Leheneratzen</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Enkriptatutako babeskopia leheneratzen...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Ez da topatu enkriptatuko babeskopiarik!</string>
-  <string name="ImportFragment_restore_complete">Leheneratzea osatuta!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Ez da topatu eskaneatutako gakorik!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">Barcode Scanner instalatu?</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure-ek Barcode Scanner behar du QR kodeak irakurri ahal izateko.</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">Errorea MMS gordetzen!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Errorea MMS hornitzailearekin konentatzerakoan...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Errorea hari-gabeko hornitzailearen MMS ezarpenak irakurtzen...</string>
-  <!--NotificationMmsMessageRecord-->
-  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia mezua</string>
-  <!--MessageRecord-->
-  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Jaso duzun mezua TextSecuren bertsio zahar eta jadanik ez onartu bat erabiliz enkriptatu zen. Mesedez, eskatu bidaltzaileari bertsiorik berrienera eguneratu dadin eta mezua berbidali dezan. </string>
-  <string name="MessageRecord_left_group">Taldea utzi duzu.</string>
-  <string name="MessageRecord_updated_group">Taldea eguneratuta.</string>
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Pasahitzak ez datoz bat!</string>
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Pasahitz zahar ez zuzena!</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <string name="PassphrasePromptActivity_enter_passphrase">Pasahitza sartu</string>
-  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-ren ikonoa</string>
-  <string name="PassphrasePromptActivity_ok_button_content_description">Bidali pasahitza</string>
-  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Pasahitz baliogabea!</string>
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">TextSecure-ekin Konektatu</string>
-  <string name="RegistrationActivity_select_your_country">Zure herrialdea aukeratu</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Zure herrialdearen 
-kodea zehaztu behar duzu
-</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Zure telefono zenbakia 
-zehaztu behar duzu
-</string>
-  <string name="RegistrationActivity_invalid_number">Zenbaki baliogabea</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Zehaztu duzun 
-zenbakia (%s) baliogabea da.
-</string>
-  <string name="RegistrationActivity_unsupported">Ez onartua</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sentitzen dugu,
-baina gailu honek ez dago onartuta datuen bidezko mezulararitzarako. Android 4.0 bertsioa baino zaharragoa duten gailuek Google Kontu bat izan behar dute. 
-Android 4.0 edo berriagoa badute, ez da beharrezkoa Google Kontu bat izatea, baina Play Store-eko aplikakzioa instalatuta eduki behar da.</string>
-  <string name="RegistrationActivity_continue">Jarraitu</string>
-  <string name="RegistrationActivity_edit">Editatu</string>
-  <!--RegistrationProblemsActivity-->
-  <string name="RegistrationProblemsActivity_possible_problems">Aurreikusi daitezkeen arazoak</string>
-  <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Zenbakia egiaztatzen</string>
-  <string name="RegistrationProgressActivity_edit_s">Editatu %s</string>
-  <string name="RegistrationProgressActivity_registration_complete">Erregistratzea osatuta!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Lehenago jaso duzun kodea sartu behar duzu...</string>
-  <string name="RegistrationProgressActivity_connecting">Konektatzen</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Egiaztatzeko konektatzen...</string>
-  <string name="RegistrationProgressActivity_network_error">Sareko errorea!</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Konektatzeko ezgai. Mesedez, egiazta ezazu zure konexioa eta saiatu berriro.</string>
-  <string name="RegistrationProgressActivity_verification_failed">Egiaztapenak huts egin du!</string>
-  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Bidali duzun egiaztapen kodea ez da zuzena. Mesedez, saiatu berriro.</string>
-  <string name="RegistrationProgressActivity_too_many_attempts">Saio gehiegi</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Zuzena ez den egiaztapen gako bat aldi gehiegi bidali duzu. Mesedez, minutu bat itxaron berriro saitu baino lehenago.</string>
-  <string name="RegistrationProgressActivity_requesting_call">Deia eskatzen</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Sarrera egiaztapen deia eskatzen...</string>
-  <string name="RegistrationProgressActivity_server_error">Zerbitzariaren errorea</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Zerbitzariak errore bat topatu du. Mesedez, saiatu berriro.</string>
-  <string name="RegistrationProgressActivity_too_many_requests">Eskaera gehiegi!</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Duela gutxi ahotsezko dei bat eskatu duzu. Beste bat eska dezakezu 20 minutu barru.</string>
-  <string name="RegistrationProgressActivity_registration_conflict">Erregistratze gatazka</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Zenbaki hau beste TextSecure zerbitzari batean erregistratuta dago jadanik (CyanogenMod?) Deserregistratu behar duzu hemen erregistratu aurretik.</string>
-  <!--RegistrationService-->
-  <string name="RegistrationService_registration_complete">Erregistratzea osatuta</string>
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure-ren erregistratea arrakastaz osatu da.</string>
-  <string name="RegistrationService_registration_error">Erregistratze errorea</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure-ren erregistratzeak arazo bat topatu du.</string>
-  <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Mezuaren elkar-trukerako
- gakoa hondatuta dago!
-</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
-Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
-</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakusteko.
-</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Eguneratutako baina ezezaguna den nortasun informazioa jaso da. Ukitu nortasuna balidatzeko.</string>
-  <string name="SmsMessageRecord_secure_session_ended">Saio segurua bukatu da.</string>
-  <string name="SmsMessageRecord_duplicate_message">Mezu bikoiztua.</string>
-  <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Taldea utzita...</string>
-  <string name="TheadRecord_secure_session_ended">Saio segurua bukatu da</string>
-  <string name="ThreadRecord_draft">Zirriborroa:</string>
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Ez daukazu nortasun gakorik.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Hartzaileak ez dauka nortasun gakorik.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Hartzaileak ez dauka nortasun gakorik!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Eskaneatu beraien gakoa konparatzeko</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Eskaneatu nire gakoa</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">KONTUZ, eskaneatutako gakoa EZ DATOR BAT. Mesedez, aztarnaren testua kontu handiz aztertu.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">EZ Egiaztatua!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Beraien gakoa zuzena da. Beharrezkoa da zure gakoa beraiekin egiaztatzea ere.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">Egiaztatua!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Ez daukazu nortasun gakorik!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Ez daukazu nortasun gakorik.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Eskaneatu konparatzeko</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Eskaneatu konparatzeko</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">KONTUZ, eskaneatutako gakoa EZ DATOR BAT!</string>
-  <string name="ViewIdentityActivity_not_verified_exclamation">EZ egiaztatua!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Eskaneatutako gakoa bat dator!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">Egiaztatua!</string>
-  <string name="ViewIdentityActivity_my_identity_fingerprint">Nire nortasunaren aztarna</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Hasi nahiz eta beste eskaera bat indarrean egon?</string>
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Dagoeneko saioa hasteko eskaera bat bidali diozu hartzaile honi, ziur zaude beste bat bidali nahi izateaz? Honek lehenengo eskaera baliogabetuko luke.</string>
-  <string name="KeyExchangeInitiator_send">Bidali</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Gaizki enkriptatuako mezua...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">Desenkriptatzen, mesedez itxaron...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Esistitzen ez den saio baterako enkriptatutako mezua...</string>
-  <!--EncryptingSmsDatabase-->
-  <string name="EncryptingSmsDatabase_error_decrypting_message">Mezua desenkriptatzerakoan errorea.</string>
-  <!--ThreadDatabase-->
-  <string name="ThreadDatabase_error_decrypting_message">Mezua desenkriptatzerakoan errorea.</string>
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">MMS zerbitzari batekin konektatzen...</string>
-  <string name="MmsDatabase_downloading_mms">MMS behera kargatzen...</string>
-  <string name="MmsDatabase_mms_download_failed">MMS-aren behera kargatzeak huts egin du!</string>
-  <string name="MmsDatabase_downloading">Behera kargatzen...</string>
-  <string name="MmsDatabase_mms_pending_download">Ukitu eta MMSaren ezarpenak konfiguratu behera kargatzearekin jarraitzeko.</string>
-  <string name="MmsDatabase_error_decrypting_message">Mezua desenkriptatzerakoan errorea.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSa desenkriptatzen, mesedez itxaron...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Gaizki enkriptatuko MMS mezua...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS mezua enkriptatua esistitzen ez den saio baterako...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Inportaketa indarrean</string>
-  <string name="ApplicationMigrationService_importing_text_messages">Testu mezuak inportatzen</string>
-  <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Ukitu irekitzeko</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Ukitu irekitzeko, edo sarraila ukitu ixteko.</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure desblokeatuta dago</string>
-  <string name="KeyCachingService_lock">Blokeatu pasahitz bat erabiliz</string>
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_no_subject">(Ez dago gairik)</string>
-  <string name="MessageNotifier_message_delivery_failed">Mezuaren banaketak huts egin du.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">Mezuaren banaketak huts egin du.</string>
-  <string name="MessageNotifier_error_delivering_message">Errorea mezua banatzen.</string>
-  <string name="MessageNotifier_mark_all_as_read">Denak irrakurritako gisa markatu</string>
-  <string name="MessageNotifier_media_message">Media mezua</string>
-  <!--QuickResponseService-->
-  <!--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-->
-  <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_contact_photo">Kontaktuaren Argazkia</string>
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">Hautatu egiteko...</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">Ez dago azken deirik.</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Bidali TextSecure-eko mezua</string>
-  <string name="conversation_activity__type_message_sms_insecure">SMS ez segurua bidali</string>
-  <string name="conversation_activity__type_message_mms_insecure">MMS ez segurua bidali</string>
-  <string name="conversation_activity__send">Bidali</string>
-  <string name="conversation_activity__remove">Ezabatu</string>
-  <string name="conversation_activity__window_description">%1$s-(r)ekin solasaldia</string>
-  <string name="conversation_activity__compose_description">Mezuaren konposizioa</string>
-  <string name="conversation_activity__emoji_toggle_description">Emoji teklatua aktibatu/desaktibatu</string>
-  <!--conversation_item-->
-  <string name="conversation_item__mms_image_description">Media mezua</string>
-  <string name="conversation_item__secure_message_description">Mezu segurua</string>
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">Behera kargatu</string>
-  <string name="conversation_item_sent__downloading">Behera kargatzen</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Bidalketak huts egin du</string>
-  <string name="conversation_item_sent__pending_approval_description">Onespenaren Zain</string>
-  <string name="conversation_item_sent__delivered_description">Banatua</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">Behera kargatu</string>
-  <string name="conversation_item_received__contact_photo_description">Kontaktuaren argazkia</string>
-  <string name="conversation_item_received__downloading">Behera kargatzen</string>
-  <!--conversation_fragment_cab-->
-  <string name="conversation_fragment_cab__batch_selection_mode">Batch hautatzeko modua</string>
-  <string name="conversation_fragment_cab__batch_selection_amount">%s hautatua</string>
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Herrialdeak kargatzen...</string>
-  <string name="country_selection_fragment__search">Bilatu</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Ezin izan dira logak eskuratu zure gailutik. ADB erabili dezakezu arazketa logak lortzeko.</string>
-  <string name="log_submit_activity__thanks">Eskerrik asko zure laguntzagatik!</string>
-  <string name="log_submit_activity__submitting">Bidaltzen</string>
-  <string name="log_submit_activity__posting_logs">Logak gist-era bidaltzen...</string>
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Nahiko zenuke zure testu mezuak TextSecure-ren enkriptatutako datubasera inportatu?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Sistemaren lehenetsitako datubasea ez da inolako moduan aldatuko.</string>
-  <string name="database_migration_activity__skip">Saltatu</string>
-  <string name="database_migration_activity__import">Inportatu</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Honek denbora tarte bat har lezake. Mesedez, pazientzia izan, jakinaraziko dizugu inportatzea osatuta dagoenean.</string>
-  <string name="database_migration_activity__importing">INPORTATZEN</string>
-  <!--database_upgrade_activity-->
-  <string name="database_upgrade_activity__updating_database">Datubasea eguneratzen...</string>
-  <string name="export_fragment__export_plaintext_backup">Esportatu enkriptatu gabeko babeskopia</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-\'SMSBackup and Restorekin\' bateragarria den enkriptatu gabeko babeskopia bat esportatu SD txartelera.</string>
-  <string name="import_fragment__import_system_sms_database">Inportatu sistemaren SMS datubasea</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Inportatu datubasea sisteman lehenetsitako mezularitza aplikaziotik.</string>
-  <string name="import_fragment__import_encrypted_backup">Enkriptatutako babeskopia inportatu</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
-Aurretik enkriptatu eta esportatu den TextSecure babeskopia leheneratu.
-</string>
-  <string name="import_fragment__import_plaintext_backup">Enkriptatu gabeko babeskopia inportatu</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">
-Enkriptatu gabeko babeskopia bat inportatu. Bateragarria \'SMSBackup Eta Restore\'-ekin.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">MMS eskuzko ezarpenak behar dira zure telefonorako.</string>
-  <string name="MmsPreferencesFragment__enabled">Gaituta</string>
-  <string name="MmsPreferencesFragment__disabled">Ezgaituta</string>
-  <string name="MmsPreferencesFragment__not_set">Ez ezarria</string>
-  <string name="MmsPreferencesFragment__invalid_uri">Sartutako testua URI baliogabea da</string>
-  <string name="MmsPreferencesFragment__invalid_host">Sartutako testua host baliogabea da</string>
-  <!--GroupUtil-->
-  <string name="GroupUtil_joined_the_group">%1$s taldean sartu da.</string>
-  <string name="GroupUtil_group_updated">Taldea eguneratuta.</string>
-  <string name="GroupUtil_title_is_now">Izenburua \'%1$s\' da orain.</string>
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">Desblokeatu</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecurek MMS ezarpenak behar ditu media eta taldeko mezuak banatu ahal izateko zure hari-gabeko hornitzailearen bitartez. Zure gailuak ez dauka informazio hau eskuragarri. Hau batzuetan gertatzen da blokeatuta dauden eta beste konfigurazio murrizgarriak dituzten gailuetan.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Media eta taldeko mezuak bidaltzeko, klik egin \'OK\'-n eta osatu beharrezkoak diren ezarpenak. Zure hornitzailearentzako ezarpenak normalean topa daitezke zure hornitzailearen APNa bilatuz. Bakarrik behin egin beharko duzu hau.</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <string name="registration_activity__your_country">ZURE HERRIALDEA</string>
-  <string name="registration_activity__your_country_code_and_phone_number">ZURE HERRIALDEA ETA 
-TELEFONO ZENBAKIA
-</string>
-  <string name="registration_activity__phone_number">TELEFONO ZENBAKIA</string>
-  <string name="registration_activity__register">Erregistratu</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Erregistratzeak kontakturako informazioa igortzen du zerbitzarira. Ez da gordetzen.</string>
-  <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Aurreikusi daitezkeen arazo 
-batzuk ondokoak dira:
-</string>
-  <string name="registration_problems__sms_interceptors">SMSen pase-harrapatzaileak</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
-Hirugarren testu mezulararitzarako bezero batzuk, hala nola, Handcent edo GoSMS, gaizki jokatzen dute eta
-sartzen diren SMS mezu guztiak bidan atzematen dute. Egiaztatu zure mezuaren hasieran 
-\"Zure TextSecure egiaztapen kode:\" agertzen den. Hala bada, zure hirugarren testu mezulararitzarako aplikazioa konfiguratu beharko duzu mezuak pasatzen uzteko.</string>
-  <string name="registration_problems__incorrect_number">Zenbaki ez zuzena.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">Mesedez, egiazta ezazu zenbakia ondo sartu duzun, eta zure zonaldeari dagokion formatoan dagoen.</string>
-  <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">TextSecurek ez du funtzionatuko Google Voice-eko zenbakiekin.</string>
-  <!--registration_progress_activity-->
-  <string name="registration_progress_activity__voice_verification">Ahotsaren bidezko egiaztapena</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">TextSecurek, era berean, deitu diezazuke zure zenbakia egiaztatzeko. Ukitu \"Dei iezadazu\" eta sartu azpian entzungo duzun sei zenbakiko kodea.</string>
-  <string name="registration_progress_activity__verify">Egiaztatu</string>
-  <string name="registration_progress_activity__call_me">Dei iezadazu</string>
-  <string name="registration_progress_activity__edit_number">Zenbakia editatu</string>
-  <string name="registration_progress_activity__connectivity_error">Konexioaren errorea</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">TextSecure ez da gai izan push zerbitzuarekin konektatzeko.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Aurreikusi daitezkeen 
-arazo batzuk ondokoak dira:
-</string>
-  <string name="registration_progress_activity__no_network_connectivity">Ez dago s
-areko konexiorik.
-</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Zure
-gailuak sarerako konexioa behar du TextSecure-eko ezaugarri hau erabili ahal izateko. Egiaztatu
-konektatuta dagoen 3G edo Wi-Fi sare batekin.</string>
-  <string name="registration_progress_activity__restrictive_firewall">Firewall murrizgarria.</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
-Wi-Fi bidez konektatua bazaude, izan daiteke firewall bat TextSecure-eko zerbitzarirako sarrera blokeatzea. Saia zaitez beste sare edo mugikorreko datu konexioarekin.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-Orain TextSecure-ek zure zenbakia automatikoki egiaztatuko du SMS egiaztapen mezu bat bidaliz.</string>
-  <string name="registration_progress_activity__connecting">Konektatzen...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">SMS bidezko
-egiaztapenaren zain...
-</string>
-  <string name="registration_progress_activity__registering_with_server">Zerbitzariarekin erregistratzen...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Honek 
-denbora tarte bat har lezake. Mesedez, pazientzia izan, jakinaraziko dizugu egiaztapena osatuta dagoenean.
-</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
-TextSecure SMS bidez egiaztatzeko mezuaren zain zegoela denbora mugara iritsi da.
-</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS bidezko egiaztapenak 
-huts egin du.
-</string>
-  <string name="registration_progress_activity__generating_keys">Gakoak sortzen...</string>
-  <!--recipients_panel-->
-  <string name="recipients_panel__to"><small>Izen edo zenbaki bat sartu</small></string>
-  <string name="recipients_panel__add_member">Partaidea gehitu</string>
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Beraien nortasuna (beraiek irakurri dezatela):</string>
-  <string name="verify_identity_activity__your_identity_you_read">Zure nortasuna (zuk irakurri):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__create_passphrase">Pasahitza sortu</string>
-  <string name="AndroidManifest__enter_passphrase">Pasahitza sartu</string>
-  <string name="AndroidManifest__select_contacts">Kontaktuak hautatu</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure detektatua</string>
-  <string name="AndroidManifest__public_identity_key">Gako publikoaren nortasuna</string>
-  <string name="AndroidManifest__change_passphrase">Pasahitza aldatu</string>
-  <string name="AndroidManifest__verify_identity">Nortasuna egiaztatu</string>
-  <string name="AndroidManifest__log_submit">Arazketa logak bidali</string>
-  <string name="AndroidManifest__media_preview">Mediaren Aurrebista</string>
-  <!--arrays.xml-->
-  <string name="arrays__import_export">Inportatu / esportatu</string>
-  <string name="arrays__my_identity_key">Nire nortasunerako gakoa</string>
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">Orokorra</string>
-  <string name="preferences__sms_mms">SMS eta MMS</string>
-  <string name="preferences__pref_all_sms_title">Jaso SMS guztiak</string>
-  <string name="preferences__pref_all_mms_title">Jaso MMS guztiak</string>
-  <string name="preferences__input_settings">Sarreraren Ezarpenak</string>
-  <string name="preferences__enable_enter_key_title">Enter tekla gaitu</string>
-  <string name="preferences__replace_smiley_with_enter_key">Smiley tekla Enter teklaren bidez ordezkatu</string>
-  <string name="preferences__pref_enter_sends_title">Enter teklak bidaltzen duena</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter tekla sakatzeak testu mezuak bidaliko ditu</string>
-  <string name="preferences__display_settings">Bistaratze-ezarpenak</string>
-  <string name="preferences__choose_identity">Nortasuna aukeratu</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Hautatu zure kontaktua kontaktuen zerrendatik.</string>
-  <string name="preferences__change_passphrase">Pasahitza aldatu</string>
-  <string name="preferences__change_my_passphrase">Nire pasahitza aldatu</string>
-  <string name="preferences__enable_passphrase">Pasahitza gaitu</string>
-  <string name="preferences__screen_security">Pantailaren segurtasuna</string>
-  <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokeatu pantailazoak arestikoen zerrendan eta aplikazioaren barruan</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Ahaztu pasahitza memoriatik denbora tarte bat pasa ondoren</string>
-  <string name="preferences__timeout_passphrase">Denbora tartearen pasahitza</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Hautatu pasahitzaren iraungitze-denbora</string>
-  <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>
-  <string name="preferences__pref_led_blink_custom_pattern_title">LEDaren keinuka eredu pertsonalizatu bat ezarri</string>
-  <string name="preferences__pref_led_blink_custom_pattern_on_for">Zenbat denbora piztuta:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_off_for">Zenbat denbora itzalita:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">Personalizatutako LED keinu eredua ezarrita!</string>
-  <string name="preferences__sound">Soinua</string>
-  <string name="preferences__change_notification_sound">Aldatu jakinarazpenaren soinua</string>
-  <string name="preferences__inthread_notifications">Hari barruko jakinarazpenak</string>
-  <string name="preferences__vibrate">Bibratu</string>
-  <string name="preferences__also_vibrate_when_notified">Jakinarazpena denean ere bibratu</string>
-  <string name="preferences__minutes">minutuak</string>
-  <string name="preferences__hours">orduak</string>
-  <string name="preferences__green">Berdea</string>
-  <string name="preferences__red">Gorria</string>
-  <string name="preferences__blue">Urdina</string>
-  <string name="preferences__orange">Laranja</string>
-  <string name="preferences__cyan">Cyan</string>
-  <string name="preferences__magenta">Magenta</string>
-  <string name="preferences__white">Zuria</string>
-  <string name="preferences__none">Bat ere ez</string>
-  <string name="preferences__fast">Arina</string>
-  <string name="preferences__normal">Normala</string>
-  <string name="preferences__slow">Motela</string>
-  <string name="preferences__custom">Pertsonalizatua</string>
-  <string name="preferences__advanced">Aurreratua</string>
-  <string name="preferences__advanced_mms_access_point_names">MMS eskuzko ezarpenak</string>
-  <string name="preferences__enable_manual_mms">MMS eskuzko ezarpenak erabili</string>
-  <string name="preferences__override_system_mms_settings">Jaramonik ez sistemaren MMS ezarpenei azpian dagoen informazioa erabiliz.</string>
-  <string name="preferences__sms_delivery_reports">SMS banaketaren txostenak</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Bidaltzen duzun SMS mezu bakoitzeko banaketa txosten bat eskatu</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatikoki ezabatu mezu zaharragoak behin solasaldi hari batek ezarritako luzera gainditutakoan</string>
-  <string name="preferences__delete_old_messages">Mezu zaharrak ezabatu</string>
-  <string name="preferences__conversation_length_limit">Solasaldiaren luzera muga</string>
-  <string name="preferences__trim_all_threads_now">Hari guztiak garbitu orain</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Eskaneatu solasaldien hari guztiak eta derrigortu solasaldien luzera mugak.</string>
-  <string name="preferences__light_theme">Argia</string>
-  <string name="preferences__dark_theme">Iluna</string>
-  <string name="preferences__appearance">Itxura</string>
-  <string name="preferences__theme">Gaia</string>
-  <string name="preferences__default">Lehenetsia</string>
-  <string name="preferences__language">Hizkuntza</string>
-  <string name="preferences__submit_debug_log">Arazketaren log-a bidali</string>
-  <string name="preferences__support_wifi_calling">\'\"WiFi Calling\' modu bateragarria</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <string name="contact_selection_list__menu_select_all">Denak hautatu</string>
-  <string name="contact_selection_list__menu_unselect_all">Denak ez-hautatu</string>
-  <string name="contact_selection_list__header_textsecure_users">TEXTSECURE-eko ERABILTZAILEAK</string>
-  <string name="contact_selection_list__header_other">KONTAKTU GUZTIAK</string>
-  <string name="contact_selection_list__unknown_contact">Mezu berria honi...</string>
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">Bukatua</string>
-  <!--refreshing push directory from menu-->
-  <string name="push_directory__menu_refresh">Freskatu kontaktuen zerrenda</string>
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">Deitu</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Mezuaren detaileak</string>
-  <string name="conversation_context__menu_copy_text">Testua kopiatu</string>
-  <string name="conversation_context__menu_delete_message">Mezua ezabatu</string>
-  <string name="conversation_context__menu_forward_message">Birbidali mezua</string>
-  <string name="conversation_context__menu_resend_message">Mezua berbidali</string>
-  <!--conversation_context_image-->
-  <string name="conversation_context_image__save_attachment">Eraskina gorde</string>
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__menu_start_secure_session">Saio segurua hasi</string>
-  <string name="conversation_insecure__security">Segurtasuna</string>
-  <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Hautatutakoak ezabatu</string>
-  <string name="conversation_list_batch__menu_select_all">Denak hautatu</string>
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">Bilatu</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">Segurtasuna</string>
-  <string name="conversation_secure_verified__menu_verify_identity">Nortasuna egiaztatu</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Saio segurua bukatu</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">Eranskina gehitu</string>
-  <string name="conversation__menu_update_group">Taldea eguneratu</string>
-  <string name="conversation__menu_leave_group">Taldea utzi</string>
-  <string name="conversation__menu_delete_thread">Haria ezabatu</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <string name="conversation_add_to_contacts__menu_add_to_contacts">Kontaktuetara gehitu</string>
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Hartzaileen zerrenda</string>
-  <string name="conversation_group_options__delivery">Banatu</string>
-  <string name="conversation_group_options__conversation">Solasaldia</string>
-  <string name="conversation_group_options__broadcast">Difusioa</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">Konparatu</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Eskaneatu konparatzeko</string>
-  <string name="key_scanning__menu_scan_to_compare">Eskaneatu konparatzeko</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_new_message">Mezu berria</string>
-  <string name="text_secure_normal__menu_new_group">Talde berria</string>
-  <string name="text_secure_normal__menu_settings">Ezarpenak</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Blokeatu</string>
-  <string name="text_secure_normal__mark_all_as_read">Irakurritako gisa markatu guztiak</string>
-  <!--reminder_header-->
-  <string name="reminder_header_sms_default_title">Lehenetsitako SMS aplikazio gisa erabili?</string>
-  <string name="reminder_header_sms_import_title">Sistemaren SMSa inportatu?</string>
-  <string name="reminder_header_push_title">Gaitu TextSecure mezuak?</string>
-  <!--MediaPreviewActivity-->
-  <string name="MediaPreviewActivity_you">Zu</string>
-  <string name="MediaPreviewActivity_cant_display">Ezgai irudi honen aurrebista sortzeko</string>
-  <string name="MediaPreviewActivity_unssuported_media_type">Euskarri mota ez-onartua</string>
-  <!--media_preview-->
-  <string name="media_preview__save_title">Gorde</string>
-  <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Irudiaren Aurrebista</string>
-  <!--Trimmer-->
-  <string name="trimmer__deleting_old_messages">Mezu zaharrak ezabatzen...</string>
-  <string name="trimmer__old_messages_successfully_deleted">Mezu zaharrak ondo ezabatu dira</string>
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-fa/strings.xml

@@ -12,7 +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_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>
@@ -33,7 +36,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>
@@ -121,10 +124,11 @@
   <string name="CustomDefaultPreference_none">هیچ کدام</string>
   <!--DateUtils-->
   <string name="DateUtils_now">اکنون</string>
+  <string name="DateUtils_minutes_ago">%d دقیقه</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">قطع ارتباط \'%s\'؟</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>
   <!--ShareActivity-->
@@ -194,8 +198,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>
@@ -211,7 +213,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>
@@ -328,11 +332,13 @@
   <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-->
   <string name="contact_selection_group_activity__no_contacts">مخاطبی یافت نشد.</string>
   <string name="contact_selection_group_activity__finding_contacts">بارگیری لیست مخاطب‌ها</string>
@@ -472,6 +478,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>
@@ -484,6 +491,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>
@@ -515,7 +528,6 @@
   <string name="preferences__pref_timeout_interval_title">فاصله ایست</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">برنامه پس از چه مدت به طور خودکار رمز وارد شده را فراموش کند و قفل شود</string>
   <string name="preferences__notifications">اطلاعیه‌ها</string>
-  <string name="preferences__display_message_notifications_in_status_bar">نمایش اطلاعیه دریافت پیام در نوار وضعیت</string>
   <string name="preferences__led_color">رنگ چراغ ال‌ای‌دی</string>
   <string name="preferences__led_color_unknown">ناشناخته</string>
   <string name="preferences__pref_led_blink_title">الگوی چشمک زدن</string>
@@ -629,7 +641,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,6 +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_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>
@@ -38,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>
@@ -68,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>
@@ -81,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>
@@ -148,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>
@@ -251,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>
@@ -396,21 +400,24 @@ 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>
@@ -440,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">Ota pikakuva</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>
@@ -462,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>
@@ -605,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>
@@ -652,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>
@@ -702,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 liitetiedostot</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>
@@ -720,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">Mobiiliverkossa</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi-verkossa</string>
+  <string name="preferences_chats__when_roaming">Roaming-tilassa</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,6 +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_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>
@@ -39,7 +43,7 @@
   <!--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>
@@ -82,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>
@@ -145,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>
@@ -250,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>
@@ -395,9 +400,9 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="KeyCachingService_passphrase_cached">TextSecure est déverrouillé</string>
   <string name="KeyCachingService_lock">Verrouiller avec la phrase de passe</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d messages dans %2$d conversations</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nouveaux messages dans %2$d conversations</string>
   <string name="MessageNotifier_most_recent_from_s">Plus récent de : %1$s</string>
-  <string name="MessageNotifier_locked_message">Message bloqué...</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>
@@ -408,13 +413,17 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Aucun contact.</string>
   <string name="contact_selection_group_activity__finding_contacts">Chargement des contacts...</string>
@@ -438,7 +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">Capture instantanée</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>
@@ -460,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>
@@ -607,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>
@@ -620,6 +629,12 @@ 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>
+  <string name="arrays__images">Images</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Vidéo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d heure</item>
@@ -644,7 +659,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 blocage pour les messages</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>
@@ -654,7 +669,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>
@@ -704,6 +719,7 @@ par SMS.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatiquement les anciens messages lorsque la conversation dépasse un certaine taille.</string>
   <string name="preferences__delete_old_messages">Supprimer les anciens messages</string>
+  <string name="preferences__chats">Chats et médias</string>
   <string name="preferences__conversation_length_limit">Limite de taille de la conversation</string>
   <string name="preferences__trim_all_threads_now">Réduire toutes les conversations maintenant</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Parcourir toutes les conversations et appliquer la limite de taille de conversation</string>
@@ -721,8 +737,14 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Avec les donnes mobiles</string>
+  <string name="preferences_chats__when_using_wifi">Avec le WI-FI</string>
+  <string name="preferences_chats__when_roaming">Avec l’itinérance</string>
+  <string name="preferences_chats__media_auto_download">Auto-télécharger les contenus médias</string>
+  <string name="preferences_chats__message_trimming">Découpage des messages</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -777,7 +799,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-->
@@ -819,6 +841,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,6 +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_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>
@@ -38,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>
@@ -52,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>
@@ -78,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>
@@ -141,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>
@@ -243,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>
@@ -387,24 +393,30 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Nema kontakata.</string>
   <string name="contact_selection_group_activity__finding_contacts">Učitavanje kontakata...</string>
@@ -428,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>
@@ -449,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>
@@ -505,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>
@@ -514,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>
@@ -593,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>
@@ -606,6 +622,12 @@ 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>
+  <string name="arrays__images">Slike</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d sat</item>
@@ -631,6 +653,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>
@@ -640,7 +663,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>
@@ -690,6 +713,7 @@ neuspješno.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Traži potvrdu isporuke za svaki poslani SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatski obriši starije poruke nakon što razgovor pređe određenu duljinu</string>
   <string name="preferences__delete_old_messages">Obriši stare poruke</string>
+  <string name="preferences__chats">Razgovori i media</string>
   <string name="preferences__conversation_length_limit">Maksimalna duljina razgovora</string>
   <string name="preferences__trim_all_threads_now">Skrati sve teme sada</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skeniraj sve teme i primijeni maksimalnu duljinu razgovora</string>
@@ -708,6 +732,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Prilikom korištenja mobilnih podataka</string>
+  <string name="preferences_chats__when_using_wifi">Prilikom korištenja Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Prilikom roaminga</string>
+  <string name="preferences_chats__media_auto_download">Automatsko preuzimanje media sadržaja</string>
+  <string name="preferences_chats__message_trimming">Skraćivanje poruke</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -760,6 +790,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-->
@@ -803,5 +834,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,6 +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_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>
@@ -39,7 +42,7 @@
   <!--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>
@@ -83,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>
@@ -106,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>
@@ -141,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>
@@ -246,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>
@@ -279,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-->
@@ -298,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.
@@ -406,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>
@@ -421,11 +425,15 @@ 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-->
   <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>
@@ -449,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>
@@ -471,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>
@@ -635,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>
@@ -651,6 +659,12 @@ 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>
+  <string name="arrays__images">Képek</string>
+  <string name="arrays__audio">Hang</string>
+  <string name="arrays__video">Videó</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d óra</item>
@@ -659,8 +673,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>
@@ -685,7 +699,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>
@@ -695,7 +709,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>
@@ -735,6 +749,7 @@ sikertelen.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Kézbesítési jelentés kérése minden elküldött SMS esetén</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Régebbi üzenetek automatikus törlése, amikor egy beszélgetésfolyam túllép egy megadott hosszt</string>
   <string name="preferences__delete_old_messages">Régi üzenetek törlése</string>
+  <string name="preferences__chats">Csevegések és média</string>
   <string name="preferences__conversation_length_limit">Beszélgetés hosszának behatárolása</string>
   <string name="preferences__trim_all_threads_now">Minden beszélgetésfolyam csonkolása</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Minden beszélgetésfolyam átnézése és a beszélgetés határoló hossz érvényre juttatása</string>
@@ -753,14 +768,20 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Mobil adat használatakor</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi használatakor</string>
+  <string name="preferences_chats__when_roaming">Barangoláskor</string>
+  <string name="preferences_chats__media_auto_download">Média auto-letöltés</string>
+  <string name="preferences_chats__message_trimming">Üzenet trimmelés</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>
@@ -783,7 +804,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-->
@@ -804,7 +825,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>
@@ -824,7 +845,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,6 +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_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>
@@ -38,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>
@@ -78,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>
@@ -141,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>
@@ -246,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>
@@ -392,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>
@@ -407,11 +411,15 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Nessun contatto.</string>
   <string name="contact_selection_group_activity__finding_contacts">Caricamento contatti...</string>
@@ -456,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>
@@ -617,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>
@@ -630,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>
@@ -664,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>
@@ -714,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>
@@ -732,6 +747,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Su rete cellulare</string>
+  <string name="preferences_chats__when_using_wifi">Su Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">In roaming</string>
+  <string name="preferences_chats__media_auto_download">Download automatico file</string>
+  <string name="preferences_chats__message_trimming">Cancellazione messaggi</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-iw/strings.xml

@@ -1,331 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">כן</string>
-  <string name="no">לא</string>
-  <string name="delete">מחק</string>
-  <string name="please_wait">המתן בבקשה...</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">עכשיו: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">עדיין לא הגדרת סיסמה!</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_delete">מחק</string>
-  <string name="ApplicationPreferencesActivity_disable">בטל</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">אירעה שגיאה בחיבור לשרת!</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">תמונה</string>
-  <string name="AttachmentTypeSelectorAdapter_video">וידאו</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">שמע</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ייתכן שתרצה לאמת
-את איש הקשר הזה.
-</string>
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">גודל ההודעה: %d KB</string>
-  <string name="ConversationItem_expires_s">פג: %s</string>
-  <string name="ConversationItem_view_secure_media_question">לצפות במדיה מאובטחת?</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">שגיאה, התקבלה הודעת החלפת מפתח מיושנת.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">התקבלה הודעת החלפת מפתח, לחץ כדי להמשיך</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">להתחיל חיבור מאובטח עם %s?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">אתה בטוח שאתה רוצה למחוק את השיחה הזאת לתמיד?</string>
-  <string name="ConversationActivity_add_attachment">צרף קובץ</string>
-  <string name="ConversationActivity_select_contact_info">בחר מידע של איש קשר</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">סליחה, הייתה שגיאה בהצבת הקובץ המצורף שלך.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">הנמען אינו SMS או אימייל חוקיים!</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">ההודעה ריקה!</string>
-  <string name="ConversationActivity_invalid_recipient">נמען שגוי!</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">נראה כי מכשיר זה אינו תומך בפעולות חיוג.</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">פרטי הודעה</string>
-  <string name="ConversationFragment_success_exclamation">הצליח!</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">למחוק שרשורים?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">אתה בטוח שאתה רוצה למחוק את השרשורים של כל השיחות שנבחרו?</string>
-  <string name="ConversationListFragment_deleting">מוחק</string>
-  <string name="ConversationListFragment_deleting_selected_threads">מוחק שרשורים שנבחרו...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">הודעת החלפת מפתח...</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">יצא</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">אזהרה, פעולה זו
-תייצא את תוכן הודעות ה-TextSecure שלך לכרטיס ה-SD ללא הצפנה.
-</string>
-  <string name="ExportFragment_cancel">בטל</string>
-  <string name="ExportFragment_exporting">מייצא</string>
-  <string name="ExportFragment_success">הצליח!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">יבא</string>
-  <string name="ImportExportActivity_export">יצא</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">פעולה זו תייבא
-הודעות מבסיס הנתונים של ה-SMS ברירת המחדל של המערכת ל-TextSecure.
- אם כבר ייבאת מבסיס נתונים זה, ייבוא מחדש יגרום להודעות כפולות.</string>
-  <string name="ImportFragment_import">יבא</string>
-  <string name="ImportFragment_cancel">בטל</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-שחזור גיבוי מוצפן יחליף לגמרי את המפתחות, ההגדרות וההודעות הקיימות.
-אתה 
-תאבד את כל המידע שבהתקנת ה-TextSecure הנוכחית שלך אבל לא שבגיבוי.
-</string>
-  <string name="ImportFragment_restore">שחזר</string>
-  <string name="ImportFragment_importing">מייבא</string>
-  <string name="ImportFragment_no_plaintext_backup_found">לא נמצא גיבוי לא מוצפן!</string>
-  <string name="ImportFragment_error_importing_backup">שגיאה בייבוא הגיבוי!</string>
-  <string name="ImportFragment_import_complete">הייבוא הסתיים!</string>
-  <string name="ImportFragment_restoring">משחזר</string>
-  <string name="ImportFragment_restoring_encrypted_backup">משחזר גיבוי מוצפן...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">לא נמצא גיבוי מוצפן!</string>
-  <string name="ImportFragment_restore_complete">השחזור הסתיים!</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">לא נמצא מפתח סרוק!</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">שגיאה באחסון ה-MMS!</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">שגיאה בהתחברות לספק ה-MMS...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">שגיאה בקריאת הגדרות ה-MMS של ספק השירות...</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">סיסמה ישנה לא נכונה.</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_continue">המשך</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <!--RegistrationService-->
-  <!--SmsMessageRecord-->
-  <!--ThreadRecord-->
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">אין לך מפתח זהות.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">לנמען אין מפתח זהות.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">לנמען אין מפתח זהות!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">סרוק את המפתח שלהם כדי להשוות</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">סרוק את המפתח שלי</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">אזהרה, המפתח שנסרק אינו זהה! בבקשה בדוק בזהירות את הטקסט של טביעת האצבע.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">לא מאומת!</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">המפתח שלהם נכון. זה הכרחי גם לאמת את המפתח שלך איתם.</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">אומת!</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">אין לך מפתח זהות!</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">אין לך מפתח זהות.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">סרוק להשוואה</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">עבור סריקה להשוואה</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">אזהרה המפתח שנסרק אינו תואם!</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">המפתח שנסרק מתאים!</string>
-  <string name="ViewIdentityActivity_verified_exclamation">אומת!</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">אתה כבר שלחת בקשת אתחול חיבור לנמען הזה, אתה בטוח שאתה רוצה לשלוח עוד אחד? זה יבטל את הבקשה הראשונה.</string>
-  <string name="KeyExchangeInitiator_send">שלח</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">הודעה מוצפנת פגומה...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">מפענח, אנא המתן...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">ההודעה הוצפנה לחיבור שאינו קיים...</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">מתחבר לשרת ה-MMS...</string>
-  <string name="MmsDatabase_downloading_mms">מוריד MMS...</string>
-  <string name="MmsDatabase_downloading">מוריד...</string>
-  <string name="MmsDatabase_mms_pending_download">גע להגדרת תצורת ה-MMS ולהמשך הורדה.</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">מפענח MMS, אנא המתן...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">הודעת MMS מוצפנת פגומה...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">הודעת ה-MMS הוצפנה לחיבור שלא קיים...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">בתהליך ייבוא</string>
-  <!--KeyCachingService-->
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">מסירת ההודעה נכשלה.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">כישלון במסירת ההודעה.</string>
-  <string name="MessageNotifier_error_delivering_message">שגיאה במסירת ההודעה.</string>
-  <string name="MessageNotifier_mark_all_as_read">סמן הכל כנקרא</string>
-  <!--QuickResponseService-->
-  <!--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-->
-  <string name="contact_selection_group_activity__no_contacts">אין אנשי קשר.</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">בחר עבור</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">אין שיחות אחרונות.</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">שלח</string>
-  <string name="conversation_activity__remove">הסר</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">הורד</string>
-  <string name="conversation_item_sent__downloading">מוריד</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">הורד</string>
-  <string name="conversation_item_received__downloading">מוריד</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__search">חפש</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">אתה רוצה לייבא את הודעות הטקסט הקיימות שלך לבסיס הנתונים המוצפן של TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">בסיס הנתונים ברירת המחדל של המערכת לא ישתנה בשום אופן.</string>
-  <string name="database_migration_activity__skip">דלג</string>
-  <string name="database_migration_activity__import">יבא</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">זה יכול לקחת כמה רגעים. סבלנות בבקשה, אנחנו נודיע לך כשהייבוא הושלם.</string>
-  <string name="database_migration_activity__importing">מייבא</string>
-  <!--database_upgrade_activity-->
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-יצא גיבוי לא מוצפן שתואם את האפליקציה \'SMSBackup And Restore\' לכרטיס ה-SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">יבא את בסיס הנתונים
-מאפליקציית ברירת המחדל של המערכת.
-</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
-שחזר גיבוי מוצפן של TextSecure שיוצא בעבר.
-</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">
-יבא קובץ גיבוי לא מוצפן. תואם \'SMSBackup And Restore\'.</string>
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">נדרשות הגדרות MMS ידניות עבור מכשירך.</string>
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">פתח</string>
-  <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure דורש הגדרות MMS כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות דרך ספק השירות שלך. המכשיר שלך לא מספק את המידע הזה, זה קורה לעיתים במכשירים נעולים או קונפיגורציות מוגבלות אחרות.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות,לחץ \'אישור\' והשלם את ההגדרות המתבקשות.את הגדרות ה-MMS עבור ספק השירות שלך אתה יכול למצוא בד\"כ ע\"י חיפוש \"ספק השרות APN\". אתה תצטרך להשלים מידע זה רק פעם אחת.</string>
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <!--registration_problems-->
-  <!--registration_progress_activity-->
-  <!--recipients_panel-->
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">הזהות שלהם (הם קוראים):</string>
-  <string name="verify_identity_activity__your_identity_you_read">הזהות שלך (אתה קורא):</string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__change_passphrase">שנה סיסמה</string>
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__general">כללי</string>
-  <string name="preferences__input_settings">הכנס הגדרות</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">בחר איש קשר מאנשי הקשר.</string>
-  <string name="preferences__change_passphrase">שנה סיסמה</string>
-  <string name="preferences__change_my_passphrase">שנה סיסמה</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">שכח את הסיסמה מהזיכרון לאחר זמן מסויים </string>
-  <string name="preferences__timeout_passphrase">זמן תוקף לסיסמה</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">צבע LED</string>
-  <string name="preferences__pref_led_blink_title">תבנית הבהוב ה- LED</string>
-  <string name="preferences__sound">קול</string>
-  <string name="preferences__inthread_notifications">התראות תוך-שרשוריות</string>
-  <string name="preferences__vibrate">רטט</string>
-  <string name="preferences__also_vibrate_when_notified">הפעל רטט בקבלת התראה</string>
-  <string name="preferences__minutes">דקות</string>
-  <string name="preferences__hours">שעות</string>
-  <string name="preferences__green">ירוק</string>
-  <string name="preferences__red">אדום</string>
-  <string name="preferences__blue">כחול</string>
-  <string name="preferences__orange">כתום</string>
-  <string name="preferences__cyan">ציאן</string>
-  <string name="preferences__magenta">מגנטה</string>
-  <string name="preferences__fast">מהיר</string>
-  <string name="preferences__normal">רגיל</string>
-  <string name="preferences__slow">איטי</string>
-  <string name="preferences__custom">מותאם אישית</string>
-  <string name="preferences__advanced">מתקדם</string>
-  <string name="preferences__override_system_mms_settings">החלף את הגדרות ה-MMS של המערכת עם המידע הבא.</string>
-  <string name="preferences__sms_delivery_reports">דוחות מסירה של SMS</string>
-  <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__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>
-  <string name="preferences__appearance">מראה</string>
-  <string name="preferences__theme">ערכת נושא</string>
-  <string name="preferences__default">ברירת מחדל</string>
-  <string name="preferences__language">שפה</string>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">הושלם</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">התקשר</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">פרטי הודעה</string>
-  <string name="conversation_context__menu_copy_text">העתק טקסט</string>
-  <string name="conversation_context__menu_delete_message">מחק הודעה</string>
-  <string name="conversation_context__menu_forward_message">העבר הודעה</string>
-  <string name="conversation_context__menu_resend_message">שלח הודעה מחדש</string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">אבטחה</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">חפש</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">אבטחה</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">צרף קובץ</string>
-  <string name="conversation__menu_delete_thread">מחק שרשור</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">רשימת נמענים</string>
-  <string name="conversation_group_options__delivery">מסירה</string>
-  <string name="conversation_group_options__conversation">שיחה</string>
-  <string name="conversation_group_options__broadcast">שידור</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">השווה</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">עבור סריקה להשוואה</string>
-  <string name="key_scanning__menu_scan_to_compare">סרוק להשוואה</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">הגדרות</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-ja/strings.xml

@@ -12,6 +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_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>
@@ -38,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>
@@ -81,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>
@@ -144,16 +149,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>
@@ -242,13 +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_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>
@@ -380,7 +385,7 @@
   <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>
@@ -395,11 +400,15 @@
   <!--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-->
   <string name="contact_selection_group_activity__no_contacts">連絡先はありません。</string>
   <string name="contact_selection_group_activity__finding_contacts">連絡先を読み込み中…</string>
@@ -445,7 +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_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>
@@ -583,7 +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_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>
@@ -596,6 +605,12 @@ 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>
+  <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>
@@ -630,7 +645,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>
@@ -680,6 +695,7 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <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>
@@ -699,6 +715,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">モバイルデータ通信利用時</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi利用時</string>
+  <string name="preferences_chats__when_roaming">ローミング時</string>
+  <string name="preferences_chats__media_auto_download">メディアの自動ダウンロード</string>
+  <string name="preferences_chats__message_trimming">メッセージの要約</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-kn-rIN/strings.xml

@@ -12,7 +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_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>
@@ -32,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>
@@ -41,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>
@@ -126,6 +132,7 @@
   <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-->
@@ -218,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>
@@ -237,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>
@@ -350,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>
@@ -358,8 +364,10 @@
   <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>
@@ -543,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>
@@ -571,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>

res/values-ko/strings.xml

@@ -12,6 +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_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>
@@ -36,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>
@@ -75,6 +77,7 @@
   <string name="ConversationActivity_select_contact_info">연락처 선택</string>
   <string name="ConversationActivity_compose_message">메시지 작성</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">첨부에 오류가 있음</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">선택된 이미지 용량 초과</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">선택된 동영상이 메시지 크기 제한 (%1$skB)을 초과하여 전송할 수 없음</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">선택된 오디오가 메시지 크기 제한 (%1$skB)을 초과하여 전송할 수 없음</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">수신 주소는 유효한 SMS 또는 이메일 주소가 아님</string>
@@ -138,7 +141,17 @@
   <string name="DateUtils_now">방금 전</string>
   <string name="DateUtils_minutes_ago">%d분 전</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">%s을(를) 연결 해제하시겠습니까?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">연결 해제를 통해 메시지를 보내거나 받지 못할 수 있습니다.</string>
+  <string name="DeviceListActivity_network_connection_failed">네트워크에 연결되지 않습니다.</string>
+  <string name="DeviceListActivity_try_again">다시 시도</string>
+  <string name="DeviceListActivity_unlinking_device">기기 연결 해제 중…</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">기기 연결 해제</string>
+  <string name="DeviceListActivity_network_failed">네트워크에 연결되지 않음</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">이름이 없는 기기</string>
+  <string name="DeviceListItem_linked_s">연결: %s</string>
+  <string name="DeviceListItem_last_active_s">최근 사용: %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">공유 대상</string>
   <!--ExportFragment-->
@@ -216,19 +229,20 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">기존 암호가 잘못됨</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">새 암호가 입력되지 않음</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">해당 기기를 설정하시겠습니까?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">해당 기기를 연결하시겠습니까?</string>
   <string name="DeviceProvisioningActivity_cancel">취소</string>
   <string name="DeviceProvisioningActivity_continue">확인</string>
-  <string name="DeviceProvisioningActivity_title">해당 기기를 설정하시겠습니까?</string>
+  <string name="DeviceProvisioningActivity_title">해당 기기를 연결하시겠습니까?</string>
   <string name="DeviceProvisioningActivity_content_intro">액세스 권한</string>
   <string name="DeviceProvisioningActivity_content_bullets">- 내 메시지 읽기
 \n- 내 이름으로 메시지 보내기</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">기기 추가</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">새 기기를 추가 중…</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">기기 추가 완료</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">기기 연결</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">새 기기를 연결 중…</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">기기 연결 완료</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">기기 없음</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">네트워크 오류</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR코드가 잘못됨</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">기기 연결 가능 갯수 초과하여 기존의 기기 중 하나 연결 해제 필요</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">암호 입력</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 아이콘</string>
@@ -356,7 +370,7 @@
   <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>
@@ -371,11 +385,15 @@
   <!--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-->
   <string name="contact_selection_group_activity__no_contacts">연락처 없음</string>
   <string name="contact_selection_group_activity__finding_contacts">주소록 로드 중…</string>
@@ -421,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>
@@ -481,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>
@@ -501,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>
@@ -540,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>
@@ -552,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>
@@ -575,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>
@@ -584,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>
@@ -634,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>
@@ -651,6 +680,12 @@
   <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>
+  <string name="preferences_chats__when_using_mobile_data">모바일 데이터 사용할 때</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi 사용할 때</string>
+  <string name="preferences_chats__when_roaming">로밍할 때</string>
+  <string name="preferences_chats__media_auto_download">미디어 자동 다운로드</string>
+  <string name="preferences_chats__message_trimming">대화 줄이기</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-mk/strings.xml

@@ -39,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>
@@ -237,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>
@@ -381,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>
@@ -391,6 +386,7 @@
   <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>
@@ -631,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

@@ -1,265 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">TextSecure</string>
-  <string name="yes">ဟုတ်ကဲ့</string>
-  <string name="no">မလုပ်ပါ</string>
-  <string name="delete">ဖျက်ရန်</string>
-  <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">လက်ရှိ: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">စကားဝှက်မသတ်မှတ်ရသေးပါ</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_delete">ဖျက်ရန်</string>
-  <!--AppProtectionPreferenceFragment-->
-  <!--DraftDatabase-->
-  <!--AttchmentManager-->
-  <!--AttachmentTypeSelectorAdapter-->
-  <string name="AttachmentTypeSelectorAdapter_picture">ပုံ</string>
-  <string name="AttachmentTypeSelectorAdapter_video">ဗွီဒီယို</string>
-  <string name="AttachmentTypeSelectorAdapter_audio">အသံ</string>
-  <!--BlockedContactsActivity-->
-  <!--ConfirmIdentityDialog-->
-  <!--ContactsDatabase-->
-  <!--ConversationItem-->
-  <string name="ConversationItem_message_size_d_kb">စာတိုအရွယ်အစား: %d KB</string>
-  <string name="ConversationItem_expires_s">သက်တမ်းကုန်: %s</string>
-  <string name="ConversationItem_view_secure_media_question">လံုခြုံသောမီဒီယာကိုကြည့်မည်လား</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">ပြဿနာ၊ ရရှိလာတဲ့ ကီးအလဲအလှယ်စာသား လွဲနေပါသည်။</string>
-  <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">%s ဖြင့်လံုခြုံသောဆက်ရှင်အစပြုမည်လား?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">စကားစမြည်ပြောထားခြင်းကို အပြီးဖျက်မှာသေချာပြီလား</string>
-  <string name="ConversationActivity_add_attachment">ပူးတွဲမှုအားပေါင်းထည့်</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">ပူးတွဲပါဖိုင်တွင် ဆက်တင်အမှားရှိ.</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">လက်ခံသူသည်　မှန်ကန်သော SMS(သို့)အီးမေးလိပ်စာ　မဟုတ်</string>
-  <string name="ConversationActivity_message_is_empty_exclamation">စာတိုမရှိ</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
-  <!--ConversationFragment-->
-  <string name="ConversationFragment_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
-  <string name="ConversationFragment_success_exclamation">အောင်မြင်!</string>
-  <!--ConversationListActivity-->
-  <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">စကားဝိုင်းကိုဖျက်မည်လား</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">စကားဝိုင်းတွင်စကားစမည်ပြောထားသည်များကိုဖျက်မည်မှာသေချာပြီလား</string>
-  <string name="ConversationListFragment_deleting">ဖျက်နေသည်</string>
-  <string name="ConversationListFragment_deleting_selected_threads">ရွေးချယ်ထားသောစကားဝိုင်းကိုဖျက်နေသည်...</string>
-  <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
-  <!--CustomDefaultPreference-->
-  <!--DateUtils-->
-  <!--DeviceListActivity-->
-  <!--DeviceListItem-->
-  <!--ShareActivity-->
-  <!--ExportFragment-->
-  <string name="ExportFragment_export">ထုတ်ယူ</string>
-  <string name="ExportFragment_success">အောင်မြင်!</string>
-  <!--GcmRefreshJob-->
-  <!--GroupCreateActivity-->
-  <!--GroupMembersDialog-->
-  <!--ImportExportActivity-->
-  <string name="ImportExportActivity_import">သွင်းယူ</string>
-  <string name="ImportExportActivity_export">ထုတ်ယူ</string>
-  <!--ImportFragment-->
-  <string name="ImportFragment_import">သွင်းယူ</string>
-  <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">စိစစ်ထားသောကီးရှာမတွေ့</string>
-  <!--MessageDetailsRecipient-->
-  <!--MmsDownloader-->
-  <string name="MmsDownloader_error_storing_mms">MMS အားသိမ်းဆည်းခြင်းအမှား</string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">MMS ထောက်ပံ့သူသို့ဆက်သွယ်ခြင်းအမှား...</string>
-  <!--NotificationMmsMessageRecord-->
-  <!--MessageRecord-->
-  <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">စကားဝှက်အဟောင်းမမှန်ကန်</string>
-  <!--DeviceProvisioningActivity-->
-  <!--PassphrasePromptActivity-->
-  <!--PlayServicesProblemFragment-->
-  <!--RatingManager-->
-  <!--RecipientPreferencesActivity-->
-  <!--RegistrationActivity-->
-  <string name="RegistrationActivity_continue">ရှေ့ဆက်</string>
-  <!--RegistrationProblemsActivity-->
-  <!--RegistrationProgressActivity-->
-  <!--RegistrationService-->
-  <!--SmsMessageRecord-->
-  <!--ThreadRecord-->
-  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">လက်ခံသူတွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">လက်ခံသူ၌အသိအမှတ်ပြုကီးမရှိ</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">၎င်းတို့၏　ကီးများကို　နှိုင်းယှဉ်ရန်　စစ်ဆေးပါ</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">ကီးကိုစစ်ဆေးပြီးရယူရန်</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">သတိပေးချက်၊　စစ်ဆေးလိုက်သောကီးသည်　တူညီမှုမရှိ၊　ကျေးဇူးပြု၍　လက်ဗွေစာသားကို　ဂရုတစိုက်စစ်ပါ</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">မစိစစ်ရသေး</string>
-  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">၎င်းတို့ကီးမှန်ကန်၊ ၎င်းတို့ကဲ့သို့　သင့်ကီးအား　အတည်ပြုစိစစ်ရန်　လိုအပ်</string>
-  <string name="VerifyIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
-  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">သင့်မှာ　အသိအမှတ်ပြုကီးမရှိ</string>
-  <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
-  <string name="ViewIdentityActivity_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
-  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">သတိပေးချက်၊ ဖတ်ထားသည့် ကီးများ မကိုက်ညီပါ။</string>
-  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">ဖတ်ထားသည့်ကီးများ ကိုက်ပါသည်။</string>
-  <string name="ViewIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
-  <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">ဒီအဆက်အသွယ်ထံ ဆက်ရှင်စရန် တောင်းဆိုချက် ပို့ထားပြီးသားဖြစ်သည်။ ထပ်မံပို့မှာ သေချာလား။ ထပ်ပို့ပါက ယခင်ပို့ထားသော တောင်းဆိုချက်ကို ပယ်ဖျက်မည်ဖြစ်သည်</string>
-  <string name="KeyExchangeInitiator_send">ပို့</string>
-  <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">ဝှက်သိမ်းမှုလွဲမှားနေသောစာသား...</string>
-  <string name="MessageDisplayHelper_decrypting_please_wait">ဝှက်စာအားဖေါ်နေသည်၊ ခေတ္တစောင့်ပါ...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">စာသားများကို နဂိုမရှိသောဆက်ရှင်မားအတွက် ဝှက်သိမ်းထားပါသည်...</string>
-  <!--EncryptingSmsDatabase-->
-  <!--ThreadDatabase-->
-  <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">MMS　ဆာဗာသို့ချိတ်ဆက်နေသည်...</string>
-  <string name="MmsDatabase_downloading_mms">MMS အားကူးဆွဲနေသည်...</string>
-  <string name="MmsDatabase_downloading">ကူးဆွဲနေသည်...</string>
-  <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSမှဝှက်စာ ဖော်နေသည်၊ ခေတ္တစောင့်ပါ...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">ဝှက်ထားမှုလွဲနေသော MMS စာသား....</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS စာသားများကို နဂိုမရှိသောဆက်ရှင်အတွက် ဝှက်သိမ်းလိုက်ပါသည်...</string>
-  <!--MuteDialog-->
-  <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">သွင်းယူနေ</string>
-  <!--KeyCachingService-->
-  <!--MessageNotifier-->
-  <string name="MessageNotifier_message_delivery_failed">အကြောင်းကြားချက်ပို့လွတ်ခြင်းမအောင်မြင်</string>
-  <string name="MessageNotifier_failed_to_deliver_message">အကြောင်းကြားချက်ပို့လွတ်ရန်မအောင်မြင်</string>
-  <string name="MessageNotifier_error_delivering_message">အကြောင်းကြားချက်ပို့လွတ်စဉ်အမှား</string>
-  <!--QuickResponseService-->
-  <!--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-->
-  <string name="contact_selection_group_activity__no_contacts">အဆက်အသွယ်မရှိ</string>
-  <!--single_contact_selection_activity-->
-  <!--ContactSelectionListFragment-->
-  <string name="ContactSelectionlistFragment_select_for">အတွက်　ရွေးချယ်ပါ</string>
-  <!--blocked_contacts_fragment-->
-  <!--contact_selection_recent_activity-->
-  <string name="contact_selection_recent_activity__no_recent_calls">မကြာသေးမှီကခေါ်ဆိုထားမှုများမရှိ</string>
-  <!--conversation_title_view-->
-  <!--conversation_activity-->
-  <string name="conversation_activity__send">ပို့</string>
-  <string name="conversation_activity__remove">ဖယ်ပစ်</string>
-  <!--conversation_item-->
-  <!--conversation_item_sent-->
-  <string name="conversation_item_sent__download">ကူးဆွဲ</string>
-  <string name="conversation_item_sent__downloading">ကူးဆွဲနေသည်</string>
-  <!--conversation_item_received-->
-  <string name="conversation_item_received__download">ကူးဆွဲ</string>
-  <string name="conversation_item_received__downloading">ကူးဆွဲနေသည်</string>
-  <!--conversation_fragment_cab-->
-  <!--country_selection_fragment-->
-  <string name="country_selection_fragment__search">ရှာရန်</string>
-  <!--device_list_fragment-->
-  <!--log_submit_activity-->
-  <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">အသင်၏ ရှိရင်းစွဲ စာသားများကို Textsecure၏ ဝှက်သိမ်းထားသော ဒေတာဘေ့စ်ထဲသို့ တင်သွင်းမည်လား။</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">စနစ်ပိုင်းဆိုင်ရာ နဂိုဒေတာဘေ့စ်ကို ပြောင်းလဲမည် မဟုတ်ပါ</string>
-  <string name="database_migration_activity__skip">ကျော်</string>
-  <string name="database_migration_activity__import">သွင်းယူ</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">ခေတ္တကြာပါလိမ့်မယ်။ တင်သွင်းမှု ပြီးဆုံးသွားရင် အကြောင်းကြားပေးပါမယ်။</string>
-  <string name="database_migration_activity__importing">သွင်းယူနေ</string>
-  <!--database_upgrade_activity-->
-  <!--media_overview_activity-->
-  <!--message_recipients_list_item-->
-  <!--MmsPreferencesFragment-->
-  <!--GroupUtil-->
-  <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
-  <!--prompt_mms_activity-->
-  <!--recipient_preferences_activity-->
-  <!--recipient_preferences-->
-  <!--registration_activity-->
-  <!--registration_problems-->
-  <!--registration_progress_activity-->
-  <!--recipients_panel-->
-  <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">သူများ အိုင်ဒီ (သူများ အမြင်) - </string>
-  <string name="verify_identity_activity__your_identity_you_read">အသင့်အိုင်ဒီ (အသင့်အမြင်) - </string>
-  <!--message_details_header-->
-  <!--AndroidManifest.xml-->
-  <!--arrays.xml-->
-  <!--plurals.xml-->
-  <!--preferences.xml-->
-  <string name="preferences__input_settings">ကီးဘုတ်ပုံစံသတ်မှတ်ချက်များ</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">အဆက်အသွယ်ကို အဆက်အသွယ်စာရင်းမှ ရွေးယူပါ</string>
-  <string name="preferences__change_my_passphrase">ကျွန်ုပ်စကားဝှက်ကိုပြောင်းပါ</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">အချိန်တစ်ခုကြာပြီးနောက်မန်မိုရီပေါ်မှဝှက်စာကိုမေ့ပစ်ပါ</string>
-  <string name="preferences__timeout_passphrase">စကားဝှက် အချိန်လွန်</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">null</string>
-  <string name="preferences__vibrate">တုန်ခါမှု</string>
-  <string name="preferences__also_vibrate_when_notified">အချက်ပြစဉ်တုန်ခါပါ</string>
-  <string name="preferences__minutes">မိနစ်</string>
-  <string name="preferences__hours">နာရီ</string>
-  <string name="preferences__green">အစိမ်း</string>
-  <string name="preferences__red">အနီ</string>
-  <string name="preferences__blue">အပြာ</string>
-  <string name="preferences__orange">လိမ္မော်</string>
-  <string name="preferences__cyan">ခရမ်း</string>
-  <string name="preferences__magenta">ခရမ်းရင့်</string>
-  <string name="preferences__fast">အမြန်</string>
-  <string name="preferences__normal">ပုံမှန်</string>
-  <string name="preferences__slow">အနှေး</string>
-  <string name="preferences__custom">စိတ်ကြိုက်</string>
-  <string name="preferences__sms_delivery_reports">SMS ပို့ပြီးကြောင်းအသိပေးခြင်း</string>
-  <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__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>
-  <!--****************************************-->
-  <!--menus-->
-  <!--****************************************-->
-  <!--contact_selection_list-->
-  <!--contact_selection-->
-  <string name="contact_selection__menu_finished">ပြီးပါပြီ</string>
-  <!--refreshing push directory from menu-->
-  <!--conversation_callable-->
-  <string name="conversation_callable__menu_call">ခေါ်ရန်</string>
-  <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
-  <string name="conversation_context__menu_copy_text">စာသားကူးရန်</string>
-  <string name="conversation_context__menu_delete_message">စာတိုဖျက်ရန်</string>
-  <string name="conversation_context__menu_forward_message">စာတိုဆက်ပို့ရန်</string>
-  <!--conversation_context_image-->
-  <!--conversation_insecure-->
-  <!--conversation_insecure_no_push-->
-  <string name="conversation_insecure__security">လုံခြုံရေး</string>
-  <!--conversation_list_batch-->
-  <!--conversation_list-->
-  <string name="conversation_list__menu_search">ရှာရန်</string>
-  <!--conversation_list_item_view-->
-  <!--conversation_list_fragment-->
-  <!--conversation_secure_verified-->
-  <string name="conversation_secure_verified__menu_security">လုံခြုံရေး</string>
-  <!--conversation_muted-->
-  <!--conversation_unmuted-->
-  <!--conversation-->
-  <string name="conversation__menu_add_attachment">ပူးတွဲမှုအားပေါင်းထည့်</string>
-  <string name="conversation__menu_delete_thread">စာတွဲကိုဖျက်ပါ</string>
-  <!--conversation_popup-->
-  <!--conversation_callable-->
-  <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">လက်ခံမည့်သူစာရင်း</string>
-  <!--key_scanning-->
-  <string name="key_scanning__menu_compare">နှိုင်းယှဉ်</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
-  <string name="key_scanning__menu_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
-  <!--text_secure_normal-->
-  <string name="text_secure_normal__menu_settings">ဆက်တင်</string>
-  <!--reminder_header-->
-  <!--MediaPreviewActivity-->
-  <!--media_preview-->
-  <!--media_preview_activity-->
-  <!--Trimmer-->
-  <!--transport_selection_list_item-->
-  <!--quick_attachment_drawer-->
-  <!--EOF-->
-</resources>

res/values-nl/strings.xml

@@ -12,6 +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_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>
@@ -38,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>
@@ -77,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>
@@ -140,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>
@@ -238,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>
@@ -380,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>
@@ -395,11 +400,15 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Geen contacten.</string>
   <string name="contact_selection_group_activity__finding_contacts">Contacten laden...</string>
@@ -445,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>
@@ -589,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>
@@ -602,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>
@@ -636,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>
@@ -686,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>
@@ -705,6 +721,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Wanneer mobiele gegevensoverdracht gebruikt wordt</string>
+  <string name="preferences_chats__when_using_wifi">Wanneer Wi-Fi gebruikt wordt</string>
+  <string name="preferences_chats__when_roaming">Bij roaming</string>
+  <string name="preferences_chats__media_auto_download">Media automatisch downloaden</string>
+  <string name="preferences_chats__message_trimming">Bericht inkorten</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-no/strings.xml

@@ -12,6 +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_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>
@@ -38,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>
@@ -78,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>
@@ -141,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>
@@ -239,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>
@@ -380,7 +384,7 @@ 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>
@@ -395,11 +399,15 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
   <string name="contact_selection_group_activity__finding_contacts">Laster kontakter...</string>
@@ -445,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>
@@ -584,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>
@@ -597,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>
@@ -631,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>
@@ -681,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>
@@ -700,6 +715,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Ved bruk av mobil data</string>
+  <string name="preferences_chats__when_using_wifi">Ved bruk av Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Ved roaming</string>
+  <string name="preferences_chats__media_auto_download">Media auto-download</string>
+  <string name="preferences_chats__message_trimming">Meldingsavkorting</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-pl/strings.xml

@@ -12,6 +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_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>
@@ -38,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>
@@ -52,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>
@@ -78,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>
@@ -141,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>
@@ -239,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>
@@ -380,24 +387,30 @@ 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-->
   <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>
@@ -421,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>
@@ -442,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>
@@ -498,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>
@@ -507,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>
@@ -574,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>
@@ -587,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>
@@ -612,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>
@@ -621,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>
@@ -671,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>
@@ -689,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-->
   <!--****************************************-->
@@ -741,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-->
@@ -784,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,6 +12,10 @@
   <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_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>
   <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Descadastrando de mensagens TextSecure...</string>
@@ -39,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>
@@ -85,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>
@@ -148,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>
@@ -257,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>
@@ -409,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>
@@ -424,11 +429,15 @@ 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-->
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">Carregando contatos...</string>
@@ -474,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>
@@ -636,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>
@@ -649,6 +658,12 @@ 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>
+  <string name="arrays__images">Imagens</string>
+  <string name="arrays__audio">Áudio</string>
+  <string name="arrays__video">Vídeo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -683,7 +698,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>
@@ -733,6 +748,7 @@ falhou.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente excluir mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
   <string name="preferences__delete_old_messages">Excluir mensagens antigas</string>
+  <string name="preferences__chats">Chats e mídia</string>
   <string name="preferences__conversation_length_limit">Tamanho máximo de conversa</string>
   <string name="preferences__trim_all_threads_now">Apagar todas conversas agora</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verificar todas conversas e aplicar tamanho máximo de conversa</string>
@@ -752,6 +768,12 @@ 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>
+  <string name="preferences_chats__when_using_mobile_data">Quando usar dados móveis</string>
+  <string name="preferences_chats__when_using_wifi">Quando usar Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Quando em roaming</string>
+  <string name="preferences_chats__media_auto_download">Download automático de mídia</string>
+  <string name="preferences_chats__message_trimming">Aparar mensagem</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->