Bump version to 3.12.0

// FREEBIE

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,33 @@
+<!--
+Please note this is a bug tracker, not a support forum. If you need support, please use
+http://support.whispersystems.org/
+or email support@whispersystems.org
+
+Delete any sections that aren't relevant.
+-->
+
+<!-- mark with x between the [ ] -->
+I have:
+- [ ] searched open and closed issues for duplicates
+- [ ] read https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports
+
+### Bug description
+
+### Steps to reproduce
+- add your steps here
+- as a list
+- using hyphens
+
+### Screenshots
+<!-- Drag and drop images here, or post a link -->
+
+### Device info
+<!-- Replace examples with your info -->
+ **Model:** Manufacturer Model XVI
+
+ **Android version:** 0.0.0
+
+ **Signal version:** 0.0.0
+
+### Link to debug log
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!-- You can remove this section if you have contributed before -->
+### First time contributor checklist
+<!-- mark with x between the brackets -->
+- [ ] I have read [how to contribute](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md) to this project
+- [ ] I have signed the [Contributor Licence Agreement](https://whispersystems.org/cla/)
+
+### Contributor checklist
+<!-- mark with x between the brackets -->
+- [ ] I am following the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines)
+- [ ] I have tested my contribution on these devices:
+ * Device A, Android X.Y.Z
+ * Device B, Android Z.Y
+- [ ] My contribution is fully baked and ready to be merged as is
+- [ ] I have made the choice whether I want the Bithub reward or not by omitting or adding the word `FREEBIE` in my commit message
+
+----------
+
+### Description

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="172"
-      android:versionName="3.5.2">
+      android:versionCode="185"
+      android:versionName="3.12.0">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
 
@@ -92,10 +92,15 @@
     <application android:name=".ApplicationContext"
                  android:icon="@drawable/icon"
                  android:label="@string/app_name"
+                 android:supportsRtl="true"
                  tools:replace="android:allowBackup"
                  android:allowBackup="false"
                  android:theme="@style/TextSecure.LightTheme">
 
+    <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
+
     <meta-data android:name="com.google.android.gms.version"
                android:value="@integer/google_play_services_version" />
 
@@ -103,6 +108,7 @@
                android:value="GlideModule" />
 
     <activity android:name="org.thoughtcrime.redphone.RedPhone"
+              android:excludeFromRecents="true"
               android:screenOrientation="portrait"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
               android:launchMode="singleTask">
@@ -131,6 +137,12 @@
 
     <activity android:name=".DeviceProvisioningActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="tsdevice"/>
+        </intent-filter>
     </activity>
 
     <activity android:name=".preferences.MmsPreferencesActivity"
@@ -173,10 +185,25 @@
 
     </activity-alias>
 
+    <activity android:name=".ConversationListArchiveActivity"
+              android:label="@string/AndroidManifest_archived_conversations"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:parentActivityName=".ConversationListActivity">
+        <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+    </activity>
+
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:parentActivityName=".ConversationListActivity">
+        <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+    </activity>
 
     <activity android:name=".ConversationPopupActivity"
               android:windowSoftInputMode="stateVisible"
@@ -313,6 +340,7 @@
     </activity>
 
     <activity android:name="org.thoughtcrime.redphone.RedPhoneShare"
+              android:excludeFromRecents="true"
               android:theme="@style/NoAnimation.Theme.BlackScreen"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
@@ -420,7 +448,7 @@
 
     <receiver android:name=".notifications.WearReplyReceiver"
               android:enabled="true"
-              android:exported="true">
+              android:exported="false">
         <intent-filter>
             <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
         </intent-filter>
@@ -428,10 +456,12 @@
 
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
+              android:exported="false"
               android:authorities="org.thoughtcrime.provider.securesms" />
 
     <provider android:name=".providers.MmsBodyProvider"
               android:grantUriPermissions="true"
+              android:exported="false"
               android:authorities="org.thoughtcrime.provider.securesms.mms" />
 
     <receiver android:name=".service.RegistrationNotifier"

BUILDING.md

@@ -5,7 +5,8 @@ Basics
 ------
 
 Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.
+dependencies.  However, you needn't install it yourself; the
+"gradle wrapper" `gradlew`, mentioned below, will do that for you.
 
 Building Signal
 ---------------
@@ -19,12 +20,12 @@ The following steps should help you (re)build Signal from the command line.
 2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
 3. Ensure that the following packages are installed from the Android SDK manager:
     * Android SDK Build Tools
-    * SDK Platform
+    * SDK Platform (API level 22)
     * Android Support Repository
     * Google Repository
-4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.
+4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
 
-        sdk.dir=\<path to your sdk installation\>
+        sdk.dir=/Application/android-sdk-macosx
 
 5. Execute Gradle:
 

CONTRIBUTING.md

