Bump version numbers for 1.2.4 release.

Don't show offline snackbar when there's no pending contacts

Closes #1610

See merge request briar/briar!1193

.idea/codeStyles/Project.xml

@@ -1,16 +1,7 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="RIGHT_MARGIN" value="100" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="android" withSubpackages="true" static="false" />
@@ -77,7 +68,6 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
         <option name="USE_TAB_CHARACTER" value="true" />
@@ -90,7 +80,8 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
-                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
             </rule>
@@ -100,7 +91,8 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
-                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
               <order>BY_NAME</order>
@@ -111,6 +103,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -121,6 +114,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -131,6 +125,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -141,6 +136,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -151,6 +147,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -161,64 +158,12 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*:layout_width</NAME>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
             </rule>
           </section>
           <section>
@@ -226,6 +171,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>

bramble-android/build.gradle

@@ -9,10 +9,10 @@ android {
 	buildToolsVersion '28.0.3'
 
 	defaultConfig {
-		minSdkVersion 14
-		targetSdkVersion 26
-		versionCode 10107
-		versionName "1.1.7"
+		minSdkVersion 16
+		targetSdkVersion 28
+		versionCode 10204
+		versionName "1.2.4"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -30,8 +30,8 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.8@zip'
-	tor 'org.briarproject:obfs4proxy-android:0.0.9@zip'
+	tor 'org.briarproject:tor-android:0.3.5.8-64@zip'
+	tor 'org.briarproject:obfs4proxy-android:0.0.11-2@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.22.1'
 
@@ -59,6 +59,8 @@ task unpackTorBinaries {
 		copy {
 			from configurations.tor.collect { zipTree(it) }
 			into torBinariesDir
+			// TODO: Remove after next Tor upgrade, which won't include non-PIE binaries
+			include 'geoip.zip', '*_pie.zip'
 		}
 	}
 	dependsOn cleanTorBinaries

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.plugin.tor;
 
 import android.content.Context;
-import android.os.Build;
 
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.event.EventBus;
@@ -89,9 +88,15 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 		// Check that we have a Tor binary for this architecture
 		String architecture = null;
 		for (String abi : AndroidUtils.getSupportedArchitectures()) {
-			if (abi.startsWith("x86")) {
+			if (abi.startsWith("x86_64")) {
+				architecture = "x86_64";
+				break;
+			} else if (abi.startsWith("x86")) {
 				architecture = "x86";
 				break;
+			} else if (abi.startsWith("arm64")) {
+				architecture = "arm64";
+				break;
 			} else if (abi.startsWith("armeabi")) {
 				architecture = "arm";
 				break;
@@ -101,8 +106,8 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 			LOG.info("Tor is not supported on this architecture");
 			return null;
 		}
-		// Use position-independent executable for SDK >= 16
-		if (Build.VERSION.SDK_INT >= 16) architecture += "_pie";
+		// Use position-independent executable
+		architecture += "_pie";
 
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java

@@ -23,6 +23,7 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static android.content.Context.WIFI_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
 import static android.provider.Settings.Secure.ANDROID_ID;
 
 @Immutable
@@ -74,8 +75,7 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 		// Silence strict mode
 		StrictMode.ThreadPolicy tp = StrictMode.allowThreadDiskWrites();
 		super.writeSeed();
-		if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT <= 18)
-			applyOpenSslFix();
+		if (SDK_INT <= 18) applyOpenSslFix();
 		StrictMode.setThreadPolicy(tp);
 	}
 

bramble-android/witness.gradle

@@ -66,8 +66,8 @@ dependencyVerification {
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
         'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
-        'org.briarproject:obfs4proxy-android:0.0.9:obfs4proxy-android-0.0.9.zip:9b7e9181535ea8d8bbe8ae6338e08cf4c5fc1e357a779393e0ce49586d459ae0',
-        'org.briarproject:tor-android:0.3.5.8:tor-android-0.3.5.8.zip:42a13a6f185be1a62f42e3f30ce66a3c099ac5ec890a65e7593111b65b44a54a',
+        'org.briarproject:obfs4proxy-android:0.0.11-2:obfs4proxy-android-0.0.11-2.zip:57e55cbe87aa2aac210fdbb6cd8cdeafe15f825406a08ebf77a8b787aa2c6a8a',
+        'org.briarproject:tor-android:0.3.5.8-64:tor-android-0.3.5.8-64.zip:9f144088c0fe845d1cf3232cdc2b51c68e6f9a22660592009f43a5633fca8824',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
         'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',

bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java

@@ -7,5 +7,5 @@ public interface FeatureFlags {
 
 	boolean shouldEnableImageAttachments();
 
-	boolean shouldEnableRemoteContacts();
+	boolean shouldEnablePrivateMessageDeletion();
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java

@@ -4,8 +4,10 @@ import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.UnsupportedVersionException;
 import org.briarproject.bramble.api.crypto.SecretKey;
+import org.briarproject.bramble.api.db.ContactExistsException;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
+import org.briarproject.bramble.api.db.PendingContactExistsException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
@@ -117,9 +119,14 @@ public interface ContactManager {
 	 * @throws FormatException If the link is invalid
 	 * @throws GeneralSecurityException If the pending contact's handshake
 	 * public key is invalid
+	 * @throws ContactExistsException If a contact with the same handshake
+	 * public key already exists
+	 * @throws PendingContactExistsException If a pending contact with the same
+	 * handshake public key already exists
 	 */
 	PendingContact addPendingContact(String link, String alias)
-			throws DbException, FormatException, GeneralSecurityException;
+			throws DbException, FormatException, GeneralSecurityException,
+			ContactExistsException, PendingContactExistsException;
 
 	/**
 	 * Returns the pending contact with the given ID.

bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java

@@ -83,7 +83,7 @@ public interface DatabaseComponent extends TransactionManager {
 	/**
 	 * Stores a pending contact.
 	 */
-	void addPendingContact(Transaction txn, PendingContact p)
+	void addPendingContact(Transaction txn, PendingContact p, AuthorId local)
 			throws DbException;
 
 	/**

bramble-api/src/main/java/org/briarproject/bramble/api/db/PendingContactExistsException.java

@@ -1,9 +1,21 @@
 package org.briarproject.bramble.api.db;
 
+import org.briarproject.bramble.api.contact.PendingContact;
+
 /**
  * Thrown when a duplicate pending contact is added to the database. This
  * exception may occur due to concurrent updates and does not indicate a
  * database error.
  */
 public class PendingContactExistsException extends DbException {
+
+	private final PendingContact pendingContact;
+
+	public PendingContactExistsException(PendingContact pendingContact) {
+		this.pendingContact = pendingContact;
+	}
+
+	public PendingContact getPendingContact() {
+		return pendingContact;
+	}
 }

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java

@@ -139,7 +139,8 @@ class ContactManagerImpl implements ContactManager, EventListener {
 				pendingContactFactory.createPendingContact(link, alias);
 		Transaction txn = db.startTransaction(false);
 		try {
-			db.addPendingContact(txn, p);
+			AuthorId local = identityManager.getLocalAuthor(txn).getId();
+			db.addPendingContact(txn, p, local);
 			KeyPair ourKeyPair = identityManager.getHandshakeKeys(txn);
 			keyManager.addPendingContact(txn, p.getId(), p.getPublicKey(),
 					ourKeyPair);

bramble-core/src/main/java/org/briarproject/bramble/db/Database.java

@@ -267,6 +267,16 @@ interface Database<T> {
 	 */
 	Collection<ContactId> getContacts(T txn, AuthorId local) throws DbException;
 
+	/**
+	 * Returns the contact with the given {@code handshakePublicKey}
+	 * for the given local pseudonym or {@code null} if none exists.
+	 * <p/>
+	 * Read-only.
+	 */
+	@Nullable
+	Contact getContact(T txn, PublicKey handshakePublicKey, AuthorId local)
+			throws DbException;
+
 	/**
 	 * Returns the group with the given ID.
 	 * <p/>

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -291,12 +291,17 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	}
 
 	@Override
-	public void addPendingContact(Transaction transaction, PendingContact p)
-			throws DbException {
+	public void addPendingContact(Transaction transaction, PendingContact p,
+			AuthorId local) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();
 		T txn = unbox(transaction);
-		if (db.containsPendingContact(txn, p.getId()))
-			throw new PendingContactExistsException();
+		Contact contact = db.getContact(txn, p.getPublicKey(), local);
+		if (contact != null)
+			throw new ContactExistsException(local, contact.getAuthor());
+		if (db.containsPendingContact(txn, p.getId())) {
+			PendingContact existing = db.getPendingContact(txn, p.getId());
+			throw new PendingContactExistsException(existing);
+		}
 		db.addPendingContact(txn, p);
 		transaction.attach(new PendingContactAddedEvent(p));
 	}

bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java

@@ -1465,6 +1465,47 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
+	@Nullable
+	@Override
+	public Contact getContact(Connection txn, PublicKey handshakePublicKey,
+			AuthorId localAuthorId) throws DbException {
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		try {
+			String sql = "SELECT contactId, authorId, formatVersion, name,"
+					+ " alias, publicKey, verified"
+					+ " FROM contacts"
+					+ " WHERE handshakePublicKey = ? AND localAuthorId = ?";
+			ps = txn.prepareStatement(sql);
+			ps.setBytes(1, handshakePublicKey.getEncoded());
+			ps.setBytes(2, localAuthorId.getBytes());
+			rs = ps.executeQuery();
+			if (!rs.next()) {
+				rs.close();
+				ps.close();
+				return null;
+			}
+			ContactId contactId = new ContactId(rs.getInt(1));
+			AuthorId authorId = new AuthorId(rs.getBytes(2));
+			int formatVersion = rs.getInt(3);
+			String name = rs.getString(4);
+			String alias = rs.getString(5);
+			PublicKey publicKey = new SignaturePublicKey(rs.getBytes(6));
+			boolean verified = rs.getBoolean(7);
+			if (rs.next()) throw new DbStateException();
+			rs.close();
+			ps.close();
+			Author author =
+					new Author(authorId, formatVersion, name, publicKey);
+			return new Contact(contactId, author, localAuthorId, alias,
+					handshakePublicKey, verified);
+		} catch (SQLException e) {
+			tryToClose(rs, LOG, WARNING);
+			tryToClose(ps, LOG, WARNING);
+			throw new DbException(e);
+		}
+	}
+
 	@Override
 	public Group getGroup(Connection txn, GroupId g) throws DbException {
 		PreparedStatement ps = null;

bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -195,8 +195,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (!assetsAreUpToDate()) installAssets();
 		if (cookieFile.exists() && !cookieFile.delete())
 			LOG.warning("Old auth cookie not deleted");
-		// Migrate old settings before having a chance to stop
-		migrateSettings();
 		// Start a new Tor process
 		LOG.info("Starting Tor");
 		String torPath = torFile.getAbsolutePath();
@@ -816,21 +814,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		controlConnection.setConf("ConnectionPadding", enable ? "1" : "0");
 	}
 
-	// TODO remove when sufficient time has passed. Added 2018-08-15
-	private void migrateSettings() {
-		Settings sOld = callback.getSettings();
-		int oldNetwork = sOld.getInt("network", -1);
-		if (oldNetwork == -1) return;
-		Settings s = new Settings();
-		if (oldNetwork == 0) {
-			s.putInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_NEVER);
-		} else if (oldNetwork == 1) {
-			s.putBoolean(PREF_TOR_MOBILE, false);
-		}
-		s.putInt("network", -1);
-		callback.mergeSettings(s);
-	}
-
 	private static class ConnectionStatus {
 
 		// All of the following are locking: this

bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java

@@ -34,6 +34,7 @@ import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.SettableClock;
 import org.briarproject.bramble.test.TestDatabaseConfig;
 import org.briarproject.bramble.test.TestMessageFactory;
+import org.briarproject.bramble.test.TestUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -1149,6 +1150,43 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.close();
 	}
 
+	@Test
+	public void testGetContactsByHandshakePublicKey() throws Exception {
+		Database<Connection> db = open(false);
+		Connection txn = db.startTransaction();
+
+		// Add an identity for a local author - no contacts should be
+		// associated
+		db.addIdentity(txn, identity);
+		PublicKey handshakePublicKey = TestUtils.getSignaturePublicKey();
+		Contact contact =
+				db.getContact(txn, handshakePublicKey, localAuthor.getId());
+		assertNull(contact);
+
+		// Add a contact associated with the local author
+		assertEquals(contactId, db.addContact(txn, author, localAuthor.getId(),
+				handshakePublicKey, true));
+		contact = db.getContact(txn, handshakePublicKey, localAuthor.getId());
+		assertNotNull(contact);
+		assertEquals(contactId, contact.getId());
+		assertEquals(author, contact.getAuthor());
+		assertNull(contact.getAlias());
+		assertEquals(handshakePublicKey, contact.getHandshakePublicKey());
+		assertTrue(contact.isVerified());
+		assertEquals(author.getName(), contact.getAuthor().getName());
+		assertEquals(author.getPublicKey(), contact.getAuthor().getPublicKey());
+		assertEquals(author.getFormatVersion(),
+				contact.getAuthor().getFormatVersion());
+
+		// Ensure no contacts are returned after contact was deleted
+		db.removeContact(txn, contactId);
+		contact = db.getContact(txn, handshakePublicKey, localAuthor.getId());
+		assertNull(contact);
+
+		db.commitTransaction(txn);
+		db.close();
+	}
+
 	@Test
 	public void testOfferedMessages() throws Exception {
 		Database<Connection> db = open(false);

bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java

@@ -26,7 +26,7 @@ public class BrambleCoreIntegrationTestModule {
 			}
 
 			@Override
-			public boolean shouldEnableRemoteContacts() {
+			public boolean shouldEnablePrivateMessageDeletion() {
 				return true;
 			}
 		};

briar-android/.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = pt_BR: pt-rBR, nb_NO: nb, zh-Hans: zh-rCN
+lang_map = pt_BR: pt-rBR, nb_NO: nb, zh-Hans: zh-rCN, zh-Hant: zh-rTW
 
 [briar.stringsxml-5]
 file_filter = src/main/res/values-<lang>/strings.xml

briar-android/build.gradle

@@ -20,10 +20,10 @@ android {
 	buildToolsVersion '28.0.3'
 
 	defaultConfig {
-		minSdkVersion 15
-		targetSdkVersion 26
-		versionCode 10107
-		versionName "1.1.7"
+		minSdkVersion 16
+		targetSdkVersion 28
+		versionCode 10204
+		versionName "1.2.4"
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
@@ -117,7 +117,7 @@ dependencies {
 	implementation 'de.hdodenhof:circleimageview:2.2.0'
 	implementation 'com.google.zxing:core:3.3.3'
 	implementation 'uk.co.samuelwall:material-tap-target-prompt:2.14.0'
-	implementation 'com.vanniktech:emoji-google:0.5.1'
+	implementation 'com.vanniktech:emoji-google:0.6.0' // later versions already use androidx
 	implementation 'com.github.kobakei:MaterialFabSpeedDial:1.2.1' // later versions already use androidx
 	def glideVersion = '4.9.0'
 	implementation("com.github.bumptech.glide:glide:$glideVersion") {

briar-android/src/main/AndroidManifest.xml

@@ -73,7 +73,7 @@
 			android:label="@string/crash_report_title"
 			android:launchMode="singleInstance"
 			android:theme="@style/BriarTheme.NoActionBar"
-			android:windowSoftInputMode="stateHidden">
+			android:windowSoftInputMode="adjustResize|stateHidden">
 		</activity>
 
 		<activity
@@ -89,7 +89,7 @@
 		<activity
 			android:name="org.briarproject.briar.android.account.SetupActivity"
 			android:label="@string/setup_title"
-			android:windowSoftInputMode="adjustResize">
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 		</activity>
 
 		<activity
@@ -126,7 +126,7 @@
 			android:label="@string/app_name"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
 			android:theme="@style/BriarTheme.NoActionBar"
-			android:windowSoftInputMode="stateHidden|adjustResize">
+			android:windowSoftInputMode="adjustResize|stateUnchanged">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
@@ -145,7 +145,7 @@
 			android:name="org.briarproject.briar.android.privategroup.creation.CreateGroupActivity"
 			android:label="@string/groups_create_group_title"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
-			android:windowSoftInputMode="adjustResize">
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
@@ -174,8 +174,7 @@
 		<activity
 			android:name="org.briarproject.briar.android.privategroup.memberlist.GroupMemberListActivity"
 			android:label="@string/groups_member_list"
-			android:parentActivityName="org.briarproject.briar.android.privategroup.conversation.GroupActivity"
-			android:windowSoftInputMode="adjustResize|stateHidden">
+			android:parentActivityName="org.briarproject.briar.android.privategroup.conversation.GroupActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity"/>
@@ -184,8 +183,7 @@
 		<activity
 			android:name="org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity"
 			android:label="@string/groups_reveal_contacts"
-			android:parentActivityName="org.briarproject.briar.android.privategroup.conversation.GroupActivity"
-			android:windowSoftInputMode="adjustResize|stateAlwaysHidden">
+			android:parentActivityName="org.briarproject.briar.android.privategroup.conversation.GroupActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity"/>
@@ -223,7 +221,7 @@
 			android:name="org.briarproject.briar.android.forum.CreateForumActivity"
 			android:label="@string/create_forum_title"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
-			android:windowSoftInputMode="adjustResize">
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
@@ -292,7 +290,7 @@
 			android:name="org.briarproject.briar.android.blog.WriteBlogPostActivity"
 			android:label="@string/blogs_write_blog_post"
 			android:parentActivityName="org.briarproject.briar.android.blog.BlogActivity"
-			android:windowSoftInputMode="stateVisible|adjustResize">
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.blog.BlogActivity"/>
@@ -302,7 +300,7 @@
 			android:name="org.briarproject.briar.android.blog.ReblogActivity"
 			android:label="@string/blogs_reblog_button"
 			android:parentActivityName="org.briarproject.briar.android.blog.BlogActivity"
-			android:windowSoftInputMode="stateHidden">
+			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.blog.BlogActivity"/>
@@ -312,7 +310,7 @@
 			android:name="org.briarproject.briar.android.blog.RssFeedImportActivity"
 			android:label="@string/blogs_rss_feeds_import"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
-			android:windowSoftInputMode="stateVisible|adjustResize">
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
@@ -341,7 +339,7 @@
 			android:name="org.briarproject.briar.android.introduction.IntroductionActivity"
 			android:label="@string/introduction_activity_title"
 			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
-			android:windowSoftInputMode="stateHidden|adjustResize">
+			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
@@ -369,7 +367,8 @@
 		<activity
 			android:name="org.briarproject.briar.android.login.ChangePasswordActivity"
 			android:label="@string/change_password"
-			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
+			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity"
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.settings.SettingsActivity"/>
@@ -424,7 +423,7 @@
 			android:name=".android.contact.add.remote.AddContactActivity"
 			android:label="@string/add_contact_remotely_title_case"
 			android:theme="@style/BriarTheme"
-			android:windowSoftInputMode="stateHidden|adjustResize"/>
+			android:windowSoftInputMode="adjustResize|stateHidden"/>
 
 		<activity
 			android:name=".android.contact.add.remote.PendingContactListActivity"

briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java

@@ -347,8 +347,10 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 		if (currentTime - lastSound > SOUND_DELAY) {
 			boolean sound = settings.getBoolean(PREF_NOTIFY_SOUND, true);
 			String ringtoneUri = settings.get(PREF_NOTIFY_RINGTONE_URI);
-			if (sound && !StringUtils.isNullOrEmpty(ringtoneUri))
-				b.setSound(Uri.parse(ringtoneUri));
+			if (sound && !StringUtils.isNullOrEmpty(ringtoneUri)) {
+				Uri uri = Uri.parse(ringtoneUri);
+				if (!"file".equals(uri.getScheme())) b.setSound(uri);
+			}
 			b.setDefaults(getDefaults());
 			lastSound = currentTime;
 		}
@@ -359,7 +361,8 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 		int defaults = DEFAULT_LIGHTS;
 		boolean sound = settings.getBoolean(PREF_NOTIFY_SOUND, true);
 		String ringtoneUri = settings.get(PREF_NOTIFY_RINGTONE_URI);
-		if (sound && StringUtils.isNullOrEmpty(ringtoneUri))
+		if (sound && (StringUtils.isNullOrEmpty(ringtoneUri) ||
+				"file".equals(Uri.parse(ringtoneUri).getScheme())))
 			defaults |= DEFAULT_SOUND;
 		if (settings.getBoolean(PREF_NOTIFY_VIBRATION, true))
 			defaults |= DEFAULT_VIBRATE;

briar-android/src/main/java/org/briarproject/briar/android/AppModule.java

@@ -243,7 +243,7 @@ public class AppModule {
 			}
 
 			@Override
-			public boolean shouldEnableRemoteContacts() {
+			public boolean shouldEnablePrivateMessageDeletion() {
 				return IS_DEBUG_BUILD;
 			}
 		};

briar-android/src/main/java/org/briarproject/briar/android/BackgroundMonitor.java

@@ -1,54 +0,0 @@
-package org.briarproject.briar.android;
-
-import android.app.Activity;
-import android.app.Application.ActivityLifecycleCallbacks;
-import android.os.Bundle;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-class BackgroundMonitor implements ActivityLifecycleCallbacks {
-
-	private final AtomicInteger foregroundActivities = new AtomicInteger(0);
-
-	boolean isRunningInBackground() {
-		return foregroundActivities.get() == 0;
-	}
-
-	@Override
-	public void onActivityCreated(Activity a, @Nullable Bundle state) {
-	}
-
-	@Override
-	public void onActivityStarted(Activity a) {
-		foregroundActivities.incrementAndGet();
-	}
-
-	@Override
-	public void onActivityResumed(Activity a) {
-	}
-
-	@Override
-	public void onActivityPaused(Activity a) {
-	}
-
-	@Override
-	public void onActivityStopped(Activity a) {
-		foregroundActivities.decrementAndGet();
-	}
-
-	@Override
-	public void onActivitySaveInstanceState(Activity a,
-			@Nullable Bundle outState) {
-	}
-
-	@Override
-	public void onActivityDestroyed(Activity a) {
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java

@@ -34,9 +34,9 @@ import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
-import static android.os.Build.VERSION.SDK_INT;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
+import static java.util.logging.Logger.getLogger;
 import static org.acra.ReportField.ANDROID_VERSION;
 import static org.acra.ReportField.APP_VERSION_CODE;
 import static org.acra.ReportField.APP_VERSION_NAME;
@@ -82,10 +82,9 @@ public class BriarApplicationImpl extends Application
 		implements BriarApplication {
 
 	private static final Logger LOG =
-			Logger.getLogger(BriarApplicationImpl.class.getName());
+			getLogger(BriarApplicationImpl.class.getName());
 
 	private final CachingLogHandler logHandler = new CachingLogHandler();
-	private final BackgroundMonitor backgroundMonitor = new BackgroundMonitor();
 
 	private AndroidComponent applicationComponent;
 	private volatile SharedPreferences prefs;
@@ -108,12 +107,16 @@ public class BriarApplicationImpl extends Application
 
 		if (IS_DEBUG_BUILD) enableStrictMode();
 
-		Logger rootLogger = Logger.getLogger("");
-		if (!IS_DEBUG_BUILD && !IS_BETA_BUILD) {
-			// Remove default log handlers so system log is not used
-			for (Handler handler : rootLogger.getHandlers()) {
-				rootLogger.removeHandler(handler);
-			}
+		Logger rootLogger = getLogger("");
+		Handler[] handlers = rootLogger.getHandlers();
+		// Disable the Android logger for release builds
+		for (Handler handler : handlers) rootLogger.removeHandler(handler);
+		if (IS_DEBUG_BUILD || IS_BETA_BUILD) {
+			// We can't set the level of the Android logger at runtime, so
+			// raise records to the logger's default level
+			rootLogger.addHandler(new LevelRaisingHandler(FINE, INFO));
+			// Restore the default handlers after the level raising handler
+			for (Handler handler : handlers) rootLogger.addHandler(handler);
 		}
 		rootLogger.addHandler(logHandler);
 		rootLogger.setLevel(IS_DEBUG_BUILD || IS_BETA_BUILD ? FINE : INFO);
@@ -122,9 +125,6 @@ public class BriarApplicationImpl extends Application
 
 		applicationComponent = createApplicationComponent();
 		EmojiManager.install(new GoogleEmojiProvider());
-
-		if (SDK_INT < 16)
-			registerActivityLifecycleCallbacks(backgroundMonitor);
 	}
 
 	protected AndroidComponent createApplicationComponent() {
@@ -186,12 +186,8 @@ public class BriarApplicationImpl extends Application
 
 	@Override
 	public boolean isRunningInBackground() {
-		if (SDK_INT >= 16) {
-			RunningAppProcessInfo info = new RunningAppProcessInfo();
-			ActivityManager.getMyMemoryState(info);
-			return (info.importance != IMPORTANCE_FOREGROUND);
-		} else {
-			return backgroundMonitor.isRunningInBackground();
-		}
+		RunningAppProcessInfo info = new RunningAppProcessInfo();
+		ActivityManager.getMyMemoryState(info);
+		return (info.importance != IMPORTANCE_FOREGROUND);
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/BriarService.java

@@ -238,8 +238,6 @@ public class BriarService extends Service {
 		} else if (level == TRIM_MEMORY_RUNNING_LOW) {
 			LOG.info("Trim memory: running low");
 		} else if (level == TRIM_MEMORY_RUNNING_CRITICAL) {
-			// This level may be received if SDK_INT < 16, although the
-			// constant isn't declared until API level 16
 			LOG.warning("Trim memory: running critically low");
 			// If we're not in the foreground, clear the UI to save memory
 			if (app.isRunningInBackground()) hideUi();

briar-android/src/main/java/org/briarproject/briar/android/LevelRaisingHandler.java

@@ -0,0 +1,42 @@
+package org.briarproject.briar.android;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * Log handler that raises all records at or above a given source level to a
+ * given destination level. This affects the level seen by subsequent handlers.
+ */
+@Immutable
+@NotNullByDefault
+class LevelRaisingHandler extends Handler {
+
+	private final Level dest;
+	private final int srcInt, destInt;
+
+	LevelRaisingHandler(Level src, Level dest) {
+		this.dest = dest;
+		srcInt = src.intValue();
+		destInt = dest.intValue();
+		if (srcInt > destInt) throw new IllegalArgumentException();
+	}
+
+	@Override
+	public void publish(LogRecord record) {
+		int recordInt = record.getLevel().intValue();
+		if (recordInt >= srcInt && recordInt < destInt) record.setLevel(dest);
+	}
+
+	@Override
+	public void flush() {
+	}
+
+	@Override
+	public void close() {
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java

@@ -150,7 +150,7 @@ class ScreenFilterMonitorImpl implements ScreenFilterMonitor, Service {
 		// Get permissions
 		String[] requestedPermissions = packageInfo.requestedPermissions;
 		if (requestedPermissions == null) return false;
-		if (SDK_INT >= 16 && SDK_INT < 23) {
+		if (SDK_INT < 23) {
 			// Check whether the permission has been requested and granted
 			int[] flags = packageInfo.requestedPermissionsFlags;
 			for (int i = 0; i < requestedPermissions.length; i++) {

briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java

@@ -16,13 +16,10 @@ import org.briarproject.briar.android.activity.ActivityComponent;
 
 import javax.annotation.Nullable;
 
-import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT;
-import static android.view.inputmethod.EditorInfo.IME_ACTION_NONE;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
 import static org.briarproject.briar.android.util.UiUtils.setError;
-import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -65,12 +62,6 @@ public class AuthorNameFragment extends SetupFragment {
 		return TAG;
 	}
 
-	@Override
-	public void onResume() {
-		super.onResume();
-		showSoftKeyboard(authorNameInput);
-	}
-
 	@Override
 	protected String getHelpText() {
 		return getString(R.string.setup_name_explanation);
@@ -82,8 +73,6 @@ public class AuthorNameFragment extends SetupFragment {
 		boolean error = authorNameLength > MAX_AUTHOR_NAME_LENGTH;
 		setError(authorNameWrapper, getString(R.string.name_too_long), error);
 		boolean enabled = authorNameLength > 0 && !error;
-		authorNameInput
-				.setImeOptions(enabled ? IME_ACTION_NEXT : IME_ACTION_NONE);
 		authorNameInput.setOnEditorActionListener(enabled ? this : null);
 		nextButton.setEnabled(enabled);
 	}

briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java

@@ -61,7 +61,6 @@ public class SetPasswordFragment extends SetupFragment {
 		strengthMeter = v.findViewById(R.id.strength_meter);
 		passwordEntryWrapper = v.findViewById(R.id.password_entry_wrapper);
 		passwordEntry = v.findViewById(R.id.password_entry);
-		passwordEntry.requestFocus();
 		passwordConfirmationWrapper =
 				v.findViewById(R.id.password_confirm_wrapper);
 		passwordConfirmation = v.findViewById(R.id.password_confirm);

briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.activity;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.UiThread;
 import android.support.v4.app.Fragment;
@@ -12,7 +11,6 @@ import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.view.inputmethod.InputMethodManager;
 
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
@@ -44,10 +42,10 @@ import javax.inject.Inject;
 import static android.arch.lifecycle.Lifecycle.State.STARTED;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
-import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
+import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 
 /**
  * Warning: Some activities don't extend {@link BaseActivity}.
@@ -217,17 +215,6 @@ public abstract class BaseActivity extends AppCompatActivity
 		});
 	}
 
-	public void showSoftKeyboard(View view) {
-		Object o = getSystemService(INPUT_METHOD_SERVICE);
-		((InputMethodManager) o).showSoftInput(view, SHOW_IMPLICIT);
-	}
-
-	public void hideSoftKeyboard(View view) {
-		IBinder token = view.getWindowToken();
-		Object o = getSystemService(INPUT_METHOD_SERVICE);
-		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
-	}
-
 	@UiThread
 	public void handleDbException(DbException e) {
 		supportFinishAfterTransition();

briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java

@@ -32,6 +32,7 @@ import static android.view.View.VISIBLE;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 
 public class RssFeedImportActivity extends BriarActivity {
 
@@ -77,7 +78,6 @@ public class RssFeedImportActivity extends BriarActivity {
 			if (actionId == IME_ACTION_DONE && importButton.isEnabled() &&
 					importButton.getVisibility() == VISIBLE) {
 				publish();
-				hideSoftKeyboard(urlInput);
 				return true;
 			}
 			return false;
@@ -123,6 +123,7 @@ public class RssFeedImportActivity extends BriarActivity {
 		// hide import button, show progress bar
 		importButton.setVisibility(GONE);
 		progressBar.setVisibility(VISIBLE);
+		hideSoftKeyboard(urlInput);
 
 		String url = validateAndNormaliseUrl(urlInput.getText().toString());
 		if (url == null) throw new AssertionError();

briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java

@@ -3,11 +3,8 @@ package org.briarproject.briar.android.blog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.db.DbException;
@@ -44,7 +41,7 @@ import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_L
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class WriteBlogPostActivity extends BriarActivity
-		implements OnEditorActionListener, SendListener {
+		implements SendListener {
 
 	private static final Logger LOG =
 			Logger.getLogger(WriteBlogPostActivity.class.getName());
@@ -113,12 +110,6 @@ public class WriteBlogPostActivity extends BriarActivity
 		component.inject(this);
 	}
 
-	@Override
-	public boolean onEditorAction(TextView textView, int actionId, KeyEvent e) {
-		input.requestFocus();
-		return true;
-	}
-
 	@Override
 	public void onSendClick(@Nullable String text,
 			List<AttachmentHeader> headers) {

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -14,7 +14,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -57,7 +56,6 @@ import javax.inject.Inject;
 
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial;
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener;
-import io.github.kobakei.materialfabspeeddial.FabSpeedDialMenu;
 
 import static android.os.Build.VERSION.SDK_INT;
 import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE;
@@ -85,8 +83,6 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 	EventBus eventBus;
 	@Inject
 	AndroidNotificationManager notificationManager;
-	@Inject
-	FeatureFlags featureFlags;
 
 	private ContactListAdapter adapter;
 	private BriarRecyclerView list;
@@ -126,19 +122,7 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 				container, false);
 
 		FabSpeedDial speedDial = contentView.findViewById(R.id.speedDial);
-		if (featureFlags.shouldEnableRemoteContacts()) {
-			speedDial.addOnMenuItemClickListener(this);
-		} else {
-			speedDial.setMenu(new FabSpeedDialMenu(contentView.getContext()));
-			speedDial.addOnStateChangeListener(open -> {
-				if (open) {
-					Intent intent = new Intent(getContext(),
-							ContactExchangeActivity.class);
-					startActivity(intent);
-					speedDial.closeMenu();
-				}
-			});
-		}
+		speedDial.addOnMenuItemClickListener(this);
 
 		OnContactClickListener<ContactListItem> onContactClickListener =
 				(view, item) -> {
@@ -169,9 +153,10 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 						startActivity(i);
 					}
 				};
-		adapter = new ContactListAdapter(getContext(), onContactClickListener);
+		adapter = new ContactListAdapter(requireContext(),
+				onContactClickListener);
 		list = contentView.findViewById(R.id.list);
-		list.setLayoutManager(new LinearLayoutManager(getContext()));
+		list.setLayoutManager(new LinearLayoutManager(requireContext()));
 		list.setAdapter(adapter);
 		list.setEmptyImage(R.drawable.ic_empty_state_contact_list);
 		list.setEmptyText(getString(R.string.no_contacts));
@@ -267,7 +252,7 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
 				if (contacts.isEmpty()) list.showData();
-				else adapter.addAll(contacts);
+				else adapter.replaceAll(contacts);
 			} else {
 				LOG.info("Concurrent update, reloading");
 				loadContacts();

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java

@@ -9,8 +9,10 @@ import android.support.annotation.Nullable;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.UnsupportedVersionException;
 import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.PendingContact;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.NoSuchPendingContactException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.android.viewmodel.LiveEvent;
 import org.briarproject.briar.android.viewmodel.LiveResult;
@@ -118,4 +120,19 @@ public class AddContactViewModel extends AndroidViewModel {
 		return addContactResult;
 	}
 
+	public void updatePendingContact(String name, PendingContact p) {
+		dbExecutor.execute(() -> {
+			try {
+				contactManager.removePendingContact(p.getId());
+				addContact(name);
+			} catch(NoSuchPendingContactException e) {
+				logException(LOG, WARNING, e);
+				// no error in UI as pending contact was converted into contact
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				addContactResult.postValue(new LiveResult<>(e));
+			}
+		});
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java

@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.contact.add.remote;
 
+import android.animation.ObjectAnimator;
 import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.ClipData;
@@ -11,7 +12,9 @@ import android.support.v4.app.ShareCompat.IntentBuilder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.Button;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -34,7 +37,8 @@ import static org.briarproject.briar.android.util.UiUtils.observeOnce;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class LinkExchangeFragment extends BaseFragment {
+public class LinkExchangeFragment extends BaseFragment
+		implements OnGlobalLayoutListener {
 
 	private static final String TAG = LinkExchangeFragment.class.getName();
 
@@ -90,9 +94,30 @@ public class LinkExchangeFragment extends BaseFragment {
 		observeOnce(viewModel.getHandshakeLink(), this,
 				this::onHandshakeLinkLoaded);
 
+		if (savedInstanceState == null) {
+			ScrollView scrollView = (ScrollView) v;
+			// we need to wait for views to be laid out to get the heights
+			scrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);
+		}
+
 		return v;
 	}
 
+	@Override
+	public void onGlobalLayout() {
+		ScrollView scrollView = (ScrollView) requireNonNull(getView());
+		View layout = scrollView.getChildAt(0);
+		int scrollBy = layout.getHeight() - scrollView.getHeight();
+		if (scrollBy > 0) {
+			// smoothScrollTo() is too fast due to the transition animation
+			ObjectAnimator animator = ObjectAnimator
+					.ofInt(scrollView, "scrollY", scrollBy);
+			animator.setDuration(1000);
+			animator.start();
+		}
+		layout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+	}
+
 	private void onHandshakeLinkLoaded(String link) {
 		View v = requireNonNull(getView());
 

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java

@@ -2,10 +2,15 @@ package org.briarproject.briar.android.contact.add.remote;
 
 import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
+import android.content.Context;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.annotation.StringRes;
 import android.support.design.widget.TextInputEditText;
 import android.support.design.widget.TextInputLayout;
+import android.support.v7.app.AlertDialog.Builder;
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +20,10 @@ import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import org.briarproject.bramble.api.UnsupportedVersionException;
+import org.briarproject.bramble.api.contact.PendingContact;
+import org.briarproject.bramble.api.db.ContactExistsException;
+import org.briarproject.bramble.api.db.PendingContactExistsException;
+import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
@@ -24,9 +33,13 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import static android.support.v4.content.ContextCompat.getColor;
+import static android.support.v4.content.ContextCompat.getDrawable;
+import static android.support.v4.graphics.drawable.DrawableCompat.setTint;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static android.widget.Toast.LENGTH_LONG;
+import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
 
@@ -107,23 +120,95 @@ public class NicknameFragment extends BaseFragment {
 
 		viewModel.getAddContactResult().observe(this, result -> {
 			if (result == null) return;
-			if (result.hasError()) {
-				int stringRes;
-				if (result
-						.getException() instanceof UnsupportedVersionException) {
-					stringRes = R.string.unsupported_link;
-				} else {
-					stringRes = R.string.adding_contact_error;
-				}
-				Toast.makeText(getContext(), stringRes, LENGTH_LONG).show();
-			} else {
-				Intent intent = new Intent(getActivity(),
-						PendingContactListActivity.class);
-				startActivity(intent);
-			}
-			finish();
+			if (result.hasError())
+				handleException(name, requireNonNull(result.getException()));
+			else
+				showPendingContactListActivity();
 		});
 		viewModel.addContact(name);
 	}
 
+	private void showPendingContactListActivity() {
+		Intent intent = new Intent(getActivity(),
+				PendingContactListActivity.class);
+		startActivity(intent);
+		finish();
+	}
+
+	private void handleException(String name, Exception e) {
+		if (e instanceof ContactExistsException) {
+			ContactExistsException ce = (ContactExistsException) e;
+			handleExistingContact(name, ce.getRemoteAuthor());
+		} else if (e instanceof PendingContactExistsException) {
+			PendingContactExistsException pe =
+					(PendingContactExistsException) e;
+			handleExistingPendingContact(name, pe.getPendingContact());
+		} else if (e instanceof UnsupportedVersionException) {
+			int stringRes = R.string.unsupported_link;
+			Toast.makeText(getContext(), stringRes, LENGTH_LONG).show();
+			finish();
+		} else {
+			int stringRes = R.string.adding_contact_error;
+			Toast.makeText(getContext(), stringRes, LENGTH_LONG).show();
+			finish();
+		}
+	}
+
+	private void handleExistingContact(String name, Author existing) {
+		OnClickListener listener = (d, w) -> {
+			d.dismiss();
+			String str = getString(R.string.contact_already_exists, name);
+			Toast.makeText(getContext(), str, LENGTH_LONG).show();
+			finish();
+		};
+		showSameLinkDialog(existing.getName(), name,
+				R.string.duplicate_link_dialog_text_1_contact, listener);
+	}
+
+	private void handleExistingPendingContact(String name, PendingContact p) {
+		OnClickListener listener = (d, w) -> {
+			viewModel.updatePendingContact(name, p);
+			Toast.makeText(getContext(), R.string.pending_contact_updated_toast,
+					LENGTH_LONG).show();
+			d.dismiss();
+			showPendingContactListActivity();
+		};
+		showSameLinkDialog(p.getAlias(), name,
+				R.string.duplicate_link_dialog_text_1, listener);
+	}
+
+	private void showSameLinkDialog(String name1, String name2,
+			@StringRes int existsRes, OnClickListener samePersonListener) {
+		Context ctx = requireContext();
+		Builder b = new Builder(ctx, R.style.BriarDialogTheme_Neutral);
+		b.setTitle(getString(R.string.duplicate_link_dialog_title));
+		String msg = getString(existsRes, name1) + "\n\n" +
+				getString(R.string.duplicate_link_dialog_text_2, name2, name1);
+		b.setMessage(msg);
+		b.setPositiveButton(R.string.same_person_button, samePersonListener);
+		b.setNegativeButton(R.string.different_person_button, (d, w) -> {
+			d.dismiss();
+			showWarningDialog(name1, name2);
+		});
+		b.setCancelable(false);
+		b.show();
+	}
+
+	private void showWarningDialog(String name1, String name2) {
+		Context ctx = requireContext();
+		Builder b = new Builder(ctx, R.style.BriarDialogTheme);
+		Drawable icon = getDrawable(ctx, R.drawable.alerts_and_states_error);
+		setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
+		b.setIcon(icon);
+		b.setTitle(getString(R.string.duplicate_link_dialog_title));
+		b.setMessage(
+				getString(R.string.duplicate_link_dialog_text_3, name1, name2));
+		b.setPositiveButton(R.string.ok, (d, w) -> {
+			d.dismiss();
+			finish();
+		});
+		b.setCancelable(false);
+		b.show();
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java

@@ -91,7 +91,7 @@ public class PendingContactListViewModel extends AndroidViewModel
 				Collection<Pair<PendingContact, PendingContactState>> pairs =
 						contactManager.getPendingContacts();
 				List<PendingContactItem> items = new ArrayList<>(pairs.size());
-				boolean online = false;
+				boolean online = items.isEmpty();
 				for (Pair<PendingContact, PendingContactState> pair : pairs) {
 					PendingContact p = pair.getFirst();
 					PendingContactState state = pair.getSecond();

briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java

@@ -21,9 +21,12 @@ import org.briarproject.briar.android.activity.BaseActivity;
 
 import javax.inject.Inject;
 
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
+import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
+import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -76,12 +79,13 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 		setButton.setOnClickListener(v1 -> onSetButtonClicked());
 
 		Button cancelButton = v.findViewById(R.id.cancelButton);
-		cancelButton.setOnClickListener(v1 -> getDialog().cancel());
+		cancelButton.setOnClickListener(v1 -> onCancelButtonClicked());
 
 		return v;
 	}
 
 	private void onSetButtonClicked() {
+		hideSoftKeyboard(aliasEditText);
 		String alias = aliasEditText.getText().toString().trim();
 		if (toUtf8(alias).length > MAX_AUTHOR_NAME_LENGTH) {
 			aliasEditLayout.setError(getString(R.string.name_too_long));
@@ -91,4 +95,17 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 		}
 	}
 
+	private void onCancelButtonClicked() {
+		hideSoftKeyboard(aliasEditText);
+		getDialog().cancel();
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		requireNonNull(getDialog().getWindow())
+				.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+		showSoftKeyboard(aliasEditText);
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -276,7 +276,7 @@ public class ConversationActivity extends BriarActivity
 		textInputView.setSendController(sendController);
 		textInputView.setMaxTextLength(MAX_PRIVATE_MESSAGE_TEXT_LENGTH);
 		textInputView.setReady(false);
-		textInputView.addOnKeyboardShownListener(this::scrollToBottom);
+		textInputView.setOnKeyboardShownListener(this::scrollToBottom);
 	}
 
 	private void scrollToBottom() {
@@ -356,6 +356,11 @@ public class ConversationActivity extends BriarActivity
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.conversation_actions, menu);
 
+		// Hide private message deletion action if feature is not enabled
+		if (!featureFlags.shouldEnablePrivateMessageDeletion()) {
+			menu.removeItem(R.id.action_delete_all_messages);
+		}
+
 		// enable introduction action if available
 		observeOnce(viewModel.showIntroductionAction(), this, enable -> {
 			if (enable != null && enable) {
@@ -389,6 +394,9 @@ public class ConversationActivity extends BriarActivity
 				AliasDialogFragment.newInstance().show(
 						getSupportFragmentManager(), AliasDialogFragment.TAG);
 				return true;
+			case R.id.action_delete_all_messages:
+				askToDeleteAllMessages();
+				return true;
 			case R.id.action_social_remove_person:
 				askToRemoveContact();
 				return true;
@@ -727,6 +735,52 @@ public class ConversationActivity extends BriarActivity
 		addConversationItem(h.accept(visitor));
 	}
 
+	private void askToDeleteAllMessages() {
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		builder.setTitle(getString(R.string.dialog_title_delete_all_messages));
+		builder.setMessage(
+				getString(R.string.dialog_message_delete_all_messages));
+		builder.setNegativeButton(R.string.delete,
+				(dialog, which) -> deleteAllMessages());
+		builder.setPositiveButton(R.string.cancel, null);
+		builder.show();
+	}
+
+	private void deleteAllMessages() {
+		list.showProgressBar();
+		runOnDbThread(() -> {
+			try {
+				boolean allDeleted =
+						conversationManager.deleteAllMessages(contactId);
+				reloadConversationAfterDeletingAllMessages(allDeleted);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				runOnUiThreadUnlessDestroyed(() -> list.showData());
+			}
+		});
+	}
+
+	private void reloadConversationAfterDeletingAllMessages(
+			boolean allDeleted) {
+		runOnUiThreadUnlessDestroyed(() -> {
+			adapter.clear();
+			loadMessages();
+			if (!allDeleted) showNotAllDeletedDialog();
+		});
+	}
+
+	private void showNotAllDeletedDialog() {
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		builder.setTitle(
+				getString(R.string.dialog_title_not_all_messages_deleted));
+		builder.setMessage(
+				getString(R.string.dialog_message_not_all_messages_deleted));
+		builder.setPositiveButton(R.string.ok, null);
+		builder.show();
+	}
+
 	private void askToRemoveContact() {
 		DialogInterface.OnClickListener okListener =
 				(dialog, which) -> removeContact();

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java

@@ -142,11 +142,8 @@ public class ImageActivity extends BriarActivity
 		viewPager.setAdapter(pagerAdapter);
 		viewPager.setCurrentItem(position);
 
-		if (SDK_INT >= 16) {
-			viewModel.getOnImageClicked()
-					.observeEvent(this, this::onImageClicked);
-			window.getDecorView().setSystemUiVisibility(UI_FLAGS_DEFAULT);
-		}
+		viewModel.getOnImageClicked().observeEvent(this, this::onImageClicked);
+		window.getDecorView().setSystemUiVisibility(UI_FLAGS_DEFAULT);
 	}
 
 	@Override
@@ -174,11 +171,7 @@ public class ImageActivity extends BriarActivity
 		viewModel.setToolbarPosition(
 				appBarLayout.getTop(), appBarLayout.getBottom()
 		);
-		if (SDK_INT >= 16) {
-			layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-		} else {
-			layout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-		}
+		layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 	}
 
 	@Override
@@ -265,7 +258,7 @@ public class ImageActivity extends BriarActivity
 	 * when the previous activity (with visible status bar) is shown.
 	 */
 	private void showStatusBarBeforeFinishing() {
-		if (SDK_INT >= 16 && appBarLayout.getVisibility() == GONE) {
+		if (appBarLayout.getVisibility() == GONE) {
 			View decorView = getWindow().getDecorView();
 			decorView.setSystemUiVisibility(UI_FLAGS_DEFAULT);
 		}

briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java

@@ -34,6 +34,8 @@ import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
 import static org.briarproject.briar.android.util.UiUtils.enterPressed;
+import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
+import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
 import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_NAME_LENGTH;
 
 @MethodsNotNullByDefault
@@ -91,12 +93,6 @@ public class CreateForumActivity extends BriarActivity {
 		progress = findViewById(R.id.createForumProgressBar);
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		showSoftKeyboard(nameEntry);
-	}
-
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java

@@ -182,7 +182,7 @@ public class ForumListFragment extends BaseEventFragment implements
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
 				if (forums.isEmpty()) list.showData();
-				else adapter.addAll(forums);
+				else adapter.replaceAll(forums);
 			} else {
 				LOG.info("Concurrent update, reloading");
 				loadForums();

briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java

@@ -43,6 +43,7 @@ import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
+import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
@@ -184,7 +185,7 @@ public class IntroductionMessageFragment extends BaseFragment
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case android.R.id.home:
-				introductionActivity.hideSoftKeyboard(ui.message);
+				hideSoftKeyboard(ui.message);
 				introductionActivity.onBackPressed();
 				return true;
 			default:
@@ -201,7 +202,7 @@ public class IntroductionMessageFragment extends BaseFragment
 		makeIntroduction(contact1, contact2, text);
 
 		// don't wait for the introduction to be made before finishing activity
-		introductionActivity.hideSoftKeyboard(ui.message);
+		hideSoftKeyboard(ui.message);
 		introductionActivity.setResult(RESULT_OK);
 		introductionActivity.supportFinishAfterTransition();
 	}

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java

@@ -35,7 +35,6 @@ import static android.hardware.Camera.Parameters.FOCUS_MODE_FIXED;
 import static android.hardware.Camera.Parameters.FOCUS_MODE_MACRO;
 import static android.hardware.Camera.Parameters.SCENE_MODE_AUTO;
 import static android.hardware.Camera.Parameters.SCENE_MODE_BARCODE;
-import static android.os.Build.VERSION.SDK_INT;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
@@ -340,7 +339,7 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 
 	@UiThread
 	private void setVideoStabilisation(Parameters params) {
-		if (SDK_INT >= 15 && params.isVideoStabilizationSupported()) {
+		if (params.isVideoStabilizationSupported()) {
 			params.setVideoStabilization(true);
 		}
 	}
@@ -415,10 +414,8 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 			} catch (RuntimeException e) {
 				throw new CameraException(e);
 			}
-			if (SDK_INT >= 15) {
-				LOG.info("Video stabilisation enabled: "
-						+ params.getVideoStabilization());
-			}
+			LOG.info("Video stabilisation enabled: "
+					+ params.getVideoStabilization());
 			LOG.info("Scene mode: " + params.getSceneMode());
 			LOG.info("Focus mode: " + params.getFocusMode());
 			LOG.info("Flash mode: " + params.getFlashMode());

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java

@@ -62,8 +62,7 @@ public class ContactExchangeActivity extends KeyAgreementActivity {
 	@UiThread
 	private void contactExchangeSucceeded(Author remoteAuthor) {
 		String contactName = remoteAuthor.getName();
-		String format = getString(R.string.contact_added_toast);
-		String text = String.format(format, contactName);
+		String text = getString(R.string.contact_added_toast, contactName);
 		Toast.makeText(this, text, LENGTH_LONG).show();
 		supportFinishAfterTransition();
 	}

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java

@@ -183,10 +183,14 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 		if (bt == null) {
 			setBluetoothState(BluetoothState.NO_ADAPTER);
 		} else {
-			setBluetoothState(BluetoothState.WAITING);
-			wasAdapterEnabled = bt.isEnabled();
 			Intent i = new Intent(ACTION_REQUEST_DISCOVERABLE);
-			startActivityForResult(i, REQUEST_BLUETOOTH_DISCOVERABLE);
+			if (i.resolveActivity(getPackageManager()) != null) {
+				setBluetoothState(BluetoothState.WAITING);
+				wasAdapterEnabled = bt.isEnabled();
+				startActivityForResult(i, REQUEST_BLUETOOTH_DISCOVERABLE);
+			} else {
+				setBluetoothState(BluetoothState.NO_ADAPTER);
+			}
 		}
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java

@@ -26,6 +26,8 @@ import javax.inject.Inject;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK;
+import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
+import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
 
 public class ChangePasswordActivity extends BriarActivity
 		implements OnClickListener, OnEditorActionListener {

briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java

@@ -83,12 +83,6 @@ public class PasswordFragment extends BaseFragment implements TextWatcher {
 		return v;
 	}
 
-	@Override
-	public void onResume() {
-		super.onResume();
-		showSoftKeyboard(password);
-	}
-
 	@Override
 	public void beforeTextChanged(CharSequence s, int start, int count,
 			int after) {

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java

@@ -47,7 +47,9 @@ public class GroupActivity extends
 	@Inject
 	GroupController controller;
 
-	private boolean isCreator, isDissolved = false;
+	@Nullable
+	private Boolean isCreator = null;
+	private boolean isDissolved = false;
 	private MenuItem revealMenuItem, inviteMenuItem, leaveMenuItem,
 			dissolveMenuItem;
 
@@ -137,6 +139,14 @@ public class GroupActivity extends
 		inviteMenuItem = menu.findItem(R.id.action_group_invite);
 		leaveMenuItem = menu.findItem(R.id.action_group_leave);
 		dissolveMenuItem = menu.findItem(R.id.action_group_dissolve);
+
+		// all role-dependent items are invisible until we know our role
+		revealMenuItem.setVisible(false);
+		inviteMenuItem.setVisible(false);
+		leaveMenuItem.setVisible(false);
+		dissolveMenuItem.setVisible(false);
+
+		// show items based on role
 		showMenuItems();
 
 		return super.onCreateOptionsMenu(menu);
@@ -151,19 +161,27 @@ public class GroupActivity extends
 				startActivity(i1);
 				return true;
 			case R.id.action_group_reveal:
+				if (isCreator == null || isCreator)
+					throw new IllegalStateException();
 				Intent i2 = new Intent(this, RevealContactsActivity.class);
 				i2.putExtra(GROUP_ID, groupId.getBytes());
 				startActivity(i2);
 				return true;
 			case R.id.action_group_invite:
+				if (isCreator == null || !isCreator)
+					throw new IllegalStateException();
 				Intent i3 = new Intent(this, GroupInviteActivity.class);
 				i3.putExtra(GROUP_ID, groupId.getBytes());
 				startActivityForResult(i3, REQUEST_GROUP_INVITE);
 				return true;
 			case R.id.action_group_leave:
+				if (isCreator == null || isCreator)
+					throw new IllegalStateException();
 				showLeaveGroupDialog();
 				return true;
 			case R.id.action_group_dissolve:
+				if (isCreator == null || !isCreator)
+					throw new IllegalStateException();
 				showDissolveGroupDialog();
 			default:
 				return super.onOptionsItemSelected(item);
@@ -209,18 +227,12 @@ public class GroupActivity extends
 	}
 
 	private void showMenuItems() {
-		if (leaveMenuItem == null || dissolveMenuItem == null) return;
-		if (isCreator) {
-			revealMenuItem.setVisible(false);
-			inviteMenuItem.setVisible(true);
-			leaveMenuItem.setVisible(false);
-			dissolveMenuItem.setVisible(true);
-		} else {
-			revealMenuItem.setVisible(true);
-			inviteMenuItem.setVisible(false);
-			leaveMenuItem.setVisible(true);
-			dissolveMenuItem.setVisible(false);
-		}
+		// we need to have the menu items and know if we are the creator
+		if (leaveMenuItem == null || isCreator == null) return;
+		revealMenuItem.setVisible(!isCreator);
+		inviteMenuItem.setVisible(isCreator);
+		leaveMenuItem.setVisible(!isCreator);
+		dissolveMenuItem.setVisible(isCreator);
 	}
 
 	private void showLeaveGroupDialog() {

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java

@@ -24,6 +24,7 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
 import static org.briarproject.briar.android.util.UiUtils.enterPressed;
+import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH;
 
 @MethodsNotNullByDefault
@@ -91,12 +92,6 @@ public class CreateGroupFragment extends BaseFragment {
 		return v;
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		listener.showSoftKeyboard(nameEntry);
-	}
-
 	@Override
 	public String getUniqueTag() {
 		return TAG;
@@ -120,7 +115,7 @@ public class CreateGroupFragment extends BaseFragment {
 
 	private void createGroup() {
 		if (!validateName()) return;
-		listener.hideSoftKeyboard(nameEntry);
+		hideSoftKeyboard(nameEntry);
 		createGroupButton.setVisibility(GONE);
 		progress.setVisibility(VISIBLE);
 		listener.onGroupNameChosen(nameEntry.getText().toString());

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupListener.java

@@ -1,15 +1,8 @@
 package org.briarproject.briar.android.privategroup.creation;
 
-import android.view.View;
-
 import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
 
 interface CreateGroupListener extends BaseFragmentListener {
 
 	void onGroupNameChosen(String name);
-
-	void showSoftKeyboard(View view);
-
-	void hideSoftKeyboard(View view);
-
 }

briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java

@@ -194,7 +194,7 @@ public class GroupListFragment extends BaseFragment implements
 						if (revision == adapter.getRevision()) {
 							adapter.incrementRevision();
 							if (groups.isEmpty()) list.showData();
-							else adapter.addAll(groups);
+							else adapter.replaceAll(groups);
 						} else {
 							LOG.info("Concurrent update, reloading");
 							loadGroups();

briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java

@@ -90,14 +90,9 @@ public class BriarReportPrimer implements ReportPrimer {
 			ActivityManager.MemoryInfo mem = new ActivityManager.MemoryInfo();
 			am.getMemoryInfo(mem);
 			String systemMemory;
-			if (Build.VERSION.SDK_INT >= 16) {
-				systemMemory = (mem.totalMem / 1024 / 1024) + " MiB total, "
-						+ (mem.availMem / 1024 / 1204) + " MiB free, "
-						+ (mem.threshold / 1024 / 1024) + " MiB threshold";
-			} else {
-				systemMemory = (mem.availMem / 1024 / 1204) + " MiB free, "
-						+ (mem.threshold / 1024 / 1024) + " MiB threshold";
-			}
+			systemMemory = (mem.totalMem / 1024 / 1024) + " MiB total, "
+					+ (mem.availMem / 1024 / 1204) + " MiB free, "
+					+ (mem.threshold / 1024 / 1024) + " MiB threshold";
 			customData.put("System memory", systemMemory);
 
 			// Virtual machine memory

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

@@ -218,11 +218,17 @@ public class SettingsFragment extends PreferenceFragmentCompat
 				});
 
 		if (SDK_INT < 27) {
-			// remove System Default Theme option
+			// remove System Default Theme option from preference entries
+			// as it is not functional on this API anyway
 			List<CharSequence> entries =
 					new ArrayList<>(Arrays.asList(theme.getEntries()));
 			entries.remove(getString(R.string.pref_theme_system));
 			theme.setEntries(entries.toArray(new CharSequence[0]));
+			// also remove corresponding value
+			List<CharSequence> values =
+					new ArrayList<>(Arrays.asList(theme.getEntryValues()));
+			values.remove(getString(R.string.pref_theme_system_value));
+			theme.setEntryValues(values.toArray(new CharSequence[0]));
 		}
 		if (IS_DEBUG_BUILD) {
 			findPreference("pref_key_explode").setOnPreferenceClickListener(
@@ -489,7 +495,13 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			Intent intent = new Intent(ACTION_CHANNEL_NOTIFICATION_SETTINGS)
 					.putExtra(EXTRA_APP_PACKAGE, packageName)
 					.putExtra(EXTRA_CHANNEL_ID, channelId);
-			startActivity(intent);
+			Context ctx = requireContext();
+			if (intent.resolveActivity(ctx.getPackageManager()) != null) {
+				startActivity(intent);
+			} else {
+				Toast.makeText(ctx, R.string.error_start_activity, LENGTH_SHORT)
+						.show();
+			}
 			return true;
 		});
 	}
@@ -511,7 +523,12 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			else uri = Uri.parse(ringtoneUri);
 			i.putExtra(EXTRA_RINGTONE_EXISTING_URI, uri);
 		}
-		startActivityForResult(i, REQUEST_RINGTONE);
+		if (i.resolveActivity(requireActivity().getPackageManager()) != null) {
+			startActivityForResult(i, REQUEST_RINGTONE);
+		} else {
+			Toast.makeText(getContext(), R.string.cannot_load_ringtone,
+					LENGTH_SHORT).show();
+		}
 		return true;
 	}
 
@@ -646,7 +663,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			} else {
 				// The user chose a ringtone other than the default
 				Ringtone r = RingtoneManager.getRingtone(getContext(), uri);
-				if (r == null) {
+				if (r == null || "file".equals(uri.getScheme())) {
 					Toast.makeText(getContext(), R.string.cannot_load_ringtone,
 							LENGTH_SHORT).show();
 				} else {

briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java

@@ -64,12 +64,6 @@ public abstract class BaseMessageFragment extends BaseFragment
 	@StringRes
 	protected abstract int getHintText();
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		message.showSoftKeyboard();
-	}
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java

@@ -27,7 +27,6 @@ import org.briarproject.briar.android.threaded.ThreadListController.ThreadListDa
 import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
-import org.briarproject.briar.android.view.KeyboardAwareLinearLayout;
 import org.briarproject.briar.android.view.TextInputView;
 import org.briarproject.briar.android.view.TextSendController;
 import org.briarproject.briar.android.view.TextSendController.SendListener;
@@ -284,14 +283,10 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 			scrollToItemAtTop(item);
 		} else {
 			// wait with scrolling until keyboard opened
-			textInput.addOnKeyboardShownListener(
-					new KeyboardAwareLinearLayout.OnKeyboardShownListener() {
-						@Override
-						public void onKeyboardShown() {
-							scrollToItemAtTop(item);
-							textInput.removeOnKeyboardShownListener(this);
-						}
-					});
+			textInput.setOnKeyboardShownListener(() -> {
+				scrollToItemAtTop(item);
+				textInput.setOnKeyboardShownListener(null);
+			});
 		}
 	}
 
@@ -332,7 +327,6 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 	private void updateTextInput() {
 		if (replyId != null) {
 			textInput.setHint(R.string.forum_message_reply_hint);
-			textInput.requestFocus();
 			textInput.showSoftKeyboard();
 		} else {
 			textInput.setHint(R.string.forum_new_message_hint);

briar-android/src/main/java/org/briarproject/briar/android/util/BriarAdapter.java

@@ -79,6 +79,10 @@ public abstract class BriarAdapter<T, V extends ViewHolder>
 		this.items.addAll(items);
 	}
 
+	public void replaceAll(Collection<T> items) {
+		this.items.replaceAll(items);
+	}
+
 	public void setItems(Collection<T> items) {
 		this.items.beginBatchedUpdates();
 		this.items.clear();

briar-android/src/main/java/org/briarproject/briar/android/util/BriarSnackbarBuilder.java

@@ -4,13 +4,18 @@ import android.support.annotation.ColorRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
+import android.support.design.widget.Snackbar.Callback;
 import android.view.View;
 import android.view.View.OnClickListener;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 
+import static android.os.Build.VERSION.SDK_INT;
+import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE;
 import static android.support.v4.content.ContextCompat.getColor;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
 
 @NotNullByDefault
 public class BriarSnackbarBuilder {
@@ -30,6 +35,24 @@ public class BriarSnackbarBuilder {
 					R.color.briar_button_text_positive));
 			s.setAction(actionResId, onClickListener);
 		}
+		// Workaround for https://issuetracker.google.com/issues/64285517
+		if (duration == LENGTH_INDEFINITE && SDK_INT < 21) {
+			// Hide snackbar while it's opening to make bouncing less noticeable
+			s.getView().setVisibility(INVISIBLE);
+			s.addCallback(new Callback() {
+				@Override
+				public void onShown(Snackbar snackbar) {
+					snackbar.getView().setVisibility(VISIBLE);
+					// Request layout again in case snackbar is in wrong place
+					snackbar.getView().requestLayout();
+				}
+
+				@Override
+				public void onDismissed(Snackbar snackbar, int event) {
+					snackbar.getView().setVisibility(INVISIBLE);
+				}
+			});
+		}
 		return s;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java

@@ -92,9 +92,11 @@ public class UiUtils {
 	public static final float GREY_OUT = 0.5f;
 
 	public static void showSoftKeyboard(View view) {
-		InputMethodManager imm = requireNonNull(
-				getSystemService(view.getContext(), InputMethodManager.class));
-		imm.showSoftInput(view, SHOW_IMPLICIT);
+		if (view.requestFocus()) {
+			InputMethodManager imm = requireNonNull(getSystemService(
+					view.getContext(), InputMethodManager.class));
+			imm.showSoftInput(view, SHOW_IMPLICIT);
+		}
 	}
 
 	public static void hideSoftKeyboard(View view) {

briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewBehavior.java

@@ -1,44 +0,0 @@
-package org.briarproject.briar.android.view;
-
-import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.util.AttributeSet;
-import android.view.View;
-
-public class BriarRecyclerViewBehavior
-		extends CoordinatorLayout.Behavior<BriarRecyclerView> {
-
-	public BriarRecyclerViewBehavior(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	@Override
-	public boolean onDependentViewChanged(CoordinatorLayout parent,
-			BriarRecyclerView child, View dependency) {
-
-		// FIXME the below code works, but does not reset margin when snackbar is dismissed
-/*
-		int margin = 0;
-		if (dependency.isShown()) margin = dependency.getHeight();
-
-		// set snackbar height as bottom margin if it is shown
-		CoordinatorLayout.LayoutParams params =
-				(CoordinatorLayout.LayoutParams) child.getLayoutParams();
-		params.setMargins(0, 0, 0, margin);
-		child.setLayoutParams(params);
-
-		child.scrollToPosition(0);
-*/
-		return true;
-	}
-
-	@Override
-	public boolean layoutDependsOn(CoordinatorLayout parent,
-			BriarRecyclerView child, View dependency) {
-		// we only want to trigger the change
-		// only when the changes is from a snackbar
-		return dependency instanceof Snackbar.SnackbarLayout;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/view/CompositeSendButton.java

@@ -13,7 +13,6 @@ import android.widget.ProgressBar;
 import org.briarproject.briar.R;
 
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static android.os.Build.VERSION.SDK_INT;
 import static java.util.Objects.requireNonNull;
 
 public class CompositeSendButton extends FrameLayout {
@@ -75,33 +74,24 @@ public class CompositeSendButton extends FrameLayout {
 		if (showImageButton) {
 			imageButton.setVisibility(VISIBLE);
 			sendButton.setEnabled(false);
-			if (SDK_INT <= 15) {
+			sendButton.clearAnimation();
+			sendButton.animate().alpha(0f).withEndAction(() -> {
 				sendButton.setVisibility(INVISIBLE);
 				imageButton.setEnabled(true);
-			} else {
-				sendButton.clearAnimation();
-				sendButton.animate().alpha(0f).withEndAction(() -> {
-					sendButton.setVisibility(INVISIBLE);
-					imageButton.setEnabled(true);
-				}).start();
-				imageButton.clearAnimation();
-				imageButton.animate().alpha(1f).start();
-			}
+			}).start();
+			imageButton.clearAnimation();
+			imageButton.animate().alpha(1f).start();
 		} else {
 			sendButton.setVisibility(VISIBLE);
 			// enable/disable buttons right away to allow fast sending
 			sendButton.setEnabled(sendEnabled);
 			imageButton.setEnabled(false);
-			if (SDK_INT <= 15) {
-				imageButton.setVisibility(INVISIBLE);
-			} else {
-				sendButton.clearAnimation();
-				sendButton.animate().alpha(1f).start();
-				imageButton.clearAnimation();
-				imageButton.animate().alpha(0f).withEndAction(() ->
-						imageButton.setVisibility(INVISIBLE)
-				).start();
-			}
+			sendButton.clearAnimation();
+			sendButton.animate().alpha(1f).start();
+			imageButton.clearAnimation();
+			imageButton.animate().alpha(0f).withEndAction(() ->
+					imageButton.setVisibility(INVISIBLE)
+			).start();
 		}
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java

@@ -13,8 +13,8 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 
-import com.vanniktech.emoji.EmojiEditText;
 import com.vanniktech.emoji.EmojiPopup;
 import com.vanniktech.emoji.RecentEmoji;
 
@@ -28,10 +28,12 @@ import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 import static android.view.KeyEvent.KEYCODE_ENTER;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_SEND;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
+import static java.lang.Character.isWhitespace;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
 
-public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
+public class EmojiTextInputView extends LinearLayout implements
 		TextWatcher {
 
 	@Inject
@@ -40,12 +42,16 @@ public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
 	private final AppCompatImageButton emojiToggle;
 	private final EmojiPopup emojiPopup;
 	private final EditText editText;
+	private final InputMethodManager imm;
 
 	@Nullable
 	private TextInputListener listener;
+	@Nullable
+	private OnKeyboardShownListener keyboardShownListener;
 	private int maxLength = Integer.MAX_VALUE;
 	private boolean emptyTextAllowed = false;
 	private boolean isEmpty = true;
+	private boolean keyboardOpen = false;
 
 	public EmojiTextInputView(Context context) {
 		this(context, null);
@@ -79,7 +85,6 @@ public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
 		editText = findViewById(R.id.input_text);
 		editText.setPadding(0, 0, paddingEnd, paddingBottom);
 		if (maxLines > 0) editText.setMaxLines(maxLines);
-		editText.setOnClickListener(v -> showSoftKeyboard());
 		editText.addTextChangedListener(this);
 		editText.setOnEditorActionListener((v, actionId, event) -> {
 			if (actionId == IME_ACTION_SEND) {
@@ -103,18 +108,30 @@ public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
 		// stuff we can't do in edit mode goes below
 		if (isInEditMode()) {
 			emojiPopup = null;
+			imm = null;
 			return;
 		}
+		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
+		imm = (InputMethodManager) requireNonNull(o);
+
 		BriarApplication app =
 				(BriarApplication) context.getApplicationContext();
 		app.getApplicationComponent().inject(this);
 		emojiPopup = EmojiPopup.Builder
-				.fromRootView(this)
+				.fromRootView(getRootView())
 				.setRecentEmoji(recentEmoji)
 				.setOnEmojiPopupShownListener(this::showKeyboardIcon)
 				.setOnEmojiPopupDismissListener(this::showEmojiIcon)
-				.build((EmojiEditText) editText);
+				.setKeyboardAnimationStyle(R.style.emoji_fade_animation_style)
+				.setOnSoftKeyboardOpenListener(this::onKeyboardOpened)
+				.setOnSoftKeyboardCloseListener(this::onKeyboardClosed)
+				.setIconColor(resolveColorAttribute(getContext(),
+						R.attr.colorControlNormal))
+				.build(editText);
 		emojiToggle.setOnClickListener(v -> emojiPopup.toggle());
+		editText.setOnClickListener(v -> {
+			if (emojiPopup.isShowing()) emojiPopup.dismiss();
+		});
 	}
 
 	@Override
@@ -125,19 +142,31 @@ public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
 	@Override
 	public void onTextChanged(CharSequence s, int start, int before,
 			int count) {
-		// Need to start at position 0 to change empty
-		if (start != 0 || emptyTextAllowed || listener == null) return;
-		if (s.length() == 0) {
-			if (!isEmpty) {
+		if (emptyTextAllowed || listener == null) return;
+		// Work out whether the trimmed text has become empty or non-empty
+		if (isEmpty) {
+			// We only need to check the characters that were added
+			if (countLeadingWhitespace(s, start, count) < count) {
+				isEmpty = false;
+				listener.onTextIsEmptyChanged(false);
+			}
+		} else if (before > 0) {
+			// Characters have been removed or replaced - check from the start
+			int length = s.length();
+			if (countLeadingWhitespace(s, 0, length) == length) {
 				isEmpty = true;
 				listener.onTextIsEmptyChanged(true);
 			}
-		} else if (isEmpty) {
-			isEmpty = false;
-			listener.onTextIsEmptyChanged(false);
 		}
 	}
 
+	private int countLeadingWhitespace(CharSequence s, int off, int len) {
+		for (int i = 0; i < len; i++) {
+			if (!isWhitespace(s.charAt(off + i))) return i;
+		}
+		return len;
+	}
+
 	@Override
 	public void afterTextChanged(Editable s) {
 	}
@@ -218,6 +247,10 @@ public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
 		editText.setHint(hint);
 	}
 
+	boolean isKeyboardOpen() {
+		return keyboardOpen || imm.isFullscreenMode();
+	}
+
 	private void showEmojiIcon() {
 		emojiToggle.setImageResource(R.drawable.ic_emoji_toggle);
 	}
@@ -227,22 +260,43 @@ public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
 	}
 
 	void showSoftKeyboard() {
-		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
-		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
-		imm.showSoftInput(editText, SHOW_IMPLICIT);
+		if (editText.requestFocus()) imm.showSoftInput(editText, SHOW_IMPLICIT);
 	}
 
 	void hideSoftKeyboard() {
 		if (emojiPopup.isShowing()) emojiPopup.dismiss();
 		IBinder token = editText.getWindowToken();
-		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
-		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
 		imm.hideSoftInputFromWindow(token, 0);
 	}
 
+	private void onKeyboardOpened(
+			@SuppressWarnings("unused") int keyboardHeight) {
+		keyboardOpen = true;
+		if (keyboardShownListener != null)
+			keyboardShownListener.onKeyboardShown();
+	}
+
+	private void onKeyboardClosed() {
+		if (imm.isFullscreenMode()) {
+			onKeyboardOpened(0);
+			return;
+		}
+		keyboardOpen = false;
+	}
+
+	void setOnKeyboardShownListener(
+			@Nullable OnKeyboardShownListener listener) {
+		keyboardShownListener = listener;
+	}
+
 	interface TextInputListener {
 		void onTextIsEmptyChanged(boolean isEmpty);
+
 		void onSendEvent();
 	}
 
+	public interface OnKeyboardShownListener {
+		void onKeyboardShown();
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/view/KeyboardAwareLinearLayout.java

@@ -1,225 +0,0 @@
-/*
-  Taken from Signal, licences under GPLv3
- */
-
-package org.briarproject.briar.android.view;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Rect;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.support.annotation.UiThread;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-
-import org.briarproject.briar.R;
-
-import java.lang.reflect.Field;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-
-import static android.content.Context.WINDOW_SERVICE;
-import static android.view.Surface.ROTATION_270;
-import static android.view.Surface.ROTATION_90;
-import static java.util.Objects.requireNonNull;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-
-/**
- * RelativeLayout that, when a view container, will report back when it thinks
- * a soft keyboard has been opened and what its height would be.
- */
-@UiThread
-public class KeyboardAwareLinearLayout extends LinearLayout {
-
-	private static final Logger LOG =
-			Logger.getLogger(KeyboardAwareLinearLayout.class.getName());
-
-	private final Rect rect = new Rect();
-	private final Set<OnKeyboardShownListener> shownListeners = new HashSet<>();
-	private final int minKeyboardSize;
-	private final int minCustomKeyboardSize;
-	private final int defaultCustomKeyboardSize;
-	private final int minCustomKeyboardTopMargin;
-	private final int statusBarHeight;
-
-	private int viewInset;
-
-	private boolean keyboardOpen = false;
-	private int rotation = -1;
-
-	public KeyboardAwareLinearLayout(Context context) {
-		this(context, null);
-	}
-
-	public KeyboardAwareLinearLayout(Context context,
-			@Nullable AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
-
-	public KeyboardAwareLinearLayout(Context context,
-			@Nullable AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		rotation = getDeviceRotation();
-		int statusBarRes = getResources()
-				.getIdentifier("status_bar_height", "dimen", "android");
-		minKeyboardSize =
-				getResources().getDimensionPixelSize(R.dimen.min_keyboard_size);
-		minCustomKeyboardSize = getResources()
-				.getDimensionPixelSize(R.dimen.min_custom_keyboard_size);
-		defaultCustomKeyboardSize = getResources()
-				.getDimensionPixelSize(R.dimen.default_custom_keyboard_size);
-		minCustomKeyboardTopMargin = getResources()
-				.getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin);
-		statusBarHeight = statusBarRes > 0 ?
-				getResources().getDimensionPixelSize(statusBarRes) : 0;
-		viewInset = getViewInset();
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		updateRotation();
-		updateKeyboardState();
-		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-	}
-
-	private void updateRotation() {
-		int oldRotation = rotation;
-		rotation = getDeviceRotation();
-		if (oldRotation != rotation) {
-			LOG.info("Rotation changed");
-			onKeyboardClose();
-		}
-	}
-
-	private void updateKeyboardState() {
-		if (isLandscape()) {
-			if (keyboardOpen) onKeyboardClose();
-			return;
-		}
-
-		if (viewInset == 0 && Build.VERSION.SDK_INT >= 21)
-			viewInset = getViewInset();
-		int availableHeight =
-				getRootView().getHeight() - statusBarHeight - viewInset;
-		getWindowVisibleDisplayFrame(rect);
-
-		int keyboardHeight = availableHeight - (rect.bottom - rect.top);
-
-		if (keyboardHeight > minKeyboardSize) {
-			if (getKeyboardHeight() != keyboardHeight)
-				setKeyboardPortraitHeight(keyboardHeight);
-			if (!keyboardOpen) onKeyboardOpen(keyboardHeight);
-		} else if (keyboardOpen) {
-			onKeyboardClose();
-		}
-	}
-
-	@TargetApi(21)
-	private int getViewInset() {
-		try {
-			Field attachInfoField = View.class.getDeclaredField("mAttachInfo");
-			attachInfoField.setAccessible(true);
-			Object attachInfo = attachInfoField.get(this);
-			if (attachInfo != null) {
-				Field stableInsetsField =
-						attachInfo.getClass().getDeclaredField("mStableInsets");
-				stableInsetsField.setAccessible(true);
-				Rect insets = (Rect) stableInsetsField.get(attachInfo);
-				return insets.bottom;
-			}
-		} catch (NoSuchFieldException e) {
-			LOG.log(WARNING,
-					"field reflection error when measuring view inset", e);
-		} catch (IllegalAccessException e) {
-			LOG.log(WARNING,
-					"access reflection error when measuring view inset", e);
-		}
-		return 0;
-	}
-
-	protected void onKeyboardOpen(int keyboardHeight) {
-		if (LOG.isLoggable(INFO))
-			LOG.info("onKeyboardOpen(" + keyboardHeight + ")");
-		keyboardOpen = true;
-
-		notifyShownListeners();
-	}
-
-	protected void onKeyboardClose() {
-		LOG.info("onKeyboardClose()");
-		keyboardOpen = false;
-	}
-
-	public boolean isKeyboardOpen() {
-		return keyboardOpen;
-	}
-
-	public int getKeyboardHeight() {
-		return isLandscape() ? getKeyboardLandscapeHeight() :
-				getKeyboardPortraitHeight();
-	}
-
-	public boolean isLandscape() {
-		int rotation = getDeviceRotation();
-		return rotation == ROTATION_90 || rotation == ROTATION_270;
-	}
-
-	private int getDeviceRotation() {
-		WindowManager windowManager =
-				(WindowManager) getContext().getSystemService(WINDOW_SERVICE);
-		return requireNonNull(windowManager).getDefaultDisplay().getRotation();
-	}
-
-	private int getKeyboardLandscapeHeight() {
-		return Math.max(getHeight(), getRootView().getHeight()) / 2;
-	}
-
-	private int getKeyboardPortraitHeight() {
-		SharedPreferences prefs =
-				PreferenceManager.getDefaultSharedPreferences(getContext());
-		int keyboardHeight = prefs.getInt("keyboard_height_portrait",
-				defaultCustomKeyboardSize);
-		return clamp(keyboardHeight, minCustomKeyboardSize,
-				getRootView().getHeight() - minCustomKeyboardTopMargin);
-	}
-
-	private int clamp(int value, int min, int max) {
-		return Math.min(Math.max(value, min), max);
-	}
-
-	private void setKeyboardPortraitHeight(int height) {
-		SharedPreferences prefs =
-				PreferenceManager.getDefaultSharedPreferences(getContext());
-		prefs.edit().putInt("keyboard_height_portrait", height).apply();
-	}
-
-	public void addOnKeyboardShownListener(OnKeyboardShownListener listener) {
-		shownListeners.add(listener);
-	}
-
-	public void removeOnKeyboardShownListener(
-			OnKeyboardShownListener listener) {
-		shownListeners.remove(listener);
-	}
-
-	private void notifyShownListeners() {
-		// Make a copy as listeners may remove themselves when called
-		Set<OnKeyboardShownListener> listeners = new HashSet<>(shownListeners);
-		for (OnKeyboardShownListener listener : listeners) {
-			listener.onKeyboardShown();
-		}
-	}
-
-	public interface OnKeyboardShownListener {
-		void onKeyboardShown();
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java

@@ -0,0 +1,50 @@
+package org.briarproject.briar.android.view;
+
+import android.content.Context;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.CoordinatorLayout.Behavior;
+import android.support.design.widget.CoordinatorLayout.LayoutParams;
+import android.support.design.widget.Snackbar.SnackbarLayout;
+import android.util.AttributeSet;
+import android.view.View;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+/**
+ * This behavior makes room for a snackbar at the bottom of the screen. The
+ * proper solution is to use layout_dodgeInsetEdges="bottom", but when used on
+ * a scrollable view that results in the view being pushed under the app bar
+ * (see https://issuetracker.google.com/issues/116541304).
+ */
+@NotNullByDefault
+public class SnackbarAwareBehavior<V extends View> extends Behavior<V> {
+
+	public SnackbarAwareBehavior(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	@Override
+	public boolean onDependentViewChanged(CoordinatorLayout parent,
+			V child, View snackbar) {
+		setMargin(child, snackbar.getHeight());
+		return true;
+	}
+
+	@Override
+	public void onDependentViewRemoved(CoordinatorLayout parent,
+			V child, View snackbar) {
+		setMargin(child, 0);
+	}
+
+	@Override
+	public boolean layoutDependsOn(CoordinatorLayout parent,
+			V child, View dependency) {
+		return dependency instanceof SnackbarLayout;
+	}
+
+	private void setMargin(V child, int margin) {
+		LayoutParams params = (LayoutParams) child.getLayoutParams();
+		params.setMargins(0, 0, 0, margin);
+		child.setLayoutParams(params);
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java

@@ -16,7 +16,7 @@ import android.widget.LinearLayout;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.view.KeyboardAwareLinearLayout.OnKeyboardShownListener;
+import org.briarproject.briar.android.view.EmojiTextInputView.OnKeyboardShownListener;
 
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 import static java.util.Objects.requireNonNull;
@@ -139,13 +139,9 @@ public class TextInputView extends LinearLayout {
 		textInput.hideSoftKeyboard();
 	}
 
-	public void addOnKeyboardShownListener(OnKeyboardShownListener listener) {
-		textInput.addOnKeyboardShownListener(listener);
-	}
-
-	public void removeOnKeyboardShownListener(
-			OnKeyboardShownListener listener) {
-		textInput.removeOnKeyboardShownListener(listener);
+	public void setOnKeyboardShownListener(
+			@Nullable OnKeyboardShownListener listener) {
+		textInput.setOnKeyboardShownListener(listener);
 	}
 
 }

briar-android/src/main/res/layout/activity_change_password.xml

@@ -29,13 +29,17 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:passwordToggleEnabled="true">
 
-			<EditText
+			<android.support.design.widget.TextInputEditText
 				android:id="@+id/current_password_entry"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/current_password"
+				android:importantForAutofill="no"
 				android:inputType="textPassword"
 				android:maxLines="1"/>
+
+			<requestFocus/>
+
 		</android.support.design.widget.TextInputLayout>
 
 		<android.support.design.widget.TextInputLayout
@@ -49,11 +53,12 @@
 			app:layout_constraintTop_toBottomOf="@id/current_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
-			<EditText
+			<android.support.design.widget.TextInputEditText
 				android:id="@+id/new_password_entry"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/choose_new_password"
+				android:importantForAutofill="no"
 				android:inputType="textPassword"
 				android:maxLines="1"/>
 		</android.support.design.widget.TextInputLayout>
@@ -69,12 +74,13 @@
 			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
-			<EditText
+			<android.support.design.widget.TextInputEditText
 				android:id="@+id/new_password_confirm"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/confirm_new_password"
 				android:imeOptions="actionDone"
+				android:importantForAutofill="no"
 				android:inputType="textPassword"
 				android:maxLines="1"/>
 		</android.support.design.widget.TextInputLayout>

briar-android/src/main/res/layout/activity_create_forum.xml

@@ -15,14 +15,17 @@
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
-		<EditText
+		<android.support.design.widget.TextInputEditText
 			android:id="@+id/createForumNameEntry"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/choose_forum_hint"
+			android:importantForAutofill="no"
 			android:inputType="text|textCapSentences"
 			android:maxLines="1"/>
 
+		<requestFocus/>
+
 	</android.support.design.widget.TextInputLayout>
 
 	<Button

briar-android/src/main/res/layout/activity_rss_feed_import.xml

@@ -18,7 +18,7 @@
 		app:cardCornerRadius="0dp"
 		app:cardUseCompatPadding="false">
 
-		<EditText
+		<android.support.design.widget.TextInputEditText
 			android:id="@+id/urlInput"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -26,9 +26,14 @@
 			android:gravity="top"
 			android:hint="@string/blogs_rss_feeds_import_hint"
 			android:imeOptions="actionDone"
+			android:importantForAutofill="no"
 			android:inputType="textUri"
 			android:padding="@dimen/margin_medium"
-			android:textColor="?android:attr/textColorPrimary"/>
+			android:textColor="?android:attr/textColorPrimary">
+
+			<requestFocus/>
+
+		</android.support.design.widget.TextInputEditText>
 
 	</android.support.v7.widget.CardView>
 

briar-android/src/main/res/layout/activity_write_blog_post.xml

@@ -14,7 +14,11 @@
 		android:gravity="bottom"
 		app:buttonText="@string/blogs_publish_blog_post"
 		app:fillHeight="true"
-		app:hint="@string/blogs_write_blog_post_body_hint"/>
+		app:hint="@string/blogs_write_blog_post_body_hint">
+
+		<requestFocus/>
+
+	</org.briarproject.briar.android.view.LargeTextInputView>
 
 	<ProgressBar
 		android:id="@+id/progressBar"

briar-android/src/main/res/layout/emoji_text_input_view.xml

@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="horizontal"
-	tools:parentTag="org.briarproject.briar.android.view.KeyboardAwareLinearLayout"
+	tools:parentTag="android.widget.LinearLayout"
 	tools:showIn="@layout/fragment_reblog">
 
 	<android.support.v7.widget.AppCompatImageButton

briar-android/src/main/res/layout/fragment_contact_list.xml

@@ -9,6 +9,7 @@
 		android:id="@+id/list"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior"
 		app:scrollToEnd="false"/>
 
 	<io.github.kobakei.materialfabspeeddial.FabSpeedDial
@@ -19,6 +20,8 @@
 		app:fab_fabRippleColor="@android:color/transparent"
 		app:fab_menu="@menu/contact_list_actions"
 		app:fab_miniFabTextBackground="@color/briar_accent"
-		app:fab_miniFabTextColor="@android:color/white"/>
+		app:fab_miniFabTextColor="@android:color/white"
+		app:layout_anchorGravity="bottom|right|end"
+		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior"/>
 
 </android.support.design.widget.CoordinatorLayout>

briar-android/src/main/res/layout/fragment_create_group.xml

@@ -15,14 +15,17 @@
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
-		<EditText
+		<android.support.design.widget.TextInputEditText
 			android:id="@+id/name"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/groups_create_group_hint"
+			android:importantForAutofill="no"
 			android:inputType="text|textCapSentences"
 			android:maxLines="1"/>
 
+		<requestFocus/>
+
 	</android.support.design.widget.TextInputLayout>
 
 	<Button

briar-android/src/main/res/layout/fragment_nickname.xml

@@ -26,7 +26,8 @@
 			app:layout_constraintEnd_toStartOf="@+id/guideline"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintVertical_bias="0.0"/>
+			app:layout_constraintVertical_bias="0.0"
+			app:layout_constraintVertical_chainStyle="packed"/>
 
 		<TextView
 			android:id="@+id/stepOneText"
@@ -74,12 +75,14 @@
 
 		<ImageView
 			android:id="@+id/imageView"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
 			android:layout_marginTop="32dp"
 			android:src="@drawable/ic_nickname"
 			app:layout_constraintBottom_toTopOf="@+id/nicknameIcon"
+			app:layout_constraintDimensionRatio="1:1"
 			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHeight_max="256dp"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/stepOneText"
 			tools:ignore="ContentDescription"/>
@@ -118,6 +121,7 @@
 			android:layout_marginTop="16dp"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
+			app:layout_constraintBottom_toTopOf="@+id/space"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0.5"
 			app:layout_constraintStart_toStartOf="parent"
@@ -133,6 +137,16 @@
 
 		</android.support.design.widget.TextInputLayout>
 
+		<Space
+			android:id="@+id/space"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			app:layout_constraintBottom_toTopOf="@+id/addButton"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHeight_default="wrap"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"/>
+
 		<Button
 			android:id="@+id/addButton"
 			style="@style/BriarButton"

briar-android/src/main/res/layout/fragment_password.xml

@@ -31,6 +31,9 @@
 				android:imeOptions="actionDone"
 				android:inputType="textPassword"
 				android:maxLines="1"/>
+
+			<requestFocus/>
+
 		</android.support.design.widget.TextInputLayout>
 
 		<Button

briar-android/src/main/res/layout/fragment_setup_author_name.xml

@@ -38,6 +38,7 @@
 				android:maxLines="1"/>
 
 			<requestFocus/>
+
 		</android.support.design.widget.TextInputLayout>
 
 		<Button

briar-android/src/main/res/layout/fragment_setup_password.xml

@@ -39,6 +39,7 @@
 				android:maxLines="1">
 
 				<requestFocus/>
+
 			</android.support.design.widget.TextInputEditText>
 
 		</android.support.design.widget.TextInputLayout>

briar-android/src/main/res/menu/conversation_actions.xml

@@ -16,6 +16,11 @@
 		android:enabled="false"
 		app:showAsAction="never"/>
 
+	<item
+		android:id="@+id/action_delete_all_messages"
+		android:title="@string/delete_all_messages"
+		app:showAsAction="never"/>
+
 	<item
 		android:id="@+id/action_social_remove_person"
 		android:icon="@drawable/action_delete_white"

briar-android/src/main/res/values-ar/strings.xml

@@ -175,6 +175,13 @@
   <string name="step_1">‮واحدة</string>
   <!--This is a numeral indicating the second step in a series of screens-->
   <string name="step_2">2</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
   <!--Introductions-->
   <string name="introduction_onboarding_title">قم بتقديم جهات إتصالك</string>
   <string name="introduction_onboarding_text">يمكنك أن تقدم جهات إتصالك لبعضها البعض، فلا يحتاجون للمقابلة الشخصية ليتواصلوا عبر Briar (براير).</string>

briar-android/src/main/res/values-az/strings.xml

@@ -118,7 +118,9 @@
   <string name="message_hint">Mesaj yazın</string>
   <string name="image_caption_hint">Mövzu əlavə edin (isteyə bağlı)</string>
   <string name="image_attach">Şəkil əlavə edin</string>
-  <string name="image_attach_error">Şəkil əlavə edilmədi</string>
+  <string name="image_attach_error">Şəkil (lər) əlavə etmək alınmadı</string>
+  <string name="image_attach_error_too_big">Şəkilin həcmi böyükdür. Limit %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Şəkil formatı dəstəklənmir: %s</string>
   <string name="set_contact_alias">Kontakt adı dəyişdirin</string>
   <string name="set_contact_alias_hint">Əlaqə adı</string>
   <string name="set_alias_button">Dəyiş</string>
@@ -138,6 +140,7 @@
   <string name="dialog_title_image_support">İndi bu kontakta şəkilləri göndərə bilərsiniz</string>
   <string name="dialog_message_image_support">Şəkilləri əlavə etmək üçün bu simvola toxunun.</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Yaxında kontakt əlavə etmək</string>
   <string name="face_to_face">Kontakta əlavə etmək istədiyiniz şəxslə tanış olmalısınız. Bu, hər kəsin kimliyinizi və ya mesajlarınızı gələcəkdə oxumasını maneə törədir.</string>
   <string name="continue_button">Davam et</string>
   <string name="try_again_button">Yenidən cəhd elə</string>
@@ -155,12 +158,56 @@
   <string name="connection_error_explanation">Həmin Wi-Fi şəbəkəsinə qoşulduğunuzu yoxlayın.</string>
   <string name="connection_error_feedback">Bu problem davam edərsə, tətbiqin təkmilləşdirilməsinə kömək etmək üçün rəy göndərin.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Məsafədə kontakt əlavə etmək </string>
+  <string name="add_contact_nearby_title">Yaxında kontakt əlavə etmək </string>
+  <string name="add_contact_remotely_title">Məsafədə kontakt əlavə etmək </string>
+  <string name="contact_name_hint">Niklə kontakt saxlayın</string>
+  <string name="contact_link_intro">Kontaktın linkini buraya daxil edin</string>
+  <string name="contact_link_hint">Kontaktın linki</string>
+  <string name="paste_button">Yapışdır</string>
+  <string name="add_contact_button">Kontankt əlavə et</string>
   <string name="copy_button">Kopyala</string>
   <string name="share_button">Paylaş</string>
+  <string name="send_link_title">Link mübadiləsi</string>
+  <string name="add_contact_choose_nickname">Ad seç</string>
+  <string name="add_contact_choose_a_nickname">Ad daxil et</string>
+  <string name="nickname_intro">Niklə kontakt saxlayın. Bunu ancaq siz görəcəksiniz. </string>
+  <string name="your_link">Əlavə etmək istədiyiniz kontakt üçün bu linki verin</string>
+  <string name="link_clip_label">Briar link</string>
+  <string name="link_copied_toast">Link kopyalandı</string>
+  <string name="adding_contact_error">Kontaktı əlavə edərkən səhv baş verdi.</string>
+  <string name="pending_contact_requests_snackbar">Gözləyən kontakt sorğuları var. </string>
+  <string name="pending_contact_requests">Kənara qoyulmuş kontak sorğuları</string>
+  <string name="no_pending_contacts">Gözləyən kontakt yoxdur</string>
   <string name="add_contact_remote_connecting">Qoşulur...</string>
+  <string name="waiting_for_contact_to_come_online">Kontaktı xəttdə gözləyin ...</string>
   <string name="connecting">Qoşulur...</string>
+  <string name="adding_contact">Kontaktın əlavə etməsi... </string>
+  <string name="adding_contact_failed">Kontakt əlavə etməsi alınmadı</string>
+  <string name="dialog_title_remove_pending_contact">Silməyi təstiqlə</string>
+  <string name="dialog_message_remove_pending_contact">Bu kontakt hələ də əlavə olunur. İndi onu çıxararsanız, əlavə olunmayacaq.</string>
+  <string name="own_link_error">Kontaktınızın linkini daxil edin, özünüzü deyil</string>
+  <string name="nickname_missing">Zəhmət olmasa adı daxil edin</string>
+  <string name="invalid_link">Səhv link</string>
+  <string name="unsupported_link">Bu link Briar-ın daha yeni versiyasından gəlir. Ən son versiyaya keçin və yenidən cəhd edin.</string>
+  <string name="intent_own_link">Öz linkini açdın. Əlavə etmək istədiyiniz kontaktlardan birini istifadə edin!</string>
+  <string name="missing_link">Zəhmət olmasa linki daxil edin</string>
   <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <string name="offline_state">İnternet bağlantısı yoxdur</string>
+  <string name="duplicate_link_dialog_title">Dublikat Link</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Eyni şəxs</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Fərqli şəxs</string>
+  <string name="pending_contact_updated_toast">Gözləyən kontakt yeniləndi</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Kontaktınızı tanıtın</string>
   <string name="introduction_onboarding_text">Kontaktlarınızı bir-birinizə təqdim edə bilərsiniz, lakin Briar-a qoşulmaq üçün şəxsən görüşmək lazım deyil.</string>

briar-android/src/main/res/values-bs/strings.xml

@@ -0,0 +1,501 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--Setup-->
+  <string name="setup_title">Dobrodošli u Briar</string>
+  <string name="setup_name_explanation">Vaše korisničko ime će biti prikazano pored sadržaja posta. Nemožete ga mijenjati nakon kreiranje računa.</string>
+  <string name="setup_next">Dalje</string>
+  <string name="setup_password_intro">Izaberite lozinku</string>
+  <string name="setup_password_explanation">Vaš Briar račun je kriptovan i sačuvan na vašem uređaju, ne na serveru ili oblaku. Ako zaboravite šifru ili deinstalirate Briar, ne postoji način da povratite vaš račun.\n\nIzaberite dugačku lozinku koju je teško pogoditi, kao četiri nasumične riječi ili deset nasumičnih slova, brojeva i simbola.</string>
+  <string name="setup_doze_title">Konekcije u pozadinskom modu</string>
+  <string name="setup_doze_intro">Da bi primao poruke, Briar mora da ostane konektovan u pozadinskom modu.</string>
+  <string name="setup_doze_explanation">Da bi primao poruke, Briar mora da ostane konektovan u pozadinskom modu. Molim vas da isključite optimizacije baterije kako bi Briar ostao konektovan.</string>
+  <string name="setup_doze_button">Dozvolite konekcije</string>
+  <string name="choose_nickname">Izaberite vaše korisničko ime</string>
+  <string name="choose_password">Izaberite vašu lozinku</string>
+  <string name="confirm_password">Potvrdite vašu lozinku</string>
+  <string name="name_too_long">Ime je predugačko</string>
+  <string name="password_too_weak">Lozinka nije dovoljno jaka</string>
+  <string name="passwords_do_not_match">Lozinke se ne poklapaju</string>
+  <string name="create_account_button">Kreirajte korisnički račun</string>
+  <string name="more_info">Više informacija</string>
+  <string name="don_t_ask_again">Ne pitaj ponovo</string>
+  <string name="setup_huawei_text">Molim dotaknite dugme ispod i provjerite da je Briar zaštićen na \"Protected Apps\" listi.</string>
+  <string name="setup_huawei_button">Zaštiti Briar</string>
+  <string name="setup_huawei_help">Ako Briar nije dodat u listu zaštićenih aplikacija - protected apps, neće moći da radi u pozadinskom modu.</string>
+  <string name="warning_dozed">%s nije mogao da se pokrene u pozadinskom modu</string>
+  <!--Login-->
+  <string name="enter_password">Lozinka</string>
+  <string name="try_again">Pogrešna lozinka, probajte ponovo</string>
+  <string name="sign_in_button">Prijavite se</string>
+  <string name="forgotten_password">Zaboravio/la sam lozinku</string>
+  <string name="dialog_title_lost_password">Izgubljena Lozinka</string>
+  <string name="dialog_message_lost_password">Vaš Briar račun je kriptovan i sačuvan na vašem uređaju, ne na serveru ili oblaku, pa nemožemo resetovati vašu lozinku. Želite li da izbrišete račun i počnete iz početka?\n\nPažnja: Vaši identiteti, kontakti i poruke će biti premanentno izgubljene.</string>
+  <string name="startup_failed_notification_title">Brirar nije mogao da se pokrene</string>
+  <string name="startup_failed_notification_text">Dotaknite za više informacija.</string>
+  <string name="startup_failed_activity_title">Briar neuspješno pokretanje</string>
+  <string name="startup_failed_db_error">Iz nekog razloga, Briar baza podataka je nepovratno oštećena. Vaš račun, vaši podaci i svi kontakti su izgubljeni. Nažalost, morate reinstalirati Briar ili podesiti novi račun tako što ćete izabrati  opciju \'ZaboraviIi ste lozinku?\' .</string>
+  <string name="startup_failed_data_too_old_error">Vaš račun je napravljen sa starom verzijom aplikacije i nemože se otvoriti novom verzijom. Morate reinstalirati staru verziju ili podesiti novi račun tako što ćete izabrati opciju  \'ZaboraviIi ste lozinku?\' kod unosa lozinke.</string>
+  <string name="startup_failed_data_too_new_error">Ova verzija aplikacije je stara. Molim vas da aplikaciju ažurirate na posljednju verziju a zatim pokušate ponovo.</string>
+  <string name="startup_failed_service_error">Briar nije mogao da pokrene potreban plugin-dodatak. Reinstaliranje Briara obično riješi problem. Međutim, imajte na umu da ćete izgubiti vaš račun i sve podatke vezane za njega pošto Briar ne koristi centralne servere da sačuva vaše podatke.</string>
+  <string name="expiry_update">Krajnji datum testiranja je pomjeren. Vaš račun će sada isteći za %d dana.</string>
+  <string name="expiry_date_reached">Ovaj softver nije više aktuelan.\nHvala na testiranju!</string>
+  <string name="download_briar">Da bi nastavili koristiti Briar, molimo preuzmite verziju 1.0</string>
+  <string name="create_new_account">Morate kreirati novi račun, ali možete koristiti isto korisničko ime.</string>
+  <string name="download_briar_button">Preuzmite Briar 1.0</string>
+  <string name="startup_open_database">Dekriptujem bazu...</string>
+  <string name="startup_migrate_database">Ažuriram bazu...</string>
+  <string name="startup_compact_database">Baza se kompaktuje...</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">Otvori navigacionu ladicu</string>
+  <string name="nav_drawer_close_description">Zatvori navigacionu ladicu</string>
+  <string name="contact_list_button">Kontakti</string>
+  <string name="groups_button">Privatne Grupe</string>
+  <string name="forums_button">Forumi</string>
+  <string name="blogs_button">Blogovi</string>
+  <!--This is part of the main menu. The app will be locked when this is tapped.-->
+  <string name="lock_button">Zaključaj aplikaciju</string>
+  <string name="settings_button">Podešavanja</string>
+  <string name="sign_out_button">Odjava</string>
+  <!--Transports-->
+  <string name="transport_tor">Internet</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">Wi-Fi</string>
+  <!--Notifications-->
+  <string name="reminder_notification_title">Odjavljeni ste iz Briara</string>
+  <string name="reminder_notification_text">Dotaknite da se prijavite nazad.</string>
+  <string name="reminder_notification_channel_title">Briarov podsjetnik za prijavu</string>
+  <string name="reminder_notification_dismiss">Obustavi</string>
+  <string name="ongoing_notification_title">Prijavljeni ste u Briar</string>
+  <string name="ongoing_notification_text">Dodirnite da otvorite Briar.</string>
+  <!--Misc-->
+  <string name="now">sada</string>
+  <string name="show">Prikaži</string>
+  <string name="hide">Sakrij</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Odustani</string>
+  <string name="got_it">Jasno</string>
+  <string name="delete">Obriši</string>
+  <string name="accept">Prihvati</string>
+  <string name="decline">Odbij</string>
+  <string name="options">Opcije</string>
+  <string name="online">Online</string>
+  <string name="offline">Offline</string>
+  <string name="send">Pošalji</string>
+  <string name="allow">Dozvoli</string>
+  <string name="open">Otvori</string>
+  <string name="no_data">Nema podataka</string>
+  <string name="ellipsis">...</string>
+  <string name="text_too_long">Tekst koji ste unijeli je predugačak</string>
+  <string name="show_onboarding">Otvori dijalog za Pomoć</string>
+  <string name="fix">Popravi</string>
+  <string name="help">Pomoć</string>
+  <string name="sorry">Izvini</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Nema kontakata za prikazivanje</string>
+  <string name="no_contacts_action">Taknite + ikonu da dodate kontakt</string>
+  <string name="date_no_private_messages">Nema poruka.</string>
+  <string name="no_private_messages">Nema poruka za prikazivanje</string>
+  <string name="message_hint">Ukucajte poruku</string>
+  <string name="image_caption_hint">Dodaj naslov (opciono)</string>
+  <string name="image_attach">Priloži fotografiju</string>
+  <string name="image_attach_error">Nije moguće priložiti fotografiju/e</string>
+  <string name="image_attach_error_too_big">Fotografija je prevelika. Limit je %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Fromat fotografije nije podržan: %s</string>
+  <string name="set_contact_alias">Promijeni ime kontakta</string>
+  <string name="set_contact_alias_hint">Ime kontakta</string>
+  <string name="set_alias_button">Promijeni</string>
+  <string name="delete_contact">Izbrišite kontakt</string>
+  <string name="dialog_title_delete_contact">Potvrdite brisanje kontakta</string>
+  <string name="dialog_message_delete_contact">Jeste li sigurni da želite da uklonite ovaj kontakt i sve poruke koje ste razmijenili?</string>
+  <string name="contact_deleted_toast">Kontakt je izbrisan</string>
+  <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
+  <string name="you">Vi</string>
+  <string name="save_image">Sačuvaj fotografiju</string>
+  <string name="dialog_title_save_image">Želite li sačuvati fotografiju?</string>
+  <string name="dialog_message_save_image">Čuvanje ove fotografije će omogućiti drugim aplikacijama da joj pristupe.\n\nJeste li sigurni da želite da je sačuvate?</string>
+  <string name="save_image_success">Fotografija je sačuvana</string>
+  <string name="save_image_error">Nije moguće sačuvati fotografiju</string>
+  <string name="dialog_title_no_image_support">Slike nisu dostupne</string>
+  <string name="dialog_message_no_image_support">Briar ne podržava prložene fotografije. Nakon nadogradnje vidjet ćete drugu ikonu.</string>
+  <string name="dialog_title_image_support">Sada možete slati fotografije ovom kontaktu</string>
+  <string name="dialog_message_image_support">Dodirni ovu ikonu da priložiš fotografije</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">Dodaj kontakt u blizini vas</string>
+  <string name="face_to_face">Morate se sresti sa osobom koju želite da dodate kao kontakt.\n\nOvo će spriječiti bilo koga da se predstavi kao vi ili da ubuduće čita poruke.</string>
+  <string name="continue_button">Nastavi</string>
+  <string name="try_again_button">Probajte ponovo</string>
+  <string name="waiting_for_contact_to_scan">Čekam da kontakt skenira i poveže se\u2026</string>
+  <string name="exchanging_contact_details">Razmjenjujem detalje o kontaktu\u2026</string>
+  <string name="contact_added_toast">Dodani kontakt: %s</string>
+  <string name="contact_already_exists">Kontakt %s već postoji</string>
+  <string name="qr_code_invalid">QR kod nije validan</string>
+  <string name="qr_code_too_old">Skenirani QR kod pripada staroj verziji  %s.\n\nMolimo vas da zatražite od vašeg kontakta da ažurira aplikaciju na posljednjiu verziju, a zatim pokušajte ponovo</string>
+  <string name="qr_code_too_new">QR kod koji skenirate pripada novijoj verziji  %s.\n\nMolimo vas nadogradite aplikaciju na posljednju verziju, a zatim pokušajte ponovo.</string>
+  <string name="camera_error">Greska kamere</string>
+  <string name="connecting_to_device">Povezujem se sa uređajem\u2026</string>
+  <string name="authenticating_with_device">Autentikacija sa uređajem\u2026</string>
+  <string name="connection_error_title">Nije moguće povezivanje sa vašim kontaktom</string>
+  <string name="connection_error_explanation">Provjerite jeste li oboje povezani na ist Wi-Fi mrežu.</string>
+  <string name="connection_error_feedback">Ako se problem ponavlja, Molimo vas <a href="feedback">pošaljite povratne informacije</a> kako bi pomogli poboljšanju aplikacije.</string>
+  <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Dodaj udaljeni konktakt</string>
+  <string name="add_contact_nearby_title">Dodaj kontakt koji je u blizini</string>
+  <string name="add_contact_remotely_title">Dodaj udaljeni kontakt</string>
+  <string name="contact_name_hint">Dodjeli kontaktu nadimak</string>
+  <string name="contact_link_intro">Unesite link vašeg kontakta ovdje</string>
+  <string name="contact_link_hint">Kontaktov link</string>
+  <string name="paste_button">Zalepi</string>
+  <string name="add_contact_button">Dodaj kontakt</string>
+  <string name="copy_button">Kopiraj</string>
+  <string name="share_button">Podijeli</string>
+  <string name="send_link_title">Razmjena linkova</string>
+  <string name="add_contact_choose_nickname">Izaberi korisničko ime</string>
+  <string name="add_contact_choose_a_nickname">Unesi korisničko ime</string>
+  <string name="nickname_intro">Dodjeli vašem kontaktu nadimak. Samo vi možete vidjeti dodjeljeni nadimak.</string>
+  <string name="your_link">Dodjeli link kontaktu kojeg želite dodati</string>
+  <string name="link_clip_label">Briar link</string>
+  <string name="link_copied_toast">Link je kopiran</string>
+  <string name="adding_contact_error">Došlo je do greške tokom dodavanja kontakta.</string>
+  <string name="pending_contact_requests_snackbar">Postoje zahtjevi za kontaktima koji čekanju</string>
+  <string name="pending_contact_requests">Zahtjevi za kontaktima na čekanju</string>
+  <string name="no_pending_contacts">Nema Zahtjeva za kontaktima na čekanju</string>
+  <string name="add_contact_remote_connecting">Konektovanje…</string>
+  <string name="waiting_for_contact_to_come_online">Čekanje da kontakt bude online…</string>
+  <string name="connecting">Konektovanje…</string>
+  <string name="adding_contact">Dodavanje kontakta...</string>
+  <string name="adding_contact_failed">Dodavanje kontakta nije uspjelo</string>
+  <string name="dialog_title_remove_pending_contact">Potvrda Uklanjanja</string>
+  <string name="dialog_message_remove_pending_contact">Ovaj se kontakt još dodaje. Ako ga sada uklonite, neće biti dodan.</string>
+  <string name="own_link_error">Unesite link vašeg kontakta, a ne vaš vlastiti link.</string>
+  <string name="nickname_missing">Molim vas unesite korisničko ime</string>
+  <string name="invalid_link">Neispravan link</string>
+  <string name="unsupported_link">Ovaj link dolazi sa nove verzije Briar-a. Molim vas ažurirajte aplikaciju na posljednju verziju, a zatim pokušajte ponovo.</string>
+  <string name="intent_own_link">Otvorili ste vaš vlastiti link. Koristite link od kontakta kojeg želite dodati.</string>
+  <string name="missing_link">Molim vas unesite link</string>
+  <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
+  <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <string name="adding_contact_slow_warning">Dodavanje ovog kontakta traje duže nego obično</string>
+  <string name="adding_contact_slow_title">Nije moguće povezivanje sa kontaktom</string>
+  <string name="adding_contact_slow_text">Dodavanje ovog kontakta traje duže nego obično.\n\nMolim vas provjerite da li je vaš kontakt dobio vaš link i dodao vas:</string>
+  <string name="offline_state">Nema konekcije na internet</string>
+  <string name="duplicate_link_dialog_title">Duliciran Link</string>
+  <string name="duplicate_link_dialog_text_1">Već imate kontakta na čekanju sa ovim linkom: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Da li su %s i %s ista osoba?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Ista osoba</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Različita osoba</string>
+  <string name="duplicate_link_dialog_text_3">%s i %s poslsli su vam isti link.\n\nJedan od njih moguće da pokušava otkriti ko su vaši kontakti.\n\nNemojte im reći da ste primili isti link od druge osobe.</string>
+  <string name="pending_contact_updated_toast">Ažuriranje kontakta je na čekanju</string>
+  <!--Introductions-->
+  <string name="introduction_onboarding_title">Upoznajte vaše kontakte</string>
+  <string name="introduction_onboarding_text">Vi možete da upoznate vaše kontakte međusobno, nije potrebno da se oni sreću licem u lice kako bi se povezali na Briar-u.</string>
+  <string name="introduction_menu_item">Izvršite upoznavanje</string>
+  <string name="introduction_activity_title">Izaberite kontakt</string>
+  <string name="introduction_not_possible">Vi već imate započeto jedno upoznavanje ovim kontaktom. Molimo vas dozvolite da ono prvo završi. Ako ste vi ili vaš kontakt rijetko na vezi, ovo može da potraje.</string>
+  <string name="introduction_message_title">Upoznajte kontakte</string>
+  <string name="introduction_message_hint">Dodajte poruku (opciono)</string>
+  <string name="introduction_button">Izvršite upoznavanje</string>
+  <string name="introduction_sent">Vaše poziv na upoznavanje je poslat</string>
+  <string name="introduction_error">Došlo je do greške pri izvršenju upoznavanja.</string>
+  <string name="introduction_response_error">Greška pri odgovoru na upoznavanje</string>
+  <string name="introduction_request_sent">Tražili ste da se %1$s i %2$s upoznaju.</string>
+  <string name="introduction_request_received">%1$s je tražio da vas upozna sa %2$s. Da li želite da dodate %2$s u vašu listu kontakata?</string>
+  <string name="introduction_request_exists_received">%1$s je tražio da vas upozna sa %2$s, ali %2$s je već u vašoj listi kontakata. Pošto %1$s to možda ne zna, vi i dalje možete da odgovorite: </string>
+  <string name="introduction_request_answered_received">%1$s je tražio da vas upozna sa %2$s.</string>
+  <string name="introduction_response_accepted_sent">Prihvatili ste upoznavanje sa %1$s.</string>
+  <string name="introduction_response_accepted_sent_info">Prije nego što %1$s bude u vašim kontaktima, mora da prihvati i upoznavanje. Ovo može potrajati.</string>
+  <string name="introduction_response_declined_sent">Odbili ste upoznavanje sa %1$s.</string>
+  <string name="introduction_response_accepted_received">%1$s prihvata upoznavanje sa %2$s.</string>
+  <string name="introduction_response_declined_received">%1$s odbija upoznavanje sa %2$s.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s kaže da je %2$s odbio-la upoznavanje.</string>
+  <!--Private Groups-->
+  <string name="groups_list_empty">Nema grupa za prikazivanje</string>
+  <string name="groups_list_empty_action">Dotaknite + ikonu da kreirate grupu, ili pitajte vaše kontakte da podijele grupe sa vama</string>
+  <string name="groups_created_by">Kreator je %s</string>
+  <string name="groups_group_is_empty">Grupa je prazna</string>
+  <string name="groups_group_is_dissolved">Ova grupa je rasformirana</string>
+  <string name="groups_remove">Ukloni</string>
+  <string name="groups_create_group_title">Kreiraj privatnu grupu</string>
+  <string name="groups_create_group_button">Kreiraj grupu</string>
+  <string name="groups_create_group_invitation_button">Pošalji poziv</string>
+  <string name="groups_create_group_hint">Izaberite ime za vašu privatnu grupu</string>
+  <string name="groups_invitation_sent">Grupna pozivnica je poslata</string>
+  <string name="groups_member_list">Lista članova</string>
+  <string name="groups_invite_members">Pošaljite poziv članovima</string>
+  <string name="groups_member_created_you">Vi ste kreirali grupu</string>
+  <string name="groups_member_created">%s je kreator grupe</string>
+  <string name="groups_member_joined_you">Pristupili ste grupi</string>
+  <string name="groups_member_joined">%s je pristupio-la grupi</string>
+  <string name="groups_leave">Napusti grupu</string>
+  <string name="groups_leave_dialog_title">Potvrdite napuštanje grupe</string>
+  <string name="groups_leave_dialog_message">Jeste li sigurni da želite da napustite grupu?</string>
+  <string name="groups_dissolve">Raspustite grupu</string>
+  <string name="groups_dissolve_dialog_title">Potvrdite raspuštanje grupe</string>
+  <string name="groups_dissolve_dialog_message">Jeste li sigurni da želite raspustiti ovu grupu?\n\nSvi ostali članovi neće moći nastaviti konverzaciju i možda neće primiti najnovije poruke.</string>
+  <string name="groups_dissolve_button">Raspusti</string>
+  <string name="groups_dissolved_dialog_title">Grupa je raspuštena</string>
+  <string name="groups_dissolved_dialog_message">Kreator je raspustio ovu grupu.\n\nNe možete više pisati poruke u grupi i možda nećete primiti poljednje poruke koje su napisane.</string>
+  <!--Private Group Invitations-->
+  <string name="groups_invitations_title">Grupni pozivi</string>
+  <string name="groups_invitations_invitation_sent">Pozvali ste %1$s da se pridruži grupi \"%2$s\".</string>
+  <string name="groups_invitations_invitation_received">%1$s je poslao-la poziv da pristupite grupi \"%2$s\".</string>
+  <string name="groups_invitations_joined">Pristupili ste grupi</string>
+  <string name="groups_invitations_declined">Grupni poziv je odbijen</string>
+  <string name="groups_invitations_response_accepted_sent">Prihvatili ste grupni poziv od %s.</string>
+  <string name="groups_invitations_response_declined_sent">Odbili ste grupni poziv od %s.</string>
+  <string name="groups_invitations_response_accepted_received">%s je prihvatio-la  grupni poziv.</string>
+  <string name="groups_invitations_response_declined_received">1%s je odbio-la grupni poziv.</string>
+  <string name="sharing_status_groups">Samo kreator moze da pozove nove članove u grupu. Ispod su trenutni članovi grupe.</string>
+  <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">Otkrijte kontakte</string>
+  <string name="groups_reveal_dialog_message">Možete odlučiti da otkrijete kontakte svim trenutnim i budućim članovima ove grupe.\n\nOtkrivanje kontakata čini konekciju ka članovima grupe bržom i pouzdanijom, jer možete da komunicirate sa otkrivenim kontaktima čak i kad kreator grupe nije na vezi.</string>
+  <string name="groups_reveal_visible">Veze kontakata su vidljive grupi</string>
+  <string name="groups_reveal_visible_revealed_by_us">Veze kontakata su vidljive grupi (vi ste je otkrili)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">Veze kontakata su vidljive grupi (otkriveno od strane %s)</string>
+  <string name="groups_reveal_invisible">Veze kontakata nisu vidljive grupi</string>
+  <!--Forums-->
+  <string name="no_forums">Nema foruma za prikazivanje</string>
+  <string name="no_forums_action">Dotaknite + ikonu da kreirate forum, ili pitajte vaše kontakte da podijele forume sa vama</string>
+  <string name="create_forum_title">Kreiraj forum</string>
+  <string name="choose_forum_hint">Izaberite ime za vaš forum</string>
+  <string name="create_forum_button">Kreiraj forum</string>
+  <string name="forum_created_toast">Forum je kreiran</string>
+  <string name="no_forum_posts">Nema postova za prikazivanje</string>
+  <string name="no_posts">Nema postova</string>
+  <string name="forum_new_message_hint">Novi post</string>
+  <string name="forum_message_reply_hint">Novi odgovor</string>
+  <string name="btn_reply">Odgovor</string>
+  <string name="forum_leave">Napusti forum</string>
+  <string name="dialog_title_leave_forum">Potvrdite napuštanje foruma</string>
+  <string name="dialog_message_leave_forum">Jeste li sigurni da želite da napustite ovaj forum?\n\nKontakti sa kojima ste podijelili ovaj forum možda prestanu dobijati novosti.</string>
+  <string name="dialog_button_leave">Napusti</string>
+  <string name="forum_left_toast">Napušten forum</string>
+  <!--Forum Sharing-->
+  <string name="forum_share_button">Podijeli forum</string>
+  <string name="contacts_selected">Kontakti selektovani</string>
+  <string name="activity_share_toolbar_header">Izaberite kontakte</string>
+  <string name="no_contacts_selector">Nema kontakata za prikazivanje</string>
+  <string name="no_contacts_selector_action">Molimo vas vratite se ovdje nakon dodavanja kontakta</string>
+  <string name="forum_shared_snackbar">Forum je podijeljen sa selektovanim kontaktima</string>
+  <string name="forum_share_message">Dodajte poruku (opciono)</string>
+  <string name="forum_share_error">Došlo je do greške prilikom dijeljenja ovog foruma.</string>
+  <string name="forum_invitation_received">%1$s je podijelio-la forum \"%2$s\" sa vama.</string>
+  <string name="forum_invitation_sent">Podijelili ste forum \"%1$s\" sa %2$s.</string>
+  <string name="forum_invitations_title">Pozivnice za forum</string>
+  <string name="forum_invitation_exists">Već ste prihvatili poziv u ovaj forum.\n\nPrihvatanje dodatnih poziva će učiniti vašu vezu sa forumom bržom i pouzdanijom.</string>
+  <string name="forum_joined_toast">Forumu ste pristupili</string>
+  <string name="forum_declined_toast">Poziv odbijen</string>
+  <string name="shared_by_format">Podijelio-la %s</string>
+  <string name="forum_invitation_already_sharing">Već se dijeli</string>
+  <string name="forum_invitation_response_accepted_sent">Prihvatili ste poziv u forum od %s.</string>
+  <string name="forum_invitation_response_declined_sent">Odbili ste poziv u forum od  %s.</string>
+  <string name="forum_invitation_response_accepted_received">1%s prihvata vaš poziv u forum.</string>
+  <string name="forum_invitation_response_declined_received">%s odbija vaš poziv u forum.</string>
+  <string name="sharing_status">Status dijeljenja</string>
+  <string name="sharing_status_forum">Bilo koji član foruma može forum podijeliti sa svojim kontaktima. Vi dijelite forum sa slijedećim kontaktima. Moguće je da ima drugih članova koje ne vidite.</string>
+  <string name="shared_with">Pdijeljeno sa %1$d (%2$d na vezi)</string>
+  <string name="nobody">Niko</string>
+  <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">Nema postova za prikazivanje</string>
+  <string name="read_more">pročitaj više</string>
+  <string name="blogs_write_blog_post">Napiši Blog Post</string>
+  <string name="blogs_write_blog_post_body_hint">Ukucajte vaš blog post</string>
+  <string name="blogs_publish_blog_post">Objavi</string>
+  <string name="blogs_blog_post_created">Blog post je kreiran</string>
+  <string name="blogs_blog_post_received">Primljen je novi blog post</string>
+  <string name="blogs_blog_post_scroll_to">Skroluj do</string>
+  <string name="blogs_feed_empty_state">Nema postova za prikazivanje</string>
+  <string name="blogs_feed_empty_state_action">Postovi od vaših kontakata i blogova na koje se prijavite će se prikazivati ovdje.\n\nDotaknite ikonu olovke da napišete post</string>
+  <string name="blogs_remove_blog">Ukloni blog</string>
+  <string name="blogs_remove_blog_dialog_message">Jeste li sigurni da želite da uklonite blog?\n\nPostovi će biti uklonjeni sa vašeg uređaja ali ne is uređaja drugih ljudi.\n\nKontakti kojima ste podijelili ovaj blog će možda prestati da dobijaju novosti.</string>
+  <string name="blogs_remove_blog_ok">Ukloni</string>
+  <string name="blogs_blog_removed">Blog je uklonjen</string>
+  <string name="blogs_reblog_comment_hint">Dodajte komentar (opciono)</string>
+  <string name="blogs_reblog_button">Rebloguj</string>
+  <!--Blog Sharing-->
+  <string name="blogs_sharing_share">Podijeli blog</string>
+  <string name="blogs_sharing_error">Došlo je do greške pri podjeli bloga.</string>
+  <string name="blogs_sharing_button">Podijeli blog</string>
+  <string name="blogs_sharing_snackbar">Blog je podijeljen sa izabranim kontaktima</string>
+  <string name="blogs_sharing_response_accepted_sent">Prihvatili ste blog pozivnicu od %s.</string>
+  <string name="blogs_sharing_response_declined_sent">Odbili ste blog pozivnicu od %s.</string>
+  <string name="blogs_sharing_response_accepted_received">%s je prihvatio-la blog pozivnicu.</string>
+  <string name="blogs_sharing_response_declined_received">%s je odbio-la blog pozivnicu.</string>
+  <string name="blogs_sharing_invitation_received">%1$s je podijelio-la blog \"%2$s\" sa vama.</string>
+  <string name="blogs_sharing_invitation_sent">Podijelili ste blog \"%1$s\" sa %2$s.</string>
+  <string name="blogs_sharing_invitations_title">Blog Pozivnice</string>
+  <string name="blogs_sharing_joined_toast">Prijavljeni ste na blog</string>
+  <string name="blogs_sharing_declined_toast">Poziv odbijen</string>
+  <string name="sharing_status_blog">Bilo ko, ko se prijavi za ovaj blog, može blog da podijeli sa svojim kontaktima. Vi dijelite blog sa slijedećim kontaktima. Moguće je da ima još potpisnika koje nemožete da vidite.</string>
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import">Uvezi RSS kanal</string>
+  <string name="blogs_rss_feeds_import_button">Uvezi</string>
+  <string name="blogs_rss_feeds_import_hint">Unesi URL od RSS kanala</string>
+  <string name="blogs_rss_feeds_import_error">Žao nam je! Došlo je do greške pri unosu vašeg kanala.</string>
+  <string name="blogs_rss_feeds_manage">Upravljanje RSS kanalima</string>
+  <string name="blogs_rss_feeds_manage_imported">Uvezeno:</string>
+  <string name="blogs_rss_feeds_manage_author">Autor:</string>
+  <string name="blogs_rss_feeds_manage_updated">Zadnje ažuriranje:</string>
+  <string name="blogs_rss_remove_feed">Uklonite kanal</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Jeste li sigurni da želite da uklonite kanal?\n\nPostovi će biti uklonjeni sa vašeg uređaja ali ne is uređaja drugih ljudi.\n\nKontakti kojima ste podijelili ovaj blog će možda prestati da dobijaju novosti.</string>
+  <string name="blogs_rss_remove_feed_ok">Ukloni</string>
+  <string name="blogs_rss_feeds_manage_delete_error">Kanal nije bilo moguće ukloniti!</string>
+  <string name="blogs_rss_feeds_manage_empty_state">Nema RSS kanala za prikazivanje\n\nDotaknite + ikonu da uvezete kanal</string>
+  <string name="blogs_rss_feeds_manage_error">Došlo je do problema pri učitavanju vaših kanala. Probajte opet kasnije.</string>
+  <!--Settings Display-->
+  <string name="pref_language_title">Jezik i regija</string>
+  <string name="pref_language_changed">Ovo podešavanje će stupiti na snagu kada restartujete Briar. Molim vas da se odjavite i restartujete Briar.</string>
+  <string name="pref_language_default">Podrazumjevane postavke sistema</string>
+  <string name="display_settings_title">Ekran</string>
+  <string name="pref_theme_title">Tema</string>
+  <string name="pref_theme_light">Svijetlost</string>
+  <string name="pref_theme_dark">Tamna</string>
+  <string name="pref_theme_auto">Automatski (Dnevno)</string>
+  <string name="pref_theme_system">Podrazumjevane postavke sistema</string>
+  <!--Settings Network-->
+  <string name="network_settings_title">Mreže</string>
+  <string name="bluetooth_setting">Povežite se preko Bluetooth-a</string>
+  <string name="bluetooth_setting_enabled">Kad god su kontakti blizu</string>
+  <string name="bluetooth_setting_disabled">Samo pri dodavanju kontakata</string>
+  <string name="tor_network_setting">Konektuj se preko Interneta (Tor)</string>
+  <string name="tor_network_setting_automatic">Automatski prema na lokaciji</string>
+  <string name="tor_network_setting_without_bridges">Koristi Tor bez mostova</string>
+  <string name="tor_network_setting_with_bridges">Koristi Tor sa mostovima</string>
+  <string name="tor_network_setting_never">Ne konektuj se</string>
+  <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
+  <string name="tor_network_setting_summary">Automatski: %1$s (za %2$s)</string>
+  <string name="tor_mobile_data_title">Koristi mobilinu mrežu</string>
+  <string name="tor_only_when_charging_title">Konektuj se preko Interneta (Tor) samo tokom punjenja uređaja</string>
+  <string name="tor_only_when_charging_summary">Onemogući interent konekciju kada se uređaj napaja samo sa baterijie</string>
+  <!--Settings Security and Panic-->
+  <string name="security_settings_title">Sigurnost</string>
+  <string name="pref_lock_title">Zaključavanje applikacije</string>
+  <string name="pref_lock_summary">Koristi zaključavanje ekrana uređaja da bi zaštitili Briar dok ste prijavljeni</string>
+  <string name="pref_lock_disabled_summary">Da bi koristili ovu mogućnost, podesite zaključavanje ekrana za vašem uređaju</string>
+  <string name="pref_lock_timeout_title">Zaključavanje aplikacije zbog neaktivnosti</string>
+  <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
+  <string name="pref_lock_timeout_summary">Kada se ne koristi Briar, automatski zaključaj poslije %s</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_1">1 minute</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_5">5 minuta</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_15">15 minuta</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_30">30 minuta</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_60">1 sata</string>
+  <string name="pref_lock_timeout_never">Nikad</string>
+  <string name="pref_lock_timeout_never_summary">Ne zaključavaj Briar automatski</string>
+  <string name="change_password">Promijeni lozinku</string>
+  <string name="current_password">Trenutna lozinka</string>
+  <string name="choose_new_password">Nova lozinka</string>
+  <string name="confirm_new_password">Potvrdi novu lozinku</string>
+  <string name="password_changed">Lozinka je promijenjena</string>
+  <string name="panic_setting">Podešavanje Panik dugmeta</string>
+  <string name="panic_setting_title">Panik dugme</string>
+  <string name="panic_setting_hint">Podesite kako Briar reaguje kad koristite Panik dugme app</string>
+  <string name="panic_app_setting_title">Panik Dugne App</string>
+  <string name="unknown_app">nepoznata aplikacija</string>
+  <string name="panic_app_setting_summary">Nema postavljene aplikacije</string>
+  <string name="panic_app_setting_none">Ništa</string>
+  <string name="dialog_title_connect_panic_app">Potvrdi Panic App</string>
+  <string name="dialog_message_connect_panic_app">Jeste li sigurni da želite da dozvolite %1$s da pokrene destruktivne akcije panik dugmeta?</string>
+  <string name="panic_setting_destructive_action">Destruktivne akcije</string>
+  <string name="panic_setting_signout_title">Odjava</string>
+  <string name="panic_setting_signout_summary">Izloguj se iz Briar-a ako je pritisnuto panik dugme</string>
+  <string name="purge_setting_title">Izbriši račun</string>
+  <string name="purge_setting_summary">Izbriši Briar račun ako je panik dugme pritisnuto. Pažnja: Ovo će trajno izbrisati vaše identitete, kontakte i poruke</string>
+  <string name="uninstall_setting_title">Deinstaliraj Briar</string>
+  <string name="uninstall_setting_summary">Ovo zahtijeva ručnu potvrdu u slučaju panike</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">Obavještenja</string>
+  <string name="notify_sign_in_title">Podsjeti me da se prijavim</string>
+  <string name="notify_sign_in_summary">Prikazi podsjetnik kada se telefon uključi ili kada se aplikacija ažurira</string>
+  <string name="notify_private_messages_setting_title">Privatne poruke</string>
+  <string name="notify_private_messages_setting_summary">Prikaži upozorenja za privatne poruke</string>
+  <string name="notify_private_messages_setting_summary_26">Podesite upozorenja za privatne poruke</string>
+  <string name="notify_group_messages_setting_title">Grupne poruke</string>
+  <string name="notify_group_messages_setting_summary">Prikaži upozorenja za grupne poruke</string>
+  <string name="notify_group_messages_setting_summary_26">Podesite upozorenja za grupne poruke</string>
+  <string name="notify_forum_posts_setting_title">Forum postovi</string>
+  <string name="notify_forum_posts_setting_summary">Prikaži upozorenja za forum postove</string>
+  <string name="notify_forum_posts_setting_summary_26">Podesite upozorenja za forum postove</string>
+  <string name="notify_blog_posts_setting_title">Blog postovi</string>
+  <string name="notify_blog_posts_setting_summary">Prikaži upozorenja na blog postove</string>
+  <string name="notify_blog_posts_setting_summary_26">Podesite upozorenja za blog postove</string>
+  <string name="notify_vibration_setting">Vibriranje</string>
+  <string name="notify_sound_setting">Zvuk</string>
+  <string name="notify_sound_setting_default">Podrazumijevana melodija</string>
+  <string name="notify_sound_setting_disabled">Ništa</string>
+  <string name="choose_ringtone_title">Izaberi melodiju</string>
+  <string name="cannot_load_ringtone">Ne mogu otvoriti melodiju</string>
+  <!--Settings Feedback-->
+  <string name="feedback_settings_title">Povratne informacije</string>
+  <string name="send_feedback">Šalji povratne informacije</string>
+  <!--Link Warning-->
+  <string name="link_warning_title">Link upozorenja</string>
+  <string name="link_warning_intro">Upravo ćete otvoriti slijedeći link sa eksternom aplikacijom</string>
+  <string name="link_warning_text">Ovo se može koristiti da se otkrije vaš identitet. Razmislite o tome vjerujete li osobi koja vam je poslala ovaj link i razmislite o otvaranju s Tor Browser-om.</string>
+  <string name="link_warning_open_link">Otvori link</string>
+  <!--Crash Reporter-->
+  <string name="crash_report_title">Briar izvještaj o rušenju aplikacije</string>
+  <string name="briar_crashed">Izvinite, Briar aplikacija se srušila.</string>
+  <string name="not_your_fault">Greška nije do vas.</string>
+  <string name="please_send_report">Molimo pomozite nam da napravimo bolji Briar tako što ćete nam poslati izvještaj o rušenju aplikacije.</string>
+  <string name="report_is_encrypted">Obećavamo da je izvještaj kriptovan i sigurno poslat.</string>
+  <string name="feedback_title">Povratne informacije</string>
+  <string name="describe_crash">Opišite šta se desilo (opciono)</string>
+  <string name="enter_feedback">Unesite vašu povratnu informaciju</string>
+  <string name="optional_contact_email">Vaša email adresa (opciono)</string>
+  <string name="include_debug_report_crash">Uključite anonimne podatke o rušenju</string>
+  <string name="include_debug_report_feedback">Uključite anonimne podatke o ovom uređaju</string>
+  <string name="could_not_load_report_data">Nije bilo moguće učitati podatke izvještaja</string>
+  <string name="send_report">Pošalji izvještaj</string>
+  <string name="close">Zatvori</string>
+  <string name="dev_report_saved">Izvještaj je sačuvan. Biće poslat slijedeći put kada se ulogujete u Briar.</string>
+  <!--Sign Out-->
+  <string name="progress_title_logout">Odjavite se iz Briara...</string>
+  <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">Detektovano je prekrivanje ekrana</string>
+  <string name="screen_filter_body">Druga aplikacija precrtava preko Briara. Da bi vas zaštitio, Briar neće reagovati na dodir dok druga aplikacija precrtava preko ekrana.\n\nSlijedeće aplikacije mogu precrtavati preko:\n\n%1$s</string>
+  <string name="screen_filter_allow">Dozvoli ovim aplikacijama da precrtavaju ekran</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Dozvole kamere</string>
+  <string name="permission_camera_request_body">Da bi skenirao QR kod, Briaru je potreban pristup kameri.</string>
+  <string name="permission_location_title">Dozvole lokacije</string>
+  <string name="permission_location_request_body">Da bi otkrio Bluetooth uređaj, Brair treba douzvolu za pristup vašoj lokaciji.\n\nBriar neće snimati vašu lokaciju ili je dijeliti sa bilo kime.</string>
+  <string name="permission_camera_location_title">Kamera i locationkacija</string>
+  <string name="permission_camera_location_request_body">Da bi skenirao QR kod, Briar treba pristup vašoj kameri.\n\nDa bi otkrio Bluetooth uređaj, Brair treba douzvolu za pristup vašoj lokaciji.\n\nBriar neće snimati vašu lokaciju ili je dijeliti sa bilo kime.</string>
+  <string name="permission_camera_denied_body">Uskratili ste pristup kameri, ali dodavanje kontakata zahtijeva pristup kameri.\n\nMolim vas da uzmete u obzir odobravanja pristupa.</string>
+  <string name="qr_code">QR kod</string>
+  <string name="show_qr_code_fullscreen">Prikazi QR kod na puni ekran</string>
+  <!--App Locking-->
+  <string name="lock_unlock">Otključaj Briar</string>
+  <string name="lock_unlock_verbose">Unesite PIN uređaja, figuru ili lozinku</string>
+  <string name="lock_unlock_fingerprint_description">Dodirnite senzor otiska sa registrovanim prstom da bi nastavili</string>
+  <string name="lock_unlock_password">Koristi lozinku</string>
+  <string name="lock_is_locked">Briar je zaključan</string>
+  <string name="lock_tap_to_unlock">Dotakni da otključaš</string>
+  <!--Screenshots-->
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_alice">Fata</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_bob">Mujo</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_carol">Suljo</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
+  <string name="screenshot_message_1">Zdravo Mujo!</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
+  <string name="screenshot_message_2">Zdravo Fato! Hvala što mi govoriš o Briar-u!</string>
+  <!--This is a message to be used in screenshots.-->
+  <string name="screenshot_message_3">Nema problema, nadam se da ti se sviđa 😀</string>
+</resources>

briar-android/src/main/res/values-ca/strings.xml

@@ -48,7 +48,7 @@
   <string name="download_briar_button">Descarrega Briar 1.0</string>
   <string name="startup_open_database">S\'està desxifrant la base de dades...</string>
   <string name="startup_migrate_database">S\'està actualitzant la base de dades...</string>
-  <string name="startup_compact_database">Compactant la base de dades...</string>
+  <string name="startup_compact_database">S\'està compactant la base de dades...</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Obre el calaix de navegació</string>
   <string name="nav_drawer_close_description">Tanca el calaix de navegació</string>
@@ -116,9 +116,11 @@
   <string name="date_no_private_messages">Sense missatges.</string>
   <string name="no_private_messages">No hi ha cap missatge</string>
   <string name="message_hint">Escriviu un missatge</string>
-  <string name="image_caption_hint">Afegeix una captura (opcional)</string>
+  <string name="image_caption_hint">Afegiu una nota (opcional)</string>
   <string name="image_attach">Afegeix una imatge</string>
-  <string name="image_attach_error">La imatge no s\'ha pogut afegir </string>
+  <string name="image_attach_error">La imatge(s) no s\'ha pogut afegir </string>
+  <string name="image_attach_error_too_big">La imatge és massa gran. El límit és %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">El format de la imatge no s\'admet: %s</string>
   <string name="set_contact_alias">Canvia el nom del contacte</string>
   <string name="set_contact_alias_hint">Nom del contacte</string>
   <string name="set_alias_button">Canvia</string>
@@ -127,18 +129,19 @@
   <string name="dialog_message_delete_contact">Segur que voleu suprimir aquest contacte i tots els missatges que us heu intercanviat?</string>
   <string name="contact_deleted_toast">S\'ha suprimit el contacte</string>
   <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
-  <string name="you">Vos</string>
-  <string name="save_image">Desa imatge</string>
+  <string name="you">Vós</string>
+  <string name="save_image">Desa la imatge</string>
   <string name="dialog_title_save_image">Voleu desar la imatge?</string>
-  <string name="dialog_message_save_image">Desant aquesta imatge es permetrà a altres aplicacions accedir-hi.\n\nConfirmeu que la voleu desar?</string>
+  <string name="dialog_message_save_image">Si deseu aquesta imatge la resta d\'aplicacions també hi podran accedir.\n\nSegur que voleu desar-la?</string>
   <string name="save_image_success">La imatge s\'ha desat</string>
   <string name="save_image_error">La imatge no s\'ha pogut desar </string>
-  <string name="dialog_title_no_image_support">Cap imatge disponible</string>
-  <string name="dialog_message_no_image_support">El vostre contacte de Briar encara no admet afegir imatges.
-Un cop s\'actualitzi ja li veureu una icona diferent </string>
-  <string name="dialog_title_image_support">Ara podeu enviar imatges a aquest contacte</string>
+  <string name="dialog_title_no_image_support">No hi ha cap imatge disponible</string>
+  <string name="dialog_message_no_image_support">La versió de Briar del vostre contacte no permet afegir imatges.
+Així que l\'actualitzi li veureu una icona diferent .</string>
+  <string name="dialog_title_image_support">Ara ja podeu enviar imatges a aquest contacte</string>
   <string name="dialog_message_image_support">Premeu aquesta icona per afegir imatges.</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Afegeix un contacte proper</string>
   <string name="face_to_face">Heu de coincidir en el mateix lloc amb la persona que voleu afegir com a contacte.\n\nD\'aquesta manera evitareu que algú suplanti les vostres identitats o pugui llegir els vostres missatges en el futur.</string>
   <string name="continue_button">Continua</string>
   <string name="try_again_button">Torna-ho a provar</string>
@@ -147,8 +150,8 @@ Un cop s\'actualitzi ja li veureu una icona diferent </string>
   <string name="contact_added_toast">S\'ha afegit el contacte %s</string>
   <string name="contact_already_exists">El contacte %s ja existia</string>
   <string name="qr_code_invalid">El codi QR és invàlid</string>
-  <string name="qr_code_too_old">El codi QR que heu escanejat prové d\'una versió antiga de %s.\n\nDemaneu al vostre contacte que actualitzi a l\'última versió i torneu a provar-ho.</string>
-  <string name="qr_code_too_new">El codi QR que heu escanejat prové d\'una versió nova de %s.\n\nActualitzeu a l\'última versió i torneu a provar-ho.</string>
+  <string name="qr_code_too_old">El codi QR que heu escanejat prové d\'una versió antiga de %s.\n\nDemaneu al vostre contacte que l\'actualitzi i torneu a provar-ho.</string>
+  <string name="qr_code_too_new">El codi QR que heu escanejat prové d\'una versió de %s més nova que la vostra.\n\nActualitzeu la vostra aplicació i torneu a provar-ho.</string>
   <string name="camera_error">Error de la càmera</string>
   <string name="connecting_to_device">Connectant-se al dispositiu\u2026</string>
   <string name="authenticating_with_device">Autenticant-se amb el dispositiu\u2026</string>
@@ -156,14 +159,66 @@ Un cop s\'actualitzi ja li veureu una icona diferent </string>
   <string name="connection_error_explanation">Comproveu que esteu connectats a la mateixa xarxa Wi-Fi.</string>
   <string name="connection_error_feedback">Si aquest problema persisteix, <a href="feedback">envieu-nos un comentari</a> per ajudar-nos a millorar l\'aplicació.</string>
   <!--Adding Contacts Remotely-->
-  <string name="paste_button">Pegar</string>
+  <string name="add_contact_remotely_title_case">Afegeix un contacte llunyà</string>
+  <string name="add_contact_nearby_title">Afegeix un contacte proper</string>
+  <string name="add_contact_remotely_title">Afegeix un contacte llunyà</string>
+  <string name="contact_name_hint">Doneu un sobrenom al contacte</string>
+  <string name="contact_link_intro">Escriviu l\'enllaç del vostre contacte</string>
+  <string name="contact_link_hint">Enllaç del contacte</string>
+  <string name="paste_button">Enganxa</string>
+  <string name="add_contact_button">Afegiu un contacte</string>
   <string name="copy_button">Copia</string>
-  <string name="share_button">Compartir</string>
+  <string name="share_button">Comparteix</string>
+  <string name="send_link_title">Intercanvieu els enllaços</string>
+  <string name="add_contact_choose_nickname">Trieu un sobrenom</string>
+  <string name="add_contact_choose_a_nickname">Escriviu un sobrenom</string>
+  <string name="nickname_intro">Doneu un sobrenom al contacte. Només vós podreu veure\'l.</string>
+  <string name="your_link">Lliureu aquest enllaç al contacte que voleu afegir</string>
+  <string name="link_clip_label">Enllaç de Briar</string>
+  <string name="link_copied_toast">L\'enllaç s\'ha copiat</string>
+  <string name="adding_contact_error">Hi ha hagut un error en afegir el contacte</string>
+  <string name="pending_contact_requests_snackbar">Hi ha sol·licituds de contacte pendents</string>
+  <string name="pending_contact_requests">Sol·licituds de contacte pendents</string>
+  <string name="no_pending_contacts">No hi ha sol·licituds de contacte pendents</string>
   <string name="add_contact_remote_connecting">S\'està connectant...</string>
+  <string name="waiting_for_contact_to_come_online">S\'està esperant que el contacte estigui connectat…</string>
   <string name="connecting">S\'està connectant...</string>
+  <string name="adding_contact">S\'està afegint el contacte…</string>
+  <string name="adding_contact_failed">No s\'ha pogut afegir el contacte</string>
+  <string name="dialog_title_remove_pending_contact">Confirmació de la supressió</string>
+  <string name="dialog_message_remove_pending_contact">Aquest contacte encara està essent afegit. Si el suprimiu ara ja no s\'acabarà d\'afegir.</string>
+  <string name="own_link_error">Escriviu l\'enllaç del vostre contacte i no el vostre enllaç</string>
+  <string name="nickname_missing">Escriviu un sobrenom</string>
+  <string name="invalid_link">Enllaç erroni</string>
+  <string name="unsupported_link">Aquest enllaç prové d\'una versió de Biar més nova que la vostra.\n\nActualitzeu la vostra aplicació i torneu a provar-ho.</string>
+  <string name="intent_own_link">Heu accedit al vostre propi enllaç. Feu servir el del contacte que voleu afegir!</string>
+  <string name="missing_link">Escriviu un enllaç</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">S\'ha afegit el nou contacte </item>
+    <item quantity="other">S\'han afegit %d nous contactes.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Afegir aquest contacte està trigant més que de costum…</string>
+  <string name="adding_contact_slow_title">No pot connectar-se al contacte</string>
+  <string name="adding_contact_slow_text">Afegir aquest contacte està trigant més que de costum.\n\nComproveu que el contacte ha rebut el vostre enllaç i també us ha afegit.</string>
+  <string name="offline_state">No hi ha connexió a Internet</string>
+  <string name="duplicate_link_dialog_title">Enllaç duplicat</string>
+  <string name="duplicate_link_dialog_text_1">Teniu una sol·licitud de contacte pendent amb l\'enllaç %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%s i %s són la mateixa persona?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Mateixa persona</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Persones diferents</string>
+  <string name="duplicate_link_dialog_text_3">%s i %s us han enviat el mateix enllaç.\n\nUn d\'ells pot estar provant de descobrir quins són els vostres contactes.\n\nNo els hi digueu que heu rebut el mateix enllaç d\'algú altre.</string>
+  <string name="pending_contact_updated_toast">S\'ha actualitzat la sol·licitud de contacte pendent</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presenteu als vostres contactes</string>
   <string name="introduction_onboarding_text">Podeu presentar als vostres contactes entre si, de manera que no necessitin trobar-se en persona per a relacionar-se a través de Briar.</string>
@@ -352,12 +407,12 @@ Un cop s\'actualitzi ja li veureu una icona diferent </string>
   <string name="bluetooth_setting_enabled">Sempre que hi hagi contactes propers</string>
   <string name="bluetooth_setting_disabled">Només quan s\'afegeixen contactes</string>
   <string name="tor_network_setting">Connecta a través d\'Internet (Tor)</string>
-  <string name="tor_network_setting_automatic">Automàtic basat en la ubicació</string>
+  <string name="tor_network_setting_automatic">Automàtic, basat en la posició</string>
   <string name="tor_network_setting_without_bridges">Usa Tor sense ponts</string>
   <string name="tor_network_setting_with_bridges">Usa Tor amb ponts</string>
   <string name="tor_network_setting_never">No et connectis</string>
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
-  <string name="tor_network_setting_summary">Automàtic: %1$s (en %2$s)</string>
+  <string name="tor_network_setting_summary">Automàtic: %1$s (a %2$s)</string>
   <string name="tor_mobile_data_title">Usa dades mòbils</string>
   <string name="tor_only_when_charging_title">Connecta a través d\'Internet (Tor) només quan s\'estigui carregant</string>
   <string name="tor_only_when_charging_summary">Desactiva la connexió a Internet quan el dispositiu estigui funcionant amb la bateria</string>
@@ -366,7 +421,7 @@ Un cop s\'actualitzi ja li veureu una icona diferent </string>
   <string name="pref_lock_title">Bloqueig de l\'aplicació</string>
   <string name="pref_lock_summary">Usa el bloqueig de pantalla del dispositiu per protegir Briar mentre inicieu la sessió</string>
   <string name="pref_lock_disabled_summary">Per utilitzar aquesta funció, configureu el bloqueig de pantalla en el vostre dispositiu</string>
-  <string name="pref_lock_timeout_title">Temps d\'inactivitat per al bloqueig</string>
+  <string name="pref_lock_timeout_title">Temps d\'inactivitat abans de bloquejar-se</string>
   <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
   <string name="pref_lock_timeout_summary">Briar es bloquejarà automàticament després de %s de no usar-se.</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
@@ -430,7 +485,7 @@ Un cop s\'actualitzi ja li veureu una icona diferent </string>
   <!--Link Warning-->
   <string name="link_warning_title">Avís d\'enllaç</string>
   <string name="link_warning_intro">L\'enllaç s\'obrirà amb una aplicació externa.</string>
-  <string name="link_warning_text">Això es podria utilitzar-se per identificar-vos. Penseu si confieu en la persona que us ha enviat aquest enllaç i considereu obrir-lo amb el navegador Tor.</string>
+  <string name="link_warning_text">Això podria usar-se per a identificar-vos. Penseu si us en refieu prou de la persona que us ha enviat l\'enllaç. Avalueu si us convindria obrir-lo amb un navegador que faciliti l\'anonimat com Tor Browser.</string>
   <string name="link_warning_open_link">Obre l\'enllaç</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Informe de fallida de Briar</string>
@@ -457,10 +512,10 @@ Un cop s\'actualitzi ja li veureu una icona diferent </string>
   <!--Permission Requests-->
   <string name="permission_camera_title">Permís de la càmera</string>
   <string name="permission_camera_request_body">Per escanejar el codi QR, Briar necessita accedir a la càmera.</string>
-  <string name="permission_location_title">Permís d\'accés a l\'ubicació</string>
-  <string name="permission_location_request_body">Per trobar dispositius Bluetooth, Briar necessita la vostra ubicació.\n\nBriar no guarda la vostra ubicació ni la comparteix amb ningú.</string>
-  <string name="permission_camera_location_title">Permís d\'accés a la càmera i l\'ubicació</string>
-  <string name="permission_camera_location_request_body">Per escanejar el codi QR, Briar necessita accedir a la càmera.\n\nPer trobar dispositius Bluetooth, Briar necessita la vostra ubicació.\n\nBriar no guarda la vostra ubicació ni la comparteix amb ningú.</string>
+  <string name="permission_location_title">Permís d\'accés a la posició</string>
+  <string name="permission_location_request_body">Per a descobrir dispositius Bluetooth, Briar necessita accedir a la vostra posició.\n\nBriar no guarda la vostra posició ni la comparteix amb ningú.</string>
+  <string name="permission_camera_location_title">Permís d\'accés a la càmera i a la posició</string>
+  <string name="permission_camera_location_request_body">Per escanejar el codi QR, Briar necessita accedir a la càmera.\n\nPer trobar dispositius Bluetooth, Briar necessita accedir a la vostra posició.\n\nBriar no guarda la vostra posició ni la comparteix amb ningú.</string>
   <string name="permission_camera_denied_body">Heu denegat l\'accés a la càmera però per afegir contactes cal utilitzar la càmera.\n\nRecomanem que permeteu l\'accés a la càmera.</string>
   <string name="qr_code">Codi QR</string>
   <string name="show_qr_code_fullscreen">Mostra el codi QR a pantalla completa</string>
@@ -473,15 +528,15 @@ Un cop s\'actualitzi ja li veureu una icona diferent </string>
   <string name="lock_tap_to_unlock">Toqueu per desbloquejar-lo</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
-  <string name="screenshot_alice">Alice</string>
+  <string name="screenshot_alice">Alba</string>
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
-  <string name="screenshot_bob">Bob</string>
+  <string name="screenshot_bob">Pere</string>
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
-  <string name="screenshot_carol">Carol</string>
+  <string name="screenshot_carol">Queralt</string>
   <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
-  <string name="screenshot_message_1">Hola Bob!</string>
+  <string name="screenshot_message_1">Hola Pere!</string>
   <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
-  <string name="screenshot_message_2">Hola Alice! Gràcies per recomanar-me Briar!</string>
+  <string name="screenshot_message_2">Hola Alba! Gràcies per recomanar-me Briar!</string>
   <!--This is a message to be used in screenshots.-->
   <string name="screenshot_message_3">De res, espero que t\'agradi 😀</string>
 </resources>

briar-android/src/main/res/values-de/strings.xml

@@ -18,7 +18,7 @@
   <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
   <string name="create_account_button">Konto anlegen</string>
   <string name="more_info">Weitere Informationen</string>
-  <string name="don_t_ask_again">Frage nicht noch einmal</string>
+  <string name="don_t_ask_again">Nicht erneut nachfragen</string>
   <string name="setup_huawei_text">Bitte tippe auf die Schaltfläche unten und stelle sicher, dass Briar unter \"Geschützte Apps\" angezeigt wird.</string>
   <string name="setup_huawei_button">Briar schützen</string>
   <string name="setup_huawei_help">Wenn Briar nicht zur Liste der geschützten Apps hinzugefügt wird, kann es nicht im Hintergrund ausgeführt werden.</string>
@@ -44,11 +44,11 @@
   <string name="expiry_update">Das Ablaufdatum des Tests wurde verlängert. Dein Konto läuft nun in %d Tagen ab.</string>
   <string name="expiry_date_reached">Diese Software ist abgelaufen.\nDanke, dass du Briar getestet hast!</string>
   <string name="download_briar">Lade bitte Version 1.0 herunter, um Briar weiterhin zu nutzen.</string>
-  <string name="create_new_account">Du wirst ein neues Konto erstellen müssen, wobei du jedoch wieder den selben Benutzernamen verwenden kannst.</string>
+  <string name="create_new_account">Du wirst ein neues Konto erstellen müssen, wobei du jedoch wieder denselben Benutzernamen verwenden kannst.</string>
   <string name="download_briar_button">Lade Briar 1.0 herunter</string>
   <string name="startup_open_database">Datenbank wird entschlüsselt...</string>
   <string name="startup_migrate_database">Datenbank wird aktualisiert...</string>
-  <string name="startup_compact_database">Datenbank komprimieren...</string>
+  <string name="startup_compact_database">Datenbank wird komprimiert ...</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Navigationsleiste öffnen</string>
   <string name="nav_drawer_close_description">Navigationsleiste schliessen</string>
@@ -118,10 +118,17 @@
   <string name="message_hint">Nachricht eingeben</string>
   <string name="image_caption_hint">Überschrift hinzufügen (optional)</string>
   <string name="image_attach">Bild anhängen</string>
-  <string name="image_attach_error">Konnte kein Bild anhängen</string>
+  <string name="image_attach_error">Bild(er) konnte(n) nicht angehängt werden</string>
+  <string name="image_attach_error_too_big">Bild zu groß. Das Limit beträgt %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Nicht unterstütztes Bildformat: %s</string>
   <string name="set_contact_alias">Kontaktnamen ändern</string>
   <string name="set_contact_alias_hint">Name des Kontakts</string>
   <string name="set_alias_button">Ändern</string>
+  <string name="delete_all_messages">Alle Nachrichten löschen</string>
+  <string name="dialog_title_delete_all_messages">Löschen der Nachrichten bestätigen</string>
+  <string name="dialog_message_delete_all_messages">Bist Du sicher, dass Du alle Nachrichten löschen willst?</string>
+  <string name="dialog_title_not_all_messages_deleted">Konnte nicht alle Nachrichten löschen</string>
+  <string name="dialog_message_not_all_messages_deleted">Nachrichten mit Bezug auf offene Kontaktempfehlungen oder Einladungen können erst nach Abschluss dieser gelöscht werden.</string>
   <string name="delete_contact">Kontakt löschen</string>
   <string name="dialog_title_delete_contact">Löschen des Kontakts bestätigen</string>
   <string name="dialog_message_delete_contact">Bist du sicher, dass du diesen Kontakt und alle dazugehörigen Nachrichten löschen möchtest?</string>
@@ -131,13 +138,15 @@
   <string name="save_image">Bild speichern</string>
   <string name="dialog_title_save_image">Bild speichern?</string>
   <string name="dialog_message_save_image">Gespeicherte Bilder können von vielen anderen Apps eingesehen werden.\n\nBist du sicher, dass du das Bild speichern möchtest?</string>
-  <string name="save_image_success">Bild wurde gespeichert.</string>
-  <string name="save_image_error">Konnte Bild nicht speichern.</string>
+  <string name="save_image_success">Bild wurde gespeichert</string>
+  <string name="save_image_error">Bild konnte nicht gespeichert werden</string>
   <string name="dialog_title_no_image_support">Bilder nicht verfügbar</string>
   <string name="dialog_message_no_image_support">Der Briar deines Kontakts unterstützt noch keine Bildanhänge. Sobald die Aktualisierung abgeschlossen ist, siehst du ein anderes Symbol.</string>
   <string name="dialog_title_image_support">Du kannst nun Bilder an diesen Kontakt senden</string>
   <string name="dialog_message_image_support">Tippe auf das Symbol, um Bilder anzuhängen.</string>
+  <string name="messaging_too_many_attachments_toast">Nur die ersten %d Bilder werden übertragen werden</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Kontakt in der Nähe hinzufügen</string>
   <string name="face_to_face">Um einen neuen Kontakt hinzuzufügen, ist es notwendig, dass sich beide Kontakte an einem Ort treffen.\n\nDadurch wird betrügerische Identitätsvortäuschung und unautorisierter Kommunikationszugriff verhindert.</string>
   <string name="continue_button">Weiter</string>
   <string name="try_again_button">Noch einmal versuchen</string>
@@ -147,23 +156,29 @@
   <string name="contact_already_exists">Kontakt %s existiert bereits</string>
   <string name="qr_code_invalid">Der QR-Code ist ungültig</string>
   <string name="qr_code_too_old">Der QR-Code, den du eingescannt hast, kommt von einer älteren Version von %s.\n\nBitte deinen Kontakt, zur neuesten Version upzudaten, und probiere es erneut.</string>
-  <string name="qr_code_too_new">Der QR-Code, den du gescannt hast, kommt von einer neueren Version von .\n\nBitte update %s auf die neueste Version und versuche es erneut.</string>
+  <string name="qr_code_too_new">Der QR-Code, den du gescannt hast, kommt von einer neueren Version.\n\nBitte aktualisiere %s auf die neueste Version und versuche es erneut.</string>
   <string name="camera_error">Kamerafehler</string>
   <string name="connecting_to_device">Verbinde mit Gerät\u2026</string>
   <string name="authenticating_with_device">Authentifiziere Gerät\u2026</string>
   <string name="connection_error_title">Keine Verbindung zum Kontakt</string>
-  <string name="connection_error_explanation">Überprüfe ob ihr beide mit dem selben Wi-Fi Netzwerk verbunden seit.</string>
+  <string name="connection_error_explanation">Überprüfe, ob ihr beide mit dem selben WLAN-Netzwerk verbunden seid.</string>
   <string name="connection_error_feedback">Wenn das Problem weiterbesteht, hilf uns die App zu verbessern und <a href="feedback">schicke Feedback</a>.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Kontakt aus der Ferne hinzufügen</string>
   <string name="add_contact_nearby_title">Kontakt in der Nähe hinzufügen</string>
+  <string name="add_contact_remotely_title">Kontakt aus der Ferne hinzufügen</string>
   <string name="contact_name_hint">Gib dem Kontakt einen Spitznamen</string>
+  <string name="contact_link_intro">Hier den Link deines Kontakts einfügen</string>
+  <string name="contact_link_hint">Kontakt Link</string>
   <string name="paste_button">Einfügen</string>
   <string name="add_contact_button">Kontakt hinzufügen</string>
   <string name="copy_button">Kopieren</string>
   <string name="share_button">Teilen</string>
+  <string name="send_link_title">Links austauschen</string>
   <string name="add_contact_choose_nickname">Wähle einen Spitznamen</string>
   <string name="add_contact_choose_a_nickname">Gib einen Spitznamen ein</string>
-  <string name="nickname_intro">Gib deinem Kontakt einen Spitznamen. Nur du kannst es sehen.</string>
+  <string name="nickname_intro">Gib deinem Kontakt einen Spitznamen. Nur du kannst ihn sehen.</string>
+  <string name="your_link">Gebe diesen Link zu dem Kontakt den du hinzufügen möchtest</string>
   <string name="link_clip_label">Briar Link</string>
   <string name="link_copied_toast">Link kopiert</string>
   <string name="adding_contact_error">Es gab einen Fehler beim Hinzufügen des Kontaktes.</string>
@@ -171,10 +186,18 @@
   <string name="pending_contact_requests">Ausstehende Kontaktanfragen</string>
   <string name="no_pending_contacts">Keine ausstehenden Kontakte</string>
   <string name="add_contact_remote_connecting">Verbindung wird aufgebaut …</string>
+  <string name="waiting_for_contact_to_come_online">Warte auf Online-Aktivität des Kontakts ...</string>
   <string name="connecting">Verbindung wird aufgebaut …</string>
   <string name="adding_contact">Kontakt hinzufügen...</string>
   <string name="adding_contact_failed">Hinzufügen von Kontakt ist fehlgeschlagen</string>
+  <string name="dialog_title_remove_pending_contact">Entfernung bestätigen</string>
+  <string name="dialog_message_remove_pending_contact">Dieser Kontakt befindet sich noch beim Hinzufügen. Wenn er jetzt entfernt wird, wird das Hinzufügen abgebrochen.</string>
+  <string name="own_link_error">Gebe den Link deines Kontakts ein, nicht deinen eigenen.</string>
   <string name="nickname_missing">Bitte gib einen Spitznamen an</string>
+  <string name="invalid_link">Ungültiger Link</string>
+  <string name="unsupported_link">Dieser Link kommt von einer neueren Version von Briar. Bitte führe eine Aktualisierung auf die aktuelle Version durch und versuche es dann nochmal. </string>
+  <string name="intent_own_link">Du hast deinen eigenen Link aufgerufen. Nutze einen Link von deinen Kontakten, die du hinzufügen möchtest!</string>
+  <string name="missing_link">Bitte gebe einen Link ein</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
@@ -183,6 +206,25 @@
     <item quantity="one">Neuer Kontakt hinzugefügt.</item>
     <item quantity="other">%d neue Kontakte hinzugefügt.</item>
   </plurals>
+  <string name="adding_contact_slow_warning">Das Hinzufügen des Kontakts dauert länger als normal</string>
+  <string name="adding_contact_slow_title">Kann nicht zu Kontakt verbinden</string>
+  <string name="adding_contact_slow_text">Das Hinzufügen des Kontakts dauert länger als normal.\n\nBitte kontrolliere, dass dein Kontakt deinen Link erhalten und eingegeben hat:</string>
+  <string name="offline_state">Keine Internetverbindung</string>
+  <string name="duplicate_link_dialog_title">Link duplizieren</string>
+  <string name="duplicate_link_dialog_text_1">Du hast bereits einen Kontakt mit diesem Link ausstehend: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Du hast bereits einen Kontakt mit diesem Link: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Sind %s und %s dieselbe Person?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Selbe Person</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Andere Person</string>
+  <string name="duplicate_link_dialog_text_3">%s und %s haben Dir denselben Link geschickt.\n\nMöglicherweise versucht einer der beiden mehr über deine Kontakte zu erfahren.\n\nDu solltest deswegen niemandem sagen, dass Du diesen Link auch von jemand anderem erhalten hast.</string>
+  <string name="pending_contact_updated_toast">Ausstehender Kontakt aktualisiert</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Mache deine Kontakte untereinander bekannt</string>
   <string name="introduction_onboarding_text">Du kannst deine Kontakte untereinander bekannt machen. So können sie sich über Briar verbinden, ohne sich persönlich treffen zu müssen.</string>
@@ -291,7 +333,7 @@
   <string name="forum_invitation_received">%1$s hat das Forum \"%2$s\" mit dir geteilt.</string>
   <string name="forum_invitation_sent">Du hast das Forum \"%1$s\" mit %2$s geteilt.</string>
   <string name="forum_invitations_title">Foreneinladungen</string>
-  <string name="forum_invitation_exists">Du hast bereits eine Einladung zu diesem Forum angenommen.\n\nMehrere Einladungen anzunehmen, wird deine Verbindung zu diesem Forum schneller und zuverlässiger machen.</string>
+  <string name="forum_invitation_exists">Du hast bereits eine Einladung zu diesem Forum angenommen.\n\nMehrere Einladungen anzunehmen wird deine Verbindung zu diesem Forum schneller und zuverlässiger machen.</string>
   <string name="forum_joined_toast">Dem Forum beigetreten</string>
   <string name="forum_declined_toast">Einladung abgelehnt</string>
   <string name="shared_by_format">Geteilt durch %s</string>
@@ -372,8 +414,8 @@
   <string name="bluetooth_setting_disabled">Nur beim Hinzufügen von Kontakten</string>
   <string name="tor_network_setting">Über Internet (Tor) verbinden</string>
   <string name="tor_network_setting_automatic">Automatisch (standortbasiert)</string>
-  <string name="tor_network_setting_without_bridges">Tor ohne Bridges benutzen</string>
-  <string name="tor_network_setting_with_bridges">Tor mit Bridges benutzen</string>
+  <string name="tor_network_setting_without_bridges">Tor ohne Bridges nutzen</string>
+  <string name="tor_network_setting_with_bridges">Tor mit Bridges nutzen</string>
   <string name="tor_network_setting_never">Nicht verbinden</string>
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
   <string name="tor_network_setting_summary">Automatisch: %1$s (in %2$s)</string>
@@ -383,11 +425,11 @@
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sicherheit</string>
   <string name="pref_lock_title">App-Sperre</string>
-  <string name="pref_lock_summary">Systemsperrbildschirm benutzen um Briar zu schützen, während angemeldet</string>
+  <string name="pref_lock_summary">Systemsperrbildschirm benutzen um ein angemeldetes Briar zu schützen</string>
   <string name="pref_lock_disabled_summary">Um dieses Feature zu benutzen, aktiviere den Systemsperrbildschirm</string>
   <string name="pref_lock_timeout_title">Zeitlimit der Inaktivität für die App-Sperr-Funktion</string>
   <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
-  <string name="pref_lock_timeout_summary">Briar automatisch nach %s sperren, wenn unbenutzt.</string>
+  <string name="pref_lock_timeout_summary">Bei Nichtnutzung Briar automatisch nach %s sperren</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
   <string name="pref_lock_timeout_1">1 Minute</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
@@ -479,7 +521,7 @@
   <string name="permission_location_title">Berechtigung Standort</string>
   <string name="permission_location_request_body">Um Bluetooth-Geräte zu  finden, braucht Briar Zugriff auf deinen Standort.\n\nBriar speichert weder deinen Standort noch gibt es ihn an andere weiter.</string>
   <string name="permission_camera_location_title">Kamera und Standort</string>
-  <string name="permission_camera_location_request_body">Um den QR-Code zu scannen, brauch Briar Zugriff auf die Kamera.\n\nUm Bluetooth-Geräte zu finden, braucht Briar Zugriff auf deinen Standort.\n\nBriar speichert weder deinen Standort noch gibt es ihn an andere weiter.</string>
+  <string name="permission_camera_location_request_body">Um den QR-Code zu scannen, braucht Briar Zugriff auf die Kamera.\n\nUm Bluetooth-Geräte zu finden, braucht Briar Zugriff auf deinen Standort.\n\nBriar speichert weder deinen Standort noch gibt es ihn an andere weiter.</string>
   <string name="permission_camera_denied_body">Du hast den Zugriff auf die Kamera verweigert, aber das Hinzufügen von Kontakten erfordert die Verwendung der Kamera.\n\nBitte gewähre den Zugriff.</string>
   <string name="qr_code">QR-Code</string>
   <string name="show_qr_code_fullscreen">QR-Code im Vollbildmodus anzeigen</string>

briar-android/src/main/res/values-es/strings.xml

@@ -118,10 +118,17 @@
   <string name="message_hint">Escribe un mensaje</string>
   <string name="image_caption_hint">Añade una breve descripción (opcional)</string>
   <string name="image_attach">Adjuntar imagen</string>
-  <string name="image_attach_error">No se pudo adjuntar imagen</string>
+  <string name="image_attach_error">No se pudieron adjuntar las imágenes</string>
+  <string name="image_attach_error_too_big">Imagen demasiado grande. El límite es de %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Formato de imagen no admitido: %s</string>
   <string name="set_contact_alias">Cambiar nombre del contacto</string>
   <string name="set_contact_alias_hint">Nombre del contacto</string>
   <string name="set_alias_button">Cambiar</string>
+  <string name="delete_all_messages">Eliminar todos los mensajes</string>
+  <string name="dialog_title_delete_all_messages">Confirmar la eliminación del mensaje</string>
+  <string name="dialog_message_delete_all_messages">¿Estás seguro de que deseas eliminar todos los mensajes?</string>
+  <string name="dialog_title_not_all_messages_deleted">No se pudieron eliminar todos los mensajes.</string>
+  <string name="dialog_message_not_all_messages_deleted">Los mensajes relacionados con presentaciones o invitaciones en curso no se pueden eliminar hasta que finalicen.</string>
   <string name="delete_contact">Eliminar contacto</string>
   <string name="dialog_title_delete_contact">Confirmar eliminación de contacto</string>
   <string name="dialog_message_delete_contact">¿Seguro que quieres eliminar este contacto y todos los mensajes intercambiados entre vosotros?</string>
@@ -137,7 +144,9 @@
   <string name="dialog_message_no_image_support">El Briar de tu contacto todavía no soporta imágenes. Una vez que lo actualice verás un ícono diferente.</string>
   <string name="dialog_title_image_support">Ahora puedes enviar imágenes a este contacto.</string>
   <string name="dialog_message_image_support">Pulsa este ícono para adjuntar imágenes.</string>
+  <string name="messaging_too_many_attachments_toast">Solo se enviarán las primeras %d  imágenes</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Agregar Contacto Cercano</string>
   <string name="face_to_face">Debes reunirte con la persona a la que quieras añadir como contacto.\n\nHaciéndolo así prevendrás que nadie te suplante o pueda leer tus mensajes en el futuro.</string>
   <string name="continue_button">Continuar</string>
   <string name="try_again_button">Prueba de nuevo</string>
@@ -155,15 +164,67 @@
   <string name="connection_error_explanation">Por favor comprobar que ambos estén conectados a la misma red Wi-Fi.</string>
   <string name="connection_error_feedback">Si este problema persiste, por favor <a href="feedback">envía tus comentarios</a> para ayudarnos a mejorar la aplicación.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Añadir un Contacto a Distancia</string>
+  <string name="add_contact_nearby_title">Agregar un contacto cercano</string>
+  <string name="add_contact_remotely_title">Añadir un contacto a distancia</string>
+  <string name="contact_name_hint">Ponerle un sobrenombre al contacto</string>
+  <string name="contact_link_intro">Introduzca el enlace de su contacto aquí</string>
+  <string name="contact_link_hint">Enlace de contacto</string>
   <string name="paste_button">Pegar</string>
+  <string name="add_contact_button">Agregar contacto</string>
   <string name="copy_button">Copiar</string>
   <string name="share_button">Compartir</string>
+  <string name="send_link_title">Intercambiar enlaces</string>
+  <string name="add_contact_choose_nickname">Elija un sobrenombre</string>
+  <string name="add_contact_choose_a_nickname">Ingrese un sobrenombre</string>
+  <string name="nickname_intro">Dele a su contacto un sobrenombre. Sólo usted puede verlo.</string>
+  <string name="your_link">Déle este enlace al contacto que desea añadir</string>
+  <string name="link_clip_label">Enlace Briar</string>
+  <string name="link_copied_toast">Enlace copiado</string>
+  <string name="adding_contact_error">Se ha producido un error al añadir el contacto.</string>
+  <string name="pending_contact_requests_snackbar">Hay solicitudes de contacto pendientes</string>
+  <string name="pending_contact_requests">Solicitudes de contacto pendientes</string>
+  <string name="no_pending_contacts">No hay contactos pendientes</string>
   <string name="add_contact_remote_connecting">Conectando...</string>
+  <string name="waiting_for_contact_to_come_online">Esperando que el contacto se ponga en línea....</string>
   <string name="connecting">Conectando...</string>
+  <string name="adding_contact">Añadir contacto....</string>
+  <string name="adding_contact_failed">La adición de un contacto ha fallado</string>
+  <string name="dialog_title_remove_pending_contact">Confirmar la eliminación</string>
+  <string name="dialog_message_remove_pending_contact">Este contacto todavía está siendo añadido. Si lo quita ahora, no se añadirá.</string>
+  <string name="own_link_error">Introduzca el enlace de su contacto, no el suyo propio</string>
+  <string name="nickname_missing">Por favor, introduzca un sobrenombre</string>
+  <string name="invalid_link">Enlace inválido</string>
+  <string name="unsupported_link">Este enlace proviene de una nueva versión de Briar. Por favor, actualice a la última versión e inténtelo de nuevo.</string>
+  <string name="intent_own_link">Abrió su propio enlace. ¡Utilice el del contacto que quiere añadir!</string>
+  <string name="missing_link">Por favor, introduzca un enlace</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
   <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Nuevo contacto añadido.</item>
+    <item quantity="other">%d nuevos contactos añadidos.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Añadir este contacto tarda más de lo habitual</string>
+  <string name="adding_contact_slow_title">No se puede conectar con el contacto</string>
+  <string name="adding_contact_slow_text">Agregar este contacto está tomando más tiempo de lo normal.\n\nPor favor, compruebe que su contacto ha recibido su enlace y lo ha agregado:</string>
+  <string name="offline_state">No hay conexión a Internet</string>
+  <string name="duplicate_link_dialog_title">Duplicar enlace</string>
+  <string name="duplicate_link_dialog_text_1">Ya tiene un contacto pendiente con este enlace: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Ya tienes un contacto con este enlace: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">¿Son %s y %s la misma persona?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Misma persona</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Diferente Persona</string>
+  <string name="duplicate_link_dialog_text_3">%s y %s le envió el mismo enlace.\n\nUno de ellos puede estar tratando de descubrir quiénes son sus contactos.\n\nNo les diga que recibió el mismo enlace de otra persona.</string>
+  <string name="pending_contact_updated_toast">Contacto pendiente actualizado</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presenta a tus contactos</string>
   <string name="introduction_onboarding_text">Presenta a tus contactos entre sí para ahorrarles encontrarse en persona para poder conectar mediante Briar.</string>

briar-android/src/main/res/values-eu/strings.xml

@@ -116,12 +116,19 @@
   <string name="date_no_private_messages">Ez dago mezurik.</string>
   <string name="no_private_messages">Ez dago erakusteko mezurik</string>
   <string name="message_hint">Idatzi mezua</string>
-  <string name="image_caption_hint">Gehitu epigrafea (aukerakoa)</string>
+  <string name="image_caption_hint">Gehitu epigrafe bat (aukerakoa)</string>
   <string name="image_attach">Erantsi irudia</string>
-  <string name="image_attach_error">Ezin izan da irudia erantsi</string>
+  <string name="image_attach_error">Ezin izan da irudia(k) erantsi</string>
+  <string name="image_attach_error_too_big">Irudia handiegia da. Muga %d MBkoa da.</string>
+  <string name="image_attach_error_invalid_mime_type">Onartu gabeko irudi formatua: %s</string>
   <string name="set_contact_alias">Aldatu kontaktuaren izena</string>
   <string name="set_contact_alias_hint">Kontaktuaren izena</string>
   <string name="set_alias_button">Aldatu</string>
+  <string name="delete_all_messages">Ezabatu mezu guztiak</string>
+  <string name="dialog_title_delete_all_messages">Baieztatu mezuak ezabatzea</string>
+  <string name="dialog_message_delete_all_messages">Ziur mezu guztiak ezabatu nahi dituzula?</string>
+  <string name="dialog_title_not_all_messages_deleted">Ezin izan dira mezu guztiak ezabatu</string>
+  <string name="dialog_message_not_all_messages_deleted">Abian diren aurkezpenen edo gonbidapenen mezuak ezin dira ezabatu hauek amaitu arte.</string>
   <string name="delete_contact">Ezabatu kontaktua</string>
   <string name="dialog_title_delete_contact">Baieztatu kontaktua ezabatzea</string>
   <string name="dialog_message_delete_contact">Ziur zaude kontaktu hau eta berarekin trukatutako mezu guztiak kendu nahi dituzula?</string>
@@ -130,14 +137,16 @@
   <string name="you">Zu</string>
   <string name="save_image">Gorde irudia</string>
   <string name="dialog_title_save_image">Gorde irudia?</string>
-  <string name="dialog_message_save_image">Irudi hau gordetzeak beste aplikazioei berau atzitea ahalbietuko lieke.\n\nZiur gorde nahi duzula?</string>
+  <string name="dialog_message_save_image">Irudi hau gordetzeak beste aplikazioei bera atzitzen utziko lieke.\n\nZiur zaude gorde nahi duzula?</string>
   <string name="save_image_success">Irudia gorde da</string>
   <string name="save_image_error">Ezin izan da irudia gorde</string>
-  <string name="dialog_title_no_image_support">Irudiak ez daude eskuragarri</string>
+  <string name="dialog_title_no_image_support">Irudiak ez daude erabilgarri</string>
   <string name="dialog_message_no_image_support">Zure kontaktuaren Briar bertsioak ez ditu oraindik irudiak eranskin gisa onartzen. Eguneratzen duenean zuk ikono desberdin bat ikusiko duzu.</string>
-  <string name="dialog_title_image_support">Orain irudiak bidali ahal dizkiozu eranskin gisa kontaktu honei</string>
+  <string name="dialog_title_image_support">Orain irudiak bidali ahal dizkiozu kontaktu honi</string>
   <string name="dialog_message_image_support">Sakatu ikono hau irudiak eransteko.</string>
+  <string name="messaging_too_many_attachments_toast">Lehen %d irudiak bidaliko dira, gehiagorik ez</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Gehitu inguruko kontaktua</string>
   <string name="face_to_face">Kontaktu gisa gehitu nahi duzun pertsonarekin aurrez aurre egon behar duzu.\n\nHonek etorkizunean inork zure itxurak egitea edo zure mezuak irakurtzea eragotziko du.</string>
   <string name="continue_button">Jarraitu</string>
   <string name="try_again_button">Saiatu berriro</string>
@@ -155,14 +164,67 @@
   <string name="connection_error_explanation">Egiaztatu biak Wi-Fi sare berera konektatuta zaudetela.</string>
   <string name="connection_error_feedback">Arazoa  mantentzen bada, mesedez <a href="feedback">bidali iruzkin bat</a> aplikazioa hobetzen laguntzeko.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Gehitu urruneko kontaktua</string>
+  <string name="add_contact_nearby_title">Gehitu inguruko kontaktua</string>
+  <string name="add_contact_remotely_title">Gehitu urruneko kontaktua</string>
+  <string name="contact_name_hint">Eman ezizena kontaktuari</string>
+  <string name="contact_link_intro">Sartu hemen zure kontaktuaren esteka</string>
+  <string name="contact_link_hint">Kontaktuaren esteka</string>
   <string name="paste_button">Itsatsi</string>
+  <string name="add_contact_button">Gehitu kontaktua</string>
   <string name="copy_button">Kopiatu</string>
-  <string name="share_button">Elkarbanatu</string>
-  <string name="add_contact_remote_connecting">Elkartzen</string>
-  <string name="connecting">Elkartzen</string>
+  <string name="share_button">Partekatu</string>
+  <string name="send_link_title">Partekatu estekak</string>
+  <string name="add_contact_choose_nickname">Aukeratu ezizena</string>
+  <string name="add_contact_choose_a_nickname">Sartu ezizen bat</string>
+  <string name="nickname_intro">Eman ezizena zure kontaktuari. Zuk ikusi dezakezu, beste inork ez</string>
+  <string name="your_link">Eman esteka hau gehitu nahi duzun kontaktuari</string>
+  <string name="link_clip_label">Briar esteka</string>
+  <string name="link_copied_toast">Esteka kopiatu da</string>
+  <string name="adding_contact_error">Errore bat gertatu da kontaktua gehitzean.</string>
+  <string name="pending_contact_requests_snackbar">Kontaktu eskaerak daude aztertzeke</string>
+  <string name="pending_contact_requests">Kontaktu eskaerak aztertzeke</string>
+  <string name="no_pending_contacts">Ez dago kontakturik aztertzeke</string>
+  <string name="add_contact_remote_connecting">Konektatzen...</string>
+  <string name="waiting_for_contact_to_come_online">Kontaktua konektatu bitartean zain...</string>
+  <string name="connecting">Konektatzen...</string>
+  <string name="adding_contact">Kontaktua gehitzen...</string>
+  <string name="adding_contact_failed">Kontaktua gehitzea huts egin du</string>
+  <string name="dialog_title_remove_pending_contact">Berretsi kentzea</string>
+  <string name="dialog_message_remove_pending_contact">Kontaktu hau gehitzen ari da oraindik. orain kentzen baduzu, ez da gehituko.</string>
+  <string name="own_link_error">Sartu zure kontaktuaren esteka, ez zurea</string>
+  <string name="nickname_missing">Sartu ezizen bat</string>
+  <string name="invalid_link">Esteka baliogabea</string>
+  <string name="unsupported_link">Esteka hau Briar-en bertsio berriago batetik dator. Eguneratu azken bertsiora eta saiatu berriro.</string>
+  <string name="intent_own_link">Zure esteka ireki duzu. Erabili gehitu nahi duzun kontaktuarena!</string>
+  <string name="missing_link">Sartu esteka bat</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Kontaktu berria gehitu da</item>
+    <item quantity="other">%d kontaktu berri gehitu dira.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Kontaktu hau gehitzeak ohi baino denbora gehiago hartzen ari da</string>
+  <string name="adding_contact_slow_title">Ezin da kontaktuarekin kontaktatu</string>
+  <string name="adding_contact_slow_text">Kontaktu hau gehitzeak ohi baino denbora gehiago hartzen du.\n\nEgiaztatu kontaktua esteka jaso duela eta zu gehitu zaituela:</string>
+  <string name="offline_state">Internet konexiorik ez</string>
+  <string name="duplicate_link_dialog_title">Bikoiztutako esteka</string>
+  <string name="duplicate_link_dialog_text_1">Baduzu kontaktu bat aztertzeke esteka honekin: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Baduzu esteka hau duen kontaktu bat: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Ziur %s eta %s pertsona bera direla?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Pertsona bera</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Beste pertsona bat</string>
+  <string name="duplicate_link_dialog_text_3">%s eta %s erabiltzaileek esteka bera bidali dizute.\n\nBietako batek agian zure kontaktuak zeintzuk diren asmatu nahi du.\n\nEz esan esteka bera jaso duzula beste norbaitengandik.</string>
+  <string name="pending_contact_updated_toast">Aztertzeke zegoen kontaktua eguneratu da</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Aurkeztu zure kontaktuak</string>
   <string name="introduction_onboarding_text">Zure kontaktuak elkarren artean aurkez ditzakezu, Briar bidez konektatzeko aurrez aurre egon behar izan ez dezaten.</string>

briar-android/src/main/res/values-fa/strings.xml

@@ -2,21 +2,21 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Setup-->
   <string name="setup_title">به Briar (برایر) خوش آمدید</string>
-  <string name="setup_name_explanation">نام مستعارتان کنار هر مطلب شما قرار خواهد گرفت و بعد از ایجاد حساب کاربری امکان تغییر آن وجود ندارد.</string>
+  <string name="setup_name_explanation">نام مستعار شما کنار هر مطلبی که پست کنید قرار خواهد گرفت. بعد از ایجاد حساب کاربری امکان تغییر آن وجود ندارد.</string>
   <string name="setup_next">بعدی</string>
-  <string name="setup_password_intro">یک رمز عبور انتخاب کنید</string>
-  <string name="setup_password_explanation">حساب کاربری Briar (برایر) شما به صورت رمزگذاری شده روی دستگاه شما به جای حافظه ابری ذخیره شده است. اگر شما رمز عبور خود را فراموش کنید یا Briar (برایر) را پاک کنید، راهی برای بازیابی حساب کاربری شما وجود نخواهد داشت.
+  <string name="setup_password_intro">یک گذرواژه انتخاب کنید</string>
+  <string name="setup_password_explanation">حساب کاربری Briar (برایر) شما به صورت رمزگذاری شده روی دستگاه شما به جای حافظه ابری ذخیره شده است. اگر گذرواژه خود را فراموش کنید یا Briar (برایر) را پاک کنید، راهی برای بازیابی حساب کاربری شما وجود نخواهد داشت.
 
-یک رمز عبور طولانی انتخاب کنید که حدس آن سخت باشد، مثل چهار عبارت تصادفی یا ده لغت تصادفی با اعداد و نماد ها.</string>
+یک گذرواژه طولانی انتخاب کنید که حدس آن سخت باشد، مثل چهار عبارت تصادفی یا ده لغت تصادفی با اعداد و نماد ها.</string>
   <string name="setup_doze_title">اتصال های پس زمینه</string>
   <string name="setup_doze_intro">برای دریافت پیام، Briar (برایر) نیاز دارد تا در پس زمینه اتصال داشته باشد.</string>
   <string name="setup_doze_explanation">برای دریافت پیام، Briar (برایر) نیاز دارد تا در پس زمینه اتصال داشته باشد. لطفا بهینه سازی باتری را غیر فعال کنید تا Briar (برایر) بتواند به اتصال خود ادامه دهد.</string>
-  <string name="setup_doze_button">دادن اجازه به اتصالات</string>
+  <string name="setup_doze_button">دادن اجازه به ارتباطات</string>
   <string name="choose_nickname">نام مستعار خود را انتخاب کنید</string>
-  <string name="choose_password">رمز عبور خود را انتخاب کنید</string>
-  <string name="confirm_password">رمز عبور خود را تایید کنید</string>
+  <string name="choose_password">گذرواژه خود را انتخاب کنید</string>
+  <string name="confirm_password">گذرواژه خود را تایید کنید</string>
   <string name="name_too_long">نام بیش از حد طولانی می باشد</string>
-  <string name="password_too_weak">رمز عبور ضعیف می باشد</string>
+  <string name="password_too_weak">گذرواژه ضعیف می باشد</string>
   <string name="passwords_do_not_match">رمز های عبور مطابقت ندارند </string>
   <string name="create_account_button">ایجاد حساب کاربری</string>
   <string name="more_info">اطلاعات بیشتر</string>
@@ -26,21 +26,21 @@
   <string name="setup_huawei_help">اگر Briar (برایر) به فهرست برنامه های محافظت شده اضافه نشده، نمی تواند در پس زمینه مشغول به کار باشد.</string>
   <string name="warning_dozed">ناتوانی %s برای اجراء در پس زمینه</string>
   <!--Login-->
-  <string name="enter_password">رمز عبور</string>
-  <string name="try_again">رمز عبور اشتباه است، لطفا دوباره سعی کنید</string>
+  <string name="enter_password">گذرواژه</string>
+  <string name="try_again">گذرواژه اشتباه است، لطفا دوباره سعی کنید</string>
   <string name="sign_in_button">ورود</string>
-  <string name="forgotten_password">رمز عبور را فراموش کرده ام</string>
-  <string name="dialog_title_lost_password">رمز عبور گمشده</string>
-  <string name="dialog_message_lost_password">حساب کاربری Briar (برایر) شما به صورت رمزنگاری شده روی سیستم شما به جای حافظه ابری ذخیره شده است برای همین ما نمی توانیم رمز عبور شما را به صورت مجدد تنظیم کنیم. آیا مایل هستید تا حساب کاربری شما را پاک کنیم و دوباره از ابتدا شروع کنیم؟
+  <string name="forgotten_password">گذرواژه خود را فراموش کرده ام</string>
+  <string name="dialog_title_lost_password">گذرواژه گمشده</string>
+  <string name="dialog_message_lost_password">حساب کاربری Briar (برایر) شما به صورت رمزنگاری شده روی سیستم شما به جای حافظه ابری ذخیره شده است برای همین ما نمی توانیم گذرواژه شما را به صورت مجدد تنظیم کنیم. آیا مایل هستید تا حساب کاربری شما را پاک کنیم و دوباره از ابتدا شروع کنیم؟
 
 اخطار: هویت های شما، مخاطبان شما و پیام های شما برای همیشه از بین خواهند رفت.</string>
   <string name="startup_failed_notification_title">Briar (برایر) نمی تواند شروع به کار کند.</string>
   <string name="startup_failed_notification_text">برای اطلاعات بیشتر کلیک کنید</string>
   <string name="startup_failed_activity_title">خطا در شروع Briar (برایر)</string>
-  <string name="startup_failed_db_error">به دلایلی، دیتابیس Briar (برایر) شما خراب شده و قابل اصلاح نیست. حساب کاربری شما، داده های شما  و تمام مخاطبان شما از بین رفته اند. متاسفانه، شما یا باید Briar (برایر) را دوباره نصب کنید یا یک حساب کاربری جدید با انتخاب \'رمز عبور ام را فراموش کرده ام\' انتخاب کنید.</string>
-  <string name="startup_failed_data_too_old_error">حساب کاربری شما با یک نسخه قدیمی از این برنامه ایجاد شده است و به همین خاطربا این نسخه نمی تواند باز شود. شما باید نسخه قدیمی را دوباره نصب کنید یا یک حساب کاربری جدید با \"رمز عبور ام را فراموش کرده ام\" در صفحه ی رمز عبور ایجاد کنید.</string>
+  <string name="startup_failed_db_error">به دلایلی، پایگاه داده Briar (برایر) شما خراب شده و قابل اصلاح نیست. حساب کاربری شما، داده های شما و تمام مخاطبان شما از بین رفته اند. متاسفانه، شما یا باید Briar (برایر) را دوباره نصب کنید یا یک حساب کاربری جدید در هنگام خواست گذرواژه با انتخاب گذرواژه خود را فراموش کرده ام\' ایجاد کنید.</string>
+  <string name="startup_failed_data_too_old_error">حساب کاربری شما با یک نسخه قدیمی از این برنامه ایجاد شده است و به همین خاطر با این نسخه نمی تواند باز شود. شما باید نسخه قدیمی را دوباره نصب کنید یا یک حساب کاربری جدید با \"گذرواژه خود را فراموش کرده ام\" در صفحه ی گذرواژه ایجاد کنید.</string>
   <string name="startup_failed_data_too_new_error">این نسخه از برنامه قدیمی می باشد. لطفا به آخرین نسخه از برنامه ارتقاء داده و دوباره سعی کنید.</string>
-  <string name="startup_failed_service_error">Briar (برایر) نمی تواند یک پلاگین ضروری را اجراء کند. نصب دوباره Briar (برایر) معمولا این مشکل را حل میکند. هرچند، توجه داشته باشید که حساب کاربری و تمام داده های مرتبط با آن را از دست خواهید داد از آنجایی که Briar (برایر) از هیچ سرور مرکزی برای ذخیره داده های شما استفاده نمی کند.</string>
+  <string name="startup_failed_service_error">Briar (برایر) نمی تواند یک افزونه ضروری را اجراء کند. نصب دوباره Briar (برایر) معمولا این مشکل را حل میکند. هرچند، توجه داشته باشید که حساب کاربری و تمام داده های مرتبط با آن را از دست خواهید داد از آنجایی که Briar (برایر) از هیچ سرور مرکزی برای ذخیره داده های شما استفاده نمی کند.</string>
   <plurals name="expiry_warning">
     <item quantity="one">این یک نسخه آزمایشی از Briar (برایر) می باشد. حساب کاربری شما در %d روز آینده به پایان می رسد و امکان تمدید آن وجود نخواهد داشت.</item>
     <item quantity="other">این یک نسخه آزمایشی از Briar (برایر) می باشد. حساب کاربری شما در %d روز آینده به پایان می رسد و امکان تمدید آن وجود نخواهد داشت.</item>
@@ -50,15 +50,15 @@
 
 بابت تست از شما سپاسگزاریم.</string>
   <string name="download_briar">برای اینکه به استفاده خود از Briar (برایر) ادامه دهید، لطفا نسخه ۱.۰ را دانلود کنید.</string>
-  <string name="create_new_account">لازم است تا یک حساب کاربری جدید ایجاد کنید، می توانید از نام مستعار یکسان برای حساب های کاربری استفاده کنید.</string>
+  <string name="create_new_account">لازم است تا یک حساب کاربری جدید ایجاد کنید، ولی می توانید از همان نام مستعار استفاده کنید.</string>
   <string name="download_briar_button">دانلود Briar (برایر) 1.0</string>
-  <string name="startup_open_database">رمزگشایی سیستم ...</string>
-  <string name="startup_migrate_database">به روز رسانی سیستم ...</string>
-  <string name="startup_compact_database">درحال فشرده‌سازی پایگاه داده...</string>
+  <string name="startup_open_database">در حال رمزگشایی سیستم ...</string>
+  <string name="startup_migrate_database">در حال ارتقا سیستم ...</string>
+  <string name="startup_compact_database">درحال فشرده‌ سازی پایگاه داده...</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">باز کردن منوی برنامه</string>
   <string name="nav_drawer_close_description">بستن منوی برنامه</string>
-  <string name="contact_list_button">مخاطبین</string>
+  <string name="contact_list_button">مخاطبان</string>
   <string name="groups_button">گروه های خصوصی</string>
   <string name="forums_button">تالار های گفتمان</string>
   <string name="blogs_button">بلاگ ها</string>
@@ -72,7 +72,7 @@
   <string name="transport_lan">وای فای</string>
   <!--Notifications-->
   <string name="reminder_notification_title">از Briar (برایر) خارج شد</string>
-  <string name="reminder_notification_text">برای وارد شدن دوباره کلیک کنید.</string>
+  <string name="reminder_notification_text">برای وارد شدن دوباره ضربه بزنید.</string>
   <string name="reminder_notification_channel_title">یادآور ورود Briar (برایر)</string>
   <string name="reminder_notification_dismiss">رد کردن</string>
   <string name="ongoing_notification_title">وارد Briar (برایر) شد</string>
@@ -115,16 +115,18 @@
   <string name="show_onboarding">نمایش پنجره راهنما</string>
   <string name="fix">اصلاح</string>
   <string name="help">راهنما</string>
-  <string name="sorry">متاسفم</string>
+  <string name="sorry">پوزش</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">هیچ مخاطبی برای نمایش وجود ندارد</string>
   <string name="no_contacts_action">برای افزودن مخاطب روی + کلیک کنید</string>
   <string name="date_no_private_messages">هیچ پیامی موجود نیست</string>
   <string name="no_private_messages">هیچ پیامی برای نشان دادن وجود ندارد</string>
   <string name="message_hint">نوشتن پیام</string>
-  <string name="image_caption_hint">یک عنوان اضافه کنید (اختیاری)</string>
-  <string name="image_attach">تصویر پیوست</string>
-  <string name="image_attach_error">تصویر پیوست نشد</string>
+  <string name="image_caption_hint">افزودن یک شرح (اختیاری)</string>
+  <string name="image_attach">پیوست کردن تصویر</string>
+  <string name="image_attach_error">پیوست کردن تصویر(ها) ممکن نمی باشد</string>
+  <string name="image_attach_error_too_big">تصویر بیش از اندازه بزرگ است. محدودیت %d مگابایت می باشد.</string>
+  <string name="image_attach_error_invalid_mime_type">فرمت تصویر پشتیبانی نمی‌شود: %s</string>
   <string name="set_contact_alias">تغییر نام مخاطب</string>
   <string name="set_contact_alias_hint">نام مخاطب</string>
   <string name="set_alias_button">تغییر</string>
@@ -136,15 +138,19 @@
   <string name="you">شما</string>
   <string name="save_image">ذخیره تصویر</string>
   <string name="dialog_title_save_image">ذخیره تصویر؟</string>
-  <string name="dialog_message_save_image">ذخیره این تصویر به دیگر برنامه‌ها اجازه می‌دهد تا به آن دسترسی داشته باشند.\n\n آیا مطمئن هستید که می‌خواهید ذخیره کنید؟</string>
+  <string name="dialog_message_save_image">ذخیره این تصویر به دیگر برنامه‌ها اجازه می‌دهد تا به آن دسترسی داشته باشند.
+
+آیا از ذخیره کردن مطمئن می باشید؟</string>
   <string name="save_image_success">تصویر ذخیره شد</string>
   <string name="save_image_error">تصویر ذخیره نشد</string>
-  <string name="dialog_title_no_image_support">تصاویر در دسترس نیست</string>
-  <string name="dialog_message_no_image_support">مخاطب برایر شما هنوز از پیوست‌های تصویر پشتیبانی نمی‌کند. هنگامی که آن‌ها را ارتقا دهید یک آیکون دیگر خواهید دید.</string>
-  <string name="dialog_title_image_support">شما هم اکنون می‌توانید تصاویر را به این مخاطب ارسال کنید</string>
-  <string name="dialog_message_image_support">برای پیوست تصاویر به روی آیکون ضربه بزنید</string>
+  <string name="dialog_title_no_image_support">تصاویر در دسترس نمی باشند</string>
+  <string name="dialog_message_no_image_support">Briar (برایر) مخاطب شما هنوز از پیوست‌ های تصویری پشتیبانی نمی‌کند. هنگامی که آنها ارتقا دادند یک آیکون متفاوت خواهید دید.</string>
+  <string name="dialog_title_image_support">شما هم اکنون می‌توانید به این مخاطب تصاویر ارسال کنید</string>
+  <string name="dialog_message_image_support">برای پیوست کردن تصاویر به روی آیکون ضربه بزنید.</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">افزودن مخاطب از نزدیک</string>
   <string name="face_to_face">برای اضافه کردن فرد به عنوان مخاطب باید با او به صورت حضوری ملاقات کنید.
+
 این از جعل هویت شما و یا از خوانده شدن پیام هایتان در آینده جلوگیری خواهد کرد.</string>
   <string name="continue_button">ادامه</string>
   <string name="try_again_button">دوباره سعی کنید</string>
@@ -152,29 +158,86 @@
   <string name="exchanging_contact_details">تبادیل جزییات مخاطبu2026\</string>
   <string name="contact_added_toast">مخاطب اضافه شد: %s</string>
   <string name="contact_already_exists">مخاطب %s از قبل وجود دارد</string>
-  <string name="qr_code_invalid">کد QR نامعتبر می باشد</string>
-  <string name="qr_code_too_old">کد QR اسکن شده متعلق به یک نسخه قدیمی از %s است.
+  <string name="qr_code_invalid">کد کیوآر نامعتبر می باشد</string>
+  <string name="qr_code_too_old">کد کیوآر اسکن شده متعلق به یک نسخه قدیمی از %s است.
 
-لطفا از مخاطب‌تان بخواهید تا به آخرین نسخه ارتقا داده و سپس دوباره تلاش کنید.</string>
-  <string name="qr_code_too_new">کد QR که شما اسکن کرده‌اید متعلق به یک نسخه جدیدتر  از %s است.
+لطفا از مخاطب‌ خود بخواهید تا به آخرین نسخه ارتقا داده و سپس دوباره تلاش کنید.</string>
+  <string name="qr_code_too_new">کد کیوآر اسکن شده توسط شما متعلق به یک نسخه جدیدتر  از %s است.
 
 لطفا به آخرین نسخه ارتقا داده و دوباره تلاش کنید.</string>
   <string name="camera_error">خطای دوربین</string>
   <string name="connecting_to_device">اتصال به دستگاهu2026\</string>
   <string name="authenticating_with_device">تصدیق سازی با دستگاه u2026\</string>
   <string name="connection_error_title">اتصال به مخاطب شما برقرار نشد</string>
-  <string name="connection_error_explanation">لطفا مطمئن شوید که هردو شما به شبکه وای فای یکسان متصل هستید.</string>
-  <string name="connection_error_feedback">اگر این مشکل ادامه پیدا کرد، لطفا <a href="feedback">بازخورد ارسال کنید</a> تا به ما در ارتقاء برنامه کمک کنید.</string>
+  <string name="connection_error_explanation">لطفا مطمئن شوید که هر دو شما به شبکه وای فای یکسان متصل هستید.</string>
+  <string name="connection_error_feedback">اگر این مشکل ادامه پیدا کرد، لطفا <a href="feedback">بازخورد ارسال کنید</a> تا به ما در بهبود برنامه کمک کنید.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">افزودن مخاطب از دور</string>
+  <string name="add_contact_nearby_title">افزودن مخاطب از نزدیک</string>
+  <string name="add_contact_remotely_title">افزودن مخاطب از راه دور</string>
+  <string name="contact_name_hint">دادن یک نام مستعار به مخاطب</string>
+  <string name="contact_link_intro">پیوند آمده از مخاطب خود را اینجا وارد کنید</string>
+  <string name="contact_link_hint">پیوند مخاطب</string>
   <string name="paste_button">چسباندن</string>
-  <string name="copy_button">تکثیر</string>
-  <string name="share_button">هم‌رسانی</string>
+  <string name="add_contact_button">افزودن مخاطب</string>
+  <string name="copy_button">کپی</string>
+  <string name="share_button">اشتراک گذاری</string>
+  <string name="send_link_title">تبادل پیوندها</string>
+  <string name="add_contact_choose_nickname">انتخاب نام مستعار</string>
+  <string name="add_contact_choose_a_nickname">یک نام مستعار وارد کنید</string>
+  <string name="nickname_intro">به مخاطب خود یک نام مستعار بدهید. فقط شما قادر به دیدن آن می باشید.</string>
+  <string name="your_link">برای افزودن مخاطب این پیوند را به او بدهید</string>
+  <string name="link_clip_label">پیوند Briar (برایر)</string>
+  <string name="link_copied_toast">پیوند کپی شد</string>
+  <string name="adding_contact_error">یک خطا هنگام افزودن مخاطب رخ داد.</string>
+  <string name="pending_contact_requests_snackbar">درخواست های مخاطب معلق وجود دارند</string>
+  <string name="pending_contact_requests">درخواست های مخاطب معلق</string>
+  <string name="no_pending_contacts">هیچ مخاطب معلقی وجود ندارد</string>
   <string name="add_contact_remote_connecting">در حال اتصال…</string>
+  <string name="waiting_for_contact_to_come_online">انتظار برای آنلاین شدن مخاطب...</string>
   <string name="connecting">در حال اتصال…</string>
+  <string name="adding_contact">در حال افزودن مخاطب...</string>
+  <string name="adding_contact_failed">افزودن مخاطب ناموفق بود</string>
+  <string name="dialog_title_remove_pending_contact">تایید حذف</string>
+  <string name="dialog_message_remove_pending_contact">این مخاطب هنوز در حال اضافه شدن می باشد. اگر اکنون آن را حذف کنید، دیگر افزوده نخواهد شد.</string>
+  <string name="own_link_error">به جای پیوند خود، پیوند مخاطب را وارد کنید</string>
+  <string name="nickname_missing">لطفا یک نام مستعار وارد کنید</string>
+  <string name="invalid_link">پیوند نامعتبر</string>
+  <string name="unsupported_link">این پیوند از یک نسخه جدیدتر Briar (برایر) آمده است. لطفا به آخرین نسخه ارتقا دهید و دوباره امتحان کنید.</string>
+  <string name="intent_own_link">شما پیوند خود را باز کردید. پیوند مخاطبی که میخواهید اضافه کنید را استفاده کنید!</string>
+  <string name="missing_link">لطفا یک پیوند وارد کنید</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">۱</string>
   <!--This is a numeral indicating the second step in a series of screens-->
   <string name="step_2">۲</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">مخاطب جدید افزوده شد.</item>
+    <item quantity="other">%d مخاطب جدید افزوده شد.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">افزودن این مخاطب بیشتر از حد معمول وقت گرفته است</string>
+  <string name="adding_contact_slow_title">عدم توانایی در اتصال به مخاطب</string>
+  <string name="adding_contact_slow_text">افزودن این مخاطب بیش تر از معمول وقت گرفته است.
+
+لطفا بررسی کنید که مخاطب شما پیوندتان را دریافت کرده و شما را افزوده است:</string>
+  <string name="offline_state">ارتباط با اینترنت برقرار نیست</string>
+  <string name="duplicate_link_dialog_title">پیوند تکراری</string>
+  <string name="duplicate_link_dialog_text_1">شما هم اکنون یک مخاطب معلق با این پیوند دارید: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">آیا %s و %s یک شخص می باشند؟</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">همان شخص</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">شخص متفاوت</string>
+  <string name="duplicate_link_dialog_text_3">%s و %s پیوند یکسانی را به شما ارسال کردند.
+
+یکی از آن ها ممکن است سعی در شناسایی مخاطبان شما داشته باشد.
+
+به آن ها نگویید که همان لینک را از یک شخص دیگر دریافت کرده اید.</string>
+  <string name="pending_contact_updated_toast">مخاطب معلق به روز رسانی شد</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">معرفی مخاطبان</string>
   <string name="introduction_onboarding_text">شما می توانید مخاطبان خود را به یکدیگر معرفی کنید، در این صورت دیگر نیازی به دیدار حضوری برای اتصال روی Briar (برایر) نمی باشد.</string>
@@ -367,11 +430,11 @@
   <string name="blogs_rss_feeds_manage_delete_error">خوراک نمی تواند پاک شود!</string>
   <string name="blogs_rss_feeds_manage_empty_state">هیچ خوراک RSS برای نمایش وجود ندارد
 
-برای وارد کردن خوراک روی آیکون + کلیک کنید</string>
+برای وارد کردن خوراک روی آیکون + ضربه بزنید</string>
   <string name="blogs_rss_feeds_manage_error">مشکلی با بارگذاری فیدهای شما وجود داشت. لطفا بعدا امتحان کنید.</string>
   <!--Settings Display-->
   <string name="pref_language_title">زبان و منطقه</string>
-  <string name="pref_language_changed">این تنظیمات زمانی که Briar (برایر) را ری استارت کنید تاثیر خود را می گذارند. لطفا خارج شوید و Briar (برایر) را ری استارت کنید.</string>
+  <string name="pref_language_changed">این تنظیمات زمانی که Briar (برایر) را ری استارت کنید تاثیر خود را می گذارند. لطفا خارج شوید و Briar (برایر) را دوباره راه اندازی کنید.</string>
   <string name="pref_language_default">پیش فرض سیستم</string>
   <string name="display_settings_title">نمایش</string>
   <string name="pref_theme_title">قالب</string>
@@ -385,15 +448,15 @@
   <string name="bluetooth_setting_enabled">هر زمانی که مخاطبان نزدیک هستند</string>
   <string name="bluetooth_setting_disabled">فقط در هنگام افزودن مخاطبان</string>
   <string name="tor_network_setting">اتصال از طریق اینترنت (تور)</string>
-  <string name="tor_network_setting_automatic">اتوماتیک مبتنی بر مکان</string>
-  <string name="tor_network_setting_without_bridges">استفاده از تور بدون بریج</string>
-  <string name="tor_network_setting_with_bridges">استفاده از تور با بریج</string>
+  <string name="tor_network_setting_automatic">خودکار مبتنی بر موقعیت</string>
+  <string name="tor_network_setting_without_bridges">استفاده از تور بدون پل ها</string>
+  <string name="tor_network_setting_with_bridges">استفاده از تور با پل ها</string>
   <string name="tor_network_setting_never">وصل نشو</string>
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
   <string name="tor_network_setting_summary">خودکار: %1$s(در %2$s)</string>
   <string name="tor_mobile_data_title">استفاده از داده موبایل</string>
   <string name="tor_only_when_charging_title">اتصال از طریق اینترنت (تور) فقط در هنگام شارژ</string>
-  <string name="tor_only_when_charging_summary">وقتی دستگاه با باتری در حال اجرا است، ارتباط به اینترنت را غیرفعال می‌کند</string>
+  <string name="tor_only_when_charging_summary">ارتباط اینترنت را هنگامی که دستگاه در حال استفاده از باتری خود می باشد را غیرفعال می کند</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">امنیت</string>
   <string name="pref_lock_title">قفل برنامه</string>
@@ -414,17 +477,17 @@
   <string name="pref_lock_timeout_60">۱ ساعت</string>
   <string name="pref_lock_timeout_never">هرگز</string>
   <string name="pref_lock_timeout_never_summary">هیچوقت Briar (برایر) را به صورت خودکار قفل نکن</string>
-  <string name="change_password">تغییر رمز عبور</string>
-  <string name="current_password">رمز عبور فعلی</string>
-  <string name="choose_new_password">رمز عبور جدید</string>
-  <string name="confirm_new_password">تائید رمز جدید</string>
-  <string name="password_changed">رمز عبور تغییر کرده است</string>
-  <string name="panic_setting">برپایی دکمه هراس</string>
+  <string name="change_password">تغییر گذرواژه</string>
+  <string name="current_password">گذرواژه فعلی</string>
+  <string name="choose_new_password">گذرواژه جدید</string>
+  <string name="confirm_new_password">تائید گذرواژه جدید</string>
+  <string name="password_changed">گذرواژه تغییر کرده است</string>
+  <string name="panic_setting">نصب دکمه هراس</string>
   <string name="panic_setting_title">دکمه هراس</string>
   <string name="panic_setting_hint">تنظیم نحوه واکنش Briar (برایر) هنگام فعال سازی دکمه هراس</string>
   <string name="panic_app_setting_title">برنامه دکمه هراس</string>
   <string name="unknown_app">یک برنامه ناشناخته</string>
-  <string name="panic_app_setting_summary">هیچ برنامه تنظیم نشده است</string>
+  <string name="panic_app_setting_summary">هیچ برنامه ای تنظیم نشده است</string>
   <string name="panic_app_setting_none">هیچکدام</string>
   <string name="dialog_title_connect_panic_app">تایید برنامه هراس</string>
   <string name="dialog_message_connect_panic_app">آیا مطمئن هستید که میخواهید به %1$s اجازه دهید تا باعث عملیات مخرب دکمه هراس بشود؟</string>
@@ -432,7 +495,7 @@
   <string name="panic_setting_signout_title">خروج</string>
   <string name="panic_setting_signout_summary">در صورت کلیک بر روی کلید هراس از Briar (برایر) خارج شو</string>
   <string name="purge_setting_title">حذف حساب کاربری</string>
-  <string name="purge_setting_summary">پاک کردن حساب کاربری Briar (برایر) شما در صورتی که دکمه هراس فشار داده شود. اخطار: این باعث پاک شدن دائمی تمام هویت ها، مخاطبان و پیام های شما خواهد شد</string>
+  <string name="purge_setting_summary">در صورت فشار دادن دکمه هراس حساب کاربری Briar (برایر) شما حذف خواهد شد. اخطار: این باعث حذف دائمی تمام هویت ها، مخاطبان و پیام های شما خواهد شد</string>
   <string name="uninstall_setting_title">پاک کردن Briar (برایر)</string>
   <string name="uninstall_setting_summary">این نیازمند تایید دستی در موعد هراس میباشد</string>
   <!--Settings Notifications-->
@@ -461,10 +524,10 @@
   <string name="feedback_settings_title">بازخورد</string>
   <string name="send_feedback">ارسال بازخورد</string>
   <!--Link Warning-->
-  <string name="link_warning_title">هشدار لینک</string>
+  <string name="link_warning_title">هشدار پیوند</string>
   <string name="link_warning_intro">با باز کردن لینک زیر شما یک برنامه بیرونی را باز خواهید کرد.</string>
-  <string name="link_warning_text">این می‌تواند برای شناسایی شما مورد استفاده قرار بگیرد. قبل از باز کردن آن به قابل اطمینان بودن شخصی که آن را برای شما ارسال کرده فکر کنید و بعد برای احتیاط آن را با مرورگر تور باز کنید.</string>
-  <string name="link_warning_open_link">باز کردن لینک</string>
+  <string name="link_warning_text">این می‌تواند برای شناسایی شما مورد استفاده قرار بگیرد. قبل از باز کردن این پیوند به قابل اطمینان بودن شخصی که آن را برای شما ارسال کرده فکر کنید و بعد برای احتیاط آن را با مرورگر تور باز کنید.</string>
+  <string name="link_warning_open_link">باز کردن پیوند</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">گزارش خطای Briar (برایر)</string>
   <string name="briar_crashed">متاسفیم، Briar (برایر) از کار افتاده است.</string>
@@ -493,21 +556,27 @@
   <string name="screen_filter_allow">به این برنامه ها اجازه بده تا روی Briar (برایر) قرار بگیرند</string>
   <!--Permission Requests-->
   <string name="permission_camera_title">دسترسی به دوربین</string>
-  <string name="permission_camera_request_body">برای اسکن کردن کد QR دسترسی به دوربین لازم است.</string>
-  <string name="permission_location_title">مجوز موقعیت محل</string>
-  <string name="permission_location_request_body">برای پیدا کردن دستگاه‌های بلوتوث، برایر نیاز به اجازه دسترسی به موقعیت مکانی شما دارد.\n\n برایر موقعیت مکان شما را ذخیره نمی‌کند و آن را با کسی به اشتراک نمی‌گذارد.</string>
+  <string name="permission_camera_request_body">برای اسکن کردن کد کیوآر دسترسی به دوربین لازم است.</string>
+  <string name="permission_location_title">اجازه موقعیت</string>
+  <string name="permission_location_request_body">برای پیدا کردن دستگاه‌های بلوتوث، Briar (برایر) نیاز به اجازه دسترسی به موقعیت شما دارد.
+
+Briar  (برایر) موقعیت شما را ذخیره نمی‌کند و آن را با کسی به اشتراک نمی‌گذارد.</string>
   <string name="permission_camera_location_title">دوربین و موقعیت</string>
-  <string name="permission_camera_location_request_body">برای اسکن کد کیو‌آر، برایر نیاز به دسترسی به دوربین دارد.\n\n برای پیدا کردن دستگاه‌های بلوتوث، برایر نیاز به اجازه دسترسی به موقعیت مکانی شما دارد.\n\n برایر موقعیت مکان شما را ذخیره نمی‌کند و آن را با کسی به اشتراک نمی‌گذارد.</string>
+  <string name="permission_camera_location_request_body">برای اسکن کد کیوآر، Briar (برایر) نیاز به دسترسی به دوربین دارد.
+
+برای پیدا کردن دستگاه‌های بلوتوث، Briar (برایر) نیاز به اجازه دسترسی به موقعیت شما دارد.
+
+Briar (برایر) موقعیت شما را ذخیره نمی‌کند و آن را با کسی به اشتراک نمی‌گذارد.</string>
   <string name="permission_camera_denied_body">شما دسترسی به دوربین را رد کرده اید، اما افزودن مخاطب نیاز به دوربین دارد.
 
 لطفا اجازه دسترسی را بدهید.</string>
-  <string name="qr_code">کد QR</string>
-  <string name="show_qr_code_fullscreen">نمایش کد QR به صورت فول اسکرین</string>
+  <string name="qr_code">کد کیوآر</string>
+  <string name="show_qr_code_fullscreen">نمایش کد کیوآر به صورت فول اسکرین</string>
   <!--App Locking-->
-  <string name="lock_unlock">آنلاک کردن Briar (برایر)</string>
-  <string name="lock_unlock_verbose">PIN، الگو یا رمز عبور دستگاه خود را برای آنلاک کردن Briar (برایر) وارد کنید</string>
+  <string name="lock_unlock">باز کردن قفل Briar (برایر)</string>
+  <string name="lock_unlock_verbose">پین، الگو یا گذرواژه دستگاه خود را برای باز کردن قفل Briar (برایر) وارد کنید</string>
   <string name="lock_unlock_fingerprint_description">برای ادامه سنسور اثر انگشت را با انگشت ثبت شده تان لمس کنید</string>
-  <string name="lock_unlock_password">از رمز عبور استفاده کنید</string>
+  <string name="lock_unlock_password">استفاده از گذرواژه</string>
   <string name="lock_is_locked">Briar (برایر) قفل می باشد</string>
   <string name="lock_tap_to_unlock">برای آنلاک کردن کلیک کنید</string>
   <!--Screenshots-->
@@ -520,7 +589,7 @@
   <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
   <string name="screenshot_message_1">هی باب!</string>
   <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
-  <string name="screenshot_message_2">هی آلیس! ممنون از اینکه درباره Briar به من گفتی!</string>
+  <string name="screenshot_message_2">هی آلیس! ممنون از اینکه درباره Briar (برایر) به من گفتی!</string>
   <!--This is a message to be used in screenshots.-->
   <string name="screenshot_message_3">خواهش میکنم، امیدوارم ازش خوشت بیاد 😀</string>
 </resources>

briar-android/src/main/res/values-fi/strings.xml

@@ -148,6 +148,13 @@
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
   <string name="step_2">2</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
   <!--Introductions-->
   <string name="introduction_onboarding_title">Esittele yhteyshenkilösi</string>
   <string name="introduction_onboarding_text">Voit esitellä muita käyttäjiä toisilleen, niin että heidän ei tarvitse tavata kasvokkain ollakseen yhteydessä Briarin kautta.</string>

briar-android/src/main/res/values-fr/strings.xml

@@ -35,7 +35,7 @@
   <string name="startup_failed_activity_title">Échec de démarrage de Briar</string>
   <string name="startup_failed_db_error">Pour quelque raison, votre base de données Briar est corrompue sans espoir de réparation. Votre compte, vos données et tous vos contacts sont perdus. Malheureusement, vous devez réinstaller Briar et créer un nouveau compte en choisissant « J’ai oublié mon mot de passe » dans l’invite de mot de passe.</string>
   <string name="startup_failed_data_too_old_error">Votre compte a été créé avec une ancienne version de cette appli et ne peut pas être ouvert avec cette version. Vous devez soit réinstaller l’ancienne version, soit créer un nouveau compte en choisissant « J’ai oublié mon mot de passe » dans l’invite de mot de passe.</string>
-  <string name="startup_failed_data_too_new_error">Cette version de l’appli est trop ancienne. Veuillez la mettre à niveau vers la dernière version et ressayer.</string>
+  <string name="startup_failed_data_too_new_error">Cette version de l’appli est trop ancienne. Veuillez passer à la version la plus récente et ressayer.</string>
   <string name="startup_failed_service_error">Briar n’a pas pu démarrer un greffon exigé. Réinstaller Briar résout généralement ce problème. Veuillez cependant noter que vous perdrez votre compte et toutes données relatives puisque Briar n’utilise pas de serveurs centralisés sur lesquels enregistrer vos données.</string>
   <plurals name="expiry_warning">
     <item quantity="one">Ceci est une version de test de Briar. Votre compte arrivera à expiration dans %d jour et ne peut pas être renouvelé.</item>
@@ -118,10 +118,17 @@
   <string name="message_hint">Rédiger le message</string>
   <string name="image_caption_hint">Ajouter une légende (facultatif)</string>
   <string name="image_attach">Joindre une image</string>
-  <string name="image_attach_error">Impossible d’attacher une image</string>
+  <string name="image_attach_error">Impossible de joindre une ou des images</string>
+  <string name="image_attach_error_too_big">L’image est trop volumineuse. La limite est %d Mo</string>
+  <string name="image_attach_error_invalid_mime_type">Format d’image non pris en charge : %s</string>
   <string name="set_contact_alias">Changer le nom du contact</string>
   <string name="set_contact_alias_hint">Nom du contact</string>
   <string name="set_alias_button">Modifier</string>
+  <string name="delete_all_messages">Supprimer tous les messages</string>
+  <string name="dialog_title_delete_all_messages">Confirmer la suppression des messages</string>
+  <string name="dialog_message_delete_all_messages">Voulez-vous vraiment supprimer tous les messages ?</string>
+  <string name="dialog_title_not_all_messages_deleted">Impossible de supprimer tous les messages</string>
+  <string name="dialog_message_not_all_messages_deleted">Les messages relatifs aux présentations ou invitations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.</string>
   <string name="delete_contact">Supprimer le contact</string>
   <string name="dialog_title_delete_contact">Confirmer la suppression du contact</string>
   <string name="dialog_message_delete_contact">Voulez-vous vraiment supprimer ce contact et tous les messages associés ?</string>
@@ -137,18 +144,19 @@
   <string name="dialog_message_no_image_support">Le Briar de votre contact ne prend pas encore en charge les images jointes. Une fois que son appli aura été mise à niveau, vous verrez une icône différente.</string>
   <string name="dialog_title_image_support">Vous pouvez désormais envoyer des images à ce contact</string>
   <string name="dialog_message_image_support">Touchez cette icône pour joindre des images.</string>
+  <string name="messaging_too_many_attachments_toast">Seules les %d premières images seront envoyées</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Ajouter un contact à proximité</string>
   <string name="face_to_face">Vous devez rencontrer la personne que vous voulez ajouter comme contact, afin d’éviter que quelqu’un se fasse passer pour vous et puisse lire vos messages à l’avenir.</string>
   <string name="continue_button">Continuer</string>
   <string name="try_again_button">Ressayer</string>
-  <string name="waiting_for_contact_to_scan">En attente de lecture du code QR par le contact et de sa connexion\u2026</string>
+  <string name="waiting_for_contact_to_scan">En attente de balayage du code QR par le contact et de sa connexion\u2026</string>
   <string name="exchanging_contact_details">Échange des renseignements de contact\u2026</string>
   <string name="contact_added_toast">Contact ajouté : %s</string>
   <string name="contact_already_exists">Le contact %s existe déjà</string>
   <string name="qr_code_invalid">Le code QR est invalide</string>
-  <string name="qr_code_too_old">Le code QR que vous avez lu provient d’une version plus ancienne de %s.\n\nVeuillez demander à votre contact de passer à la version la plus récente, puis ressayez.</string>
-  <string name="qr_code_too_new">Le code QR que vous avez lu provient d’une version plus récente de %s.\n\nVeuillez passer à la version la plus récente, puis ressayez.</string>
+  <string name="qr_code_too_old">Le code QR que vous avez balayé provient d’une version plus ancienne de %s.\n\nVeuillez demander à votre contact de passer à la version la plus récente et ressayer.</string>
+  <string name="qr_code_too_new">Le code QR que vous avez balayé provient d’une version plus récente de %s.\n\nVeuillez passer à la version la plus récente et ressayer.</string>
   <string name="camera_error">Erreur de l’appareil photo</string>
   <string name="connecting_to_device">Connexion à l’appareil\u2026</string>
   <string name="authenticating_with_device">Autentification avec l’appareil\u2026</string>
@@ -178,13 +186,16 @@
   <string name="pending_contact_requests">Demandes de contact en attente</string>
   <string name="no_pending_contacts">Il n’y a aucun contact en attente</string>
   <string name="add_contact_remote_connecting">Connexion…</string>
-  <string name="waiting_for_contact_to_come_online">En attente de l’arrivée en ligne du contact…\n\nA-t-il déjà saisi votre lien ?</string>
+  <string name="waiting_for_contact_to_come_online">En attente de l’arrivée en ligne du contact…</string>
   <string name="connecting">Connexion…</string>
   <string name="adding_contact">Ajout du contact…</string>
   <string name="adding_contact_failed">Échec d’ajout du contact</string>
+  <string name="dialog_title_remove_pending_contact">Confirmer la suppression</string>
+  <string name="dialog_message_remove_pending_contact">Le contact est encore en cours d’ajout. Si vous le supprimez maintenant, il ne sera pas ajouté.</string>
   <string name="own_link_error">Saisissez le lien de votre contact, pas le vôtre</string>
   <string name="nickname_missing">Veuillez saisir un pseudonyme</string>
   <string name="invalid_link">Le lien est invalide</string>
+  <string name="unsupported_link">Ce lien provient d’une version plus récente de Briar. Veuillez passer à la version la plus récente et ressayer.</string>
   <string name="intent_own_link">Vous avez ouvert votre propre lien. Utilisez celui du contact que vous souhaitez ajouter.</string>
   <string name="missing_link">Veuillez saisir un lien</string>
   <!--This is a numeral indicating the first step in a series of screens-->
@@ -195,6 +206,25 @@
     <item quantity="one">Un nouveau contact a été ajouté</item>
     <item quantity="other">%d nouveaux contacts ont été ajoutés.</item>
   </plurals>
+  <string name="adding_contact_slow_warning">L’ajout de ce contact prend plus longtemps que d’habitude</string>
+  <string name="adding_contact_slow_title">Impossible de se connecter au contact</string>
+  <string name="adding_contact_slow_text">L’ajout de ce contact prend plus longtemps que d’habitude.\n\nVeuillez vérifier si votre contact a reçu votre lien et vous a ajouté :</string>
+  <string name="offline_state">Aucune connexion à Internet</string>
+  <string name="duplicate_link_dialog_title">Lien en double</string>
+  <string name="duplicate_link_dialog_text_1">Vous avez déjà un contact en attente avec ce lien : %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Vous avez déjà un contact avec ce lien : %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%s et %s sont-elles la même personne ?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">La même personne</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Une personne différente</string>
+  <string name="duplicate_link_dialog_text_3">%s et %s vous ont envoyé le même lien.\n\nL\'une d’elle pourrait tenter de découvrir qui sont vos contacts.\n\nNe lui dites pas que vous avez reçu le même lien de quelqu’un d’autre.</string>
+  <string name="pending_contact_updated_toast">Le contact en attente a été mis à jour</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Présenter vos contacts</string>
   <string name="introduction_onboarding_text">Vous pouvez présenter vos contacts mutuellement, afin qu’ils n’aient pas à se rencontrer en personne pour se connecter les uns aux autres avec Briar.</string>
@@ -487,11 +517,11 @@
   <string name="screen_filter_allow">Permettre à ces applis de s’afficher par-dessus</string>
   <!--Permission Requests-->
   <string name="permission_camera_title">Autorisation d’accès à l’appareil photo</string>
-  <string name="permission_camera_request_body">Afin de lire le code QR, Briar doit accéder à l’appareil photo.</string>
+  <string name="permission_camera_request_body">Afin de balayer le code QR, Briar doit accéder à l’appareil photo.</string>
   <string name="permission_location_title">Autorisation d’accès à la position</string>
   <string name="permission_location_request_body">Afin de découvrir des périphériques Bluetooth, Briar doit accéder à votre position.\n\nBriar n’enregistre pas votre position et ne la partage avec personne.</string>
   <string name="permission_camera_location_title">Appareil photo et position</string>
-  <string name="permission_camera_location_request_body">Afin de lire le code QR, Briar doit accéder à l’appareil photo.\n\nAfin de découvrir des périphériques Bluetooth, Briar doit accéder à votre position.\n\nBriar n’enregistre pas votre position et ne la partage avec personne.</string>
+  <string name="permission_camera_location_request_body">Afin de balayer le code QR, Briar doit accéder à l’appareil photo.\n\nAfin de découvrir des périphériques Bluetooth, Briar doit accéder à votre position.\n\nBriar n’enregistre pas votre position et ne la partage avec personne.</string>
   <string name="permission_camera_denied_body">Vous avez refusé l’accès à la caméra, mais l’ajout de contacts exige l’utilisation de celle-ci.\n\nVeuillez envisager d’y accorder l’accès.</string>
   <string name="qr_code">Code QR</string>
   <string name="show_qr_code_fullscreen">Afficher le code QR en plein écran</string>

briar-android/src/main/res/values-gl/strings.xml

@@ -118,7 +118,9 @@
   <string name="message_hint">Esciba unha mensaxe</string>
   <string name="image_caption_hint">Engadir un comentario (optativo)</string>
   <string name="image_attach">Anexar imaxe</string>
-  <string name="image_attach_error">Non se anexou a imaxe</string>
+  <string name="image_attach_error">Non se anexaron imaxe(s)</string>
+  <string name="image_attach_error_too_big">Imaxe demasiado grande. Max %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Formato non admitido: %s</string>
   <string name="set_contact_alias">Cambiar o nome do contacto</string>
   <string name="set_contact_alias_hint">Nome do contacto</string>
   <string name="set_alias_button">Cambiar</string>
@@ -138,6 +140,7 @@
   <string name="dialog_title_image_support">Xa pode enviar imaxes a este contacto</string>
   <string name="dialog_message_image_support">Toque en esta icona para anexar imaxes.</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Engadir contacto próximo</string>
   <string name="face_to_face">Debe atoparse coa persoa que quere engadir como contacto.\n\Isto evitará que calquera poida suplantala ou ler as súas mensaxes no futuro.</string>
   <string name="continue_button">Continuar</string>
   <string name="try_again_button">Tenteo de novo</string>
@@ -155,13 +158,66 @@
   <string name="connection_error_explanation">Por favor, comprobe que ambas están conectadas a mesma rede Wi-Fi.</string>
   <string name="connection_error_feedback">Si persiste o problema,<a href="feedback">envíe un informe</a> para axudarnos a mellorar a app.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Engadir contacto a distancia</string>
+  <string name="add_contact_nearby_title">Engadir contacto próximo</string>
+  <string name="add_contact_remotely_title">Engadir contacto a distancia</string>
+  <string name="contact_name_hint">Darlle un alcume ao contacto</string>
+  <string name="contact_link_intro">Introducir aquí a ligazón do seu contacto</string>
+  <string name="contact_link_hint">Ligazón do contacto</string>
   <string name="paste_button">Pegar</string>
+  <string name="add_contact_button">Engadir contacto</string>
   <string name="copy_button">Copiar</string>
   <string name="share_button">Compartir</string>
+  <string name="send_link_title">Intercambiar ligazóns</string>
+  <string name="add_contact_choose_nickname">Escoller alcume</string>
+  <string name="add_contact_choose_a_nickname">Introducir alcume</string>
+  <string name="nickname_intro">Déalle un alcume ao contacto. Só vostede pode velo.</string>
+  <string name="your_link">Envíe esta ligazón ao contacto que quere engadir</string>
+  <string name="link_clip_label">Ligazón Briar</string>
+  <string name="link_copied_toast">Ligazón copiada</string>
+  <string name="adding_contact_error">Algo fallou ao engadir o contacto.</string>
+  <string name="pending_contact_requests_snackbar">Existen solicitudes de contactos pendentes</string>
+  <string name="pending_contact_requests">Solicitudes Pendentes de Contactos</string>
+  <string name="no_pending_contacts">Sen contactos pendentes</string>
   <string name="add_contact_remote_connecting">Conectando...</string>
+  <string name="waiting_for_contact_to_come_online">Agardando a que o contacto se conecte...</string>
   <string name="connecting">Conectando...</string>
+  <string name="adding_contact">Engadindo contacto...</string>
+  <string name="adding_contact_failed">Fallou engadir contacto</string>
+  <string name="dialog_title_remove_pending_contact">Confirme a eliminación</string>
+  <string name="dialog_message_remove_pending_contact">Este contacto aínda está a ser engadido. Se o elimina agora, non será engadido.</string>
+  <string name="own_link_error">Introduza a ligazón do contacto, non o propio</string>
+  <string name="nickname_missing">Por favor introduza un alcume</string>
+  <string name="invalid_link">Ligazón non válida</string>
+  <string name="unsupported_link">Esta ligazón chega desde unha versión nova de Briar. Por favor, actualice a nova versión e inténteo de novo.</string>
+  <string name="intent_own_link">Abreu a súa propia ligazón. Utilice a do contacto que quere engadir!</string>
+  <string name="missing_link">Por favor introduza ligazón</string>
   <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Novo contacto engadido.</item>
+    <item quantity="other">%d novos contactos engadidos.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Estanos a costar moito tempo engadir esta usuaria</string>
+  <string name="adding_contact_slow_title">Non puido conectar co Contacto</string>
+  <string name="adding_contact_slow_text">Estanos a costar engadir este contacto.\n\nPor favor, comprobe que o contacto recibeu a súa ligazón e engadeuna a vostede:</string>
+  <string name="offline_state">Sen conexión a internet</string>
+  <string name="duplicate_link_dialog_title">Duplicar Ligazón</string>
+  <string name="duplicate_link_dialog_text_1">Xa ten un contacto pendente con esta ligazón: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Son %s e %s a mesma persoa?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Mesma Persoa</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Diferente Persoa</string>
+  <string name="duplicate_link_dialog_text_3">%s e %s enviaronlle a mesma ligazón.\n\nUnha delas podería estar a intentar descubrir os seus contactos.\n\nNon lles diga que recibeu a mesma ligazón de alguén máis.</string>
+  <string name="pending_contact_updated_toast">Contacto pendente actualizado</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presente aos seus contactos</string>
   <string name="introduction_onboarding_text">Pode presentar aos seus contactos, así non precisan encontrarse en persoa para conectar a través de Briar.</string>

briar-android/src/main/res/values-he/strings.xml

@@ -131,10 +131,17 @@
   <string name="message_hint">הקלד הודעה</string>
   <string name="image_caption_hint">הוסף כיתוב (רשותי)</string>
   <string name="image_attach">צרף תמונה</string>
-  <string name="image_attach_error">לא היה ניתן לצרף תמונה</string>
+  <string name="image_attach_error">לא היה ניתן לצרף תמונה (או תמונות)</string>
+  <string name="image_attach_error_too_big">התמונה גדולה מדי. המגבלה היא %d מ\"ב.</string>
+  <string name="image_attach_error_invalid_mime_type">תסדיר תמונה בלתי נתמך: %s</string>
   <string name="set_contact_alias">שַׁנֵּה שם איש קשר</string>
   <string name="set_contact_alias_hint">שם איש הקשר</string>
   <string name="set_alias_button">שַׁנֵּה</string>
+  <string name="delete_all_messages">מחק את כל ההודעות</string>
+  <string name="dialog_title_delete_all_messages">אשר מחיקת הודעה</string>
+  <string name="dialog_message_delete_all_messages">האם אתה בטוח שאתה רוצה למחוק את כל ההודעות?</string>
+  <string name="dialog_title_not_all_messages_deleted">לא היה ניתן למחוק את כל ההודעות</string>
+  <string name="dialog_message_not_all_messages_deleted">הודעות שקשורות אל היכרויות מתמשכות או הזמנות אינן יכולות להימחק עד שההיכרויות או ההזמנות יסוימו.</string>
   <string name="delete_contact">מחק איש קשר</string>
   <string name="dialog_title_delete_contact">אשר מחיקת איש קשר</string>
   <string name="dialog_message_delete_contact">האם אתה בטוח שאתה רוצה למחוק איש קשר זה ואת כל ההודעות שהוחלפו עם איש קשר זה?</string>
@@ -150,6 +157,7 @@
   <string name="dialog_message_no_image_support">Briar של איש הקשר שלך אינו תומך בצרופות תמונה. ברגע שהוא ישדרג, תראה צלמית שונה.</string>
   <string name="dialog_title_image_support">אתה יכול כעת לשלוח תמונות אל איש קשר זה</string>
   <string name="dialog_message_image_support">הקש על צלמית זו כדי לצרף תמונות.</string>
+  <string name="messaging_too_many_attachments_toast">רק %d התמונות הראשונות יישלחו</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">הוסף איש קשר בקרבה</string>
   <string name="face_to_face">אתם חייבים להפגש עם האדם שאותו תרצו להוסיף כאיש קשר.
@@ -193,13 +201,16 @@
   <string name="pending_contact_requests">בקשות ממתינות של אנשי קשר</string>
   <string name="no_pending_contacts">אין בקשות ממתינות של אנשי קשר</string>
   <string name="add_contact_remote_connecting">מתחבר...</string>
-  <string name="waiting_for_contact_to_come_online">ממתין אל איש הקשר שיהיה מקוון...\n\nהאם הוא הכניס כבר את הקישור?</string>
+  <string name="waiting_for_contact_to_come_online">ממתין אל איש הקשר שיהיה מקוון...</string>
   <string name="connecting">מתחבר...</string>
   <string name="adding_contact">מוסיף איש קשר...</string>
   <string name="adding_contact_failed">הוספת איש קשר נכשלה</string>
+  <string name="dialog_title_remove_pending_contact">אשר הסרה</string>
+  <string name="dialog_message_remove_pending_contact">איש קשר זה מתווסף. אם תסיר אותו כעת, הוא לא יתווסף.</string>
   <string name="own_link_error">הכנס את הקישור של איש הקשר שלך, לא את שלך</string>
   <string name="nickname_missing">אנא הכנס כינוי</string>
   <string name="invalid_link">קישור בלתי תקף</string>
+  <string name="unsupported_link">קישור זה מגיע מגרסה חדשה יותר של Briar. אנא שדרג אל הגרסה האחרונה ונסה שוב.</string>
   <string name="intent_own_link">פתחת את הקישור של עצמך. השתמש באחד של איש הקשר שאתה רוצה להוסיף!</string>
   <string name="missing_link">אנא הכנס קישור</string>
   <!--This is a numeral indicating the first step in a series of screens-->
@@ -212,6 +223,25 @@
     <item quantity="many">%dאנשי קשר חדשים התווספו. </item>
     <item quantity="other">%d אנשי קשר חדשים התווספו.</item>
   </plurals>
+  <string name="adding_contact_slow_warning">הוספת איש קשר זה לוקחת מעבר לזמן הרגיל</string>
+  <string name="adding_contact_slow_title">לא ניתן להתחבר אל איש קשר</string>
+  <string name="adding_contact_slow_text">הוספת איש קשר זה לוקחת מעבר לזמן הרגיל.\n\nאנא בדוק שאיש הקשר שלך קיבל את הקישור שלך ושהוא הוסיף אותך:</string>
+  <string name="offline_state">אין חיבור אינטרנט</string>
+  <string name="duplicate_link_dialog_title">קישור כפול</string>
+  <string name="duplicate_link_dialog_text_1">יש לך כבר איש קשר ממתין עם קישור זה: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">יש לך כבר איש קשר עם קישור זה: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">האם %s ו־%s הם אותו איש?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">אותו איש</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">איש שונה</string>
+  <string name="duplicate_link_dialog_text_3">%s ו־%s שלחו לך את אותו הקישור.\n\nייתכן שאחד מהם מנסה לגלות מי הם אנשי הקשר שלך.\n\nאל תגיד לו שקיבלת את אותו הקישור ממישהו אחר.</string>
+  <string name="pending_contact_updated_toast">איש קשר ממתין עודכן</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">הציגו את אנשי קשר שלכם</string>
   <string name="introduction_onboarding_text">אתם יכולים להציג את אנשי הקשר שלכם אחד לשני, כך שהם לא צריכים להפגש פנים-מול-פנים על מנת להתחבר בבריאר.</string>

briar-android/src/main/res/values-hi/strings.xml

@@ -119,6 +119,8 @@
   <string name="image_caption_hint">एक कैप्शन जोड़ें (वैकल्पिक)</string>
   <string name="image_attach">छवि संलग्न करें</string>
   <string name="image_attach_error">छवि संलग्न नहीं कर सका</string>
+  <string name="image_attach_error_too_big">छवि बहुत बड़ी है। सीमा %d एमबी है।</string>
+  <string name="image_attach_error_invalid_mime_type">छवि प्रारूप असमर्थित: %s</string>
   <string name="set_contact_alias">संपर्क नाम बदलें</string>
   <string name="set_contact_alias_hint">संपर्क नाम</string>
   <string name="set_alias_button">परिवर्तन</string>
@@ -138,6 +140,7 @@
   <string name="dialog_title_image_support">अब आप इस संपर्क को चित्र भेज सकते हैं</string>
   <string name="dialog_message_image_support">छवियों को संलग्न करने के लिए इस प्रतिकृति को दबायें।</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">आस-पास वाले संपर्क जोड़ें</string>
   <string name="face_to_face">आपको उस व्यक्ति के साथ मिलना चाहिए जिसे आप संपर्क के रूप में जोड़ना चाहते हैं। \ N \ n यह किसी को भविष्य में आपके प्रतिरूपण या पढ़ने के बाद से किसी को भी रोकेगा।</string>
   <string name="continue_button">जारी रहना</string>
   <string name="try_again_button">पुनः प्रयास करें</string>
@@ -155,11 +158,66 @@
   <string name="connection_error_explanation">कृपया जांचें कि आप दोनों एक ही वाई-फाई नेटवर्क से जुड़े हुए हैं।</string>
   <string name="connection_error_feedback">यदि यह समस्या बनी रहती है, तो कृपया ऐप को बेहतर बनाने में हमारी सहायता के लिए <a href="feedback">फ़ीडबैक भेजें</a>।</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">दूरी वाले संपर्क जोड़ें</string>
+  <string name="add_contact_nearby_title">आस-पास वाले संपर्क जोड़ें</string>
+  <string name="add_contact_remotely_title">दूरी वाले संपर्क जोड़ें</string>
+  <string name="contact_name_hint">संपर्क को एक उपनाम दें</string>
+  <string name="contact_link_intro">यहां अपने संपर्क से लिंक दर्ज करें</string>
+  <string name="contact_link_hint">संपर्क का लिंक</string>
+  <string name="paste_button">चिपकाएं</string>
+  <string name="add_contact_button">संपर्क जोड़ें</string>
+  <string name="copy_button">प्रतिलिपि बनाएं</string>
   <string name="share_button">शेयर</string>
+  <string name="send_link_title">लिंक अदला बदली करें</string>
+  <string name="add_contact_choose_nickname">उपनाम चुने</string>
+  <string name="add_contact_choose_a_nickname">एक उपनाम दर्ज करें</string>
+  <string name="nickname_intro">अपने संपर्क को एक उपनाम दें। केवल आप इसे देख सकते हैं।</string>
+  <string name="your_link">आप जिस संपर्क को जोड़ना चाहते हैं, उसे यह लिंक दें</string>
+  <string name="link_clip_label">Briar लिंक</string>
+  <string name="link_copied_toast">लिंक कॉपी किया गया</string>
+  <string name="adding_contact_error">संपर्क जोड़ने में त्रुटि हुई।</string>
+  <string name="pending_contact_requests_snackbar">संपर्क अनुरोध लंबित हैं</string>
+  <string name="pending_contact_requests">लंबित संपर्क अनुरोध</string>
+  <string name="no_pending_contacts">कोई लंबित संपर्क नहीं</string>
   <string name="add_contact_remote_connecting">कनेक्ट हो रहा है ...</string>
+  <string name="waiting_for_contact_to_come_online">संपर्क की ऑनलाइन आने की प्रतीक्षा की जा रही है...</string>
   <string name="connecting">कनेक्ट हो रहा है ...</string>
+  <string name="adding_contact">संपर्क जोड़ रहा है ...</string>
+  <string name="adding_contact_failed">संपर्क जोड़ना विफल रहा</string>
+  <string name="dialog_title_remove_pending_contact">हटाने की पुष्टि करें</string>
+  <string name="dialog_message_remove_pending_contact">यह संपर्क अभी भी जोड़ा जा रहा है। यदि आप इसे अभी हटाते हैं, तो इसे जोड़ा नहीं जाएगा।</string>
+  <string name="own_link_error">अपना संपर्क का लिंक दर्ज करें, अपना नहीं</string>
+  <string name="nickname_missing">कृपया एक उपनाम दर्ज करें</string>
+  <string name="invalid_link">अमान्य लिंक</string>
+  <string name="unsupported_link">यह लिंक Briar के नए संस्करण से आया है। कृपया नवीनतम संस्करण में अद्यतन करें और पुनः प्रयास करें।</string>
+  <string name="intent_own_link">आपने अपना लिंक खोला। उस संपर्क का उपयोग करें जिसे आप जोड़ना चाहते हैं!</string>
+  <string name="missing_link">कृपया एक लिंक डालें।</string>
   <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">नया संपर्क जोड़ा गया|</item>
+    <item quantity="other">%d नए संपर्क जोड़े गए</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">इस संपर्क को जोड़ने में सामान्य से अधिक समय लग रहा है</string>
+  <string name="adding_contact_slow_title">संपर्क से जुड़ नहीं कर सकता</string>
+  <string name="adding_contact_slow_text">इस संपर्क को जोड़ने में सामान्य से अधिक समय लग रहा है। \n\n कृपया जांचें कि आपके संपर्क ने आपका लिंक प्राप्त कर लिया है और आपको जोड़ दिया है:</string>
+  <string name="offline_state">कोई इंटरनेट कनेक्शन नहीं</string>
+  <string name="duplicate_link_dialog_title">प्रतिलिपि लिंक</string>
+  <string name="duplicate_link_dialog_text_1">आपके पास इस लिंक के साथ पहले से ही एक लंबित संपर्क है: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">क्या %s और %s एक ही व्यक्ति हैं?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">वही आदमी</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">अलग व्यक्ति</string>
+  <string name="duplicate_link_dialog_text_3">%s और %s ने एक ही लिंक भेजा है। \n\n और उनमें से कोई भी यह जानने की कोशिश कर सकता है कि आपके संपर्क कौन हैं। \n\n उन्हें यह न बताएं कि आपको वही लिंक किसी और से मिला है।</string>
+  <string name="pending_contact_updated_toast">लंबित संपर्क अपडेट किया गया</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">अपने संपर्कों का परिचय दें</string>
   <string name="introduction_onboarding_text">आप अपने संपर्कों को एक दूसरे से जोड़ सकते हैं, इसलिए उन्हें Briar  से जुड़ने के लिए व्यक्तिगत रूप से मिलने की जरूरत नहीं है।</string>

briar-android/src/main/res/values-hu/strings.xml

@@ -116,14 +116,37 @@
   <string name="date_no_private_messages">Nincs üzenet.</string>
   <string name="no_private_messages">Nincs megjeleníthető üzenet</string>
   <string name="message_hint">Üzenet írása</string>
+  <string name="image_caption_hint">Felirat hozzáadása (opcionális)</string>
+  <string name="image_attach">Kép csatolása</string>
+  <string name="image_attach_error">Nem sikerült a kép(ek) csatolása</string>
+  <string name="image_attach_error_too_big">A kép túl nagy. A korlát: %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Képformátum nem támogatott: %s</string>
+  <string name="set_contact_alias">Kapcsolat nevének megváltoztatása</string>
+  <string name="set_contact_alias_hint">Kapcsolat neve</string>
   <string name="set_alias_button">Módosítás</string>
+  <string name="delete_all_messages">Minden üzenet törlése</string>
+  <string name="dialog_title_delete_all_messages">Üzenet törlés megerősítése</string>
+  <string name="dialog_message_delete_all_messages">Biztos, hogy szeretné törölni összes üzenetét?</string>
+  <string name="dialog_title_not_all_messages_deleted">Nem törölhető minden üzenet</string>
+  <string name="dialog_message_not_all_messages_deleted">Azok az üzenetek amik kimenő bemutatkozások vagy meghívások nem törölhetők, míg be nem fejeződnek.</string>
   <string name="delete_contact">Kapcsolat törlése</string>
   <string name="dialog_title_delete_contact">Kapcsolat törlésének megerősítése</string>
   <string name="dialog_message_delete_contact">Biztosan eltávolítja ezt a kapcsolatot és minden vele történt üzenetváltását?</string>
   <string name="contact_deleted_toast">Kapcsolat törölve</string>
   <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
-  <string name="you">Te</string>
+  <string name="you">Ön</string>
+  <string name="save_image">Kép mentése</string>
+  <string name="dialog_title_save_image">Kép mentése?</string>
+  <string name="dialog_message_save_image">A kép mentése lehetővé teszi, hogy más alkalmazások is elérjék.\n\nBiztosan szeretné menteni?</string>
+  <string name="save_image_success">Kép mentve</string>
+  <string name="save_image_error">Sikertelen kép mentés</string>
+  <string name="dialog_title_no_image_support">Képek nem elérhetők</string>
+  <string name="dialog_message_no_image_support">A Briar kapcsolata nem támogatja a kép csatolmányokat. Ha frissített, akkor más ikont fog látni.</string>
+  <string name="dialog_title_image_support">Most már küldhet képeket a kapcsolatainak</string>
+  <string name="dialog_message_image_support">Érintse meg az ikont képek csatolásához.</string>
+  <string name="messaging_too_many_attachments_toast">Csak az első %d kép kerül küldésre</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Közeli kontakt hozzáadása</string>
   <string name="face_to_face">Találkoznia kell a személlyel akit, hozzá szeretne adni a kapcsolatokhoz.\n\nEz megelőzi azt, hogy valaki megszemélyesítse Önt, vagy elolvassa későbbi üzeneteit.</string>
   <string name="continue_button">Folytatás</string>
   <string name="try_again_button">Újrapróbálkozás</string>
@@ -141,15 +164,68 @@
   <string name="connection_error_explanation">Ellenőrizzék, hogy mindketten ugyanahhoz a Wi-Fi hálózathoz vannak-e csatlakozva.</string>
   <string name="connection_error_feedback">Ha ez a probléma tartósan fennáll, kérjük <a href="feedback"> küldjön visszajelzést </a> nekünk, hogy segítsen fejleszteni az appot.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Távoli kapcsolat hozzá adása</string>
+  <string name="add_contact_nearby_title">Közeli kapcsolat hozzáadása</string>
+  <string name="add_contact_remotely_title">Távoli kapcsolat hozzá adása</string>
+  <string name="contact_name_hint">Adjon a kapcsolatnak becenevet</string>
+  <string name="contact_link_intro">Írj a be a linket a kapcsolatától ide</string>
+  <string name="contact_link_hint">Kapcsolat linkje</string>
   <string name="paste_button">Beilleszt</string>
+  <string name="add_contact_button">Kapcsolat hozzáadása</string>
   <string name="copy_button">Másol</string>
   <string name="share_button">Megoszt</string>
+  <string name="send_link_title">Linkek cseréje</string>
+  <string name="add_contact_choose_nickname">Becenév választása</string>
+  <string name="add_contact_choose_a_nickname">Becenév megadása</string>
+  <string name="nickname_intro">Adja meg a kontakt becenevét. Csak ön láthatja.</string>
+  <string name="your_link">Adja oda ezt a linket annak a kapcsolatának, akit hozzá szeretne adni</string>
+  <string name="link_clip_label">Briar link</string>
+  <string name="link_copied_toast">Link másolva</string>
+  <string name="adding_contact_error">Hiba történt a kapcsolat hozzáadásakor.</string>
+  <string name="pending_contact_requests_snackbar">Vannak még folyamatban lévő kérelmek</string>
+  <string name="pending_contact_requests">Folyamatban lévő kapcsolati kérelmek</string>
+  <string name="no_pending_contacts">Nincs várakozó kapcsolat</string>
   <string name="add_contact_remote_connecting">Csatlakozás...</string>
+  <string name="waiting_for_contact_to_come_online">Várakozás a kapcsolatra, hogy online legyen...</string>
   <string name="connecting">Csatlakozás...</string>
+  <string name="adding_contact">Kapcsolat hozzáadása...</string>
+  <string name="adding_contact_failed">Kapcsolat hozzáadása sikertelen</string>
+  <string name="dialog_title_remove_pending_contact">Eltávolítás megerősítése</string>
+  <string name="dialog_message_remove_pending_contact">A kapcsolat még hozzáadás alatt. Ha törli, akkor nem kerül hozzá adásra.</string>
+  <string name="own_link_error">A kapcsolata linkjét adja meg, ne a sajátját</string>
+  <string name="nickname_missing">Kérjük adjon meg becenevet</string>
+  <string name="invalid_link">Érvénytelen link</string>
+  <string name="unsupported_link">Ez a link a Briar újabb verziójából származik.
+Kérjük frissítsen a legutolsó verzióra és próbálja újra.</string>
+  <string name="intent_own_link">A saját linkjét nyitotta meg. Használja a kapcsolatától kapottat a hozzáadáshoz!</string>
+  <string name="missing_link">Kérjük adja meg a linket</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
   <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Új kapcsolat hozzáadva.</item>
+    <item quantity="other">%d új kapcsolat hozzáadva</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Ennek a kapcsolatnak a hozzáadása a szokásosnál tovább tart</string>
+  <string name="adding_contact_slow_title">Sikertelen csatlakozás a kapcsolathoz</string>
+  <string name="adding_contact_slow_text">Ennek a kapcsolatnak a hozzáadása tovább tart, mint általában.\n\nKérjük ellenőrizze, hogy a kapcsolata megkapta-e a linket és hozzáadta-e Önt:</string>
+  <string name="offline_state">Nincs internet kapcsolat</string>
+  <string name="duplicate_link_dialog_title">Duplikált link</string>
+  <string name="duplicate_link_dialog_text_1">Önnek már van várakozó kapcsolata ezzel a linkkel: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Önnek már van kapcsolata ezzel a linkkel: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%s és %s ugyanaz a személy?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Ugyanaz a személy</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Másik személy</string>
+  <string name="duplicate_link_dialog_text_3">%s és %s ugyanazt a linket küldte.\n\nEgyikük lehet, hogy megpróbálja kikutatni, hogy kik a kapcsolatai.\n\nNe árulja el nekik, hogy ugyanazt a linket már megkapta mástól.</string>
+  <string name="pending_contact_updated_toast">Várakozó kapcsolat frissítve</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Kapcsolatai bemutatása</string>
   <string name="introduction_onboarding_text">Bemutathatja kapcsolatait egymásnak, így nem szükséges, hogy találkozzanak személyesen, hogy kapcsolódhassanak a Briar-on.</string>
@@ -347,6 +423,8 @@
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
   <string name="tor_network_setting_summary">Automatikus: %1$s ( %2$s)</string>
   <string name="tor_mobile_data_title">Mobil adat használata</string>
+  <string name="tor_only_when_charging_title">Csatlakozás az internethez Tor-ral, töltés alatt</string>
+  <string name="tor_only_when_charging_summary">Letiltja az internet kapcsolatot, amikor elemről fut az eszköz</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Biztonság</string>
   <string name="pref_lock_title">App zár</string>
@@ -417,6 +495,7 @@ Vigyázat: Ez végleg törli az identitásait, kapcsolatait és üzeneteit</stri
   <!--Link Warning-->
   <string name="link_warning_title">Link figyelmeztetés</string>
   <string name="link_warning_intro">Épp megnyit egy linket egy külső alkalmazással.</string>
+  <string name="link_warning_text">Ez tudja azonosítani Önt. Gondolkodjon el arról, hogy megbízik-e a személyben, aki a linket küldte és nyissa meg azt a Tor böngészőben.</string>
   <string name="link_warning_open_link">Link megnyitása</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Briar összeomlási jelentés</string>

briar-android/src/main/res/values-is/strings.xml

@@ -0,0 +1,490 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--Setup-->
+  <string name="setup_title">Velkomin í Briar</string>
+  <string name="setup_name_explanation">Stuttnefnið þitt birtist við hlið alls þess efnis sem þú sendir inn. Þú getur ekki breytt því eftir að þú hefur skráð notandaaðganginn þinn.</string>
+  <string name="setup_next">Næsta</string>
+  <string name="setup_password_intro">Veldu lykilorð</string>
+  <string name="setup_password_explanation">Notandaaðgangur þinn í Briar er geymdur dulritaður á tækinu þínu, ekki í tölvuskýi. Ef þú gleymir lykilorðinu þínu eða fjarlægir Briar, þá er engin leið til að endurheimta notandaaðganginn þinn.\n\nVeldu langt lykilorð sem erfitt er að giska á, svo sem eins og fjögur orð af handahófi, eða slembna samsetningu tíu bósktafa, tölustafa og tákna.</string>
+  <string name="setup_doze_title">Bakgrunnstengingar</string>
+  <string name="setup_doze_intro">Til að taka á móti skilaboðum þarf Briar að haldast tengt í bakgrunni.</string>
+  <string name="setup_doze_explanation">Til að taka á móti skilaboðum þarf Briar að haldast tengt í bakgrunni. Gerðu orkusparnaðarferli óvirk svo Briar geti haldið tengingum.</string>
+  <string name="setup_doze_button">Leyfa tengingar</string>
+  <string name="choose_nickname">Veldu þér stuttnefni</string>
+  <string name="choose_password">Veldu þér lykilorð</string>
+  <string name="confirm_password">Staðfestu lykilorðið</string>
+  <string name="name_too_long">Nafnið er of langt</string>
+  <string name="password_too_weak">Lykilorðið er of veikt</string>
+  <string name="passwords_do_not_match">Lykilorðin stemma ekki</string>
+  <string name="create_account_button">Búa til notandaaðgang</string>
+  <string name="more_info">Nánari upplýsingar</string>
+  <string name="don_t_ask_again">Ekki spyrja aftur</string>
+  <string name="setup_huawei_text">Ýttu á hnappinn hér fyrir neðan og gakktu úr skugga um að Briar sé varið á skjánum \"Varin forrit\".</string>
+  <string name="setup_huawei_button">Verja Briar</string>
+  <string name="setup_huawei_help">Ef Briar er ekki bætt á listann yfir varin forrit, getur það ekki keyrt í bakgrunni.</string>
+  <string name="warning_dozed">%s gat ekki keyrt í bakgrunni</string>
+  <!--Login-->
+  <string name="enter_password">Lykilorð</string>
+  <string name="try_again">Rangt lykilorð, reyndu aftur</string>
+  <string name="sign_in_button">Skrá inn</string>
+  <string name="forgotten_password">Ég hef gleymt lykilorðinu mínu</string>
+  <string name="dialog_title_lost_password">Týnt lykilorð</string>
+  <string name="dialog_message_lost_password">Notandaaðgangur þinn í Briar er geymdur dulritaður á tækinu þínu, ekki í tölvuskýi, þannig að við getum ekki endurstillt lykilorðið þitt. Myndirðu vilja eyða notandaaðgangnum þínum og byrja aftur?\n\nVarúð: Auðkennin þín, tengiliðir og skilaboð munu tapast óendurkræft.</string>
+  <string name="startup_failed_notification_title">Gat ekki ræst Briar.</string>
+  <string name="startup_failed_notification_text">Ýttu til að sjá meiri upplýsingar.</string>
+  <string name="startup_failed_activity_title">Bilun í ræsingu Briar</string>
+  <string name="startup_failed_db_error">Af einhverjum ástæðum er Briar-gagnagrunnurinn svo skemmdur að ekki er hægt að laga hann. Notandaaðgangurinn þinn, gögnin þín og allir tengiliðir hafa tapast. Því miður þarft þú að setja Briar upp aftur, eða setja upp nýjan notandaaðgang með því að velja \'Ég hef gleymt lykilorðinu mínu\' þegar beðið er um lykilorð.</string>
+  <string name="startup_failed_data_too_old_error">Notandaaðgangurinn þinn var útbúinn með eldri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu. Þú þarft annað hvort að setja gömlu útgáfuna aftur, eða setja upp nýjan notandaaðgang með því að velja \'Ég hef gleymt lykilorðinu mínu\' þegar beðið er um lykilorð.</string>
+  <string name="startup_failed_data_too_new_error">Þessi útgáfa forritsins er of gömul. Uppfærðu í nýjustu útgáfuna og prófaðu síðan aftur.</string>
+  <string name="startup_failed_service_error">Briar tókst ekki að ræsa nauðsynlega forritsviðbót. Venjulega er nóg að setja Briar upp aftur til að leysa þetta vandamál. Hinsvegar, athugaðu að þá munt þú missa notandaaðganginn þinn ásamt öllum gögnum honum tengdum, því Briar notar ekki miðlæga þjóna til að geyma gögnin þín.</string>
+  <plurals name="expiry_warning">
+    <item quantity="one">Þetta er prufuútgáfa af Briar. Notandaaðgangurinn þinn mun renna út eftir %d dag og er ekki hægt að endurnýja hann.</item>
+    <item quantity="other">Þetta er prufuútgáfa af Briar. Notandaaðgangurinn þinn mun renna út eftir %d daga og er ekki hægt að endurnýja hann.</item>
+  </plurals>
+  <string name="expiry_update">Dagsetningin fyrir prufuútgáfuna hefur verið framlengd. Notandaaðgangurinn þinn mun núna renna út eftir %d daga.</string>
+  <string name="expiry_date_reached">Þessi hugbúnaður er úreltur.\nTakk fyrir að hafa tekið þátt í prófunum!</string>
+  <string name="download_briar">Til að halda áfram að nota Briar, ættirðu að sækja útgáfu 1.0.</string>
+  <string name="create_new_account">Þú þarft að búa til nýjan notandaaðgang, en þú getur notað áfram sama stuttnefni.</string>
+  <string name="download_briar_button">Sækja Briar 1.0</string>
+  <string name="startup_open_database">Afkóða gagnagrunn…</string>
+  <string name="startup_migrate_database">Uppfæri gagnagrunn…</string>
+  <string name="startup_compact_database">Þjappa gagnagrunni…</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">Opna leiðsagnarsleðann</string>
+  <string name="nav_drawer_close_description">Loka leiðsagnarsleðanum</string>
+  <string name="contact_list_button">Tengiliðir</string>
+  <string name="groups_button">Einkahópar</string>
+  <string name="forums_button">Vefspjallsvæði</string>
+  <string name="blogs_button">Blogg</string>
+  <!--This is part of the main menu. The app will be locked when this is tapped.-->
+  <string name="lock_button">Læsa forriti</string>
+  <string name="settings_button">Stillingar</string>
+  <string name="sign_out_button">Skrá út</string>
+  <!--Transports-->
+  <string name="transport_tor">Internet</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">Þráðlaust Wi-Fi net</string>
+  <!--Notifications-->
+  <string name="reminder_notification_title">Skráð út úr Briar</string>
+  <string name="reminder_notification_text">Ýttu til að skrá þig aftur inn.</string>
+  <string name="reminder_notification_channel_title">Áminning um innskráningu í Briar</string>
+  <string name="reminder_notification_dismiss">Hafna</string>
+  <string name="ongoing_notification_title">Skráð inn í Briar</string>
+  <string name="ongoing_notification_text">Snertu til að opna Briar.</string>
+  <plurals name="private_message_notification_text">
+    <item quantity="one"> Ný einkaskilaboð.</item>
+    <item quantity="other">%d ný einkaskilaboð.</item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="one">Ný hópskilaboð</item>
+    <item quantity="other">%d ný hópskilaboð.</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="one">Ný færsla á spjallsvæði.</item>
+    <item quantity="other">%d nýjar færslur á spjallsvæði.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="one">Ný bloggfærsla.</item>
+    <item quantity="other">%d nýjar bloggfærslur.</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">núna</string>
+  <string name="show">Birta</string>
+  <string name="hide">Fela</string>
+  <string name="ok">Í lagi</string>
+  <string name="cancel">Hætta við</string>
+  <string name="got_it">Náði því</string>
+  <string name="delete">Eyða</string>
+  <string name="accept">Samþykkja</string>
+  <string name="decline">Hafna</string>
+  <string name="options">Valkostir</string>
+  <string name="online">Nettengt</string>
+  <string name="offline">Ónettengt</string>
+  <string name="send">Senda</string>
+  <string name="allow">Leyfa</string>
+  <string name="open">Opna</string>
+  <string name="no_data">Engin gögn</string>
+  <string name="ellipsis">…</string>
+  <string name="text_too_long">Textinn sem var settur inn er of langur</string>
+  <string name="show_onboarding">Birta hjálparglugga</string>
+  <string name="fix">Laga</string>
+  <string name="help">Hjálp</string>
+  <string name="sorry">Því miður</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Engir tengiliðir til að birta</string>
+  <string name="no_contacts_action">Ýttu á + táknið til að bæta við tengilið</string>
+  <string name="date_no_private_messages">Engin skilaboð.</string>
+  <string name="no_private_messages">Engin skilaboð sem hægt er að birta</string>
+  <string name="message_hint">Skrifaðu skilaboð</string>
+  <string name="image_caption_hint">Bæta við fyrirsögn (valfrjálst)</string>
+  <string name="image_attach">Hengja við mynd</string>
+  <string name="image_attach_error">Gat ekki hengt við mynd(ir)</string>
+  <string name="set_contact_alias">Breyta nafni tengiliðar</string>
+  <string name="set_contact_alias_hint">Nafn tengiliðar</string>
+  <string name="set_alias_button">Breyta</string>
+  <string name="dialog_title_not_all_messages_deleted">Gat ekki eytt öllum skilaboðum</string>
+  <string name="delete_contact">Eyða tengilið</string>
+  <string name="dialog_title_delete_contact">Staðfesta eyðingu tengiliðar</string>
+  <string name="dialog_message_delete_contact">Ertu viss að þú viljir fjarlægja þennan tengilið ásamt öllum þeim skilaboðum sem ykkur hafa farið á milli?</string>
+  <string name="contact_deleted_toast">Tengilið eytt</string>
+  <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
+  <string name="you">Þú</string>
+  <string name="save_image">Vista mynd</string>
+  <string name="dialog_title_save_image">Vista mynd?</string>
+  <string name="dialog_message_save_image">Ef þú vistar myndina geta önnur forrit fengið aðgang að henni.\n\nErtu viss um að þú viljir vista ?</string>
+  <string name="save_image_success">Mynd var vistuð</string>
+  <string name="save_image_error">Gat ekki vistað mynd</string>
+  <string name="dialog_title_no_image_support">Myndir ekki tiltækar</string>
+  <string name="dialog_message_no_image_support">Briar-útgáfa tengiliðarins þíns styður ekki ennþá myndaviðhengi. Þegar þeir verða búnir að uppgæra hugbúnaðinn muntu sjá öðruvísi tákn.</string>
+  <string name="dialog_title_image_support">Þú getur núna sent myndir til þessa tengiliðar</string>
+  <string name="dialog_message_image_support">Ýttu á þessa táknmynd til að hengja við myndir.</string>
+  <!--Adding Contacts-->
+  <string name="face_to_face">Þú verður að hitta persónuna sem þú vilt bæta við sem tengilið.\n\nÞetta kemur í veg fyrir að nokkur geti látist vera þú eða nokkur geti framvegis lesið skilaboðin þín.</string>
+  <string name="continue_button">Halda áfram</string>
+  <string name="try_again_button">Reyndu aftur</string>
+  <string name="waiting_for_contact_to_scan">Bíð eftir að tengiliður skanni og tengist\u2026</string>
+  <string name="exchanging_contact_details">Skiptist á upplýsingum um tengilið\u2026</string>
+  <string name="contact_added_toast">Tengilið bætt við: %s</string>
+  <string name="contact_already_exists">Tengiliðurinn %s er þegar til</string>
+  <string name="qr_code_invalid">QR-kóðinn er ógildur</string>
+  <string name="qr_code_too_old">QR-kóðinn sem þú skannaðir kemur frá eldri útgáfu af %s.\n\nBiddu tengiliðinn þinn um að uppfæra í nýjustu útgáfuna og prófaðu síðan aftur.</string>
+  <string name="qr_code_too_new">QR-kóðinn sem þú skannaðir kemur frá nýrri útgáfu af %s.\n\nUppfærðu í nýjustu útgáfuna og prófaðu síðan aftur.</string>
+  <string name="camera_error">Villa í myndavél</string>
+  <string name="connecting_to_device">Tengist við tæki\u2026</string>
+  <string name="authenticating_with_device">Auðkenni við tæki\u2026</string>
+  <string name="connection_error_title">Gat ekki tengst við tengiliðinn þinn</string>
+  <string name="connection_error_explanation">Athugaðu hvort þið séuð ekki báðir tengdir við sama þráðlausa Wi-Fi netið.</string>
+  <string name="connection_error_feedback">Ef þetta vandamál er viðvarandi, ættirðu að <a href="feedback">senda umsögn</a> til að hjálpa okkur að bæta forritið.</string>
+  <!--Adding Contacts Remotely-->
+  <string name="add_contact_remote_connecting">Tengist…</string>
+  <string name="connecting">Tengist…</string>
+  <!--This is a numeral indicating the first step in a series of screens-->
+  <!--This is a numeral indicating the second step in a series of screens-->
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <!--Introductions-->
+  <string name="introduction_onboarding_title">Kynntu tengiliðina þína</string>
+  <string name="introduction_onboarding_text">Þú getur kynnt tengiliðina þína fyrir hver öðrum, svo að þeir þurfi ekki að hittast í eigin persónu til að tengjast í gegnum Briar.</string>
+  <string name="introduction_menu_item">Útbúðu kynningu</string>
+  <string name="introduction_activity_title">Veldu tengilið</string>
+  <string name="introduction_not_possible">Þú ert þegar með eina kynningu í vinnslu gagnvart þessum tengiliðum. Leyfðu því ferli að ljúka fyrst. Ef þú eða tengiliðirnir þínir eruð sjaldan á netinu, gæti þetta tekið svolítinn tíma.</string>
+  <string name="introduction_message_title">Kynntu tengiliði</string>
+  <string name="introduction_message_hint">Bættu við skilaboðum (valfrjálst)</string>
+  <string name="introduction_button">Útbúðu kynningu</string>
+  <string name="introduction_sent">Kynningin þín hefur verið send.</string>
+  <string name="introduction_error">Villa kom upp við kynninguna.</string>
+  <string name="introduction_response_error">Villa kom upp við að svara kynningunni.</string>
+  <string name="introduction_request_sent">Þú hefur verið beðin/n um að kynna %1$s fyrir %2$s.</string>
+  <string name="introduction_request_received">%1$s hefur beðið um að fá að kynna þig fyrir %2$s. Viltu bæta %2$s við tengiliðalistann þinn?</string>
+  <string name="introduction_request_exists_received">%1$s hefur beðið um að fá að kynna þig fyrir %2$s, en %2$s er þegar í tengiliðalistanum þínum. Þar sem ekki er víst að %1$s viti það, þá geturðu samt svarað:</string>
+  <string name="introduction_request_answered_received">%1$s hefur beðið um að fá að kynna þig fyrir %2$s.</string>
+  <string name="introduction_response_accepted_sent">Þú samþykktir kynningu við %1$s.</string>
+  <string name="introduction_response_accepted_sent_info">Áður en %1$s verður bætt í tengiliðaskrána þína, verða þeir einnig að samþykkja kynninguna. Það gæti tekið svolítinn tíma.</string>
+  <string name="introduction_response_declined_sent">Þú hafnaðir kynningu við %1$s.</string>
+  <string name="introduction_response_accepted_received">%1$s samþykkti kynningu við %2$s.</string>
+  <string name="introduction_response_declined_received">%1$s hafnaði kynningu við %2$s.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s segir að %2$s hafi hafnað kynningunni.</string>
+  <!--Private Groups-->
+  <string name="groups_list_empty">Engir hópar sem hægt er að birta</string>
+  <string name="groups_list_empty_action">Ýttu á + táknið til að útbúa hóp, eða biddu tengiliðina þína um að deila hópi með þér</string>
+  <string name="groups_created_by">Búið til af %s</string>
+  <plurals name="messages">
+    <item quantity="one">%d skilaboð</item>
+    <item quantity="other">%d skilaboð</item>
+  </plurals>
+  <string name="groups_group_is_empty">Þessi hópur er tómur</string>
+  <string name="groups_group_is_dissolved">Þessi hópur hefur verið leystur upp</string>
+  <string name="groups_remove">Fjarlægja</string>
+  <string name="groups_create_group_title">Búa til einkahóp</string>
+  <string name="groups_create_group_button">Búa til hóp</string>
+  <string name="groups_create_group_invitation_button">Senda boð</string>
+  <string name="groups_create_group_hint">Veldu nafn á einkahópinn þinn</string>
+  <string name="groups_invitation_sent">Boð í hóp hafa verið send</string>
+  <string name="groups_member_list">Listi yfir meðlimi</string>
+  <string name="groups_invite_members">Bjóða meðlimum</string>
+  <string name="groups_member_created_you">Þú bjóst til hópinn</string>
+  <string name="groups_member_created">%s bjó til hópinn</string>
+  <string name="groups_member_joined_you">Þú gekkst í hópinn</string>
+  <string name="groups_member_joined">%s gekk í hópinn</string>
+  <string name="groups_leave">Hætta í hópi</string>
+  <string name="groups_leave_dialog_title">Staðfesting á að hætta í hópi</string>
+  <string name="groups_leave_dialog_message">Ertu viss um að þú viljir hætta í þessum hópi?</string>
+  <string name="groups_dissolve">Leysa upp hóp</string>
+  <string name="groups_dissolve_dialog_title">Staðfesting á að leysa upp hóp</string>
+  <string name="groups_dissolve_dialog_message">Ertu viss um að þú viljir leysa upp þennan hóp?\n\nAllir aðrir meðlimir hópsins eiga á hættu að geta ekki haldið áfram með samtöl sín og gætu misst af síðustu skilaboðunum.</string>
+  <string name="groups_dissolve_button">Leysa upp</string>
+  <string name="groups_dissolved_dialog_title">Hópur var leystur upp</string>
+  <string name="groups_dissolved_dialog_message">Stofnandi hópsins hefur leyst hann upp.\n\nÞú getur ekki lengur skrifað skilaboð til hópsins og mögulega færðu ekki öll þau skilaboð sem þegar hafa verið skrifuð.</string>
+  <!--Private Group Invitations-->
+  <string name="groups_invitations_title">Boð í hópa</string>
+  <string name="groups_invitations_invitation_sent">Þú hefur boðið %1$s að ganga í hópinn \"%2$s\".</string>
+  <string name="groups_invitations_invitation_received">%1$s hefur boðið þér að ganga í hópinn \"%2$s\".</string>
+  <string name="groups_invitations_joined">Hefur gengið í hópinn</string>
+  <string name="groups_invitations_declined">Boði í hóp hafnað</string>
+  <plurals name="groups_invitations_open">
+    <item quantity="one">%d opið boð í hóp</item>
+    <item quantity="other">%d opin boð í hóp</item>
+  </plurals>
+  <string name="groups_invitations_response_accepted_sent">Þú samþykktir boð í hóp frá %s.</string>
+  <string name="groups_invitations_response_declined_sent">Þú hafnaðir boði í hóp frá %s.</string>
+  <string name="groups_invitations_response_accepted_received">%s samþykkti boð í hóp.</string>
+  <string name="groups_invitations_response_declined_received">%s hafnaði boði í hóp.</string>
+  <string name="sharing_status_groups">Einungis stofnandinn getur boðið nýjum meðlimum í hópinn. Hé fyrir neðan eru allir skráðir meðlimir í hópnum.</string>
+  <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">Uppljóstra um tengiliði</string>
+  <string name="groups_reveal_dialog_message">Þú getur valið hvort eigi að birta tengiliði fyrir öllum núverandi og verðandi meðlimum þessa hóps.\n\nAð ljóstra upp um tengiliði gerir tengingu þína við hópinn hraðari og áreiðanlegri, vegna þess að þá getur þú átt samskipti við birtu tengiliðina jafnvel þótt stofnandi hópsins sé ekki á netinu.</string>
+  <string name="groups_reveal_visible">Vensl tengiliðar eru sýnileg hópnum</string>
+  <string name="groups_reveal_visible_revealed_by_us">Vensl tengiliðar eru sýnileg hópnum (uppljóstrað af þér)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">Vensl tengiliðar eru sýnileg hópnum (uppljóstrað af %s)</string>
+  <string name="groups_reveal_invisible">Vensl tengiliðar eru ekki sýnileg hópnum</string>
+  <!--Forums-->
+  <string name="no_forums">Engin spjallsvæði sem hægt er að birta</string>
+  <string name="no_forums_action">Ýttu á + táknið til að útbúa spjallsvæði, eða biddu tengiliðina þína um að deila spjallsvæði með þér</string>
+  <string name="create_forum_title">Búa til spjallsvæði</string>
+  <string name="choose_forum_hint">Veldu nafn á spjallsvæðið þitt</string>
+  <string name="create_forum_button">Búa til spjallsvæði</string>
+  <string name="forum_created_toast">Spjallsvæði búið til</string>
+  <string name="no_forum_posts">Engar færslur sem hægt er að birta</string>
+  <string name="no_posts">Engar færslur</string>
+  <plurals name="posts">
+    <item quantity="one">%d færsla</item>
+    <item quantity="other">%d færslur</item>
+  </plurals>
+  <string name="forum_new_message_hint">Ný færsla</string>
+  <string name="forum_message_reply_hint">Nýtt svar</string>
+  <string name="btn_reply">Svara</string>
+  <string name="forum_leave">Hætta á spjallsvæði</string>
+  <string name="dialog_title_leave_forum">Staðfesta að hætt sé á spjallsvæði</string>
+  <string name="dialog_message_leave_forum">Ertu viss um að þú viljir fjarlægja þetta spjallsvæði?\n\nAllir tengiliðir sem þú hefur deilt þessu bloggi með gætu hætt að fá uppfærslur.</string>
+  <string name="dialog_button_leave">Hætta</string>
+  <string name="forum_left_toast">Hætti á spjallsvæði</string>
+  <!--Forum Sharing-->
+  <string name="forum_share_button">Deila spjallsvæði</string>
+  <string name="contacts_selected">Tengiliðir valdir</string>
+  <string name="activity_share_toolbar_header">Veldu tengiliði</string>
+  <string name="no_contacts_selector">Engir tengiliðir til að birta</string>
+  <string name="no_contacts_selector_action">Komdu aftur hingað eftir að þú hefur bætt við tengilið</string>
+  <string name="forum_shared_snackbar">Spjallsvæði deilt með völdum tengiliðum</string>
+  <string name="forum_share_message">Bæta við skilaboðum (valfrjálst)</string>
+  <string name="forum_share_error">Villa kom upp við að deila þessu spjallsvæði.</string>
+  <string name="forum_invitation_received">%1$s hefur deilt spjallsvæðinu \"%2$s\" með þér.</string>
+  <string name="forum_invitation_sent">Þú hefur deilt spjallsvæðinu \"%1$s\" með %2$s.</string>
+  <string name="forum_invitations_title">Boð á spjallsvæði</string>
+  <string name="forum_invitation_exists">Þú hefur þegar samþykkt boð inn á þetta spjallsvæði.\n\nAð samþykkja fleiri boð inn á spjallsvæðið mun gera tenginguna þína við spjallsvæðið hraðvirkari og áreiðanlegri.</string>
+  <string name="forum_joined_toast">Tekur þátt á spjallsvæði</string>
+  <string name="forum_declined_toast">Boði hafnað</string>
+  <string name="shared_by_format">Deilt af %s</string>
+  <string name="forum_invitation_already_sharing">Þegar deilt</string>
+  <string name="forum_invitation_response_accepted_sent">Þú samþykktir boð á spjallsvæði frá %s.</string>
+  <string name="forum_invitation_response_declined_sent">Þú hafnaðir boði á spjallsvæði frá %s.</string>
+  <string name="forum_invitation_response_accepted_received">%s samþykkti boð á spjallsvæði.</string>
+  <string name="forum_invitation_response_declined_received">%s hafnaði boði á spjallsvæði.</string>
+  <string name="sharing_status">Staða deilingar</string>
+  <string name="sharing_status_forum">Hver og einn meðlimur spjallsvæðis getur deilt því með tengiliðunum sínum. Þú ert að deila þessu spjallsvæði með eftirfarandi tengiliðum. Það gætu einnig verið fyrir hendi meðlimir sem þú sérð ekki.</string>
+  <string name="shared_with">Deilt með %1$d (%2$d á netinu)</string>
+  <plurals name="forums_shared">
+    <item quantity="one">%d spjallsvæði deilt með tengiliðum</item>
+    <item quantity="other">%d spjallsvæðum deilt með tengiliðum</item>
+  </plurals>
+  <string name="nobody">Enginn</string>
+  <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">Engar færslur sem hægt er að birta</string>
+  <string name="read_more">lesa meira</string>
+  <string name="blogs_write_blog_post">Skrifa bloggfærslu</string>
+  <string name="blogs_write_blog_post_body_hint">Skrifaðu bloggfærsluna þína</string>
+  <string name="blogs_publish_blog_post">Birta</string>
+  <string name="blogs_blog_post_created">Bloggfærsla útbúin</string>
+  <string name="blogs_blog_post_received">Ný bloggfærsla móttekin</string>
+  <string name="blogs_blog_post_scroll_to">Skruna að</string>
+  <string name="blogs_feed_empty_state">Engar færslur sem hægt er að birta</string>
+  <string name="blogs_feed_empty_state_action">Færslur frá tengiliðum þínum og bloggum sem þú ert áskrifandi að munu birtast hér\n\nÝttu á pennatáknið til að skrifa færslu</string>
+  <string name="blogs_remove_blog">Fjarlægja blogg</string>
+  <string name="blogs_remove_blog_dialog_message">Ertu viss um að þú viljir fjarlægja þetta blogg?\n\nFærslur verða fjarlægðar af tækinu þínu en ekki tækjum annars fólks.\n\nAllir tengiliðir sem þú hefur deilt þessu bloggi með gætu hætt að fá uppfærslur.</string>
+  <string name="blogs_remove_blog_ok">Fjarlægja</string>
+  <string name="blogs_blog_removed">Blogg var fjarlægt</string>
+  <string name="blogs_reblog_comment_hint">Bæta við athugasemd (valkvætt)</string>
+  <string name="blogs_reblog_button">Endurblogg</string>
+  <!--Blog Sharing-->
+  <string name="blogs_sharing_share">Deila bloggi</string>
+  <string name="blogs_sharing_error">Það kom upp villa við að deila þessu bloggi.</string>
+  <string name="blogs_sharing_button">Deila bloggi</string>
+  <string name="blogs_sharing_snackbar">Bloggi deilt með völdum tengiliðum</string>
+  <string name="blogs_sharing_response_accepted_sent">Þú samþykktir boð á blogg frá %s.</string>
+  <string name="blogs_sharing_response_declined_sent">Þú hafnaðir boði á blogg frá %s.</string>
+  <string name="blogs_sharing_response_accepted_received">%s samþykkti boð á blogg.</string>
+  <string name="blogs_sharing_response_declined_received">%s hafnaði boði á blogg.</string>
+  <string name="blogs_sharing_invitation_received">%1$s deildi blogginu \"%2$s\" með þér.</string>
+  <string name="blogs_sharing_invitation_sent">Þú deildir blogginu \"%1$s\" með %2$s.</string>
+  <string name="blogs_sharing_invitations_title">Boð á blogg</string>
+  <string name="blogs_sharing_joined_toast">Gerðist áskrifandi að bloggi</string>
+  <string name="blogs_sharing_declined_toast">Boði hafnað</string>
+  <string name="sharing_status_blog">Hver sá sem gerist áskrifandi að bloggi getur deilt því með tengiliðunum sínum. Þú ert að deila þessu bloggi með eftirfarandi tengiliðum. Það gætu einnig verið fyrir hendi áskrifendur sem þú sérð ekki.</string>
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import">Flytja inn RSS-streymi</string>
+  <string name="blogs_rss_feeds_import_button">Flytja inn</string>
+  <string name="blogs_rss_feeds_import_hint">Settu inn slóðina á RSS-streymið</string>
+  <string name="blogs_rss_feeds_import_error">Því miður! Það kom upp villa við að flytja inn streymið.</string>
+  <string name="blogs_rss_feeds_manage">Sýsla með RSS-streymi</string>
+  <string name="blogs_rss_feeds_manage_imported">Fflutt inn:</string>
+  <string name="blogs_rss_feeds_manage_author">Höfundur:</string>
+  <string name="blogs_rss_feeds_manage_updated">Síðast uppfært:</string>
+  <string name="blogs_rss_remove_feed">Fjarlægja streymi</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Ertu viss um að þú viljir fjarlægja þetta streymi?\n\nFærslur verða fjarlægðar af tækinu þínu en ekki tækjum annars fólks.\n\nAllir tengiliðir sem þú hefur deilt þessu streymi með gætu hætt að fá uppfærslur.</string>
+  <string name="blogs_rss_remove_feed_ok">Fjarlægja</string>
+  <string name="blogs_rss_feeds_manage_delete_error">Ekki var hægt að eyða streyminu!</string>
+  <string name="blogs_rss_feeds_manage_empty_state">Engin RSS-streymi til að birta\n\nÝttu á + táknið til að flytja inn streymi</string>
+  <string name="blogs_rss_feeds_manage_error">Vandamál hefur komið upp með að hlaða inn streymunum þínum. Reyndu aftur síðar.</string>
+  <!--Settings Display-->
+  <string name="pref_language_title">Tungumál og landsvæði</string>
+  <string name="pref_language_changed">Þessi stilling tekur gildi í næst þegar þú skráir þig inn í Briar. Skráðu þig út og endurræstu Briar.</string>
+  <string name="pref_language_default">Sjálfgefið í kerfinu</string>
+  <string name="display_settings_title">Birting</string>
+  <string name="pref_theme_title">Þema</string>
+  <string name="pref_theme_light">Ljóst</string>
+  <string name="pref_theme_dark">Dökkt</string>
+  <string name="pref_theme_auto">Sjálfvirkt (eftir tíma dags)</string>
+  <string name="pref_theme_system">Sjálfgefið í kerfinu</string>
+  <!--Settings Network-->
+  <string name="network_settings_title">Netkerfi</string>
+  <string name="bluetooth_setting">Tengjast í gegnum Bluetooth</string>
+  <string name="bluetooth_setting_enabled">Alltaf þegar tengiliðir eru nálægt</string>
+  <string name="bluetooth_setting_disabled">Aðeins þegar tengiliðum er bætt við</string>
+  <string name="tor_network_setting">Tengjast í gegnum internetið (Tor)</string>
+  <string name="tor_network_setting_automatic">Sjálfvirkt byggt á staðsetningu</string>
+  <string name="tor_network_setting_without_bridges">Nota Tor án brúa</string>
+  <string name="tor_network_setting_with_bridges">Nota Tor með brúm</string>
+  <string name="tor_network_setting_never">Ekki tengjast</string>
+  <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
+  <string name="tor_network_setting_summary">Sjálfvirkt: %1$s (eftir %2$s)</string>
+  <string name="tor_mobile_data_title">Nota farsímagagnasamband</string>
+  <string name="tor_only_when_charging_title">Tengjast í gegnum internetið (Tor) aðeins þegar verið er í hleðslu</string>
+  <string name="tor_only_when_charging_summary">Gerir internettengingu óvirka þegar tækið keyrir á rafhlöðu</string>
+  <!--Settings Security and Panic-->
+  <string name="security_settings_title">Öryggi</string>
+  <string name="pref_lock_title">Forritslæsing</string>
+  <string name="pref_lock_summary">Notaðu skjálæsingu tækisins til að vernda Briar á meðan þú ert skráð/ur inn</string>
+  <string name="pref_lock_disabled_summary">Til að nota þetta þarftu að setja upp skjálæsingu fyrir tækið þitt</string>
+  <string name="pref_lock_timeout_title">Tímamörk forritslæsingar við aðgerðaleysi</string>
+  <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
+  <string name="pref_lock_timeout_summary">Þehar ekki er verið að nota Briar, læsa því sjálfvirkt eftir %s</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_1">1 mínúta</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_5">5 mínútur</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_15">15 mínútur</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_30">30 mínútur</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_60">1 klukkustund</string>
+  <string name="pref_lock_timeout_never">Aldrei</string>
+  <string name="pref_lock_timeout_never_summary">Aldrei læsa Briar sjálfvirkt</string>
+  <string name="change_password">Breyta lykilorði</string>
+  <string name="current_password">Núverandi lykilorð</string>
+  <string name="choose_new_password">Nýtt lykilorð</string>
+  <string name="confirm_new_password">Staðfestu nýtt lykilorð</string>
+  <string name="password_changed">Lykilorðinu hefur verið breytt</string>
+  <string name="panic_setting">Uppsetning neyðarhnapps</string>
+  <string name="panic_setting_title">Neyðarhnappur</string>
+  <string name="panic_setting_hint">Stilltu hvernig Briar mun bregðast við ef þú notar neyðarhnappsforrit</string>
+  <string name="panic_app_setting_title">Forrit fyrir neyðarhnapp</string>
+  <string name="unknown_app">óþekkt forrit</string>
+  <string name="panic_app_setting_summary">Ekkert forrit hefur verið stillt</string>
+  <string name="panic_app_setting_none">Ekkert</string>
+  <string name="dialog_title_connect_panic_app">Staðfesta neyðarhnappsforrit</string>
+  <string name="dialog_message_connect_panic_app">Ertu viss um að þú viljir leyfa %1$s að setja í gang eyðileggjandi neyðarhnappsaðgerðir?</string>
+  <string name="panic_setting_destructive_action">Óafturkræfar aðgerðir</string>
+  <string name="panic_setting_signout_title">Skrá út</string>
+  <string name="panic_setting_signout_summary">Skrá út úr Briar ef ýtt er á neyðarhnapp</string>
+  <string name="purge_setting_title">Eyða notandaaðgangi</string>
+  <string name="purge_setting_summary">Eyða Briar-aðgangnum þínum ef ýtt er á neyðarhnapp. Varúð: Þetta mun eyða endanlega auðkennunum þínum, tengiliðum og skilaboðum</string>
+  <string name="uninstall_setting_title">Fjarlægja Briar</string>
+  <string name="uninstall_setting_summary">Þetta krefst handvirkrar staðfestingar komi upp neyðarástand</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">Tilkynningar</string>
+  <string name="notify_sign_in_title">Minna mig á að skrá inn</string>
+  <string name="notify_sign_in_summary">Birta áminningu þegar síminn er ræstur eða þegar forritið hefur verið uppfært</string>
+  <string name="notify_private_messages_setting_title">Einkaskilaboð</string>
+  <string name="notify_private_messages_setting_summary">Birta aðvaranir vegna einkaskilaboða</string>
+  <string name="notify_private_messages_setting_summary_26">Stilla aðvaranir vegna einkaskilaboða</string>
+  <string name="notify_group_messages_setting_title">Hópskilaboð</string>
+  <string name="notify_group_messages_setting_summary">Birta aðvaranir vegna hópskilaboða</string>
+  <string name="notify_group_messages_setting_summary_26">Stilla aðvaranir vegna hópskilaboða</string>
+  <string name="notify_forum_posts_setting_title">Færslur á spjallsvæði</string>
+  <string name="notify_forum_posts_setting_summary">Birta aðvaranir vegna færslna á spjallsvæði</string>
+  <string name="notify_forum_posts_setting_summary_26">Stilla aðvaranir vegna færslna á spjallsvæði</string>
+  <string name="notify_blog_posts_setting_title">Bloggfærslur</string>
+  <string name="notify_blog_posts_setting_summary">Birta aðvaranir vegna færslna á bloggi</string>
+  <string name="notify_blog_posts_setting_summary_26">Stilla aðvaranir vegna færslna á bloggi</string>
+  <string name="notify_vibration_setting">Titra</string>
+  <string name="notify_sound_setting">Hljóð</string>
+  <string name="notify_sound_setting_default">Sjálfgefinn hringitónn</string>
+  <string name="notify_sound_setting_disabled">Ekkert</string>
+  <string name="choose_ringtone_title">Veldu hringitón</string>
+  <string name="cannot_load_ringtone">Get ekki hlaðið inn hringitóni</string>
+  <!--Settings Feedback-->
+  <string name="feedback_settings_title">Umsagnir</string>
+  <string name="send_feedback">Senda umsögn</string>
+  <!--Link Warning-->
+  <string name="link_warning_title">Aðvörun vegna tengils</string>
+  <string name="link_warning_intro">Þú ert í þann mund að fara að opna eftirfarandi tengil með utanaðkomandi forriti.</string>
+  <string name="link_warning_text">Þetta er hægt að nota til að auðkenna þig. Hugsaðu þig vel um hvort þú treystir þeim sem sendi þér þennan tengil og íhugaðu hvort þú ættir frekar að opna hann með Tor-vafranum.</string>
+  <string name="link_warning_open_link">Opna tengil</string>
+  <!--Crash Reporter-->
+  <string name="crash_report_title">Hrunskýrsla fyrir Briar</string>
+  <string name="briar_crashed">Því miður, Briar hefur hrunið.</string>
+  <string name="not_your_fault">Það er ekki þér að kenna.</string>
+  <string name="please_send_report">Hjálpaðu okkur við að bæta Briar með því að senda okkur hrunskýrslu.</string>
+  <string name="report_is_encrypted">Við lofum að skýrslan sé dulrituð og send á öruggan máta.</string>
+  <string name="feedback_title">Umsagnir</string>
+  <string name="describe_crash">Lýstu því hvað gerðist (valfrjálst)</string>
+  <string name="enter_feedback">Settu inn umsögnina þína</string>
+  <string name="optional_contact_email">Tölvupóstfangið þitt (valfrjálst)</string>
+  <string name="include_debug_report_crash">Senda nafnlaus gögn um hrunið</string>
+  <string name="include_debug_report_feedback">Senda nafnlaus gögn um tækið</string>
+  <string name="could_not_load_report_data">Gat ekki hlaðið inn gögnum skýrslunnar.</string>
+  <string name="send_report">Senda skýrslu</string>
+  <string name="close">Loka</string>
+  <string name="dev_report_saved">Skýrsla vistuð. Hún verður send næst þegar þú skráir þig inn í Briar.</string>
+  <!--Sign Out-->
+  <string name="progress_title_logout">Skrái út úr Briar…</string>
+  <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">Skjáyfirlag fannst</string>
+  <string name="screen_filter_body">Annað forrit er að birta upplýsingar ofan á Briar. Í öryggisskyni mun Briar ekki bregðast við snertingum þegar annað forrit teiknar ofaná það.\n\nEftirfarandi forrit gætu verið að birta upplýsingar ofan á:\n\n%1$s</string>
+  <string name="screen_filter_allow">Leyfa þessum forritum að birta upplýsingar efst</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Heimildir á myndavél</string>
+  <string name="permission_camera_request_body">Til að skanna QR-kóðann þarf Briar heimild til að nota myndavélina.</string>
+  <string name="permission_location_title">Heimild fyrir staðsetningu</string>
+  <string name="permission_location_request_body">Til að finna Bluetooth-tæki, þarf Briar heimild til að nota staðsetningu þína.\n\nBriar geymir ekki staðsetningar eða deilir þeim með neinum.</string>
+  <string name="permission_camera_location_title">Myndavél og staðsetning</string>
+  <string name="permission_camera_location_request_body">Til að skanna QR-kóðann, þarf Briar aðgang að myndavélinni.\n\nTil að finna Bluetooth-tæki, þarf Briar heimild til að nota staðsetningu þína.\n\nBriar geymir ekki staðsetningar eða deilir þeim með neinum.</string>
+  <string name="permission_camera_denied_body">Þú hefur hafnað aðgangi að myndavélinni, en það að bæta við tengiliðum krefst notkun hennar.\n\nÍhugaðu að veita þennan aðgang.</string>
+  <string name="qr_code">QR-kóði</string>
+  <string name="show_qr_code_fullscreen">Birta QR-kóða á öllum skjánum</string>
+  <!--App Locking-->
+  <string name="lock_unlock">Aflæsa Briar</string>
+  <string name="lock_unlock_verbose">Settu inn PIN-númer tækisins, mynstur eða lykilorðið þitt til að aflæsa Briar</string>
+  <string name="lock_unlock_fingerprint_description">Snertu fingrafaraskynjarann með viðeigandi fingri til að halda áfram</string>
+  <string name="lock_unlock_password">Nota lykilorð</string>
+  <string name="lock_is_locked">Briar er læst</string>
+  <string name="lock_tap_to_unlock">Ýttu til að aflæsa</string>
+  <!--Screenshots-->
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_alice">Lísa</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_bob">Bjössi</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_carol">Kata</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
+  <string name="screenshot_message_1">Hæ Bjössi!</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
+  <string name="screenshot_message_2">Hæ Lísa! Takk fyrir að segja mér frá Briar!</string>
+  <!--This is a message to be used in screenshots.-->
+  <string name="screenshot_message_3">Ekki málið, vona að þér líki það 😀</string>
+</resources>

briar-android/src/main/res/values-it/strings.xml

@@ -118,10 +118,17 @@
   <string name="message_hint">Scrivi un messaggio</string>
   <string name="image_caption_hint">Aggiungi una didascalia (facoltativo)</string>
   <string name="image_attach">Allega immagine</string>
-  <string name="image_attach_error">Non è stato possibile allegare l\'immagine</string>
+  <string name="image_attach_error">Impossibile allegare l\'immagine/i</string>
+  <string name="image_attach_error_too_big">Immagine troppo grande. Il limite è di %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Formato immagine non supportato: %s</string>
   <string name="set_contact_alias">Cambia il nome del contatto</string>
   <string name="set_contact_alias_hint">Nome contatto</string>
   <string name="set_alias_button">Cambia</string>
+  <string name="delete_all_messages">Elimina tutti i messaggi</string>
+  <string name="dialog_title_delete_all_messages">Conferma l\'eliminazione dei messaggi</string>
+  <string name="dialog_message_delete_all_messages">Sei sicuro di voler eliminare tutti i messaggi?</string>
+  <string name="dialog_title_not_all_messages_deleted">Impossibile eliminare i messaggi</string>
+  <string name="dialog_message_not_all_messages_deleted">I messaggi relativi a presentazioni o inviti in corso non posssono essere eliminati fino alla loro conclusione.</string>
   <string name="delete_contact">Elimina contatto</string>
   <string name="dialog_title_delete_contact">Conferma cancellazione contatto</string>
   <string name="dialog_message_delete_contact">Sei sicuro di voler rimuovere questo contatto e tutti i messaggi scambiati con esso?</string>
@@ -137,8 +144,9 @@
   <string name="dialog_message_no_image_support">Il Briar del tuo contatto non supporta ancora le immagini in allegato. Quando avrà aggiornato vedrai un\'icona diversa.</string>
   <string name="dialog_title_image_support">Ora puoi inviare immagini a questo contatto</string>
   <string name="dialog_message_image_support">Tocca questa icona per allegare immagini.</string>
+  <string name="messaging_too_many_attachments_toast">Verranno inviate solo le prime %d immagini</string>
   <!--Adding Contacts-->
-  <string name="add_contact_title">Aggiungi contatto vicino</string>
+  <string name="add_contact_title">Aggiungi contatti vicino</string>
   <string name="face_to_face">Devi incontrarti con la persona che vuoi aggiungere come contatto.\n\nQuesto evita che qualcuno ti impersoni o legga i tuoi messaggi in futuro.</string>
   <string name="continue_button">Continua</string>
   <string name="try_again_button">Riprova</string>
@@ -160,7 +168,7 @@
   <string name="add_contact_nearby_title">Aggiungi contatto vicino</string>
   <string name="add_contact_remotely_title">Aggiungi contatto distante</string>
   <string name="contact_name_hint">Dai un nickname al contatto</string>
-  <string name="contact_link_intro">Inserisci il link dal tuo contatto qui</string>
+  <string name="contact_link_intro">Inserisci qui il link dal tuo contatto</string>
   <string name="contact_link_hint">Link del contatto</string>
   <string name="paste_button">Incolla</string>
   <string name="add_contact_button">Aggiungi contatto</string>
@@ -178,13 +186,16 @@
   <string name="pending_contact_requests">Richieste di contatto in attesa</string>
   <string name="no_pending_contacts">Nessun contatto in attesa</string>
   <string name="add_contact_remote_connecting">Connessione in corso...</string>
-  <string name="waiting_for_contact_to_come_online">In attesa che il contatto sia in linea…\n\nHa già inserito il tuo link?</string>
+  <string name="waiting_for_contact_to_come_online">In attesa che il contatto sia in linea...</string>
   <string name="connecting">Connessione in corso...</string>
   <string name="adding_contact">Aggiunta contatto…</string>
   <string name="adding_contact_failed">Aggiunta del contatto fallita</string>
+  <string name="dialog_title_remove_pending_contact">Conferma la rimozione</string>
+  <string name="dialog_message_remove_pending_contact">Questo contatto sta ancora per essere aggiunto. Se lo rimuovi ora, non verrà aggiunto.</string>
   <string name="own_link_error">Inserisci il link del contatto, non il tuo</string>
   <string name="nickname_missing">Inserisci un nickname</string>
   <string name="invalid_link">Link non valido</string>
+  <string name="unsupported_link">Questo collegamento viene da una versione più recente di Briar. Aggiorna all\'ultima versione e riprova.</string>
   <string name="intent_own_link">Hai aperto il tuo stesso link. Usa quello del contatto che vuoi aggiungere!</string>
   <string name="missing_link">Inserisci un link</string>
   <!--This is a numeral indicating the first step in a series of screens-->
@@ -195,6 +206,25 @@
     <item quantity="one">Nuovo contatto aggiunto.</item>
     <item quantity="other">%d nuovi contatti aggiunti.</item>
   </plurals>
+  <string name="adding_contact_slow_warning">L\'aggiunta di questo contatto sta impiegando più tempo del solito</string>
+  <string name="adding_contact_slow_title">Impossibile connettersi al contatto</string>
+  <string name="adding_contact_slow_text">L\'aggiunta di questo contatto sta impiegando più tempo del solito.\n\nControlla che il tuo contatto abbia ricevuto il tuo link e ti abbia aggiunto:</string>
+  <string name="offline_state">Nessuna connessione internet</string>
+  <string name="duplicate_link_dialog_title">Duplica il link</string>
+  <string name="duplicate_link_dialog_text_1">Hai già un contatto in attesa con questo link: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Hai già un contatto con questo link: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%s e %s sono la stessa persona?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Stessa persona</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Persone diverse</string>
+  <string name="duplicate_link_dialog_text_3">%s e %s ti hanno inviato lo stesso link.\n\nUno dei due potrebbe tentare di scoprire chi sono i tuoi contatti.\n\nNon dirgli che hai ricevuto lo stesso link da qualcun altro.</string>
+  <string name="pending_contact_updated_toast">Contatto in attesa aggiornato</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduzione tuoi contatti</string>
   <string name="introduction_onboarding_text">Puoi presentare i tuoi contatti fra di loro, così non hanno bisogno di incontrarsi di persona per connettersi a Briar.</string>

briar-android/src/main/res/values-ja/strings.xml

@@ -1,12 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <!--Setup-->
   <string name="setup_title">Briarへようこそ</string>
-  <string name="setup_name_explanation">あなたのニックネームは、常に、あなたが投稿するコンテンツとともに表示されます。プロフィール作成後の編集はできません。</string>
+  <string name="setup_name_explanation">あなたのニックネームは、常に、あなたが投稿するコンテンツとともに表示されます。プロフィール作成後、編集はできません。</string>
   <string name="setup_next">次へ</string>
   <string name="setup_password_intro">パスワードを選択</string>
-  <string name="setup_password_explanation">Briarのアカウント情報はクラウドではなく、暗号化され端末に保存されます。アプリのアンインストールやパスワードの紛失をした場合、アカウントへのアクセスとデータを回復する手段はありません。推測するのが難しい、長いパスワードを設定してください。ランダムな4単語やランダムな10文字などです。</string>
+  <string name="setup_password_explanation">Briarのアカウント情報はクラウドではなく、暗号化された端末に保存されます。アプリのアンインストールやパスワードの紛失をした場合、アカウントへのアクセスとデータを回復する手段はありません。\n\n推測するのが難しい、長いパスワードを設定してください。ランダムな4単語やランダムな10文字と数字と記号を組み合わせたものなどです。</string>
   <string name="setup_doze_title">バックグラウンド接続</string>
+  <string name="setup_doze_intro">メッセージを受信するには、Briarはバックグラウンドで接続を維持する必要があります。</string>
+  <string name="setup_doze_explanation">メッセージを受信するには、Briarはバックグラウンドで接続を維持する必要があります。 Briarが接続を維持できるように、バッテリーの最適化を無効にしてください。</string>
+  <string name="setup_doze_button">接続を許可</string>
   <string name="choose_nickname">ニックネームを入力</string>
   <string name="choose_password">パスワードを入力</string>
   <string name="confirm_password">確認のため再度パスワードを入力</string>
@@ -14,33 +17,57 @@
   <string name="password_too_weak">パスワードが弱すぎます。</string>
   <string name="passwords_do_not_match">パスワードが一致しません。</string>
   <string name="create_account_button">アカウントを作成</string>
+  <string name="more_info">詳細情報</string>
+  <string name="don_t_ask_again">次からはたずねない</string>
+  <string name="setup_huawei_text">下のボタンをタップして、「保護されたアプリ」画面でBriarが保護されていることを確認してください。</string>
+  <string name="setup_huawei_button">Briarを保護</string>
+  <string name="setup_huawei_help">Briarが保護されたアプリのリストに追加されていない場合、Briarはバックグラウンドで実行することができません。</string>
+  <string name="warning_dozed">%sはバックグラウンドで実行することができませんでした</string>
   <!--Login-->
   <string name="enter_password">パスワード</string>
   <string name="try_again">パスワードが間違っています。もう一度入力してください。</string>
-  <string name="sign_in_button">Sign In</string>
+  <string name="sign_in_button">サインイン</string>
   <string name="forgotten_password">パスワードを忘れました。</string>
   <string name="dialog_title_lost_password">パスワードを紛失</string>
-  <string name="dialog_message_lost_password">あなたのBriarアカウントはクラウド上ではなく、暗号化さた上であなたのデバイスに保存さています。したがってBriarはパスワードをリセットできません。アカウントを削除しはじめからやりなおしますか？注意！あなたのID、連絡先、メッセージは永久に削除されます。</string>
+  <string name="dialog_message_lost_password">あなたのBriarアカウントはクラウド上ではなく、暗号化さた上であなたのデバイスに保存さています。したがってBriarはパスワードをリセットできません。アカウントを削除しはじめからやりなおしますか？\n\n注意：あなたのID、連絡先、メッセージは永久に復元できません。</string>
   <string name="startup_failed_notification_title">Briarを起動できません。</string>
-  <string name="startup_failed_activity_title">起動に失敗</string>
+  <string name="startup_failed_notification_text">「詳細情報」をタップしてください。</string>
+  <string name="startup_failed_activity_title">起動に失敗しました</string>
+  <string name="startup_failed_db_error">何らかの理由で、Briarデータベースが修復できないほど破損しています。 アカウント、データ、およびすべての連絡先が失われています。 残念ながら、パスワードプロンプトで「パスワードを忘れましました。」を選択して、Briarを再インストールするか、新しいアカウントを設定する必要があります。</string>
+  <string name="startup_failed_data_too_old_error">アカウントはこのアプリの古いバージョンで作成されたため、このバージョンで開くことはできません。 パスワードプロンプトで「パスワードを紛失しました。」を選択して、古いバージョンを再インストールするか、新しいアカウントを設定する必要があります。</string>
+  <string name="startup_failed_data_too_new_error">このバージョンのアプリは古すぎます。 最新バージョンにアップグレードして、もう一度試してみてください。</string>
   <string name="startup_failed_service_error">プラグインの起動に失敗しました。Briarを再インストールすることで通常は直ります。Briarは中央サーバにデータを保存していないため、アカウントとそれに関連する情報は全て失われることに注意してください。</string>
+  <plurals name="expiry_warning">
+    <item quantity="other">これは、Briarのテストバージョンです。 アカウントは%d日で期限切れになり、更新できません。</item>
+  </plurals>
+  <string name="expiry_update">テストの有効期限が延長されました。 アカウントは%d日後に有効期限が切れます。</string>
   <string name="expiry_date_reached">このソフトの有効期限が切れました。テストに参加してくださりありがとうございます！</string>
+  <string name="download_briar">引き続きBriarを使用するには、バージョン1.0を使用してください。</string>
+  <string name="create_new_account">新しいアカウントを作成する必要があります。同じニックネームも使用できます。</string>
+  <string name="download_briar_button">Briar 1.0をダウンロード</string>
+  <string name="startup_open_database">データベースの復号化中…</string>
+  <string name="startup_migrate_database">データベースをアップグレード中…</string>
+  <string name="startup_compact_database">データベースの圧縮中…</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">ナビゲーションを開く</string>
   <string name="nav_drawer_close_description">ナビゲーションを閉じる</string>
   <string name="contact_list_button">連絡先</string>
-  <string name="groups_button">Private Groups</string>
+  <string name="groups_button">プライベートグループ</string>
   <string name="forums_button">フォーラム</string>
-  <string name="blogs_button">Blogs</string>
+  <string name="blogs_button">ブログ</string>
   <!--This is part of the main menu. The app will be locked when this is tapped.-->
   <string name="lock_button">アプリをロック</string>
-  <string name="settings_button">Settings</string>
+  <string name="settings_button">設定</string>
   <string name="sign_out_button">サインアウト</string>
   <!--Transports-->
   <string name="transport_tor">インターネット</string>
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Briarからサインアウト</string>
+  <string name="reminder_notification_text">タップして再ログインします。</string>
+  <string name="reminder_notification_channel_title">Briarサインインリマインダー</string>
+  <string name="reminder_notification_dismiss">断る</string>
   <string name="ongoing_notification_title">Briarにサインイン</string>
   <string name="ongoing_notification_text">Briarを開く</string>
   <plurals name="private_message_notification_text">
@@ -53,12 +80,12 @@
     <item quantity="other">%d件の新規フォーラム投稿</item>
   </plurals>
   <plurals name="blog_post_notification_text">
-    <item quantity="other">%d件の新規ブログポスト</item>
+    <item quantity="other">%d件の新規ブログ投稿</item>
   </plurals>
   <!--Misc-->
-  <string name="now">現在</string>
+  <string name="now">たった今</string>
   <string name="show">表示</string>
-  <string name="hide">非表示</string>
+  <string name="hide">隠す</string>
   <string name="ok">OK</string>
   <string name="cancel">キャンセル</string>
   <string name="got_it">了解</string>
@@ -66,7 +93,7 @@
   <string name="accept">承認</string>
   <string name="decline">却下</string>
   <string name="options">オプション</string>
-  <string name="online">オプション</string>
+  <string name="online">オンライン</string>
   <string name="offline">オフライン</string>
   <string name="send">送信</string>
   <string name="allow">許可</string>
@@ -74,75 +101,431 @@
   <string name="no_data">データなし</string>
   <string name="ellipsis">...</string>
   <string name="text_too_long">入力された文章が長すぎます。</string>
-  <string name="show_onboarding">ヘルプを表示</string>
+  <string name="show_onboarding">ヘルプダイアログを表示</string>
+  <string name="fix">修復する</string>
   <string name="help">ヘルプ</string>
+  <string name="sorry">すみません</string>
   <!--Contacts and Private Conversations-->
+  <string name="no_contacts">表示する連絡先がありません</string>
+  <string name="no_contacts_action">「＋」アイコンをタップして連絡先を追加</string>
   <string name="date_no_private_messages">メッセージがありません。</string>
+  <string name="no_private_messages">表示するメッセージがありません</string>
   <string name="message_hint">メッセージ入力</string>
-  <string name="delete_contact">連絡先を削除</string>
-  <string name="contact_deleted_toast">連絡先の削除完了</string>
+  <string name="image_caption_hint">説明文を追加する（任意）</string>
+  <string name="image_attach">画像を添付</string>
+  <string name="image_attach_error">画像を添付できませんでした</string>
+  <string name="image_attach_error_too_big">画像が大きすぎます。 %dMBが制限です。</string>
+  <string name="image_attach_error_invalid_mime_type">サポートされていない画像形式：%s</string>
+  <string name="set_contact_alias">連絡先を変更</string>
+  <string name="set_contact_alias_hint">連絡先名</string>
+  <string name="set_alias_button">変更</string>
+  <string name="delete_contact">この連絡先を削除</string>
+  <string name="dialog_title_delete_contact">連絡先の削除時に確認</string>
+  <string name="dialog_message_delete_contact">この連絡先と、この連絡先とのすべてのメッセージを削除してもよろしいですか？</string>
+  <string name="contact_deleted_toast">連絡先を削除しました</string>
+  <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
+  <string name="you">あなた</string>
+  <string name="save_image">画像を保存</string>
+  <string name="dialog_title_save_image">画像を保存しますか？</string>
+  <string name="dialog_message_save_image">画像を保存すると、他のアプリがその画像にアクセスできるようになります。\n\n保存してもよろしいですか？</string>
+  <string name="save_image_success">画像を保存しました</string>
+  <string name="save_image_error">画像を保存できませんでした</string>
+  <string name="dialog_title_no_image_support">利用できない画像です</string>
+  <string name="dialog_message_no_image_support">あなたのこの連絡先のBriarは画像の添付ファイルをまだサポートしていません。連絡先がアップグレードすると、別のアイコンが表示されます。</string>
+  <string name="dialog_title_image_support">この連絡先に画像を送信できるようになりました</string>
+  <string name="dialog_message_image_support">このアイコンをタップして画像を添付します。</string>
   <!--Adding Contacts-->
-  <string name="add_contact_title">連絡先を追加</string>
+  <string name="add_contact_title">近くの人を連絡先に追加する</string>
+  <string name="face_to_face">連絡先として追加したい人と会う必要があります。\n\nこれにより、だれかがあなたになりすましたり、メッセージを読んだりするのを防ぐことができます。</string>
   <string name="continue_button">続ける</string>
   <string name="try_again_button">もう一度やり直してください</string>
+  <string name="waiting_for_contact_to_scan">連絡先がスキャンして接続するのを待っています\u2026</string>
+  <string name="exchanging_contact_details">連絡先の詳細を交換しています\ u2026</string>
+  <string name="contact_added_toast">追加された連絡先：%s</string>
+  <string name="contact_already_exists">連絡先%sは既に存在しています </string>
+  <string name="qr_code_invalid">QRコードが無効です</string>
+  <string name="qr_code_too_old">スキャンしたQRコードは%sの古いバージョンから取得されました。\n\n最新バージョンへアップグレードしてもらって、もう一度お試しください。</string>
+  <string name="qr_code_too_new">スキャンしたQRコードは、新しいバージョンの%sから取得されました。\n\n最新バージョンにアップグレードしてから、もう一度お試しください。</string>
+  <string name="camera_error">カメラエラー</string>
+  <string name="connecting_to_device">デバイスに接続中\u2026</string>
+  <string name="authenticating_with_device">デバイス同士での認証中\u2026</string>
+  <string name="connection_error_title">連絡先に接続できませんでした</string>
+  <string name="connection_error_explanation">あなたと連絡相手、両方が同じWi-Fiネットワークに接続していることを確認してください。</string>
+  <string name="connection_error_feedback">この問題が解決しない場合、アプリを改善するために<a href="feedback">フィードバック</a>を送信してください。</string>
+  <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">離れた場所にいる相手を連絡先に追加</string>
+  <string name="add_contact_nearby_title">近くにいる相手を連絡先に追加</string>
+  <string name="add_contact_remotely_title">離れた場所にいる相手を連絡先に追加</string>
+  <string name="contact_name_hint">連絡先にニックネームを付ける</string>
+  <string name="contact_link_intro">連絡相手のリンクをここに入力してください</string>
+  <string name="contact_link_hint">連絡相手のリンク</string>
+  <string name="paste_button">貼り付け</string>
+  <string name="add_contact_button">連絡相手を追加</string>
+  <string name="copy_button">コピー</string>
+  <string name="share_button">共有</string>
+  <string name="send_link_title">リンクの交換</string>
+  <string name="add_contact_choose_nickname">ニックネームを選んでください</string>
+  <string name="add_contact_choose_a_nickname">ニックネームを入力してください</string>
+  <string name="nickname_intro">この連絡相手にニックネームを付けます。 あなただけがそれを見ることができます。</string>
+  <string name="your_link">リンクを共有する連絡相手を追加する</string>
+  <string name="link_clip_label">Briarリンク</string>
+  <string name="link_copied_toast">リンクをコピーしました</string>
+  <string name="adding_contact_error">連絡先への追加中にエラーが発生しました。</string>
+  <string name="pending_contact_requests_snackbar">保留中の連絡先への追加リクエストがあります</string>
+  <string name="pending_contact_requests">連絡先追加リクエスト</string>
+  <string name="no_pending_contacts">保留中の連絡先追加リクエストはありません</string>
+  <string name="add_contact_remote_connecting">接続中…</string>
+  <string name="waiting_for_contact_to_come_online">連絡相手がオンラインになるのを待っています…</string>
+  <string name="connecting">接続中…</string>
+  <string name="adding_contact">連絡先を追加しています…</string>
+  <string name="adding_contact_failed">連絡先の追加に失敗しました</string>
+  <string name="dialog_title_remove_pending_contact">削除の確認</string>
+  <string name="dialog_message_remove_pending_contact">この連絡先はまだ追加中です。 今削除すると、追加されません。</string>
+  <string name="own_link_error">あなたのリンクではなく連絡先のリンクを入力してください</string>
+  <string name="nickname_missing">ニックネームを入力してください</string>
+  <string name="invalid_link">無効なリンク</string>
+  <string name="unsupported_link">このリンクは、Briarの新しいバージョンからのものです。 最新バージョンにアップグレードしてから、もう一度試してください。</string>
+  <string name="intent_own_link">あなたのBriar自身を指すリンクを開きました。 別の追加したい連絡先を使用してください！</string>
+  <string name="missing_link">リンクを入力してください</string>
+  <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
+  <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="other">%d 新しい連絡先が追加されました。</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">この連絡先の追加には通常より時間がかかります</string>
+  <string name="adding_contact_slow_title">連絡先に接続できません</string>
+  <string name="adding_contact_slow_text">この連絡先の追加には通常より時間がかかります。\n \n連絡先がリンクを受信して追加したことを確認してください：</string>
+  <string name="offline_state">インターネットに接続されていません</string>
+  <string name="duplicate_link_dialog_title">重複リンク</string>
+  <string name="duplicate_link_dialog_text_1">既に保留中の連絡先があります。リンク：%s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%sと%sは同じ人ですか？</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">同じ人</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">別の人</string>
+  <string name="duplicate_link_dialog_text_3">%sと%sから同じリンクを受信しました。\n\nどちらかがあなたの連絡先の内容を知ろうとしている可能性があります。\n\n他の人から同じリンクを受け取ったことを伝えないでください。</string>
+  <string name="pending_contact_updated_toast">保留中の連絡先が更新されました</string>
   <!--Introductions-->
+  <string name="introduction_onboarding_title">連絡先を紹介</string>
+  <string name="introduction_onboarding_text">連絡先をお互いに紹介できるので、Briarを使用して連絡するために直接会う必要はありません。</string>
+  <string name="introduction_menu_item">はじめに</string>
+  <string name="introduction_activity_title">連絡先を選択</string>
+  <string name="introduction_not_possible">これらの連絡先については、すでに1つの紹介が進行中です。 これが最初に完了するようにしてください。 あなたやあなたの連絡相手がめったにオンラインにならない場合、これには時間がかかることがあります。</string>
+  <string name="introduction_message_title">連絡相手を紹介する</string>
+  <string name="introduction_message_hint">メッセージを追加する（任意）</string>
+  <string name="introduction_button">はじめに</string>
+  <string name="introduction_sent">こちらの構成情報を送信しました。</string>
+  <string name="introduction_error">構成情報の作成中にエラーが発生しました。</string>
+  <string name="introduction_response_error">連絡相手からの構成情報に返信する際のエラー</string>
+  <string name="introduction_request_sent">%1$sを%2$sに追加するように要求しました。</string>
+  <string name="introduction_request_received">%1$sから%2$sへの紹介を求められました。 連絡先リストに%2$sを追加しますか？</string>
+  <string name="introduction_request_exists_received">%1$sから%2$sの紹介を求められましたが、%2$sは既に連絡先リストにあります。%1$sはそれを知らない可能性があるため、引き続き応じれます：</string>
+  <string name="introduction_request_answered_received">%1$sから%2$sへの紹介を求められました。</string>
+  <string name="introduction_response_accepted_sent">%1$sの紹介を受け入れました。</string>
+  <string name="introduction_response_accepted_sent_info">%1$sを連絡先に追加する前に、紹介を受け入れる必要があります。 これには時間がかかる場合があります。</string>
+  <string name="introduction_response_declined_sent">%1$sへの紹介を辞退しました。</string>
+  <string name="introduction_response_accepted_received">%1$sは%2$sの紹介を受け入れました。</string>
+  <string name="introduction_response_declined_received">%1$sは%2$sへの紹介を辞退しました。</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$sによると、%2$sが紹介を辞退しました。</string>
   <!--Private Groups-->
+  <string name="groups_list_empty">表示するグループがありません</string>
+  <string name="groups_list_empty_action">「＋」アイコンをタップしてグループを作成するか、連絡先に登録している誰かにグループを共有してもらう</string>
+  <string name="groups_created_by">%sによって作成されました。</string>
+  <plurals name="messages">
+    <item quantity="other">%d通のメッセージ</item>
+  </plurals>
+  <string name="groups_group_is_empty">このグループは空です</string>
+  <string name="groups_group_is_dissolved">このグループは解散しました</string>
   <string name="groups_remove">削除</string>
   <string name="groups_create_group_title">プライベートグループ作成</string>
   <string name="groups_create_group_button">グループ作成</string>
   <string name="groups_create_group_invitation_button">招待する</string>
   <string name="groups_create_group_hint">プライベートグループに名前をつける</string>
+  <string name="groups_invitation_sent">グループ招待状が送信されました</string>
   <string name="groups_member_list">メンバー一覧</string>
+  <string name="groups_invite_members">メンバーを招待</string>
+  <string name="groups_member_created_you">グループを作成しました</string>
+  <string name="groups_member_created">%sがグループを作成しました</string>
+  <string name="groups_member_joined_you">グループに参加しました</string>
+  <string name="groups_member_joined">%sがグループに参加しました</string>
+  <string name="groups_leave">グループをやめる</string>
+  <string name="groups_leave_dialog_title">グループをやめる確認</string>
+  <string name="groups_leave_dialog_message">このグループをやめてもよろしいですか？</string>
+  <string name="groups_dissolve">グループを削除</string>
+  <string name="groups_dissolve_dialog_title">グループの削除の確認</string>
+  <string name="groups_dissolve_dialog_message">このグループを削除してもよろしいですか？\n\nグループを削除すると、他のすべてのメンバーは会話を続けることができなくなり、最新のメッセージは受信できなくなります。</string>
+  <string name="groups_dissolve_button">削除</string>
+  <string name="groups_dissolved_dialog_title">グループを削除しました</string>
+  <string name="groups_dissolved_dialog_message">このグループの作成者はこのグループを削除しました。\n\nそのため、書き込まれたすべてのメンバーは会話を続けることができなくなり、最新のメッセージも受信できなくなりました。</string>
   <!--Private Group Invitations-->
+  <string name="groups_invitations_title">グループへ招待</string>
+  <string name="groups_invitations_invitation_sent">%1$sをグループ \"%2$s\"に招待しています。</string>
+  <string name="groups_invitations_invitation_received">%1$sがあなたをグループ \"%2$s\"に招待しています。</string>
+  <string name="groups_invitations_joined">グループに参加しました</string>
+  <string name="groups_invitations_declined">グループへの招待を辞退しました</string>
+  <plurals name="groups_invitations_open">
+    <item quantity="other">%d個のオープングループへの招待</item>
+  </plurals>
+  <string name="groups_invitations_response_accepted_sent">%sからのグループ招待を受け入れました。</string>
+  <string name="groups_invitations_response_declined_sent">%sからのグループへの招待を辞退しました。</string>
+  <string name="groups_invitations_response_accepted_received">%sはグループへの招待を受け入れました。</string>
+  <string name="groups_invitations_response_declined_received">%sはグループへの招待を辞退しました。</string>
+  <string name="sharing_status_groups">グループに新しいメンバーを招待できるのは、作成者のみです。 以下は、グループの現在の全員のメンバーです。</string>
   <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">連絡先を公開する</string>
+  <string name="groups_reveal_dialog_message">このグループの現在および将来のすべてのメンバーに連絡先を公開するかどうかを選択できます。\n\n連絡先を公開すると、グループの作成者がオフラインの場合でも公開された連絡先と通信できるため、グループへの接続がより高速で信頼性が高くなります。</string>
+  <string name="groups_reveal_visible">連絡先関係はグループに表示されます</string>
+  <string name="groups_reveal_visible_revealed_by_us">連絡先の関係はグループに表示されます（あなたによって公開されました）</string>
+  <string name="groups_reveal_visible_revealed_by_contact">連絡先の関係はグループに表示されます（%sによって公開されました）</string>
+  <string name="groups_reveal_invisible">連絡先の関係はグループには表示されません</string>
   <!--Forums-->
+  <string name="no_forums">表示するフォーラムがありません</string>
+  <string name="no_forums_action">「＋」アイコンをタップしてフォーラムを作成するか、連絡先に登録している誰かにフォーラムを共有してもらいます</string>
+  <string name="create_forum_title">フォーラムを作成</string>
+  <string name="choose_forum_hint">フォーラムの名前を選択してください</string>
+  <string name="create_forum_button">フォーラムを作成</string>
+  <string name="forum_created_toast">フォーラムが作成されました</string>
+  <string name="no_forum_posts">表示する投稿がありません</string>
+  <string name="no_posts">投稿なし</string>
+  <plurals name="posts">
+    <item quantity="other">%dつの投稿</item>
+  </plurals>
+  <string name="forum_new_message_hint">新しい投稿</string>
+  <string name="forum_message_reply_hint">新しい返信</string>
   <string name="btn_reply">返信</string>
+  <string name="forum_leave">フォーラムをやめる</string>
+  <string name="dialog_title_leave_forum">フォーラムをやめる確認</string>
+  <string name="dialog_message_leave_forum">このフォーラムをやめてもよろしいですか？\n\nこのフォーラムで共有した連絡先は更新の受信を停止します。</string>
+  <string name="dialog_button_leave">脱退する</string>
+  <string name="forum_left_toast">フォーラムをやめました</string>
   <!--Forum Sharing-->
+  <string name="forum_share_button">フォーラムを共有</string>
+  <string name="contacts_selected">選択した連絡先</string>
+  <string name="activity_share_toolbar_header">連絡先を選択</string>
+  <string name="no_contacts_selector">表示する連絡先がありません</string>
+  <string name="no_contacts_selector_action">連絡先を追加した後、ここに戻ってください</string>
+  <string name="forum_shared_snackbar">選択した連絡先と共有されるフォーラム</string>
+  <string name="forum_share_message">メッセージを追加する（任意）</string>
+  <string name="forum_share_error">このフォーラムの共有中にエラーが発生しました。</string>
+  <string name="forum_invitation_received">%1$sがフォーラム\"%2$s\"をあなたと共有しました。</string>
+  <string name="forum_invitation_sent">フォーラム\"%1$s\"を%2$sと共有しました。</string>
+  <string name="forum_invitations_title">フォーラムへの招待</string>
+  <string name="forum_invitation_exists">既にこのフォーラムへの招待を受け入れています。\n\n招待をさらに受け入れると、フォーラムへの接続がより速く、より信頼できるものになります。</string>
+  <string name="forum_joined_toast">フォーラムに参加しました</string>
+  <string name="forum_declined_toast">招待を辞退しました</string>
+  <string name="shared_by_format">%sによって共有されました。</string>
+  <string name="forum_invitation_already_sharing">既に共有しています</string>
+  <string name="forum_invitation_response_accepted_sent">%sからのフォーラムへの招待を受け入れました。</string>
+  <string name="forum_invitation_response_declined_sent">%sからのフォーラムへの招待を辞退しました。</string>
+  <string name="forum_invitation_response_accepted_received">%sはフォーラムへの招待を受け入れました。</string>
+  <string name="forum_invitation_response_declined_received">%sはフォーラムへの招待を辞退しました。</string>
+  <string name="sharing_status">共有ステータス</string>
+  <string name="sharing_status_forum">フォーラムのメンバーは誰でも連絡先と共有できます。 このフォーラムを次の連絡先と共有しています。 他のメンバーが表示されない場合もあります。</string>
+  <string name="shared_with">%1$dと共有（%2$d オンライン）</string>
+  <plurals name="forums_shared">
+    <item quantity="other">連絡先に登録している人が共有している%dフォーラム</item>
+  </plurals>
+  <string name="nobody">誰もいません</string>
   <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">表示する投稿がありません</string>
+  <string name="read_more">続きを読む</string>
+  <string name="blogs_write_blog_post">ブログに投稿する</string>
+  <string name="blogs_write_blog_post_body_hint">ブログの投稿内容を入力してください</string>
   <string name="blogs_publish_blog_post">公開</string>
+  <string name="blogs_blog_post_created">ブログポストが作成されました</string>
+  <string name="blogs_blog_post_received">新しいブログの投稿を受け取りました</string>
+  <string name="blogs_blog_post_scroll_to">スクロール：</string>
+  <string name="blogs_feed_empty_state">表示する投稿がありません</string>
+  <string name="blogs_feed_empty_state_action">登録している連絡先やブログからの投稿がここに表示されます\n\nペンアイコンをタップして投稿を書き込みます</string>
+  <string name="blogs_remove_blog">ブログを削除</string>
+  <string name="blogs_remove_blog_dialog_message">このブログを削除してもよろしいですか？\n\n投稿はデバイスから削除されますが、他の人のデバイスからは削除されません。\n\nこのブログを共有した人に更新の受信を停止します。</string>
   <string name="blogs_remove_blog_ok">解除</string>
+  <string name="blogs_blog_removed">ブログを削除しました</string>
+  <string name="blogs_reblog_comment_hint">コメントを追加する（任意）</string>
+  <string name="blogs_reblog_button">リブログ</string>
   <!--Blog Sharing-->
+  <string name="blogs_sharing_share">ブログを共有</string>
+  <string name="blogs_sharing_error">このブログの共有中にエラーが発生しました。</string>
+  <string name="blogs_sharing_button">ブログを共有</string>
+  <string name="blogs_sharing_snackbar">選択した連絡先と共有するブログ</string>
+  <string name="blogs_sharing_response_accepted_sent">%sからのブログへの招待を受け入れました。</string>
+  <string name="blogs_sharing_response_declined_sent">%sからのブログへの招待を辞退しました。</string>
+  <string name="blogs_sharing_response_accepted_received">%sはブログへの招待を受け入れました。</string>
+  <string name="blogs_sharing_response_declined_received">%sはブログへの招待を辞退しました。</string>
+  <string name="blogs_sharing_invitation_received">%1$sがブログ\"%2$s\"をあなたと共有しました。</string>
+  <string name="blogs_sharing_invitation_sent">ブログ\"%1$s\"を%2$sと共有しました。</string>
+  <string name="blogs_sharing_invitations_title">ブログへの招待</string>
+  <string name="blogs_sharing_joined_toast">ブログの購読</string>
+  <string name="blogs_sharing_declined_toast">招待を辞退しました</string>
+  <string name="sharing_status_blog">ブログを購読している人は誰でも、ブログを連絡先と共有できます。 このブログを次の連絡先と共有しています。 表示できない他の購読者もいる可能性があります。</string>
   <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import">RSSフィードをインポート</string>
   <string name="blogs_rss_feeds_import_button">インポート</string>
+  <string name="blogs_rss_feeds_import_hint">RSSフィードのURLを入力してください</string>
+  <string name="blogs_rss_feeds_import_error">申し訳ありません！ フィードのインポート中にエラーが発生しました。</string>
+  <string name="blogs_rss_feeds_manage">RSSフィードを管理</string>
+  <string name="blogs_rss_feeds_manage_imported">インポート済み：</string>
   <string name="blogs_rss_feeds_manage_author">著者:</string>
   <string name="blogs_rss_feeds_manage_updated">最終更新:</string>
+  <string name="blogs_rss_remove_feed">フィードを削除</string>
+  <string name="blogs_rss_remove_feed_dialog_message">このフィードを削除してもよろしいですか？\n\n投稿はデバイスから削除されますが、他の人のデバイスからは削除されません。\n\nこのフィードを共有した人は更新の受信を停止されます。</string>
   <string name="blogs_rss_remove_feed_ok">解除</string>
+  <string name="blogs_rss_feeds_manage_delete_error">フィードを削除できませんでした！</string>
+  <string name="blogs_rss_feeds_manage_empty_state">表示するRSSフィードはありません\n\n「＋」アイコンをタップしてフィードをインポートします</string>
+  <string name="blogs_rss_feeds_manage_error">フィードの読み込み中に問題が発生しました。 後でもう一度やり直してください。</string>
   <!--Settings Display-->
+  <string name="pref_language_title">言語 &amp; 領域</string>
+  <string name="pref_language_changed">この設定は、Briarを再起動すると有効になります。 サインアウトしてBriarを再起動してください。</string>
+  <string name="pref_language_default">システムのデフォルト</string>
   <string name="display_settings_title">表示</string>
   <string name="pref_theme_title">テーマ</string>
   <string name="pref_theme_light">ライト</string>
   <string name="pref_theme_dark">ダーク</string>
+  <string name="pref_theme_auto">自動（昼間）</string>
   <string name="pref_theme_system">システムデフォルト</string>
   <!--Settings Network-->
+  <string name="network_settings_title">ネットワーク</string>
+  <string name="bluetooth_setting">Bluetooth経由で接続する</string>
+  <string name="bluetooth_setting_enabled">連絡先に登録している人が近くにいるときはいつでも接続する</string>
+  <string name="bluetooth_setting_disabled">その人を追加した場合のみ</string>
+  <string name="tor_network_setting">インターネット経由で接続する（Tor）</string>
+  <string name="tor_network_setting_automatic">場所に基づいて自動的に接続する</string>
+  <string name="tor_network_setting_without_bridges">ブリッジなしでTorを使用する</string>
+  <string name="tor_network_setting_with_bridges">ブリッジを通してTorを使用する</string>
+  <string name="tor_network_setting_never">接続しない</string>
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
+  <string name="tor_network_setting_summary">自動：%1$s（%2$sのうち）</string>
+  <string name="tor_mobile_data_title">モバイルデータを使用する</string>
+  <string name="tor_only_when_charging_title">充電時にのみインターネット（Tor）経由で接続する</string>
+  <string name="tor_only_when_charging_summary">デバイスがバッテリー使用している場合、インターネット接続を無効にする</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">セキュリティ</string>
+  <string name="pref_lock_title">アプリロック</string>
+  <string name="pref_lock_summary">ログイン中にデバイスの画面ロックを使用して、Briarを保護します</string>
+  <string name="pref_lock_disabled_summary">この機能を使用するには、デバイスの画面ロックを設定します</string>
+  <string name="pref_lock_timeout_title">\"Inactivity timeout\"された場合、アプリロックをロックする</string>
   <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
+  <string name="pref_lock_timeout_summary">Briarを使用しない場合、%s後に自動的にロックします</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
   <string name="pref_lock_timeout_1">1 分</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
   <string name="pref_lock_timeout_5">5 分</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_15">15分</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_30">30分</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
   <string name="pref_lock_timeout_60">1 時間</string>
-  <string name="pref_lock_timeout_never">二度としない</string>
+  <string name="pref_lock_timeout_never">しない</string>
+  <string name="pref_lock_timeout_never_summary">Briarを自動的にロックしない</string>
   <string name="change_password">パスワードの変更</string>
+  <string name="current_password">現在のパスワード</string>
+  <string name="choose_new_password">新しいパスワード</string>
   <string name="confirm_new_password">新しいパスワードの確認</string>
+  <string name="password_changed">パスワードが変更されました。</string>
+  <string name="panic_setting">パニックボタンのセットアップ</string>
+  <string name="panic_setting_title">パニックボタン</string>
+  <string name="panic_setting_hint">パニックボタンアプリを使用したときのBriarの反応を構成する</string>
+  <string name="panic_app_setting_title">パニックボタンアプリ</string>
+  <string name="unknown_app">未知のアプリ</string>
+  <string name="panic_app_setting_summary">アプリが設定されていません</string>
   <string name="panic_app_setting_none">なし</string>
+  <string name="dialog_title_connect_panic_app">パニックアプリを確認</string>
+  <string name="dialog_message_connect_panic_app">%1$sが強制力の強いパニックボタンアクションをトリガーすることを許可してもよろしいですか？</string>
+  <string name="panic_setting_destructive_action">強制力の強いアクション</string>
   <string name="panic_setting_signout_title">サインアウト</string>
+  <string name="panic_setting_signout_summary">パニックボタンが押された場合、Briarからログアウトする</string>
   <string name="purge_setting_title">アカウントを削除</string>
+  <string name="purge_setting_summary">パニックボタンが押された場合は、Briarアカウントを削除します。 注意：これにより、ID、連絡先、メッセージが完全に削除されます</string>
+  <string name="uninstall_setting_title">Briarをアンインストールする</string>
+  <string name="uninstall_setting_summary">これには、パニックイベントの手動の確認が必要です</string>
   <!--Settings Notifications-->
   <string name="notification_settings_title">通知</string>
+  <string name="notify_sign_in_title">サインインするように通知する</string>
+  <string name="notify_sign_in_summary">電話の起動時またはアプリの更新時にリマインダーを表示する</string>
   <string name="notify_private_messages_setting_title">プライベート・メッセージ</string>
-  <string name="notify_lock_screen_setting_title">ロック画面</string>
+  <string name="notify_private_messages_setting_summary">プライベートメッセージのアラートを表示する</string>
+  <string name="notify_private_messages_setting_summary_26">プライベートメッセージのアラートを設定する</string>
+  <string name="notify_group_messages_setting_title">グループメッセージ</string>
+  <string name="notify_group_messages_setting_summary">グループメッセージのアラートを表示する</string>
+  <string name="notify_group_messages_setting_summary_26">グループメッセージのアラートを設定する</string>
+  <string name="notify_forum_posts_setting_title">フォーラム投稿</string>
+  <string name="notify_forum_posts_setting_summary">フォーラム投稿のアラートを表示する</string>
+  <string name="notify_forum_posts_setting_summary_26">フォーラム投稿のアラートを設定する</string>
+  <string name="notify_blog_posts_setting_title">ブログポスト</string>
+  <string name="notify_blog_posts_setting_summary">ブログ投稿のアラートを表示する</string>
+  <string name="notify_blog_posts_setting_summary_26">ブログ投稿のアラートを設定する</string>
+  <string name="notify_vibration_setting">バイブレーション</string>
+  <string name="notify_sound_setting">音</string>
+  <string name="notify_sound_setting_default">デフォルト着信音</string>
   <string name="notify_sound_setting_disabled">なし</string>
+  <string name="choose_ringtone_title">着信音を選択</string>
+  <string name="cannot_load_ringtone">着信音を読み込めません</string>
   <!--Settings Feedback-->
+  <string name="feedback_settings_title">フィードバック</string>
+  <string name="send_feedback">フィードバックを送信</string>
   <!--Link Warning-->
+  <string name="link_warning_title">リンクの警告</string>
+  <string name="link_warning_intro">外部アプリで次のリンクを開こうとしています。</string>
+  <string name="link_warning_text">これはあなたを識別するために使用できます。 このリンクを送ってきた人を信頼していいのどうか考えてください。リンクを開く場合は、Tor Browserで開いてください。</string>
+  <string name="link_warning_open_link">リンクを開く</string>
   <!--Crash Reporter-->
+  <string name="crash_report_title">Briarのクラッシュレポート</string>
+  <string name="briar_crashed">申し訳ありませんが、Briarはクラッシュしました。</string>
+  <string name="not_your_fault">これはあなたのせいではありません。</string>
+  <string name="please_send_report">クラッシュレポートを送信して、より良いBriarの開発にご協力ください。</string>
+  <string name="report_is_encrypted">レポートは暗号化され、安全に送信されることをお約束します。</string>
+  <string name="feedback_title">フィードバック</string>
+  <string name="describe_crash">何が起こったかのかを説明してください（任意）</string>
+  <string name="enter_feedback">フィードバックを入力してください</string>
+  <string name="optional_contact_email">あなたのメールアドレス（任意）</string>
+  <string name="include_debug_report_crash">クラッシュに関する匿名のデータを添付する</string>
+  <string name="include_debug_report_feedback">このデバイスに関する匿名のデータを添付する</string>
+  <string name="could_not_load_report_data">レポートデータを読み込めませんでした。</string>
+  <string name="send_report">レポートを送信</string>
   <string name="close">閉じる</string>
+  <string name="dev_report_saved">レポートを保存しました。 次回、Briarにログインしたときに送信されます。</string>
   <!--Sign Out-->
+  <string name="progress_title_logout">Briarからサインアウト中…</string>
   <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">スクリーンオーバーレイが検出されました</string>
+  <string name="screen_filter_body">別のアプリがBriarの画面上に描画しています。 セキュリティを保護するために、Briarは、別のアプリがBriarの画面上に描画している場合、タッチに応答しません。\n\n次のアプリが上に描画されている可能性があります：\n\n%1$s</string>
+  <string name="screen_filter_allow">これらのアプリがBriarの画面上に描画できるようにする</string>
   <!--Permission Requests-->
+  <string name="permission_camera_title">カメラへのアクセス許可</string>
+  <string name="permission_camera_request_body">QRコードをスキャンするには、Briarはカメラにアクセスする必要があります。</string>
+  <string name="permission_location_title">位置情報へのアクセスの許可</string>
+  <string name="permission_location_request_body">Bluetoothデバイスを検出するには、Briarがあなたの位置情報へのアクセスを必要とします。\n\nBriarはあなたの場所を保存したり、誰とも共有したりしません。</string>
+  <string name="permission_camera_location_title">カメラと位置情報</string>
+  <string name="permission_camera_location_request_body">QRコードをスキャンするには、Briarはカメラにアクセスする必要があります。\n\nBluetoothデバイスを検出するには、Briarは現在地情報にアクセスする許可が必要です。\n\nBriarは現在地を保存したり、誰とも共有したりしません。</string>
+  <string name="permission_camera_denied_body">カメラへのアクセスをが拒否されましたが、連絡先を追加するにはカメラを使用する必要があります。\n\nカメラへのアクセスの許可を考えてください。</string>
+  <string name="qr_code">QRコード</string>
+  <string name="show_qr_code_fullscreen">QRコードを全画面表示する</string>
   <!--App Locking-->
+  <string name="lock_unlock">Briarのロックを解除</string>
+  <string name="lock_unlock_verbose">Briarのロックを解除するには、デバイスのPIN、パターン、またはパスワードを入力してください</string>
+  <string name="lock_unlock_fingerprint_description">登録した指で指紋センサーに触れて続行します</string>
+  <string name="lock_unlock_password">パスワードを使用</string>
+  <string name="lock_is_locked">Briarはロックされています</string>
+  <string name="lock_tap_to_unlock">タップしてロック解除</string>
+  <!--Screenshots-->
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_alice">アリス</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_bob">ボブ</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_carol">キャロル</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
+  <string name="screenshot_message_1">こんにちは、ボブ！</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
+  <string name="screenshot_message_2">やあ、アリス！ Briarを教えてくれてありがとう！</string>
+  <!--This is a message to be used in screenshots.-->
+  <string name="screenshot_message_3">どういたしまして！気に入ってくれるといいな😀</string>
 </resources>

briar-android/src/main/res/values-ko/strings.xml

@@ -0,0 +1,483 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--Setup-->
+  <string name="setup_title">Briar에 오신 것을 환영합니다</string>
+  <string name="setup_name_explanation">별명은 게시한 모든 컨텐츠 옆에 보여지게 됩니다. 별명은 계정을 만든 후에는 바꿀 수 없습니다.</string>
+  <string name="setup_next">다음</string>
+  <string name="setup_password_intro">비밀번호를 정해주세요.</string>
+  <string name="setup_password_explanation">Briar 계정은 암호화되어 기기에 저장되기 때문에 클라우드에 저장되지 않습니다. 비밀번호를 잊어버리셨거나 Briar를 삭제하셨었다면 계정을 복구할 방법이 없습니다.\n\n연관성 없는 네 단어, 혹은 완전히 무작위적인 글자, 숫자, 그리고 기호의 조합과 같은 길고 알아맞추기 어려운 비밀번호로 정해주세요.</string>
+  <string name="setup_doze_title">백그라운드 연결</string>
+  <string name="setup_doze_intro">메시지를 받기 위해서는 Briar가 백그라운드에서 연결된 상태를 유지해야 합니다.</string>
+  <string name="setup_doze_explanation">메시지를 받기 위해서는 Briar가 백그라운드에서 연결된 상태를 유지해야 합니다. Briar가 백그라운드에서 연결된 상태를 유지할 수 있게 배터리 최적화를 비활성화해 주세요.</string>
+  <string name="setup_doze_button">연결 허용하기</string>
+  <string name="choose_nickname">별명을 정하세요</string>
+  <string name="choose_password">비밀번호를 정하세요</string>
+  <string name="confirm_password">비밀번호를 확인하세요</string>
+  <string name="name_too_long">이름이 너무 깁니다.</string>
+  <string name="password_too_weak">비밀번호가 너무 약합니다</string>
+  <string name="passwords_do_not_match">비밀번호가 일치하지 않습니다</string>
+  <string name="create_account_button">계정 만들기</string>
+  <string name="more_info">추가 정보</string>
+  <string name="don_t_ask_again">다시는 물어보지 않기</string>
+  <string name="setup_huawei_text">밑의 버튼을 눌러 Briar를 \"보호된 앱\" 스크린에서 보호되게 해 주세요.</string>
+  <string name="setup_huawei_button">Briar 보호하기</string>
+  <string name="setup_huawei_help">Briar가 보호된 앱 목록에 추가되지 않는다면, 백그라운드에서 실행될 수 없습니다.</string>
+  <string name="warning_dozed">%s가 백그라운드에서 실행될 수 없었습니다</string>
+  <!--Login-->
+  <string name="enter_password">비밀번호</string>
+  <string name="try_again">잘못된 비밀번호입니다. 다시 시도하세요.</string>
+  <string name="sign_in_button">로그인</string>
+  <string name="forgotten_password">비밀번호를 잊어버렸습니다</string>
+  <string name="dialog_title_lost_password">비밀번호 분실</string>
+  <string name="dialog_message_lost_password">Briar 계정은 클라우드가 아니라 기기에서 암호화돼 저장되므로 비밀번호를 재설정 할 수 없습니다. 계정을 삭제하고 다시 시작하시겠습니까? \n\n주의 : 신원, 연락처 및 메시지는 영구적으로 손실됩니다.</string>
+  <string name="startup_failed_notification_title">Briar가 켜질 수 없습니다</string>
+  <string name="startup_failed_notification_text">눌러서 추가 정보 확인.</string>
+  <string name="startup_failed_activity_title">Briar 시작 실패</string>
+  <string name="startup_failed_db_error">어떤 이유에선지, Briar 데이터베이스가 복구될 수 없을 정도로 손상됐습니다. 데이터와 모든 연락처 정보가 사라졌습니다. 안타깝게도, Briar를 다시 설치하거나 비밀번호를 입력하는 화면에서 \"비밀번호를 잊어버렸습니다\"를 눌러 새로운 계정을 설정해야 합니다.</string>
+  <string name="startup_failed_data_too_old_error">너무 오래된 버전의 Briar를 이용해 만든 계정이라 이 버전으로는 사용할 수 없습니다. 이전 버전을 다시 설치하거나 비밀번호를 입력하는 창에서 \'비밀번호를 잊어버렸습니다\'를 선택해 새로운 계정을 설정하세요.</string>
+  <string name="startup_failed_data_too_new_error">이 버전의 앱은 너무 오래됐습니다. 최신 버전으로 업그레이드하고 다시 시도하세요.</string>
+  <string name="startup_failed_service_error">Briar에서 필요한 플러그인을 시작하지 못했습니다. Briar를 다시 설치하면 대개 이 문제가 해결됩니다. 그렇지만 Briar에서는 데이터를 저장하기 위해 중앙 서버를 사용하고 있지 않기 때문에 계정과 관련된 모든 데이터를 잃게 됩니다.</string>
+  <plurals name="expiry_warning">
+    <item quantity="other">이 Briar는 테스트용입니다. %d일 내에 계정이 만료되고 다시 되돌리지 못합니다.</item>
+  </plurals>
+  <string name="expiry_update">테스트 만료 기한이 늘어났습니다. 이제 %d일 후에 계정이 만료됩니다.</string>
+  <string name="expiry_date_reached">이 소프트웨어는 만료되었습니다. \ n 테스트 해 주셔서 감사합니다!</string>
+  <string name="download_briar">Briar를 계속 사용하기 위해선, 1.0 버전을 다운로드해 주세요.</string>
+  <string name="create_new_account">새로운 계정을 만들어야 하지만, 같은 별명을 사용할 수 있습니다.</string>
+  <string name="download_briar_button">Briar 1.0 다운로드</string>
+  <string name="startup_open_database">데이터베이스를 복호화하고 있습니다....</string>
+  <string name="startup_migrate_database">데이터베이스를 업그레이드 하고 있습니다...</string>
+  <string name="startup_compact_database">데이터베이스를 작게 만들고 있습니다...</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">탐색 창 열기</string>
+  <string name="nav_drawer_close_description">탐색 창 닫기</string>
+  <string name="contact_list_button">연락처</string>
+  <string name="groups_button">개인 모임</string>
+  <string name="forums_button">포럼</string>
+  <string name="blogs_button">블로그</string>
+  <!--This is part of the main menu. The app will be locked when this is tapped.-->
+  <string name="lock_button">앱 잠그기</string>
+  <string name="settings_button">설정</string>
+  <string name="sign_out_button">로그아웃</string>
+  <!--Transports-->
+  <string name="transport_tor">인터넷</string>
+  <string name="transport_bt">블루투스</string>
+  <string name="transport_lan">Wi-Fi</string>
+  <!--Notifications-->
+  <string name="reminder_notification_title">Briar에서 로그아웃 됨</string>
+  <string name="reminder_notification_text">눌러서 다시 로그인하세요.</string>
+  <string name="reminder_notification_channel_title">Briar 로그인 알림</string>
+  <string name="reminder_notification_dismiss">그만 보기</string>
+  <string name="ongoing_notification_title">Briar에 로그인 됨</string>
+  <string name="ongoing_notification_text">Briar를 열려면 만지세요.</string>
+  <plurals name="private_message_notification_text">
+    <item quantity="other">새로운 %d개의 개인 메시지가 있습니다.</item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="other">새로운 %d개의 모임 메시지가 있습니다.</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="other">새로운 %d개의 포럼 게시물이 있습니다.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="other">새로운 %d개의 블로그 게시물이 있습니다.</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">지금</string>
+  <string name="show">Show</string>
+  <string name="hide">숨기기</string>
+  <string name="ok">확인</string>
+  <string name="cancel">취소</string>
+  <string name="got_it">알겠습니다</string>
+  <string name="delete">삭제</string>
+  <string name="accept">받아들이기</string>
+  <string name="decline">거절하기</string>
+  <string name="options">옵션</string>
+  <string name="online">온라인</string>
+  <string name="offline">오프라인</string>
+  <string name="send">보내기</string>
+  <string name="allow">허용하기</string>
+  <string name="open">열기</string>
+  <string name="no_data">데이터가 없습니다</string>
+  <string name="ellipsis">...</string>
+  <string name="text_too_long">입력된 내용이 너무 깁니다</string>
+  <string name="show_onboarding">도움말 보기</string>
+  <string name="fix">고치기</string>
+  <string name="help">도움</string>
+  <string name="sorry">죄송합니다</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">저장된 연락처가 없습니다</string>
+  <string name="no_contacts_action">+ 상징을 눌러서 연락처를 추가하세요</string>
+  <string name="date_no_private_messages">메시지가 없습니다.</string>
+  <string name="no_private_messages">저장된 메시지가 없습니다</string>
+  <string name="message_hint">메시지 입력하기</string>
+  <string name="image_caption_hint">캡션 넣기(선택 사항)</string>
+  <string name="image_attach">이미지 첨부하기</string>
+  <string name="set_contact_alias">연락처 이름 바꾸기</string>
+  <string name="set_contact_alias_hint">연락처 이름</string>
+  <string name="set_alias_button">바꾸기</string>
+  <string name="delete_contact">연락처 지우기</string>
+  <string name="dialog_title_delete_contact">연락처 삭제 확인</string>
+  <string name="dialog_message_delete_contact">정말로 이 연락처, 그리고 이 연락처와의 메시지를 모두 빼시겠어요?</string>
+  <string name="contact_deleted_toast">연락처가 삭제됐습니다</string>
+  <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
+  <string name="you">당신</string>
+  <string name="save_image">이미지 저장하기</string>
+  <string name="dialog_title_save_image">이미지를 저장하시겠어요?</string>
+  <string name="dialog_message_save_image">이 이미지를 저장하면 다른 앱에서도 볼 수 있게 됩니다. 정말로 저장하시겠어요?</string>
+  <string name="save_image_success">이미지가 저장됐습니다</string>
+  <string name="save_image_error">이미지를 저장할 수 없었습니다</string>
+  <string name="dialog_title_no_image_support">이미지를 사용할 수 없습니다</string>
+  <string name="dialog_message_no_image_support">연락하는 분의 Briar가 이미지 첨부를 지원하지 않습니다. 이 분이 업그레이드하면 다른 상징을 볼 수 있습니다.</string>
+  <string name="dialog_title_image_support">이제 이 분에게 이미지를 보낼 수 있습니다</string>
+  <string name="dialog_message_image_support">이 상징을 눌러 이미지를 첨부하세요.</string>
+  <!--Adding Contacts-->
+  <string name="face_to_face">연락처를 추가하려는 사람과 먼저 만나야 합니다.\n\n나중에 누군가 당신인 척 하거나 메시지를 훔쳐보는 것을 방지할 수 있습니다.</string>
+  <string name="continue_button">계속하기</string>
+  <string name="try_again_button">다시 시도하기</string>
+  <string name="waiting_for_contact_to_scan">연락처가 스캔하고 연결하길 기다리고 있습니다\u2026</string>
+  <string name="exchanging_contact_details">연락처 세부사항을 교환하고 있습니다\u2026</string>
+  <string name="contact_added_toast">%s: 연락처가 추가됐습니다.</string>
+  <string name="contact_already_exists">%s의 연락처가 이미 있습니다</string>
+  <string name="qr_code_invalid">QR 코드가 유효하지 않습니다</string>
+  <string name="qr_code_too_old">스캔한 QR 코드는 너무 오래된 버전의 %s에서 나왔습니다.\n\n연락하는 분에게 최신 버전으로 업그레이드를 부탁하고 다시 시도하세요.</string>
+  <string name="qr_code_too_new">스캔한 QR 코드는 더 새로운 버전의 %s에서 나왔습니다.\n\n최신 버전으로 업그레이드 후에 다시 시도해 주세요.</string>
+  <string name="camera_error">카메라 오류</string>
+  <string name="connecting_to_device">\u2026 기기에 연결하고 있습니다</string>
+  <string name="authenticating_with_device">\u2026 기기와 인증하고 있습니다</string>
+  <string name="connection_error_title">연락처에 연결하지 못했습니다</string>
+  <string name="connection_error_explanation">둘 다 같은 Wi-Fi 네트워크에 연결돼 있는지 확인해 보세요.</string>
+  <string name="connection_error_feedback">문제가 계속된다면, 부디 <a href="feedback">피드백을 남겨서</a> 앱이 좋아지게 도와주세요.</string>
+  <!--Adding Contacts Remotely-->
+  <string name="paste_button">붙여 넣기</string>
+  <string name="copy_button">복사하기</string>
+  <string name="share_button">공유</string>
+  <string name="add_contact_remote_connecting">접속중...</string>
+  <string name="connecting">접속중...</string>
+  <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
+  <!--This is a numeral indicating the second step in a series of screens-->
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <!--Introductions-->
+  <string name="introduction_onboarding_title">연락처끼리 소개시키기</string>
+  <string name="introduction_onboarding_text">연락처끼리 서로 소개해서, 직접 만날 필요 없이 Briar로 연결될 수 있습니다.</string>
+  <string name="introduction_menu_item">소개하기</string>
+  <string name="introduction_activity_title">연락처 선택하기</string>
+  <string name="introduction_not_possible">이미 이 연락처와 소개시키고 있습니다. 먼저 이 소개를 끝내주세요. 만약 당신이나 연락하는 분이 거의 온라인이 아니라면, 시간이 좀 걸릴 수 있습니다.</string>
+  <string name="introduction_message_title">연락처 소개하기</string>
+  <string name="introduction_message_hint">메시지 추가하기(선택 사항)</string>
+  <string name="introduction_button">소개하기</string>
+  <string name="introduction_sent">소개시켰습니다.</string>
+  <string name="introduction_error">소개하는 과정에서 문제가 있었습니다.</string>
+  <string name="introduction_response_error">소개에 응하는 과정에서 문제가 있었습니다.</string>
+  <string name="introduction_request_sent">%2$s에게 %1$s를 소개하고 싶다고 했습니다.</string>
+  <string name="introduction_request_received">%1$s이(가) %2$s에게 소개시키고 싶다고 물었습니다. %2$s을(를) 연락처 목록에 추가하고 싶으십니까?</string>
+  <string name="introduction_request_exists_received">%1$s이(가) %2$s에게 소개시키고 싶다고 물었지만, %2$s은(는) 이미 연락처 목록에 있습니다. %1$s이(가) 아직 이 부분을 모르고 있을 수 있으니, 아직 응할 수 있습니다:</string>
+  <string name="introduction_request_answered_received">%1$s이(가) %2$s에게 소개시키고 싶다고 물었습니다.</string>
+  <string name="introduction_response_accepted_sent">%1$s에게 소개되겠다고 했습니다.</string>
+  <string name="introduction_response_accepted_sent_info">%1$s이(가) 당신의 연락처를 받기 전에, 그 쪽에서도 소개를 승락해야 합니다. 여기서 시간이 좀 걸릴 수 있습니다.</string>
+  <string name="introduction_response_declined_sent">%1$s에게 소개되고 싶지 않다고 했습니다.</string>
+  <string name="introduction_response_accepted_received">%1$s이(가) %2$s에게 소개해도 괜찮다고 했습니다.</string>
+  <string name="introduction_response_declined_received">%1$s이(가) %2$s에게 소개되고 싶지 않다고 했습니다.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s이(가) %2$s이(가) 소개를 거절했다고 합니다.</string>
+  <!--Private Groups-->
+  <string name="groups_list_empty">모임이 없습니다.</string>
+  <string name="groups_list_empty_action">+ 상징을 눌러 모임을 만들거나, 연락하는 분에게 모임을 공유해 달라고 물어보세요</string>
+  <string name="groups_created_by">%s이(가) 만듦</string>
+  <plurals name="messages">
+    <item quantity="other">메시지 %d개</item>
+  </plurals>
+  <string name="groups_group_is_empty">이 모임에는 아무도 없습니다</string>
+  <string name="groups_group_is_dissolved">이 모임은 해체됐습니다</string>
+  <string name="groups_remove">빼기</string>
+  <string name="groups_create_group_title">개인 모임 만들기</string>
+  <string name="groups_create_group_button">모임 만들기</string>
+  <string name="groups_create_group_invitation_button">초대장 보내기</string>
+  <string name="groups_create_group_hint">개인 모임의 이름을 정하세요</string>
+  <string name="groups_invitation_sent">모임 초대장을 보냈습니다</string>
+  <string name="groups_member_list">구성원 목록</string>
+  <string name="groups_invite_members">구성원 초대하기</string>
+  <string name="groups_member_created_you">모임을 만들었습니다</string>
+  <string name="groups_member_created">%s이(가) 모임을 만들었습니다</string>
+  <string name="groups_member_joined_you">모임에 참가했습니다</string>
+  <string name="groups_member_joined">%s이(가) 모임에 참가했습니다</string>
+  <string name="groups_leave">모임 나가기</string>
+  <string name="groups_leave_dialog_title">모임 떠나기 확인</string>
+  <string name="groups_leave_dialog_message">정말로 이 모임을 나가고 싶으신가요?</string>
+  <string name="groups_dissolve">모임 해체하기</string>
+  <string name="groups_dissolve_dialog_title">모임 해체 확인</string>
+  <string name="groups_dissolve_dialog_message">정말로 이 모임을 해체하려고 하세요?\n\n모든 다른 구성원들이 대화를 계속할 수 없게 되고, 최신 메시지를 받지 못할 수 있습니다.</string>
+  <string name="groups_dissolve_button">해체하기</string>
+  <string name="groups_dissolved_dialog_title">모임이 해체됐습니다</string>
+  <string name="groups_dissolved_dialog_message">이 모임을 만든 분이 모임을 해체하셨습니다.\n\n더 이상 모임에 메시지를 보내지 못하고, 올려진 게시글을 받아보지 못할 수 있습니다.</string>
+  <!--Private Group Invitations-->
+  <string name="groups_invitations_title">모임 초대장</string>
+  <string name="groups_invitations_invitation_sent">%1$s을(를) \"%2$s\" 모임에 참가하도록 초대했습니다.</string>
+  <string name="groups_invitations_invitation_received">%1$s이(가) \"%2$s\" 모임에 참가하도록 초대했습니다.</string>
+  <string name="groups_invitations_joined">모임에 참가했습니다</string>
+  <string name="groups_invitations_declined">모임 초대장 거절함</string>
+  <plurals name="groups_invitations_open">
+    <item quantity="other">받을 수 있는 초대장 %d개</item>
+  </plurals>
+  <string name="groups_invitations_response_accepted_sent">%s(으)로부터 받은 초대장을 승락했습니다.</string>
+  <string name="groups_invitations_response_declined_sent">%s(으)로부터의 모임 초대장을 거절했습니다.</string>
+  <string name="groups_invitations_response_accepted_received">%s이(가) 모임 초대장을 승락했습니다.</string>
+  <string name="groups_invitations_response_declined_received">%s이(가) 모임 초대장을 거절했습니다.</string>
+  <string name="sharing_status_groups">모임을 만든 분만 새로운 구성원을 초대할 수 있습니다. 다음은 모임의 모든 현재 구성원입니다.</string>
+  <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">연락처 보이기</string>
+  <string name="groups_reveal_dialog_message">이 모임의 지금과 앞으로 들어올 구성원에게 연락처를 공개할지를 정할 수 있습니다.\n\n연락처를 공개하면, 모임을 만든 사람이 오프라인이어도 공개된 연락처와 연결할 수 있기 때문에 모임에 더 빠르고 안정적으로 연결할 수 있습니다.</string>
+  <string name="groups_reveal_visible">연락처 관계가 모임에서 보입니다</string>
+  <string name="groups_reveal_visible_revealed_by_us">연락처 관계가 모임에서 보입니다(본인이 공개)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">연락처 관계가 모임에서 보입니다(%s이(가) 공개)</string>
+  <string name="groups_reveal_invisible">연락처 관계가 모임에서 보이지 않습니다</string>
+  <!--Forums-->
+  <string name="no_forums">보여드릴 포럼이 없습니다</string>
+  <string name="no_forums_action">+ 상징을 눌러 포럼을 만들거나, 연락하는 분에게 포럼을 공유해 달라고 물어보세요 </string>
+  <string name="create_forum_title">포럼 만들기</string>
+  <string name="choose_forum_hint">만드실 포럼 이름을 정해주세요</string>
+  <string name="create_forum_button">포럼 만들기</string>
+  <string name="forum_created_toast">포럼이 만들어졌습니다</string>
+  <string name="no_forum_posts">게시물이 없습니다</string>
+  <string name="no_posts">게시글이 없습니다</string>
+  <plurals name="posts">
+    <item quantity="other">게시글 %d개</item>
+  </plurals>
+  <string name="forum_new_message_hint">새로운 게시글</string>
+  <string name="forum_message_reply_hint">새로운 답글</string>
+  <string name="btn_reply">답장</string>
+  <string name="forum_leave">포럼 떠나기</string>
+  <string name="dialog_title_leave_forum">포럼 떠나기 확인</string>
+  <string name="dialog_message_leave_forum">정말로 이 포럼을 떠나려고 하세요?\n\n이 포럼과 공유한 연락처에서 업데이트가 되지 않을 수 있습니다.</string>
+  <string name="dialog_button_leave">떠나기</string>
+  <string name="forum_left_toast">포럼을 떠났습니다</string>
+  <!--Forum Sharing-->
+  <string name="forum_share_button">포럼 공유하기</string>
+  <string name="contacts_selected">선택한 연락처</string>
+  <string name="activity_share_toolbar_header">연락처 선택하기</string>
+  <string name="no_contacts_selector">저장된 연락처가 없습니다</string>
+  <string name="no_contacts_selector_action">연락처를 추가한 후에 돌아오길 바랍니다</string>
+  <string name="forum_shared_snackbar">선택한 연락처와 공유하는 포럼</string>
+  <string name="forum_share_message">메시지 추가하기(선택 사항)</string>
+  <string name="forum_share_error">포럼을 공유하는 과정에서 문제가 있었습니다</string>
+  <string name="forum_invitation_received">%1$s이(가) \"%2$s\" 포럼을 공유했습니다.</string>
+  <string name="forum_invitation_sent">\"%1$s\" 포럼을 %2$s과(와) 공유했습니다.</string>
+  <string name="forum_invitations_title">포럼 초대장</string>
+  <string name="forum_invitation_exists">이미 이 포럼에 초대를 승락했습니다.\n\n초대를 더 많이 승락할수록 더 빠르고 안정적으로 포럼에 연결할 수 있습니다.</string>
+  <string name="forum_joined_toast">포럼에 참가했습니다.</string>
+  <string name="forum_declined_toast">초대장 거절함</string>
+  <string name="shared_by_format">%s에 의해 공유됨</string>
+  <string name="forum_invitation_already_sharing">이미 공유하고 있습니다</string>
+  <string name="forum_invitation_response_accepted_sent">%s(으)로부터의 포럼 초대를 승락했습니다.</string>
+  <string name="forum_invitation_response_declined_sent">%s(으)로부터의 포럼 초대를 거절했습니다.</string>
+  <string name="forum_invitation_response_accepted_received">%s이(가) 포럼 초대장을 승락했습니다.</string>
+  <string name="forum_invitation_response_declined_received">%s이(가) 포럼 초대장을 거절했습니다.</string>
+  <string name="sharing_status">공유 상태</string>
+  <string name="sharing_status_forum">포럼의 어느 구성원이든 연락처와 공유할 수 있습니다. 다음 연락처와 포럼을 공유하고 있습니다. 볼 수 없는 구성원이 더 있을 수 있습니다.</string>
+  <string name="shared_with">와(과) 공유하고 있습니다.(%1$d명 온라인)</string>
+  <plurals name="forums_shared">
+    <item quantity="other">연락처와 공유한 %d개의 포럼</item>
+  </plurals>
+  <string name="nobody">아무도 없음</string>
+  <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">게시물이 없습니다</string>
+  <string name="read_more">더 읽기</string>
+  <string name="blogs_write_blog_post">블로그 게시물 쓰기</string>
+  <string name="blogs_write_blog_post_body_hint">블로그 게시물 입력하기</string>
+  <string name="blogs_publish_blog_post">게시</string>
+  <string name="blogs_blog_post_created">블로그 게시물을 만들었습니다</string>
+  <string name="blogs_blog_post_received">새로운 블로그 게시물을 받았습니다</string>
+  <string name="blogs_blog_post_scroll_to">스크롤</string>
+  <string name="blogs_feed_empty_state">게시물이 없습니다</string>
+  <string name="blogs_feed_empty_state_action">연락처와 구독한 블로그의 게시물이 여기에 나타납니다.\n\n게시물을 쓰려면 펜 상징을 누르세요</string>
+  <string name="blogs_remove_blog">블로그 빼기</string>
+  <string name="blogs_remove_blog_dialog_message">정말로 이 블로그를 빼시겠어요?\n\n기기에서 게시물은 빠지겠지만 다른 사람의 기기에서는 빠지지 않습니다.\n\n이 블로그를 공유하던 연락처에서 업데이트가 되지 않을 수 있습니다. </string>
+  <string name="blogs_remove_blog_ok">빼기</string>
+  <string name="blogs_blog_removed">블로그를 뺐습니다</string>
+  <string name="blogs_reblog_comment_hint">글 추가하기(선택 사항)</string>
+  <string name="blogs_reblog_button">재블로그</string>
+  <!--Blog Sharing-->
+  <string name="blogs_sharing_share">블로그 공유하기</string>
+  <string name="blogs_sharing_error">블로그를 공유하는 과정에서 문제가 있었습니다.</string>
+  <string name="blogs_sharing_button">블로그 공유하기</string>
+  <string name="blogs_sharing_snackbar">선택한 연락처와 블로그 공유됨</string>
+  <string name="blogs_sharing_response_accepted_sent">%s(으)로부터 받은 블로그 초대장을 승락했습니다.</string>
+  <string name="blogs_sharing_response_declined_sent">%s(으)로부터의 블로그 초대장을 거절했습니다.</string>
+  <string name="blogs_sharing_response_accepted_received">%s이(가) 블로그 초대를 승락했습니다.</string>
+  <string name="blogs_sharing_response_declined_received">%s이(가) 블로그 초대장을 거절했습니다.</string>
+  <string name="blogs_sharing_invitation_received">%1$s이(가) \"%2$s\" 블로그를 공유했습니다.</string>
+  <string name="blogs_sharing_invitation_sent">%2$s와(과) \"%1$s\" 블로그를 공유했습니다.</string>
+  <string name="blogs_sharing_invitations_title">블로그 초대장</string>
+  <string name="blogs_sharing_joined_toast">블로그에 구독함</string>
+  <string name="blogs_sharing_declined_toast">모임 초대장 거절함</string>
+  <string name="sharing_status_blog">블로그에 구독한 누구든 연락처와 공유할 수 있습니다. 다음 연락처와 이 블로그를 공유하고 있습니다. 보이지 않는 다른 구독자가 더 있을 수 있습니다.</string>
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import">RSS 피드 불러오기</string>
+  <string name="blogs_rss_feeds_import_button">가져오기</string>
+  <string name="blogs_rss_feeds_import_hint">RSS 피드 URL을 입력하세요</string>
+  <string name="blogs_rss_feeds_import_error">죄송합니다! 피드를 불러오는 과정에서 문제가 있었습니다.</string>
+  <string name="blogs_rss_feeds_manage">RSS 피드 관리하기</string>
+  <string name="blogs_rss_feeds_manage_imported">다음을 불러왔습니다:</string>
+  <string name="blogs_rss_feeds_manage_author">작성자:</string>
+  <string name="blogs_rss_feeds_manage_updated">최종 업데이트:</string>
+  <string name="blogs_rss_remove_feed">피드 빼기</string>
+  <string name="blogs_rss_remove_feed_dialog_message">정말로 이 피드를 빼시겠어요?\n\n기기에서 게시물은 빠지겠지만 다른 사람의 기기에서는 빠지지 않습니다.\n\n이 피드를 공유하던 연락처에서 업데이트가 되지 않을 수 있습니다. </string>
+  <string name="blogs_rss_remove_feed_ok">빼기</string>
+  <string name="blogs_rss_feeds_manage_delete_error">피드를 지울 수 없었습니다!</string>
+  <string name="blogs_rss_feeds_manage_empty_state">보여드릴 RSS 피드가 없습니다\n\n+ 상징을 눌러 피드를 불러오세요</string>
+  <string name="blogs_rss_feeds_manage_error">피드를 불러오는 과정에서 문제가 있었습니다. 나중에 다시 시도해 주세요.</string>
+  <!--Settings Display-->
+  <string name="pref_language_title">언어 &amp; 지역</string>
+  <string name="pref_language_changed">Briar를 다시 시작한 후에 설정이 적용됩니다. 부디 로그아웃하고 Briar를 다시 시작해 주세요.</string>
+  <string name="pref_language_default">기본 설정</string>
+  <string name="display_settings_title">화면</string>
+  <string name="pref_theme_title">테마</string>
+  <string name="pref_theme_light">빛</string>
+  <string name="pref_theme_dark">어둠</string>
+  <string name="pref_theme_auto">자동(시간에 따라)</string>
+  <string name="pref_theme_system">기본 설정</string>
+  <!--Settings Network-->
+  <string name="network_settings_title">네트워크</string>
+  <string name="bluetooth_setting">블루투스로 연결하기</string>
+  <string name="bluetooth_setting_enabled">연락처가 가까이 있을 때마다</string>
+  <string name="bluetooth_setting_disabled">연락처를 추가할 때만</string>
+  <string name="tor_network_setting">인터넷(Tor)를 통해 연결하기</string>
+  <string name="tor_network_setting_automatic">장소에 따라 자동으로</string>
+  <string name="tor_network_setting_without_bridges">Tor를 브리지 없이 사용하기</string>
+  <string name="tor_network_setting_with_bridges">Tor를 브리지를 통해 사용하기</string>
+  <string name="tor_network_setting_never">연결하지 말기</string>
+  <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
+  <string name="tor_network_setting_summary">자동: %1$s(%2$s에서)</string>
+  <string name="tor_mobile_data_title">모바일 데이터 사용하기</string>
+  <string name="tor_only_when_charging_title">충전할 때만 인터넷(Tor)을 통해 연결하기</string>
+  <string name="tor_only_when_charging_summary">베터리로 구동하고 있을 때는 인터넷 연결을 비활성화</string>
+  <!--Settings Security and Panic-->
+  <string name="security_settings_title"> 보안</string>
+  <string name="pref_lock_title">앱 잠금</string>
+  <string name="pref_lock_summary">로그인한 동안 기기의 화면 잠금을 사용해서 Briar 보호하기</string>
+  <string name="pref_lock_disabled_summary">이 기능을 이용하려면 기기에 화면 잠금을 설정하세요</string>
+  <string name="pref_lock_timeout_title">앱 잠금까지의 대기시간</string>
+  <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
+  <string name="pref_lock_timeout_summary">Briar를 사용하지 않으면 %s 후에 자동으로 잠그기</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_1">1분</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_5">5분</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_15">15분</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_30">30분</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_60">1시간</string>
+  <string name="pref_lock_timeout_never">절대</string>
+  <string name="pref_lock_timeout_never_summary">절대 자동으로 Briar 잠그지 않기</string>
+  <string name="change_password">비밀번호 바꾸기</string>
+  <string name="current_password">현재 비밀번호</string>
+  <string name="choose_new_password">새 비밀번호</string>
+  <string name="confirm_new_password">새 비밀번호 확인:</string>
+  <string name="password_changed">비밀번호가 바꼈습니다.</string>
+  <string name="panic_setting">패닉 버튼 설정</string>
+  <string name="panic_setting_title">패닉 버튼</string>
+  <string name="panic_setting_hint">패닉 버튼을 누를 때 Briar가 어떻게 반응할지 설정</string>
+  <string name="panic_app_setting_title">패닉 버튼 앱</string>
+  <string name="unknown_app">모르는 앱</string>
+  <string name="panic_app_setting_summary">설정된 앱이 없습니다</string>
+  <string name="panic_app_setting_none">없음</string>
+  <string name="dialog_title_connect_panic_app">패닉 앱 확인</string>
+  <string name="dialog_message_connect_panic_app">%1$s이(가) 파괴적인 패닉 버튼 동작을 작동시킬 수 있게 허용하시겠어요?</string>
+  <string name="panic_setting_destructive_action">파괴적인 행동</string>
+  <string name="panic_setting_signout_title">로그아웃</string>
+  <string name="panic_setting_signout_summary">패닉 버튼이 눌리면 Briar에서 로그아웃하기</string>
+  <string name="purge_setting_title">계정 삭제하기</string>
+  <string name="purge_setting_summary">패닉 버튼이 눌리면 Brirar 계정을 지우기(주의: 계정, 연락처와 메시지가 영구적으로 지워집니다)</string>
+  <string name="uninstall_setting_title">Briar 삭제하기</string>
+  <string name="uninstall_setting_summary">패닉 상황에서 수동으로 확인해야 합니다</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">알림</string>
+  <string name="notify_sign_in_title">로그인 알려주기</string>
+  <string name="notify_sign_in_summary">폰이 켜지거나 앱이 업데이트되면 알려주기</string>
+  <string name="notify_private_messages_setting_title">개인 메시지</string>
+  <string name="notify_private_messages_setting_summary">개인 메시지에 대해 알림 보이기</string>
+  <string name="notify_private_messages_setting_summary_26">개인 메시지에 대해 알림 설정하기</string>
+  <string name="notify_group_messages_setting_title">모임 메시지</string>
+  <string name="notify_group_messages_setting_summary">모임 메시지 알림 보이기</string>
+  <string name="notify_group_messages_setting_summary_26">모임 메시지 알림 설정</string>
+  <string name="notify_forum_posts_setting_title">포럼 게시물</string>
+  <string name="notify_forum_posts_setting_summary">포럼 게시물 알림 보이기</string>
+  <string name="notify_forum_posts_setting_summary_26">포럼 게시물 알림 설정</string>
+  <string name="notify_blog_posts_setting_title">블로그 게시물</string>
+  <string name="notify_blog_posts_setting_summary">블로그 게시물 알림 보이기</string>
+  <string name="notify_blog_posts_setting_summary_26">블로그 게시물 알림 설정</string>
+  <string name="notify_vibration_setting">진동</string>
+  <string name="notify_sound_setting">소리</string>
+  <string name="notify_sound_setting_default">기본 벨소리</string>
+  <string name="notify_sound_setting_disabled">없음</string>
+  <string name="choose_ringtone_title">벨소리 정하기</string>
+  <string name="cannot_load_ringtone">벨소리를 불러올 수 없었습니다</string>
+  <!--Settings Feedback-->
+  <string name="feedback_settings_title">피드백</string>
+  <string name="send_feedback">피드백 보내기</string>
+  <!--Link Warning-->
+  <string name="link_warning_title">링크 경고</string>
+  <string name="link_warning_intro">외부 앱으로 링크를 열려고 합니다</string>
+  <string name="link_warning_text">당신이 추적당할 수 있습니다. 이 링크를 보낸 사람을 믿을 수 있는지 생각해보고 Tor 브라우저로 여는 것을 고려하세요.</string>
+  <string name="link_warning_open_link">링크 열기</string>
+  <!--Crash Reporter-->
+  <string name="crash_report_title">Briar 사고 리포트</string>
+  <string name="briar_crashed">죄송해요, Briar가 꺼졌어요.</string>
+  <string name="not_your_fault">당신 탓이 아니에요.</string>
+  <string name="please_send_report">부디 사고 리포트를 저희에게 보내서 더 나은 Briar를 만드는 것을 도와주세요.</string>
+  <string name="report_is_encrypted">리포트가 암호화되고 안전하게 보내진다고 약속하겠습니다.</string>
+  <string name="feedback_title">피드백</string>
+  <string name="describe_crash">무슨 일이 있었는지 서술해주세요(선택 사항)</string>
+  <string name="enter_feedback">피드백 적기</string>
+  <string name="optional_contact_email">이메일 주소(선택 사항)</string>
+  <string name="include_debug_report_crash">사고에 대해 익명으로 자료도 보내기</string>
+  <string name="include_debug_report_feedback">익명으로 이 기기에 대한 자료도 보내기</string>
+  <string name="could_not_load_report_data">리포트 자료를 불러올 수 없었습니다.</string>
+  <string name="send_report">리포트 보내기</string>
+  <string name="close">닫기</string>
+  <string name="dev_report_saved">리포트를 저장했습니다. 다음 번에 Briar에 로그인 할 때 보내지게 됩니다.</string>
+  <!--Sign Out-->
+  <string name="progress_title_logout">Briar에서 로그아웃하고 있습니다...</string>
+  <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">화면 위 발견</string>
+  <string name="screen_filter_body">다른 앱이 Briar 화면 위에 있습니다. 보안을 위해 Briar는 다른 앱이 위에 있을 때는 만져도 반응하지 않습니다.\n\n다음 앱이 화면 위에 있을 수 있습니다.\n\n%1$s</string>
+  <string name="screen_filter_allow">이 앱이 위에 있는 것을 허용하기</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">카메라 권한</string>
+  <string name="permission_camera_request_body">QR 코드를 스캔하려면 Briar가 카메라를 사용할 수 있어야 합니다.</string>
+  <string name="permission_location_title">위치 권한</string>
+  <string name="permission_location_request_body">블루투스 기기를 찾으려면, Briar는 위치 정보에 대한 권한이 필요합니다.\n\nBriar는 위치 정보를 저장하거나 누구에게도 공유하지 않습니다.</string>
+  <string name="permission_camera_location_title">카메라와 위치 정보</string>
+  <string name="permission_camera_location_request_body">QR 코드를 스캔하려면, Briar는 카메라를 사용할 수 있어야 합니다.\n\n블루투스 기기를 찾으려면, Briar는 위치 정보에 대한 권한이 필요합니다.\n\nBriar는 위치 정보를 저장하거나 누구에게도 공유하지 않습니다.</string>
+  <string name="permission_camera_denied_body">카메라 사용을 거절하셨지만, 연락처를 추가하기 위해서는 카메라를 사용해야 합니다.\n\n사용 허가를 고려해주시기 바랍니다.</string>
+  <string name="qr_code">QR 코드</string>
+  <string name="show_qr_code_fullscreen">QR 코드를 큰 화면으로 보이기</string>
+  <!--App Locking-->
+  <string name="lock_unlock">Briar 잠금 해제</string>
+  <string name="lock_unlock_verbose">기기의 PIN, 패턴이나 비밀번호를 입력해 Briar를 잠금 해제하세요</string>
+  <string name="lock_unlock_fingerprint_description">계속하시려면 등록된 손가락으로 지문인식 센서를 만져주세요</string>
+  <string name="lock_unlock_password">비밀번호 사용하기</string>
+  <string name="lock_is_locked">Briar가 잠겼습니다</string>
+  <string name="lock_tap_to_unlock">눌러 잠금해제</string>
+  <!--Screenshots-->
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_alice">영희</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_bob">철수</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_carol">민수</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
+  <string name="screenshot_message_1">철수야, 안녕?</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
+  <string name="screenshot_message_2">영희야, 안녕! Briar에 대해 알려줘서 고마워!</string>
+  <!--This is a message to be used in screenshots.-->
+  <string name="screenshot_message_3">문자나 전화할 때는 Signal도 사용해 봐^^ 엄청 편하고 안전해!</string>
+</resources>

briar-android/src/main/res/values-lt/strings.xml

@@ -0,0 +1,568 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--Setup-->
+  <string name="setup_title">Sveiki atvykę į Briar</string>
+  <string name="setup_name_explanation">Jūsų slapyvardis bus rodomas šalia bet kokio jūsų skelbiamo turinio. Sukūrę paskyrą, slapyvardžio pakeisti nebegalėsite.</string>
+  <string name="setup_next">Kitas</string>
+  <string name="setup_password_intro">Pasirinkite slaptažodį</string>
+  <string name="setup_password_explanation">Jūsų Briar paskyra yra saugoma šifruotu pavidalu jūsų įrenginyje, o ne debesijoje. Jei pamiršite savo slaptažodį ar pašalinsite Briar programėlę, daugiau nebegalėsite atkurti savo paskyros.\n\nPasirinkite ilgą slaptažodį, kurį sunku atspėti, kaip pavyzdžiui, keturis atsitiktinius žodžius ar dešimt atsitiktinių raidžių, skaitmenų ir simbolių.</string>
+  <string name="setup_doze_title">Foniniai ryšiai</string>
+  <string name="setup_doze_intro">Norint gauti žinutes, Briar turi išlikti fone prisijungusi.</string>
+  <string name="setup_doze_explanation">Norint gauti žinutes, Briar turi išlikti fone prisijungusi. Išjunkite akumuliatoriaus naudojimo optimizavimą, kad Briar galėtų išlikti prisijungusi.</string>
+  <string name="setup_doze_button">Leisti ryšius</string>
+  <string name="choose_nickname">Pasirinkite savo slapyvardį</string>
+  <string name="choose_password">Pasirinkite savo slaptažodį</string>
+  <string name="confirm_password">Pakartokite savo slaptažodį</string>
+  <string name="name_too_long">Vardas yra per ilgas</string>
+  <string name="password_too_weak">Slaptažodis yra per silpnas</string>
+  <string name="passwords_do_not_match">Slaptažodžiai nesutampa</string>
+  <string name="create_account_button">Sukurti paskyrą</string>
+  <string name="more_info">Daugiau informacijos</string>
+  <string name="don_t_ask_again">Daugiau nebeklausti</string>
+  <string name="setup_huawei_text">Bakstelėkite žemiau esantį mygtuką ir įsitikinkite, kad \"Apsaugotų programėlių\" rodinyje Briar yra apsaugota.</string>
+  <string name="setup_huawei_button">Apsaugoti Briar</string>
+  <string name="setup_huawei_help">Jei Briar nebus pridėta į apsaugotų programėlių sąrašą, ji negalės veikti fone.</string>
+  <string name="warning_dozed">%s nepavyko pasileisti fone</string>
+  <!--Login-->
+  <string name="enter_password">Slaptažodis</string>
+  <string name="try_again">Neteisingas slaptažodis, bandykite dar kartą</string>
+  <string name="sign_in_button">Prisijungti</string>
+  <string name="forgotten_password">Aš pamiršau savo slaptažodį</string>
+  <string name="dialog_title_lost_password">Prarastas slaptažodis</string>
+  <string name="dialog_message_lost_password">Jūsų Briar paskyra yra saugoma šifruotu pavidalu jūsų įrenginyje, o ne debesijoje, taigi, negalime atstatyti jūsų slaptažodžio Ar norėtumėte ištrinti savo paskyrą ir pradėti iš naujo?\n\nDėmesio: Jūsų tapatybės, žinutės ir adresatai bus prarasti visiems laikams.</string>
+  <string name="startup_failed_notification_title">Nepavyko paleisti Briar</string>
+  <string name="startup_failed_notification_text">Bakstelėkite išsamesnei informacijai.</string>
+  <string name="startup_failed_activity_title">Briar paleidimo nesėkmė</string>
+  <string name="startup_failed_db_error">Dėl kažkokių priežasčių, jūsų Briar duomenų bazė yra nepataisomai sugadinta. Jūsų paskyra, jūsų duomenys ir visi jūsų adresatai yra prarasti. Dėja, turite iš naujo įdiegti Briar arba nusistatyti naują paskyrą, slaptažodžio užklausoje, pasirinkdami \"Aš pamiršau savo slaptažodį\".</string>
+  <string name="startup_failed_data_too_old_error">Jūsų paskyra buvo sukurta, naudojant seną šios programėlės versiją, ir negali būti atverta naudojant šią versiją. Jūs privalote arba iš naujo įdiegti seną versiją, arba nusistatyti naują paskyrą, slaptažodžio užklausoje, pasirinkdami \"Aš pamiršau savo slaptažodį\".</string>
+  <string name="startup_failed_data_too_new_error">Ši programėlės versija yra per sena. Atnaujinkite į naujausią versiją ir bandykite dar kartą.</string>
+  <string name="startup_failed_service_error">Briar nepavyko paleisti reikiamo įskiepio. Briar įdiegimas iš naujo, įprastai, išsprendžia šią problemą. Vis dėlto, turėkite omenyje, kad kadangi Briar duomenų laikymui nenaudoja centrinių serverių, jūs tokiu atveju prarasite savo paskyrą ir visus su ja susietus duomenis.</string>
+  <plurals name="expiry_warning">
+    <item quantity="one">Tai yra bandomoji Briar versija. Jūsų paskyros galiojimas pasibaigs po %d dienos ir negalės būti pratęstas.</item>
+    <item quantity="few">Tai yra bandomoji Briar versija. Jūsų paskyros galiojimas pasibaigs po %d dienų ir negalės būti pratęstas.</item>
+    <item quantity="many">Tai yra bandomoji Briar versija. Jūsų paskyros galiojimas pasibaigs po %d dienų ir negalės būti pratęstas.</item>
+    <item quantity="other">Tai yra bandomoji Briar versija. Jūsų paskyros galiojimas pasibaigs po %d dienos ir negalės būti pratęstas.</item>
+  </plurals>
+  <string name="expiry_update">Bandomosios versijos galiojimo pabaigos data buvo pratęsta. Dabar, jūsų paskyros galiojimo laikas pasibaigs po %d dienų.</string>
+  <string name="expiry_date_reached">Programinės įrangos galiojimas pasibaigė.\nDėkojame, kad išbandėte!</string>
+  <string name="download_briar">Norėdami naudotis Briar, atsisiųskite versiją 1.0.</string>
+  <string name="create_new_account">Jūs turėsite susikurti paskyrą, tačiau galėsite naudoti tą patį slapyvardį.</string>
+  <string name="download_briar_button">Atsisiųsti Briar 1.0</string>
+  <string name="startup_open_database">Iššifruojama duomenų bazė…</string>
+  <string name="startup_migrate_database">Naujinama duomenų bazė…</string>
+  <string name="startup_compact_database">Suspaudžiama duomenų bazė…</string>
+  <!--Navigation Drawer-->
+  <string name="nav_drawer_open_description">Atidaryti naršymo stalčių</string>
+  <string name="nav_drawer_close_description">Uždaryti naršymo stalčių</string>
+  <string name="contact_list_button">Adresatai</string>
+  <string name="groups_button">Privačios grupės</string>
+  <string name="forums_button">Forumai</string>
+  <string name="blogs_button">Tinklaraščiai</string>
+  <!--This is part of the main menu. The app will be locked when this is tapped.-->
+  <string name="lock_button">Užrakinti programėlę</string>
+  <string name="settings_button">Nustatymai</string>
+  <string name="sign_out_button">Atsijungti</string>
+  <!--Transports-->
+  <string name="transport_tor">Internetas</string>
+  <string name="transport_bt">Bluetooth</string>
+  <string name="transport_lan">Belaidis (Wi-Fi)</string>
+  <!--Notifications-->
+  <string name="reminder_notification_title">Atsijungta iš Briar</string>
+  <string name="reminder_notification_text">Bakstelėkite, norėdami prisijungti atgal.</string>
+  <string name="reminder_notification_channel_title">Briar prisijungimo priminimas</string>
+  <string name="reminder_notification_dismiss">Atmesti</string>
+  <string name="ongoing_notification_title">Prisijungta į Briar</string>
+  <string name="ongoing_notification_text">Prilieskite, norėdami atverti Briar.</string>
+  <plurals name="private_message_notification_text">
+    <item quantity="one">Nauja privati žinutė.</item>
+    <item quantity="few">%d naujos privačios žinutės.</item>
+    <item quantity="many">%d naujų privačių žinučių.</item>
+    <item quantity="other">%d nauja privati žinutė.</item>
+  </plurals>
+  <plurals name="group_message_notification_text">
+    <item quantity="one">Nauja grupės žinutė.</item>
+    <item quantity="few">%d naujos grupės žinutės.</item>
+    <item quantity="many">%d naujų grupės žinučių.</item>
+    <item quantity="other">%d nauja grupės žinutė.</item>
+  </plurals>
+  <plurals name="forum_post_notification_text">
+    <item quantity="one">Naujas forumo įrašas.</item>
+    <item quantity="few">%d nauji forumo įrašai.</item>
+    <item quantity="many">%d naujų forumo įrašų.</item>
+    <item quantity="other">%d naujas forumo įrašas.</item>
+  </plurals>
+  <plurals name="blog_post_notification_text">
+    <item quantity="one">Naujas tinklaraščio įrašas.</item>
+    <item quantity="few">%d nauji tinklaraščio įrašai.</item>
+    <item quantity="many">%d naujų tinklaraščio įrašų.</item>
+    <item quantity="other">%d naujas tinklaraščio įrašas.</item>
+  </plurals>
+  <!--Misc-->
+  <string name="now">dabar</string>
+  <string name="show">Rodyti</string>
+  <string name="hide">Slėpti</string>
+  <string name="ok">Gerai</string>
+  <string name="cancel">Atsisakyti</string>
+  <string name="got_it">Supratau</string>
+  <string name="delete">Ištrinti</string>
+  <string name="accept">Priimti</string>
+  <string name="decline">Atmesti</string>
+  <string name="options">Parametrai</string>
+  <string name="online">Pasiekiama(-s)</string>
+  <string name="offline">Nepasiekiama(-s)</string>
+  <string name="send">Siųsti</string>
+  <string name="allow">Leisti</string>
+  <string name="open">Atverti</string>
+  <string name="no_data">Nėra duomenų</string>
+  <string name="ellipsis">…</string>
+  <string name="text_too_long">Įvestas tekstas yra per ilgas</string>
+  <string name="show_onboarding">Rodyti pagalbos dialogą</string>
+  <string name="fix">Pataisyti</string>
+  <string name="help">Pagalba</string>
+  <string name="sorry">Atsiprašome</string>
+  <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Nėra rodytinų adresatų</string>
+  <string name="no_contacts_action">Norėdami pridėti adresatą, bakstelėkite + piktogramą</string>
+  <string name="date_no_private_messages">Žinučių nėra.</string>
+  <string name="no_private_messages">Nėra rodytinų žinučių</string>
+  <string name="message_hint">Rašykite žinutę</string>
+  <string name="image_caption_hint">Pridėkite paaiškinimą (nebūtina)</string>
+  <string name="image_attach">Pridėti paveikslą</string>
+  <string name="image_attach_error">Nepavyko pridėti paveikslo(-ų)</string>
+  <string name="image_attach_error_too_big">Paveikslas per didelis. Apribojimas yra %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Nepalaikomas paveikslo formatas: %s</string>
+  <string name="set_contact_alias">Pakeisti adresato vardą</string>
+  <string name="set_contact_alias_hint">Adresato vardas</string>
+  <string name="set_alias_button">Pakeisti</string>
+  <string name="delete_all_messages">Ištrinti visas žinutes</string>
+  <string name="dialog_title_delete_all_messages">Patvirtinkite žinutės ištrynimą</string>
+  <string name="dialog_message_delete_all_messages">Ar tikrai norite ištrinti visas žinutes?</string>
+  <string name="dialog_title_not_all_messages_deleted">Nepavyko ištrinti visų žinučių</string>
+  <string name="dialog_message_not_all_messages_deleted">Žinutės, susijusios su vykstančiais supažindinimais ar pakvietimais negali būti ištrintos, kol nebus išspręstos.</string>
+  <string name="delete_contact">Ištrinti adresatą</string>
+  <string name="dialog_title_delete_contact">Patvirtinkite adresato ištrynimą</string>
+  <string name="dialog_message_delete_contact">Ar tikrai norite pašalinti šį adresatą ir visas žinutes, kuriomis apsikeitėte su šiuo adresatu ?</string>
+  <string name="contact_deleted_toast">Adresatas ištrintas</string>
+  <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
+  <string name="you">Jūs</string>
+  <string name="save_image">Įrašyti paveikslą</string>
+  <string name="dialog_title_save_image">Įrašyti paveikslą?</string>
+  <string name="dialog_message_save_image">Įrašius šį paveikslą, kitoms programėlėms bus leista gauti prieigą prie jo.\n\nAr tikrai norite įrašyti?</string>
+  <string name="save_image_success">Paveikslas buvo įrašytas</string>
+  <string name="save_image_error">Nepavyko įrašyti paveikslo</string>
+  <string name="dialog_title_no_image_support">Paveikslai neprieinami</string>
+  <string name="dialog_message_no_image_support">Jūsų adresato Briar kol kas nepalaiko paveikslo priedų. Jam atnaujinus programėlę, jūs matysite kitokią piktogramą.</string>
+  <string name="dialog_title_image_support">Dabar šiam adresatui galite siųsti paveikslus</string>
+  <string name="dialog_message_image_support">Bakstelėkite šią piktogramą, norėdami pridėti paveikslus.</string>
+  <string name="messaging_too_many_attachments_toast">Bus išsiųsti tik %d pirmi paveikslai</string>
+  <!--Adding Contacts-->
+  <string name="add_contact_title">Pridėti šalia esantį adresatą</string>
+  <string name="face_to_face">Jūs privalote susitikti gyvai su asmeniu, kurį norite pridėti kaip adresatą.\n\nTai neleis bet kam apsimetinėti jumis ar ateityje skaityti jūsų žinutes.</string>
+  <string name="continue_button">Tęsti</string>
+  <string name="try_again_button">Bandyti dar kartą</string>
+  <string name="waiting_for_contact_to_scan">Laukiama, kol adresatas nuskenuos ir prisijungs\u2026</string>
+  <string name="exchanging_contact_details">Apsikeičiama adresato informacija\u2026</string>
+  <string name="contact_added_toast">Adresatas pridėtas: %s</string>
+  <string name="contact_already_exists">Adresatas %s jau yra</string>
+  <string name="qr_code_invalid">QR kodas yra neteisingas</string>
+  <string name="qr_code_too_old">Jūsų nuskenuotas QR kodas yra iš senesnės %s versijos.\n\nPaprašykite adresato, kad atsinaujintų į naujausią versiją, o tuomet bandykite dar kartą.</string>
+  <string name="qr_code_too_new">Jūsų nuskenuotas QR kodas yra iš naujesnės %s versijos.\n\nAtsinaujinkite į naujausią versiją, o tuomet bandykite dar kartą.</string>
+  <string name="camera_error">Kameros klaida</string>
+  <string name="connecting_to_device">Jungiamasi prie įrenginio\u2026</string>
+  <string name="authenticating_with_device">Tapatybės nustatymas su įrenginiu\u2026</string>
+  <string name="connection_error_title">Nepavyko prisijungti prie jūsų adresato</string>
+  <string name="connection_error_explanation">Įsitikinkite, kad abu esate prisijungę prie to paties belaidžio (Wi-Fi) tinklo.</string>
+  <string name="connection_error_feedback">Jei ši problema išlieka, <a href="feedback">atsiųskite mums atsiliepimą</a>, kad padėtumėte mums patobulinti programėlę.</string>
+  <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Pridėti adresatą per atstumą</string>
+  <string name="add_contact_nearby_title">Pridėti šalia esantį adresatą</string>
+  <string name="add_contact_remotely_title">Pridėti adresatą per atstumą</string>
+  <string name="contact_name_hint">Suteikite adresatui slapyvardį</string>
+  <string name="contact_link_intro">Čia įveskite iš adresato gautą nuorodą</string>
+  <string name="contact_link_hint">Adresato nuoroda</string>
+  <string name="paste_button">Įdėti</string>
+  <string name="add_contact_button">Pridėti adresatą</string>
+  <string name="copy_button">Kopijuoti</string>
+  <string name="share_button">Bendrinti</string>
+  <string name="send_link_title">Apsikeiskite nuorodomis</string>
+  <string name="add_contact_choose_nickname">Pasirinkite slapyvardį</string>
+  <string name="add_contact_choose_a_nickname">Įveskite slapyvardį</string>
+  <string name="nickname_intro">Suteikite savo adresatui slapyvardį. Slapyvardį matysite tik jūs.</string>
+  <string name="your_link">Perduokite šią nuorodą adresatui, kurį norite pridėti</string>
+  <string name="link_clip_label">Briar nuoroda</string>
+  <string name="link_copied_toast">Nuoroda nukopijuota</string>
+  <string name="adding_contact_error">Pridedant adresatą, įvyko klaida.</string>
+  <string name="pending_contact_requests_snackbar">Yra laukiančių adresato užklausų</string>
+  <string name="pending_contact_requests">Laukiančios adresato užklausos</string>
+  <string name="no_pending_contacts">Laukiančių adresatų nėra</string>
+  <string name="add_contact_remote_connecting">Jungiamasi…</string>
+  <string name="waiting_for_contact_to_come_online">Laukiama, kol adresatas prisijungs prie tinko…</string>
+  <string name="connecting">Jungiamasi…</string>
+  <string name="adding_contact">Pridedamas adresatas…</string>
+  <string name="adding_contact_failed">Adresato pridėti nepavyko</string>
+  <string name="dialog_title_remove_pending_contact">Patvirtinkite šalinimą</string>
+  <string name="dialog_message_remove_pending_contact">Šis adresatas yra vis dar pridedamas. Jeigu jį dabar pašalinsite, jis nebus pridėtas.</string>
+  <string name="own_link_error">Įveskite ne savo, o adresato nuorodą</string>
+  <string name="nickname_missing">Įveskite slapyvardį</string>
+  <string name="invalid_link">Neteisinga nuoroda</string>
+  <string name="unsupported_link">Ši nuoroda atėjo iš naujesnės Briar versijos. Atsinaujinkite į naujausią versiją ir bandykite dar kartą.</string>
+  <string name="intent_own_link">Jūs atvėrėte savo nuorodą. Naudokite nuorodą to adresato, kurį norite pridėti!</string>
+  <string name="missing_link">Įveskite nuorodą</string>
+  <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
+  <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Pridėtas naujas adresatas.</item>
+    <item quantity="few">Pridėti %d nauji adresatai.</item>
+    <item quantity="many">Pridėta %d naujų adresatų.</item>
+    <item quantity="other">Pridėtas %d naujas adresatas.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Adresato pridėjimas užtrunka ilgiau nei įprasta</string>
+  <string name="adding_contact_slow_title">Nepavyksta prisijungti prie adresato</string>
+  <string name="adding_contact_slow_text">Šio adresato pridėjimas užtrunka ilgiau nei įprasta.\n\nPatikrinkite ar šis adresatas gavo jūsų nuorodą ir pridėjo jus:</string>
+  <string name="offline_state">Nėra interneto ryšio</string>
+  <string name="duplicate_link_dialog_title">Identiška nuoroda</string>
+  <string name="duplicate_link_dialog_text_1">Jūs jau turite laukiančią adresato užklausą su šia nuoroda: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Jau turite adresatą su šia nuoroda: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Ar %s ir %s yra tas pats asmuo?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Tas pats asmuo</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Kitas asmuo</string>
+  <string name="duplicate_link_dialog_text_3">%s ir %s išsiuntė jums tą pačią nuorodą.\n\nGali būti, kad vienas iš šių asmenų bando sužinoti kas yra jūsų adresatų sąraše.\n\nNesakykite šiems asmenims, kad gavote tokią pačią nuorodą iš kito asmens.</string>
+  <string name="pending_contact_updated_toast">Laukiantis adresatas atnaujintas</string>
+  <!--Introductions-->
+  <string name="introduction_onboarding_title">Supažindinkite savo adresatus</string>
+  <string name="introduction_onboarding_text">Galite supažindinti savo adresatus vieną su kitu, kad jiems nereikėtų susitikti gyvai ir jie galėtų užmegzti ryšį, naudodami Briar.</string>
+  <string name="introduction_menu_item">Supažindinti</string>
+  <string name="introduction_activity_title">Pasirinkite adresatą</string>
+  <string name="introduction_not_possible">Jau vyksta vienas supažindinimas tarp šių adresatų. Iš pradžių, leiskite, kad jis būtų užbaigtas. Jeigu jūs ar jūsų adresatai retai būna prisijungę, tuomet tai gali šiek tiek užtrukti.</string>
+  <string name="introduction_message_title">Supažindinkite adresatus</string>
+  <string name="introduction_message_hint">Pridėkite žinutę (nebūtina)</string>
+  <string name="introduction_button">Supažindinti</string>
+  <string name="introduction_sent">Jūsų supažindinimas išsiųstas.</string>
+  <string name="introduction_error">Supažindinant, įvyko klaida.</string>
+  <string name="introduction_response_error">Klaida, atsakant į supažindinimą</string>
+  <string name="introduction_request_sent">Jūs paprašėte, kad naudotojas %1$s būtų supažindintas su %2$s.</string>
+  <string name="introduction_request_received">%1$s paprašė supažindinti jus su %2$s. Ar norite pridėti naudotoją %2$s į savo adresatų sąrašą?</string>
+  <string name="introduction_request_exists_received">%1$s paprašė supažindinti jus su %2$s, tačiau %2$s jau yra jūsų adresatų sąraše. Kadangi %1$s gali to ir nežinoti, vis tiek galite atsakyti:</string>
+  <string name="introduction_request_answered_received">%1$s paprašė supažindinti jus su %2$s.</string>
+  <string name="introduction_response_accepted_sent">Jūs priėmėte supažindinimą su %1$s.</string>
+  <string name="introduction_response_accepted_sent_info">Prieš tai, kai naudotojas %1$s bus pridėtas į jūsų adresatus, jis taip pat turi priimti supažindinimą. Tai gali šiek tiek užtrukti.</string>
+  <string name="introduction_response_declined_sent">Jūs atmetėte supažindinimą su %1$s.</string>
+  <string name="introduction_response_accepted_received">%1$s priėmė supažindinimą su %2$s.</string>
+  <string name="introduction_response_declined_received">%1$s atmetė supažindinimą su %2$s.</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s sako, kad %2$s atmetė supažindinimą.</string>
+  <!--Private Groups-->
+  <string name="groups_list_empty">Nėra rodytinų grupių</string>
+  <string name="groups_list_empty_action">Norėdami sukurti grupę ar paprašyti savo adresatų pradėti su jumis bendrinti grupes, bakstelėkite + piktogramą</string>
+  <string name="groups_created_by">Sukūrė %s</string>
+  <plurals name="messages">
+    <item quantity="one">%d žinutė</item>
+    <item quantity="few">%d žinutės</item>
+    <item quantity="many">%d žinučių</item>
+    <item quantity="other">%d žinutė</item>
+  </plurals>
+  <string name="groups_group_is_empty">Ši grupė tuščia</string>
+  <string name="groups_group_is_dissolved">Ši grupė išformuota</string>
+  <string name="groups_remove">Šalinti</string>
+  <string name="groups_create_group_title">Sukurkite privačią grupę</string>
+  <string name="groups_create_group_button">Sukurti grupę</string>
+  <string name="groups_create_group_invitation_button">Siųsti pakvietimą</string>
+  <string name="groups_create_group_hint">Pasirinkite savo privačios grupės pavadinimą</string>
+  <string name="groups_invitation_sent">Pakvietimas į grupę išsiųstas</string>
+  <string name="groups_member_list">Narių sąrašas</string>
+  <string name="groups_invite_members">Pakviesti narius</string>
+  <string name="groups_member_created_you">Jūs sukūrėte grupę</string>
+  <string name="groups_member_created">%s sukūrė grupę</string>
+  <string name="groups_member_joined_you">Jūs prisijungėte prie grupės</string>
+  <string name="groups_member_joined">%s prisijungė prie grupės</string>
+  <string name="groups_leave">Išeiti iš grupės</string>
+  <string name="groups_leave_dialog_title">Patvirtinkite išėjimą iš grupės</string>
+  <string name="groups_leave_dialog_message">Ar tikrai norite išeiti iš šios grupės?</string>
+  <string name="groups_dissolve">Išformuoti grupę</string>
+  <string name="groups_dissolve_dialog_title">Patvirtinkite grupės išformavimą</string>
+  <string name="groups_dissolve_dialog_message">Ar tikrai norite išformuoti šią grupę?\n\nVisi kiti nariai negalės tęsti savo pokalbio ir gali nebegauti naujausių žinučių.</string>
+  <string name="groups_dissolve_button">Išformuoti</string>
+  <string name="groups_dissolved_dialog_title">Grupė išformuota</string>
+  <string name="groups_dissolved_dialog_message">Šios grupės įkūrėjas ją išformavo.\n\nJūs daugiau nebegalite rašyti žinučių į šią grupę ir galite nebegauti visų parašytų įrašų.</string>
+  <!--Private Group Invitations-->
+  <string name="groups_invitations_title">Pakvietimai į grupę</string>
+  <string name="groups_invitations_invitation_sent">Jūs pakvietėte, kad  %1$s prisijungtų prie grupės \"%2$s\".</string>
+  <string name="groups_invitations_invitation_received">%1$s pakvietė jus prisijungti prie grupės \"%2$s\".</string>
+  <string name="groups_invitations_joined">Prisijungta prie grupės</string>
+  <string name="groups_invitations_declined">Pakvietimas į grupę atmestas</string>
+  <plurals name="groups_invitations_open">
+    <item quantity="one">%d atviras pakvietimas į grupę</item>
+    <item quantity="few">%d atviri pakvietimai į grupę</item>
+    <item quantity="many">%d atvirų pakvietimų į grupę</item>
+    <item quantity="other">%d atviras pakvietimas į grupę</item>
+  </plurals>
+  <string name="groups_invitations_response_accepted_sent">Jūs priėmėte pakvietimą į grupę iš %s.</string>
+  <string name="groups_invitations_response_declined_sent">Jūs atmetėte pakvietimą į grupę iš %s.</string>
+  <string name="groups_invitations_response_accepted_received">%s priėmė pakvietimą į grupę.</string>
+  <string name="groups_invitations_response_declined_received">%s atmetė pakvietimą į grupę.</string>
+  <string name="sharing_status_groups">Tik įkūrėjas gali kviesti naujus narius į grupę. Žemiau yra visi esami grupės nariai.</string>
+  <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">Atskleisti adresatus</string>
+  <string name="groups_reveal_dialog_message">Galite pasirinkti ar atskleisti adresatus visiems esamiems ir būsimiems šios grupės nariams.\n\nAdresatų atskleidimas paverčia jūsų ryšį su grupe greitesnį ir labiau patikimą, nes galite bendrauti su atskleistais adresatais netgi tuomet, kai grupės įkūrėjas yra atsijungęs.</string>
+  <string name="groups_reveal_visible">Adresatų sąryšiai yra matomi grupei</string>
+  <string name="groups_reveal_visible_revealed_by_us">Adresatų sąryšiai yra matomi grupei (atskleidėte jūs)</string>
+  <string name="groups_reveal_visible_revealed_by_contact">Adresatų sąryšiai yra matomi grupei (atskleidė %s)</string>
+  <string name="groups_reveal_invisible">Adresatų sąryšiai nėra matomi grupei</string>
+  <!--Forums-->
+  <string name="no_forums">Nėra rodytinų forumų</string>
+  <string name="no_forums_action">Norėdami sukurti forumą ar paprašyti savo adresatų pradėti su jumis bendrinti forumus, bakstelėkite + piktogramą</string>
+  <string name="create_forum_title">Sukurkite forumą</string>
+  <string name="choose_forum_hint">Pasirinkite savo forumo pavadinimą</string>
+  <string name="create_forum_button">Sukurti forumą</string>
+  <string name="forum_created_toast">Forumas sukurtas</string>
+  <string name="no_forum_posts">Nėra rodytinų įrašų</string>
+  <string name="no_posts">Įrašų nėra</string>
+  <plurals name="posts">
+    <item quantity="one">%d įrašas</item>
+    <item quantity="few">%d įrašai</item>
+    <item quantity="many">%d įrašų</item>
+    <item quantity="other">%d įrašas</item>
+  </plurals>
+  <string name="forum_new_message_hint">Naujas įrašas</string>
+  <string name="forum_message_reply_hint">Naujas atsakymas</string>
+  <string name="btn_reply">Atsakyti</string>
+  <string name="forum_leave">Išeiti iš forumo</string>
+  <string name="dialog_title_leave_forum">Patvirtinkite išėjimą iš forumo</string>
+  <string name="dialog_message_leave_forum">Ar tikrai norite išeiti iš šio forumo?\n\nBet kokie adresatai, su kuriais bendrinote šį forumą, gali nustoti gauti atnaujinimus.</string>
+  <string name="dialog_button_leave">Išeiti</string>
+  <string name="forum_left_toast">Išeita iš forumo</string>
+  <!--Forum Sharing-->
+  <string name="forum_share_button">Bendrinti forumą</string>
+  <string name="contacts_selected">Pasirinkti adresatai</string>
+  <string name="activity_share_toolbar_header">Pasirinkite adresatus</string>
+  <string name="no_contacts_selector">Nėra rodytinų adresatų</string>
+  <string name="no_contacts_selector_action">Grįžkite čia po to, kai pridėsite adresatą</string>
+  <string name="forum_shared_snackbar">Forumas bendrinamas su pasirinktais adresatais</string>
+  <string name="forum_share_message">Pridėkite žinutę (nebūtina)</string>
+  <string name="forum_share_error">Bendrinant šį forumą, įvyko klaida.</string>
+  <string name="forum_invitation_received">%1$s pradėjo bendrinti su jumis forumą \"%2$s\".</string>
+  <string name="forum_invitation_sent">Jūs pradėjote bendrinti su %2$s forumą \"%1$s\".</string>
+  <string name="forum_invitations_title">Pakvietimai į forumą</string>
+  <string name="forum_invitation_exists">Jūs jau priėmėte pakvietimą į šį forumą.\n\nPriėmus daugiau pakvietimų, jūsų ryšys su forumu taps greitesnis ir patikimesnis.</string>
+  <string name="forum_joined_toast">Prisijungta prie forumo</string>
+  <string name="forum_declined_toast">Pakvietimas atmestas</string>
+  <string name="shared_by_format">Bendrina %s</string>
+  <string name="forum_invitation_already_sharing">Jau bendrinamas</string>
+  <string name="forum_invitation_response_accepted_sent">Jūs priėmėte pakvietimą į forumą iš %s.</string>
+  <string name="forum_invitation_response_declined_sent">Jūs atmetėte pakvietimą į forumą iš %s.</string>
+  <string name="forum_invitation_response_accepted_received">%s priėmė pakvietimą į forumą.</string>
+  <string name="forum_invitation_response_declined_received">%s atmetė pakvietimą į forumą.</string>
+  <string name="sharing_status">Bendrinimo būsena</string>
+  <string name="sharing_status_forum">Bet kuris forumo narys gali jį bendrinti su savo adresatais. Jūs bendrinate šį forumą su šiais adresatais. Taip pat gali būti ir kitų narių, kurių nematote.</string>
+  <string name="shared_with">Bendrinama su %1$d (%2$d pasiekiami)</string>
+  <plurals name="forums_shared">
+    <item quantity="one">Adresatų bendrinamas %d forumas</item>
+    <item quantity="few">Adresatų bendrinami %d forumai</item>
+    <item quantity="many">Adresatų bendrinama %d forumų</item>
+    <item quantity="other">Adresatų bendrinamas %d forumas</item>
+  </plurals>
+  <string name="nobody">Niekas</string>
+  <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">Nėra rodytinų įrašų</string>
+  <string name="read_more">skaityti daugiau</string>
+  <string name="blogs_write_blog_post">Rašyti tinklaraščio įrašą</string>
+  <string name="blogs_write_blog_post_body_hint">Rašykite savo tinklaraščio įrašą</string>
+  <string name="blogs_publish_blog_post">Paskelbti</string>
+  <string name="blogs_blog_post_created">Tinklaraščio įrašas sukurtas</string>
+  <string name="blogs_blog_post_received">Gautas naujas tinklaraščio įrašas</string>
+  <string name="blogs_blog_post_scroll_to">Slinkti</string>
+  <string name="blogs_feed_empty_state">Nėra rodytinų įrašų</string>
+  <string name="blogs_feed_empty_state_action">Čia bus rodomi įrašai iš jūsų adresatų bei jūsų prenumeruojamų tinklaraščių\n\nNorėdami rašyti įrašą, bakstelėkite rašiklio piktogramą</string>
+  <string name="blogs_remove_blog">Šalinti tinklaraštį</string>
+  <string name="blogs_remove_blog_dialog_message">Ar tikrai norite pašalinti šį tinklaraštį?\n\nĮrašai bus pašalinti iš jūsų įrenginio, tačiau liks kitų žmonių įrenginiuose.\n\nBet kokie adresatai, su kuriais bendrinote šį tinklaraštį, gali nustoti gauti atnaujinimus.</string>
+  <string name="blogs_remove_blog_ok">Šalinti</string>
+  <string name="blogs_blog_removed">Tinklaraštis pašalintas</string>
+  <string name="blogs_reblog_comment_hint">Pridėkite komentarą (nebūtina)</string>
+  <string name="blogs_reblog_button">Bendrinti į savo tinklaraštį</string>
+  <!--Blog Sharing-->
+  <string name="blogs_sharing_share">Bendrinti tinklaraštį</string>
+  <string name="blogs_sharing_error">Bendrinant šį tinklaraštį, įvyko klaida.</string>
+  <string name="blogs_sharing_button">Bendrinti tinklaraštį</string>
+  <string name="blogs_sharing_snackbar">Tinklaraštis bendrinamas su pasirinktais adresatais</string>
+  <string name="blogs_sharing_response_accepted_sent">Jūs priėmėte pakvietimą į tinklaraštį iš %s.</string>
+  <string name="blogs_sharing_response_declined_sent">Jūs atmetėte pakvietimą į tinklaraštį iš %s.</string>
+  <string name="blogs_sharing_response_accepted_received">%s priėmė pakvietimą į tinklaraštį.</string>
+  <string name="blogs_sharing_response_declined_received">%s atmetė pakvietimą į tinklaraštį.</string>
+  <string name="blogs_sharing_invitation_received">%1$s pradėjo bendrinti su jumis tinklaraštį \"%2$s\".</string>
+  <string name="blogs_sharing_invitation_sent">Jūs pradėjote bendrinti su %2$s tinklaraštį \"%1$s\".</string>
+  <string name="blogs_sharing_invitations_title">Pakvietimai į tinklaraštį</string>
+  <string name="blogs_sharing_joined_toast">Tinklaraštis užprenumeruotas</string>
+  <string name="blogs_sharing_declined_toast">Pakvietimas atmestas</string>
+  <string name="sharing_status_blog">Bet kas, prenumeruojantis tinklaraštį, gali jį bendrinti su savo adresatais. Jūs bendrinate šį tinklaraštį su šiais adresatais. Taip pat gali būti ir kitų prenumeratorių, kurių nematote.</string>
+  <!--RSS Feeds-->
+  <string name="blogs_rss_feeds_import">Importuoti RSS kanalą</string>
+  <string name="blogs_rss_feeds_import_button">Importuoti</string>
+  <string name="blogs_rss_feeds_import_hint">Įveskite RSS kanalo URL</string>
+  <string name="blogs_rss_feeds_import_error">Atleiskite! Importuojant jūsų kanalą, įvyko klaida.</string>
+  <string name="blogs_rss_feeds_manage">Tvarkyti RSS kanalus</string>
+  <string name="blogs_rss_feeds_manage_imported">Importuota:</string>
+  <string name="blogs_rss_feeds_manage_author">Autorius:</string>
+  <string name="blogs_rss_feeds_manage_updated">Paskutinį kartą atnaujinta:</string>
+  <string name="blogs_rss_remove_feed">Šalinti kanalą</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Ar tikrai norite pašalinti šį kanalą?\n\nĮrašai bus pašalinti iš jūsų įrenginio, tačiau liks kitų žmonių įrenginiuose.\n\nBet kokie adresatai, su kuriais bendrinote šį kanalą, gali nustoti gauti atnaujinimus.</string>
+  <string name="blogs_rss_remove_feed_ok">Šalinti</string>
+  <string name="blogs_rss_feeds_manage_delete_error">Nepavyko ištrinti kanalo!</string>
+  <string name="blogs_rss_feeds_manage_empty_state">Nėra rodytinų RSS kanalų\n\nNorėdami importuoti kanalą, bakstelėkite + piktogramą</string>
+  <string name="blogs_rss_feeds_manage_error">Įkeliant jūsų kanalus, atsirado problemų. Vėliau bandykite dar kartą.</string>
+  <!--Settings Display-->
+  <string name="pref_language_title">Kalba ir regionas</string>
+  <string name="pref_language_changed">Šis nustatymas įsigalios, kai paleisite Briar iš naujo. Atsijunkite ir paleiskite Briar iš naujo.</string>
+  <string name="pref_language_default">Sistemos numatytoji</string>
+  <string name="display_settings_title">Rodinys</string>
+  <string name="pref_theme_title">Apipavidalinimas</string>
+  <string name="pref_theme_light">Šviesus</string>
+  <string name="pref_theme_dark">Tamsus</string>
+  <string name="pref_theme_auto">Automatinis (Dienos metas)</string>
+  <string name="pref_theme_system">Sistemos numatytasis</string>
+  <!--Settings Network-->
+  <string name="network_settings_title">Tinklai</string>
+  <string name="bluetooth_setting">Prisijungti per Bluetooth</string>
+  <string name="bluetooth_setting_enabled">Kai adresatai yra šalia</string>
+  <string name="bluetooth_setting_disabled">Tik pridedant adresatus</string>
+  <string name="tor_network_setting">Prisijungti per internetą (Tor)</string>
+  <string name="tor_network_setting_automatic">Automatiškai pagal buvimo vietą</string>
+  <string name="tor_network_setting_without_bridges">Naudoti Tor be tinklų tiltų</string>
+  <string name="tor_network_setting_with_bridges">Naudoti Tor su tinklų tiltais</string>
+  <string name="tor_network_setting_never">Neprisijungti</string>
+  <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
+  <string name="tor_network_setting_summary">Automatiškai: %1$s (šalyje %2$s)</string>
+  <string name="tor_mobile_data_title">Naudoti mobiliuosius duomenis</string>
+  <string name="tor_only_when_charging_title">Prisijungti per internetą (Tor) tik įkraunant įrenginį</string>
+  <string name="tor_only_when_charging_summary">Išjungia interneto ryšį, kai įrenginys veikia naudodamas akumuliatorių</string>
+  <!--Settings Security and Panic-->
+  <string name="security_settings_title">Saugumas</string>
+  <string name="pref_lock_title">Programėlės užrakinimas</string>
+  <string name="pref_lock_summary">Naudoti įrenginio ekrano užraktą, kad esant prisijungus, Briar būtų apsaugota</string>
+  <string name="pref_lock_disabled_summary">Norėdami naudoti šią ypatybę, nusistatykite įrenginyje ekrano užraktą</string>
+  <string name="pref_lock_timeout_title">Programėlės užrakinimo laiko limitas esant neveiklumui</string>
+  <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
+  <string name="pref_lock_timeout_summary">Nenaudojant Briar, automatiškai ją užrakinti po %s</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_1">1 minutės</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_5">5 minučių</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_15">15 minučių</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_30">30 minučių</string>
+  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_60">1 valandos</string>
+  <string name="pref_lock_timeout_never">Niekada</string>
+  <string name="pref_lock_timeout_never_summary">Niekada automatiškai neužrakinti Briar</string>
+  <string name="change_password">Pakeisti slaptažodį</string>
+  <string name="current_password">Dabartinis slaptažodis</string>
+  <string name="choose_new_password">Naujas slaptažodis</string>
+  <string name="confirm_new_password">Pakartokite naują slaptažodį</string>
+  <string name="password_changed">Slaptažodis pakeistas.</string>
+  <string name="panic_setting">Panikos mygtuko sąranka</string>
+  <string name="panic_setting_title">Panikos mygtukas</string>
+  <string name="panic_setting_hint">Konfigūruoti ką Briar darys, kai naudosite panikos mygtuko programėlę</string>
+  <string name="panic_app_setting_title">Panikos mygtuko programėlė</string>
+  <string name="unknown_app">nežinoma programėlė</string>
+  <string name="panic_app_setting_summary">Nėra nustatyta jokia programėlė</string>
+  <string name="panic_app_setting_none">Nėra</string>
+  <string name="dialog_title_connect_panic_app">Patvirtinkite panikos programėlę</string>
+  <string name="dialog_message_connect_panic_app">Ar tikrai norite leisti %1$s sukelti naikinamuosius panikos mygtuko veiksmus?</string>
+  <string name="panic_setting_destructive_action">Naikinamieji veiksmai</string>
+  <string name="panic_setting_signout_title">Atsijungti</string>
+  <string name="panic_setting_signout_summary">Atsijungti iš Briar, jei yra paspaudžiamas panikos mygtukas</string>
+  <string name="purge_setting_title">Ištrinti paskyrą</string>
+  <string name="purge_setting_summary">Ištrinti jūsų Briar paskyrą, jei yra paspaudžiamas panikos mygtukas. Dėmesio: Tai visiems laikams ištrins jūsų tapatybes, adresatus ir žinutes</string>
+  <string name="uninstall_setting_title">Pašalinti Briar</string>
+  <string name="uninstall_setting_summary">Panikos atveju, tai reikalauja rankinio patvirtinimo</string>
+  <!--Settings Notifications-->
+  <string name="notification_settings_title">Pranešimai</string>
+  <string name="notify_sign_in_title">Priminti man prisijungti</string>
+  <string name="notify_sign_in_summary">Rodyti priminimą, kai telefonas įsijungia ar, kai programėlė buvo atnaujinta</string>
+  <string name="notify_private_messages_setting_title">Privačios žinutės</string>
+  <string name="notify_private_messages_setting_summary">Rodyti pranešimus apie privačias žinutes</string>
+  <string name="notify_private_messages_setting_summary_26">Konfigūruoti privačių žinučių pranešimus</string>
+  <string name="notify_group_messages_setting_title">Grupės žinutės</string>
+  <string name="notify_group_messages_setting_summary">Rodyti pranešimus apie grupės žinutes</string>
+  <string name="notify_group_messages_setting_summary_26">Konfigūruoti grupės žinučių pranešimus</string>
+  <string name="notify_forum_posts_setting_title">Forumo įrašai</string>
+  <string name="notify_forum_posts_setting_summary">Rodyti pranešimus apie forumo įrašus</string>
+  <string name="notify_forum_posts_setting_summary_26">Konfigūruoti forumo įrašų pranešimus</string>
+  <string name="notify_blog_posts_setting_title">Tinklaraščio įrašai</string>
+  <string name="notify_blog_posts_setting_summary">Rodyti pranešimus apie tinklaraščio įrašus</string>
+  <string name="notify_blog_posts_setting_summary_26">Konfigūruoti tinklaraščio įrašų pranešimus</string>
+  <string name="notify_vibration_setting">Vibruoti</string>
+  <string name="notify_sound_setting">Garsas</string>
+  <string name="notify_sound_setting_default">Numatytoji skambėjimo melodija</string>
+  <string name="notify_sound_setting_disabled">Nėra</string>
+  <string name="choose_ringtone_title">Pasirinkite skambėjimo melodiją</string>
+  <string name="cannot_load_ringtone">Nepavyksta įkelti skambučio melodijos</string>
+  <!--Settings Feedback-->
+  <string name="feedback_settings_title">Atsiliepimai</string>
+  <string name="send_feedback">Siųsti atsiliepimą</string>
+  <!--Link Warning-->
+  <string name="link_warning_title">Įspėjimas apie nuorodą</string>
+  <string name="link_warning_intro">Jūs ketinate atverti šią nuorodą, naudojant išorinę programėlę.</string>
+  <string name="link_warning_text">Tai gali būti panaudota tam, kad jūs būtumėte atpažinti. Pagalvokite ar pasitikite asmeniu, kuris jums siunčia šią nuorodą ir apsvarstykite galimybę ją atverti, naudojant Tor Browser.</string>
+  <string name="link_warning_open_link">Atverti nuorodą</string>
+  <!--Crash Reporter-->
+  <string name="crash_report_title">Briar strigties ataskaita</string>
+  <string name="briar_crashed">Atleiskite, Briar užstrigo.</string>
+  <string name="not_your_fault">Tai nėra jūsų kaltė.</string>
+  <string name="please_send_report">Padėkite mums sukurti geresnę Briar, išsiųsdami mums strigties ataskaitą.</string>
+  <string name="report_is_encrypted">Mes pažadame, kad ataskaita yra šifruota ir išsiunčiama saugiai.</string>
+  <string name="feedback_title">Atsiliepimai</string>
+  <string name="describe_crash">Aprašykite kas nutiko (nebūtina)</string>
+  <string name="enter_feedback">Įveskite savo atsiliepimą</string>
+  <string name="optional_contact_email">Jūsų el. pašto adresas (nebūtina)</string>
+  <string name="include_debug_report_crash">Įtraukti anoniminius duomenis apie strigtį</string>
+  <string name="include_debug_report_feedback">Įtraukti anoniminius duomenis apie šį įrenginį</string>
+  <string name="could_not_load_report_data">Nepavyko įkelti ataskaitos duomenų.</string>
+  <string name="send_report">Siųsti ataskaitą</string>
+  <string name="close">Užverti</string>
+  <string name="dev_report_saved">Ataskaita įrašyta. Ji bus išsiųsta, kai kitą kartą prisijungsite prie Briar.</string>
+  <!--Sign Out-->
+  <string name="progress_title_logout">Atsijungiama iš Briar…</string>
+  <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">Aptikta ekrano perdanga</string>
+  <string name="screen_filter_body">Aptikta kitos programėlės perdanga virš Briar. Tam, kad būtų apsaugotas jūsų saugumas, Briar nereaguos į prilietimus tol, kol kita programėlė yra atvaizduojama ant viršaus. Gali būti, kad šios programėlės perdengia Briar:\n\n%1$s</string>
+  <string name="screen_filter_allow">Leisti šioms programėlėms perdengti ant viršaus</string>
+  <!--Permission Requests-->
+  <string name="permission_camera_title">Kameros leidimas</string>
+  <string name="permission_camera_request_body">Norint nuskenuoti QR kodą, Briar reikia prieigos prie kameros.</string>
+  <string name="permission_location_title">Įrenginio vietovės leidimas</string>
+  <string name="permission_location_request_body">Tam, kad galėtų atrasti Bluetooth įrenginius, Briar reikia gauti prieigą prie jūsų įrenginio vietovės.\n\nBriar nesaugo jūsų įrenginio vietovės ir su niekuo jos nebendrina.</string>
+  <string name="permission_camera_location_title">Kamera ir įrenginio vietovė</string>
+  <string name="permission_camera_location_request_body">Tam, kad galėtų nuskenuoti QR kodą, Briar reikia gauti prieigą prie jūsų kameros.\n\nTam, kad galėtų atrasti Bluetooth įrenginius, Briar reikia gauti prieigą prie jūsų įrenginio vietovės.\n\nBriar nesaugo jūsų įrenginio vietovės ir su niekuo jos nebendrina.</string>
+  <string name="permission_camera_denied_body">Jūs uždraudėte prieigą prie kameros, tačiau norint pridėti adresatus, reikia naudoti kamerą.\n\nApsvarstykite galimybę sutekti prieigą prie kameros.</string>
+  <string name="qr_code">QR kodas</string>
+  <string name="show_qr_code_fullscreen">Rodyti QR kodą visame ekrane</string>
+  <!--App Locking-->
+  <string name="lock_unlock">Atrakinti Briar</string>
+  <string name="lock_unlock_verbose">Norėdami atrakinti Briar, įveskite savo įrenginio PIN, šabloną ar slaptažodį</string>
+  <string name="lock_unlock_fingerprint_description">Norėdami tęsti, priregistruotu pirštu prilieskite piršto atspaudo jutiklį</string>
+  <string name="lock_unlock_password">Naudoti slaptažodį</string>
+  <string name="lock_is_locked">Briar užrakinta</string>
+  <string name="lock_tap_to_unlock">Bakstelėkite, norėdami atrakinti</string>
+  <!--Screenshots-->
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_alice">Jurgita</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_bob">Mindaugas</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_carol">Vilma</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
+  <string name="screenshot_message_1">Labas, Mindaugai!</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
+  <string name="screenshot_message_2">Sveika, Jurgita! Ačiū, kad papasakojai man apie Briar!</string>
+  <!--This is a message to be used in screenshots.-->
+  <string name="screenshot_message_3">Jokių problemų, tikiuosi tau patiks 😀</string>
+</resources>

briar-android/src/main/res/values-mk/strings.xml

@@ -118,10 +118,17 @@
   <string name="message_hint">Напиши порака</string>
   <string name="image_caption_hint">Додај наслов (опционално)</string>
   <string name="image_attach">Прикачи слика</string>
-  <string name="image_attach_error">Сликата не може да се прикачи</string>
+  <string name="image_attach_error">Сликата/те не може да се прикачи(ат)</string>
+  <string name="image_attach_error_too_big">Сликата е преголема. Лимитот е %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Форматот на сликата не е поддржан: %s</string>
   <string name="set_contact_alias">Промена на име на контакт</string>
   <string name="set_contact_alias_hint">Име на контакт</string>
   <string name="set_alias_button">Промени</string>
+  <string name="delete_all_messages">Избриши ги сите пораки</string>
+  <string name="dialog_title_delete_all_messages">Потврди бришење на порака</string>
+  <string name="dialog_message_delete_all_messages">Дали сте сигурни дека сакате да ги избришете сите пораки?</string>
+  <string name="dialog_title_not_all_messages_deleted">Не можат да бидат избришани сите пораки</string>
+  <string name="dialog_message_not_all_messages_deleted">Порактите поврзани со претставувањата или поканите кои се во тек не можат да бидат избришани додека не бидат завршени.</string>
   <string name="delete_contact">Избриши контакт</string>
   <string name="dialog_title_delete_contact">Потврди бришење на контакт</string>
   <string name="dialog_message_delete_contact">Дали сте сигурни дека сакате да го избришете овој контакт и сите пораки поврзани со него?</string>
@@ -137,6 +144,7 @@
   <string name="dialog_message_no_image_support">Верзијата на Briar на контактот се уште не поддржува прикачувања на слики. Во моментот кога тој ќе го ажурира Briar, ќе видите различна икона.</string>
   <string name="dialog_title_image_support">Сега можете да му испраќате слики на овој контакт</string>
   <string name="dialog_message_image_support">Допрете ја оваа икона за да прикачите слики.</string>
+  <string name="messaging_too_many_attachments_toast">Само првите %d слики ќе бидат испратени</string>
   <!--Adding Contacts-->
   <string name="add_contact_title">Додај контакт ВО БЛИЗИНА</string>
   <string name="face_to_face">Морате да се сретнете со лицето кое сакате да го додадете за контакт.\n\nОва спречува во иднина било кој да се преставува како вас или да ги чита вашите пораки во иднина.</string>
@@ -178,13 +186,16 @@
   <string name="pending_contact_requests">Барања за контакт на чекање</string>
   <string name="no_pending_contacts">Нема контакти на чекање</string>
   <string name="add_contact_remote_connecting">Се поврзува...</string>
-  <string name="waiting_for_contact_to_come_online">Чекање контактот да се вклучи...\n\nДали веќе го внел твојот линк?</string>
+  <string name="waiting_for_contact_to_come_online">Чекање на контакт да се вклучи...</string>
   <string name="connecting">Се поврзува...</string>
   <string name="adding_contact">Додавање контакт...</string>
   <string name="adding_contact_failed">Додавањето на контакт беше неуспешно</string>
+  <string name="dialog_title_remove_pending_contact">Потврди отстранување</string>
+  <string name="dialog_message_remove_pending_contact">Овој контакт е сеуште додаден. Ако го отстраните сега, нема да биде додаден.</string>
   <string name="own_link_error">Внеси го линкот на твојот контакт, а не својот линк</string>
   <string name="nickname_missing">Ве молиме внесете прекар</string>
   <string name="invalid_link">Неважечки линк</string>
+  <string name="unsupported_link">Овој линк доаѓа од понова верзија на Briar. Ве молиме надградете во последна верзија и обидете се повторно.</string>
   <string name="intent_own_link">Го отвори твојот линк. Користи го линкот на контактот што сакаш да го додадеш!</string>
   <string name="missing_link">Ве молиме внесете линк</string>
   <!--This is a numeral indicating the first step in a series of screens-->
@@ -195,6 +206,25 @@
     <item quantity="one">Нов контакт е додаден.</item>
     <item quantity="other">%dнови контакти се додадени.</item>
   </plurals>
+  <string name="adding_contact_slow_warning">Додавањето на овој контакт е подолго од вообичаено</string>
+  <string name="adding_contact_slow_title">Не може да се поврзе со контакт</string>
+  <string name="adding_contact_slow_text">Додавањето на овој контакт е подолго од вообичаеното.\n\nВе молиме проверете дека вашиот контакт го добил вашиот линк и дека ве додал: </string>
+  <string name="offline_state">Нема Интернет врска</string>
+  <string name="duplicate_link_dialog_title">Дуплицирање на линк</string>
+  <string name="duplicate_link_dialog_text_1">Веќе имате контакт на чекање со овој линк: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Веќе имате контакт со овој линк: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Дали %s и %s е истата личност?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Истата личност</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Различна личност</string>
+  <string name="duplicate_link_dialog_text_3">%sи %s ти го испратија истиот линк.\n\nЕден од нив можеби се обидува да открие кои се твоите контакти.\n\nНе им кажувајте дека сте добиле ист линк од некој друг.</string>
+  <string name="pending_contact_updated_toast">Контактот на чекање е ажуриран</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Запознај ги твоите контакти</string>
   <string name="introduction_onboarding_text">Можете да ги запознаете вашите контакти меѓусебно, па тие нема да имаат потреба да се запознаваат лично за да се поврзат на Briar.</string>

briar-android/src/main/res/values-nl/strings.xml

@@ -118,7 +118,9 @@
   <string name="message_hint">Schrijf een bericht</string>
   <string name="image_caption_hint">Voeg een titel toe (optioneel)</string>
   <string name="image_attach">Voeg een afbeelding toe</string>
-  <string name="image_attach_error">Kon afbeelding niet toevoegen</string>
+  <string name="image_attach_error">Kon afbeelding(en) niet toevoegen</string>
+  <string name="image_attach_error_too_big">Afbeelding is te groot. Grens is %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Bestandsformaat wordt niet ondersteund: %s</string>
   <string name="set_contact_alias">Verander naam van contact</string>
   <string name="set_contact_alias_hint">Contactnaam</string>
   <string name="set_alias_button">Wijzigen</string>
@@ -138,6 +140,7 @@
   <string name="dialog_title_image_support">Je kan nu afbeeldingen naar dit contact sturen</string>
   <string name="dialog_message_image_support">Tik op dit icoon om afbeelding bij te sluiten.</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Voeg contact in de buurt toe</string>
   <string name="face_to_face">Je moet een persoon in levenden lijve ontmoeten om die als contact toe te voegen.\n\nDit voortkomt dat anderen zich als jou voor kunnen doen of in de toekomst je berichten kunnen lezen.</string>
   <string name="continue_button">Ga verder</string>
   <string name="try_again_button">Probeer nog een keer</string>
@@ -155,15 +158,66 @@
   <string name="connection_error_explanation">Controleer alsjeblieft dat jullie beiden met hetzelfde wifinetwerk zijn verbonden.</string>
   <string name="connection_error_feedback">Als dit probleem aanhoudt, <a href="feedback">stuur feedback</a> alsjeblieft om ons te helpen de app te verbeteren.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Voeg een contact ver weg toe</string>
+  <string name="add_contact_nearby_title">Voeg contact dat in de buurt is toe</string>
+  <string name="add_contact_remotely_title">Voeg een contact dat niet in de buurt is toe</string>
+  <string name="contact_name_hint">Geef contact een bijnaam</string>
+  <string name="contact_link_intro">Voer de link van je contact hier in</string>
+  <string name="contact_link_hint">Link van contact</string>
   <string name="paste_button">Plakken</string>
+  <string name="add_contact_button">Voeg contact toe</string>
   <string name="copy_button">Kopiëren</string>
   <string name="share_button">Delen</string>
+  <string name="send_link_title">Wissel links uit</string>
+  <string name="add_contact_choose_nickname">Kies bijnaam</string>
+  <string name="add_contact_choose_a_nickname">Voer bijnaam in</string>
+  <string name="nickname_intro">Geef je contact een bijnaam. Alleen jij dat dit zien.</string>
+  <string name="your_link">Geef deze link aan de contact die je toe wil voegen</string>
+  <string name="link_clip_label">Briar-link</string>
+  <string name="link_copied_toast">Link is gekopieerd</string>
+  <string name="adding_contact_error">Er was een probleem met toevoegen van het contact.</string>
+  <string name="pending_contact_requests_snackbar">Er zijn geen wachtende contactverzoeken</string>
+  <string name="pending_contact_requests">Wachtende contactverzoeken</string>
+  <string name="no_pending_contacts">Geen wachtende contactverzoeken</string>
   <string name="add_contact_remote_connecting">Bezig met verbinden...</string>
+  <string name="waiting_for_contact_to_come_online">Aan het wachten tot contact online komt...</string>
   <string name="connecting">Bezig met verbinden...</string>
+  <string name="adding_contact">Contact aan het toevoegen...</string>
+  <string name="adding_contact_failed">Toevoegen van contact is gefaald</string>
+  <string name="dialog_title_remove_pending_contact">Bevestig verwijderen</string>
+  <string name="dialog_message_remove_pending_contact">Dit contact wordt nog toegevoegd. Als je het nu verwijderd, zal het niet worden toegevoegd.</string>
+  <string name="own_link_error">Voer de link van je contact in, niet je eigenste</string>
+  <string name="nickname_missing">Voer a.u.b. een bijnaam in</string>
+  <string name="invalid_link">Ongeldige link</string>
+  <string name="unsupported_link">Deze link komt van een nieuwe versie van Briar. Upgrade alsjeblieft naar de laatste versie en probeer het nog eens.</string>
+  <string name="intent_own_link">Je hebt je eigen link geopend. Gebruik de link van jouw contact die je wil toevoegen!</string>
+  <string name="missing_link">Voeg a.u.b. link in</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
   <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Nieuw contact toegevoegd</item>
+    <item quantity="other">%d nieuwe contacten zijn toegevoegd.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Toevoegen van dit contact duurt langer dan gebruikelijk</string>
+  <string name="adding_contact_slow_title">Kan niet verbinden met contact</string>
+  <string name="adding_contact_slow_text">Het toeveogen van dit contact duurt langer dan gebruikelijk.\n\nGa alsjeblieft na of je contact jouw link heeft ontvangen en je heeft toegevoegd.</string>
+  <string name="offline_state">Geen internetverbinding</string>
+  <string name="duplicate_link_dialog_title">Duplicate link</string>
+  <string name="duplicate_link_dialog_text_1">Je hebt al en wachtend contact met deze link: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Zijn %s en %s dezelfde persoon?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Zelfde persoon</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Ander persoon</string>
+  <string name="duplicate_link_dialog_text_3">%s en %s hebben je dezelfde link gestuurd.\n\nEen van hen kan proberen te ontdekken wie jouw contacten zijn.\n\nVertel ze niet dat je dezelfde link al van een ander persoon hebt ontvangen.</string>
+  <string name="pending_contact_updated_toast">Wachtend contact is bijgewerkt</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduceer je contacten</string>
   <string name="introduction_onboarding_text">Je kan je contacten aan elkaar introduceren zodat ze niet in levenden lijve elkaar te hoeven ontmoeten om op Briar in contact te komen.</string>

briar-android/src/main/res/values-oc/strings.xml

@@ -120,7 +120,9 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="message_hint">Picatz lo messatge</string>
   <string name="image_caption_hint">Ajustar una legenda (optionala)</string>
   <string name="image_attach">Juntar un imatge</string>
-  <string name="image_attach_error">Fracàs de l’apondon de l’imatge</string>
+  <string name="image_attach_error">Impossible de juntar d’imatges</string>
+  <string name="image_attach_error_too_big">Imatge tròp pesuc. Limit de %d Mo. </string>
+  <string name="image_attach_error_invalid_mime_type">Format d’imatge pas compatible : %s</string>
   <string name="set_contact_alias">Cambiar lo nom del contacte</string>
   <string name="set_contact_alias_hint">Nom del contacte</string>
   <string name="set_alias_button">Cambiar</string>
@@ -140,6 +142,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="dialog_title_image_support">Ara podètz enviar d’imatges a aqueste contacte</string>
   <string name="dialog_message_image_support">Tocatz aquesta icòna per juntar d’imatges.</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Ajustar un contacte a proximitat</string>
   <string name="face_to_face">Vos cal vos amassar amb la persona que volètz apondre als contactes.\n\n Aquò es fach per evitar qu’òm vos raube l’identitat e que vòstres messatges sián legits per d’autres.</string>
   <string name="continue_button">Contunhar</string>
   <string name="try_again_button">Tornar ensajar</string>
@@ -157,10 +160,66 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="connection_error_explanation">Verificatz que sètz los dos connectats al meteis ret wifi.</string>
   <string name="connection_error_feedback">S’aqueste problèma dura, mercés <a href="feedback"> d’enviar un comentari</a> per nos ajudar a melhorar l’aplicacion.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Ajustar un contacte a distància</string>
+  <string name="add_contact_nearby_title">Ajustatz un contacte a proximitat</string>
+  <string name="add_contact_remotely_title">Ajustatz un contacte a distància</string>
+  <string name="contact_name_hint">Donar un escais-nom a un contacte</string>
+  <string name="contact_link_intro">Picatz lo ligam del contacte aquí</string>
+  <string name="contact_link_hint">Ligam del contacte</string>
+  <string name="paste_button">Pegar</string>
+  <string name="add_contact_button">Ajustar un contacte</string>
   <string name="copy_button">Copiar</string>
   <string name="share_button">Partejar</string>
+  <string name="send_link_title">Escambiar de ligams</string>
+  <string name="add_contact_choose_nickname">Causir l’escais-nom</string>
+  <string name="add_contact_choose_a_nickname">Picatz l’escais-nom</string>
+  <string name="nickname_intro">Donatz un escais-nom a vòstre contacte. Pas que vosautres poiretz lo veire.</string>
+  <string name="your_link">Donatz aqueste ligam al contacte que volètz ajustar</string>
+  <string name="link_clip_label">Ligam Briar</string>
+  <string name="link_copied_toast">Ligam copiat</string>
+  <string name="adding_contact_error">I a agut una error en ajustar lo contacte.</string>
+  <string name="pending_contact_requests_snackbar">I a de demandas d’apondon en espèra</string>
+  <string name="pending_contact_requests">Demandas d’apondon en espèra</string>
+  <string name="no_pending_contacts">Cap de demanda en espèra</string>
+  <string name="add_contact_remote_connecting">Connexion…</string>
+  <string name="waiting_for_contact_to_come_online">En espèra que lo contacte passe en linha…</string>
+  <string name="connecting">Connexion…</string>
+  <string name="adding_contact">Apondon del contacte…</string>
+  <string name="adding_contact_failed">L’apondon a pas foncionat</string>
+  <string name="dialog_title_remove_pending_contact">Confirmar la supression</string>
+  <string name="dialog_message_remove_pending_contact">Aqueste contacte es a èsser ajustat. Se lo levatz ara, serà pas ajustat.</string>
+  <string name="own_link_error">Picatz lo ligam del contacte, non pas lo vòstre</string>
+  <string name="nickname_missing">Mercés de picar un escais-nom</string>
+  <string name="invalid_link">Ligam invalid</string>
+  <string name="unsupported_link">Aqueste ligam ven d’una version de Briar mai recenta. Passatz a la darrièra version e tornatz ensajar.</string>
+  <string name="intent_own_link">Avètz dubèrt vòstre pròpi ligam. Utilizatz çò d’un contacte que volètz ajustar !</string>
+  <string name="missing_link">Mercés de picar un ligam</string>
   <!--This is a numeral indicating the first step in a series of screens-->
+  <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Nòu contacte ajustat.</item>
+    <item quantity="other">%d nòus contactes ajustats.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">L’apondon del contacte tarda mai que de costuma</string>
+  <string name="adding_contact_slow_title">Connexion impossibla al contacte</string>
+  <string name="adding_contact_slow_text">.L’apondon del contacte tarda mai que de costuma\n\nVerificatz que vòstre contacte aja ben recebut vòstre ligam e vos aja ajustat :</string>
+  <string name="offline_state">Cap de connexion Internet</string>
+  <string name="duplicate_link_dialog_title">Duplicar lo ligam</string>
+  <string name="duplicate_link_dialog_text_1">Avètz ja una demanda en espèra amb aqueste ligam : %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Son %s e %s la meteissa persona ?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Meteissa persona</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Persona diferenta</string>
+  <string name="duplicate_link_dialog_text_3">%s e %s vos envia lo meteis ligam.\n\nUn d’eles poiriá ensajar de descobrir quines son vòstres contactes.\n\n Digatz-los pas qu’avètz recebut lo meteis ligam de qualqu’un mai.</string>
+  <string name="pending_contact_updated_toast">Contact en espèra actualizat</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Presentatz vòstres contactes</string>
   <string name="introduction_onboarding_text">Podètz presentar vòstres contactes, lor caldrà pas se veire per s’apondre e se connectar a Briar.</string>

briar-android/src/main/res/values-pl/strings.xml

@@ -5,10 +5,10 @@
   <string name="setup_name_explanation">Twoja nazwa użytkownika będzie wyświetlana przy każdej zamieszczonej przez Ciebie treści. Nie można jej zmienić po tworzeniu konta.</string>
   <string name="setup_next">Dalej</string>
   <string name="setup_password_intro">Wybierz Hasło</string>
-  <string name="setup_password_explanation">Twoje konto Briar jest przechowywane i szyfrowane na Twoim urządzeniu nie w chmurze. Jeśli zapomnisz hasła lub odinstalujesz Briar, nie ma możliwości aby odzyskać Twoje konto.\n\nWybierz długie hasło, które jest trudne do odgadnięcia, czyli takie z losowymi literami numerami i symbolami.</string>
-  <string name="setup_doze_title">Połączenia w Tle</string>
+  <string name="setup_password_explanation">Twoje konto Briar jest przechowywane w postaci zaszyfrowanej na Twoim urządzeniu, a nie w chmurze. Jeżeli zapomnisz hasło lub odinstalujesz Briar, nie da się odzyskać Twojego konta.\n\nWybierz długie hasło, które jest trudne do odgadnięcia, jak np. cztery losowe słowa, lub dziesięć losowych liter, liczb i symboli </string>
+  <string name="setup_doze_title">Połączenia w tle</string>
   <string name="setup_doze_intro">Aby otrzymywać wiadomości, Briar musi utrzymywać połączenie w tle.</string>
-  <string name="setup_doze_explanation">Aby otrzymywać wiadomości, Briar musi utrzymywać połączenie w tle. Wyłącz optymalizacje baterii aby Briar mógł zostać połączony.</string>
+  <string name="setup_doze_explanation">Aby otrzymywać wiadomości, Briar musi utrzymywać połączenie w tle. Wyłącz optymalizacje baterii aby Briar mógł utrzymywać połączenie w tle.</string>
   <string name="setup_doze_button">Pozwól na Połączenia</string>
   <string name="choose_nickname">Wybierz nazwę użytkownika</string>
   <string name="choose_password">Wybierz hasło</string>
@@ -21,19 +21,19 @@
   <string name="don_t_ask_again">Nie pytaj ponownie</string>
   <string name="setup_huawei_text">Proszę dotknąć przycisku poniżej i upewnić się, że Briar jest na liście chronionych aplikacji.</string>
   <string name="setup_huawei_button">Chroń Briar</string>
-  <string name="setup_huawei_help">Jeśli Briar nie będzie na liście chronionych aplikacji nie będzie miał możliwości aby działać w tle.</string>
+  <string name="setup_huawei_help">Jeśli Briar nie będzie na liście chronionych aplikacji, nie będzie miał możliwości aby działać w tle.</string>
   <string name="warning_dozed">%s nie był wstanie działać w tle</string>
   <!--Login-->
   <string name="enter_password">Hasło</string>
   <string name="try_again">Złe hasło, spróbuj ponownie</string>
   <string name="sign_in_button">Zaloguj Się</string>
-  <string name="forgotten_password">Przypomnij hasło</string>
+  <string name="forgotten_password">Zapomniałem hasło</string>
   <string name="dialog_title_lost_password">Nie pamiętam hasła</string>
   <string name="dialog_message_lost_password">Twoje konto Briar jest zaszyfrowane na Twoim urządzeniu nie w chmurze, więc nie będzie można zresetować Twojego hasła. Czy chcesz usunąć swoje konto i stworzyć nowe?\n\nUwaga: Twoje hasła, kontakty i wiadomości będą utracone.</string>
   <string name="startup_failed_notification_title">Briar nie mógł się uruchomić</string>
-  <string name="startup_failed_notification_text">Więcej informacji</string>
+  <string name="startup_failed_notification_text">Naciśnij, aby uzyskać więcej informacji</string>
   <string name="startup_failed_activity_title">Briar nie mógł się uruchomić</string>
-  <string name="startup_failed_db_error">Niestety baza danych Briar została uszkodzona i nie można jej naprawić. Twoje konto, dane i kontakty zostały utracone. Niestety musisz przeinstalować Briar lub utworzyć nowe konto wybierając opcje \"Zapomniałem hasła\".</string>
+  <string name="startup_failed_db_error">Z jakiegoś powodu Twoja baza danych Briar została uszkodzona w stopniu uniemożliwiającym naprawę. Twoje konto, dane i kontakty zostały utracone. Niestety musisz przeinstalować Briar lub utworzyć nowe konto wybierając opcje \"Zapomniałem hasła\".</string>
   <string name="startup_failed_data_too_old_error">Twoje konto zostało stworzone przez starszą wersję aplikacji i nie może zostać otwarte w tej wersji. Musisz zainstalować starszą wersję aplikacji lub utworzyć nowe konto klikając \"Zapomniałem hasła\".</string>
   <string name="startup_failed_data_too_new_error">Ta wersja aplikacji jest zbyt stara. Proszę zaktualizować program do najnowszej wersji i spróbować ponownie.</string>
   <string name="startup_failed_service_error">Briar nie był w stanie uruchomić wybranego rozszerzenia. Przeinstalowanie Briar zwykle rozwiązuje ten problem. Pamiętaj jednak, że stracisz wtedy swoje konto i wszystkie powiązanie z nim dane, gdyż Briar nie używa centralnych serwerów by przechowywać dane.</string>
@@ -46,10 +46,11 @@
   <string name="expiry_update">Okres testowania został wydłużony. Twoje konto wygaśnie za %d dni.</string>
   <string name="expiry_date_reached">Ten program wygasł.\nDziękujemy za testy!</string>
   <string name="download_briar">Aby dalej korzystać z Briar, proszę pobrać wersję 1.0.</string>
-  <string name="create_new_account">Będzie potrzeba stworzenia nowego konta, ale możesz użyć takiej samej nazwy użytkownika.</string>
+  <string name="create_new_account">Musisz utworzyć nowe konto, ale możesz użyć takiej samej nazwy użytkownika.</string>
   <string name="download_briar_button">Pobierz Briar 1.0</string>
   <string name="startup_open_database">Deszyfruję Bazę Danych...</string>
   <string name="startup_migrate_database">Aktualizuję Bazę Danych...</string>
+  <string name="startup_compact_database">Kompaktowanie Bazy Danych…</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Otwórz panel nawigacji</string>
   <string name="nav_drawer_close_description">Zamknij panel nawigacji</string>
@@ -67,8 +68,8 @@
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Wylogowano z Briar</string>
-  <string name="reminder_notification_text">Dotknij aby zalogować.</string>
-  <string name="reminder_notification_channel_title">Przypomnienie o zalogowaniu</string>
+  <string name="reminder_notification_text">Dotknij, aby zalogować się ponownie</string>
+  <string name="reminder_notification_channel_title">Przypomnienie o zalogowaniu do Briar</string>
   <string name="reminder_notification_dismiss">Odrzuć</string>
   <string name="ongoing_notification_title">Zalogowany w Briar</string>
   <string name="ongoing_notification_text">Dotknij aby otworzyć Briar</string>
@@ -125,61 +126,133 @@
   <string name="date_no_private_messages">Brak wiadomości.</string>
   <string name="no_private_messages">Brak wiadomości do pokazania</string>
   <string name="message_hint">Typ wiadomości</string>
+  <string name="image_caption_hint">Dodaj podpis (opcjonalne)</string>
+  <string name="image_attach">Załącz obraz</string>
+  <string name="image_attach_error">Nie udało się dołączyć obrazu(ów)</string>
+  <string name="image_attach_error_too_big">Obraz zajmuje za dużo. Limit wynosi %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Format obrazu jest nieobsługiwany: %s</string>
+  <string name="set_contact_alias">Zmień nazwę kontaktu</string>
   <string name="set_contact_alias_hint">Nazwa kontaktu</string>
   <string name="set_alias_button">Zmień</string>
+  <string name="dialog_title_not_all_messages_deleted">Nie mogłem usunąć wszystkich wiadomości</string>
   <string name="delete_contact">Usuń kontakt</string>
   <string name="dialog_title_delete_contact">Potwierdź usunięcie kontaktu</string>
   <string name="dialog_message_delete_contact">Czy na pewno chcesz usunąć ten kontakt i wszystkie wymienione z nim wiadomości?</string>
   <string name="contact_deleted_toast">Kontakt usunięty</string>
   <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
-  <string name="you">You</string>
-  <string name="save_image">Zapisz obrazek</string>
+  <string name="you">Ty</string>
+  <string name="save_image">Zapisz obraz</string>
+  <string name="dialog_title_save_image">Zapisać obraz?</string>
+  <string name="dialog_message_save_image">Zapisanie tego obrazu pozwoli innym aplikacjom na dostęp do niego.\n\nJesteś pewien, że chcesz go zapisać?</string>
+  <string name="save_image_success">Obraz został zapisany</string>
+  <string name="save_image_error">Nie udało się zapisać obrazu</string>
+  <string name="dialog_title_no_image_support">Obrazy są niedostępne</string>
+  <string name="dialog_message_no_image_support">Briar twoich kontaktów nie obsługuje jeszcze obrazów jako załączników. Jak wykonają aktualizację, zobaczysz inną ikonę.</string>
+  <string name="dialog_title_image_support">Możesz teraz wysyłać obrazy do tego kontaktu</string>
+  <string name="dialog_message_image_support">Kliknij tą ikonę aby dołączyć obrazy</string>
   <!--Adding Contacts-->
-  <string name="face_to_face">Musisz spotkać się z osobą którą chcesz dodać jako kontakt.\n\nTo uniemożliwi komukolwiek podszyć się pod Ciebie lub czytać wysyłane wiadomości.</string>
+  <string name="add_contact_title">Dodaj kontakt w pobliżu</string>
+  <string name="face_to_face">Musisz spotkać się z osobą którą chcesz dodać jako kontakt.\n\nTo uniemożliwi komukolwiek udawanie Ciebie lub czytanie Twoich wiadomości w przyszłości.</string>
   <string name="continue_button">Kontynuuj</string>
   <string name="try_again_button">Spróbuj ponownie</string>
-  <string name="waiting_for_contact_to_scan">Czekanie aż ktoś zeskanuje kod i połączy się\u2026</string>
+  <string name="waiting_for_contact_to_scan">Czekanie aż kontakt zeskanuje kod i połączy się\u2026</string>
   <string name="exchanging_contact_details">Wymienianie szczegółów dotyczących kontatku\u2026</string>
   <string name="contact_added_toast">Kontakt dodany: %s</string>
   <string name="contact_already_exists">Kontakt %s już istnieje</string>
-  <string name="qr_code_invalid">Kod QR jest nie prawidłowy</string>
+  <string name="qr_code_invalid">Kod QR jest nieprawidłowy</string>
+  <string name="qr_code_too_old">Kod QR, który zeskanowałeś pochodzi od starszej wersji %s.\n\nPoproś swój kontakt o zaktualizowanie do najnowszej wersji i wtedy spróbuj ponownie.</string>
+  <string name="qr_code_too_new">Kod QR, który zeskanowałeś pochodzi od nowszej wersji %s.\n\n Wykonaj aktualizację do najnowszej wersji i spróbuj ponownie.</string>
   <string name="camera_error">Błąd aparatu</string>
   <string name="connecting_to_device">Łączenie z urządzeniem\u2026</string>
   <string name="authenticating_with_device">Autoryzowanie z urządzeniem\u2026</string>
   <string name="connection_error_title">Nie udało się połączyć z kontaktem</string>
-  <string name="connection_error_explanation">Sprawdź czy oboje jesteście połączeni z tą samą siecią Wi-Fi.</string>
-  <string name="connection_error_feedback">Jeśli problem będzie występować, proszę <a href="feedback">wysłać zgłoszenie</a> aby pomóc nam ulepszyć aplikację.</string>
+  <string name="connection_error_explanation">Sprawdź czy obaj jesteście połączeni z tą samą siecią Wi-Fi.</string>
+  <string name="connection_error_feedback">Jeśli problem będzie występować dalej, proszę <a href="feedback">wysłać zgłoszenie</a> aby pomóc nam ulepszyć aplikację.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Dodaj Kontakt na odległość</string>
+  <string name="add_contact_nearby_title">Dodaj kontakt w pobliżu</string>
+  <string name="add_contact_remotely_title">Dodaj kontakt na odległość</string>
+  <string name="contact_name_hint">Nadaj pseudonim kontaktowi</string>
+  <string name="contact_link_intro">Wprowadź tutaj link od swojego kontaktu</string>
+  <string name="contact_link_hint">Link kontaktu</string>
   <string name="paste_button">Wklej</string>
+  <string name="add_contact_button">Dodaj kontakt</string>
   <string name="copy_button">Kopiuj</string>
   <string name="share_button">Udostępnij</string>
+  <string name="send_link_title">Wymień linki</string>
+  <string name="add_contact_choose_nickname">Wybierz Pseudonim</string>
+  <string name="add_contact_choose_a_nickname">Wprowadź pseudonim</string>
+  <string name="nickname_intro">Nadaj pseudonim swojemu kontaktowi. Tylko ty możesz go widzieć.</string>
+  <string name="your_link">Podaj ten link kontaktowi, którego chcesz dodać</string>
+  <string name="link_clip_label">Link Briar</string>
+  <string name="link_copied_toast">Link skopiowany</string>
+  <string name="adding_contact_error">Wystąpił błąd podczas dodawaniu kontaktu</string>
+  <string name="pending_contact_requests_snackbar">Są prośby o dodanie do kontaktów</string>
+  <string name="pending_contact_requests">Prośby o dodanie do kontaktów</string>
+  <string name="no_pending_contacts">Brak próśb o dodanie do kontaktów</string>
   <string name="add_contact_remote_connecting">Trwa łączenie...</string>
+  <string name="waiting_for_contact_to_come_online">Czekam, aż kontakt pojawi się online…</string>
   <string name="connecting">Trwa łączenie...</string>
+  <string name="adding_contact">Dodawanie kontaktu…</string>
+  <string name="adding_contact_failed">Dodawanie kontaktu nie powiodło się</string>
+  <string name="dialog_title_remove_pending_contact">Potwierdź Usunięcie</string>
+  <string name="dialog_message_remove_pending_contact">Ten kontakt jest nadal dodawany. Jeżeli go teraz usuniesz, nie zostanie on dodany.</string>
+  <string name="own_link_error">Wprowadź link twojego kontaktu, a nie swój</string>
+  <string name="nickname_missing">Proszę, wprowadź pseudonim</string>
+  <string name="invalid_link">Niepoprawny link</string>
+  <string name="unsupported_link">Ten link pochodzi od nowszej wersji Briara. Wykonaj aktualizację do najnowszej wersji i spróbuj ponownie.</string>
+  <string name="intent_own_link">Otworzyłeś swój własny link. Użyj linku od kontaktu, którego chcesz dodać!</string>
+  <string name="missing_link">Proszę wprowadź link</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
+  <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Nowy kontakt dodany.</item>
+    <item quantity="few">Nowe kontakty dodane.</item>
+    <item quantity="many">Nowe kontakty dodane.</item>
+    <item quantity="other">Dodano %d nowych kontaktów.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Dodawanie tego kontaktu zajmuje więcej czasu niż zwykle</string>
+  <string name="adding_contact_slow_title">Nie można połączyć się z Kontaktem</string>
+  <string name="adding_contact_slow_text">Dodawanie tego kontaktu zajmuje więcej czasu niż zwykle.\n\nProsze sprawdź czy twój kontakt otrzymał twój link i ciebie dodał:</string>
+  <string name="offline_state">Brak połączenia z Internetem</string>
+  <string name="duplicate_link_dialog_title">Duplikat Linku</string>
+  <string name="duplicate_link_dialog_text_1">Masz już oczekujący kontakt z tym linkiem: %s</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Czy %s i %s to ta sama osoba?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Ta sama osoba</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Inna osoba</string>
+  <string name="duplicate_link_dialog_text_3">%s i %s wysłał ci ten sam link.\n\nJeden z nich może próbować odkryć, kim są twoje kontakty.\n\nNie mów im, że otrzymałeś ten sam link od kogoś innego.</string>
+  <string name="pending_contact_updated_toast">Oczekujący kontakt zaktualizowany</string>
   <!--Introductions-->
-  <string name="introduction_onboarding_title">Udostępnij swoje kontakty.</string>
-  <string name="introduction_onboarding_text">Możesz udostępniać kontakty, tak aby osoby nie musiały spotykać się osobiście.</string>
-  <string name="introduction_menu_item">Udostępnij</string>
+  <string name="introduction_onboarding_title">Przedstaw swoje kontakty.</string>
+  <string name="introduction_onboarding_text">Możesz przedstawić twoje kontakty sobie nawzajem, wtedy nie będą musiały spotykać się osobiście, żeby połączyć się w Briar</string>
+  <string name="introduction_menu_item">Wykonaj przedstawienie</string>
   <string name="introduction_activity_title">Wybierz kontakt</string>
-  <string name="introduction_not_possible">Masz już jedno udostępnianie w toku. Proszę pozwolić aby proces zakończył się. Jeśli kontakty są rzadko online, może to zabrać trochę czasu.</string>
-  <string name="introduction_message_title">Udostępnij kontakty</string>
+  <string name="introduction_not_possible">Masz już jedno przedstawienie w toku. Proszę pozwolić aby proces najpierw się zakończył. Jeśli ty, albo twoje kontakty są rzadko online, może to zabrać trochę czasu.</string>
+  <string name="introduction_message_title">Przedstaw kontakty</string>
   <string name="introduction_message_hint">Dodaj wiadomość (opcjonalne)</string>
-  <string name="introduction_button">Udostępnij</string>
-  <string name="introduction_sent">Udostępnianie zostało wysłane.</string>
-  <string name="introduction_error">Wystąpił błąd podczas udostępniania.</string>
-  <string name="introduction_response_error">Wystąpił błąd podczas odpowiedzi na udostępnienie</string>
-  <string name="introduction_request_sent">Udostępniłeś %1$s kontaktowi %2$s.</string>
-  <string name="introduction_request_received">%1$s poprosił o udostępnienie Twojego kontaktu dla %2$s. Czy chcesz dodać %2$s do listy kontaktów?</string>
-  <string name="introduction_request_exists_received">%1$s poprosił o udostępnienie Twojego kontaktu dla %2$s, ale %2$s jest już na liście Twoich kontaktów. Jednak %1$s o tym nie wie i możesz odpowiedzieć:</string>
-  <string name="introduction_request_answered_received">%1$s poprosił aby udostępnić Twój kontakt dla %2$s.</string>
-  <string name="introduction_response_accepted_sent">Zaakceptowałeś kontakt %1$s.</string>
-  <string name="introduction_response_accepted_sent_info">Zanim %1$s zostanie dodany jako Twój kontakt, musi także zaakceptować udostępnienie. To może trochę potrwać.</string>
-  <string name="introduction_response_declined_sent">Odrzuciłeś udostępnienie kontaktu do %1$s.</string>
-  <string name="introduction_response_accepted_received">%1$s zaakceptował udostępnienie kontaktu %2$s</string>
-  <string name="introduction_response_declined_received">%1$s odrzucił udostępnienie kontaktu %2$s</string>
-  <string name="introduction_response_declined_received_by_introducee">%1$s mówi, że %2$s odrzucił udostępnienie kontaktu.</string>
+  <string name="introduction_button">Wykonaj przedstawienie</string>
+  <string name="introduction_sent">Twoje przedstawienie zostało wysłane.</string>
+  <string name="introduction_error">Wystąpił błąd podczas wykonywania przedstawienia.</string>
+  <string name="introduction_response_error">Wystąpił błąd podczas odpowiedzi na przedstawienie</string>
+  <string name="introduction_request_sent">Poprosiłeś o przedstawienie %1$s kontaktowi %2$s.</string>
+  <string name="introduction_request_received">%1$s poprosił o możliwość przedstawienia Ciebie kontaktowi %2$s. Czy chcesz dodać %2$s do listy kontaktów?</string>
+  <string name="introduction_request_exists_received">%1$s poprosił o możliwość przedstawienia Ciebie kontaktowi %2$s, ale %2$s jest już na liście Twoich kontaktów. Skoro %1$s może o tym nie wiedzieć, możesz nadal odpowiedzieć:</string>
+  <string name="introduction_request_answered_received">%1$s poprosił o możliwość przedstawienia Ciebie kontaktowi %2$s.</string>
+  <string name="introduction_response_accepted_sent">Zaakceptowałeś przedstawienie kontaktowi %1$s.</string>
+  <string name="introduction_response_accepted_sent_info">Zanim %1$s zostanie dodany jako Twój kontakt, musi także zaakceptować przedstawienie. To może trochę potrwać.</string>
+  <string name="introduction_response_declined_sent">Odrzuciłeś przedstawienie dla kontaktu%1$s.</string>
+  <string name="introduction_response_accepted_received">%1$s zaakceptował przedstawienie kontaktowi %2$s</string>
+  <string name="introduction_response_declined_received">%1$s odrzucił przedstawienie kontaktowi %2$s</string>
+  <string name="introduction_response_declined_received_by_introducee">%1$s mówi, że %2$s odrzucił przedstawienie</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Brak grup do pokazania</string>
   <string name="groups_list_empty_action">Dotknij ikonkę + aby stworzyć grupę, lub poprosić kontakty o ich udostępnienie</string>
@@ -209,10 +282,10 @@
   <string name="groups_leave_dialog_message">Jesteś pewny, że chcesz opuścić tą grupę?</string>
   <string name="groups_dissolve">Rozwiąż Grupę</string>
   <string name="groups_dissolve_dialog_title">Potwierdź Rozwiązanie Grupy</string>
-  <string name="groups_dissolve_dialog_message">Czy chcesz rozwiązać tą grupę?\n\nWszyscy członkowie nie będą mogli kontynuować swoich konwersacji ani otrzymywać wiadomości.</string>
+  <string name="groups_dissolve_dialog_message">Czy chcesz rozwiązać tą grupę?\n\nPozostali członkowie nie będą mogli kontynuować swoich konwersacji oraz mogą nie otrzymać najnowszych wiadomości</string>
   <string name="groups_dissolve_button">Rozwiąż</string>
   <string name="groups_dissolved_dialog_title">Grupa Została Rozwiązana</string>
-  <string name="groups_dissolved_dialog_message">Twórca tej grupy rozwiązał ją.\n\nNie możesz już więcej pisać z członkami grupy ani czytać postów które zostały już napisane.</string>
+  <string name="groups_dissolved_dialog_message">Twórca tej grupy rozwiązał ją.\n\nNie możesz już więcej pisać wiadomości do grupy i możesz nie otrzymać wszystkich wiadomości które zostały napisane.</string>
   <!--Private Group Invitations-->
   <string name="groups_invitations_title">Zaproszenia do Grup</string>
   <string name="groups_invitations_invitation_sent">Zaprosiłeś %1$s aby dołączył do grupy \"%2$s\".</string>
@@ -229,16 +302,16 @@
   <string name="groups_invitations_response_declined_sent">Odrzuciłeś zaproszenie do grupy od %s.</string>
   <string name="groups_invitations_response_accepted_received">%s przyjął zaproszenie do grupy.</string>
   <string name="groups_invitations_response_declined_received">%s odrzucił zaproszenie do grupy.</string>
-  <string name="sharing_status_groups">Tylko osoba która utworzyła grupę może zapraszać nowych użytkowników do grupy. Poniżej są osoby, które dołączyły do grupy.</string>
+  <string name="sharing_status_groups">Tylko osoba która utworzyła grupę może zapraszać nowych użytkowników do grupy. Poniżej są wszyscy aktualni członkowie grupy.</string>
   <!--Private Groups Revealing Contacts-->
   <string name="groups_reveal_contacts">Ujawnij kontakty</string>
   <string name="groups_reveal_dialog_message">Możesz wybrać czy chcesz ujawnić kontakty dla wszystkich aktualnych i przyszłych członków tej grupy.\n\nUjawnienie kontaktów sprawia że połączenie do grupy jest szybsze i bardziej stabilne, ponieważ możesz komunikować się z ujawnionymi kontaktami nawet wtedy kiedy twórca grupy jest offline.</string>
   <string name="groups_reveal_visible">Powiązanie kontaktów jest widoczne dla grupy</string>
   <string name="groups_reveal_visible_revealed_by_us">Relacje kontaktów są widoczne dla grupy (ujawnione przez Ciebie)</string>
   <string name="groups_reveal_visible_revealed_by_contact">Relacje kontaktów są widoczne dla grupy (ujawnione przez %s)</string>
-  <string name="groups_reveal_invisible">Relacje kontaktów są nie widoczne dla grupy</string>
+  <string name="groups_reveal_invisible">Relacje kontaktów są niewidoczne dla grupy</string>
   <!--Forums-->
-  <string name="no_forums">Brak for do pokazania</string>
+  <string name="no_forums">Brak forów do pokazania</string>
   <string name="no_forums_action">Dotknij ikonkę + aby stworzyć forum, lub poprosić kontakty o ich udostępnienie</string>
   <string name="create_forum_title">Stwórz Forum</string>
   <string name="choose_forum_hint">Wybierz nazwę dla swojego forum</string>
@@ -257,7 +330,7 @@
   <string name="btn_reply">Odpowiedz</string>
   <string name="forum_leave">Opuść Forum</string>
   <string name="dialog_title_leave_forum">Potwierdź Opuszczenie Forum</string>
-  <string name="dialog_message_leave_forum">Jesteś pewny, że chcesz opuścić to forum?\n\nWszystkie kontakty którym udostępniłeś to forum mogą przestać otrzymywać powiadomienia.</string>
+  <string name="dialog_message_leave_forum">Jesteś pewny, że chcesz opuścić to forum?\n\nWszystkie kontakty którym udostępniłeś to forum mogą przestać otrzymywać uaktualnienia postów</string>
   <string name="dialog_button_leave">Opuść</string>
   <string name="forum_left_toast">Opuścił/a Forum</string>
   <!--Forum Sharing-->
@@ -271,7 +344,7 @@
   <string name="forum_share_error">Wystąpił problem podczas udostępniania tego forum.</string>
   <string name="forum_invitation_received">%1$s udostępnił Ci forum \"%2$s\"</string>
   <string name="forum_invitation_sent">Udostępniłeś forum \"%1$s\" użytkownikowi %2$s.</string>
-  <string name="forum_invitations_title">Zaproszenia do for</string>
+  <string name="forum_invitations_title">Zaproszenia do forów</string>
   <string name="forum_invitation_exists">Już zaakceptowałeś zaproszenie do tego forum.\n\nAkceptowanie większej ilości zaproszeń sprawi, że Twoje połączenie będzie szybsze i bardziej stabilne.</string>
   <string name="forum_joined_toast">Dołączył do forum</string>
   <string name="forum_declined_toast">Zaproszenie odrzucone</string>
@@ -299,11 +372,11 @@
   <string name="blogs_publish_blog_post">Opublikuj</string>
   <string name="blogs_blog_post_created">Wpis na Bloga Utworzony</string>
   <string name="blogs_blog_post_received">Otrzymano Nowy Wpis z Bloga</string>
-  <string name="blogs_blog_post_scroll_to">Przewiń Do</string>
+  <string name="blogs_blog_post_scroll_to">Przewiń do</string>
   <string name="blogs_feed_empty_state">Brak postów do pokazania</string>
-  <string name="blogs_feed_empty_state_action">Posty twoich od Twoich kontaktów i blogów które subskrybujesz pojawią się tutaj\n\nDotknij ikonki długopisu aby napisać post</string>
+  <string name="blogs_feed_empty_state_action">Postyod Twoich kontaktów i blogów które subskrybujesz pojawią się tutaj\n\nDotknij ikonki długopisu aby napisać post</string>
   <string name="blogs_remove_blog">Usuń Blog</string>
-  <string name="blogs_remove_blog_dialog_message">Jesteś pewny, że chcesz usunąć ten blog?\n\nPosty będą usunięte z Twojego urządzenia ale nie z urządzeń innych osób.\n\nWszystkie kontakty którym udostępniłeś ten blog mogą przestać otrzymywać powiadomienia.</string>
+  <string name="blogs_remove_blog_dialog_message">Jesteś pewny, że chcesz usunąć ten blog?\n\nPosty będą usunięte z Twojego urządzenia ale nie z urządzeń innych osób.\n\nWszystkie kontakty którym udostępniłeś ten blog mogą przestać otrzymywać aktualizacje postów.</string>
   <string name="blogs_remove_blog_ok">Usuń</string>
   <string name="blogs_blog_removed">Blog usunięty</string>
   <string name="blogs_reblog_comment_hint">Dodaj komentarz (opcjonalne)</string>
@@ -324,25 +397,25 @@
   <string name="blogs_sharing_declined_toast">Zaproszenie odrzucone</string>
   <string name="sharing_status_blog">Każdy kto subskrybuje blog może go udostępnić swoim kontaktom. Udostępniasz ten blog następującym kontaktom. Mogą być tu także subskrybenci których nie możesz zobaczyć.</string>
   <!--RSS Feeds-->
-  <string name="blogs_rss_feeds_import">Zaimportuj RSS</string>
+  <string name="blogs_rss_feeds_import">Zaimportuj kanał RSS</string>
   <string name="blogs_rss_feeds_import_button">Zaimportuj</string>
-  <string name="blogs_rss_feeds_import_hint">Wprowadź adres URL do RSS</string>
-  <string name="blogs_rss_feeds_import_error">Wystąpił błąd podczas importowania.</string>
-  <string name="blogs_rss_feeds_manage">Zarządzaj RSS</string>
+  <string name="blogs_rss_feeds_import_hint">Wprowadź adres URL do kanału RSS</string>
+  <string name="blogs_rss_feeds_import_error">Przepraszamy! Wystąpił błąd podczas importowania twojego kanału RSS</string>
+  <string name="blogs_rss_feeds_manage">Zarządzaj kanałami RSS</string>
   <string name="blogs_rss_feeds_manage_imported">Zaimportowane:</string>
   <string name="blogs_rss_feeds_manage_author">Autor:</string>
   <string name="blogs_rss_feeds_manage_updated">Ostatnio Zaktualizowane:</string>
-  <string name="blogs_rss_remove_feed">Usuń RSS</string>
-  <string name="blogs_rss_remove_feed_dialog_message">Jesteś pewny, że chcesz usunąć tą tablicę?\n\nPosty będą usunięte z Twojego urządzenia ale nie z urządzeń innych ludzi.\n\nWszystkie kontakty którym udostępniłeś ten blog mogą przestać otrzymywać powiadomienia.</string>
+  <string name="blogs_rss_remove_feed">Usuń kanał RSS</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Jesteś pewny, że chcesz usunąć ten kanał RSS?\n\nPosty będą usunięte z Twojego urządzenia, ale nie z urządzeń innych ludzi.\n\nWszystkie kontakty którym udostępniłeś ten kanał mogą przestać otrzymywać jego uaktualnienia</string>
   <string name="blogs_rss_remove_feed_ok">Usuń</string>
   <string name="blogs_rss_feeds_manage_delete_error">Kanał nie mógł zostać usunięty!</string>
-  <string name="blogs_rss_feeds_manage_empty_state">Brak RSS do wyświetlenia\n\nDotknij ikonki + aby zaimportować</string>
-  <string name="blogs_rss_feeds_manage_error">Wystąpił problem podczas ładowania twoich RSS. Proszę spróbować ponownie.</string>
+  <string name="blogs_rss_feeds_manage_empty_state">Brak RSS do wyświetlenia\n\nDotknij ikonki + aby zaimportować kanał.</string>
+  <string name="blogs_rss_feeds_manage_error">Wystąpił problem podczas ładowania twoich kanałów RSS. Proszę spróbować ponownie później.</string>
   <!--Settings Display-->
   <string name="pref_language_title">Język &amp; region</string>
-  <string name="pref_language_changed">Aby zastosować ustawienia musisz zrestartować Briar. Proszę się wylogować i zrestartować Briar.</string>
+  <string name="pref_language_changed">Te ustawienia zostaną zastosowane gdy zrestartujesz Briar. Proszę się wylogować i zrestartować Briar.</string>
   <string name="pref_language_default">Domyślny systemu</string>
-  <string name="display_settings_title">Wyświetl</string>
+  <string name="display_settings_title">Wyświetlacz</string>
   <string name="pref_theme_title">Motyw</string>
   <string name="pref_theme_light">Jasny</string>
   <string name="pref_theme_dark">Ciemny</string>
@@ -352,7 +425,7 @@
   <string name="network_settings_title">Sieci</string>
   <string name="bluetooth_setting">Połącz przez Bluetooth</string>
   <string name="bluetooth_setting_enabled">Zawsze wtedy gdy kontakty są w pobliżu</string>
-  <string name="bluetooth_setting_disabled">Tylko gdy dodaję kontakty</string>
+  <string name="bluetooth_setting_disabled">Tylko przy dodawaniu kontaktów</string>
   <string name="tor_network_setting">Połącz przez Internet (Tor)</string>
   <string name="tor_network_setting_automatic">Automatycznie bazując na lokalizacji</string>
   <string name="tor_network_setting_without_bridges">Używaj Tor bez mostów</string>
@@ -361,10 +434,14 @@
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
   <string name="tor_network_setting_summary">Automatycznie: %1$s (za %2$s)</string>
   <string name="tor_mobile_data_title">Używaj danych komórkowych</string>
+  <string name="tor_only_when_charging_title">Łącz przez Internet (Tor) tylko podczas ładowania</string>
+  <string name="tor_only_when_charging_summary">Wyłącza połączenie Internetowe, gdy urządzenie pracuje na baterii</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Bezpieczeństwo</string>
+  <string name="pref_lock_title">Blokada aplikacji</string>
   <string name="pref_lock_summary">Użyj blokady ekranu urządzenia by chronić Briar gdy zalogowany</string>
   <string name="pref_lock_disabled_summary">Aby użyć tej funkcji skonfiguruj blokadę ekranu na swoim urządzeniu</string>
+  <string name="pref_lock_timeout_title">Blokada aplikacji po czasie bezczynności</string>
   <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
   <string name="pref_lock_timeout_summary">Gdy nie używam Briar, automatycznie zablokuj po %s</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
@@ -388,17 +465,18 @@
   <string name="panic_setting_title">Przycisk wyjścia awaryjnego</string>
   <string name="panic_setting_hint">Skonfiguruj jak Briar ma zareagować gdy wciśniesz przycisk wyjścia awaryjnego</string>
   <string name="panic_app_setting_title">Aplikacja Przycisku Wyjścia Awaryjnego</string>
-  <string name="unknown_app">nie znana aplikacja</string>
+  <string name="unknown_app">nieznana aplikacja</string>
   <string name="panic_app_setting_summary">Żadna aplikacja nie została ustawiona</string>
   <string name="panic_app_setting_none">Brak</string>
   <string name="dialog_title_connect_panic_app">Potwierdź Awaryjną Aplikację</string>
   <string name="dialog_message_connect_panic_app">Czy na pewno chcesz pozwolić %1$s aby działała jako przycisk wyjścia awaryjnego?</string>
+  <string name="panic_setting_destructive_action">Działania Destrukcyjne</string>
   <string name="panic_setting_signout_title">Wyloguj się</string>
-  <string name="panic_setting_signout_summary">Wyloguj się z Briar jeśli przycisk zostanie wciśnięty</string>
+  <string name="panic_setting_signout_summary">Wyloguj się z Briar jeśli przycisk awaryjny zostanie wciśnięty</string>
   <string name="purge_setting_title">Skasuj Konto</string>
   <string name="purge_setting_summary">Skasuj Twoje konto Briar jeśli przycisk wyjścia awaryjnego zostanie wciśnięty. Ostrzeżenie: Ta akcja usunie permanentnie Twoje konto, kontakty i wiadomości</string>
   <string name="uninstall_setting_title">Odinstaluj Briar</string>
-  <string name="uninstall_setting_summary">To wymaga manualnego potwierdzenia w przypadku aktywowania</string>
+  <string name="uninstall_setting_summary">To wymaga manualnego potwierdzenia w przypadku aktywowania procedury awaryjnej</string>
   <!--Settings Notifications-->
   <string name="notification_settings_title">Powiadomienia</string>
   <string name="notify_sign_in_title">Przypomnij mi by się zalogować</string>
@@ -407,14 +485,14 @@
   <string name="notify_private_messages_setting_summary">Pokaż powiadomienia dla prywatnych wiadomości</string>
   <string name="notify_private_messages_setting_summary_26">Skonfiguruj powiadomienia dla prywatnych wiadomości</string>
   <string name="notify_group_messages_setting_title">Wiadomości grupowe</string>
-  <string name="notify_group_messages_setting_summary">Pokaż powiadomienia dla aplikacji grupowych</string>
+  <string name="notify_group_messages_setting_summary">Pokaż powiadomienia dla wiadomości grupowych</string>
   <string name="notify_group_messages_setting_summary_26">Skonfiguruj powiadomienia dla wiadomości grupowych</string>
   <string name="notify_forum_posts_setting_title">Posty na forum</string>
-  <string name="notify_forum_posts_setting_summary">Pokazuj powiadomienia dla postów w forach</string>
-  <string name="notify_forum_posts_setting_summary_26">Skonfiguruj powiadomienia dla postów w forach</string>
+  <string name="notify_forum_posts_setting_summary">Pokazuj powiadomienia dla postów na forach</string>
+  <string name="notify_forum_posts_setting_summary_26">Skonfiguruj powiadomienia dla postów na forach</string>
   <string name="notify_blog_posts_setting_title">Wpisy na blogach</string>
   <string name="notify_blog_posts_setting_summary">Pokazuj powiadomienia dla wpisów na blogach</string>
-  <string name="notify_blog_posts_setting_summary_26">Skonfiguruj alerty dla wpisów na blogach</string>
+  <string name="notify_blog_posts_setting_summary_26">Skonfiguruj powiadomienia dla wpisów na blogach</string>
   <string name="notify_vibration_setting">Wibruj</string>
   <string name="notify_sound_setting">Dźwięk</string>
   <string name="notify_sound_setting_default">Domyślny dzwonek</string>
@@ -422,25 +500,26 @@
   <string name="choose_ringtone_title">Wybierz dzwonek</string>
   <string name="cannot_load_ringtone">Nie mogę załadować dzwonka</string>
   <!--Settings Feedback-->
-  <string name="feedback_settings_title">Wsparcie</string>
-  <string name="send_feedback">Wyślij wsparcie</string>
+  <string name="feedback_settings_title">Twoja opinia</string>
+  <string name="send_feedback">Wyślij opinię</string>
   <!--Link Warning-->
-  <string name="link_warning_title">Uważaj na link</string>
-  <string name="link_warning_intro">Otwierasz link w zewnętrznej aplikacji.</string>
+  <string name="link_warning_title">Ostrzeżenie o linku</string>
+  <string name="link_warning_intro">Zaraz otworzysz następujący link w zewnętrznej aplikacji.</string>
+  <string name="link_warning_text">Może to posłużyć do twojej identyfikacji. Zastanów się czy ufasz osobie która wysłała Ci ten link i rozważ otwarcie go za pomocą Przeglądarki Tor.</string>
   <string name="link_warning_open_link">Otwórz Link</string>
   <!--Crash Reporter-->
-  <string name="crash_report_title">Zgłoś błąd w Briar</string>
-  <string name="briar_crashed">Przepraszamy, wystąpił błąd w Briar</string>
+  <string name="crash_report_title">Zgłoś awarię w Briar</string>
+  <string name="briar_crashed">Przepraszamy, wystąpił awaria w Briar</string>
   <string name="not_your_fault">To nie Twoja wina.</string>
-  <string name="please_send_report">Proszę pomóż nam ulepszać Briar wysyłając raport z usterki.</string>
-  <string name="report_is_encrypted">Raport z usterki jest zaszyfrowany i wysyłany bezpiecznie.</string>
-  <string name="feedback_title">Wsparcie</string>
+  <string name="please_send_report">Proszę pomóż nam ulepszać Briar wysyłając raport z awarii.</string>
+  <string name="report_is_encrypted">Obiecujemy, że raport z awarii jest zaszyfrowany i wysyłany bezpiecznie.</string>
+  <string name="feedback_title">Twoja opinia</string>
   <string name="describe_crash">Opisz co się stało (opcjonalne)</string>
   <string name="enter_feedback">Wprowadź swoje uwagi</string>
   <string name="optional_contact_email">Twój adres email (opcjonalne)</string>
-  <string name="include_debug_report_crash">Załącz anonimowe dane na temat usterki</string>
+  <string name="include_debug_report_crash">Załącz anonimowe dane na temat awarii</string>
   <string name="include_debug_report_feedback">Załącz anonimowe dane o tym urządzeniu</string>
-  <string name="could_not_load_report_data">Nie można było załadować danych.</string>
+  <string name="could_not_load_report_data">Nie można było załadować danych raportu.</string>
   <string name="send_report">Wyślij raport</string>
   <string name="close">Zamknij</string>
   <string name="dev_report_saved">Raport zapisany. Zostanie wysłany następnym razem kiedy zalogujesz się do Briar.</string>
@@ -448,27 +527,36 @@
   <string name="progress_title_logout">Wylogowywanie z Briar...</string>
   <!--Screen Filters & Tapjacking-->
   <string name="screen_filter_title">Wykryto nakładkę na ekran</string>
-  <string name="screen_filter_body">Inna aplikacja jest rysowana nad Briar. Aby bronić Twoje bezpieczeństwo, Briar nie będzie odpowiadał na dotyk gdy inna aplikacja jest rysowana nad nim.\n\nNastępujące aplikacje mogą być przyczyną:\n\n%1$s</string>
+  <string name="screen_filter_body">Inna aplikacja jest rysowana nad Briar. Aby bronić Twoje bezpieczeństwo, Briar nie będzie odpowiadał na dotyk gdy inna aplikacja jest rysowana nad nim.\n\nNastępujące aplikacje mogą wyświetlać nad nim:\n\n%1$s</string>
   <string name="screen_filter_allow">Pozwól tym aplikacjom na pozostanie na pierwszym planie</string>
   <!--Permission Requests-->
   <string name="permission_camera_title">Dostęp do aparatu</string>
-  <string name="permission_camera_request_body">Aby zeskanować kod QR, Briar potrzebuje mieć dostęp do aparatu.</string>
+  <string name="permission_camera_request_body">Aby zeskanować kod QR, Briar potrzebuje dostępu do aparatu.</string>
+  <string name="permission_location_title">Zezwolenie na lokalizację </string>
+  <string name="permission_location_request_body">Aby odkryć urządzenia Bluetooth, Briar potrzebuje zezwolenia na dostęp do twojej lokalizacji.\n\nBriar nie przechowuje twojej lokalizacji ani nie udostępnia jej nikomu.</string>
   <string name="permission_camera_location_title">Kamera i lokalizacja</string>
-  <string name="permission_camera_denied_body">Odmówiłeś dostępu do kamery, lecz dodawanie kontaktów tego wymaga.\n\nProszę udzielić dostępu.</string>
+  <string name="permission_camera_location_request_body">Aby zeskanować kod QR, Briar potrzebuje dostępu do kamery.\n\nAby odkryć urządzenia Bluetooth, Briar potrzebuje zezwolenia na dostęp do Twojej lokalizacji.\n\nBriar nie przechowuje Twojej lokalizacji ani nie udostępnia jej nikomu.</string>
+  <string name="permission_camera_denied_body">Odmówiłeś dostępu do aparatu, lecz dodawanie kontaktów wymaga jego użycia.\n\nProszę rozważyć udzielenie dostępu do aparatu</string>
   <string name="qr_code">Kod QR</string>
   <string name="show_qr_code_fullscreen">Pokaż QR na pełnym ekranie</string>
   <!--App Locking-->
   <string name="lock_unlock">Odblokuj Briar</string>
   <string name="lock_unlock_verbose">Wprowadź PIN swojego urządzenia, wzór lub hasło aby odblokować Briar</string>
-  <string name="lock_unlock_fingerprint_description">Dotknij czytnika linii papilarnych zapisanym odciskiem palca.</string>
+  <string name="lock_unlock_fingerprint_description">Dotknij czytnika linii papilarnych zarejestrowanym odciskiem palca aby kontynuować. </string>
   <string name="lock_unlock_password">Użyj hasła</string>
   <string name="lock_is_locked">Briar jest zablokowany</string>
   <string name="lock_tap_to_unlock">Dotknij by odblokować</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_alice">Alicja</string>
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_bob">Janusz</string>
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_carol">Grażyna</string>
   <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
+  <string name="screenshot_message_1">Hej Janusz!</string>
   <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
+  <string name="screenshot_message_2">Hej Alicja! Dzięki za opowiedzenie mi o Briarze!</string>
   <!--This is a message to be used in screenshots.-->
+  <string name="screenshot_message_3">Nie ma sprawy, mam nadzieję, że ci się podoba 😀</string>
 </resources>

briar-android/src/main/res/values-pt-rBR/strings.xml

@@ -116,15 +116,32 @@
   <string name="date_no_private_messages">Sem Mensagens</string>
   <string name="no_private_messages">Nenhuma mensagem para ser exibida</string>
   <string name="message_hint">Digite a mensagem</string>
+  <string name="image_caption_hint">Adicione uma legenda (opcional)</string>
+  <string name="image_attach">Anexar imagem</string>
+  <string name="image_attach_error">Não foi possível anexar imagem(s)</string>
+  <string name="image_attach_error_too_big">Imagem muito grande. O limite é de %dMB. </string>
+  <string name="image_attach_error_invalid_mime_type">Formato da imagem não suportado: %s</string>
+  <string name="set_contact_alias">Alterar nome do contato</string>
   <string name="set_contact_alias_hint">Nome de contato</string>
   <string name="set_alias_button">Trocar</string>
+  <string name="dialog_title_not_all_messages_deleted">Não foi possível apagar todas as mensagens</string>
   <string name="delete_contact">Apagar contato</string>
   <string name="dialog_title_delete_contact">Confirmar remoção do contato</string>
   <string name="dialog_message_delete_contact">Você tem certeza que quer remover este contato e todas mensagens trocadas com ele?</string>
   <string name="contact_deleted_toast">Contato apagado</string>
   <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
   <string name="you">Você</string>
+  <string name="save_image">Salvar imagem</string>
+  <string name="dialog_title_save_image">Salvar imagem?</string>
+  <string name="dialog_message_save_image">Salvando essa imagem irá permitir que outros aplicativos a acessem.\n\nVocê tem certeza que quer salvar? </string>
+  <string name="save_image_success">Imagem salva</string>
+  <string name="save_image_error">Não foi possível salvar imagem</string>
+  <string name="dialog_title_no_image_support">Imagens indisponíveis</string>
+  <string name="dialog_message_no_image_support">Seu contato do Briar ainda não suporta anexo de imagens. Quando ele atualizar  um você verá ícone diferente.</string>
+  <string name="dialog_title_image_support">Você agora pode enviar imagens para esse contato</string>
+  <string name="dialog_message_image_support">Toque nesse ícone para anexar imagens.</string>
   <!--Adding Contacts-->
+  <string name="add_contact_title">Adicionar contato que está próximo</string>
   <string name="face_to_face">Você deve estar frente-a-frente com a pessoa que deseja adicionar como contato.\n\nIsso evita que alguém se passe por você ou leia suas mensagens no futuro.</string>
   <string name="continue_button">Continuar</string>
   <string name="try_again_button">Tente novamente</string>
@@ -142,15 +159,66 @@
   <string name="connection_error_explanation">Por favor. certifique se ambos estão conectados na mesma rede Wi-Fi.</string>
   <string name="connection_error_feedback">Se o problema persistir, for favor <a href="feedback">enviar feedback</a> para nós ajudar a melhor o app.</string>
   <!--Adding Contacts Remotely-->
+  <string name="add_contact_remotely_title_case">Adicionar contato à distância</string>
+  <string name="add_contact_nearby_title">Adicionar contato que está próximo</string>
+  <string name="add_contact_remotely_title">Adicionar contato à distância</string>
+  <string name="contact_name_hint">De um apelido ao contato</string>
+  <string name="contact_link_intro">Insira o link do seu contato aqui</string>
+  <string name="contact_link_hint">Link do contato</string>
   <string name="paste_button">Colar</string>
+  <string name="add_contact_button">Adicionar contato</string>
   <string name="copy_button">Copiar</string>
   <string name="share_button">Compartilhar</string>
+  <string name="send_link_title">Passem os links</string>
+  <string name="add_contact_choose_nickname">Escolha um apelido</string>
+  <string name="add_contact_choose_a_nickname">Insira um apelido</string>
+  <string name="nickname_intro">De um apelido ao contato. Somente você pode vê-lo. </string>
+  <string name="your_link">Passe esse link para o contato que você quer adicionar</string>
+  <string name="link_clip_label">Link Briar</string>
+  <string name="link_copied_toast">Link copiado</string>
+  <string name="adding_contact_error">Ocorreu um erro ao adicionar o contato.</string>
+  <string name="pending_contact_requests_snackbar">Existem solicitações de contato pendentes</string>
+  <string name="pending_contact_requests">Solicitações de contatos pendentes</string>
+  <string name="no_pending_contacts">Sem contatos pendentes</string>
   <string name="add_contact_remote_connecting">Conectando...</string>
+  <string name="waiting_for_contact_to_come_online">Esperando pelo usuário estar online ...</string>
   <string name="connecting">Conectando...</string>
+  <string name="adding_contact">Adicionando contato ...</string>
+  <string name="adding_contact_failed">Adicionar o contato falhou</string>
+  <string name="dialog_title_remove_pending_contact">Confirme a remoção </string>
+  <string name="dialog_message_remove_pending_contact">Esse contato ainda está sendo adicionado. Se você removê-lo agora, o mesmo não será adicionado</string>
+  <string name="own_link_error">Insira o link do seu contato, não seu próprio  </string>
+  <string name="nickname_missing">Por favor insira um apelido</string>
+  <string name="invalid_link">Link invalido</string>
+  <string name="unsupported_link">Esse link veio de uma versão mais recente do Briar. Por favor atualize para versão mais recente e tente novamente </string>
+  <string name="intent_own_link">Você abriu seu próprio link. Utilize o link do contato que quer adicionar!</string>
+  <string name="missing_link">Por favor insira um link</string>
   <!--This is a numeral indicating the first step in a series of screens-->
   <string name="step_1">1</string>
   <!--This is a numeral indicating the second step in a series of screens-->
   <string name="step_2">2</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">Novo contato adicionado.</item>
+    <item quantity="other">%dnovos contados adicionados.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Adicionar este contato está demorando mais que o normal</string>
+  <string name="adding_contact_slow_title">Não foi possível conectar ao contato </string>
+  <string name="adding_contact_slow_text">Adicionar este contato está demorando mais que o normal.\n\nPor favor se certifique que o seu contato recebeu seu link e adicionou você: </string>
+  <string name="offline_state">Sem conexão à Internet</string>
+  <string name="duplicate_link_dialog_title">Link duplicado</string>
+  <string name="duplicate_link_dialog_text_1">Você já tem um contato pendente com esse link: %s </string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%s e %s são a mesma pessoa?</string>
+  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
+	string will be used in a dialog button, so if the translation of this string is longer than 20
+	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
+  <string name="same_person_button">Mesma pessoa</string>
+  <!--This is a button for answering that two nicknames refer to different people. This string
+	will be used in a dialog button, so if the translation of this string longer than 20 characters,
+	please use "No" instead, and use "Yes" for the "Same Person" button-->
+  <string name="different_person_button">Pessoa diferente</string>
+  <string name="duplicate_link_dialog_text_3">%s e %s te enviaram o mesmo link.\n\nUm deles talvez esteja tentando descobrir quem são seus contatos.\n\nNão conte pra eles que recebeu o mesmo link de outra pessoa.</string>
+  <string name="pending_contact_updated_toast">Contato pendente atualizado</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Apresente seus contatos</string>
   <string name="introduction_onboarding_text">Você pode apresentar seus contatos entre si, assim eles não precisam se encontrar pessoalmente para se comunicar no Briar.</string>
@@ -346,6 +414,8 @@
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
   <string name="tor_network_setting_summary">Automático: %1$s (em %2$s) </string>
   <string name="tor_mobile_data_title">Usar dados moveis</string>
+  <string name="tor_only_when_charging_title">Conectar via Internet (Tor) apenas enquanto carregando</string>
+  <string name="tor_only_when_charging_summary">Desabilita conexão à Internet quando seu dispositivo estiver somente na bateria</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Segurança</string>
   <string name="pref_lock_title">Bloqueio de app</string>
@@ -415,6 +485,7 @@
   <!--Link Warning-->
   <string name="link_warning_title">Aviso sobre Link</string>
   <string name="link_warning_intro">Você está prestes a abrir esse link em um Aplicativo Externo.</string>
+  <string name="link_warning_text">Isso pode ser usado para identificar você. Pense sobre se quer ou não confiar na pessoa que te enviou esse link e considere abrindo o no Tor Browser</string>
   <string name="link_warning_open_link">Abrir Link</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Relatório de falhas do Briar</string>