@@ -0,0 +1,88 @@
+# Contributing to Signal Android
+
+Thank you for deciding to help this project! If you have contributed to other open source projects before please note that some conventions here might be a bit different than what you have been used to. Reading this document will save you, other contributors and the developers time.
+
+
+## Development Ideology
+
+Truths which we believe to be self-evident:
+
+1. **The answer is not more options.**  If you feel compelled to add a preference that's exposed to the user, it's very possible you've made a wrong turn somewhere.
+1. **The user doesn't know what a key is.**  We need to minimize the points at which a user is exposed to this sort of terminology as extremely as possible.
+1. **There are no power users.** The idea that some users "understand" concepts better than others has proven to be, for the most part, false. If anything, "power users" are more dangerous than the rest, and we should avoid exposing dangerous functionality to them.
+1. **If it's "like PGP," it's wrong.**  PGP is our guide for what not to do.
+1. **It's an asynchronous world.**  Be wary of anything that is anti-asynchronous: ACKs, protocol confirmations, or any protocol-level "advisory" message.
+1. **There is no such thing as time.** Protocol ideas that require synchronized clocks are doomed to failure.
+
+
+## Translations
+
+Please do not submit issues or pull requests for translation fixes. Anyone can update the translations in [Transifex](https://www.transifex.com/projects/p/signal-android/). Please submit your corrections there.
+
+
+## Issues
+
+### Useful bug reports
+1. Please search both open and closed issues first to make sure your issue is not a duplicate.
+1. Read the [Submitting useful bug reports guide](https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug.
+
+### Issue tracker is for bugs
+The main purpose of this issue tracker is to track bugs for the Android client. Relevant, concise and to the point comments that help to solve the issue are very welcome.
+
+##### Send support questions to support
+Please do **not** ask support questions at the issue tracker. We want to help you using Signal and we have created our support system just for that. You can reach support by sending email to support@whispersystems.org or by going to our [Support Center](http://support.whispersystems.org). You can also search for existing troubleshooting articles at the [Support Center](http://support.whispersystems.org).
+
+##### Not a discussion forum
+Please do **not** use this issue tracker as a discussion forum. Discussion related to the bug in question should of course go to the issue itself. However other discussion should take place at the [community forum](https://whispersystems.discoursehosting.net). You can use that forum to discuss any Signal related topics or to just hang out with your fellow users.
+
+### Don't bump issues
+Every time someone comments on an issue, GitHub sends email to [everyone who is watching](https://github.com/WhisperSystems/Signal-Android/watchers) the repository (currently around 500 people). Thus bumping issues with :+1:s, _me toos_ or asking for updates just generate unnecessary email notifications. Moreover bumping an issue does not help solving it. Please be respectful to everyone's time and try to only comment when you have relevant new information to add.
+
+### Open issues
+
+#### If it's open it's tracked
+Have you followed all the points in the [Submitting useful bug reports guide](https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports) but nobody has commented on your issue? Is there no milestone or person assigned to it? Don't worry, the developers read every issue and if it's open it means it's tracked and taken into account. It might just take time as other issues have higher priorities. And remember that this is an open source project: Anyone is encouraged to take an active role in fixing open issues.
+
+### Closed issues
+
+#### "My issue was closed without giving a reason!"
+Please understand that writing detailed explanations every time for every issue someone comes up with takes time. Sometimes a reason has been posted earlier to another related issue which you can search for. It's also possible that your issue was not in line with the guidelines of the project (see especially the [Development Ideology](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md#development-ideology)). Or it was just simply decided that the issue is not something that Signal should do at this time.
+
+
+## Pull requests
+
+### Sign the Contributor Licence Agreement (CLA)
+You need to sign our CLA before your pull request can be merged. You can sign it at: https://whispersystems.org/cla/
+
+### Follow the Code Style Guidelines
+Before submitting a pull request please check that your code adheres to the [Code style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines).
+
+### Submit only complete PRs and test them
+Please do not submit pull requests that are still a work in progress. Pull requests should be ready for a merge when you submit them. Also please do not submit pull requests that you have not tested.
+
+### Smaller is better
+Please do not try to change too much at once. Big changes are less likely to be merged. If you are a first time contributor start with small and simple PRs to get to know the codebase.
+
+### Merging can sometimes take a while
+If your pull request follows all the advice above but still has not been merged it usually means the developers haven't simply had the time to review it yet. We understand that this might feel frustrating. We are sorry!
+
+### Bithub
+Accepted pull requests will be rewarded with Bitcoins! After your pull request has been merged you will automatically receive an email to the address you have specified as your Git commit email. Follow the instructions in the email to claim your coins. If you wish to submit your contribution for free please add the word `FREEBIE` in your Git commit message. You may wish to explore some previously merged commits to see how it all works.
+
+
+## How can I contribute?
+Any one can help by
+- advising new people about the guidelines of this project
+ - redirecting support questions to support@whispersystems.org and the [support site](http://support.whispersystems.org)
+ - redirecting non-bug related discussions to the [community forum](https://whispersystems.discoursehosting.net)
+- improving documentation at the [wiki](https://github.com/WhisperSystems/Signal-Android/wiki)
+- [translating](https://www.transifex.com/projects/p/signal-android/)
+- finding and marking duplicate issues
+- trying to reproduce issues
+- finding solutions to open issues and posting relevant findings as comments
+- submitting pull requests
+- testing other people's pull requests
+- spreading the joy of Signal to your friends and family
+- donating money to our [BitHub](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b) or through the [Freedom of the Press Foundation's donation page](https://freedom.press/bundle/encryption-tools-journalists)
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WhisperSystems/Signal-Android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

README.md

@@ -6,7 +6,7 @@ Signal uses your phone's data connection (WiFi/3G/4G) to communicate securely, o
 
 Currently available on the Play store.
 
-*[![Play Store Badge](https://developer.android.com/images/brand/en_app_rgb_wo_60.png)](https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms)*
+<a href="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" height=36px /></a>
 
 ## Contributing Bug reports
 We use GitHub for bug tracking. Please search the existing issues for your bug and create a new one if the issue is not yet tracked!
@@ -29,20 +29,16 @@ https://www.transifex.com/projects/p/signal-android/
 ## Contributing Code
 Instructions on how to setup your development environment and build Signal can be found in  [BUILDING.md](https://github.com/WhisperSystems/Signal-Android/blob/master/BUILDING.md).
 
-If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar.
+If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions.
 
-For larger changes and feature ideas, we ask that you propose it on the mailing list for a high-level discussion before implementation.
+For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://whispersystems.discoursehosting.net) for a high-level discussion with the wider community before implementation.
 
 This repository is set up with [BitHub](https://whispersystems.org/blog/bithub/), so you can make money for committing to Signal. The current BitHub price for an accepted pull request is:
 
 [![Current BitHub Price](https://bithub.herokuapp.com/v1/status/payment/commit/)](https://whispersystems.org/blog/bithub/)
 
 ## Contributing Ideas
-Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the mailing list!
-
-whispersystems@lists.riseup.net
-
-https://lists.riseup.net/www/info/whispersystems
+Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://whispersystems.discoursehosting.net).
 
 ## Contributing Funds
 [![Donate](https://cloud.githubusercontent.com/assets/3121306/11278543/d46e03d0-8eeb-11e5-9691-0da1bf643192.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b)
@@ -75,6 +71,6 @@ The form and manner of this distribution makes it eligible for export under the
 
 Copyright 2011 Whisper Systems
 
-Copyright 2013-2014 Open Whisper Systems
+Copyright 2013-2016 Open Whisper Systems
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html

build.gradle

@@ -36,12 +36,14 @@ repositories {
 dependencies {
     compile 'me.leolin:ShortcutBadger:1.1.0-WS1'
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
-    compile 'com.google.android.gms:play-services-base:6.5.87'
+    compile 'com.google.android.gms:play-services-gcm:8.1.0'
+    compile 'com.google.android.gms:play-services-maps:8.1.0'
+    compile 'com.google.android.gms:play-services-location:8.1.0'
     compile 'com.jpardogo.materialtabstrip:library:1.0.9'
     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.1'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.makeramen:roundedimageview:2.1.0'
     compile 'com.pnikosis:materialish-progress:1.5'
     compile 'de.greenrobot:eventbus:2.4.0'
@@ -68,9 +70,9 @@ dependencies {
     provided 'com.squareup.dagger:dagger-compiler:1.2.2'
 
     compile 'org.whispersystems:jobmanager:1.0.2'
-    compile 'org.whispersystems:libpastelog:1.0.6'
+    compile 'org.whispersystems:libpastelog:1.0.7'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'org.whispersystems:textsecure-android:1.8.3'
+    compile 'org.whispersystems:textsecure-android:1.8.6'
     compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0'
     compile 'com.google.zxing:core:3.2.1'
 
@@ -97,12 +99,14 @@ dependencyVerification {
     verify = [
             'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9',
             'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
-            'com.google.android.gms:play-services-base:832cb6b3130e871db6a412c4ab585656dbcc5e7948101f190186757785703f75',
+            'com.google.android.gms:play-services-gcm:757ecd2c837ac81c98f4cc7dc783e7454c6d0506f6cc66b10417126b675248c9',
+            'com.google.android.gms:play-services-maps:c58a9d98a98889fb0b27f78100f2d9341ed7722db24ccf832df62b6e8ce1b42e',
+            'com.google.android.gms:play-services-location:8226f778aa86bd15b9143f62425262cc53d64021990f62eb1aaec108d4e25f35',
             'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa',
             'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
             'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
             'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc',
-            'com.github.bumptech.glide:glide:4718ac4c57ebabe56e673dc3265950b9dbf940d1c43c0adc363e8b95c0abdf75',
+            'com.github.bumptech.glide:glide:76ef123957b5fbaebb05fcbe6606dd58c3bc3fcdadb257f99811d0ac9ea9b88b',
             'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1',
             'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54',
             'de.greenrobot:eventbus:61d743a748156a372024d083de763b9e91ac2dcb3f6a1cbc74995c7ddab6e968',
@@ -120,17 +124,19 @@ dependencyVerification {
             'com.doomonafireball.betterpickers:library:132ecd685c95a99e7377c4e27bfadbb2d7ed0bea995944060cd62d4369fdaf3d',
             'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
             'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
-            'org.whispersystems:libpastelog:550d33c565380d90f4c671e7b8ed5f3a6da55a9fda468373177106b2eb5220b2',
+            'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88',
             'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
-            'org.whispersystems:textsecure-android:aec5fc59952d9f5482491091091687816f46be1144342a0244f48fd55d6ab393',
+            'org.whispersystems:textsecure-android:0405821f479985677d6d5f4032eaaa732e04562c1975969cbaea37939030ec96',
             'com.h6ah4i.android.compat:mulsellistprefcompat:47167c5cb796de1a854788e9ff318358e36c8fb88123baaa6e38fb78511dfabe',
             'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
+            'com.google.android.gms:play-services-base:ef36e50fa5c0415ed41f74dd399a889efd2fa327c449036e140c7c3786aa0e1f',
             'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a',
             'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
             'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
             'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
-            'org.whispersystems:textsecure-java:b407ca6d1430204dfabf38e27db22d5177409072a9668238bd1877de7676ad3f',
+            'org.whispersystems:textsecure-java:d4ee0d0537693f82b7a9f76fe32cf6b61f79e27d8657a486ee4959b54b738c5a',
             'org.whispersystems:axolotl-android:40d3db5004a84749a73f68d2f0d01b2ae35a73c54df96d8c6c6723b96efb6fc0',
+            'com.google.android.gms:play-services-basement:e1d29b21e02fd2a63e5a31807415cbb17a59568e27e3254181c01ffae10659bf',
             'com.googlecode.libphonenumber:libphonenumber:9625de9d2270e9a280ff4e6d9ef3106573fb4828773fd32c9b7614f4e17d2811',
             'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
             'com.squareup.okhttp:okhttp:89b7f63e2e5b6c410266abc14f50fe52ea8d2d8a57260829e499b1cd9f0e61af',

contributing.md

@@ -1,31 +0,0 @@
-##Translations
-
-Please do not submit issues or pull requests for translation fixes. Anyone can update the translations in [Transifex](https://www.transifex.com/projects/p/textsecure-official/). Please submit your corrections there.
-
-## Submitting useful bug reports
-1. Search our issues first to make sure this is not a duplicate.
-1. Read the [Submitting useful bug reports guide](https://github.com/WhisperSystems/TextSecure/wiki/Submitting-useful-bug-reports) before posting a bug.
-
-## Development Ideology
-
-Truths which we believe to be self-evident:
-
-1. **The answer is not more options.**  If you feel compelled to add a
-   preference that's exposed to the user, it's very possible you've made
-   a wrong turn somewhere.
-1. **The user doesn't know what a key is.**  We need to minimize the points
-   at which a user is exposed to this sort of terminology as extremely as
-   possible.
-1. **There are no power users.** The idea that some users "understand"
-   concepts better than others has proven to be, for the most part, false.
-   If anything, "power users" are more dangerous than the rest, and we
-   should avoid exposing dangerous functionality to them.
-1. **If it's "like PGP," it's wrong.**  PGP is our guide for what
-   not to do.
-1. **It's an asynchronous world.**  Be wary of anything that is
-   anti-asynchronous: ACKs, protocol confirmations, or any protocol-level
-   "advisory" message.
-1. **There is no such thing as time.** Protocol ideas that require synchronized
-   clocks are doomed to failure. 
-
-Before you submit a pull request, please check if your code follows the [Code style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines).

res/drawable-ldrtl/actionbar_icon.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/actionbar_icon_holo_dark"
+          android:left="8dp"/>
+</layer-list>

res/drawable-v21/conversation_list_item_read_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_read_light" />
+        </selector>
+    </item>
+</ripple>

res/drawable-v21/conversation_list_item_read_background_dark.xml

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

res/drawable/actionbar_icon.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/actionbar_icon_holo_dark"
+          android:right="8dp"/>
+</layer-list>

res/drawable/conversation_list_item_read_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_read_light" />
+</selector>

res/drawable/conversation_list_item_read_background_dark.xml

@@ -2,4 +2,5 @@
 <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_read_dark" />
 </selector>

res/drawable/rounded_rectangle.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/transparent"/>
+    <stroke android:width="1dp" android:color="#ffbbbbbb"/>
+    <corners android:radius="5dp"/>
+    <padding android:bottom="5dp" android:left="5dp" android:right="5dp" android:top="5dp"/>
+</shape>

res/layout/alert_view.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools">
+
+    <ImageView
+        android:id="@+id/sms_failed_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_error_red_24dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
+
+    <ImageView
+        android:id="@+id/pending_approval_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_info_outline_grey600_24dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/conversation_item_sent__pending_approval_description" />
+
+</merge>

res/layout/attachment_type_selector.xml

@@ -132,17 +132,34 @@
             <TextView android:layout_marginTop="10dp"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
+                      android:gravity="center"
                       style="@style/AttachmentTypeLabel"
                       android:text="@string/attachment_type_selector__camera"/>
 
         </LinearLayout>
 
-        <LinearLayout android:layout_width="match_parent"
+        <LinearLayout android:id="@+id/location_linear_layout"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_weight="1"
                       android:gravity="center"
                       android:orientation="vertical">
 
+            <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/location_button"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:src="@drawable/ic_location_on_white_36dp"
+                    android:scaleType="center"
+                    android:elevation="4dp"
+                    app:circleColor="@color/blue_grey_400"/>
+
+            <TextView android:layout_marginTop="10dp"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      style="@style/AttachmentTypeLabel"
+                      android:text="@string/attachment_type_selector__location"/>
+
         </LinearLayout>
 
 
@@ -180,4 +197,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

res/layout/contact_filter_toolbar.xml

@@ -24,6 +24,7 @@
                       android:layout_width="0px"
                       android:layout_weight="1"
                       android:layout_marginLeft="5dp"
+                      android:layout_marginStart="5dp"
                       android:hint="@string/contact_selection_activity__enter_name_or_number"
                       android:inputType="textPersonName"
                       style="@style/TextSecure.TitleTextStyle"

res/layout/contact_selection_activity.xml

@@ -11,7 +11,7 @@
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:theme="@style/TextSecure.LightActionBar" />
+            android:theme="?attr/actionBarStyle" />
 
         <fragment android:id="@+id/contact_selection_list_fragment"
                   android:layout_width="match_parent"

res/layout/contact_selection_list_fragment.xml

@@ -29,6 +29,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:visibility="gone"
-        android:layout_gravity="right"/>
+        android:layout_gravity="end"/>
 
 </FrameLayout>

res/layout/contact_selection_list_item.xml

@@ -8,7 +8,6 @@
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:background="@drawable/conversation_list_item_background"
         android:paddingLeft="48dp"
         android:paddingRight="20dp">
 
@@ -18,8 +17,9 @@
             android:layout_height="40dp"
             android:foreground="@drawable/contact_photo_background"
             android:cropToPadding="true"
-            tools:src="@color/md_material_blue_600"
+            tools:src="@color/blue_600"
             android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
 
     <LinearLayout android:layout_width="0dp"
@@ -46,6 +46,7 @@
             <TextView android:id="@+id/number"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
+                      android:textDirection="ltr"
                       android:singleLine="true"
                       android:ellipsize="marquee"
                       android:textAppearance="?android:attr/textAppearanceSmall"
@@ -57,6 +58,7 @@
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:paddingLeft="10dip"
+                      android:paddingStart="10dip"
                       android:ellipsize="end"
                       android:singleLine="true"
                       android:textAppearance="?android:attr/textAppearanceSmall"

res/layout/conversation_activity.xml

@@ -46,6 +46,13 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center">
 
+                <org.thoughtcrime.securesms.components.location.SignalMapView
+                        android:id="@+id/attachment_location"
+                        android:layout_width="210dp"
+                        android:layout_height="210dp"
+                        android:layout_gravity="center_horizontal"
+                        android:visibility="gone"/>
+
                 <org.thoughtcrime.securesms.components.ThumbnailView
                         android:id="@+id/attachment_thumbnail"
                         android:layout_width="230dp"

res/layout/conversation_item_pending.xml

@@ -2,9 +2,8 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView android:id="@+id/pending_indicator"
-              android:layout_width="20dp"
+              android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:visibility="gone"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:fontFamily="sans-serif-light"
               android:textColor="?conversation_item_sent_text_secondary_color"

res/layout/conversation_item_pending_v11.xml

@@ -4,9 +4,8 @@
 
     <pl.tajchert.sample.DotsTextView
             android:id="@+id/pending_indicator"
-            android:layout_width="20dp"
+            android:layout_width="match_parent"
             android:layout_height="20dp"
-            android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:fontFamily="sans-serif-light"
             android:textColor="?conversation_item_sent_text_secondary_color"

res/layout/conversation_item_received.xml

@@ -41,7 +41,6 @@
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_toRightOf="@id/contact_photo"
-                      android:layout_toEndOf="@id/contact_photo"
                       android:layout_marginRight="35dp"
                       android:background="@drawable/received_bubble"
                       android:orientation="vertical">
@@ -109,31 +108,24 @@
                           android:orientation="horizontal"
                           android:gravity="left">
 
-                <ImageView android:id="@+id/sent_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:visibility="gone"/>
-
-                <ImageView android:id="@+id/delivered_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:visibility="gone" />
-
                 <ImageView android:id="@+id/secure_indicator"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center_vertical"
-                           android:paddingRight="4dp"
                            android:paddingTop="2dp"
+                           android:paddingRight="4dp"
+                           android:paddingEnd="4dp"
                            android:src="?menu_lock_icon_small"
                            android:contentDescription="@string/conversation_item__secure_message_description"
                            android:visibility="gone"
                            android:tint="?conversation_item_received_text_secondary_color"
                            android:tintMode="multiply"/>
 
-                <FrameLayout android:id="@+id/pending_indicator_stub"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"/>
+                <org.thoughtcrime.securesms.components.DeliveryStatusView
+                        android:id="@+id/delivery_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"/>
 
                 <TextView android:id="@+id/conversation_item_date"
                           android:layout_width="wrap_content"
@@ -145,35 +137,35 @@
                           android:textSize="@dimen/conversation_item_date_text_size"
                           android:fontFamily="sans-serif-light"
                           android:autoLink="none"
-                          android:linksClickable="false" />
+                          android:linksClickable="false"
+                          tools:text="Now"/>
+
+                <TextView android:id="@+id/sim_info"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_gravity="left"
+                          android:paddingTop="1dip"
+                          android:paddingLeft="4dp"
+                          android:paddingStart="4dp"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:textColor="?conversation_item_received_text_secondary_color"
+                          android:textSize="@dimen/conversation_item_date_text_size"
+                          android:fontFamily="sans-serif-light"
+                          android:autoLink="none"
+                          android:linksClickable="false"
+                          android:visibility="gone"
+                          tools:visibility="visible"
+                          tools:text="from SIM1"/>
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout android:id="@+id/indicators_parent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:orientation="vertical"
-            android:gravity="center_vertical">
-
-            <ImageView android:id="@+id/sms_failed_indicator"
+        <org.thoughtcrime.securesms.components.AlertView
+                android:id="@+id/indicators_parent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_action_warning_red"
-                android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description"
-                android:visibility="gone" />
-
-            <ImageView
-                    android:id="@+id/pending_approval_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_info_outline_grey600_24dp"
-                    android:visibility="gone"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/conversation_item_sent__pending_approval_description"
-                    tools:visibility="gone" />
-
-        </LinearLayout>
+                android:layout_alignParentRight="true"
+                android:orientation="vertical"
+                android:gravity="center_vertical"/>
 
         <TextView android:id="@+id/indicator_text"
                   android:layout_width="wrap_content"

res/layout/conversation_item_sent.xml

@@ -16,35 +16,15 @@
                     android:layout_marginBottom="6dp"
                     android:layout_marginRight="0dp">
 
-        <LinearLayout android:id="@+id/indicators_parent"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:orientation="vertical"
-                      android:gravity="left|center_vertical"
-                      android:layout_marginLeft="6dp"
-                      android:layout_alignParentLeft="true"
-                      android:layout_centerVertical="true">
-
-            <ImageView
-                android:id="@+id/sms_failed_indicator"
+        <org.thoughtcrime.securesms.components.AlertView
+                android:id="@+id/indicators_parent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_error_red_24dp"
-                tools:visibility="visible"
-                android:visibility="gone"
-                android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
-
-            <ImageView
-                android:id="@+id/pending_approval_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_info_outline_grey600_24dp"
-                android:visibility="gone"
-                android:layout_gravity="center_vertical"
-                android:contentDescription="@string/conversation_item_sent__pending_approval_description"
-                tools:visibility="visible" />
-
-        </LinearLayout>
+                android:orientation="vertical"
+                android:gravity="left|center_vertical"
+                android:layout_marginLeft="6dp"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"/>
 
         <LinearLayout android:id="@+id/body_bubble"
                       android:layout_width="wrap_content"
@@ -145,33 +125,30 @@
                           android:paddingBottom="2dp"
                           tools:text="30 mins" />
 
-                <FrameLayout android:id="@+id/pending_indicator_stub"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"/>
+                <TextView android:id="@+id/sim_info"
+                          android:autoLink="none"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:minWidth="15sp"
+                          android:linksClickable="false"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:layout_gravity="right"
+                          android:fontFamily="sans-serif-light"
+                          android:textColor="?conversation_item_sent_text_secondary_color"
+                          android:textSize="@dimen/conversation_item_date_text_size"
+                          android:paddingTop="1dip"
+                          android:paddingBottom="2dp"
+                          android:paddingLeft="4dp"
+                          android:paddingStart="4dp"
+                          android:visibility="gone"
+                          tools:visibility="visible"
+                          tools:text="to SIM1"/>
 
-                <ImageView android:id="@+id/sent_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical|end"
-                           android:src="@drawable/ic_done_white_18dp"
-                           android:paddingLeft="2dp"
-                           android:paddingBottom="2dp"
-                           android:visibility="gone"
-                           android:tint="?conversation_item_sent_text_secondary_color"
-                           android:tintMode="multiply"
-                           android:contentDescription="@string/conversation_item_sent__delivered_description" />
-
-                <ImageView android:id="@+id/delivered_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical|end"
-                           android:src="@drawable/ic_done_all_white_18dp"
-                           android:paddingLeft="2dp"
-                           android:paddingBottom="2dp"
-                           android:visibility="gone"
-                           android:tint="?conversation_item_sent_text_secondary_color"
-                           android:tintMode="multiply"
-                           android:contentDescription="@string/conversation_item_sent__delivered_description" />
+                <org.thoughtcrime.securesms.components.DeliveryStatusView
+                        android:id="@+id/delivery_status"
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"
+                        app:iconColor="?conversation_item_sent_text_secondary_color"/>
 
                 <ImageView android:id="@+id/secure_indicator"
                            android:layout_width="wrap_content"

res/layout/conversation_list_fragment.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+              xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               xmlns:fab="http://schemas.android.com/apk/res-auto"
               android:layout_width="fill_parent"
@@ -27,17 +28,14 @@
 
     </LinearLayout>
 
-    <com.melnykov.fab.FloatingActionButton
+    <android.support.design.widget.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:src="@drawable/ic_create_white_24dp"
             android:focusable="true"
-            android:contentDescription="@string/conversation_list_fragment__fab_content_description"
-            fab:fab_colorNormal="?fab_color"
-            fab:fab_colorPressed="@color/textsecure_primary_dark"
-            fab:fab_colorRipple="@color/textsecure_primary_dark" />
+            android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
 
-</FrameLayout>
+</android.support.design.widget.CoordinatorLayout>

res/layout/conversation_list_item_action.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.ConversationListItemAction
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="70dp">
+
+    <TextView android:id="@+id/description"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center"
+              android:textSize="14sp"
+              android:textStyle="bold"
+              tools:text="Archived conversations (2)"/>
+
+</org.thoughtcrime.securesms.ConversationListItemAction>

res/layout/conversation_list_item_view.xml

@@ -4,7 +4,6 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:background="@drawable/conversation_list_item_background"
         android:layout_height="70dp">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
@@ -13,6 +12,7 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:layout_marginTop="3dp"
         android:layout_marginBottom="3dp"
@@ -25,9 +25,12 @@
     <RelativeLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:layout_marginLeft="4dip"
+                  android:layout_marginStart="4dip"
                   android:layout_marginRight="8dip"
+                  android:layout_marginEnd="8dip"
                   android:layout_centerVertical="true"
                   android:layout_toRightOf="@id/contact_photo_image"
+                  android:layout_toEndOf="@id/contact_photo_image"
                   android:weightSum="1"
                   android:orientation="horizontal">
 
@@ -37,7 +40,9 @@
                   android:layout_height="wrap_content"
                   android:layout_alignParentTop="true"
                   android:layout_alignParentLeft="true"
+                  android:layout_alignParentStart="true"
                   android:layout_toLeftOf="@+id/thumbnail"
+                  android:layout_toStartOf="@+id/thumbnail"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:textColor="?attr/conversation_list_item_contact_color"
                   android:singleLine="true"
@@ -45,23 +50,30 @@
                   android:ellipsize="end"
                   android:drawablePadding="5dp"/>
 
-        <ImageView android:id="@+id/error"
-                   android:layout_height="20dp"
-                   android:layout_width="20dp"
-                   android:layout_alignParentLeft="true"
-                   android:layout_below="@id/from"
-                   android:paddingBottom="3dp"
-                   android:visibility="gone"
-                   tools:visibility="visible"
-                   android:src="@drawable/ic_action_warning_red"
-                   android:contentDescription="@string/conversation_list_item_view__error_alert" />
+        <org.thoughtcrime.securesms.components.AlertView
+                android:id="@+id/indicators_parent"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:paddingTop="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_marginEnd="2dp"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@id/from"
+                app:useSmallIcon="true"
+                android:visibility="gone"
+                tools:visibility="visible"/>
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/subject"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/from"
-                android:layout_toRightOf="@id/error"
+                android:layout_toRightOf="@id/indicators_parent"
+                android:layout_toEndOf="@id/indicators_parent"
+                android:layout_toLeftOf="@+id/delivery_status"
+                android:layout_toStartOf="@+id/delivery_status"
+                android:paddingRight="1dp"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?attr/conversation_list_item_subject_color"
                 android:fontFamily="sans-serif-light"
@@ -77,6 +89,7 @@
                 android:layout_marginRight="5dip"
                 android:layout_marginLeft="5dip"
                 android:layout_toLeftOf="@+id/date"
+                android:layout_toStartOf="@+id/date"
                 android:layout_alignParentTop="true"
                 android:layout_marginTop="5dip"
                 android:contentDescription="@string/conversation_activity__attachment_thumbnail"
@@ -87,9 +100,11 @@
 
         <TextView android:id="@id/date"
                   android:layout_marginLeft="3dip"
+                  android:layout_marginStart="3dip"
                   android:layout_height="wrap_content"
                   android:layout_width="wrap_content"
                   android:layout_alignParentRight="true"
+                  android:layout_alignParentEnd="true"
                   android:layout_alignParentTop="true"
                   android:layout_above="@id/subject"
                   android:textAppearance="?android:attr/textAppearanceSmall"
@@ -98,5 +113,30 @@
                   tools:text="30 mins"
                   android:singleLine="true"/>
 
+        <TextView android:id="@+id/archived"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@id/date"
+                  android:layout_alignParentRight="true"
+                  android:layout_alignParentEnd="true"
+                  android:layout_alignBaseline="@id/subject"
+                  android:layout_marginLeft="5dp"
+                  android:layout_marginRight="5dp"
+                  android:text="@string/conversation_list_item_view__archived"
+                  android:textColor="#ffbbbbbb"
+                  android:background="@drawable/rounded_rectangle"
+                  android:textSize="12sp"
+                />
+
+        <org.thoughtcrime.securesms.components.DeliveryStatusView
+                  android:id="@+id/delivery_status"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@+id/date"
+                  android:layout_toLeftOf="@+id/archived"
+                  android:layout_toStartOf="@+id/archived"
+                  android:layout_alignWithParentIfMissing="true"
+                  app:iconColor="?attr/conversation_list_item_subject_color"/>
+
     </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationListItem>

res/layout/conversation_title_view.xml

@@ -26,8 +26,9 @@
               android:layout_height="wrap_content"
               android:singleLine="true"
               android:ellipsize="end"
-              android:layout_gravity="center_vertical"
+              android:layout_gravity="center_vertical|start"
               android:gravity="center_vertical"
+              android:textDirection="ltr"
               style="@style/TextSecure.SubtitleTextStyle"/>
 
 </org.thoughtcrime.securesms.ConversationTitleView>

res/layout/delivery_status_view.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <FrameLayout android:id="@+id/pending_indicator_stub"
+                 android:layout_width="wrap_content"
+                 android:paddingRight="2dp"
+                 android:layout_height="wrap_content" />
+
+    <ImageView android:id="@+id/sent_indicator"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_gravity="center_vertical|end"
+               android:src="@drawable/ic_done_white_18dp"
+               android:paddingLeft="2dp"
+               android:paddingBottom="2dp"
+               android:visibility="gone"
+               android:contentDescription="@string/conversation_item_sent__delivered_description" />
+
+    <ImageView android:id="@+id/delivered_indicator"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_gravity="center_vertical|end"
+               android:src="@drawable/ic_done_all_white_18dp"
+               android:paddingLeft="2dp"
+               android:paddingBottom="2dp"
+               android:visibility="gone"
+               android:contentDescription="@string/conversation_item_sent__delivered_description" />
+
+</merge>

res/layout/device_add_fragment.xml

@@ -30,7 +30,7 @@
             android:layout_weight="1"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
-            android:background="@color/gray5"
+            android:background="?android:windowBackground"
             android:gravity="center">
 
             <ImageView android:id="@+id/devices"
@@ -43,7 +43,8 @@
 
             <TextView android:text="@string/device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link"
                       android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"/>
+                      android:layout_height="wrap_content"
+                      android:textColor="?android:textColorSecondary"/>
 
 
         </LinearLayout>

res/layout/device_link_fragment.xml

@@ -22,7 +22,8 @@
 
         <LinearLayout android:layout_width="match_parent"
                       android:layout_height="match_parent"
-                      android:orientation="vertical">
+                      android:orientation="vertical"
+                      android:background="?device_link_item_card_background">
 
             <TextView
                     android:layout_width="wrap_content"

res/layout/export_fragment.xml

@@ -74,6 +74,7 @@
                 <ImageView android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_marginRight="10dip"
+                           android:layout_marginEnd="10dip"
                            android:src="?plaintext_backup"/>
 
                 <LinearLayout android:orientation="vertical"
@@ -82,11 +83,13 @@
 
                     <TextView android:layout_width="match_parent"
                               android:layout_height="wrap_content"
+                              android:gravity="start"
                               style="@style/Registration.Description"
                               android:text="@string/export_fragment__export_plaintext_backup"/>
 
                     <TextView android:layout_width="match_parent"
                               android:layout_height="wrap_content"
+                              android:gravity="start"
                               android:textAppearance="?android:attr/textAppearanceSmall"
                               android:text="@string/export_fragment__export_a_plaintext_backup_compatible_with"/>
                 </LinearLayout>

res/layout/group_create_activity.xml

@@ -26,15 +26,16 @@
                 android:layout_height="70dp"
                 position="bottom_right"
                 android:layout_marginRight="10dp"
-                android:src="@drawable/ic_group_photo"
                 android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />
 
-            <EditText android:id="@+id/group_name"
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/group_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:padding="10dp"
                 android:lines="1"
+                android:maxLength="255"
                 android:inputType="textAutoCorrect"
                 android:hint="@string/GroupCreateActivity_group_name_hint" />
             </LinearLayout>
@@ -56,7 +57,8 @@
                 style="@android:style/Widget.ProgressBar"
                 android:indeterminate="true" />
 
-            <TextView android:id="@+id/creating_group_text"
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                android:id="@+id/creating_group_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -97,4 +99,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-</LinearLayout>
+</LinearLayout>

res/layout/import_fragment.xml

@@ -31,6 +31,7 @@
             <ImageView android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginRight="10dip"
+                       android:layout_marginEnd="10dip"
                        android:src="?import_sms"/>
 
             <LinearLayout android:orientation="vertical"
@@ -39,11 +40,13 @@
 
                 <TextView android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:gravity="start"
                           style="@style/Registration.Description"
                           android:text="@string/import_fragment__import_system_sms_database"/>
 
                 <TextView android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:gravity="start"
                           android:textAppearance="?android:attr/textAppearanceSmall"
                           android:text="@string/import_fragment__import_the_database_from_the_default_system"/>
 
@@ -71,6 +74,7 @@
             <ImageView android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginRight="10dip"
+                       android:layout_marginEnd="10dip"
                        android:src="?encrypted_backup"/>
 
             <LinearLayout android:orientation="vertical"
@@ -79,11 +83,13 @@
 
                 <TextView android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:gravity="start"
                           style="@style/Registration.Description"
                           android:text="@string/import_fragment__restore_encrypted_backup"/>
 
                 <TextView android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:gravity="start"
                           android:textAppearance="?android:attr/textAppearanceSmall"
                           android:text="@string/import_fragment__restore_a_previously_exported_encrypted_signal_backup"/>
 
@@ -112,6 +118,7 @@
             <ImageView android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginRight="10dip"
+                       android:layout_marginEnd="10dip"
                        android:src="?plaintext_backup"/>
 
             <LinearLayout android:orientation="vertical"
@@ -120,11 +127,13 @@
 
                 <TextView android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:gravity="start"
                           style="@style/Registration.Description"
                           android:text="@string/import_fragment__import_plaintext_backup"/>
 
                 <TextView android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:gravity="start"
                           android:textAppearance="?android:attr/textAppearanceSmall"
                           android:text="@string/import_fragment__import_a_plaintext_backup_file"/>
             </LinearLayout>

res/layout/invite_activity.xml

@@ -32,7 +32,8 @@
                       android:layout_marginBottom="30dp"
                       android:layout_marginTop="18dp"
                       android:fontFamily="sans-serif-light"
-                      android:paddingLeft="10dp"/>
+                      android:paddingLeft="10dp"
+                      android:paddingStart="10dp"/>
 
             <EditText android:id="@+id/invite_text"
                       android:layout_width="match_parent"
@@ -40,7 +41,10 @@
                       android:minLines="2"
                       tools:text="Let's switch to Signal: http://sgnl.link/asdfdfsa"
                       android:background="@drawable/sent_bubble"
-                      android:padding="10dp"
+                      android:paddingTop="10dp"
+                      android:paddingBottom="10dp"
+                      android:paddingLeft="10dp"
+                      android:paddingRight="20dp"
                       android:gravity="top"
                       android:inputType="textShortMessage|textMultiLine"
                       android:textColor="#ff333333"/>
@@ -54,6 +58,7 @@
                 <Button android:id="@+id/share_button"
                         android:drawablePadding="10dp"
                         android:drawableLeft="@drawable/ic_share_black_18dp"
+                        android:drawableStart="@drawable/ic_share_black_18dp"
                         android:text="@string/InviteActivity_share"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -61,6 +66,7 @@
 
                 <Button android:id="@+id/sms_button"
                         android:drawableLeft="@drawable/ic_message_black_18dp"
+                        android:drawableStart="@drawable/ic_message_black_18dp"
                         android:drawablePadding="10dp"
                         android:text="@string/InviteActivity_send_sms"
                         android:layout_width="wrap_content"
@@ -95,7 +101,7 @@
 
         <LinearLayout android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:gravity="right"
+                      android:gravity="end"
                       android:padding="10dp"
                       android:orientation="horizontal">
 

res/layout/message_details_header.xml

@@ -34,7 +34,8 @@
 
         <TableLayout android:id="@+id/metadata_container"
                      android:layout_width="match_parent"
-                     android:layout_height="match_parent">
+                     android:layout_height="match_parent"
+                     android:shrinkColumns="1">
 
             <TableRow android:id="@+id/sent_container"
                       android:layout_width="match_parent"
@@ -51,7 +52,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="Jan 18, 9:29AM" />
+                          tools:text="Jan 18, 2015, 12:29:37 AM GMT-08:00" />
 
             </TableRow>
 
@@ -70,7 +71,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="Jan 18, 9:31AM" />
+                          tools:text="Jan 18, 2015, 12:31:15 AM GMT-08:00" />
 
             </TableRow>
 

res/layout/prompt_apn_activity.xml

@@ -29,7 +29,7 @@
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
                       android:layout_marginBottom="16dip"
-                      android:text="@string/prompt_mms_activity__to_send_media_and_group_messages_click_ok"/>
+                      android:text="@string/prompt_mms_activity__to_send_media_and_group_messages_tap_ok"/>
                         
             <LinearLayout android:orientation="horizontal"
                           android:gravity="center"

res/layout/quick_camera_controls.xml

@@ -14,6 +14,7 @@
                  android:layout_centerHorizontal="true"
                  android:background="@drawable/quick_camera_shutter_ring"
                  android:src="@drawable/quick_shutter_button"
+                 android:enabled="false"
                  android:padding="20dp"/>
 
     <ImageButton android:id="@+id/fullscreen_button"
@@ -21,7 +22,7 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
                  android:layout_alignParentRight="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_fullscreen"
                  android:padding="20dp" />
 
@@ -30,8 +31,9 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
                  android:layout_alignParentLeft="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_rear"
+                 android:enabled="false"
                  android:padding="20dp"
                  android:visibility="invisible"
                  tools:visibility="visible" />

res/layout/quick_camera_controls_land.xml

@@ -14,6 +14,7 @@
                  android:layout_centerVertical="true"
                  android:background="@drawable/quick_camera_shutter_ring"
                  android:src="@drawable/quick_shutter_button"
+                 android:enabled="false"
                  android:padding="20dp"/>
 
     <ImageButton android:id="@+id/fullscreen_button"
@@ -21,7 +22,7 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
                  android:layout_alignParentRight="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_fullscreen"
                  android:padding="20dp"/>
 
@@ -30,8 +31,9 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentTop="true"
                  android:layout_alignParentRight="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_rear"
+                 android:enabled="false"
                  android:padding="20dp"
                  android:visibility="invisible"
                  tools:visibility="visible"/>

res/layout/redphone_call_card.xml

@@ -40,10 +40,12 @@
 
         <!-- Contact photo for call_info_1 -->
         <ImageView android:id="@+id/photo"
-                   android:layout_alignParentTop="true"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
+                   android:layout_below="@+id/call_banner_1"
+                   android:layout_marginBottom="@dimen/in_call_button_height"
                    android:gravity="top|center_horizontal"
+                   android:background="@android:color/black"
                    android:scaleType="centerCrop"
                    />
 
@@ -140,23 +142,6 @@
 
         </RelativeLayout>  <!-- End of call_banner for call_info #1. -->
 
-        <!-- "Inset" photo used with "id/photo" above:
-               When the contact photo is a lo-res thumbnail, id/photo
-             contains a scaled-up but *blurred* version of the photo, and
-             *this* ImageView is overlaid on top as a smaller, unblurred
-             inset.  (See InCallContactPhoto.java.)
-               The top of the inset is vertically aligned with the bottom
-             of the call banner.  (Note that means that in states where the
-             "call state label" is visible, the label (see below) will overlap
-             the top of the inset photo.)  -->
-        <ImageView android:id="@+id/insetPhoto"
-            android:layout_below="@id/call_banner_1"
-            android:layout_width="180dp"
-            android:layout_height="180dp"
-            android:scaleType="centerCrop"
-            android:layout_marginLeft="0dp"
-            />
-
         <!-- The "call state label": In some states, this shows a special
              indication like "Dialing" or "Incoming call" or "Call ended".
              It's unused for the normal case of an active ongoing call. -->

res/layout/registration_activity.xml

@@ -15,6 +15,7 @@
 
         <TextView style="@style/Registration.Label"
                   android:layout_width="fill_parent"
+                  android:gravity="start"
                   android:textAllCaps="true"
                   android:text="@string/registration_activity__your_country" />
 
@@ -25,10 +26,12 @@
 
         <TextView style="@style/Registration.Label"
                   android:layout_width="fill_parent"
+                  android:gravity="start"
                   android:textAllCaps="true"
                   android:text="@string/registration_activity__your_country_code_and_phone_number" />
 
         <LinearLayout android:orientation="horizontal"
+                      android:layoutDirection="ltr"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content">
 
@@ -62,11 +65,13 @@
                   android:layout_width="fill_parent"
                   android:layout_marginBottom="8dip"
                   android:layout_marginTop="16dip"
+                  android:gravity="start"
                   android:text="@string/registration_activity__verify_your_number_to_connect_with_signal"/>
 
         <TextView style="@style/Registration.Description"
                   android:layout_width="fill_parent"
                   android:layout_marginBottom="16dip"
+                  android:gravity="start"
                   android:text="@string/registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy"/>
 
         <LinearLayout android:layout_width="wrap_content"

res/layout/registration_progress_activity.xml

@@ -188,7 +188,7 @@
                         android:layout_below="@+id/connectivity_alert"
                         android:paddingLeft="4dip"
                         android:paddingRight="4dip"
-                        android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_push_service" />
+                        android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_server" />
             </RelativeLayout>
 
             <Button
@@ -285,6 +285,7 @@
 
             <TextView
                     style="@style/Registration.Description"
+                    android:gravity="start"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dip"
@@ -480,6 +481,7 @@
 
             <TextView
                     style="@style/Registration.Description"
+                    android:gravity="start"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:paddingLeft="5dip"
@@ -498,6 +500,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"
                         android:text="1:57"
                         android:textSize="12.0sp" />
 
@@ -506,6 +509,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
                         android:text="@string/registration_progress_activity__waiting_for_sms_verification"
                         android:textAllCaps="true"
                         android:textSize="12.0sp"

res/layout/signal_map_view.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools">
+
+    <FrameLayout android:layout_width="match_parent"
+                 android:layout_height="match_parent"
+                 android:layout_weight="1">
+        <com.google.android.gms.maps.MapView
+                android:id="@+id/map_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"/>
+
+        <ImageView android:id="@+id/image_view"
+                   android:layout_width="match_parent"
+                   android:layout_height="match_parent"
+                   android:visibility="gone"
+                   tools:src="@drawable/ic_action_warning_red"
+                   tools:visibility="visible"/>
+    </FrameLayout>
+
+    <TextView android:id="@+id/address_view"
+              android:visibility="visible"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_weight="0"
+              android:ellipsize="end"
+              android:maxLines="1"
+              android:singleLine="true"
+              android:padding="5dp"
+              tools:text="21 Jump St, Atlanta GA 30311"/>
+
+</merge>

res/layout/transport_selection_list_item.xml

@@ -8,6 +8,7 @@
               android:gravity="center_vertical"
               android:paddingLeft="10dp"
               android:paddingRight="10dp">
+
     <ImageView android:id="@+id/icon"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
@@ -16,11 +17,28 @@
                android:contentDescription="@string/transport_selection_list_item__transport_icon"
                tools:src="@drawable/ic_send_push_white_24dp"
                tools:backgroundTint="@color/textsecure_primary" />
-    <TextView android:id="@+id/text"
-              android:paddingLeft="10dp"
-              android:fontFamily="sans-serif-light"
-              android:textSize="16sp"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              tools:text="TextSecure" />
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:gravity="center_vertical"
+                  android:paddingLeft="10dp">
+
+        <TextView android:id="@+id/text"
+                  android:fontFamily="sans-serif-light"
+                  android:textSize="16sp"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  tools:text="TextSecure" />
+
+        <TextView android:id="@+id/subtext"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:fontFamily="sans-serif-light"
+                  android:textSize="12dp"
+                  android:visibility="gone"
+                  tools:text="From Home"
+                  tools:visibility="visible"/>
+
+    </LinearLayout>
 </LinearLayout>

res/menu/conversation.xml

@@ -7,9 +7,6 @@
     <item android:title="@string/conversation__menu_view_media"
           android:id="@+id/menu_view_media" />
 
-    <item android:title="@string/conversation__menu_delete_thread"
-          android:id="@+id/menu_delete_thread" />
-
     <item android:title="@string/conversation__menu_conversation_settings"
           android:id="@+id/menu_conversation_settings"/>
 

res/menu/conversation_list_batch.xml

@@ -5,10 +5,11 @@
     <item android:title="@string/conversation_list_batch__menu_delete_selected"
           android:id="@+id/menu_delete_selected"
           android:icon="?menu_trash_icon"
-          app:showAsAction="ifRoom" />
+          app:showAsAction="always" />
 
     <item android:title="@string/conversation_list_batch__menu_select_all"
           android:id="@+id/menu_select_all"
-          android:icon="?menu_selectall_icon" />
+          android:icon="?menu_selectall_icon"
+          app:showAsAction="always"/>
 
 </menu>

res/menu/conversation_list_batch_archive.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/conversation_list_batch_archive__menu_archive_selected"
+          android:id="@+id/menu_archive_selected"
+          android:icon="@drawable/ic_archive_white_24dp"
+          app:showAsAction="always"/>
+
+</menu>

res/menu/conversation_list_batch_unarchive.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/conversation_list_batch_unarchive__menu_unarchive_selected"
+          android:id="@+id/menu_archive_selected"
+          android:icon="@drawable/ic_unarchive_white_24dp"
+          app:showAsAction="always"/>
+
+</menu>

res/menu/key_scanning.xml

@@ -7,10 +7,10 @@
           app:showAsAction="ifRoom">
 
         <menu>
-            <item android:title="@string/key_scanning__menu_scan_to_compare"
+            <item android:title="@string/key_scanning__menu_scan_contacts_qr_code"
                   android:id="@+id/menu_scan"/>
 
-            <item android:title="@string/key_scanning__menu_get_scanned_to_compare"
+            <item android:title="@string/key_scanning__menu_display_your_qr_code"
                   android:id="@+id/menu_get_scanned"/>
 
         </menu>

res/menu/media_overview.xml

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

res/menu/text_secure_normal.xml

@@ -19,4 +19,7 @@
     <item android:title="@string/text_secure_normal__menu_settings"
           android:id="@+id/menu_settings" />
 
+    <item android:title="@string/text_secure_normal__help"
+          android:id="@+id/menu_help"/>
+
 </menu>

res/values-ar/strings.xml

@@ -8,13 +8,26 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">حاليا: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">لم تقم بتحديد عبارة سرية بعد!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s رسائل في المحادثة</string>
+  <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+    <item quantity="zero">%d رسائل في المحادثة</item>
+    <item quantity="one">رسالة في المحادثة</item>
+    <item quantity="two">%d رسائل في المحادثة</item>
+    <item quantity="few">%d رسائل في المحادثة</item>
+    <item quantity="many">%d رسائل في المحادثة</item>
+    <item quantity="other">%d رسائل في المحادثة</item>
+  </plurals>
   <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>
+  <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+    <item quantity="zero">تقليم كل المحادثات إلى أحدث %d رسالة الآن.</item>
+    <item quantity="one">سوف يتم تقليم كل المحادثات إلى أحدث رسالة.</item>
+    <item quantity="two">سوف يتم تقليم كل المحادثات إلى أحدث %d رسالة الآن.</item>
+    <item quantity="few">سوف يتم تقليم كل المحادثات إلى أحدث %d رسالة الآن.</item>
+    <item quantity="many">سوف يتم تقليم كل المحادثات إلى أحدث %d رسالة الآن.</item>
+    <item quantity="other">سوف يتم تقليم كل المحادثات إلى أحدث %d رسالة الآن.</item>
+  </plurals>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">تعطيل العبارة السرية؟</string>
-  <string name="ApplicationPreferencesActivity_disable_lock_screen">
-إزالة قفل الشاشة للرسائل؟</string>
+  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">سوف يتم إلغاء قفل سييجنال وإشعارات الرسائل دائماً</string>
   <string name="ApplicationPreferencesActivity_disable">تعطيل</string>
   <string name="ApplicationPreferencesActivity_unregistering">جارٍ إلغاء التسجيل</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">جارٍ إلغاء التسجيل من رسائل ومكالمات سيجنال...</string>
@@ -30,12 +43,22 @@
   <string name="ApplicationPreferencesActivity_off">مغلق</string>
   <string name="ApplicationPreferencesActivity_Off">مغلق</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">رسائل نصية %1$s, MMS %2$s</string>
+  <string name="ApplicationPreferencesActivity_privacy_summary">العبارة السرية %1$s، تأمين الشاشة %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">المظهر %1$s، اللغة %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d دقائق</string>
+  <plurals name="AppProtectionPreferenceFragment_minutes">
+    <item quantity="zero">%d دقيقة</item>
+    <item quantity="one">دقيقة</item>
+    <item quantity="two">%d دقيقتين</item>
+    <item quantity="few">%d دقائق</item>
+    <item quantity="many">%d دقيقة</item>
+    <item quantity="other">%d دقيقة</item>
+  </plurals>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(صورة)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(صوت)</string>
   <string name="DraftDatabase_Draft_video_snippet">(فيديو)</string>
+  <string name="DraftDatabase_Draft_location_snippet">(الموقع)</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">لم يتم العثور على تطبيق لاختيار ملف.</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -64,7 +87,7 @@
   <string name="ConversationItem_view_secure_media_question">عرض الوسائط المشفرة؟</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">تم حفظ هذا المحتوى بقاعدة بيانات مشفرة، يتطلب عرضها فى تطبيق خارجى فك تشفيرها و تخزينها مؤقتاً بالذاكرة، هل ترغب فى الاستمرار؟</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">خطأ. تم استقبال رسالة تبادل مفاتيح غير صالحة.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">تم استلام رسالة تبادل المفاتيح، أنقر للمتابعة.</string>
+  <string name="ConversationItem_received_key_exchange_message_tap_to_process">تم استلام رسالة تبادل مفاتيح، أنقر للمتابعة.</string>
   <string name="ConversationItem_group_action_left">%1$s تَرك المجموعة.</string>
   <string name="ConversationItem_click_for_details">إضغط للتفاصيل</string>
   <string name="ConversationItem_click_to_approve_unencrypted">أنقر من أجل استعاضة غير آمنة</string>
@@ -72,6 +95,8 @@
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">الاستعاضة برسالة وسائط متعددة غير مشفرة؟</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">هذه الرسالة <b>لن تكون</b> مشفرة لأن المستلم لم يعد مستخدم سيجنال. .\n\nهل ترغب في إرسالها غير مشفرة؟</string>
   <string name="ConversationItem_unable_to_open_media">لم يتم العثور على تطبيق قادر على فتح الملف.</string>
+  <string name="ConversationItem_from_s">من %s</string>
+  <string name="ConversationItem_to_s">إلى %s</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">إعادة ضبط جلسة آمنة؟</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">سوف يتم الاحتفاظ برسائلك. هذا قد يساعد في حال وجود مشاكل في التشفير بهذه المحادثة.</string>
@@ -90,8 +115,14 @@
   <string name="ConversationActivity_group_members">أعضاء المجموعة</string>
   <string name="ConversationActivity_group_conversation">دردشة جماعية</string>
   <string name="ConversationActivity_unnamed_group">مجموعة غير مسماه</string>
-  <string name="ConversationActivity_d_recipients_in_group">أعضاء %d </string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">عضو 1</string>
+  <plurals name="ConversationActivity_d_recipients_in_group">
+    <item quantity="zero">%d عضو</item>
+    <item quantity="one">عضو</item>
+    <item quantity="two">%d عضوين</item>
+    <item quantity="few">%d عضو</item>
+    <item quantity="many">%d عضو</item>
+    <item quantity="other">%d عضو</item>
+  </plurals>
   <string name="ConversationActivity_saved_draft">مسودة محفوظة</string>
   <string name="ConversationActivity_invalid_recipient">جهة اتصال غير صحيحة!</string>
   <string name="ConversationActivity_calls_not_supported">المكالمات غير مدعمة</string>
@@ -135,12 +166,8 @@
     <item quantity="other">سوف يتم حذف %1$d رسالة مختارة نهائيا.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">أحفظ في الذاكرة؟</string>
-  <string name="ConversationFragment_saving_this_media_to_storage_warning">حفظ الملف في الذاكرة يسمح ﻷي تطبيق آخر على الهاتف من النفاذ له. \n\nاستمر؟</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">خطأ أثناء حفظ المرفق إلى الذاكرة!</string>
   <string name="ConversationFragment_success_exclamation">تم بنجاح!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">تعذر الإضافة إلى الذاكرة!</string>
-  <string name="ConversationFragment_saving_attachment">حفظ المرفق</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">جارٍ حفظ المرفق في الذاكرة...</string>
   <string name="ConversationFragment_pending">معلق...</string>
   <string name="ConversationFragment_push">بيانات (سيجنال)</string>
   <string name="ConversationFragment_mms">رسالة وسائط متعددة</string>
@@ -167,9 +194,28 @@
     <item quantity="other">سوف يتم حذف %1$d رسائل مختارة بشكل نهائي.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">حذف</string>
-  <string name="ConversationListFragment_deleting_selected_threads">حذف المحادثات المختارة</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">جارٍ حذف المحادثات المختارة...</string>
+  <plurals name="ConversationListFragment_conversations_archived">
+    <item quantity="zero">تم نقل %d رسالة إلى الأرشيف</item>
+    <item quantity="one">تم نقل رسالة إلى الأرشيف</item>
+    <item quantity="two">تم نقل %d رسالة إلى الأرشيف</item>
+    <item quantity="few">تم نقل %d رسالة إلى الأرشيف</item>
+    <item quantity="many">تم نقل %d رسالة إلى الأرشيف</item>
+    <item quantity="other">تم نقل %d رسالة إلى الأرشيف</item>
+  </plurals>
+  <string name="ConversationListFragment_undo">تراجع</string>
+  <plurals name="ConversationListFragment_moved_conversations_to_inbox">
+    <item quantity="zero">تم نقل %d رسالة إلى الوارد</item>
+    <item quantity="one">تم نقل رسالة إلى الوارد</item>
+    <item quantity="two">تم نقل %d رسالة إلى الوارد</item>
+    <item quantity="few">تم نقل %d رسالة إلى الوارد</item>
+    <item quantity="many">تم نقل %d رسالة إلى الوارد</item>
+    <item quantity="other">تم نقل %d رسالة إلى الوارد</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">رسالة تبادل المفاتيح</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">أرشيف المحادثات (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">استخدام التخصيص: %s</string>
   <string name="CustomDefaultPreference_using_default">الاستخدام الافتراضي: %s</string>
@@ -189,6 +235,7 @@
   <string name="DeviceListItem_unnamed_device">جهاز غير مسمى</string>
   <string name="DeviceListItem_linked_s">مقترن %s</string>
   <string name="DeviceListItem_last_active_s">آخر مرة %s</string>
+  <string name="DeviceListItem_today">اليوم</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">شارك مع</string>
   <!--ExperienceUpgradeActivity-->
@@ -210,14 +257,14 @@
   <string name="ExportFragment_success">تم بنجاح!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">فشل دائما في اتصال سيجنال!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">عملية تسجيل سيجنال مع خدمات جوجل بلاي لم تتم. اتصال البيانات عبر شبكة الجوال معطلة، رجاء محاولة إعادة التسجيل من خلال قائمة إعدادات سيجنال.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">سيجنال لم يتمكن من التسجيل مع خدمات جوجل بلاي، وتم تعطيل رسائل ومكالمات سيجنال. رجاء محاولة إعادة التسجيل عبر قائمة الإعدادات بالتطبيق ثم اختيار متقدم.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">مجموعة جديدة</string>
   <string name="GroupCreateActivity_actionbar_update_title">تحديث المجموعة</string>
   <string name="GroupCreateActivity_group_name_hint">أسم المجموعة</string>
   <string name="GroupCreateActivity_actionbar_mms_title">مجموعة وسائط متعددة جديدة</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">قمت باختيار شخص لا يدعم مجوعات سيجنال وبالتالي ستكون مجموعة وسائط متعددة.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">أنت غير مسجل لاستخدام بيانات شبكة الجوال لذلك فإن مجموعات سيجنال معطلة.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">أنت غير مسجل في رسائل ومكالمات سيجنال وبالتالي فإن مجموعات سيجنال معطلة. حاول إعادة التسجيل عبر قائمة الإعدادات بالتطبيق ثم اختيار متقدم.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">خطأ غير متوقع تسبب في تعذر إنشاء المجموعة.</string>
   <string name="GroupCreateActivity_contacts_no_members">تحتاج إلى شخص واحد على الأقل في المجموعة!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">لا يمكن قراءة رقم أحد أعضاء المجموعة بشكل صحيح. رجاء تصحيح أو حذف هذا العضو والمحاولة مرة أخرى.</string>
@@ -328,11 +375,14 @@
 \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_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_linked_already">عذرا، لديك أجهزة عديدة مقترنة حاليا. حاول إلغاء إقران بعضهم...</string>
+  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">عذرا، الرابط غير صحيح.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">ربط سيجنال بجهاز؟</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">يبدو أنك تحاول ربط سيجنال باستخدام ماسح ضوئي خارجي. رجاء مسح الكود مرة أخرى باستخدام الخاصية المدمجة في سيجنال من أجل حمايتك.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_watermark_content_description">أيقونة سيجنال</string>
@@ -377,7 +427,7 @@
   <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">الرقم المطلوب لا يدعم مكالمات صوتية مشفرة!</string>
   <string name="RedPhone_got_it">عُلم</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_signal">تواصل مع سيجنال</string>
+  <string name="RegistrationActivity_connect_with_signal">التواصل بواسطة سيجنال</string>
   <string name="RegistrationActivity_select_your_country">اختر بلدك</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">يجب عليك تحديد رمز دولتك</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">يجب عليك تحديد
@@ -426,8 +476,7 @@
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">تم استلام رسالة تبادل مفاتيح تالفة.</string>
   <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 name="SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process"> تم استلام رسالة بمفتاح هوية غير معلوم. أنقر للمتابعة والإظهار.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">تم استلام تحديث ولكن معلومات الهوية مجهولة. أنقر للتحقق من الهوية.</string>
   <string name="SmsMessageRecord_secure_session_reset">إعادة ضبط جلسة آمنة.</string>
   <string name="SmsMessageRecord_duplicate_message">رسالة مكررة.</string>
@@ -444,8 +493,6 @@
   <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_your_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>
@@ -453,8 +500,6 @@
   <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_not_verified_exclamation">لم يتم التحقق!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">المفتاح الذي تم مسحه ضوئياً متطابق!</string>
@@ -509,14 +554,15 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">الردود السريعة غير متاحة عند قفل سيجنال!</string>
   <string name="QuickResponseService_problem_sending_message">مشكلة في الإرسال!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">رسالة سيجنال جديدة.</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">المحتويات مخفية</string>
+  <string name="SingleRecipientNotificationBuilder_signal">سيجنال</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">رسالة جديدة</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">صورة</string>
   <string name="attachment_type_selector__audio">صوت</string>
   <string name="attachment_type_selector__video">فيديو</string>
   <string name="attachment_type_selector__contact">جهة اتصال</string>
   <string name="attachment_type_selector__camera">كاميرا</string>
+  <string name="attachment_type_selector__location">الموقع</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">العبارة السرية القديمة</string>
   <string name="change_passphrase_activity__new_passphrase">العبارة السرية الجديدة</string>
@@ -569,12 +615,17 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">تحميل البلدان جارٍ ...</string>
   <string name="country_selection_fragment__search">بحث</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">مسح رمز الاستجابة السريع المبين على الجهاز لربطه.</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">ربط الجهاز</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">لا توجد أجهزة مقترنة...</string>
+  <string name="device_list_fragment__link_new_device">ربط جهاز جديد</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">استمر</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط السجلات من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
+  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط السجلات من هاتفك. يمكنك استخدام ADB للحصول على سجل التشغيل  بدلا من ذلك.</string>
   <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
   <string name="log_submit_activity__submitting">إرسال</string>
   <string name="log_submit_activity__posting_logs">جاري نشر السجلات إلى Gist...</string>
@@ -624,7 +675,7 @@
   <string name="prompt_passphrase_activity__unlock">فتح القفل</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">يتطلب سيجنال إعدادات خدمة الوسائط المتعددة من أجل تسليم رسائل الوسائط المتعددة والمجموعات عبر شبكة الجوال. في بعض الأحوال لا تتاح هذه المعلومات مع الهواتف المقفولة أو ذات الإعدادات المقيدة.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">من اجل إرسال وسائط متعددة ورسائل إلى مجموعات أضغط على \"تم\" وأكمل الإعدادات المطلوبة. يمكن العثور على إعدادات رسائل الوسائط المتعددة الخاصة بمشغل شبكة الجوال الخاصة بك بالبحث عن \"أسم المشغل APN\". سوف تحتاج إلى القيام  بهذه الخطوة مرة واحدة.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">من اجل إرسال وسائط متعددة ورسائل إلى مجموعات أضغط على \"تم\" وأكمل الإعدادات المطلوبة. يمكن العثور على إعدادات رسائل الوسائط المتعددة الخاصة بمشغل شبكة الجوال الخاصة بك بالبحث عن \"أسم المشغل APN\". سوف تحتاج إلى القيام بهذه الخطوة مرة واحدة.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">جهة الاتصال محظورة</string>
   <!--recipient_preferences-->
@@ -670,12 +721,11 @@
   <string name="registration_progress_activity__call_me">أتصل بي</string>
   <string name="registration_progress_activity__edit_number">تعديل الرقم</string>
   <string name="registration_progress_activity__connectivity_error">خطأ في الاتصال</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-سيجنال غير قادر على الاتصال بخدمة دفع الوصول إلى الرسائل.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">لم يتمكن سيجنال من الاتصال بالخادم.</string>
   <string name="registration_progress_activity__some_possible_problems_include">بعض المشاكل 
 المحتملة وتتضمن:</string>
   <string name="registration_progress_activity__no_network_connectivity">لا يوجد شبكة اتصال.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">الجهاز في حاجة إلى اتصال بالإترنت من أجل استخدام هذه الخاصية من سيجنال. تأكد من الاتصال ببيانات شبكة الجوال أو Wi-Fi. </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">الجهاز في حاجة إلى الاتصال بالإترنت من أجل استخدام هذه الخاصية من سيجنال. تأكد من الاتصال ببيانات شبكة الجوال أو 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 فإنه من الوارد وجود جدار ناري يمنع النفاذ إلى خادم سيجنال. قم بتجربة شبكة أخرى أو بيانات شبكة الجوال.</string>
@@ -714,13 +764,14 @@
   <string name="AndroidManifest__public_identity_key">مفتاح الهوية العلني</string>
   <string name="AndroidManifest__change_passphrase">غير العبارة السرية</string>
   <string name="AndroidManifest__verify_identity">تحقق من الهوية</string>
-  <string name="AndroidManifest__log_submit">أرسل سجلات التصحيح</string>
+  <string name="AndroidManifest__log_submit">أرسل سجل التشغيل.</string>
   <string name="AndroidManifest__media_preview">معاينة الوسائط</string>
   <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>
   <string name="AndroidManifest__invite_friends">دعوة الأصدقاء</string>
+  <string name="AndroidManifest_archived_conversations">أرشيف المحادثة</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد / تصدير</string>
   <string name="arrays__your_identity_key">متفاح الهوية الخاص بك</string>
@@ -742,12 +793,12 @@
   <string name="arrays__video">فيديو</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
-    <item quantity="zero">%d صفر</item>
+    <item quantity="zero">%d ساعة</item>
     <item quantity="one">%d ساعة</item>
     <item quantity="two">%d ساعتين</item>
     <item quantity="few">%d ساعات</item>
     <item quantity="many">%d ساعة</item>
-    <item quantity="other">%d أخرى</item>
+    <item quantity="other">%d ساعة</item>
   </plurals>
   <!--preferences.xml-->
   <string name="preferences__general">عام</string>
@@ -767,18 +818,16 @@
   <string name="preferences__change_passphrase">غير العبارة السرية</string>
   <string name="preferences__change_your_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__lock_signal_and_message_notifications_with_a_passphrase">أقفل سيجال وإخطارات الرسائل بعبارة سرية</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>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">انسى العبارة السرية من ذاكرة الجهاز بعد فترة</string>
-  <string name="preferences__timeout_passphrase">نسيان العبارة السرية بعد فترة</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">تحديد مهلة العبارة السرية</string>
-  <string name="preferences__pref_timeout_interval_title">مدة الصلاحية</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">الوقت اللازم ليتم مسح العبارة السرية من الذاكرة</string>
+  <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">غلق سيجنال تلقائيا بعد مدة زمنية محددة</string>
+  <string name="preferences__inactivity_timeout_passphrase">تحديد مدة تذكر العبارة السرية</string>
+  <string name="preferences__inactivity_timeout_interval">مدة الصلاحية</string>
   <string name="preferences__notifications">الإشعارات</string>
   <string name="preferences__enable_message_notifications">تفعيل إشعارات الرسالة</string>
+  <string name="preferences__new_contacts_notifications">الإخطار بجهات اتصال جديدة</string>
+  <string name="preferences__show_a_notification_for_new_signal_contacts">أظهر إخطار لمستخدمي سيجنال جدد</string>
   <string name="preferences__led_color">لون ضوء التنبيه LED</string>
   <string name="preferences__led_color_unknown">مجهول</string>
   <string name="preferences__pref_led_blink_title">نمط وميض LED</string>
@@ -789,7 +838,7 @@
   <string name="preferences__sound">صوت</string>
   <string name="preferences__change_notification_sound">تغيير صوت التنبيه</string>
   <string name="preferences__silent">صامت</string>
-  <string name="preferences__inthread_notifications">إشعارات داخل المحادثة</string>
+  <string name="preferences__in_conversation_notifications">تنويهات أثناء المحادثة</string>
   <string name="preferences__play_inthread_notifications">تفعيل تنبيه صوتي أثناء مطالعة محادثة نشطة</string>
   <string name="preferences__repeat_alerts">تكرار التنبيهات</string>
   <string name="preferences__never">أبدا</string>
@@ -827,21 +876,19 @@
   <string name="preferences__mmsc_password">كلمة السر MMSC</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__automatically_delete_older_messages_once_a_conversation_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>
+  <string name="preferences__trim_all_conversations_now">تقليم كل المحادثات الآن</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">فحص وتقليم كل المحادثات وفق الحد الأقصى</string>
   <string name="preferences__devices">الأجهزة</string>
   <string name="preferences__light_theme">فاتح</string>
   <string name="preferences__dark_theme">داكن</string>
   <string name="preferences__appearance">المظهر</string>
   <string name="preferences__theme">المظهر</string>
-  <string name="preferences__theme_summary">المظهر %s</string>
   <string name="preferences__default">افتراضي</string>
   <string name="preferences__language">اللغة</string>
-  <string name="preferences__language_summary">اللغة %s</string>
   <string name="preferences__signal_messages_and_calls">رسائل ومكالمات سيجنال</string>
   <string name="preferences__free_private_messages_and_calls"> رسائل ومكالمات مجانية وآمنة مع مستخدمي سيجنال</string>
   <string name="preferences__submit_debug_log">إرسال سجل التصحيح</string>
@@ -870,7 +917,7 @@
   <!--refreshing push directory from menu-->
   <string name="push_directory__menu_refresh">تحيدث قائمة الاتصال</string>
   <!--conversation_callable_insecure-->
-  <string name="conversation_callable_insecure__menu_call">أتصل</string>
+  <string name="conversation_callable_insecure__menu_call">اتصل</string>
   <!--conversation_callable_secure-->
   <string name="conversation_callable_secure__menu_call">مكالمة سيجنال</string>
   <!--conversation_context-->
@@ -888,11 +935,14 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">احذف المختار</string>
   <string name="conversation_list_batch__menu_select_all">اختر الكل</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">تم اختيار الأرشيف</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">اختيار غير المؤرشف</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">بحث</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">صورة جهة الاتصال</string>
   <string name="conversation_list_item_view__error_alert">تنبيه بخطأ</string>
+  <string name="conversation_list_item_view__archived">الأرشيف</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">محادثة جديدة</string>
   <!--conversation_secure_verified-->
@@ -921,8 +971,6 @@
   <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_new_message">رسالة جديدة</string>
   <string name="text_secure_normal__menu_new_group">مجموعة جديدة</string>
@@ -930,18 +978,29 @@
   <string name="text_secure_normal__menu_clear_passphrase">أقفل</string>
   <string name="text_secure_normal__mark_all_as_read">اعتبارها رسائل مقروءة</string>
   <string name="text_secure_normal__invite_friends">دعوة الأصدقاء</string>
+  <string name="text_secure_normal__help">مساعدة</string>
   <!--reminder_header-->
+  <string name="reminder_header_outdated_build">لقد انتهت صلاحية هذه الإصدارة من سيجنال.</string>
+  <plurals name="reminder_header_outdated_build_details">
+    <item quantity="zero">تنتهي صلاحية نسخة سيجنال المستخدمة خلال %d يوم. ألمس للتحديث إلى أخر إصدارة.</item>
+    <item quantity="one">تنتهي صلاحية نسخة سيجنال المستخدمة خلال يوم. ألمس للتحديث إلى أخر إصدارة.</item>
+    <item quantity="two">تنتهي صلاحية نسخة سيجنال المستخدمة خلال %d يوم. ألمس للتحديث إلى أخر إصدارة.</item>
+    <item quantity="few">تنتهي صلاحية نسخة سيجنال المستخدمة خلال %d يوم. ألمس للتحديث إلى أخر إصدارة.</item>
+    <item quantity="many">تنتهي صلاحية نسخة سيجنال المستخدمة خلال %d يوم. ألمس للتحديث إلى أخر إصدارة.</item>
+    <item quantity="other">تنتهي صلاحية نسخة سيجنال المستخدمة خلال %d يوم. ألمس للتحديث إلى أخر إصدارة.</item>
+  </plurals>
+  <string name="reminder_header_outdated_build_details_today">تنتهي اليوم صلاحية إصدارة سيجنال. ألمس لتحديث التطبيق.</string>
   <string name="reminder_header_expired_build">لقد انتهت صلاحية هذه النسخة من سيجنال!</string>
-  <string name="reminder_header_expired_build_details">رجاء التحديث لآخر إصداره من التطبيق. لن ترسل الرسائل بنجاح بعد الآن.</string>
+  <string name="reminder_header_expired_build_details">لن ترسل الرسائل بنجاح بعد الآن. ألمس لتحديث التطبيق.</string>
   <string name="reminder_header_expired_build_button">تحديث</string>
   <string name="reminder_header_sms_default_title">اجعله تطبيق المراسلة الافتراضي</string>
   <string name="reminder_header_sms_default_text">المس لجعل سيجنال التطبيق الافتراضي للرسائل.</string>
   <string name="reminder_header_sms_default_button">تعيين</string>
   <string name="reminder_header_sms_import_title">استيراد رسائل النظام</string>
-  <string name="reminder_header_sms_import_text">أضغط لنسخ الرسائل النصية القصيرة على الهاتف إلى قاعدة البيانات المشفرة.</string>
+  <string name="reminder_header_sms_import_text">أنقر لنسخ الرسائل من على الهاتف إلى قاعدة بيانات سيجنال المشفرة.</string>
   <string name="reminder_header_sms_import_button">استيراد</string>
   <string name="reminder_header_push_title">تفعيل رسائل ومكالمات سيجنال</string>
-  <string name="reminder_header_push_text">ترقية تجربتك في التواصل.</string>
+  <string name="reminder_header_push_text">ترقية التطبيق من أجل تواصل أفضل.</string>
   <string name="reminder_header_push_button">تفعيل</string>
   <string name="reminder_header_invite_title">دعوة إلى سيجنال</string>
   <string name="reminder_header_invite_text">انتقل بالمحادثة مع %1$s  للمستوى التالي.</string>
@@ -956,8 +1015,9 @@
   <string name="MediaPreviewActivity_unssuported_media_type">غير مدعوم.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">أحفظ</string>
+  <!--media_overview-->
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">معاينة الصورة</string>
+  <string name="media_preview_activity__image_content_description">معاينه الصوره</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">إنعاش</string>
   <!--redphone_audio_popup_menu-->
@@ -970,8 +1030,5 @@
   <string name="trimmer__old_messages_successfully_deleted">تم حذف الرسائل القديمة بنجاح</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">أيقونة النقل.</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">مسح رمز الاستجابة السريع المبين على الجهاز لربطه.</string>
-  <string name="device_link_fragment__link_device">ربط الجهاز</string>
-  <string name="device_list_fragment__link_new_device">ربط جهاز جديد</string>
   <!--EOF-->
 </resources>

res/values-be/strings.xml

@@ -7,9 +7,7 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Цяпер: %s</string>
   <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_delete">Выдаліць</string>
   <string name="ApplicationPreferencesActivity_disable">Выключыць</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Памылка падлучэння да сервера!</string>
@@ -22,7 +20,6 @@
   <string name="ApplicationPreferencesActivity_Off">Выкл</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d хвілін</string>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(малюнак)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(аўдыё)</string>
@@ -45,9 +42,7 @@
   <string name="ConversationItem_expires_s">Заканчваецца: %s</string>
   <string name="ConversationItem_error_not_delivered">Не было дастаўлена</string>
   <string name="ConversationItem_view_secure_media_question">Паказаць бяспечнае медыя?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Гэты кантэнт быў захаваны ў зашыфраванай базе дадзеных. На жаль, для яго прагляду ў знешняй праграме спатрэбіцца часова расшыфраваць дадзеныя і запісаць іх на дыск. Вы ўпэўненыя, што хочаце гэта зрабіць?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Памылка, атрымана неактуальнае паведамленне абмену ключамі.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Паведамленне абмену ключамі атрымана, дакраніцеся, каб працягнуць.</string>
   <string name="ConversationItem_group_action_left">%1$s пакінуў групавую гутарку.</string>
   <string name="ConversationItem_click_for_details">Націсніце каб пабачыць дэталі</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Націсніце для небяспечнага паўтора</string>
@@ -66,8 +61,6 @@
   <string name="ConversationActivity_group_members">Удзельнікі групы</string>
   <string name="ConversationActivity_group_conversation">Групавая гутарка</string>
   <string name="ConversationActivity_unnamed_group">Неназваная група</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d удзельнікаў</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 ўдзельнік</string>
   <string name="ConversationActivity_saved_draft">Захаваны чарнавік</string>
   <string name="ConversationActivity_invalid_recipient">Няправільны атрымальнік!</string>
   <string name="ConversationActivity_calls_not_supported">Званкі не падтрымліваюцца</string>
@@ -84,11 +77,8 @@
   <string name="ConversationFragment_transport_s_sent_received_s">Транспарт: %1$s\nДаслана/Атрымана: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Адпраўшчык: %1$s\nТранспарт: %2$s\nДаслана: %3$s\nАтрымана: %4$s</string>
   <string name="ConversationFragment_save_to_sd_card">Захаваць на дыск?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Памылка пры захаванні дадатку на дыск!</string>
   <string name="ConversationFragment_success_exclamation">Паспяхова!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Немагчыма запісаць на дыск!</string>
-  <string name="ConversationFragment_saving_attachment">Захаванне дадатку</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Захаванне дадатку на дыск...</string>
   <string name="ConversationFragment_pending">У працэсе...</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
@@ -96,9 +86,9 @@
   <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">Выдаленне</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Выдаленне абраных гутарак...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Паведамленне абмену ключамі...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Выкарыстоўваць кастомны: %s</string>
   <string name="CustomDefaultPreference_using_default">Выкарыстоўваць стандартны: %s</string>
@@ -231,8 +221,6 @@
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Атрыманы пашкоджаны ключ абмену паведамленнямі!</string>
   <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 name="SmsMessageRecord_received_updated_but_unknown_identity_information">Атрыманая інфармацыя абноўленая, але мае невядомую інфармацыю індэнтыфікацыі. Націсніце каб валідзіраваць ідэнтыфікацыю.</string>
   <string name="SmsMessageRecord_duplicate_message">Дублікат паведамлення.</string>
   <!--ThreadRecord-->
@@ -242,7 +230,6 @@
   <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_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>
@@ -250,8 +237,6 @@
   <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_not_verified_exclamation">Не верыфікавана!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Адсканаваныя ключ супадае!</string>
@@ -294,6 +279,7 @@
   <string name="MessageNotifier_media_message">Мультымедыя паведамленне</string>
   <!--QuickResponseService-->
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">Новае паведамленне</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -338,10 +324,11 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Загрузка краінаў...</string>
   <string name="country_selection_fragment__search">Пошук</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <!--experience_upgrade_activity-->
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Не атрымалася ўзяць логі з вашай прылады. Вы па-ранейшаму можаце выкарыстоўваць ADB, каб атрымаць логі замест гэтага.</string>
   <string name="log_submit_activity__thanks">Дзякуй за вашу дапамогу!</string>
   <string name="log_submit_activity__submitting">Падпіска</string>
   <string name="log_submit_activity__posting_logs">Публікацыя логаў у gist...</string>
@@ -374,7 +361,6 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Разблакіраваць</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Каб даслаць медыя ці групавыя паведамленні, націсніце \'OK\' і задайце неабходныя налады. Налады MMS для вашага аператара могуць быць атрыманыя праз пошук у \'APN вашага аператара\'. Вы можаце зрабіць гэта толькі адзін раз. </string>
   <!--recipient_preferences_activity-->
   <!--recipient_preferences-->
   <!--- redphone_call_controls-->
@@ -432,8 +418,6 @@
   <string name="AndroidManifest__public_identity_key">Публічны ідэнтыфікацыйны ключ</string>
   <string name="AndroidManifest__change_passphrase">Змяніць пароль</string>
   <string name="AndroidManifest__verify_identity">Праверыць ідэнтыфікатар</string>
-  <string name="AndroidManifest__log_submit">Даслаць логі</string>
-  <string name="AndroidManifest__media_preview">Папярэдні прагляд медыя</string>
   <string name="AndroidManifest__media_overview">Усе выявы</string>
   <string name="AndroidManifest__media_overview_named">Усе выявы з %1$s</string>
   <!--arrays.xml-->
@@ -462,15 +446,8 @@
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Абярыце кантакт са спісу.</string>
   <string name="preferences__change_passphrase">Змяніць пароль.</string>
   <string name="preferences__enable_passphrase">Уключыць пароль</string>
-  <string name="preferences__passphrase_summary">Пароль %s</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>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Выдаляць пароль з памяці праз пэўны інтэрвал часу</string>
-  <string name="preferences__timeout_passphrase">Час запамінання пароля</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Абярыце час запамінання пароля</string>
-  <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__led_color">колер святлодыёда</string>
   <string name="preferences__led_color_unknown">Невядома</string>
@@ -481,7 +458,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_set">Пэўны ўзор міргацення светладыёда усталяваны!</string>
   <string name="preferences__sound">Гук</string>
   <string name="preferences__change_notification_sound">Змяніць гук апавяшчэння</string>
-  <string name="preferences__inthread_notifications">Апавяшчэнне ў гутарцы</string>
   <string name="preferences__repeat_alerts">Паўтарыць папярэджанні</string>
   <string name="preferences__never">Ніколі</string>
   <string name="preferences__one_time">Адзін раз</string>
@@ -517,19 +493,14 @@
   <string name="preferences__mmsc_password">MMSC Password</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__light_theme">Светлы</string>
   <string name="preferences__dark_theme">Цёмны</string>
   <string name="preferences__appearance">З\'яўленне</string>
   <string name="preferences__theme">Тэма</string>
-  <string name="preferences__theme_summary">Тэма %s</string>
   <string name="preferences__default">Па-змоўчані</string>
   <string name="preferences__language">Мова</string>
-  <string name="preferences__language_summary">Мова %s</string>
   <string name="preferences__submit_debug_log">Выслаць debug log</string>
   <string name="preferences__support_wifi_calling">Рэжым сумяшчальнасці \'WiFi выклік\' </string>
   <!--****************************************-->
@@ -589,8 +560,6 @@
   <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_new_message">Новае паведамленне</string>
   <string name="text_secure_normal__menu_new_group">Новая група</string>
@@ -598,16 +567,14 @@
   <string name="text_secure_normal__menu_clear_passphrase">Заблакіраваць</string>
   <string name="text_secure_normal__mark_all_as_read">Пазначыць усе як прачытаныя</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build_details">Паведамленні больш ня будуць высылацца. Калі ласка абнавіцеся да больш новай версіі.</string>
-  <string name="reminder_header_sms_import_text">Націсніце каб скапіраваць вашыя SMS з тэлефона ў зашыфраваную базу.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Вы</string>
   <string name="MediaPreviewActivity_cant_display">Не атрымліваецца папярэдне праглядзець выяву</string>
   <string name="MediaPreviewActivity_unssuported_media_type">Гэты медыя тып не падтрымліваецца</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Захаваць</string>
+  <!--media_overview-->
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Перадпрагляд выявы</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <!--Trimmer-->

res/values-bg/strings.xml

@@ -8,13 +8,18 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">В момента: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Все още не си сложил парола!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s съобщения на разговор</string>
+  <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+    <item quantity="one">1 съобщение на разговор</item>
+    <item quantity="other">%d съобщения на разговор</item>
+  </plurals>
   <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>
+  <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+    <item quantity="one">Това ще скъси всички разговори до най-новoто съобщение.</item>
+    <item quantity="other">Това ще скъси всички разговори до %dте най-нови съобщения.</item>
+  </plurals>
   <string name="ApplicationPreferencesActivity_delete">Изтрий</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Изключи паролата?</string>
-  <string name="ApplicationPreferencesActivity_disable_lock_screen">
-Изключи заключен екран за съобщения?</string>
+  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Това ще отключи изцяло всички известия съобщения и Signal съобщения.</string>
   <string name="ApplicationPreferencesActivity_disable">Изключи</string>
   <string name="ApplicationPreferencesActivity_unregistering">Отписване</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Дерегистриране от Singal съобщения и обаждания...</string>
@@ -30,12 +35,18 @@
   <string name="ApplicationPreferencesActivity_off">изкл</string>
   <string name="ApplicationPreferencesActivity_Off">Изключено</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
+  <string name="ApplicationPreferencesActivity_privacy_summary">Парола %1$s, Защита на екрана %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">Тема %1$s, Език %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d минути</string>
+  <plurals name="AppProtectionPreferenceFragment_minutes">
+    <item quantity="one">1 минута</item>
+    <item quantity="other">%d минути</item>
+  </plurals>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(изображение)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(аудио)</string>
   <string name="DraftDatabase_Draft_video_snippet">(видео)</string>
+  <string name="DraftDatabase_Draft_location_snippet">(местоположение)</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Неуспешно откирване на папка за избор на файл.</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -63,9 +74,9 @@
   <string name="ConversationItem_expires_s">Изтича: %s</string>
   <string name="ConversationItem_error_not_delivered">Недоставен</string>
   <string name="ConversationItem_view_secure_media_question">Искаш ли да видиш подсигурения медиен файл?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Тази информация се съхранява в криптирана база данни. За съжаление, за да я видиш в момента се изисква данните да бъдат временно разшифровани и записани на диска. Сигурен ли си, че искаш да направиш това?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Медията е запазаена в криптирана база данни. За съжаление, за да я разгледате приложението за разглеждане изисква информацията да бъде времено декриптирана и запазане на диска. Сигурни ли сте че желаете това?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Грешка, загубил давност ключ е получен при обмяна на ключовете.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Получи се съобщение за обмяна на ключове, натисни, за да продължиш.</string>
+  <string name="ConversationItem_received_key_exchange_message_tap_to_process">Получи се съобщение за обмяна на ключове, натисни, за да продължиш.</string>
   <string name="ConversationItem_group_action_left">%1$s напусна групата.</string>
   <string name="ConversationItem_click_for_details">Натисни за повече информация</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Натисни, за да разрешиш преминавене към не криптирани съобщения в краен случай</string>
@@ -73,6 +84,8 @@
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Разреши преминавене към не шифровани MMS-и?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Това съобщение <b>НЯМА</b> да бъде криптирано, защото получтеля вече не е потребител на Signal.\n\nИзпрати незащитено съобщение?</string>
   <string name="ConversationItem_unable_to_open_media">Неуспешно откриване на приложение за отваряне на този файл.</string>
+  <string name="ConversationItem_from_s">от %s</string>
+  <string name="ConversationItem_to_s">do %s</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">Рестартирай сигурната сесия?</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Това може да помогне ако имате проблеми с екрипцията в този разговор. Вашите съобщения ще бъдат запазени.</string>
@@ -91,8 +104,10 @@
   <string name="ConversationActivity_group_members">Членове на групата</string>
   <string name="ConversationActivity_group_conversation">Групов разговор</string>
   <string name="ConversationActivity_unnamed_group">Безименна група</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d участника</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 член</string>
+  <plurals name="ConversationActivity_d_recipients_in_group">
+    <item quantity="one">1 участник</item>
+    <item quantity="other">%d участника</item>
+  </plurals>
   <string name="ConversationActivity_saved_draft">Запазена чернова</string>
   <string name="ConversationActivity_invalid_recipient">Невалиден получател!</string>
   <string name="ConversationActivity_calls_not_supported">Функцията за разговори не се подържа</string>
@@ -128,12 +143,25 @@
     <item quantity="other">Това ще изтрие невъзвращаемо всичките  %1$d избрани съобщения.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Запази на SD картата?</string>
-  <string name="ConversationFragment_saving_this_media_to_storage_warning">Запазване на този файл на външната памет ще разреши на всички други приложения да го виждат и променят.\n\nПродължи?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Грешка при запазване на прикачения файл на SD карта!</string>
+  <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
+    <item quantity="one">Запазването на този медиен файл ще даде достъп до него на всички други приложения.\n\nПродължи?</item>
+    <item quantity="other">Запазването на всички %1$d медийни файла ще даде достъп до тях на всички други приложения.\n\nПродължи?</item>
+  </plurals>
+  <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
+    <item quantity="one">Грешка при запазването на прикаченият файл!</item>
+    <item quantity="other">Грешка при запазването на прикачените файлове!</item>
+  </plurals>
   <string name="ConversationFragment_success_exclamation">Успех!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Неуспеше запис на SD карта!</string>
-  <string name="ConversationFragment_saving_attachment">Запазване на прикачения файл</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Запазване на прикачения файл на SD карта...</string>
+  <plurals name="ConversationFragment_saving_n_attachments">
+    <item quantity="one">Запазване на прикачения файл</item>
+    <item quantity="other">Запазване на %1$d прикачени файла</item>
+  </plurals>
+  <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
+    <item quantity="one">Запазване на прикачения файл...</item>
+    <item quantity="other">Запазване на %1$d прикачени файла...</item>
+  </plurals>
+  <string name="ConversationFragment_collecting_attahments">Събиране на прикачените файлове...</string>
   <string name="ConversationFragment_pending">Предстоящ...</string>
   <string name="ConversationFragment_push">Данни (Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -152,9 +180,20 @@
     <item quantity="other">Това ще изтрие невъзвращаемо всичките  %1$d избрани разговори.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Изтриване</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Изтриване на избраните разговори...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Изтриване на избраните разговори...</string>
+  <plurals name="ConversationListFragment_conversations_archived">
+    <item quantity="one">Разговорът е архивиран</item>
+    <item quantity="other">%d архивирани разговора</item>
+  </plurals>
+  <string name="ConversationListFragment_undo">ВЪЗСТАНОВИ</string>
+  <plurals name="ConversationListFragment_moved_conversations_to_inbox">
+    <item quantity="one">Преместен разговор във входяща кутия</item>
+    <item quantity="other">Преместени %d разговора във входящата кутия</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Съобщение за обмяна на ключовете...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Архивирани разговори (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Използване на специален:  %s</string>
   <string name="CustomDefaultPreference_using_default">Използване на подразбиращ се: %s</string>
@@ -174,6 +213,7 @@
   <string name="DeviceListItem_unnamed_device">Некръстено устройство</string>
   <string name="DeviceListItem_linked_s">Свързан с %s</string>
   <string name="DeviceListItem_last_active_s">Последна активност %s</string>
+  <string name="DeviceListItem_today">Днес</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Сподели с</string>
   <!--ExperienceUpgradeActivity-->
@@ -194,14 +234,14 @@
   <string name="ExportFragment_success">Успех!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Перманентна Signal комуникационна грешка!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не успя да се регистрира с Google Play Services. Комуникация през канала с данни е забранен, моля опитайте да се пререгистрирате през менюто с настройки на Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не успя да се регистрира с Google Play Services. Signal съообщения и разговори са деактивирани, моля пререгистрирайте през менюто Настройки &gt; Допълнителние.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_actionbar_update_title">Промени група</string>
   <string name="GroupCreateActivity_group_name_hint">Име на групата</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Нова MMS група</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Избрахте контакт, който не поддържа Signal групи, така че групата ще бъде MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Не сте регистриран, за да използвате канала за данни, така че Signal групите ще бъдат за деактивирани.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Не сте регистриран за Signal съобщения и разговори, така че Signal групи са деактивирани. Моля, опитайте да се регистрирате в Настройки &gt; Допълнителни.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Настъпи не очаквана грешка, която доведе до неуспешно създаване на група.</string>
   <string name="GroupCreateActivity_contacts_no_members">Трябва да добавиш поне един човек в групата си!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Един от членовете на групата има номер, който не може да бъде разпознат правилно. Моля, оправи номера на контакта или го премахни.</string>
@@ -316,6 +356,8 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <string name="DeviceProvisioningActivity_content_progress_key_error">Невалиден QR код.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">За съжалние имаш твърде много регистрирани устройства, опитай да премахнеш някои от тях...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">За съжаление това не е валидна QR връзка.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Свържи с Signal устройство?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Изглежда се опитвате да свържете Signal устройство с 3та скенер програма. За Ваша сигурност, моля сканирайте кодът повторно използвайки Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Въведи паролата</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal икона</string>
@@ -415,8 +457,7 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <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 name="SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process">Получено е съобщение с не познат ключ за самоличност. Натисни, за да го обработиш и покажеш.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Получена е променена, но непозната информация за самоличност. Натисни, за да я провериш.</string>
   <string name="SmsMessageRecord_secure_session_reset">Сигурната сесия е започната от начало.</string>
   <string name="SmsMessageRecord_duplicate_message">Дублирай съобщението.</string>
@@ -433,8 +474,8 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <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_your_key_scanned">Сканирай моя ключ</string>
+  <string name="VerifyIdentityActivity_scan_contacts_qr_code">Сканирай QR кодът на контакта</string>
+  <string name="VerifyIdentityActivity_display_your_qr_code">Покажи собствения QR code</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>
@@ -442,8 +483,8 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <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_scan_contacts_qr_code">Сканирай QR кодът на контакта</string>
+  <string name="ViewIdentityActivity_display_your_qr_code">Покажи собствения QR code</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ВНИМАНИЕ, сканираният ключ НЕ Е съвпада!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">Не потвърдено!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Сканираният ключ е същия!</string>
@@ -476,6 +517,8 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Извършва се внасяне</string>
   <string name="ApplicationMigrationService_importing_text_messages">Внасяне на текстови съобщения</string>
+  <string name="ApplicationMigrationService_import_complete">Внасянето завършено</string>
+  <string name="ApplicationMigrationService_Signal_system_database_import_is_complete">Внасянето на системната база данни на Signal е завършено.</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_signal_passphrase_cached">Натисните, за да отворите.</string>
   <string name="KeyCachingService_signal_passphrase_cached_with_lock">Натиснете, за да отворите или натиснете катинара, за да затворите.</string>
@@ -498,14 +541,15 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Бърз отговор не е възможен, когато Signal е заключен!</string>
   <string name="QuickResponseService_problem_sending_message">Проблем при изпрашане на съобщение!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Ново Signal съобщение</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Съдържанието е скрито</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Ново съобщение</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Изображение</string>
   <string name="attachment_type_selector__audio">Аудио</string>
   <string name="attachment_type_selector__video">Видео</string>
   <string name="attachment_type_selector__contact">Контакт</string>
   <string name="attachment_type_selector__camera">Камера</string>
+  <string name="attachment_type_selector__location">Местоположение</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Стара парола</string>
   <string name="change_passphrase_activity__new_passphrase">Нова парола</string>
@@ -558,12 +602,17 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Зареждане на държавите...</string>
   <string name="country_selection_fragment__search">Търси</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Сканирай QR кодът, показан на устройството, за да се свържете</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Свържи устройство</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Няма свързани устройства...</string>
+  <string name="device_list_fragment__link_new_device">Свържи ново устройство</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">продължи</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Не успешен опит да се сдобием с доклада от устройството ти. Въпреки това можеш да ползваш ADB, за да се добиеш с доклада.</string>
+  <string name="log_submit_activity__log_fetch_failed">Неуспешно прочитане на доклада на Вашето устройство. Все пак може да използвате ADB, за да получте доклада.</string>
   <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
   <string name="log_submit_activity__submitting">Изпращане</string>
   <string name="log_submit_activity__posting_logs">Изпращане на доклад до gist...</string>
@@ -609,7 +658,7 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <string name="prompt_passphrase_activity__unlock">Отключи</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal се нуждае от MMS настройки, за да може да достави медийни и групови съобщения през мрежата. Устройството ти не прави тази информация достъпна, което се случва понякога за заключени устройва и други ограничени конфигурации.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">За да изптратиш медийни и групови съобщения, избери \'ОК\' и нагласи изискваните настройки. MMS настройките на твоя мобилен оператор могат да бъдат намерени като потърсиш \'APN настройки\'. Нужно е да изпълниш тази стъпка само веднъж.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">За да изптратиш медийни и групови съобщения, избери \'ОК\' и нагласи изискваните настройки. MMS настройките на твоя мобилен оператор могат да бъдат намерени като потърсиш \'APN настройки\'. Нужно е да изпълниш тази стъпка само веднъж.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">БЛОКИРАН</string>
   <!--recipient_preferences-->
@@ -660,16 +709,15 @@ Signal може да ти се обади, за да потвърди номер
   <string name="registration_progress_activity__call_me">Обади ми се</string>
   <string name="registration_progress_activity__edit_number">Промени номера</string>
   <string name="registration_progress_activity__connectivity_error">Грешка при свързването.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal не успя да се свъже с пуш интернет услугата.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal не успя да се свърже със сървъра.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Няколко вероятни
 проблема включват:
 </string>
   <string name="registration_progress_activity__no_network_connectivity">Няма интернет
 връзка.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Вашето
-устройство се нуждае от връзка с интернет, за да ползвате Signal функциите.
-Провере, за да се уверите, че сте свързани към 3G или Wi-Fi.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Устройствот Ви
+се нуждае от връзка с интернет, за да може да използва тази Signal услуга.
+Проверете и се убедете, че сте свързани с мобилната мрежа или Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall-a e твърде рестриктивен.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Ако сте свързане през Wi-Fi, възможно е да имате firewall, който блокирва достъпа до Signal сървъра. Оптайте друг вид достъп до интернет.</string>
@@ -713,12 +761,13 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="AndroidManifest__change_passphrase">Смени паролата</string>
   <string name="AndroidManifest__verify_identity">Провери самоличността</string>
   <string name="AndroidManifest__log_submit">Изпрати доклад</string>
-  <string name="AndroidManifest__media_preview">Преглед на файла</string>
+  <string name="AndroidManifest__media_preview">Преглед на медията</string>
   <string name="AndroidManifest__media_overview">Всички изображения</string>
   <string name="AndroidManifest__media_overview_named">Всички изображения с %1$s</string>
-  <string name="AndroidManifest__message_details">Информаця за съобщението</string>
+  <string name="AndroidManifest__message_details">Информация за съобщението</string>
   <string name="AndroidManifest_manage_linked_devices">Управление на свързани устройства</string>
   <string name="AndroidManifest__invite_friends">Поканете приятели</string>
+  <string name="AndroidManifest_archived_conversations">Архивирани разговори</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__your_identity_key">Вашият ключ за самоличност</string>
@@ -761,18 +810,16 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="preferences__change_passphrase">Смени паролата</string>
   <string name="preferences__change_your_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__lock_signal_and_message_notifications_with_a_passphrase">Заключи Signal и всички извесития с парола</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>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Изтрий паролата от паметта след известно време</string>
-  <string name="preferences__timeout_passphrase">Изтичане на паролата</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Продължителност на помненето на паролата</string>
-  <string name="preferences__pref_timeout_interval_title">Продължителност на помненето</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Продължителнос от време, преди да забравя паролата от памета</string>
+  <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Автоматично заключвай Signal след зададен период от неактивност</string>
+  <string name="preferences__inactivity_timeout_passphrase">Парола за период на неактивност</string>
+  <string name="preferences__inactivity_timeout_interval">Продължителност на период за неактивност</string>
   <string name="preferences__notifications">Известия</string>
   <string name="preferences__enable_message_notifications">Разреши известия за съобщения</string>
+  <string name="preferences__new_contacts_notifications">Известия за нови контакти</string>
+  <string name="preferences__show_a_notification_for_new_signal_contacts">Показва известия за нови Signal контакти</string>
   <string name="preferences__led_color">LED цвят</string>
   <string name="preferences__led_color_unknown">Непознат</string>
   <string name="preferences__pref_led_blink_title">LED известяване</string>
@@ -783,7 +830,7 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="preferences__sound">Мелодия</string>
   <string name="preferences__change_notification_sound">Промени звуков сигнал за известие</string>
   <string name="preferences__silent">Тих</string>
-  <string name="preferences__inthread_notifications">Известия по време на разговор</string>
+  <string name="preferences__in_conversation_notifications">Известия по време на разговор</string>
   <string name="preferences__play_inthread_notifications">Пускай звук за известие докато гледаш активен чат</string>
   <string name="preferences__repeat_alerts">Повтарящи се аларми</string>
   <string name="preferences__never">Никога</string>
@@ -821,21 +868,19 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="preferences__mmsc_password">MMSC Парола</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__automatically_delete_older_messages_once_a_conversation_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>
+  <string name="preferences__trim_all_conversations_now">Скъси всички разговори сега</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Сканирай всички разговори и приложи ограничението за дължина на разговори</string>
   <string name="preferences__devices">Устройства</string>
   <string name="preferences__light_theme">Светла</string>
   <string name="preferences__dark_theme">Тъмна</string>
   <string name="preferences__appearance">Външен вид</string>
   <string name="preferences__theme">Тема</string>
-  <string name="preferences__theme_summary">Тема %s</string>
   <string name="preferences__default">По подразбиране</string>
   <string name="preferences__language">Език</string>
-  <string name="preferences__language_summary">Език %s</string>
   <string name="preferences__signal_messages_and_calls">Signal съобщения и обаждания</string>
   <string name="preferences__free_private_messages_and_calls">Безплатни, лични съобщения и обаждания до Signal потребители</string>
   <string name="preferences__submit_debug_log">Изпрати доклад</string>
@@ -882,11 +927,14 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Изтрий избраното</string>
   <string name="conversation_list_batch__menu_select_all">Избери всичко</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Архивът е избран</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Деархивирай изрбания</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Търси</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Изображение на контакта</string>
   <string name="conversation_list_item_view__error_alert">Известие за грешка</string>
+  <string name="conversation_list_item_view__archived">Архивиран</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Нов разговор</string>
   <!--conversation_secure_verified-->
@@ -915,8 +963,8 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <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>
+  <string name="key_scanning__menu_display_your_qr_code">Покажи собствения QR code</string>
+  <string name="key_scanning__menu_scan_contacts_qr_code">Сканирай QR кодът на контакта</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ново съобщение</string>
   <string name="text_secure_normal__menu_new_group">Нова група</string>
@@ -924,15 +972,22 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="text_secure_normal__menu_clear_passphrase">Заключи</string>
   <string name="text_secure_normal__mark_all_as_read">Маркирай всички като прочетени</string>
   <string name="text_secure_normal__invite_friends">Поканете приятели</string>
+  <string name="text_secure_normal__help">Помощ</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build">Вдашата Signal версия е изтекла!</string>
-  <string name="reminder_header_expired_build_details">Съобщенията няма повече да бъдат успешно доставени, моля, обновете до най-новата версия.</string>
+  <string name="reminder_header_outdated_build">Вашата версия на Signal е стара</string>
+  <plurals name="reminder_header_outdated_build_details">
+    <item quantity="one">Вашата версия на Signal ще изтече след 1 ден. Натиснете, за да обновите до най-новата версия.</item>
+    <item quantity="other">Вашата версия на Signal ще изтече след %d дена. Натиснете, за да обновите до най-новата версия.</item>
+  </plurals>
+  <string name="reminder_header_outdated_build_details_today">Вашата версия на Signal ще изтече днес. Натиснете, за да обновите до най-новата версия.</string>
+  <string name="reminder_header_expired_build">Вашата версоя ма Signal е изтекла!</string>
+  <string name="reminder_header_expired_build_details">Съобщенията няма да успесно изпращани от сега нататък. Натиснете, за да обновите до най-новата версия.</string>
   <string name="reminder_header_expired_build_button">ОБНОВИ</string>
   <string name="reminder_header_sms_default_title">Използвай като SMS програма по подразбиране</string>
   <string name="reminder_header_sms_default_text">Натисни, за да направиш Signal своята SMS програма по подразбиране.</string>
   <string name="reminder_header_sms_default_button">ЗАДАЙ</string>
   <string name="reminder_header_sms_import_title">Внеси системните SMS-и</string>
-  <string name="reminder_header_sms_import_text">Натисните, за да копирате своите SMS съобщения в шифрованата база данни.</string>
+  <string name="reminder_header_sms_import_text">Натиснете, за да копирате SMS съобщенията от Вашия телефон в криптираната база данни на Сигнал.</string>
   <string name="reminder_header_sms_import_button">ВНЕСИ</string>
   <string name="reminder_header_push_title">Активирай Singal съобщения и обаждания</string>
   <string name="reminder_header_push_text">Обнови комуникацията си.</string>
@@ -950,8 +1005,10 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="MediaPreviewActivity_unssuported_media_type">Неподдържан медиен формат.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Запази</string>
+  <!--media_overview-->
+  <string name="media_overview__save_all">Запази всички</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Преглед на изображение</string>
+  <string name="media_preview_activity__image_content_description">Преглед на изображението</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Освежи</string>
   <!--redphone_audio_popup_menu-->
@@ -964,8 +1021,5 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="trimmer__old_messages_successfully_deleted">Старите съобщения бяха успешно изтрити</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Икона за транспорт</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Сканирай QR кодът, показан на устройството, за да се свържете</string>
-  <string name="device_link_fragment__link_device">Свържи устройство</string>
-  <string name="device_list_fragment__link_new_device">Свържи ново устройство</string>
   <!--EOF-->
 </resources>

res/values-cs/strings.xml

@@ -8,13 +8,20 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Aktuálně: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Dosud nemáte nastavené heslo!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s zpráv na konverzaci</string>
+  <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+    <item quantity="one">1 zpráva na konverzaci</item>
+    <item quantity="few">%d zprávy na konverzaci</item>
+    <item quantity="other">%d zpráv na konverzaci</item>
+  </plurals>
   <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>
+  <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+    <item quantity="one">Tímto zkrátíte všechny konverzace na poslední zprávu.</item>
+    <item quantity="few">Tímto zkrátíte všechny konverzace na posledních %d zprávy.</item>
+    <item quantity="other">Tímto zkrátíte všechny konverzace na posledních %d zpráv.</item>
+  </plurals>
   <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_this_will_permanently_unlock_signal_and_message_notifications">Tímto trvale odemkenete Signal a upozornění na zprávy.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivovat</string>
   <string name="ApplicationPreferencesActivity_unregistering">Rušení registrace</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Odregistrace Signal zpráv a volání</string>
@@ -30,12 +37,19 @@ Zakázat uzamčení obrazovky zpráv?</string>
   <string name="ApplicationPreferencesActivity_off">vyp.</string>
   <string name="ApplicationPreferencesActivity_Off">Vyp.</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
+  <string name="ApplicationPreferencesActivity_privacy_summary">Heslo %1$s, Zabezpečení obrazovky %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">Téma %1$s, Jazyk %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d minut</string>
+  <plurals name="AppProtectionPreferenceFragment_minutes">
+    <item quantity="one">1 minuta</item>
+    <item quantity="few">%d minuty</item>
+    <item quantity="other">%d minut</item>
+  </plurals>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(obrázek)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
   <string name="DraftDatabase_Draft_video_snippet">(video)</string>
+  <string name="DraftDatabase_Draft_location_snippet">(poloha)</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nemohu nalézt aplikaci pro vybraný typ dat.</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -64,9 +78,9 @@ kontakt</string>
   <string name="ConversationItem_expires_s">Vyprší: %s</string>
   <string name="ConversationItem_error_not_delivered">Nedoručeno</string>
   <string name="ConversationItem_view_secure_media_question">Zobrazit zabezpečená média?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tato média byla uložena v zašifrované databázi. Aby bylo možné je zobrazit v jiném programu, musí být dočasně dešifrována a v dešifrované podobě uložena. Opravdu to chcete udělat?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tato media jsou uložena v zašifrované databázi. Bohužel, abyste je mohli prohlížet jinou aplikací, je nutno je dešifrovat a uložit dešifrované do úložiště. Opravdu to chcete udělat?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Chyba při předávání klíčů.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Byl vám doručen klíč, klepněte pro jeho přijetí.</string>
+  <string name="ConversationItem_received_key_exchange_message_tap_to_process">Byl vám doručen klíč, klikněte pro jeho zpracování.</string>
   <string name="ConversationItem_group_action_left">%1$s opustil(a) skupinu.</string>
   <string name="ConversationItem_click_for_details">Klikněte pro detail</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Klikněte pro nešifrovaný záložní způsob</string>
@@ -74,6 +88,8 @@ kontakt</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Použít záložní způsob přes nešifrovanou MMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tato zpráva <b>není</b> šifrována, protože příjemce již není uživatelem Signal.\n\nOdeslat nešifrovanou zprávu?</string>
   <string name="ConversationItem_unable_to_open_media">Nemohu nalézt aplikaci pro otevření tohoto typu dat.</string>
+  <string name="ConversationItem_from_s">od %s</string>
+  <string name="ConversationItem_to_s">%s</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">Resetovat zabezpečenou konverzaci?</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Může to pomoct pokud máte problém s šifrováním této konverzace. Vaše zprávy zůstanou zachovány.</string>
@@ -92,8 +108,11 @@ kontakt</string>
   <string name="ConversationActivity_group_members">Členové skupiny</string>
   <string name="ConversationActivity_group_conversation">Skupinová konverzace</string>
   <string name="ConversationActivity_unnamed_group">Nepojmenovaná skupina</string>
-  <string name="ConversationActivity_d_recipients_in_group">Počet členů: %d</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 člen</string>
+  <plurals name="ConversationActivity_d_recipients_in_group">
+    <item quantity="one">1 člen</item>
+    <item quantity="few">%d členové</item>
+    <item quantity="other">%d členů</item>
+  </plurals>
   <string name="ConversationActivity_saved_draft">Uložený koncept</string>
   <string name="ConversationActivity_invalid_recipient">Chybný příjemce!</string>
   <string name="ConversationActivity_calls_not_supported">Volání není podporováno</string>
@@ -131,12 +150,29 @@ kontakt</string>
     <item quantity="other">Tímto trvale smažete všech %1$d označených zpráv.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Uložit do paměti?</string>
-  <string name="ConversationFragment_saving_this_media_to_storage_warning">Uložením dat do paměti k nim umožníte přístup kterékoliv aplikaci ve svém telefonu.\n\nPokračovat?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Chyba při ukládání přílohy!</string>
+  <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
+    <item quantity="one">Uložíte-li přílohu do úložiště, budou k ní mít přístup všechny aplikace ve vašem zařízení.\n\nPokračovat?</item>
+    <item quantity="few">Uložíte-li %1$d přílohy do úložiště, budou k nim mít přístup všechny aplikace ve vašem zařízení.\n\nPokračovat?</item>
+    <item quantity="other">Uložíte-li všech %1$d příloh do úložiště, budou k nim mít přístup všechny aplikace ve vašem zařízení.\n\nPokračovat?</item>
+  </plurals>
+  <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
+    <item quantity="one">Chyba při ukládání příloy!</item>
+    <item quantity="few">Chyba při ukládání příloh!</item>
+    <item quantity="other">Chyba při ukládání příloh!</item>
+  </plurals>
   <string name="ConversationFragment_success_exclamation">Úspěšně dokončeno!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nelze uložit data do paměti.</string>
-  <string name="ConversationFragment_saving_attachment">Ukládám přílohu</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Ukládám přílohu do paměti.</string>
+  <plurals name="ConversationFragment_saving_n_attachments">
+    <item quantity="one">Ukládám přílohu</item>
+    <item quantity="few">Ukládám %1$d přílohy</item>
+    <item quantity="other">Ukládám %1$d příloh</item>
+  </plurals>
+  <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
+    <item quantity="one">Příloha uložena do úložiště</item>
+    <item quantity="few">Uloženo %1$d přílohy do úložiště</item>
+    <item quantity="other">Uloženo %1$d příloh do úložiště</item>
+  </plurals>
+  <string name="ConversationFragment_collecting_attahments">Shromažďuji přílohy...</string>
   <string name="ConversationFragment_pending">Probíhající:</string>
   <string name="ConversationFragment_push">Data(Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -157,9 +193,22 @@ kontakt</string>
     <item quantity="other">Tímto trvale smažete všech %1$d označených konverzací.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Mažu</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Mažu označené konverzace...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Mažu označené konverzace...</string>
+  <plurals name="ConversationListFragment_conversations_archived">
+    <item quantity="one">Konverzace archivována</item>
+    <item quantity="few">%d konverzace archivovány</item>
+    <item quantity="other">%d konverzací archivováno</item>
+  </plurals>
+  <string name="ConversationListFragment_undo">ZPĚT</string>
+  <plurals name="ConversationListFragment_moved_conversations_to_inbox">
+    <item quantity="one">Konverzace přesunuta do složky příchozích zpráv</item>
+    <item quantity="few">Přesunuty %d konverzace do složky příchozích zpráv</item>
+    <item quantity="other">Přesunuto %d konverzací do složky příchozích zpráv</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Předávání klíčů...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Archivované konverzace (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Používá se vlastní: %s</string>
   <string name="CustomDefaultPreference_using_default">Používá se výchozí: %s</string>
@@ -179,6 +228,7 @@ kontakt</string>
   <string name="DeviceListItem_unnamed_device">Nepojmenované zřízení</string>
   <string name="DeviceListItem_linked_s">Provázáno %s</string>
   <string name="DeviceListItem_last_active_s">Naposled aktivní %s</string>
+  <string name="DeviceListItem_today">Dnes</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Sdílet s</string>
   <!--ExperienceUpgradeActivity-->
@@ -199,14 +249,14 @@ kontakt</string>
   <string name="ExportFragment_success">Úspěšně dokončeno!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikace Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal se nemůže registrovat k službě Google Play. Datová komunikace byla zakázána, prosím zkuste se znovu registrovat v menu nastavení Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Sginal se nemůže registrovat k službě Google Play. Zprávy a volání jsou proto zakázány: Prosím zkuste se znovu registrovat v menu Nastavení &gt; Rozšířené.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
   <string name="GroupCreateActivity_actionbar_update_title">Upravit skupinu</string>
   <string name="GroupCreateActivity_group_name_hint">Název skupiny</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nová MMS skupina</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Vybrali jste kontakt</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Nejste zaregistrován k použití datové komunikace, takže jsou skupiny Signal zakázány.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Nejste zaregistrován k použití Signalu pro zprávy a volání, takže jsou skupiny Signal zakázány. Prosím registrujte se v Nastavení &gt; Rozšířené</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Došlo k neočekávané chybě, která znemožnila vytvoření skupiny.</string>
   <string name="GroupCreateActivity_contacts_no_members">Ve vaší skupině musí být alespoň jeden kontakt.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jeden z členů Vaší skupiny má číslo, které se nedaří správně zpracovat. Prosím opravte jej nebo odstraňte a zkuste znovu.</string>
@@ -319,6 +369,8 @@ tuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Omlouváme se, ale máte provázáno příliš mnoho zařízení, pokuste se některé odpojit...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Omlouváme se, ale toto není platný QR kód pro provázání zařízení</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Provázat zařízení Signal?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Zdá se se snažíte provázat zařízení Signal použitím jiné skennovací aplikace. Pro vaši ochranu, prosím oskenujete kód ještě jednou z aplikace Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Zadat heslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona Signal</string>
@@ -363,7 +415,7 @@ tuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string
   <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Volané číslo nepodporuje šifrované hovory!</string>
   <string name="RedPhone_got_it">Mám to.</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_signal">Připojení pomocí Signal</string>
+  <string name="RegistrationActivity_connect_with_signal">Připojení pomocí Signál</string>
   <string name="RegistrationActivity_select_your_country">Zvolte svou zemi</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Zadejte kód
 vaší země</string>
@@ -412,8 +464,7 @@ telefonní číslo</string>
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Obdržen neplatný požadavek na výměnu klíčů.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zpracování a zobrazení.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process">Přijata zpráva s neznámým identifikačním klíčem. Klikněte pro její zpracování a zobrazení.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Aktualizována přijatá dat od neznámé identity. Klikněte pro ověření identity.</string>
   <string name="SmsMessageRecord_secure_session_reset">Reset zabezpečené komunikace.</string>
   <string name="SmsMessageRecord_duplicate_message">Duplicitní zpráva</string>
@@ -430,8 +481,8 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nemáte identifikační klíč.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Příjemce nemá identifikační klíč.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Příjemce nemá identifikační klíč!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Nasnímat cizí klíč pro srovnání</string>
-  <string name="VerifyIdentityActivity_get_your_key_scanned">Získejte váš naskenovaný klíč</string>
+  <string name="VerifyIdentityActivity_scan_contacts_qr_code">Skenovat QR kód kontaktu</string>
+  <string name="VerifyIdentityActivity_display_your_qr_code">Zobrazit váš QR kód</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROVÁNÍ, nasnímaný klíč NENÍ SPRÁVNÝ! Zkontrolujte prosím textový otisk.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NEověřeno!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Klíč protistrany je správný. Protistrana by měla ještě ověřit váš vlastní klíč.</string>
@@ -439,8 +490,8 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nemáte identifikační klíč!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nemáte identifikační klíč.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Nasnímej a porovnej</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Nechat se naskenovat k porovnání</string>
+  <string name="ViewIdentityActivity_scan_contacts_qr_code">Skenovat QR kód kontaktu</string>
+  <string name="ViewIdentityActivity_display_your_qr_code">Zobrazit váš QR kód</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">UPOZORNĚNÍ: naskenovaný klíč nesouhlasí</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NEověřeno!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Nasnímaný klíč souhlasí!</string>
@@ -473,6 +524,8 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Probíhá import</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importuji textové zprávy</string>
+  <string name="ApplicationMigrationService_import_complete">Import dokončen</string>
+  <string name="ApplicationMigrationService_Signal_system_database_import_is_complete">Import systémové databáze Signál je dokončen.</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_signal_passphrase_cached">Stisknutím otevřete.</string>
   <string name="KeyCachingService_signal_passphrase_cached_with_lock">Dotykem otevřete nebo stisknutím zámku uzamkněte.</string>
@@ -495,14 +548,15 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Rychlá dopověď není dostupná pokud je Signal uzamčen!</string>
   <string name="QuickResponseService_problem_sending_message">Problém při odesílání zprávy!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Nová Signal zpráva</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Obsah skrytý</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nová zpráva</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Obrázek</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__video">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
+  <string name="attachment_type_selector__location">Poloha</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Původní heslo</string>
   <string name="change_passphrase_activity__new_passphrase">Nové heslo</string>
@@ -555,12 +609,17 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Načítám země...</string>
   <string name="country_selection_fragment__search">Hledat</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scanovat QR kód zobrazný na zařízení pro provázní</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Provázat zařízení</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Žádná zařízení nejsou provázána...</string>
+  <string name="device_list_fragment__link_new_device">Provázat nové zařízení</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">pokračovat</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__log_fetch_failed">Na vašem zařízení nelze číst log. Můžete místo toho použít pro získání logu ADB.</string>
   <string name="log_submit_activity__thanks">Díky za Vaši pomoc!</string>
   <string name="log_submit_activity__submitting">Odesílání</string>
   <string name="log_submit_activity__posting_logs">Posílání logů do gist...</string>
@@ -607,7 +666,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="prompt_passphrase_activity__unlock">Odemknout</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal vyžaduje informace o nastavení MMS, aby mohly být média a skupinové zprávy doručovány. Váš přístroj tyto informace neposkytuje, což se stává u zamknutých nebo jinak upravených přístrojů.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pro odesílání médií a skupinových zpráv klepněte na OK a vyplňte požadované informace. Nastavení MMS pro vašeho operátora lze většinou zjistit hledáním \"*váš operátor* APN\". Toto je je třeba udělat pouze jednou.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">Pro odesílání médií a skupinových zpráv klepněte na OK a vyplňte požadované informace. Nastavení MMS pro vašeho operátora lze většinou zjistit hledáním \"*váš operátor* APN\". Toto stačí udělat pouze jednou.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BLOKOVÁN</string>
   <!--recipient_preferences-->
@@ -657,15 +716,13 @@ Je možné také použít telefonní ověření. Signal vám může zavolat a ov
   <string name="registration_progress_activity__call_me">Zavolej mi</string>
   <string name="registration_progress_activity__edit_number">Upravit číslo</string>
   <string name="registration_progress_activity__connectivity_error">Chyba připojení.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal se nemůže připojit ke službe push.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal se nemůže připojit k serveru.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Příčiny mohou být:</string>
   <string name="registration_progress_activity__no_network_connectivity">Není připojení
         k síti.
     </string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Vaše
-zařízení potřebuje síťové připojení aby moh používat tuto funkci aplikace Signal. Zkontrolujte,
-zda je připojeno k 3G nebo Wifi</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Abyste mohli použít tuto funkci Signal, musíte být připojeni k internetu.
+Zkontrolujte, zda jste připojeni přes obilním data nebo Wifi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Jste-li připojeni přes Wifi, je možné, že existuje firewall který blokuje přístup k Signal serverům. Zkuste jinou síť, nebo mobilní data.</string>
@@ -710,13 +767,14 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="AndroidManifest__public_identity_key">Veřejný identifikační klíč</string>
   <string name="AndroidManifest__change_passphrase">Změnit heslo</string>
   <string name="AndroidManifest__verify_identity">Ověření identity</string>
-  <string name="AndroidManifest__log_submit">Odeslat ladící logy</string>
-  <string name="AndroidManifest__media_preview">Náhled dat</string>
+  <string name="AndroidManifest__log_submit">Odeslat ladící log</string>
+  <string name="AndroidManifest__media_preview">Náhled multimedií</string>
   <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_linked_devices">Spravovat provázaná zařízení</string>
   <string name="AndroidManifest__invite_friends">Pozvat přátele</string>
+  <string name="AndroidManifest_archived_conversations">Archivované konverzace</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__your_identity_key">Váš identifikační klíč</string>
@@ -752,7 +810,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences__input_settings">Nastavení vstupu</string>
   <string name="preferences__enable_enter_key_title">Používat Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Nahradit klávesu smajlík klávesou enter</string>
-  <string name="preferences__pref_enter_sends_title">Klávesa \'Enter\' odesílá</string>
+  <string name="preferences__pref_enter_sends_title">Klávesa Enter odesílá</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Stisk tlačítka \'enter\' na klávesnici odešle zprávu</string>
   <string name="preferences__display_settings">Nastavení zobrazení</string>
   <string name="preferences__choose_identity">Zvolit identitu</string>
@@ -760,18 +818,16 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences__change_passphrase">Změnit heslo</string>
   <string name="preferences__change_your_passphrase">Změna vašeho hesla</string>
   <string name="preferences__enable_passphrase">Povolit přístupové heslo</string>
-  <string name="preferences__passphrase_summary">Heslo %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">Povolit uzamčení obrazovky zpráv</string>
+  <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Zamknout Signal a upozornění na zprávy heslem</string>
   <string name="preferences__screen_security">Zabezpečení obrazovky</string>
-  <string name="preferences__screen_security_summary">Zabezpečení obrazovky %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Zablokovat náhled v seznamu aplikací</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Po určitém čase zapomenout heslo</string>
-  <string name="preferences__timeout_passphrase">Vypršení hesla</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Volba času zapomenutí hesla</string>
-  <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__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Automaticky zamknout Signal po určité době neaktivity</string>
+  <string name="preferences__inactivity_timeout_passphrase">Heslo po době neaktivity</string>
+  <string name="preferences__inactivity_timeout_interval">Interval neaktivity</string>
   <string name="preferences__notifications">Upozornění</string>
   <string name="preferences__enable_message_notifications">Povolit upozornění na zprávy</string>
+  <string name="preferences__new_contacts_notifications">Upozornění na nové kontakty</string>
+  <string name="preferences__show_a_notification_for_new_signal_contacts">Zobrazit upozornění na nové kontakty Signal.</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>
@@ -782,7 +838,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences__sound">Zvuk</string>
   <string name="preferences__change_notification_sound">Změnit zvuk upozornění</string>
   <string name="preferences__silent">Ticho</string>
-  <string name="preferences__inthread_notifications">Upozornění v konverzaci</string>
+  <string name="preferences__in_conversation_notifications">Upozornění během konverzace</string>
   <string name="preferences__play_inthread_notifications">Přehrát zvuk oznámení při prohlížení aktivní konverzace</string>
   <string name="preferences__repeat_alerts">Opakovat upozornění</string>
   <string name="preferences__never">Nikdy</string>
@@ -820,21 +876,19 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences__mmsc_password">MMSC Heslo</string>
   <string name="preferences__sms_delivery_reports">Doručenky SMS</string>
   <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__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Automaticky mazat starší zprávy jakmile konverzace přesáhne nastavenou 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>
+  <string name="preferences__trim_all_conversations_now">Zkrátit všechny konverzace teď</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Prohledat všechny konverzace a uplatnit limit délky.</string>
   <string name="preferences__devices">Zařízení</string>
   <string name="preferences__light_theme">Světlý</string>
   <string name="preferences__dark_theme">Tmavý</string>
   <string name="preferences__appearance">Chování</string>
   <string name="preferences__theme">Vzhled</string>
-  <string name="preferences__theme_summary">Vzhled %s</string>
   <string name="preferences__default">Výchozí</string>
   <string name="preferences__language">Jazyk</string>
-  <string name="preferences__language_summary">Jazyk %s</string>
   <string name="preferences__signal_messages_and_calls">Signal zpravy a volání</string>
   <string name="preferences__free_private_messages_and_calls">Svobodné šifrované zprávy a volání uživatelům Signal</string>
   <string name="preferences__submit_debug_log">Odeslat ladící log</string>
@@ -881,11 +935,14 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Smazat označené</string>
   <string name="conversation_list_batch__menu_select_all">Označit vše</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Vybrán archiv</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Obnovit vybrané z archivu</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Hledat</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Fotografie kontaktu</string>
   <string name="conversation_list_item_view__error_alert">Upozornění na chybu</string>
+  <string name="conversation_list_item_view__archived">Archivováno</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nová konverzace</string>
   <!--conversation_secure_verified-->
@@ -914,8 +971,8 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="conversation_group_options__broadcast">Rozeslat</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Porovnat</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Nechat se naskenovat</string>
-  <string name="key_scanning__menu_scan_to_compare">Nasnímej a porovnej</string>
+  <string name="key_scanning__menu_display_your_qr_code">Zobrazit váš QR kód</string>
+  <string name="key_scanning__menu_scan_contacts_qr_code">Skenovat QR kód kontaktu</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nová zpráva</string>
   <string name="text_secure_normal__menu_new_group">Nová skupina</string>
@@ -923,15 +980,23 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="text_secure_normal__menu_clear_passphrase">Uzamknout</string>
   <string name="text_secure_normal__mark_all_as_read">Označit vše jako přečtené</string>
   <string name="text_secure_normal__invite_friends">Pozvat přátele</string>
+  <string name="text_secure_normal__help">Nápověda</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build">Platnost vaší verze aplikace Signal skončila!</string>
-  <string name="reminder_header_expired_build_details">Zprávy již nemohou být odesílány, prosím aktualizujte na nejnovější verzi.</string>
+  <string name="reminder_header_outdated_build">Vaše verze aplikace Signal je zastaralá</string>
+  <plurals name="reminder_header_outdated_build_details">
+    <item quantity="one">Platnost vaší verze aplikace Signal skončí za 1 den. Dotykem aktualizujte na nejnovější verzi.</item>
+    <item quantity="few">Platnost vaší verze aplikace Signal skončí za %d dny. Dotykem aktualizujte na nejnovější verzi.</item>
+    <item quantity="other">Platnost vaší verze aplikace Signal skončí za %d dnů. Dotykem aktualizujte na nejnovější verzi.</item>
+  </plurals>
+  <string name="reminder_header_outdated_build_details_today">Platnost vaší verze aplikace Signal skončí dnes. Dotykem aktualizujte na nejnovější verzi.</string>
+  <string name="reminder_header_expired_build">Platnost vaší verze aplikace Signal vypršela!</string>
+  <string name="reminder_header_expired_build_details">Zprávy nemohou být úspěšně odesílány. Dotykem aktulizujte na nejnovější verzi.</string>
   <string name="reminder_header_expired_build_button">AKTUALIZOVAT</string>
   <string name="reminder_header_sms_default_title">Nastavit jako výchozí aplikaci pro SMS</string>
   <string name="reminder_header_sms_default_text">Dotykem nastavíte Signal jako výchozí SMS aplikaci</string>
   <string name="reminder_header_sms_default_button">NASTAVIT</string>
   <string name="reminder_header_sms_import_title">Importovat SMS ze systému</string>
-  <string name="reminder_header_sms_import_text">Poklepejte ke zkopírování SMS zpráv ve Vašem telefonu do šifrované databáze.</string>
+  <string name="reminder_header_sms_import_text">Klikněte pro zkopírování SMS z telefonu do šifrované databáze Signal.</string>
   <string name="reminder_header_sms_import_button">IMPORTOVAT</string>
   <string name="reminder_header_push_title">Povolit Signal zprávy a volání</string>
   <string name="reminder_header_push_text">Lepší zážitky z komunikace.</string>
@@ -949,6 +1014,8 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="MediaPreviewActivity_unssuported_media_type">Nepodporovaný typ dat.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Uložit</string>
+  <!--media_overview-->
+  <string name="media_overview__save_all">Uložit vše</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Náhled obrázku</string>
   <!--new_conversation_activity-->
@@ -963,8 +1030,5 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="trimmer__old_messages_successfully_deleted">Staré zprávy byly úspěšně smazány.</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona přenosu</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scanovat QR kód zobrazný na zařízení pro provázní</string>
-  <string name="device_link_fragment__link_device">Provázat zařízení</string>
-  <string name="device_list_fragment__link_new_device">Provázat nové zařízení</string>
   <!--EOF-->
 </resources>

res/values-da/strings.xml

@@ -8,14 +8,17 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Nu: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har endnu ikke indtastet et kodeord!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s beskeder pr. samtale</string>
+  <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+    <item quantity="one">1 besked pr. samtale</item>
+    <item quantity="other">%d beskeder pr. samtale</item>
+  </plurals>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slet alle gamle beskeder?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på, du vil trimme ALLE samtaletråde til de sidste %s beskeder?</string>
+  <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+    <item quantity="one">Dette vil øjeblikkeligt reducere alle samtaler til den nyeste besked.</item>
+    <item quantity="other">Dette vil øjeblikkeligt reducere alle samtaler til de %d nyeste beskeder.</item>
+  </plurals>
   <string name="ApplicationPreferencesActivity_delete">Slet</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Deaktivér kodeord?</string>
-  <string name="ApplicationPreferencesActivity_disable_lock_screen">
-Deaktivér låseskærm for beskeder?
-</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivér</string>
   <string name="ApplicationPreferencesActivity_unregistering">Afregistrerer</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Afregistrerer fra Signalbeskeder og -opkald...</string>
@@ -31,8 +34,13 @@ Deaktivér låseskærm for beskeder?
   <string name="ApplicationPreferencesActivity_off">slukket</string>
   <string name="ApplicationPreferencesActivity_Off">Slukket</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
+  <string name="ApplicationPreferencesActivity_privacy_summary">Kodeord %1$s, Skærmsikkerhed %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">Tema %1$s, Sprog %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d minutter</string>
+  <plurals name="AppProtectionPreferenceFragment_minutes">
+    <item quantity="one">1 minut</item>
+    <item quantity="other">%d minutter</item>
+  </plurals>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(billede)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(lyd)</string>
@@ -67,9 +75,7 @@ denne kontakt.</string>
   <string name="ConversationItem_expires_s">Udløber: %s</string>
   <string name="ConversationItem_error_not_delivered">Ikke sendt</string>
   <string name="ConversationItem_view_secure_media_question">Gennemse sikre data?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denne fil er gemt i en krypteret database. For at se den i et eksternt program kræves det desværre, at filen midlertidigt dekrypteres og gemmes. Er du sikker på, du vil gøre det?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fejl! Modtog en gammel udvekslingsnøgle.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Udvekslingsnøgle er modtaget. Klik for at fortsætte</string>
   <string name="ConversationItem_group_action_left">%1$s har forladt gruppen.</string>
   <string name="ConversationItem_click_for_details">Tryk for detaljer</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tryk for at godkende ukrypteret besked</string>
@@ -95,8 +101,10 @@ denne kontakt.</string>
   <string name="ConversationActivity_group_members">Gruppemedlemmer</string>
   <string name="ConversationActivity_group_conversation">Gruppesamtaler</string>
   <string name="ConversationActivity_unnamed_group">Unavngivet gruppe</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d medlemmer</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 medlem</string>
+  <plurals name="ConversationActivity_d_recipients_in_group">
+    <item quantity="one">1 medlem</item>
+    <item quantity="other">%d medlemmer</item>
+  </plurals>
   <string name="ConversationActivity_saved_draft">Gemte kladde</string>
   <string name="ConversationActivity_invalid_recipient">Ugyldig modtager!</string>
   <string name="ConversationActivity_calls_not_supported">Opkald er ikke understøttet</string>
@@ -132,12 +140,8 @@ denne kontakt.</string>
     <item quantity="other">Dette vil slette alle %1$d valgte beskeder permanent.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Gem på lager?</string>
-  <string name="ConversationFragment_saving_this_media_to_storage_warning">Hvis du gemmer dette indhold i hukommelsen, vil alle andre apps på din enhed have adgang til det.\n\nFortsæt?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Kunne ikke gemme vedhæftet fil på lageret!</string>
   <string name="ConversationFragment_success_exclamation">Fuldført!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kunne ikke skrive til lageret!</string>
-  <string name="ConversationFragment_saving_attachment">Gemmer vedhæftet fil</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Gemmer vedhæftet fil på lageret...</string>
   <string name="ConversationFragment_pending">Afventer...</string>
   <string name="ConversationFragment_push">Data (Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -156,9 +160,20 @@ denne kontakt.</string>
     <item quantity="other">Dette vil slette alle %1$d valgte samtaler permanent.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Sletter</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Sletter valgte tråde...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Sletter valgte samtaler...</string>
+  <plurals name="ConversationListFragment_conversations_archived">
+    <item quantity="one">Samtale arkiveret</item>
+    <item quantity="other">%d samtaler arkiveret</item>
+  </plurals>
+  <string name="ConversationListFragment_undo">FORTRYD</string>
+  <plurals name="ConversationListFragment_moved_conversations_to_inbox">
+    <item quantity="one">Samtale flyttet til inbox</item>
+    <item quantity="other">%d samtaler flyttet til inbox</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Udvekslingsnøgle...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arkiverede samtaler (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Anvender tilpasset: %s</string>
   <string name="CustomDefaultPreference_using_default">Anvender standard: %s</string>
@@ -178,6 +193,7 @@ denne kontakt.</string>
   <string name="DeviceListItem_unnamed_device">Unavngivet enhed</string>
   <string name="DeviceListItem_linked_s">Tilkoblede %s</string>
   <string name="DeviceListItem_last_active_s">Sidste aktive %s</string>
+  <string name="DeviceListItem_today">I dag</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Del med</string>
   <!--ExperienceUpgradeActivity-->
@@ -198,14 +214,12 @@ denne kontakt.</string>
   <string name="ExportFragment_success">Fuldført!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent fejl i Signal-kommunikationen!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal kunne ikke registreres hos Google Play Services. Kommunikation over data-kanalen er deaktiveret. Prøv at genregistrere via indstillingerne i Signal.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Opdatér gruppe</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Ny MMS-gruppe</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Du har valgt en person der ikke understøtter Signal-grupper. Denne gruppe vil være en MMS-gruppe.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Du er ikke registreret som bruger af datakanalen, så Signal-grupper er deaktiveret.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">En ukendt fejl har medført, at oprettelse af gruppen mislykkedes.</string>
   <string name="GroupCreateActivity_contacts_no_members">Der skal være mindst én person i gruppen!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En kontakt i gruppen har et nummer, der ikke kan læses. Ret nummeret eller fjern kontakten og prøv igen.</string>
@@ -277,7 +291,7 @@ vil det resultere i dupletter.</string>
   <string name="MmsDownloader_error_reading_mms_settings">Kunne ikke læse udbyderens MMS-indstillinger...</string>
   <!--- NotificationBarManager-->
   <string name="NotificationBarManager_signal_call_in_progress">Signalopkald i gang.</string>
-  <string name="NotificationBarManager_missed_call_from_s">Mistet opkal fra %s</string>
+  <string name="NotificationBarManager_missed_call_from_s">Mistet opkald fra %s</string>
   <string name="NotificationBarManager_missed_signal_call">Mistet Signalopkald</string>
   <string name="NotificationBarManager__establishing_signal_call">Foretager Signalopkald</string>
   <string name="NotificationBarManager__incoming_signal_call">Indgående Signalopkald.</string>
@@ -293,7 +307,7 @@ vil det resultere i dupletter.</string>
   <string name="MessageRecord_updated_group">Opdaterede gruppen.</string>
   <string name="MessageRecord_s_called_you">%s har ringet til dig</string>
   <string name="MessageRecord_called_s">Ringede til %s</string>
-  <string name="MessageRecord_missed_call_from">Mistet opkal fra %s</string>
+  <string name="MessageRecord_missed_call_from">Mistet opkald fra %s</string>
   <string name="MessageRecord_s_is_on_signal_say_hey">%s er på Signal, sig hej!</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Kodeord matcher ikke!</string>
@@ -316,6 +330,9 @@ vil det resultere i dupletter.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netværksfejl.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ugyldig QR-kode.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Beklager, du har allerede for mange tilkoblede enheder; prøv at fjern nogle...</string>
+  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Beklager. Dette er ikke en gyldig QR-kode til at forbinde enheder.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Forbind en Signal enhed?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Det ser ud som om du forsøger at forbinde en Signal-enhed vha. en tredjeparts-skanner. Af hensyn til sikkerhed, bør du skanne koden igen fra selve Signal-appen.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Indtast kodeord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal-ikon</string>
@@ -360,7 +377,6 @@ vil det resultere i dupletter.</string>
   <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Det indtastede telefonnummer understøtter ikke secure voice!</string>
   <string name="RedPhone_got_it">Modtaget</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_signal">Forbundet til Signal</string>
   <string name="RegistrationActivity_select_your_country">Vælg land</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Du skal vælge din
 landekode
@@ -421,9 +437,6 @@ nøgle-besked!
 </string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 Modtog en nøgle-besked for en ugyldig protokol-version.
-</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
 </string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Modtog opdaterede, men ukendte identitetsoplysninger. Klik for at validere identitet.</string>
   <string name="SmsMessageRecord_secure_session_reset">Sikker forbindelse gendannet.</string>
@@ -441,8 +454,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Du har ingen identitetsnøgle.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Modtageren har ingen identitetsnøgle.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Modtageren har ingen identiitetsnøgle!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skan deres nøgle for at sammenligne</string>
-  <string name="VerifyIdentityActivity_get_your_key_scanned">Få din nøgle skannet.</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ADVARSEL. Den skannede nøgle matcher IKKE! Tjek fingeraftryksteksten nøje.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">IKKE bekræftet!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Modpartens nøgle er korrekt. Det er også nødvendigt at bekræfte din nøgle med modparten.</string>
@@ -450,8 +461,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Du har ingen identitetsnøgle!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Du har ingen identitetsnøgle.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Skan for at sammenligne</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Bliv skannet for at sammenligne</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ADVARSEL. Den skannede nøgle matcher IKKE!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">IKKE bekræftet!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Den skannede nøgle matcher!</string>
@@ -498,7 +507,7 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="MessageNotifier_message_delivery_failed">Levering af besked mislykkedes.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Kunne ikke sende besked.</string>
   <string name="MessageNotifier_error_delivering_message">Fejl ved levering af besked.</string>
-  <string name="MessageNotifier_mark_all_as_read">Markér alle som læst</string>
+  <string name="MessageNotifier_mark_all_as_read">Læst</string>
   <string name="MessageNotifier_mark_read">Markér som læst</string>
   <string name="MessageNotifier_media_message">Multimediebesked</string>
   <string name="MessageNotifier_reply">Svar</string>
@@ -506,14 +515,15 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hurtig-svar utilgængelig når Signal er låst!</string>
   <string name="QuickResponseService_problem_sending_message">Problem med at sende besked!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Ny Signalbesked.</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Indhold skjult</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Ny besked</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Billede</string>
   <string name="attachment_type_selector__audio">Lyd</string>
   <string name="attachment_type_selector__video">Video</string>
   <string name="attachment_type_selector__contact">Kontaktperson</string>
   <string name="attachment_type_selector__camera">Kamera</string>
+  <string name="attachment_type_selector__location">Lokation</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Gammelt kodeord</string>
   <string name="change_passphrase_activity__new_passphrase">Nyt kodeord</string>
@@ -566,12 +576,16 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Indlæser lande...</string>
   <string name="country_selection_fragment__search">Søg</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skan QR-koden der vises på enheden for at tilkoble.</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Tilkobel enhed</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Ingen enheder tilkoblet</string>
+  <string name="device_list_fragment__link_new_device">Tilkobel ny enhed</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">fortsæt</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Kunne ikke hente loggene fra din enhed. Du kan stadig bruge ADB til at hente fejlfindingslogge i stedet.</string>
   <string name="log_submit_activity__thanks">Tak for hjælpen!</string>
   <string name="log_submit_activity__submitting">Sender</string>
   <string name="log_submit_activity__posting_logs">Sender loggene til gist...</string>
@@ -617,7 +631,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="prompt_passphrase_activity__unlock">Lås op</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal skal bruge MMS-indstillinger for at levere media og gruppebeskeder gennem din teleudbyder. Din enhed gør ikke denne information tilgængelig, hvilket nogle gange er tilfældet for låste enheder og andre begrænsende opsætninger.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Klik \"OK\" for at sende multimedie- og gruppebeskeder og udfyld indstillingerne. MMS-indstillingerne for din teleoperatør kan ofte findes ved at søge på \"din operatørs APN\". Du behøver kun gøre dette en gang.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BLOKERET</string>
   <!--recipient_preferences-->
@@ -664,11 +677,10 @@ Signal kan også ringe til dig og verificere dit telefonnummer. Tryk på \'Ring
   <string name="registration_progress_activity__call_me">Ring mig op</string>
   <string name="registration_progress_activity__edit_number">Redigér nummer</string>
   <string name="registration_progress_activity__connectivity_error">Forbindelsesfejl.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal kunne ikke forbinde til push-service.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal var ikke i stand til at forbinde til serveren.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Mulige problemer:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ingen netværksforbindelse.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Din enhed kræver en netværksforbindelse for at benytte denne Signal-funktion. Tjek om enheden har forbindelse til Edge, 3G, LTE eller et trådløst netværk.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Din enhed skal have netværksforbindelse for at bruge denne Signal-funktion. Tjek om der er forbindelse til mobildata eller Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktiv firewall.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Hvis du er tilsluttet Internet via et trådløst netværk, er det muligt, at en firewall blokerer adgangen til Signals server. Prøv et andet trådløst netværk eller brug mobildata.</string>
@@ -708,13 +720,13 @@ mislykkedes.</string>
   <string name="AndroidManifest__public_identity_key">Offentlig identitetsnøgle</string>
   <string name="AndroidManifest__change_passphrase">Ændr kodeord</string>
   <string name="AndroidManifest__verify_identity">Verificér identitet</string>
-  <string name="AndroidManifest__log_submit">Indsend fejlfindingslogge</string>
-  <string name="AndroidManifest__media_preview">Forhåndsvisning af multimedie</string>
+  <string name="AndroidManifest__media_preview">Mediepreview</string>
   <string name="AndroidManifest__media_overview">Alle billeder</string>
   <string name="AndroidManifest__media_overview_named">Alle billeder med %1$s</string>
-  <string name="AndroidManifest__message_details">Beskeddetaljer</string>
+  <string name="AndroidManifest__message_details">Besked-detaljer</string>
   <string name="AndroidManifest_manage_linked_devices">Håndtér tilkoblede enheder</string>
   <string name="AndroidManifest__invite_friends">Invitér venner</string>
+  <string name="AndroidManifest_archived_conversations">Arkiverede samtaler</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importér / eksportér</string>
   <string name="arrays__your_identity_key">Din identitetsnøgle</string>
@@ -757,18 +769,14 @@ mislykkedes.</string>
   <string name="preferences__change_passphrase">Ændr kodeord</string>
   <string name="preferences__change_your_passphrase">Ændring af dit kodeord</string>
   <string name="preferences__enable_passphrase">Aktivér kodeord</string>
-  <string name="preferences__passphrase_summary">Kodeord %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">Kræv kodeord når Signal åbnes</string>
+  <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Lås Signal og beskednotifikationer med et kodeord</string>
   <string name="preferences__screen_security">Skærmsikkerhed</string>
-  <string name="preferences__screen_security_summary">Skærmsikkerhed %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokér skærmbillede (screenshots) i listen \\"forrige apps\\" og i Signal</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Fjern kodeord efter den valgte tidsperiode. Brug hvis du kun har behov for kodelås midlertidigt, fx ved udlån af mobil, eller hvis din mobil bruges som fælles musikafspiller.</string>
-  <string name="preferences__timeout_passphrase">Midlertidig kodelås</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Vælg timeout for kodeord</string>
-  <string name="preferences__pref_timeout_interval_title">Tidsinterval for midlertidig kodelås</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hvor lang tid der skal gå, før kodeordet slettes fra hukommelsen</string>
+  <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Lås automatisk Signal efter et valgt tidsinterval med inaktivitet</string>
   <string name="preferences__notifications">Notifikationer</string>
   <string name="preferences__enable_message_notifications">Aktivér beskednotifikationer</string>
+  <string name="preferences__new_contacts_notifications">Notifikationer om nye kontakter</string>
+  <string name="preferences__show_a_notification_for_new_signal_contacts">Vis notifikationer om nye Signal-kontakter</string>
   <string name="preferences__led_color">LED-farve</string>
   <string name="preferences__led_color_unknown">Ukendt</string>
   <string name="preferences__pref_led_blink_title">LED-blinkemønster</string>
@@ -779,7 +787,7 @@ mislykkedes.</string>
   <string name="preferences__sound">Lyd</string>
   <string name="preferences__change_notification_sound">Ændr notifikationslyd</string>
   <string name="preferences__silent">Ingen lyd</string>
-  <string name="preferences__inthread_notifications">I beskeder</string>
+  <string name="preferences__in_conversation_notifications">Notifikationer under samtalevisning</string>
   <string name="preferences__play_inthread_notifications">Afspil notifikationslyd, når en aktiv samtale vises</string>
   <string name="preferences__repeat_alerts">Gentag notifikationer</string>
   <string name="preferences__never">Aldrig</string>
@@ -817,21 +825,18 @@ mislykkedes.</string>
   <string name="preferences__mmsc_password">MMSC-kodeord</string>
   <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Bed om en leveringsrapport for hver SMS-besked, du sender</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slet gamle beskeder automatisk, når en samtaletråd overskrider en specificeret størrelse</string>
   <string name="preferences__delete_old_messages">Slet gamle beskeder</string>
   <string name="preferences__chats">Chat og medier</string>
   <string name="preferences__conversation_length_limit">Grænse på samtaler</string>
-  <string name="preferences__trim_all_threads_now">Trim alle samtaletråde nu</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skan alle samtaletråde og håndhæv grænsen for størrelsen af samtaler</string>
+  <string name="preferences__trim_all_conversations_now">Trim alle samtaler nu</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Løb gennem alle samtaler og gennemfør begrænsninger for samtalelængde</string>
   <string name="preferences__devices">Enheder</string>
   <string name="preferences__light_theme">Lys</string>
   <string name="preferences__dark_theme">Mørk</string>
   <string name="preferences__appearance">Udseende</string>
   <string name="preferences__theme">Tema</string>
-  <string name="preferences__theme_summary">Tema %s</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Sprog</string>
-  <string name="preferences__language_summary">Sprog %s</string>
   <string name="preferences__signal_messages_and_calls">Signalbeskeder og -opkald</string>
   <string name="preferences__free_private_messages_and_calls">Gratis private beskeder og opkald til Signal-brugere</string>
   <string name="preferences__submit_debug_log">Indsend fejlfindingslog</string>
@@ -878,11 +883,14 @@ mislykkedes.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Slet markeret</string>
   <string name="conversation_list_batch__menu_select_all">Markér alle</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Arkiver valgte</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Uarkiver valgte</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Søg</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Kontaktbillede</string>
   <string name="conversation_list_item_view__error_alert">Advarselsfejl</string>
+  <string name="conversation_list_item_view__archived">Arkiveret</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Ny samtale</string>
   <!--conversation_secure_verified-->
@@ -911,8 +919,6 @@ mislykkedes.</string>
   <string name="conversation_group_options__broadcast">Transmission</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Sammenlign</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Bliv skannet for at sammenligne</string>
-  <string name="key_scanning__menu_scan_to_compare">Skan for at sammenligne</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ny besked</string>
   <string name="text_secure_normal__menu_new_group">Ny gruppe</string>
@@ -920,15 +926,21 @@ mislykkedes.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Markér alle som læst</string>
   <string name="text_secure_normal__invite_friends">Invitér venner</string>
+  <string name="text_secure_normal__help">Hjælp</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build">Din version af Signal er udløbet!</string>
-  <string name="reminder_header_expired_build_details">Beskeder vil ikke længere blive sendt. Opdatér venligst til den nyeste version.</string>
+  <string name="reminder_header_outdated_build">Din version af Signal er forældet</string>
+  <plurals name="reminder_header_outdated_build_details">
+    <item quantity="one">Din version af Signal udløber om 1 dag. Tap for at opdatere til den seneste version.</item>
+    <item quantity="other">Din version af Signal udløber om %d dage. Tap for at opdatere til den seneste version.</item>
+  </plurals>
+  <string name="reminder_header_outdated_build_details_today">Din version af Signal udløber i dag. Tap for at opdatere til den seneste version.</string>
+  <string name="reminder_header_expired_build">Din version af Signal er udgået!</string>
+  <string name="reminder_header_expired_build_details">Beskeder vil ikke længere blive afsendt ordentligt. Tap for at opdatere til den seneste version.</string>
   <string name="reminder_header_expired_build_button">OPDATER</string>
   <string name="reminder_header_sms_default_title">Anvend som standard SMS-app</string>
   <string name="reminder_header_sms_default_text">Tryk for at gøre Signal til din standard SMS-app.</string>
   <string name="reminder_header_sms_default_button">SET</string>
   <string name="reminder_header_sms_import_title">Importér SMS</string>
-  <string name="reminder_header_sms_import_text">Tryk for at kopiere din telefons SMS\'er til TextSecures krypterede database.</string>
   <string name="reminder_header_sms_import_button">IMPORTÈR</string>
   <string name="reminder_header_push_title">Aktivér Signalbeskeder og -opkald</string>
   <string name="reminder_header_push_text">Tryk for øjeblikkelig afsending, stærkere privatlivsbeskyttelse og ingen SMS-afgifter.</string>
@@ -946,8 +958,9 @@ mislykkedes.</string>
   <string name="MediaPreviewActivity_unssuported_media_type">Ikke-understøttet multimedietype</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Gem</string>
+  <!--media_overview-->
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Forhåndsvisning af billede</string>
+  <string name="media_preview_activity__image_content_description">Billedpreview</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Opdater</string>
   <!--redphone_audio_popup_menu-->
@@ -960,8 +973,5 @@ mislykkedes.</string>
   <string name="trimmer__old_messages_successfully_deleted">Gennemført sletning af gamle beskeder</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Transportikon</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skan QR-koden der vises på enheden for at tilkoble.</string>
-  <string name="device_link_fragment__link_device">Tilkobel enhed</string>
-  <string name="device_list_fragment__link_new_device">Tilkobel ny enhed</string>
   <!--EOF-->
 </resources>

res/values-de/strings.xml

@@ -8,18 +8,23 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Momentan: %s</string>
   <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>
+  <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+    <item quantity="one">1 Nachricht je Unterhaltung</item>
+    <item quantity="other">%d Nachrichten je Unterhaltung</item>
+  </plurals>
   <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 wirklich alle Nachrichten in sämtlichen Unterhaltungen bis auf die letzten %s Nachrichten löschen?</string>
+  <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+    <item quantity="one">Jetzt alle Unterhaltungen bis auf die letzte Nachricht kürzen.</item>
+    <item quantity="other">Jetzt alle Unterhaltungen bis auf die %d letzten Nachrichten kürzen.</item>
+  </plurals>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_disable_lock_screen">
-Signal und Benachrichtigungen dauerhaft entsperren.</string>
+  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <string name="ApplicationPreferencesActivity_unregistering">Registrierung löschen</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Signal-Registrierung wird gelöscht …</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Signal-Nachrichten und -Telefonie deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Signal-Nachrichten und -Telefonie durch Löschen Ihrer Registrierung vom Server deaktivieren. Sie werden Ihre Rufnummer erneut registrieren müssen, um zukünftig wieder verschlüsselt zu kommunizieren.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Registrierung für Signal-Nachrichten und -Anrufe wird gelöscht …</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Signal-Nachrichten und -Anrufe deaktivieren?</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Signal-Nachrichten und -Anrufe durch Löschen Ihrer Registrierung vom Server deaktivieren. Sie werden Ihre Rufnummer erneut registrieren müssen, um zukünftig wieder verschlüsselt zu kommunizieren.</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>
@@ -30,14 +35,20 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ApplicationPreferencesActivity_off">aus</string>
   <string name="ApplicationPreferencesActivity_Off">Aus</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
+  <string name="ApplicationPreferencesActivity_privacy_summary">Passwort %1$s, Bildschirmschutz %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">Design %1$s, Sprache %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d Minuten</string>
+  <plurals name="AppProtectionPreferenceFragment_minutes">
+    <item quantity="one">1 Minute</item>
+    <item quantity="other">%d Minuten</item>
+  </plurals>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(Bild)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(Audio)</string>
   <string name="DraftDatabase_Draft_video_snippet">(Video)</string>
+  <string name="DraftDatabase_Draft_location_snippet">(Standort)</string>
   <!--AttchmentManager-->
-  <string name="AttachmentManager_cant_open_media_selection">Keine App zur Dateiauswahl auffindbar.</string>
+  <string name="AttachmentManager_cant_open_media_selection">Keine App zur Auswahl der Medieninhalte auffindbar.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
@@ -61,23 +72,25 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ConversationItem_message_size_d_kb">Nachrichtengröße: %d kB</string>
   <string name="ConversationItem_expires_s">Läuft ab in: %s</string>
   <string name="ConversationItem_error_not_delivered">Nicht zugestellt</string>
-  <string name="ConversationItem_view_secure_media_question">Verschlüsselte Datei anzeigen?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Datei ist in einer verschlüsselten Datenbank gespeichert. Zur Anzeige muss sie vorübergehend entschlüsselt abgespeichert werden. Möchten Sie dennoch fortfahren?</string>
+  <string name="ConversationItem_view_secure_media_question">Sichere Medieninhalte anzeigen?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Medieninhalte sind in einer verschlüsselten Datenbank gespeichert. Zur Anzeige müssen sie vorübergehend entschlüsselt im Gerätespeicher abgespeichert werden. Möchten Sie dennoch fortfahren?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fehler: Abgelaufene Schlüsselaustausch-Nachricht empfangen.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Schlüsselaustausch-Nachricht empfangen. Zum Fortfahren antippen.</string>
+  <string name="ConversationItem_received_key_exchange_message_tap_to_process">Schlüsselaustausch-Nachricht empfangen. Zum Fortfahren antippen.</string>
   <string name="ConversationItem_group_action_left">%1$s hat die Gruppe verlassen.</string>
   <string name="ConversationItem_click_for_details">Für Details antippen</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Für Rückgriff auf unsicheren Versand antippen</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Rückgriff auf unverschlüsselte SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Rückgriff auf unverschlüsselte MMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Diese Nachricht wird <b>nicht</b> verschlüsselt sein, da der Kontakt Signal nicht mehr verwendet.\n\nUnsichere Nachricht senden?</string>
-  <string name="ConversationItem_unable_to_open_media">Keine App zum Öffnen der Datei gefunden.</string>
+  <string name="ConversationItem_unable_to_open_media">Keine App zum Öffnen dieser Medieninhalte gefunden.</string>
+  <string name="ConversationItem_from_s">von %s</string>
+  <string name="ConversationItem_to_s">an %s</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">Verschlüsselung neu starten?</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Hilfreich bei Problemen mit der Verschlüsselung in dieser Unterhaltung. Ihre Nachrichten bleiben erhalten.</string>
   <string name="ConversationActivity_reset">Neu starten</string>
   <string name="ConversationActivity_delete_thread_question">Unterhaltung löschen?</string>
-  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Alle Nachrichten dieser Unterhaltung dauerhaft löschen.</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Alle Nachrichten dieser Unterhaltung unwiderruflich löschen.</string>
   <string name="ConversationActivity_add_attachment">Anhang hinzufügen</string>
   <string name="ConversationActivity_select_contact_info">Kontaktinfo wählen</string>
   <string name="ConversationActivity_compose_message">Nachricht verfassen</string>
@@ -90,8 +103,10 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ConversationActivity_group_members">Gruppenmitglieder</string>
   <string name="ConversationActivity_group_conversation">Gruppenunterhaltung</string>
   <string name="ConversationActivity_unnamed_group">Unbenannte Gruppe</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d Mitglieder</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 Mitglied</string>
+  <plurals name="ConversationActivity_d_recipients_in_group">
+    <item quantity="one">1 Mitglied</item>
+    <item quantity="other">%d Mitglieder</item>
+  </plurals>
   <string name="ConversationActivity_saved_draft">Entwurf gespeichert</string>
   <string name="ConversationActivity_invalid_recipient">Ungültiger Kontakt!</string>
   <string name="ConversationActivity_calls_not_supported">Anrufe nicht unterstützt</string>
@@ -127,12 +142,25 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
     <item quantity="other">Unwiderruflich alle %1$d ausgewählten Nachrichten löschen.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Im Gerätespeicher speichern?</string>
-  <string name="ConversationFragment_saving_this_media_to_storage_warning">Das Speichern der Datei im Gerätespeicher ermöglicht allen anderen Apps Ihres Geräts 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>
+  <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
+    <item quantity="one">Das Speichern dieses Medieninhalts im Gerätespeicher ermöglicht jeder anderen installierten App darauf Zugriff.\n\nTrotzdem fortfahren?</item>
+    <item quantity="other">Das Speichern aller %1$d Medieninhalte im Gerätespeicher ermöglicht jeder anderen installierten App darauf Zugriff.\n\nTrotzdem fortfahren?</item>
+  </plurals>
+  <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
+    <item quantity="one">Fehler beim Speichern des Anhangs im Gerätespeicher!</item>
+    <item quantity="other">Fehler beim Speichern der Anhänge im Gerätespeicher!</item>
+  </plurals>
   <string name="ConversationFragment_success_exclamation">Erfolgreich!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kein Schreibzugriff auf Gerätespeicher!</string>
-  <string name="ConversationFragment_saving_attachment">Anhang speichern</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Anhang wird im Gerätespeicher gespeichert …</string>
+  <plurals name="ConversationFragment_saving_n_attachments">
+    <item quantity="one">Anhang speichern</item>
+    <item quantity="other">%1$d Anhänge speichern</item>
+  </plurals>
+  <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
+    <item quantity="one">Anhang wird im Gerätespeicher gespeichert …</item>
+    <item quantity="other">%1$d Anhänge werden im Gerätespeicher gespeichert …</item>
+  </plurals>
+  <string name="ConversationFragment_collecting_attahments">Anhänge werden gesammelt …</string>
   <string name="ConversationFragment_pending">Ausstehend …</string>
   <string name="ConversationFragment_push">Datenkanal (Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -151,9 +179,20 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
     <item quantity="other">Unwiderruflich alle %1$d ausgewählten Unterhaltungen löschen.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Löschen</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht …</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Ausgewählte Unterhaltungen werden gelöscht …</string>
+  <plurals name="ConversationListFragment_conversations_archived">
+    <item quantity="one">Unterhaltung archiviert</item>
+    <item quantity="other">%d Unterhaltungen archiviert</item>
+  </plurals>
+  <string name="ConversationListFragment_undo">RÜCKGÄNGIG</string>
+  <plurals name="ConversationListFragment_moved_conversations_to_inbox">
+    <item quantity="one">Unterhaltung in Eingang verschoben</item>
+    <item quantity="other">%d Unterhaltungen in Eingang verschoben</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch-Nachricht …</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Archivierte Unterhaltungen (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Benutzerdefiniert: %s</string>
   <string name="CustomDefaultPreference_using_default">Standard: %s</string>
@@ -173,6 +212,7 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="DeviceListItem_unnamed_device">Unbenanntes Gerät</string>
   <string name="DeviceListItem_linked_s">%s verknüpft</string>
   <string name="DeviceListItem_last_active_s">Zuletzt aktiv %s</string>
+  <string name="DeviceListItem_today">Heute</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Teilen mit</string>
   <!--ExperienceUpgradeActivity-->
@@ -184,7 +224,7 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exportieren</string>
   <string name="ExportFragment_export_plaintext_to_storage">Klartextsicherung exportieren?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung: Exportiert Ihre Signal-Nachrichten unverschlüsselt in den Gerätespeicher.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung: Exportiert die unverschlüsselten Inhalte Ihrer Signal-Nachrichten in den Gerätespeicher.</string>
   <string name="ExportFragment_cancel">Abbruch</string>
   <string name="ExportFragment_exporting">Exportieren</string>
   <string name="ExportFragment_exporting_plaintext_to_storage">Klartext wird in Gerätespeicher exportiert …</string>
@@ -193,14 +233,14 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ExportFragment_success">Erfolgreich!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dauerhafter Signal-Kommunikationsfehler!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal konnte keine Verbindung zu den Google Play-Diensten herstellen. Signal-Nachrichten wurden daher deaktiviert. Bitte über das Menü „Einstellungen“ erneut registrieren.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal konnte nicht für die Google Play-Dienste registriert werden. Signal-Nachrichten und -Anrufe wurden daher deaktiviert. Bitte registrieren Sie Signal im Menü „Einstellungen“ &gt; „Weitere Einstellungen“ erneut.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Gruppe bearbeiten</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenname</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Neue MMS-Gruppe</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der Signal-Gruppen nicht unterstützt. Daher wird dies eine MMS-Gruppe sein.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Sie sind nicht für Signal-Nachrichten registriert. Signal-Gruppen sind daher deaktiviert.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Sie sind nicht für Signal-Nachrichten und -Anrufe registriert, daher sind Signal-Gruppen deaktiviert. Bitte registrieren Sie Signal im Menü „Einstellungen“ &gt; „Weitere Einstellungen“.</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>
@@ -269,8 +309,8 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="MmsDownloader_error_reading_mms_settings">MMS-Einstellungen des Mobilfunkanbieters konnten nicht gelesen werden …</string>
   <!--- NotificationBarManager-->
   <string name="NotificationBarManager_signal_call_in_progress">Signal-Anruf läuft</string>
-  <string name="NotificationBarManager_missed_call_from_s">Verpasster Anruf von %s</string>
-  <string name="NotificationBarManager_missed_signal_call">Verpasster Signal-Anruf</string>
+  <string name="NotificationBarManager_missed_call_from_s">Entgangener Anruf von %s</string>
+  <string name="NotificationBarManager_missed_signal_call">Entgangener Signal-Anruf</string>
   <string name="NotificationBarManager__establishing_signal_call">Signal-Anruf wird hergestellt</string>
   <string name="NotificationBarManager__incoming_signal_call">Eingehender Signal-Anruf</string>
   <string name="NotificationBarManager__deny_call">Anruf ablehnen</string>
@@ -278,14 +318,14 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="NotificationBarManager__end_call">Anruf beenden</string>
   <string name="NotificationBarManager__cancel_call">Anruf abbrechen</string>
   <!--NotificationMmsMessageRecord-->
-  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedianachricht</string>
+  <string name="NotificationMmsMessageRecord_multimedia_message">MMS</string>
   <!--MessageRecord-->
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Die empfangene Nachricht wurde mit einer veralteten Version von Signal verschlüsselt, die nicht mehr unterstützt wird. Bitten Sie den Kontakt, Signal zu aktualisieren und die Nachricht erneut zu senden.</string>
   <string name="MessageRecord_left_group">Sie haben die Gruppe verlassen.</string>
   <string name="MessageRecord_updated_group">Gruppe wurde aktualisiert.</string>
   <string name="MessageRecord_s_called_you">Eingegangener Anruf von %s</string>
   <string name="MessageRecord_called_s">Ausgegangener Anruf an %s</string>
-  <string name="MessageRecord_missed_call_from">Verpasster Anruf von %s</string>
+  <string name="MessageRecord_missed_call_from">Entgangener Anruf von %s</string>
   <string name="MessageRecord_s_is_on_signal_say_hey">%s ist bei Signal. Zeit, Hallo zu sagen! </string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passwörter stimmen nicht überein!</string>
@@ -297,7 +337,8 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="DeviceProvisioningActivity_continue">WEITER</string>
   <string name="DeviceProvisioningActivity_title">Gerät verbinden?</string>
   <string name="DeviceProvisioningActivity_content_intro">Folgende Rechte werden vergeben:</string>
-  <string name="DeviceProvisioningActivity_content_bullets">• Alle Nachrichten lesen\n• Nachrichten in Ihrem Namen senden</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+• Alle Ihre Nachrichten lesen\n• Nachrichten in Ihrem Namen versenden</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 freigeschaltet!</string>
@@ -306,6 +347,8 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ungültiger QR-Code.</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>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Dies ist leider kein gültiger QR-Code zur Geräteverknüpfung.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Signal-Gerät verknüpfen?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Sie versuchen offenbar, ein Signal-Gerät mithilfe einer Scanner-App eines Drittanbieters zu verknüpfen. Scannen Sie den QR-Code zu Ihrem Schutz noch einmal direkt aus Signal ein.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Passwort eingeben</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal-Symbol</string>
@@ -347,7 +390,7 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="RedPhone_login_failed">Anmeldung fehlgeschlagen!</string>
   <string name="RedPhone_message_from_the_server">Nachricht vom Server</string>
   <string name="RedPhone_number_not_registered">Rufnummer nicht registriert!</string>
-  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Die gewählte Rufnummer unterstützt keine sichere Telefonie!</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Die gewählte Rufnummer unterstützt keine sicheren Anrufe!</string>
   <string name="RedPhone_got_it">OK</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_signal">Mit Signal verbinden</string>
@@ -398,8 +441,7 @@ Bitte kontrollieren Sie noch einmal Ihre Rufnummer. Diese wird anschließend dur
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Fehlerhafte Schlüsselaustausch-Nachricht empfangen!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process">Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Aktualisierten, aber unbekannten Schlüssel empfangen. Antippen, um Schlüssel zu prüfen.</string>
   <string name="SmsMessageRecord_secure_session_reset">Verschlüsselung neu gestartet.</string>
   <string name="SmsMessageRecord_duplicate_message">Doppelte Nachricht.</string>
@@ -409,15 +451,15 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="ThreadRecord_draft">Entwurf:</string>
   <string name="ThreadRecord_called">Ausgegangener Anruf</string>
   <string name="ThreadRecord_called_you">Eingegangener Anruf</string>
-  <string name="ThreadRecord_missed_call">Verpasster Anruf</string>
-  <string name="ThreadRecord_media_message">Multimedianachricht</string>
+  <string name="ThreadRecord_missed_call">Entgangener Anruf</string>
+  <string name="ThreadRecord_media_message">Nachricht mit Medieninhalten</string>
   <string name="ThreadRecord_s_is_on_signal_say_hey">%s ist bei Signal. Zeit, Hallo zu sagen!</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen eigenen Schlüssel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">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_your_key_scanned">Ihren QR-Code anzeigen</string>
+  <string name="VerifyIdentityActivity_scan_contacts_qr_code">QR-Code einscannen</string>
+  <string name="VerifyIdentityActivity_display_your_qr_code">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>
@@ -425,8 +467,8 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sie haben keinen eigenen Schlüssel!</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">Ihren QR-Code anzeigen</string>
+  <string name="ViewIdentityActivity_scan_contacts_qr_code">QR-Code einscannen</string>
+  <string name="ViewIdentityActivity_display_your_qr_code">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>
@@ -459,6 +501,8 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importieren wird durchgeführt</string>
   <string name="ApplicationMigrationService_importing_text_messages">Nachrichten werden importiert</string>
+  <string name="ApplicationMigrationService_import_complete">Importieren abgeschlossen</string>
+  <string name="ApplicationMigrationService_Signal_system_database_import_is_complete">Importieren der Systemdatenbank abgeschlossen.</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_signal_passphrase_cached">Zum Öffnen antippen.</string>
   <string name="KeyCachingService_signal_passphrase_cached_with_lock">Zum Öffnen antippen oder zum Schließen Schloss antippen.</string>
@@ -468,27 +512,28 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</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>
+  <string name="MessageNotifier_media_message_with_text">Nachricht mit Medieninhalten: %s</string>
   <string name="MessageNotifier_no_subject">(ohne Text)</string>
   <string name="MessageNotifier_message_delivery_failed">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_error_delivering_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_mark_all_as_read">Alle gelesen</string>
   <string name="MessageNotifier_mark_read">Gelesen</string>
-  <string name="MessageNotifier_media_message">Mediennachricht</string>
+  <string name="MessageNotifier_media_message">Nachricht mit Medieninhalten</string>
   <string name="MessageNotifier_reply">Antworten</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Schnellantwort nicht verfügbar, solange Signal gesperrt ist!</string>
   <string name="QuickResponseService_problem_sending_message">Problem beim Senden der Nachricht!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Neue Signal-Nachricht</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Inhalt verborgen</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Neue Nachricht</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Bild</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__video">Video</string>
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
+  <string name="attachment_type_selector__location">Standort</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Altes Passwort</string>
   <string name="change_passphrase_activity__new_passphrase">Neues Passwort</string>
@@ -509,9 +554,9 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Unterhaltung stummgeschaltet</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Signal-Nachricht schreiben</string>
-  <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS schreiben</string>
-  <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS schreiben</string>
+  <string name="conversation_activity__type_message_push">Signal-Nachricht senden</string>
+  <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS senden</string>
+  <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS senden</string>
   <string name="conversation_activity__send">Senden</string>
   <string name="conversation_activity__remove">Entfernen</string>
   <string name="conversation_activity__window_description">Unterhaltung mit %1$s</string>
@@ -522,8 +567,8 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--conversation_input_panel-->
   <string name="conversation_input_panel__slide_to_cancel">ZUM ABBRECHEN WEGWISCHEN</string>
   <!--conversation_item-->
-  <string name="conversation_item__mms_downloading_description">Mediennachricht wird heruntergeladen</string>
-  <string name="conversation_item__mms_image_description">Mediennachricht</string>
+  <string name="conversation_item__mms_downloading_description">Nachricht mit Medieninhalten wird heruntergeladen</string>
+  <string name="conversation_item__mms_image_description">Nachricht mit Medieninhalten</string>
   <string name="conversation_item__secure_message_description">Sichere Nachricht</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
@@ -541,12 +586,17 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Länder werden geladen …</string>
   <string name="country_selection_fragment__search">Suchen</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Zum Verknüpfen den auf dem Gerät angezeigten QR-Code einscannen</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Gerät verknüpfen</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Keine Geräte verknüpft …</string>
+  <string name="device_list_fragment__link_new_device">Neues Gerät verknüpfen</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">Fortsetzen</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__log_fetch_failed">Das Diagnoseprotokoll auf Ihrem Gerät konnte nicht gelesen werden. Sie können allerdings immer noch ADB verwenden, um ein Diagnoseprotokoll zu erhalten.</string>
   <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
   <string name="log_submit_activity__submitting">Übermitteln</string>
   <string name="log_submit_activity__posting_logs">Diagnoseprotokoll wird übermittelt …</string>
@@ -563,7 +613,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Eine mit „SMS Backup &amp; Restore“ kompatible Klartextsicherung exportieren</string>
   <string name="import_fragment__import_system_sms_database">System-SMS-Datenbank 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__restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen?</string>
+  <string name="import_fragment__restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Eine zuvor exportierte, verschlüsselte Signal-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 &amp; Restore“ kompatible Klartextsicherung importieren</string>
@@ -591,8 +641,8 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Entsperren</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal benötigt MMS-Einstellungen, um Medien- und Gruppennachrichten über Ihren Mobilfunkanbieter 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__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal benötigt MMS-Einstellungen, um Nachrichten mit Medieninhalten und Gruppennachrichten über Ihren Mobilfunkanbieter 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_tap_ok">Zum Versenden von Nachrichten mit Medieninhalten 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-->
@@ -639,11 +689,10 @@ Signal kann Sie zur Überprüfung Ihrer Rufnummer auch anrufen. Tippen Sie auf
   <string name="registration_progress_activity__call_me">Mich anrufen</string>
   <string name="registration_progress_activity__edit_number">Rufnummer bearbeiten</string>
   <string name="registration_progress_activity__connectivity_error">Verbindungsfehler.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Verbindung zum Signal-Dienst konnte nicht hergestellt werden.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Verbindung mit Signal-Server konnte nicht hergestellt werden.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Einige der möglichen Probleme beinhalten:</string>
   <string name="registration_progress_activity__no_network_connectivity">Keine Netzwerkverbindung.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Um diese Signal-Funktion nutzen zu können, benötigt Ihr Gerät eine Netzverbindung, Stellen Sie sicher, dass eine 3G- oder WLAN-Verbindung besteht.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Um diese Signal-Funktion nutzen zu können, benötigt Ihr Gerät eine Netzverbindung, Stellen Sie sicher, dass eine mobile Daten- oder WLAN-Verbindung besteht.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktive Firewall.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Bei Verbindung über WLAN blockiert möglicherweise eine Firewall den Zugang zum Signal-Server. Versuchen Sie ein anderes Netzwerk oder die mobile Datenverbindung.</string>
@@ -683,12 +732,13 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
   <string name="AndroidManifest__verify_identity">Kontakt überprüfen</string>
   <string name="AndroidManifest__log_submit">Diagnoseprotokoll übermitteln</string>
-  <string name="AndroidManifest__media_preview">Dateivorschau</string>
+  <string name="AndroidManifest__media_preview">Medieninhaltevorschau</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_linked_devices">Verknüpfte Geräte verwalten</string>
   <string name="AndroidManifest__invite_friends">Freunde einladen</string>
+  <string name="AndroidManifest_archived_conversations">Archivierte Unterhaltungen</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Datensicherung</string>
   <string name="arrays__your_identity_key">Ihr Schlüssel</string>
@@ -731,18 +781,16 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__change_passphrase">Passwort ändern</string>
   <string name="preferences__change_your_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">Signal und Benachrichtigungen mit Passwort sperren</string>
+  <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Signal und Benachrichtungen mit einem 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>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Passwort nach einer gewissen Zeit vergessen</string>
-  <string name="preferences__timeout_passphrase">Passwort vergessen</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Wartezeit auswählen</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__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Signal bei Inaktivität nach einer festgelegten Verzögerungszeit automatisch sperren</string>
+  <string name="preferences__inactivity_timeout_passphrase">Passwort bei Inaktivität</string>
+  <string name="preferences__inactivity_timeout_interval">Verzögerungszeit</string>
   <string name="preferences__notifications">Benachrichtigungen</string>
   <string name="preferences__enable_message_notifications">Benachrichtigungen über Nachrichtenempfang aktivieren</string>
+  <string name="preferences__new_contacts_notifications">Über neue Kontakte benachrichtigen</string>
+  <string name="preferences__show_a_notification_for_new_signal_contacts">Benachrichtigungen über neue Signal-Kontakte anzeigen</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>
@@ -750,10 +798,10 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</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">LED-Blinkmuster eingestellt</string>
-  <string name="preferences__sound">Benachrichtigungston</string>
+  <string name="preferences__sound">Ton</string>
   <string name="preferences__change_notification_sound">Benachrichtigungston ändern</string>
   <string name="preferences__silent">Lautlos</string>
-  <string name="preferences__inthread_notifications">Immer benachrichtigen</string>
+  <string name="preferences__in_conversation_notifications">Immer benachrichtigen</string>
   <string name="preferences__play_inthread_notifications">Benachrichtigungston während aktiver Unterhaltungen wiedergeben</string>
   <string name="preferences__repeat_alerts">Benachrichtigungen wiederholen</string>
   <string name="preferences__never">Nie</string>
@@ -791,22 +839,20 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__mmsc_password">MMSC-Passwort</string>
   <string name="preferences__sms_delivery_reports">SMS-Zustellberichte</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald die Unterhaltung eine bestimmte Länge überschreitet</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald eine Unterhaltung die angegebene Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
-  <string name="preferences__chats">Unterhaltungen und Multimedia</string>
+  <string name="preferences__chats">Unterhaltungen und Medieninhalte</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>
+  <string name="preferences__trim_all_conversations_now">Alle Unterhaltungen jetzt kürzen</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Alle Unterhaltungen prüfen und deren Längenbegrenzung sicherstellen</string>
   <string name="preferences__devices">Geräte</string>
   <string name="preferences__light_theme">Hell</string>
   <string name="preferences__dark_theme">Dunkel</string>
-  <string name="preferences__appearance">Aussehen</string>
+  <string name="preferences__appearance">Darstellung</string>
   <string name="preferences__theme">Design</string>
-  <string name="preferences__theme_summary">Design %s</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Sprache</string>
-  <string name="preferences__language_summary">Sprache %s</string>
-  <string name="preferences__signal_messages_and_calls">Signal-Nachrichten und -Telefonie</string>
+  <string name="preferences__signal_messages_and_calls">Signal-Nachrichten und -Anrufe</string>
   <string name="preferences__free_private_messages_and_calls">Kostenlos und verschlüsselt mit Signal-Nutzern Nachrichten austauschen und telefonieren</string>
   <string name="preferences__submit_debug_log">Diagnoseprotokoll übermitteln</string>
   <string name="preferences__support_wifi_calling">Kompatibilität WLAN-Telefonie</string>
@@ -816,7 +862,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</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__media_auto_download">Medieninhalte automatisch herunterladen</string>
   <string name="preferences_chats__message_trimming">Unterhaltungen kürzen</string>
   <string name="preferences_advanced__use_system_emoji">System-Emojis verwenden</string>
   <string name="preferences_advanced__disable_signal_built_in_emoji_support">Integrierte Emojis deaktivieren und stattdessen System-Emojis verwenden</string>
@@ -852,11 +898,14 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Ausgewählte löschen</string>
   <string name="conversation_list_batch__menu_select_all">Alle auswählen</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Ausgewählte archivieren</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Ausgewählte in Eingang verschieben</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Suchen</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Kontaktbild</string>
   <string name="conversation_list_item_view__error_alert">Fehlerbenachrichtigung</string>
+  <string name="conversation_list_item_view__archived">Archiviert</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Neue Unterhaltung</string>
   <!--conversation_secure_verified-->
@@ -885,8 +934,8 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="conversation_group_options__broadcast">Übertragen</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Vergleichen</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Ihren QR-Code anzeigen</string>
-  <string name="key_scanning__menu_scan_to_compare">QR-Code einscannen</string>
+  <string name="key_scanning__menu_display_your_qr_code">Ihren QR-Code anzeigen</string>
+  <string name="key_scanning__menu_scan_contacts_qr_code">QR-Code einscannen</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Neue Unterhaltung</string>
   <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
@@ -894,17 +943,24 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Signal sperren</string>
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
   <string name="text_secure_normal__invite_friends">Freunde einladen</string>
+  <string name="text_secure_normal__help">Hilfe</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build">Ihre Version von Signal ist veraltet!</string>
-  <string name="reminder_header_expired_build_details">Das Versenden von Nachrichten ist nicht mehr möglich. Bitte Signal auf die neueste Version aktualisieren.</string>
+  <string name="reminder_header_outdated_build">Ihre Version von Signal ist veraltet</string>
+  <plurals name="reminder_header_outdated_build_details">
+    <item quantity="one">Ihre Version von Signal wird in 1 Tag ablaufen. Antippen, um auf die neueste Version zu aktualisieren.</item>
+    <item quantity="other">Ihre Version von Signal wird in %d Tagen ablaufen. Antippen, um auf die neueste Version zu aktualisieren.</item>
+  </plurals>
+  <string name="reminder_header_outdated_build_details_today">Ihre Version von Signal wird heute ablaufen. Antippen, um auf die neueste Version zu aktualisieren.</string>
+  <string name="reminder_header_expired_build">Ihre Version von Signal ist abgelaufen!</string>
+  <string name="reminder_header_expired_build_details">Nachrichten werden nicht mehr erfolgreich versendet werden. Antippen, um auf die neueste Version zu aktualisieren.</string>
   <string name="reminder_header_expired_build_button">AKTUALISIEREN</string>
   <string name="reminder_header_sms_default_title">Als Standard-SMS-App verwenden</string>
   <string name="reminder_header_sms_default_text">Antippen, um Signal als Standard-SMS-App zu verwenden.</string>
   <string name="reminder_header_sms_default_button">FESTLEGEN</string>
   <string name="reminder_header_sms_import_title">System-SMS importieren</string>
-  <string name="reminder_header_sms_import_text">Antippen, um auf dem Telefon gespeicherte SMS-Nachrichten in die verschlüsselte Datenbank zu importieren.</string>
+  <string name="reminder_header_sms_import_text">Antippen, um auf Ihrem Telefon gespeicherte SMS-Nachrichten in die verschlüsselte Datenbank von Signal zu importieren.</string>
   <string name="reminder_header_sms_import_button">IMPORTIEREN</string>
-  <string name="reminder_header_push_title">Signal-Nachrichten und -Telefonie aktivieren</string>
+  <string name="reminder_header_push_title">Signal-Nachrichten und -Anrufe aktivieren</string>
   <string name="reminder_header_push_text">Verbessern Sie Ihr Kommunikationserlebnis.</string>
   <string name="reminder_header_push_button">AKTIVIEREN</string>
   <string name="reminder_header_invite_title">Zu Signal einladen</string>
@@ -917,9 +973,11 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Sie</string>
   <string name="MediaPreviewActivity_cant_display">Bildvorschau fehlgeschlagen</string>
-  <string name="MediaPreviewActivity_unssuported_media_type">Nicht unterstützter Dateityp</string>
+  <string name="MediaPreviewActivity_unssuported_media_type">Nicht unterstützter Medieninhaltetyp</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Speichern</string>
+  <!--media_overview-->
+  <string name="media_overview__save_all">Alle speichern</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Bildvorschau</string>
   <!--new_conversation_activity-->
@@ -934,8 +992,5 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="trimmer__old_messages_successfully_deleted">Alte Nachrichten wurden erfolgreich gelöscht</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Übertragungssymbol</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Zum Verknüpfen den auf dem Gerät angezeigten QR-Code einscannen</string>
-  <string name="device_link_fragment__link_device">Gerät verknüpfen</string>
-  <string name="device_list_fragment__link_new_device">Neues Gerät verknüpfen</string>
   <!--EOF-->
 </resources>

res/values-el/strings.xml

@@ -8,13 +8,17 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Αυτή τη στιγμή: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχεις ορίσει συνθηματικό!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s μηνύματα ανά συζήτηση</string>
+  <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+    <item quantity="one">1 μήνυμα ανά συζήτηση</item>
+    <item quantity="other">%d μηνύματα ανά συζήτηση</item>
+  </plurals>
   <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>
+  <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+    <item quantity="one">Αυτό θα κουρέψει άμεσα όλες τις συζητήσεις στο πιο πρόσφατο μήνυμα.</item>
+    <item quantity="other">Αυτό θα κουρέψει άμεσα όλες τις συζητήσεις στα %d πιο πρόσφατα μηνύματα.</item>
+  </plurals>
   <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_signal_messages_and_calls">Απεγγραφή από τα μηνύματα και τις κλήσεις Signal...</string>
@@ -30,12 +34,18 @@
   <string name="ApplicationPreferencesActivity_off">απενεργοποίηση</string>
   <string name="ApplicationPreferencesActivity_Off">Απενεργοποίηση</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
+  <string name="ApplicationPreferencesActivity_privacy_summary">Συνθηματικό %1$s, Ασφάλεια οθόνης %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">Θέμα %1$s, Γλώσσα %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d λεπτά</string>
+  <plurals name="AppProtectionPreferenceFragment_minutes">
+    <item quantity="one">1 λεπτό</item>
+    <item quantity="other">%d λεπτά</item>
+  </plurals>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(εικόνα)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(ήχος)</string>
   <string name="DraftDatabase_Draft_video_snippet">(βίντεο)</string>
+  <string name="DraftDatabase_Draft_location_snippet">(τοποθεσία)</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Δεν μπορεί να βρεθεί μια εφαρμογή για επιλογή μέσων ενημέρωσης.</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -67,9 +77,7 @@
   <string name="ConversationItem_expires_s">Λήγει: %s</string>
   <string name="ConversationItem_error_not_delivered">Δεν παραδόθηκε</string>
   <string name="ConversationItem_view_secure_media_question">Προβολή ασφαλών πολυμέσων;</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Αυτό το αρχείο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Δυστυχώς, για να το ανοίξεις με κάποιο εξωτερικό πρόγραμμα, είναι απαραίτητο να αποκρυπτογραφηθεί και να εγγραφεί στον δίσκο. Είσαι σίγουρος/η πως το θέλεις αυτό;</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Σφάλμα, λάβαμε παλιό μήνυμα ανταλλαγής κλειδιών.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, κάνε κλικ για επεξεργασία.</string>
   <string name="ConversationItem_group_action_left">Ο/Η %1$s έφυγε απο την ομάδα.</string>
   <string name="ConversationItem_click_for_details">Πάτησε για λεπτομέρειες</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Πάτησε για απροστάτευτη εναλλακτική</string>
@@ -95,8 +103,10 @@
   <string name="ConversationActivity_group_members">Μέλη ομάδας</string>
   <string name="ConversationActivity_group_conversation">Ομαδική συζήτηση</string>
   <string name="ConversationActivity_unnamed_group">Ανώνυμη ομάδα</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d μέλη</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 μέλος</string>
+  <plurals name="ConversationActivity_d_recipients_in_group">
+    <item quantity="one">1 μέλος</item>
+    <item quantity="other">%d μέλη</item>
+  </plurals>
   <string name="ConversationActivity_saved_draft">Αποθηκευμένο προσχέδιο</string>
   <string name="ConversationActivity_invalid_recipient">Άκυρος παραλήπτης!</string>
   <string name="ConversationActivity_calls_not_supported">Δεν υποστηρίζονται κλήσεις</string>
@@ -136,12 +146,8 @@
     <item quantity="other">Αυτό θα διαγράψει οριστικά όλα τα %1$d επιλεγμένα μηνύματα.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Να αποθηκευτεί στην μνήμη;</string>
-  <string name="ConversationFragment_saving_this_media_to_storage_warning">Αποθηκεύοντας αυτό το αρχείο στον αποθηκευτικό χώρο θα επιτρέψει σε οποιαδήποτε άλλη εφαρμογή στην συσκευή σου να έχει πρόσβαση σε αυτό.\n\nΣυνέχεια;</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Σφάλμα κατά την αποθήκευση συνημμένου στην αποθήκευση!</string>
   <string name="ConversationFragment_success_exclamation">Επιτυχία!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Αδύνατη η εγγραφή στην μνήμη!</string>
-  <string name="ConversationFragment_saving_attachment">Αποθήκευση συνημμένου</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Αποθήκευση συνημμένου στην μνήμη...</string>
   <string name="ConversationFragment_pending">Εν αναμονή...</string>
   <string name="ConversationFragment_push">Δεδομένα (Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -160,9 +166,20 @@
     <item quantity="other">Αυτό θα διαγράψει οριστικά όλες τις %1$d επιλεγμένες συζητήσεις.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Διαγραφή</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Διαγραφή επιλεγμένων συζητήσεων...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Διαγραφή επιλεγμένων συζητήσεων...</string>
+  <plurals name="ConversationListFragment_conversations_archived">
+    <item quantity="one">Η συζήτηση αρχειοθετήθηκε</item>
+    <item quantity="other">Αρχειοθετήθηκαν %d συζητήσεις</item>
+  </plurals>
+  <string name="ConversationListFragment_undo">ΑΝΑΙΡΕΣΗ</string>
+  <plurals name="ConversationListFragment_moved_conversations_to_inbox">
+    <item quantity="one">Η συνομιλία μεταφέρθηκε στα εισερχόμενα</item>
+    <item quantity="other">%d συνομιλίες μεταφέρθηκαν στα εισερχόμενα</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Μήνυμα ανταλλαγής κλειδιών...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Αρχειοθετήθηκαν οι συζητήσεις (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Χρησιμοποιείται το προσαρμοσμένο: %s</string>
   <string name="CustomDefaultPreference_using_default">Χρησιμοποιείται το προκαθορισμένο: %s</string>
@@ -182,6 +199,7 @@
   <string name="DeviceListItem_unnamed_device">Ανώνυμη συσκευή</string>
   <string name="DeviceListItem_linked_s">Συνδεδεμένο %s</string>
   <string name="DeviceListItem_last_active_s">Τελευταία ενεργός/η %s</string>
+  <string name="DeviceListItem_today">Σήμερα</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Διαμοιρασμός με</string>
   <!--ExperienceUpgradeActivity-->
@@ -202,14 +220,14 @@
   <string name="ExportFragment_success">Επιτυχία!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Μόνιμη αποτυχία επικοινωνίας του Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Signal δεν μπόρεσε να εγγραφεί με τις υπηρεσίες του Google Play. Η επικοινωνία μέσω του καναλιού δεδομένων έχει απενεργοποιηθεί, παρακαλώ δοκίμασε να ξαναγραφτείς από το μενού ρυθμίσεων του Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Signal δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να επανεγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Νέα ομάδα</string>
   <string name="GroupCreateActivity_actionbar_update_title">Ενημέρωση ομάδας</string>
   <string name="GroupCreateActivity_group_name_hint">Όνομα ομάδας</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Νέα ομάδα MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Επέλεξες μια επαφή που δεν υποστηρίζει ομάδες Signal, οπότε αυτή η ομάδα θα είναι MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Δεν είσαι εγγεγραμμένος/η για τη χρήση του καναλιού δεδομένων, οπότε οι ομάδες Signal είναι απενεργοποιημένες.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Δεν έχεις εγγραφτεί για μηνύματα και κλήσεις του Signal, οπότε οι ομάδες του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να εγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Προέκυψε ένα απρόσμενο σφάλμα και η δημιουργία ομάδας απέτυχε.</string>
   <string name="GroupCreateActivity_contacts_no_members">Χρειάζεται τουλάχιστον ένα άτομο στην ομάδα σου
 !</string>
@@ -260,7 +278,7 @@
   <string name="InviteActivity_cancel">Ακύρωση</string>
   <string name="InviteActivity_sending">Αποστολή...</string>
   <string name="InviteActivity_heart_content_description">Καρδιά</string>
-  <string name="InviteActivity_invitations_sent">Οι προσκλήσεις έχουν σταλεί!</string>
+  <string name="InviteActivity_invitations_sent">Οι προσκλήσεις στάλθηκαν!</string>
   <string name="InviteActivity_invite_to_signal">Πρόσκληση στο Signal</string>
   <plurals name="InviteActivity_send_to_friends">
     <item quantity="one">ΑΠΟΣΤΟΛΗ ΣΕ 1 ΦΙΛΟ</item>
@@ -303,7 +321,7 @@
   <string name="MessageRecord_s_called_you">O/H %s σε κάλεσε</string>
   <string name="MessageRecord_called_s">Κλήση προς τον/την %s</string>
   <string name="MessageRecord_missed_call_from">Αναπάντητη κλήση από τον/την %s</string>
-  <string name="MessageRecord_s_is_on_signal_say_hey">%s είναι στο Signal, πείτε ένα γεια!</string>
+  <string name="MessageRecord_s_is_on_signal_say_hey">Ο/Η %s είναι στο Signal, πες ένα γεια!</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Τα συνθηματικά δε ταιριάζουν!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Λανθασμένο, παλιό συνθηματικό!</string>
@@ -325,6 +343,8 @@
   <string name="DeviceProvisioningActivity_content_progress_key_error">Άκυρος QR κωδικός.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Συγγνώμη, έχεις πάρα πολλές συσκευές ήδη συνδεδεμένες, προσπάθησε να αφαιρέσεις κάποιες...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Συγγνώμη, αυτός δεν είναι ένας έγκυρος κωδικός QR για σύνδεση συσκευών.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Σύνδεση μιας συσκευής Signal;</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Φαίνεται πως προσπαθείς να συνδέσεις μια συσκευή Signal χρησιμοποιώντας ένα τρίτο πρόγραμμα σάρωσης. Για την προστασία σου, παρακαλώ ξανασκάνναρε τον κωδικό μέσα από το Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Εισαγωγή συνθηματικό</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Εικονίδιο Signal</string>
@@ -359,7 +379,7 @@
   <string name="RedPhone_connecting">Συνδέεται</string>
   <string name="RedPhone_handshake_failed">Αποτυχία χειραψίας!</string>
   <string name="RedPhone_recipient_unavailable">Μη διαθέσιμος αποδέκτης</string>
-  <string name="RedPhone_performing_handshake">Εκτέλεση \"χειραψίας\"</string>
+  <string name="RedPhone_performing_handshake">Εκτέλεση χειραψίας</string>
   <string name="RedPhone_network_failed">Αποτυχία Δικτύου!</string>
   <string name="RedPhone_client_failed">Αποτυχία πελάτη</string>
   <string name="RedPhone_fatal_error">Ανεπανόρθωτο σφάλμα</string>
@@ -369,7 +389,6 @@
   <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Ο αριθμός που κάλεσες δεν υποστηρίζει ασφαλή φωνή!</string>
   <string name="RedPhone_got_it">Εντάξει</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_signal">Σύνδεση με το Signal</string>
   <string name="RegistrationActivity_select_your_country">Επιλέξτε χώρα</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Πρέπει να καθορίσεις τον
 κώδικα της χώρας σου</string>
@@ -423,8 +442,6 @@
     </string>
   <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 name="SmsMessageRecord_received_updated_but_unknown_identity_information">Λήφθηκε ενημερωμένη αλλά άγνωστη πληροφορία ταυτότητας. Πάτησε για επιβεβαίωση ταυτότητας.</string>
   <string name="SmsMessageRecord_secure_session_reset">Επαναφορά ασφαλούς συνεδρίας.</string>
   <string name="SmsMessageRecord_duplicate_message">Διπλότυπο μήνυμα.</string>
@@ -441,8 +458,6 @@
   <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_your_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>
@@ -450,8 +465,6 @@
   <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_not_verified_exclamation">ΔΕΝ επιβεβαιώθηκε!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Το σαρωμένο κλειδί ταιριάζει!</string>
@@ -506,14 +519,15 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Η γρήγορη απάντηση δεν είναι διαθέσιμη όταν το Signal είναι κλειδωμένο!</string>
   <string name="QuickResponseService_problem_sending_message">Πρόβλημα με την αποστολή μηνύματος!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Νέο μήνυμα Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Κρυμμένα περιεχόμενα</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Νέο Μήνυμα</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Εικόνα</string>
   <string name="attachment_type_selector__audio">Ήχος</string>
   <string name="attachment_type_selector__video">Βίντεο</string>
   <string name="attachment_type_selector__contact">Επαφή</string>
   <string name="attachment_type_selector__camera">Κάμερα</string>
+  <string name="attachment_type_selector__location">Τοποθεσία</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Παλιό συνθηματικό</string>
   <string name="change_passphrase_activity__new_passphrase">Νέο συνθηματικό</string>
@@ -566,12 +580,16 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Γίνεται φόρτωση χωρών...</string>
   <string name="country_selection_fragment__search">Αναζήτηση</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Σκάναρε το QR code που εμφανίζεται στην συσκευή για να γίνει η σύνδεση</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Σύνδεση συσκευής</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Δεν έχουν συνδεθεί συσκευές...</string>
+  <string name="device_list_fragment__link_new_device">Σύνδεση νέας συσκευής</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">συνέχεια</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Αποτυχία δημιουργίας αρχείου συμβάντων για τη συσκευή σου. Μπορείς να χρησιμοποιήσεις το ADB για να ανακτήσεις τα debug logs.</string>
   <string name="log_submit_activity__thanks">Ευχαριστούμε για τη βοήθειά σου!</string>
   <string name="log_submit_activity__submitting">Αποστολή</string>
   <string name="log_submit_activity__posting_logs">Αποστολή των αρχείων καταγραφής στο gist…</string>
@@ -617,7 +635,6 @@
   <string name="prompt_passphrase_activity__unlock">Ξεκλείδωμα</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Το Signal χρειάζεται τις ρυθμίσεις MMS για να στείλει μηνύματα πολυμέσων και ομαδικών συζητήσεων μέσω του παρόχου σου. Η συσκευή σου δεν παρέχει αυτές τις πληροφορίες, το οποίο μερικές φορές γίνεται σε κλειδωμένες συσκευές ή λόγω άλλων περιοριστικών ρυθμίσεων.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Για να στείλεις μηνύματα πολυμέσων, πάτησε «ΟΚ» και συμπλήρωσε τις ρυθμίσεις APN. Θα βρείς τις σωστές ρυθμίσεις APN για τον πάροχό σου ψάχνοντας online για «το όνομα του παρόχου σου» + APN. Αυτές οι ρυθμίσεις γίνονται μόνο μία φορά.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">ΜΠΛΟΚΑΡΙΣΜΕΝΟΣ/Η</string>
   <!--recipient_preferences-->
@@ -661,7 +678,7 @@
 για την περιοχή σου.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__signal_will_not_work_with_google_voice_numbers">
-        Το Signal δεν λειτουργεί με αριθμούς Google Voice.
+Το Signal δεν λειτουργεί με αριθμούς Google Voice.
     </string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Επιβεβαίωση με φωνή</string>
@@ -672,17 +689,16 @@
   <string name="registration_progress_activity__call_me">Κάλεσέ με</string>
   <string name="registration_progress_activity__edit_number">Επεξεργασία αριθμού</string>
   <string name="registration_progress_activity__connectivity_error">Σφάλμα συνδεσιμότητας.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Το Signal δεν μπόρεσε να συνδεθεί στην υπηρεσία push.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Το Signal δεν μπόρεσε να συνδεθεί στον διακομιστή.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Πιθανά
         προβλήματα:
     </string>
   <string name="registration_progress_activity__no_network_connectivity">Δεν υπάρχει
 σύνδεση στο δίκτυο.
     </string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Η
-συσκευή χρειάζεται σύνδεση στο δίκτυο για να χρησιμοποιηθεί αυτή η λειτουργία του Signal.
-Επιβεβαίωσε πως είσαι συνδεδεμένος σε 3G ή WiFi.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Η συσκευή
+σου πρέπει να είναι συνδεδεμένη στο δίκτυο για να χρησιμοποιήσεις αυτό το χαρακτηριστικό του Signal. 
+Επιβεβαίωσε ότι είναι συνδεδεμένη σε Wi-Fi ή 3G.</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">
 Αν είσαι συνδεμένος/η μέσω WiFi, πιθανώς να υπάρχει ένα τείχος προστασίας που εμποδίζει
@@ -709,7 +725,7 @@
   <string name="recipients_panel__to"><small>Εισαγωγή ονόματος ή αριθμού</small></string>
   <string name="recipients_panel__add_member">Προσθήκη μέλους</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Η ταυτότητά του/tης (αυτός/η διαβάζει):</string>
+  <string name="verify_identity_activity__their_identity_they_read">Η ταυτότητά του/της (αυτός/η διαβάζει):</string>
   <string name="verify_identity_activity__your_identity_you_read">Η ταυτότητά σου (εσύ διαβάζεις):</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">Ορισμένα ζητήματα χρειάζονται την προσοχή σου.</string>
@@ -727,13 +743,13 @@
   <string name="AndroidManifest__public_identity_key">Δημόσιο κλειδί ταυτότητας</string>
   <string name="AndroidManifest__change_passphrase">Αλλαγή συνθηματικού</string>
   <string name="AndroidManifest__verify_identity">Επιβεβαίωση ταυτότητας</string>
-  <string name="AndroidManifest__log_submit">Υποβολή διαγνωστικού αρχείου.</string>
-  <string name="AndroidManifest__media_preview">Προεπισκόπηση  Πολυμέσων</string>
+  <string name="AndroidManifest__media_preview">Προεπισκόπιση</string>
   <string name="AndroidManifest__media_overview">Όλες οι εικόνες</string>
   <string name="AndroidManifest__media_overview_named">Όλες οι εικόνες με τον/την %1$s</string>
-  <string name="AndroidManifest__message_details">Στοιχεία μηνύματος</string>
+  <string name="AndroidManifest__message_details">Λεπτομέρειες μηνύματος</string>
   <string name="AndroidManifest_manage_linked_devices">Διαχείριση συνδεδεμένων συσκευών</string>
   <string name="AndroidManifest__invite_friends">Πρόσκληση φίλων</string>
+  <string name="AndroidManifest_archived_conversations">Αρχειοθετημένες συζητήσεις</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Εισαγωγή / εξαγωγή</string>
   <string name="arrays__your_identity_key">Το κλειδί ταυτότητάς σου</string>
@@ -776,18 +792,16 @@
   <string name="preferences__change_passphrase">Αλλαγή συνθηματικού</string>
   <string name="preferences__change_your_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__lock_signal_and_message_notifications_with_a_passphrase">Κλείδωμα του Signal και των ειδοποιήσεων μηνυμάτων με ένα συνθηματικό</string>
   <string name="preferences__screen_security">Ασφάλεια οθόνης</string>
-  <string name="preferences__screen_security_summary">Ασφάλεια οθόνης %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Να επιτρέπεται η καταγραφή της οθόνης (screenshots)</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Να σβήνεται το συνθηματικό από τη μνήμη μετά από κάποιο διάστημα</string>
-  <string name="preferences__timeout_passphrase">Χρονικό όριο συνθηματικού</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Επιλέξτε χρονικό όριο συνθηματικού</string>
-  <string name="preferences__pref_timeout_interval_title">Χρονικό όριο</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Πόση ώρα θα περιμένουμε πριν σβήσουμε το συνθηματικό από τη μνήμη</string>
+  <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Αυτόματο κλείδωμα του Signal μετά απο κάποιο συγκεκριμένο χρόνο αδράνειας</string>
+  <string name="preferences__inactivity_timeout_passphrase">Συνθηματικό χρόνου αδράνειας</string>
+  <string name="preferences__inactivity_timeout_interval">Χρονικό διάστημα χρόνου αδράνειας</string>
   <string name="preferences__notifications">Ειδοποιήσεις</string>
   <string name="preferences__enable_message_notifications">Ενεργοποίηση ειδοποιήσεων μηνυμάτων</string>
+  <string name="preferences__new_contacts_notifications">Ειδοποιήσεις νέων επαφών</string>
+  <string name="preferences__show_a_notification_for_new_signal_contacts">Εμφάνιση ειδοποίησης για νέες επαφές Signal</string>
   <string name="preferences__led_color">Χρώμα LED</string>
   <string name="preferences__led_color_unknown">Αγνωστο</string>
   <string name="preferences__pref_led_blink_title">Μοτίβο αναβοσβησίματος του LED</string>
@@ -798,7 +812,7 @@
   <string name="preferences__sound">Ήχος</string>
   <string name="preferences__change_notification_sound">Αλλαγή ήχου ειδοποίησης</string>
   <string name="preferences__silent">Σε σίγαση</string>
-  <string name="preferences__inthread_notifications">Ειδοποιήσεις εντός συζητήσεων</string>
+  <string name="preferences__in_conversation_notifications">Ειδοποιήσεις εντός της συζήτησης</string>
   <string name="preferences__play_inthread_notifications">Αναπαραγωγή ήχου ειδοποίησης όταν βλέπεις μια ενεργή συνομιλία</string>
   <string name="preferences__repeat_alerts">Επανάληψη ειδοποιήσεων</string>
   <string name="preferences__never">Ποτέ</string>
@@ -836,21 +850,19 @@
   <string name="preferences__mmsc_password">MMSC Κωδικός`</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__automatically_delete_older_messages_once_a_conversation_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>
+  <string name="preferences__trim_all_conversations_now">Κούρεμα όλων των συζητήσεων τώρα</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Σκανάρισμα όλων των συζητήσεων και επιβολή του ορίου μήκους των συζητήσεων</string>
   <string name="preferences__devices">Συσκευές</string>
   <string name="preferences__light_theme">Φως</string>
   <string name="preferences__dark_theme">Σκοτάδι</string>
   <string name="preferences__appearance">Εμφάνιση</string>
   <string name="preferences__theme">Θέμα</string>
-  <string name="preferences__theme_summary">Θέμα %s</string>
   <string name="preferences__default">Προκαθορισμένη</string>
   <string name="preferences__language">Γλώσσα</string>
-  <string name="preferences__language_summary">Γλώσσα %s</string>
   <string name="preferences__signal_messages_and_calls">Μηνύματα και κλήσεις του Signal</string>
   <string name="preferences__free_private_messages_and_calls">Δωρεάν προσωπικά μηνύματα και κλήσεις προς τους χρήστες του Signal</string>
   <string name="preferences__submit_debug_log">Αποστολή αρχείων καταγραφής αποσφαλμάτωσης</string>
@@ -897,11 +909,14 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Διαγραφή επιλεγμένων</string>
   <string name="conversation_list_batch__menu_select_all">Επιλογή Όλων</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Επιλεγμένο αρχείο</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Απαρχειοθέτηση επιλέχθηκε</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Αναζήτηση</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Φωτογραφία επαφής</string>
   <string name="conversation_list_item_view__error_alert">Ειδοποίηση σφάλματος</string>
+  <string name="conversation_list_item_view__archived">Αρχειοθετημένα</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Νεα Συζήτηση</string>
   <!--conversation_secure_verified-->
@@ -930,8 +945,6 @@
   <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_new_message">Νέο Μήνυμα</string>
   <string name="text_secure_normal__menu_new_group">Νέα ομάδα</string>
@@ -939,15 +952,21 @@
   <string name="text_secure_normal__menu_clear_passphrase">Κλείδωμα</string>
   <string name="text_secure_normal__mark_all_as_read">Σημείωση όλων ως αναγνωσμένα</string>
   <string name="text_secure_normal__invite_friends">Πρόσκληση φίλων</string>
+  <string name="text_secure_normal__help">Βοήθεια</string>
   <!--reminder_header-->
+  <string name="reminder_header_outdated_build">Η έκδοση του Signal σου είναι παρωχημένη</string>
+  <plurals name="reminder_header_outdated_build_details">
+    <item quantity="one">Η έκδοση του Signal σου θα λήξει σε 1 ημέρα. Πάτα για να αναβαθμίσεις στην πιο πρόσφατη έκδοση.</item>
+    <item quantity="other">Η έκδοση του Signal σου θα λήξει σε %d ημέρες. Πάτα για να αναβαθμίσεις στην πιο πρόσφατη έκδοση.</item>
+  </plurals>
+  <string name="reminder_header_outdated_build_details_today">Η έκδοση του Signal σου θα λήξει σήμερα. Πάτα για να αναβαθμίσεις στην πιο πρόσφατη έκδοση.</string>
   <string name="reminder_header_expired_build">Η έκδοση του Signal σου έχει λήξει!</string>
-  <string name="reminder_header_expired_build_details">Τα μηνύματα δεν θα στείλνονται με επιτυχία, παρακαλώ αναβάθμισε στην πιο πρόσφατη έκδοση.</string>
+  <string name="reminder_header_expired_build_details">Τα μηνύματα δεν θα αποστέλλονται πια επιτυχώς. Πάτα για να αναβαθμίσεις στην πιο πρόσφατη έκδοση.</string>
   <string name="reminder_header_expired_build_button">ΑΝΑΒΑΘΜΙΣΗ</string>
   <string name="reminder_header_sms_default_title">Χρήση ως προκαθορισμένη εφαρμογή για τα SMS</string>
   <string name="reminder_header_sms_default_text">Πάτα για να κάνεις το Signal την προκαθορισμένη εφαρμογή για τα SMS.</string>
   <string name="reminder_header_sms_default_button">ΟΡΙΣΜΟΣ</string>
   <string name="reminder_header_sms_import_title">Εισαγωγή SMS συστήματος</string>
-  <string name="reminder_header_sms_import_text">Πάτησε για να αντιγραφτούν τα μηνύματα SMS του κινητού σου τηλεφώνου στην κρυπτογραφημένη βάση δεδομένων.</string>
   <string name="reminder_header_sms_import_button">ΕΙΣΑΓΩΓΗ</string>
   <string name="reminder_header_push_title">Ενεργοποίηση των μηνημάτων και κλήσεων Signal</string>
   <string name="reminder_header_push_text">Αναβάθμισε την εμπειρία επικοινωνίας σου.</string>
@@ -965,6 +984,7 @@
   <string name="MediaPreviewActivity_unssuported_media_type">Μη υποστηριζόμενος τύπος μέσων ενημέρωσης</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Αποθήκευση</string>
+  <!--media_overview-->
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Προεπισκόπηση εικόνας</string>
   <!--new_conversation_activity-->
@@ -979,8 +999,5 @@
   <string name="trimmer__old_messages_successfully_deleted">Τα παλιά μηνύματα διαγράφτηκαν επιτυχώς</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Μεταφορά εικονίδιου</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Σκάναρε το QR code που εμφανίζεται στην συσκευή για να γίνει η σύνδεση</string>
-  <string name="device_link_fragment__link_device">Σύνδεση συσκευής</string>
-  <string name="device_list_fragment__link_new_device">Σύνδεση νέας συσκευής</string>
   <!--EOF-->
 </resources>

res/values-es/strings.xml

@@ -8,18 +8,23 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Actualmente: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">¡Todavía no ha elegido una clave de acceso!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mensajes por conversación</string>
+  <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+    <item quantity="one">1 mensaje por conversación</item>
+    <item quantity="other">%d mensajes por conversación</item>
+  </plurals>
   <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>
+  <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+    <item quantity="one">Esto recortará inmediatamente todas las conversaciones al mensaje más reciente.</item>
+    <item quantity="other">Esto recortará inmediatamente todas las conversaciones a los %d mensajes más recientes.</item>
+  </plurals>
   <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_this_will_permanently_unlock_signal_and_message_notifications">Esto desbloqueará permanentemente Signal y las notificaciones de mensaje.</string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Desregistrándose</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Desregistrándose de mensajes y llamadas de Signal...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Borrando cuenta Signal...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">¿Deshabilitar mensajes y llamadas de Signal?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Deshabilitar los mensajes y llamadas de Signal desregistrándole del servidor. Necesitará volver a registrar su número de teléfono para usarlos de nuevo en el futuro.</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Esto deshabilitará los mensajes de Signal eliminándole del servidor. Necesitará volver a registrar su número de teléfono para usar mensajes de Signal de nuevo en el futuro.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Error conectando al servidor!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS habilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pulse para cambiar la aplicación de SMS predeterminada</string>
@@ -30,12 +35,18 @@
   <string name="ApplicationPreferencesActivity_off">inactivo</string>
   <string name="ApplicationPreferencesActivity_Off">Inactivo</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
+  <string name="ApplicationPreferencesActivity_privacy_summary">Frase contraseña %1$s, seguridad de la pantalla %2$s</string>
+  <string name="ApplicationPreferencesActivity_appearance_summary">Tema %1$s, Idioma %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d minutos</string>
+  <plurals name="AppProtectionPreferenceFragment_minutes">
+    <item quantity="one">1 minuto</item>
+    <item quantity="other">%d minutos</item>
+  </plurals>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(imagen)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
   <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
+  <string name="DraftDatabase_Draft_location_snippet">(ubicación)</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">No se pudo encontrar una aplicación para el contenido seleccionado.</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -67,9 +78,9 @@ este contacto.
   <string name="ConversationItem_expires_s">Expira: %s</string>
   <string name="ConversationItem_error_not_delivered">No entregado</string>
   <string name="ConversationItem_view_secure_media_question">¿Ver contenido seguro?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este archivo ha sido guardado en una base de datos cifrada. Desafortunadamente, para verlo con un visor de contenido externo se requiere que los datos sean descifrados temporalmente y escritos al disco. ¿Está seguro de que desea hacer esto?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este audiovisual se ha almacenado en una base de datos cifrada. Desafortunadamente, para verlo con un visor de contenido externo actualmente se requiere que los datos sean temporalmente descifrados y escritos en el almacenamiento. ¿Está seguro de que desea hacer esto?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Error, recibió un mensaje de intercambio de claves expirado.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ha recibido un mensaje de intercambio de claves, haga clic para proceder.</string>
+  <string name="ConversationItem_received_key_exchange_message_tap_to_process">Se recibió un mensaje de intercambio de clave, pulse para proceder.</string>
   <string name="ConversationItem_group_action_left">%1$s ha abandonado el grupo.</string>
   <string name="ConversationItem_click_for_details">Pulse para ver los detalles</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Pulse para cambiar a no cifrado</string>
@@ -77,6 +88,8 @@ este contacto.
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">¿Recurrir a MMS cifrado?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque el destinatario ya no es un usuario de Signal.\n\n¿Enviar mensaje no asegurado?</string>
   <string name="ConversationItem_unable_to_open_media">No se pudo encontrar una aplicación capaz de abrir este contenido.</string>
+  <string name="ConversationItem_from_s">de %s</string>
+  <string name="ConversationItem_to_s">a %s</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">¿Reiniciar la sesión segura?</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Esto le puede ayudar si está teniendo problemas de cifrado en esta conversación. Sus mensajes se mantendrán.</string>
@@ -95,8 +108,10 @@ este contacto.
   <string name="ConversationActivity_group_members">Miembros del grupo</string>
   <string name="ConversationActivity_group_conversation">Conversación de grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo sin nombre</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d miembros</string>
-  <string name="ConversationActivity_d_recipients_in_group_singular">1 miembro</string>
+  <plurals name="ConversationActivity_d_recipients_in_group">
+    <item quantity="one">1 miembro</item>
+    <item quantity="other">%d miembros</item>
+  </plurals>
   <string name="ConversationActivity_saved_draft">Guardar borrador</string>
   <string name="ConversationActivity_invalid_recipient">¡Destinatario inválido!</string>
   <string name="ConversationActivity_calls_not_supported">Llamadas incompatibles</string>
@@ -136,12 +151,8 @@ Recibido:%4$s</string>
     <item quantity="other">Esto eliminará de forma permanente los %1$d mensajes seleccionados.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">¿Guardar en el almacenamiento?</string>
-  <string name="ConversationFragment_saving_this_media_to_storage_warning">Guardar este contenido multimedia en la memoria permitirá que cualquier otra aplicación en su dispositivo lo acceda.\n\n¿Continuar?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">¡Error al guardar adjunto en el almacenamiento!</string>
   <string name="ConversationFragment_success_exclamation">¡Completado!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">¡No se pudo escribir en el almacenamiento!</string>
-  <string name="ConversationFragment_saving_attachment">Guardando adjunto</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Guardando adjunto en el almacenamiento...</string>
   <string name="ConversationFragment_pending">Pendiente...</string>
   <string name="ConversationFragment_push">Datos (Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -160,9 +171,20 @@ Recibido:%4$s</string>
     <item quantity="other">Esto eliminará permanentemente las %1$d conversaciones seleccionadas.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Eliminando</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Eliminando conversaciones seleccionadas...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Borrando conversaciones seleccionadas...</string>
+  <plurals name="ConversationListFragment_conversations_archived">
+    <item quantity="one">Conversación archivada</item>
+    <item quantity="other">%d conversaciones archivadas</item>
+  </plurals>
+  <string name="ConversationListFragment_undo">Atrás</string>
+  <plurals name="ConversationListFragment_moved_conversations_to_inbox">
+    <item quantity="one">Conversacion movida a la bandeja de entrada</item>
+    <item quantity="other">%d Conversaciones movidas a la bandeja de entrada</item>
+  </plurals>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensaje de intercambio de claves...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Conversaciones archivadas (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Usando personalizado: %s</string>
   <string name="CustomDefaultPreference_using_default">Usando predeterminado: %s</string>
@@ -182,6 +204,7 @@ Recibido:%4$s</string>
   <string name="DeviceListItem_unnamed_device">Dispositivo sin nombre</string>
   <string name="DeviceListItem_linked_s">Se vinculó %s</string>
   <string name="DeviceListItem_last_active_s">Activo por última vez el %s</string>
+  <string name="DeviceListItem_today">Hoy</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartir con</string>
   <!--ExperienceUpgradeActivity-->
@@ -202,14 +225,14 @@ Recibido:%4$s</string>
   <string name="ExportFragment_success">¡Éxito!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">¡Fallo permanente de comunicación de Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal no pudo registrarse con Google Play Services. La comunicación sobre el canal de datos ha sido deshabilitada, por favor, intente volver a registrarse desde el menú de configuración de Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal fué incapaz de registrarse con Google Play Services. Los mensajes y llamadas de Signal han sido desactivados, por favor, intenta registrarte otra vez en Configuración &gt; Avanzado.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuevo grupo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizar grupo</string>
   <string name="GroupCreateActivity_group_name_hint">Nombre del grupo</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nuevo grupo de MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Ha seleccionado un contacto que no soporta grupos de Signal, así que este grupo será de MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">No está registrado para usar el canal de datos, así que los grupos de Signal están deshabilitados.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">No estás registrado para los mensajes y llamadas de Signal, así que los grupos de Signal están desactivados, por favor, intenta registrarte otra vez en Configuración &gt; Avanzado.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Un error inesperado hizo fallar la creación del grupo.</string>
   <string name="GroupCreateActivity_contacts_no_members">¡Necesita al menos una persona en su grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Uno de los miembros de su grupo tiene un número que no puede ser leído correctamente. Por favor arréglelo o elimine ese contacto, e inténtelo de nuevo.</string>
@@ -271,7 +294,7 @@ importarla de nuevo dará como resultado mensajes duplicados.</string>
   </plurals>
   <string name="InviteActivity_lets_switch_to_signal">Pasémonos a Signal: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Parece que no tiene ninguna aplicación con qué compartir.</string>
-  <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Los amigos no dejan que sus amigos hablen sin encriptar.</string>
+  <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Los verdaderos amigos no dejan que sus amigos hablen sin cifrar</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">¡No se encontró una clave escaneada!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">¿Instalar Barcode Scanner?</string>
@@ -324,6 +347,9 @@ importarla de nuevo dará como resultado mensajes duplicados.</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_linked_already">Lo sentimos, ya tiene demasiados dispositivos vinculados, pruebe a eliminar alguno...</string>
+  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Lo sentimos , este código QR no es ​​válido .</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">¿Enlazar un dispositivo Signal?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Parece que estás intentando enlazar un dispositivo Signal usando un escáner de terceros. Para tu protección, por favor, escanea el código otra vez desde Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduzca clave de acceso</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icono de Signal</string>
@@ -430,9 +456,7 @@ de intercambio de claves!
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 Se recibió un mensaje de intercambio de claves para una versión no válida del protocolo.
 </string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-Se recibió un mensaje con una clave de identidad desconocida. Haga clic para procesar y mostrar.
-</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process">Se recibió un mensaje con una clave de identidad desconocida. Pulse para procesar y mostrar.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Recibí actualizado pero con información de identidad desconocida. Pulse para validar identidad.</string>
   <string name="SmsMessageRecord_secure_session_reset">Reinicio de sesión segura.</string>
   <string name="SmsMessageRecord_duplicate_message">Duplicar mensaje.</string>
@@ -449,8 +473,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">No tiene ninguna clave de identidad.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">El destinatario no tiene clave de identidad.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">¡El destinatario no tiene clave de identidad!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Escanear la clave de ellos, para comparar</string>
-  <string name="VerifyIdentityActivity_get_your_key_scanned">Que escaneen su clave</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ADVERTENCIA: la clave escaneada NO coincide. Por favor, verifique el texto de la huella digital cuidadosamente.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">¡NO verificado!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">La clave de ellos es correcta. También es necesario verificar su clave con ellos.</string>
@@ -458,8 +480,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">¡No tiene ninguna clave de identidad!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">No tiene ninguna clave de identidad.</string>
-  <string name="ViewIdentityActivity_scan_to_compare">Escanear para comparar</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Escanear su clave para comparar</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ADVERTENCIA: ¡las claves escaneadas NO coinciden!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">¡NO verificada!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">¡La clave escaneada coincide!</string>
@@ -514,14 +534,15 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">¡La respuesta rápida no está disponible cuando Signal está bloqueado!</string>
   <string name="QuickResponseService_problem_sending_message">¡Hubo un problema al enviar el mensaje!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Nuevo mensaje de Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Contenidos ocultos</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nuevo mensaje</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Imagen</string>
   <string name="attachment_type_selector__audio">Audio</string>
   <string name="attachment_type_selector__video">Vídeo</string>
   <string name="attachment_type_selector__contact">Contacto</string>
   <string name="attachment_type_selector__camera">Cámara</string>
+  <string name="attachment_type_selector__location">Ubicación</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Clave de acceso antigua</string>
   <string name="change_passphrase_activity__new_passphrase">Nueva clave de acceso</string>
@@ -574,12 +595,17 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Cargando países...</string>
   <string name="country_selection_fragment__search">Buscar</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escanear el código QR mostrado en el dispositivo para vincular</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Vincular dispositivo</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">No hay dispositivos vinculados...</string>
+  <string name="device_list_fragment__link_new_device">Vincular nuevo dispositivo</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">continuar</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__log_fetch_failed">No se pudo leer el registro (log) en su dispositivo. Aún puede usar ADB para obtener un registro de depuración en su lugar.</string>
   <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
   <string name="log_submit_activity__submitting">Enviando</string>
   <string name="log_submit_activity__posting_logs">Publicando registros de actividad en gist...</string>
@@ -625,7 +651,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal requiere que la configuración de MMS envíe los mensajes audiovisuales y de grupo a través de su proveedor móvil. Su dispositivo no proporciona esta información, algo que ocasionalmente ocurre con dispositivos bloqueados y otras configuraciones restrictivas.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar contenido multimedia y mensajes de grupo haga click en \'OK\' y realice la configuración requerida. Las opciones de MMS de su proveedor de telefonía pueden ser encontradas normalmente buscando el \'APN de su proveedor\'. Solo necesitará hacer esto una vez.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">Para enviar mensajes audiovisuales y de grupo, pulse \'Aceptar\' y complete las configuraciones solicitadas. Las configuraciones de MMS para su proveedor generalmente se pueden localizar buscando por \'el APN de su proveedor\'. Sólo necesitará hacer esto una vez.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BLOQUEADO</string>
   <!--recipient_preferences-->
@@ -679,8 +705,7 @@ Signal también puede llamarle para verificar su número. Pulse \'Llamarme\' e i
   <string name="registration_progress_activity__call_me">Llamarme</string>
   <string name="registration_progress_activity__edit_number">Editar número</string>
   <string name="registration_progress_activity__connectivity_error">Fallo de conectividad.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal no pudo conectar con el servicio de actualización activa (push).</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal no pudo conectar con el servidor.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Algunos posibles
 problemas son:
 
@@ -688,9 +713,10 @@ problemas son:
   <string name="registration_progress_activity__no_network_connectivity">Sin conectividad 
 a la red.
     </string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Sus
-dispositivos necesitan conectividad de red para usar esta característica de Signal. Compruébela para asegurarse
-de que está conectado mediante 3G o Wi-Fi.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Tu
+dispositivo necesita estar conectado para poder usar esta característica de Signal. Comprueba
+que está conectado a datos móviles o por Wi-Fi.
+ </string>
   <string name="registration_progress_activity__restrictive_firewall">Cortafuegos restrictivo.
 </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -738,13 +764,14 @@ por SMS.
   <string name="AndroidManifest__public_identity_key">Clave pública de identidad</string>
   <string name="AndroidManifest__change_passphrase">Cambiar clave de acceso</string>
   <string name="AndroidManifest__verify_identity">Verificar identidad</string>
-  <string name="AndroidManifest__log_submit">Enviar registros de depuración</string>
-  <string name="AndroidManifest__media_preview">Previsualización del contenido</string>
+  <string name="AndroidManifest__log_submit">Remitir registro (log) de depuración</string>
+  <string name="AndroidManifest__media_preview">Previsualizar multimedia</string>
   <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_linked_devices">Administrar dispositivos vinculados</string>
   <string name="AndroidManifest__invite_friends">Invitar amigos</string>
+  <string name="AndroidManifest_archived_conversations">Conversaciones archivadas</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar/exportar</string>
   <string name="arrays__your_identity_key">Su clave de identidad</string>
@@ -787,18 +814,16 @@ por SMS.
   <string name="preferences__change_passphrase">Cambiar clave de acceso</string>
   <string name="preferences__change_your_passphrase">Cambiar su frase de contraseña</string>
   <string name="preferences__enable_passphrase">Habilitar clave de acceso</string>
-  <string name="preferences__passphrase_summary">Clave de acceso %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">Habilitar pantalla de bloqueo para mensajes</string>
+  <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Bloquear Signal y notificaciones de mensajes con una frase-contraseña</string>
   <string name="preferences__screen_security">Seguridad de la pantalla</string>
-  <string name="preferences__screen_security_summary">Seguridad de la pantalla %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bloquear capturas de pantalla en la lista de aplicaciones recientes y dentro de la aplicación</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Eliminar la clave de acceso de la memoria tras cierto intervalo</string>
-  <string name="preferences__timeout_passphrase">Caducidad de clave de acceso</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Seleccionar caducidad de clave de acceso</string>
-  <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__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Bloquear automáticamente Signal tras un intervalo de inactividad específicado</string>
+  <string name="preferences__inactivity_timeout_passphrase">Frase-contraseña para suspensión por inactividad</string>
+  <string name="preferences__inactivity_timeout_interval">Intervalo para suspensión por inactividad</string>
   <string name="preferences__notifications">Notificaciones</string>
   <string name="preferences__enable_message_notifications">Habilitar notificaciones de mensaje</string>
+  <string name="preferences__new_contacts_notifications">Notificaciones de nuevos contactos</string>
+  <string name="preferences__show_a_notification_for_new_signal_contacts">Mostrar una notificación para nuevos contactos de Signal</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>
@@ -809,7 +834,7 @@ por SMS.
   <string name="preferences__sound">Sonido</string>
   <string name="preferences__change_notification_sound">Cambiar sonido de notificación</string>
   <string name="preferences__silent">Silenciar</string>
-  <string name="preferences__inthread_notifications">Notificaciones dentro de conversación</string>
+  <string name="preferences__in_conversation_notifications">Notificaciones en conversación</string>
   <string name="preferences__play_inthread_notifications">Reproducir sonido de notificación al pasar a ver una conversación activa</string>
   <string name="preferences__repeat_alerts">Repetir alertas</string>
   <string name="preferences__never">Nunca</string>
@@ -847,21 +872,19 @@ por SMS.
   <string name="preferences__mmsc_password">Contraseña de MMSC</string>
   <string name="preferences__sms_delivery_reports">Confirmación de entrega de SMS</string>
   <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__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Eliminar automáticamente los mensajes más antiguos cuando la 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>
+  <string name="preferences__trim_all_conversations_now">Recortar todas las conversaciones ahora</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Escanear todas las conversaciones e imponer los límites de longitud en las conversaciones</string>
   <string name="preferences__devices">Dispositivos</string>
   <string name="preferences__light_theme">Claro</string>
   <string name="preferences__dark_theme">Oscuro</string>
   <string name="preferences__appearance">Apariencia</string>
   <string name="preferences__theme">Tema</string>
-  <string name="preferences__theme_summary">Tema %s</string>
   <string name="preferences__default">Por defecto</string>
   <string name="preferences__language">Idioma</string>
-  <string name="preferences__language_summary">Idioma %s</string>
   <string name="preferences__signal_messages_and_calls">Signal mensajes y llamadas</string>
   <string name="preferences__free_private_messages_and_calls">Llamadas y mensajes privados gratuitos para los usuarios de Signal</string>
   <string name="preferences__submit_debug_log">Enviar registro de depuración</string>
@@ -908,11 +931,14 @@ por SMS.
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Borrar seleccionado</string>
   <string name="conversation_list_batch__menu_select_all">Seleccionar todo</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Archivo seleccionado</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Archivo deseleccionado</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Buscar</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Foto del contacto</string>
   <string name="conversation_list_item_view__error_alert">Alerta de error</string>
+  <string name="conversation_list_item_view__archived">Archivado</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nueva conversación</string>
   <!--conversation_secure_verified-->
@@ -941,8 +967,6 @@ por SMS.
   <string name="conversation_group_options__broadcast">Transmisión</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Comparar</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Escanear mi clave para comparar</string>
-  <string name="key_scanning__menu_scan_to_compare">Escanear para comparar</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nuevo mensaje</string>
   <string name="text_secure_normal__menu_new_group">Nuevo grupo</string>
@@ -950,15 +974,22 @@ por SMS.
   <string name="text_secure_normal__menu_clear_passphrase">Bloquear</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todos como leídos</string>
   <string name="text_secure_normal__invite_friends">Invitar amigos</string>
+  <string name="text_secure_normal__help">Ayuda</string>
   <!--reminder_header-->
+  <string name="reminder_header_outdated_build">Su versión de Signal está anticuada</string>
+  <plurals name="reminder_header_outdated_build_details">
+    <item quantity="one">Su versión de Signal caducará en 1 día. Pulse para actualizarla a la versión más reciente.</item>
+    <item quantity="other">Su versión de Signal caducará en %d días. Pulse para actualizarla a la versión más reciente.</item>
+  </plurals>
+  <string name="reminder_header_outdated_build_details_today">Su versión de Signal caduca hoy. Pulse para actualizarla a la versión más reciente.</string>
   <string name="reminder_header_expired_build">¡Su versión de Signal ha caducado!</string>
-  <string name="reminder_header_expired_build_details">Los mensajes ya no se enviarán con éxito, por favor, actualice a la versión más reciente.</string>
+  <string name="reminder_header_expired_build_details">Los mensajes ya no se mandarán exitosamente. Pulse para actualizar a la versión más reciente.</string>
   <string name="reminder_header_expired_build_button">ACTUALIZAR</string>
   <string name="reminder_header_sms_default_title">Usar como aplicación de SMS predeterminada</string>
   <string name="reminder_header_sms_default_text">Pulse para hacer de Signal su aplicación de SMS predeterminada.</string>
   <string name="reminder_header_sms_default_button">AJUSTAR</string>
   <string name="reminder_header_sms_import_title">Importar SMS del sistema</string>
-  <string name="reminder_header_sms_import_text">Pulse para copiar los mensajes SMS de su teléfono en su base de datos cifrada.</string>
+  <string name="reminder_header_sms_import_text">Pulse para copiar los mensajes SMS de su teléfono a la base de datos cifrada de Signal.</string>
   <string name="reminder_header_sms_import_button">IMPORTAR</string>
   <string name="reminder_header_push_title">Activar Signal mensajes y llamadas</string>
   <string name="reminder_header_push_text">Actualiza tu experiencia comunicativa</string>
@@ -976,8 +1007,9 @@ por SMS.
   <string name="MediaPreviewActivity_unssuported_media_type">Formato de contenido no compatible</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Guardar</string>
+  <!--media_overview-->
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Previsualización de la imagen</string>
+  <string name="media_preview_activity__image_content_description">Previsualización de imagen</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Recargar</string>
   <!--redphone_audio_popup_menu-->
@@ -990,8 +1022,5 @@ por SMS.
   <string name="trimmer__old_messages_successfully_deleted">Mensajes antiguos borrados con éxito</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icono de transporte</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escanear el código QR mostrado en el dispositivo para vincular</string>
-  <string name="device_link_fragment__link_device">Vincular dispositivo</string>
-  <string name="device_list_fragment__link_new_device">Vincular nuevo dispositivo</string>
   <!--EOF-->
 </resources>