Merge branch 'master' into '1636-compression-failure'

# Conflicts: # bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
2026-02-12 10:49:06 +01:00 · 2020-01-08 15:27:01 +00:00
parent 26144c18d8 dd3c909b31
commit 5af7bbb24d
43 changed files with 597 additions and 320 deletions
--- a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
@@ -6,15 +6,25 @@ import android.content.Context;
 import android.os.Build;
 import android.provider.Settings;

+import org.briarproject.bramble.api.Pair;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
 import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

+import javax.annotation.Nullable;
+
 import static android.content.Context.MODE_PRIVATE;
 import static android.os.Build.VERSION.SDK_INT;
 import static java.util.Arrays.asList;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;

+@NotNullByDefault
 public class AndroidUtils {

 	// Fake Bluetooth address returned by BluetoothAdapter on API 23 and later
@@ -22,7 +32,6 @@ public class AndroidUtils {

 	private static final String STORED_REPORTS = "dev-reports";

-	@SuppressWarnings("deprecation")
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
 		if (SDK_INT >= 21) {
@@ -36,24 +45,64 @@ public class AndroidUtils {

 	public static String getBluetoothAddress(Context ctx,
 			BluetoothAdapter adapter) {
+		return getBluetoothAddressAndMethod(ctx, adapter).getFirst();
+	}
+
+	public static Pair<String, String> getBluetoothAddressAndMethod(Context ctx,
+			BluetoothAdapter adapter) {
 		// Return the adapter's address if it's valid and not fake
 		@SuppressLint("HardwareIds")
 		String address = adapter.getAddress();
-		if (isValidBluetoothAddress(address)) return address;
+		if (isValidBluetoothAddress(address)) {
+			return new Pair<>(address, "adapter");
+		}
 		// Return the address from settings if it's valid and not fake
 		address = Settings.Secure.getString(ctx.getContentResolver(),
 				"bluetooth_address");
-		if (isValidBluetoothAddress(address)) return address;
+		if (isValidBluetoothAddress(address)) {
+			return new Pair<>(address, "settings");
+		}
+		// Try to get the address via reflection
+		address = getBluetoothAddressByReflection(adapter);
+		if (isValidBluetoothAddress(address)) {
+			return new Pair<>(requireNonNull(address), "reflection");
+		}
 		// Let the caller know we can't find the address
-		return "";
+		return new Pair<>("", "");
 	}

-	private static boolean isValidBluetoothAddress(String address) {
+	private static boolean isValidBluetoothAddress(@Nullable String address) {
 		return !StringUtils.isNullOrEmpty(address)
 				&& BluetoothAdapter.checkBluetoothAddress(address)
 				&& !address.equals(FAKE_BLUETOOTH_ADDRESS);
 	}

+	@Nullable
+	private static String getBluetoothAddressByReflection(
+			BluetoothAdapter adapter) {
+		try {
+			Field mServiceField =
+					adapter.getClass().getDeclaredField("mService");
+			mServiceField.setAccessible(true);
+			Object mService = mServiceField.get(adapter);
+			// mService may be null when Bluetooth is disabled
+			if (mService == null) throw new NoSuchFieldException();
+			Method getAddressMethod =
+					mService.getClass().getMethod("getAddress");
+			return (String) getAddressMethod.invoke(mService);
+		} catch (NoSuchFieldException e) {
+			return null;
+		} catch (IllegalAccessException e) {
+			return null;
+		} catch (NoSuchMethodException e) {
+			return null;
+		} catch (InvocationTargetException e) {
+			return null;
+		} catch (SecurityException e) {
+			return null;
+		}
+	}
+
 	public static File getReportDir(Context ctx) {
 		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
 	}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
@@ -6,6 +6,4 @@ package org.briarproject.bramble.api;
 public interface FeatureFlags {

 	boolean shouldEnableImageAttachments();
-
-	boolean shouldEnablePrivateMessageDeletion();
 }
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java
@@ -18,17 +18,6 @@ public class BrambleCoreIntegrationTestModule {

 	@Provides
 	FeatureFlags provideFeatureFlags() {
-		return new FeatureFlags() {
-
-			@Override
-			public boolean shouldEnableImageAttachments() {
-				return true;
-			}
-
-			@Override
-			public boolean shouldEnablePrivateMessageDeletion() {
-				return true;
-			}
-		};
+		return () -> true;
 	}
 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
@@ -235,17 +235,6 @@ public class AppModule {

 	@Provides
 	FeatureFlags provideFeatureFlags() {
-		return new FeatureFlags() {
-
-			@Override
-			public boolean shouldEnableImageAttachments() {
-				return IS_DEBUG_BUILD;
-			}
-
-			@Override
-			public boolean shouldEnablePrivateMessageDeletion() {
-				return IS_DEBUG_BUILD;
-			}
-		};
+		return () -> IS_DEBUG_BUILD;
 	}
 }
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -270,9 +270,7 @@ public class ConversationActivity extends BriarActivity
 		ConversationScrollListener scrollListener =
 				new ConversationScrollListener(adapter, viewModel);
 		list.getRecyclerView().addOnScrollListener(scrollListener);
-		if (featureFlags.shouldEnablePrivateMessageDeletion()) {
-			addSelectionTracker();
-		}
+		addSelectionTracker();

 		textInputView = findViewById(R.id.text_input_container);
 		if (featureFlags.shouldEnableImageAttachments()) {
@@ -378,11 +376,6 @@ 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) {
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
@@ -7,15 +7,13 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.Settings;

 import org.acra.builder.ReportBuilder;
 import org.acra.builder.ReportPrimer;
-import org.briarproject.bramble.util.StringUtils;
+import org.briarproject.bramble.api.Pair;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.android.BriarApplication;
 import org.briarproject.briar.android.logging.BriefLogFormatter;
@@ -23,7 +21,6 @@ import org.briarproject.briar.android.logging.BriefLogFormatter;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -43,8 +40,12 @@ import static android.content.Context.WIFI_SERVICE;
 import static android.net.ConnectivityManager.TYPE_MOBILE;
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED;
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Collections.unmodifiableMap;
+import static org.briarproject.bramble.util.AndroidUtils.getBluetoothAddressAndMethod;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubInetAddress;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;

 public class BriarReportPrimer implements ReportPrimer {

@@ -195,63 +196,53 @@ public class BriarReportPrimer implements ReportPrimer {

 			// Is Bluetooth available?
 			BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
-			boolean btAvailable = bt != null;
-			// Is Bluetooth enabled?
-			boolean btEnabled = bt != null && bt.isEnabled() &&
-					!StringUtils.isNullOrEmpty(bt.getAddress());
-			// Is Bluetooth connectable?
-			boolean btConnectable = bt != null &&
-					(bt.getScanMode() == SCAN_MODE_CONNECTABLE ||
-							bt.getScanMode() ==
-									SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-			// Is Bluetooth discoverable?
-			boolean btDiscoverable = bt != null &&
-					bt.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE;
-			// Is Bluetooth LE scanning and advertising supported?
-			boolean btLeApi = false, btLeScan = false, btLeAdvertise = false;
-			if (bt != null && Build.VERSION.SDK_INT >= 21) {
-				btLeApi = true;
-				btLeScan = bt.getBluetoothLeScanner() != null;
-				btLeAdvertise = bt.getBluetoothLeAdvertiser() != null;
-			}
+			if (bt == null) {
+				customData.put("Bluetooth status", "Not available");
+			} else {
+				// Is Bluetooth enabled?
+				boolean btEnabled = bt.isEnabled()
+						&& !isNullOrEmpty(bt.getAddress());
+				// Is Bluetooth connectable?
+				int scanMode = bt.getScanMode();
+				boolean btConnectable = scanMode == SCAN_MODE_CONNECTABLE ||
+						scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE;
+				// Is Bluetooth discoverable?
+				boolean btDiscoverable =
+						scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE;

-			String btStatus;
-			if (btAvailable) btStatus = "Available, ";
-			else btStatus = "Not available, ";
-			if (btEnabled) btStatus += "enabled, ";
-			else btStatus += "not enabled, ";
-			if (btConnectable) btStatus += "connectable, ";
-			else btStatus += "not connectable, ";
-			if (btDiscoverable) btStatus += "discoverable";
-			else btStatus += "not discoverable";
-			customData.put("Bluetooth status", btStatus);
-			if (btLeApi) {
-				String btLeStatus;
-				if (btLeScan) btLeStatus = "Scanning, ";
-				else btLeStatus = "No scanning, ";
-				if (btLeAdvertise) btLeStatus += "advertising";
-				else btLeStatus += "no advertising";
-				customData.put("Bluetooth LE status", btLeStatus);
-			}
+				String btStatus;
+				if (btEnabled) btStatus = "Available, enabled, ";
+				else btStatus = "Available, not enabled, ";
+				if (btConnectable) btStatus += "connectable, ";
+				else btStatus += "not connectable, ";
+				if (btDiscoverable) btStatus += "discoverable";
+				else btStatus += "not discoverable";
+				customData.put("Bluetooth status", btStatus);

-			if (bt != null) {
-				customData.put("Bluetooth address",
-						scrubMacAddress(bt.getAddress()));
+				if (SDK_INT >= 21) {
+					// Is Bluetooth LE scanning and advertising supported?
+					boolean btLeScan = bt.getBluetoothLeScanner() != null;
+					boolean btLeAdvertise =
+							bt.getBluetoothLeAdvertiser() != null;
+					String btLeStatus;
+					if (btLeScan) btLeStatus = "Scanning, ";
+					else btLeStatus = "No scanning, ";
+					if (btLeAdvertise) btLeStatus += "advertising";
+					else btLeStatus += "no advertising";
+					customData.put("Bluetooth LE status", btLeStatus);
+				}
+
+				Pair<String, String> p = getBluetoothAddressAndMethod(ctx, bt);
+				String address = p.getFirst();
+				String method = p.getSecond();
+				customData.put("Bluetooth address", scrubMacAddress(address));
+				customData.put("Bluetooth address method", method);
 			}
-			String btSettingsAddr;
-			try {
-				btSettingsAddr = Settings.Secure.getString(
-						ctx.getContentResolver(), "bluetooth_address");
-			} catch (SecurityException e) {
-				btSettingsAddr = "Could not get address from settings";
-			}
-			customData.put("Bluetooth address from settings",
-					scrubMacAddress(btSettingsAddr));

 			// Git commit ID
 			customData.put("Commit ID", BuildConfig.GitHash);

-			return Collections.unmodifiableMap(customData);
+			return unmodifiableMap(customData);
 		}
 	}

--- a/briar-android/src/main/res/values-ar/strings.xml
+++ b/briar-android/src/main/res/values-ar/strings.xml
@@ -45,11 +45,10 @@
    <item quantity="many">هذا إصدار تجريبي من Briar (براير). حسابك سينتهي خلال %d يوم ولن يمكن تجديده.</item>
    <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="download_briar">لمتابعة استخدام Briar (براير)، يرجى تنزيل آخر إصدار. </string>
  <string name="create_new_account">انت في حاجة لانشاء حساب جديد، لكن يمكنك استعمال نفس الاسم المستعار.</string>
-  <string name="download_briar_button">تحميل Briar (براير) 1.0</string>
+  <string name="download_briar_button">تنزيل آخر أصدار</string>
  <string name="startup_open_database">جارِ فك تشفير قاعدة البيانات...</string>
  <string name="startup_migrate_database">جارِ ترقية قاعدة البيانات...</string>
  <string name="startup_compact_database">جارِ ضغظ قاعدة البيانات…</string>
@@ -130,15 +129,32 @@
  <string name="fix">إصلاح</string>
  <string name="help">مساعدة</string>
  <string name="sorry">معذرة</string>
+  <string name="error_start_activity">غير متوفّر على نظامكم </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_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="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_deleted_ongoing_both">لا يمكن حذف الرّسائل القائمة والمتعلّقة بالدعوات وطلبات التعارف حتى حسمها.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">لا يمكن حذف الرّسائل المتعلّقة بطلبات التعارف القائمة حتى حسمها.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">لا يمكن حذف الرّسائل القائمة والمتعلّقة بالدعوات حتى حسمها.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">لا يمكن حذف الرّسائل المُحمّلة جزئيّاً قبل الانتهاء من تحميلها بشكل كامل. </string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">لحذف دعوة أو طلب تعارف، عليكم اختيار الطّلب والرّد. </string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">لحذف طلب تعارف، عليكم اختيار الطّلب والرّد.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">لحذف دعوة، عليكم اختيار الطّلب والرّد. </string>
  <string name="delete_contact">حذف جهة الإتصال</string>
  <string name="dialog_title_delete_contact">تأكيد حذف جهة الإتصال</string>
  <string name="dialog_message_delete_contact">هل أنت متأكد/ة من أنك تريد حذف جهة الإتصال هذه وكل الرسائل المتبادلة بينكما؟</string>
@@ -147,10 +163,16 @@
  <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_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>
+  <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>
  <string name="continue_button">إستمرار</string>
  <string name="try_again_button">الرجاء المحاولة مجددًا</string>
@@ -159,6 +181,8 @@
  <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>
@@ -166,22 +190,71 @@
  <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="add_contact_remote_connecting">اتصال...</string>
-  <string name="connecting">اتصال...</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>
+  <string name="step_1">١</string>
  <!--This is a numeral indicating the second step in a series of screens-->
-  <string name="step_2">2</string>
+  <string name="step_2">٢</string>
+  <plurals name="contact_added_notification_text">
+    <item quantity="zero">تمّت إضافة %d من جهات الاتصال</item>
+    <item quantity="one">تمّت إضافة جهة الاتصال</item>
+    <item quantity="two">تمّت إضافة %d من جهات الاتصال</item>
+    <item quantity="few">تمّت إضافة %d من جهات الاتصال</item>
+    <item quantity="many">تمّت إضافة %d من جهات الاتصال</item>
+    <item quantity="other">تمّت إضافة %d من جهات الاتصال.</item>
+  </plurals>
+  <string name="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>
@@ -394,10 +467,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">تلقائيا: %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"-->
@@ -426,6 +503,7 @@
  <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>
@@ -460,6 +538,7 @@
  <!--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>
@@ -486,7 +565,10 @@
  <!--Permission Requests-->
  <string name="permission_camera_title">إذن الكاميرا</string>
  <string name="permission_camera_request_body">للتمكن من مسح رمز QR، يحتاج Briar (براير) إلى إستعمال الكاميرا.</string>
-  <string name="permission_camera_location_title">آلة التصوير والموقع</string>
+  <string name="permission_location_title">إذن معرفة الموقع </string>
+  <string name="permission_location_request_body">لاكتشاف أجهزة بلوتوث، يحتاج Briar (براير) لإذن بالوصول إلى موقعكم.\n\n لا يخزّن Briar (براير) موقعكم ولا يشاركه مع أي شخص. </string>
+  <string name="permission_camera_location_title">الكاميرا والموقع</string>
+  <string name="permission_camera_location_request_body">لمسح رمز الاستجابة السّريعة أو QR، يحتاج Briar (براير) للوصول إلى الكاميرا. \n\n لاكتشاف أجهزة بلوتوث، يحتاج Briar (براير) لإذن بالوصول إلى موقعكم. \n\n لا يخزّن Briar (براير) موقعكم ولا يشاركه مع أي شخص. </string>
  <string name="permission_camera_denied_body">قد رفضت إعطاء إذن الكاميرا، لكن إضافة جهات إتصال يتطلب إستعمال الكاميرا.\n\nالرجاء منح الإذن.</string>
  <string name="qr_code">رمز QR</string>
  <string name="show_qr_code_fullscreen">اظهار رمز QR بوضع ملء الشاشة</string>
@@ -505,6 +587,9 @@
  <!--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>
--- a/briar-android/src/main/res/values-az/strings.xml
+++ b/briar-android/src/main/res/values-az/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Bu Briar\'ın test versiyasıdır. Hesabınız %dgün ərzində sona çatacaq və yeniləmə mümkün deyil.</item>
    <item quantity="other">Bu Briar\'ın test versiyasıdır. Hesabınız %dgün ərzində sona çatacaq və yeniləmə mümkün deyil.</item>
  </plurals>
-  <string name="expiry_update">Testin sona çatma tarixi uzadıldı. Hesabınız testi %d gün ərzində sona çatacaq.</string>
  <string name="expiry_date_reached">Bu proqram sona çatdı. Test üçün təşəkkür edirik!</string>
-  <string name="download_briar">Briar istifadə etməyə davam etmək üçün, 1.0 versiyasını yükləyin.</string>
+  <string name="download_briar">Briar-dan istifadə etməyə davam etmək üçün ən son versiyanı yükləyin.</string>
  <string name="create_new_account">Yeni bir hesab yaratmaq lazımdır, lakin eyni ləqəbi istifadə edə bilərsiniz.</string>
-  <string name="download_briar_button">Briar 1.0 yükləyin</string>
+  <string name="download_briar_button">Son versiyasını yükləyin </string>
  <string name="startup_open_database">Məlumatlar şifrədən açılması...</string>
  <string name="startup_migrate_database">Məlumatların təzələnməsi...</string>
  <string name="startup_compact_database">Məlumatın sıxılması...</string>
@@ -110,6 +109,7 @@
  <string name="fix">Düzəliş</string>
  <string name="help">Yardım</string>
  <string name="sorry">Bağışlayın</string>
+  <string name="error_start_activity">Sizin sistemdə ələçatmazdır. </string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Göstərmək üçün əlaqə yoxdur</string>
  <string name="no_contacts_action">Kontakt əlavə etmək üçün + işarəsinə toxunun</string>
@@ -124,6 +124,10 @@
  <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>
+  <string name="delete_all_messages">Bütün mesajları sil</string>
+  <string name="dialog_title_delete_all_messages">Silməyi təsdiq et</string>
+  <string name="dialog_message_delete_all_messages">Bütün mesajları silmək istədiyinizə əminsinizmi? </string>
+  <string name="dialog_title_not_all_messages_deleted">Bütün mesajları silmək alınmadı</string>
  <string name="delete_contact">Kontakt silin</string>
  <string name="dialog_title_delete_contact">Kontaktın silinməsini təsdiqləyin</string>
  <string name="dialog_message_delete_contact">Bu kontaktı və bu kontaktla əvəzlənən bütün mesajları silmək istədiyinizə əminsinizmi?</string>
@@ -139,6 +143,7 @@
  <string name="dialog_message_no_image_support">Sizin Briar kontaktınız hələlik şəkillər dəstəkləmir. Təkmilləşmədən sonra fərqli bir simvol görürsünüz.</string>
  <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>
+  <string name="messaging_too_many_attachments_toast">Yalnız %d ilk şəkil göndəriləcək</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>
@@ -156,7 +161,7 @@
  <string name="authenticating_with_device">Cihazla təsdiqlənir \u2026</string>
  <string name="connection_error_title">Kontaktınıza qoşula bilmədi</string>
  <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>
+  <string name="connection_error_feedback"><a href="feedback">Bu problem davam edərsə, tətbiqin təkmilləşdirilməsinə kömək etmək üçün rəy göndərin.</a></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>
@@ -196,6 +201,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>
+  <plurals name="contact_added_notification_text">
+    <item quantity="one">New contact added.</item>
+    <item quantity="other">%d yeni kontakt əlavə olundu. </item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Bu kontaktın əlavə edilməsi adi haldan daha uzun sürür</string>
+  <string name="adding_contact_slow_title">Kontakta qoşula bilmir</string>
+  <string name="adding_contact_slow_text">Bu kontaktın əlavə edilməsi normaldan daha çox vaxt tələb edir.\n\nYoxlayın ki kontakt sizin linkinizi qəbul edib və sizi əlavə etdi: </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-->
@@ -270,7 +282,7 @@
  <string name="groups_reveal_contacts">Kontaktları aşkar edin</string>
  <string name="groups_reveal_dialog_message">Bu qrupun bütün mövcud və gələcək üzvlərinə kontaktların aşkarlanıb veriləcəyini seçə bilərsiniz. \n\n Kontaktları geri götürmək, qrupun yaradıcısı olsa da, aşkar əlaqələrlə ünsiyyət qura biləcəyiniz üçün qrupla əlaqənizi daha sürətli və daha etibarlı edir.</string>
  <string name="groups_reveal_visible">Kontakt qrupda görünə bilər</string>
-  <string name="groups_reveal_visible_revealed_by_us">Kontakt əlaqəsi qrupda görür</string>
+  <string name="groups_reveal_visible_revealed_by_us">Kontakt əlaqəsi qrupda görür (sizin üçün görsənir)</string>
  <string name="groups_reveal_invisible">Kontakt əlaqəsi qrup üçün görünmür</string>
  <!--Forums-->
  <string name="no_forums">Göstərmək üçün forum yoxdur</string>
@@ -353,7 +365,7 @@
  <!--Settings Display-->
  <string name="pref_language_title">Dil və region</string>
  <string name="pref_language_changed">Briar-ı yenidən başlatdığınızda bu parametr qüvvəyə minir. Lütfən çıxın və Briar-ı yenidən başladın.</string>
-  <string name="pref_language_default">System default</string>
+  <string name="pref_language_default">Sistemdə olduğu kimi </string>
  <string name="display_settings_title">Görüntü</string>
  <string name="pref_theme_title">Tema</string>
  <string name="pref_theme_light">Ağ</string>
@@ -381,6 +393,7 @@
  <string name="pref_lock_disabled_summary">Bundan istifadə etmək üçün ekran kilidini quraşdırın. </string>
  <string name="pref_lock_timeout_title">Tətbiq kilidinin hərəkətsizlik müddəti</string>
  <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
+  <string name="pref_lock_timeout_summary">Briar-ı istifadə etməsəniz, onu avtomatik olaraq %s dəqiqədən sonra kilidləyin</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 dəqiqə</string>
  <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
@@ -465,8 +478,10 @@
  <string name="screen_filter_allow">Bu tətbiqlərin yuxarı çəkilməsinə icazə verin</string>
  <!--Permission Requests-->
  <string name="permission_camera_title">Camera izni</string>
+  <string name="permission_camera_request_body">QR kodunu skan etmək üçün Briar-a kameraya icazə lazımdır.</string>
  <string name="permission_location_title">Mövqe icazəsi</string>
  <string name="permission_camera_location_title">Kamera və mövqe</string>
+  <string name="permission_camera_denied_body">Kameraya daxil olmağı rədd etdiniz, lakin əlaqə əlavə etmək kameradan istifadə etməyi tələb edir. \n\nİcazə verilməsini düşünün.</string>
  <string name="qr_code">QR kodu</string>
  <string name="show_qr_code_fullscreen">QR kodu tam ekranda göstər</string>
  <!--App Locking-->
@@ -486,7 +501,7 @@
  <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
  <string name="screenshot_message_1">Salam Bob!</string>
  <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
-  <string name="screenshot_message_2">Salam Alice! Briar haqqında danışdığınız üçün təşəkkür edirik!</string>
+  <string name="screenshot_message_2">Salam Elis! Briar haqqında danışdığınız üçün təşəkkür edirik!</string>
  <!--This is a message to be used in screenshots.-->
  <string name="screenshot_message_3">Problem yoxdur, bunu ümüd edirəm 😀</string>
 </resources>
--- a/briar-android/src/main/res/values-bs/strings.xml
+++ b/briar-android/src/main/res/values-bs/strings.xml
@@ -37,11 +37,8 @@
  <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>
--- a/briar-android/src/main/res/values-ca/strings.xml
+++ b/briar-android/src/main/res/values-ca/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Aquesta és una versió de prova de Briar. El vostre compte expira en %d dia i no es pot renovar.</item>
    <item quantity="other">Aquesta és una versió de prova de Briar. El vostre compte caducarà en %d dies i no es podrà renovar.</item>
  </plurals>
-  <string name="expiry_update">S\'ha allargat la data de caducitat d\'aquesta versió de test de Briar. Ara el vostre compte caducarà d\'aquí a %d dies.</string>
  <string name="expiry_date_reached">Aquesta versió de Briar ha caducat.\nGràcies per haver-lo provat!</string>
-  <string name="download_briar">Per continuar fent servir Briar, descarregueu-vos la versió 1.0.</string>
+  <string name="download_briar">Per continuar utilitzant el Briar, baixeu la darrera versió.</string>
  <string name="create_new_account">Haureu de crear un compte nou, però podeu utilitzar el mateix sobrenom.</string>
-  <string name="download_briar_button">Descarrega Briar 1.0</string>
+  <string name="download_briar_button">Baixa l\'última versió</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">S\'està compactant la base de dades...</string>
@@ -110,6 +109,7 @@
  <string name="fix">Corregeix</string>
  <string name="help">Ajuda</string>
  <string name="sorry">Ens sap greu</string>
+  <string name="error_start_activity">No disponible al vostre sistema</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">No hi ha cap contacte per mostrar</string>
  <string name="no_contacts_action">Toqueu la icona + per afegir un contacte</string>
@@ -124,6 +124,10 @@
  <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>
+  <string name="delete_all_messages">Suprimeix tots els missatges</string>
+  <string name="dialog_title_delete_all_messages">Confirmeu la supressió dels missatges</string>
+  <string name="dialog_message_delete_all_messages">Esteu segur que voleu suprimir tots els missatges?</string>
+  <string name="dialog_title_not_all_messages_deleted">No s\'ha pogut suprimir tots els missatges</string>
  <string name="delete_contact">Suprimeix aquest contacte</string>
  <string name="dialog_title_delete_contact">Confirmeu la supressió del contacte</string>
  <string name="dialog_message_delete_contact">Segur que voleu suprimir aquest contacte i tots els missatges que us heu intercanviat?</string>
@@ -140,6 +144,7 @@
 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>
+  <string name="messaging_too_many_attachments_toast">Només s\'enviaran les %d primeres 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>
@@ -207,6 +212,7 @@ Així que l\'actualitzi li veureu una icona diferent .</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>
+  <string name="duplicate_link_dialog_text_1_contact">Ja teniu un contacte amb aquest 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
--- a/briar-android/src/main/res/values-de/strings.xml
+++ b/briar-android/src/main/res/values-de/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Dies ist eine Testversion von Briar. Dein Konto läuft in %d Tag ab und kann nicht verlängert werden.</item>
    <item quantity="other">Dies ist eine Testversion von Briar. Dein Konto läuft in %d Tagen ab und kann nicht verlängert werden.</item>
  </plurals>
-  <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="download_briar">Bitte lade die aktuelle Version von Briar herunter, um es weiter zu benutzen.</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="download_briar_button">Lade die aktuelle Version 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 wird komprimiert ...</string>
@@ -110,6 +109,7 @@
  <string name="fix">Behoben</string>
  <string name="help">Hilfe</string>
  <string name="sorry">Entschuldigung</string>
+  <string name="error_start_activity">Nicht Verfügbar auf deinem Gerät</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Keine Kontakte vorhanden</string>
  <string name="no_contacts_action">Tippe auf das + Symbol, um einen Kontakt hinzuzufügen</string>
@@ -128,7 +128,6 @@
  <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>
@@ -168,7 +167,7 @@
  <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_intro">Füge hier den Link des Kontakts ein, den du hinzufügen möchtest:</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>
@@ -178,7 +177,7 @@
  <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 ihn sehen.</string>
-  <string name="your_link">Gebe diesen Link zu dem Kontakt den du hinzufügen möchtest</string>
+  <string name="your_link">Gebe diesen Link 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>
@@ -196,7 +195,7 @@
  <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="intent_own_link">Du hast deinen eigenen Link aufgerufen. Nutze den Link des  Kontaktes, den 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>
--- a/briar-android/src/main/res/values-es/strings.xml
+++ b/briar-android/src/main/res/values-es/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Esta es una versión de prueba de Briar. Su cuenta expirará en %d día y no podrá ser renovada.</item>
    <item quantity="other">Esta es una versión de prueba de Briar. Tu cuenta expirará en %d días y no podrá ser renovada.</item>
  </plurals>
-  <string name="expiry_update">La fecha de caducidad de las pruebas se ha ampliado. Tu cuenta expirará en %d días.</string>
  <string name="expiry_date_reached">Este programa ha caducado.\n¡Gracias por probarlo!</string>
-  <string name="download_briar">Para continuar usando Briar, por favor descarga la versión 1.0.</string>
+  <string name="download_briar">Para continuar usando Briar, por favor descarga la versión mas reciente.</string>
  <string name="create_new_account">Necesitarás crear una nueva cuenta, pero puedes usar el mismo nombre de usuario.</string>
-  <string name="download_briar_button">Descargar Briar 1.0</string>
+  <string name="download_briar_button">Descargar la última versión.</string>
  <string name="startup_open_database">Descifrando la base de datos...</string>
  <string name="startup_migrate_database">Actualizando la base de datos...</string>
  <string name="startup_compact_database">Compactando base de datos...</string>
@@ -110,6 +109,7 @@
  <string name="fix">Reparar</string>
  <string name="help">Ayuda</string>
  <string name="sorry">Disculpa</string>
+  <string name="error_start_activity">No disponible en tu sistema</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">No hay contactos para mostrar</string>
  <string name="no_contacts_action">Golpear el icono + para añadir un contacto</string>
@@ -128,7 +128,6 @@
  <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>
--- a/briar-android/src/main/res/values-eu/strings.xml
+++ b/briar-android/src/main/res/values-eu/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Hau Briar-en probetarako bertsio bat da. Zure kontua egun %d barru iraungituko da eta ezin da berriztu.</item>
    <item quantity="other">Hau Briar-en probetarako bertsio bat da. Zure kontua %d egun barru iraungituko da eta ezin da berriztu.</item>
  </plurals>
-  <string name="expiry_update">Probetarako iraungitze data luzatu da. Zure kontua %d egun barru iraungituko da.</string>
  <string name="expiry_date_reached">Programa hau iraungitu da.\nEskerrik asko probatzeagatik!</string>
-  <string name="download_briar">Briar erabiltzen jarraitzeko, deskargatu 1.0 bertsioa.</string>
+  <string name="download_briar">Briar erabiltzen jarraitzeko, deskargatu azken bertsioa.</string>
  <string name="create_new_account">Kontu berri bat sortu beharko duzu, baina erabiltzaile-izen bera erabili dezakezu.</string>
-  <string name="download_briar_button">Deskargatu Briar 1.0</string>
+  <string name="download_briar_button">Deskargatu azken bertsioa</string>
  <string name="startup_open_database">Datu-basea deszifratzen...</string>
  <string name="startup_migrate_database">Datu-basea eguneratzen...</string>
  <string name="startup_compact_database">Datu-basea trinkotzen…</string>
@@ -110,6 +109,7 @@
  <string name="fix">Konpondu</string>
  <string name="help">Laguntza</string>
  <string name="sorry">Sentitzen dugu</string>
+  <string name="error_start_activity">Ez dago eskuragarri zure sistemarako</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Ez dago erakusteko kontakturik</string>
  <string name="no_contacts_action">Sakatu + ikonoa kontaktua gehitzeko</string>
@@ -128,7 +128,13 @@
  <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="dialog_message_not_deleted_ongoing_both">Abian diren gonbidapenen edo aurkezpenen mezuak ezin dira ezabatu hauek amaitu arte.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Abian diren aurkezpenen mezuak ezin dira ezabatu hauek amaitu arte.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Abian diren gonbidapenen mezuak ezin dira ezabatu hauek amaitu arte.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Erdizka deskargatutako mezuak ezin dira ezabatu deskargatzen amaitu arte.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Gonbidapen edo aurkezpen bat ezabatzeko eskaria eta erantzuna hautatu behar dituzu.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Aurkezpen bat ezabatzeko eskaria eta erantzuna hautatu behar dituzu.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Gonbidapen bat ezabatzeko eskaria eta erantzuna hautatu behar dituzu.</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>
--- a/briar-android/src/main/res/values-fa/strings.xml
+++ b/briar-android/src/main/res/values-fa/strings.xml
@@ -45,13 +45,12 @@
    <item quantity="one">این یک نسخه آزمایشی از Briar (برایر) می باشد. حساب کاربری شما در %d روز آینده به پایان می رسد و امکان تمدید آن وجود نخواهد داشت.</item>
    <item quantity="other">این یک نسخه آزمایشی از Briar (برایر) می باشد. حساب کاربری شما در %d روز آینده به پایان می رسد و امکان تمدید آن وجود نخواهد داشت.</item>
  </plurals>
-  <string name="expiry_update">تاریخ اتمام آزمایش افزایش یافته است. حساب کاربری شما در %d روز آینده به پایان می رسد.</string>
  <string name="expiry_date_reached">این نرم افزار منقضی شده است.

 بابت تست از شما سپاسگزاریم.</string>
-  <string name="download_briar">برای اینکه به استفاده خود از Briar (برایر) ادامه دهید، لطفا نسخه ۱.۰ را دانلود کنید.</string>
+  <string name="download_briar">برای ادامه استفاده از Briar، لطفا آخرین نسخه را دانلود کنید.</string>
  <string name="create_new_account">لازم است تا یک حساب کاربری جدید ایجاد کنید، ولی می توانید از همان نام مستعار استفاده کنید.</string>
-  <string name="download_briar_button">دانلود Briar (برایر) 1.0</string>
+  <string name="download_briar_button">دانلود آخرین نسخه</string>
  <string name="startup_open_database">در حال رمزگشایی سیستم ...</string>
  <string name="startup_migrate_database">در حال ارتقا سیستم ...</string>
  <string name="startup_compact_database">درحال فشرده‌ سازی پایگاه داده...</string>
@@ -116,6 +115,7 @@
  <string name="fix">اصلاح</string>
  <string name="help">راهنما</string>
  <string name="sorry">پوزش</string>
+  <string name="error_start_activity">برای سیستم شما موجود نمی باشد</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">هیچ مخاطبی برای نمایش وجود ندارد</string>
  <string name="no_contacts_action">برای افزودن مخاطب روی + کلیک کنید</string>
@@ -130,6 +130,17 @@
  <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_deleted_ongoing_both">پیام های مرتبط با دعوت ها و معرفی های جاری نمی توانند حذف شوند تا زمانی که به نتیجه برسند.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">پیام های مرتبط با معرفی های جاری نمی توانند حذف شوند تا زمانی که به نتیجه برسند.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">پیام های مرتبط با دعوت نامه های جاری نمی توانند حذف شوند تا زمانی که به نتیجه برسند.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">پیام‌های نیمه دانلود شده تا زمانی که دانلود آن ها پایان نیافته است قابل حذف نیستند.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">برای حذف یک دعوت نامه یا معرفی، باید درخواست و پاسخ را انتخاب کنید.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">برای حذف یک معرفی، باید درخواست و پاسخ را انتخاب کنید.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">برای حذف یک دعوت نامه، باید درخواست و پاسخ آن را انتخاب کنید.</string>
  <string name="delete_contact">حذف مخاطب</string>
  <string name="dialog_title_delete_contact">تایید حذف مخاطب</string>
  <string name="dialog_message_delete_contact">آیا مطمئن هستید که میخواهید این مخاطب و تمام پیام های تبادل شده با آن را حذف کنید؟</string>
@@ -147,6 +158,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">برای اضافه کردن فرد به عنوان مخاطب باید با او به صورت حضوری ملاقات کنید.
@@ -222,6 +234,7 @@
  <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
--- a/briar-android/src/main/res/values-fi/strings.xml
+++ b/briar-android/src/main/res/values-fi/strings.xml
@@ -41,11 +41,8 @@
    <item quantity="one">Tämä on Briarin testiversio. Sinun tilisi tulee vanhentumaan %d päivän päästä eikä sitä voi uusia.</item>
    <item quantity="other">Tämä on Briarin testiversio. Sinun tilisi tulee vanhentumaan %d päivän päästä eikä sitä voi uusia.</item>
  </plurals>
-  <string name="expiry_update">Testiaikaa on pidennetty. Tilisi tulee nyt vanhentumaan %d päivän kuluttua.</string>
  <string name="expiry_date_reached">Tämä sovellus on vanhentunut.\nKiitos testaamisesta!</string>
-  <string name="download_briar">Jatkaaksesi Briarin käyttöä, lataa versio 1.0.</string>
  <string name="create_new_account">Sinun täytyy luoda uusi tili, mutta voit käyttää samaa tunnusta.</string>
-  <string name="download_briar_button">Lataa Briar 1.0</string>
  <string name="startup_open_database">Puretaan tietokannan salaus...</string>
  <string name="startup_migrate_database">Päivitetään tietokanta...</string>
  <!--Navigation Drawer-->
--- a/briar-android/src/main/res/values-fr/strings.xml
+++ b/briar-android/src/main/res/values-fr/strings.xml
@@ -41,11 +41,10 @@
    <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>
    <item quantity="other">Ceci est une version de test de Briar. Votre compte arrivera à expiration dans %d jours et ne pourra pas être renouvelé.</item>
  </plurals>
-  <string name="expiry_update">La date de fin de test a été repoussée. Votre compte arrivera maintenant à expiration dans %d jours.</string>
  <string name="expiry_date_reached">Ce logiciel est arrivé à expiration.\nMerci de l’avoir testé !</string>
-  <string name="download_briar">Pour continuer à utiliser Briar, veuillez télécharger la version 1.0.</string>
+  <string name="download_briar">Pour continuer à utiliser Briar, veuillez télécharger la dernière version.</string>
  <string name="create_new_account">Vous devrez créer un nouveau compte, mais vous pouvez utiliser le même pseudonyme.</string>
-  <string name="download_briar_button">Télécharger Briar 1.0</string>
+  <string name="download_briar_button">Télécharger la dernière version</string>
  <string name="startup_open_database">Déchiffrement de la base de données…</string>
  <string name="startup_migrate_database">Mise à niveau de la base de données…</string>
  <string name="startup_compact_database">Compactage de la base de données…</string>
@@ -110,6 +109,7 @@
  <string name="fix">Corriger</string>
  <string name="help">Aide</string>
  <string name="sorry">Désolé</string>
+  <string name="error_start_activity">N’est pas proposée sur votre système.</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Aucun contact à afficher</string>
  <string name="no_contacts_action">Touchez l’icône + pour ajouter un contact</string>
@@ -128,7 +128,13 @@
  <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="dialog_message_not_deleted_ongoing_both">Les messages relatifs aux invitations et présentations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Les messages relatifs aux présentations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Les messages relatifs aux invitations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Les messages partiellement téléchargés ne peuvent pas être supprimés tant que le téléchargement n’est pas terminé.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Pour supprimer une invitation ou une présentation, vous devez sélectionner la demande et la réponse.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Pour supprimer une présentation, vous devez sélectionner la demande et la réponse.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Pour supprimer une invitation, vous devez sélectionner la demande et la réponse.</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>
--- a/briar-android/src/main/res/values-gl/strings.xml
+++ b/briar-android/src/main/res/values-gl/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Esta versión de Briar é para probas. A conta caducará en %d día e non se pode anovar.</item>
    <item quantity="other">Esta é unha versión de proba de Briar. A conta caducará en %d días e non se pode anovar.</item>
  </plurals>
-  <string name="expiry_update">A data de caducidade de probas foi alongada. Agora a súa conta caduca en %d días.</string>
  <string name="expiry_date_reached">Este software caducou.\nGrazas por probalo!</string>
-  <string name="download_briar">Para continuar utilizando Briar, descargue por favor a versión 1.0.</string>
+  <string name="download_briar">Para seguir utilizando Briar, descarga por favor a última versión.</string>
  <string name="create_new_account">Precisa crear unha nova conta, pero pode utilizar o mesmo alcume.</string>
-  <string name="download_briar_button">Descargar Briar 1.0</string>
+  <string name="download_briar_button">Descargar Última Versión</string>
  <string name="startup_open_database">Descifrando a Base de datos...</string>
  <string name="startup_migrate_database">Actualizando a Base de datos...</string>
  <string name="startup_compact_database">Compactando a base de datos...</string>
@@ -110,6 +109,7 @@
  <string name="fix">Arranxar</string>
  <string name="help">Axuda</string>
  <string name="sorry">Desculpe</string>
+  <string name="error_start_activity">Non dispoñible para o teu sistema</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Sen contactos para amosar</string>
  <string name="no_contacts_action">Toque a icona + para engadir un contacto</string>
@@ -124,6 +124,10 @@
  <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>
+  <string name="delete_all_messages">Borrar todas as mensaxes</string>
+  <string name="dialog_title_delete_all_messages">Confirmar borrado de mensaxes</string>
+  <string name="dialog_message_delete_all_messages">Seguro que queres borrar todas as mensaxes?</string>
+  <string name="dialog_title_not_all_messages_deleted">Non se puideron borrar todas as mensaxes</string>
  <string name="delete_contact">Eliminar contacto</string>
  <string name="dialog_title_delete_contact">Confirme a eliminación do contacto</string>
  <string name="dialog_message_delete_contact">Segura de querer eliminar este contacto e todas as mensaxes que intercambiaron?</string>
@@ -139,6 +143,7 @@
  <string name="dialog_message_no_image_support">O cliente do seu contacto Briar non admite anexos de imaxes. Unha vez actualice verá unha icona diferente.</string>
  <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>
+  <string name="messaging_too_many_attachments_toast">Só se enviarán as primeiras %d 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>
@@ -206,6 +211,7 @@
  <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>
+  <string name="duplicate_link_dialog_text_1_contact">Xa tes un contacto 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
--- a/briar-android/src/main/res/values-he/strings.xml
+++ b/briar-android/src/main/res/values-he/strings.xml
@@ -45,12 +45,9 @@
    <item quantity="many">זאת גרסת בחינה של Briar. חשבונך יפוג תוך %d ימים ואינו יכול להתחדש.</item>
    <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>
@@ -141,7 +138,6 @@
  <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>
--- a/briar-android/src/main/res/values-hi/strings.xml
+++ b/briar-android/src/main/res/values-hi/strings.xml
@@ -41,11 +41,8 @@
    <item quantity="one">यह Briar का एक परीक्षण संस्करण है आपका खाता %dदिनों में समाप्त हो जाएगा और नवीनीकरण नहीं किया जा सकता है</item>
    <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>
--- a/briar-android/src/main/res/values-hu/strings.xml
+++ b/briar-android/src/main/res/values-hu/strings.xml
@@ -5,7 +5,7 @@
  <string name="setup_name_explanation">A beceneve fog megjelenni minden tartalom mellett amit Ön osztott meg. Nem tudja megváltoztatni a fiók létrehozása után.</string>
  <string name="setup_next">Következő</string>
  <string name="setup_password_intro">Válasszon jelszót</string>
-  <string name="setup_password_explanation">A Briar fiókja titkosítva az eszközén kerül tárolásra, nem a felhőben. Ha elfelejti a jelszavát, vagy eltávolítja a Briar-t, nincs lehetőség fiókja visszanyerésére.\n\nVálasszon egy hosszú jelszót, amit nehéz kitalálni, mint négy tetszőleges szó vagy tíz tetszőleges betű, szám vagy szimbólum.</string>
+  <string name="setup_password_explanation">A Briar fiókja az eszközén kerül tárolásra titkosítva, nem a felhőben. Ha elfelejti a jelszavát, vagy eltávolítja a Briar-t, nincs lehetőség fiókja visszanyerésére.\n\nVálasszon egy hosszú, nehezen kitalálható jelszót, például négy tetszőleges szó vagy tíz tetszőleges betű, szám vagy szimbólum.</string>
  <string name="setup_doze_title">Háttérkapcsolatok</string>
  <string name="setup_doze_intro">Az üzenetek fogadásához a Briar-nak szüksége van a háttérben csatlakozásra.</string>
  <string name="setup_doze_explanation">Az üzenetek fogadásához a Briarnak szüksége van háttérben csatlakozásra. Kérjük tiltsa le az akkumulátor optimalizációt, így a Briar kapcsolatban tud maradni.</string>
@@ -29,7 +29,7 @@
  <string name="sign_in_button">Bejelentkezés</string>
  <string name="forgotten_password">Elfelejtettem a jelszavam</string>
  <string name="dialog_title_lost_password">Elveszett jelszó</string>
-  <string name="dialog_message_lost_password">A Briar fiókja titkosítva az eszközén kerül tárolásra, nem a felhőben, így nem tudjuk helyreállítani a jelszavát. Szeretné törölni a fiókját és elölről kezdeni?\n\nFigyelem: az identitásai, kapcsolatai és üzenetei végleg elvesznek.</string>
+  <string name="dialog_message_lost_password">A Briar fiókja az eszközén kerül tárolásra titkosítva, nem a felhőben. Ha elfelejti a jelszavát, vagy eltávolítja a Briar-t, nincs lehetőség fiókja visszanyerésére.\n\nVálasszon egy hosszú, nehezen kitalálható jelszót, például négy tetszőleges szó vagy tíz tetszőleges betű, szám vagy szimbólum.</string>
  <string name="startup_failed_notification_title">Briar nem tud elindulni</string>
  <string name="startup_failed_notification_text">Érintse meg további információért</string>
  <string name="startup_failed_activity_title">Briar indítási hiba</string>
@@ -41,11 +41,10 @@
    <item quantity="one">Ez a teszt verziója a Briar-nak. A fiókja le fog járni %d napon belül és nem megújítható.</item>
    <item quantity="other">Ez a teszt verziója a Briar-nak. A fiókja le fog járni %d napon belül és nem megújítható.</item>
  </plurals>
-  <string name="expiry_update">A tesztelési lejárati dátum módosult. A fiókja most lejár %d napon belül.</string>
  <string name="expiry_date_reached">Ez a szoftver lejárt.\nKöszönjük a tesztelését!</string>
-  <string name="download_briar">A Briar használatának folytatásához kérjük töltse le az 1.0 verziót.</string>
+  <string name="download_briar">A Briar használatának folytatásához kérjük töltse le a legújabb verziót.</string>
  <string name="create_new_account">Új fiókot kell létrehoznia, de használhatja ugyanazt a becenevet.</string>
-  <string name="download_briar_button">Briar 1.0 letöltése</string>
+  <string name="download_briar_button">Legújabb verzió letöltése</string>
  <string name="startup_open_database">Adatbázis dekódolása...</string>
  <string name="startup_migrate_database">Adatbázis frissítése</string>
  <string name="startup_compact_database">Adatbázis tömörítése...</string>
@@ -110,6 +109,7 @@
  <string name="fix">Javítás</string>
  <string name="help">Súgó</string>
  <string name="sorry">Sajnáljuk</string>
+  <string name="error_start_activity">Nem elérhető az ön rendszerén</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Nincs megjeleníthető kapcsolat</string>
  <string name="no_contacts_action">Érintse meg a + gombot kapcsolatok hozzáadásához</string>
@@ -128,7 +128,6 @@
  <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>
@@ -137,7 +136,9 @@
  <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="dialog_message_save_image">A kép mentése lehetővé teszi, hogy más alkalmazások is elérjék.
+
+Biztosan 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>
@@ -146,7 +147,7 @@
  <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="add_contact_title">Közeli kapcsolat 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>
@@ -162,7 +163,7 @@
  <string name="authenticating_with_device">Azonosítás az eszközzel\u2026</string>
  <string name="connection_error_title">Nem sikerült csatlakozni a kapcsolatához</string>
  <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>
+  <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>
@@ -300,7 +301,7 @@ Kérjük frissítsen a legutolsó verzióra és próbálja újra.</string>
  <string name="groups_reveal_visible">Kapcsolat viszony látható a csoportnak</string>
  <string name="groups_reveal_visible_revealed_by_us">Kapcsolat viszony látható a csoportnak (Ön által felfedve)</string>
  <string name="groups_reveal_visible_revealed_by_contact">Kapcsolat viszony látható a csoportnak (%s által felfedve)</string>
-  <string name="groups_reveal_invisible">Kapcsolat viszony nem látható a csoportnak (</string>
+  <string name="groups_reveal_invisible">Kapcsolat viszony nem látható a csoportnak </string>
  <!--Forums-->
  <string name="no_forums">Nincs megjelenítendő fórum</string>
  <string name="no_forums_action">Érintse meg a + ikont fórum létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg fórumokat Önnel</string>
@@ -364,7 +365,10 @@ Kérjük frissítsen a legutolsó verzióra és próbálja újra.</string>
  <string name="blogs_feed_empty_state_action">A bejegyzések a kapcsolataitól és a blogoktól, amikre feliratkozott, itt jelennek meg.\n\nÉrintse meg a toll ikont egy blog bejegyzés írásához</string>
  <string name="blogs_remove_blog">Blog eltávolítása</string>
  <string name="blogs_remove_blog_dialog_message">Biztosan eltávolítja ezt a blogot?
-\n\nA bejegyzések törlődni fognak az Ön eszközéről, de nem a többi ember eszközéről.\n\nKapcsolatai, akivel megosztotta ezt a blogot, lehet nem kapnak többé frissítést.</string>
+
+A bejegyzések törlődni fognak az Ön eszközéről, de nem a többi ember eszközéről.
+
+Kapcsolatai, akivel megosztotta ezt a blogot, lehet nem kapnak többé frissítést.</string>
  <string name="blogs_remove_blog_ok">Eltávolít</string>
  <string name="blogs_blog_removed">Blog eltávolítva</string>
  <string name="blogs_reblog_comment_hint">Megjegyzés hozzáadása (opcionális)</string>
--- a/briar-android/src/main/res/values-is/strings.xml
+++ b/briar-android/src/main/res/values-is/strings.xml
@@ -41,11 +41,10 @@
    <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="download_briar">Til að halda áfram að nota Briar, ættirðu að sækja nýjustu útgáfuna.</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="download_briar_button">Ná í nýjustu útgáfu</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>
@@ -54,7 +53,7 @@
  <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="forums_button">Spjallsvæð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>
@@ -110,6 +109,7 @@
  <string name="fix">Laga</string>
  <string name="help">Hjálp</string>
  <string name="sorry">Því miður</string>
+  <string name="error_start_activity">Er ekki tiltækt fyrir kerfið þitt</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>
@@ -119,9 +119,14 @@
  <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="image_attach_error_too_big">Myndin er of stór. Hámark er %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Myndskráarsnið er ekki stutt: %s</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="delete_all_messages">Eyða öllum skilaboðum</string>
+  <string name="dialog_title_delete_all_messages">Staðfesta eyðingu skilaboða</string>
+  <string name="dialog_message_delete_all_messages">Ertu viss um að þú viljir eyða öllum skilaboðum?</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>
@@ -138,7 +143,9 @@
  <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>
+  <string name="messaging_too_many_attachments_toast">Einungis fyrstu %d myndirnar verða sendar</string>
  <!--Adding Contacts-->
+  <string name="add_contact_title">Bæta við nálægum tengilið</string>
  <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>
@@ -156,26 +163,76 @@
  <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_remotely_title_case">Bæta við fjarlægum tengilið</string>
+  <string name="add_contact_nearby_title">Bæta við nálægum tengilið</string>
+  <string name="add_contact_remotely_title">Bæta við fjarlægum tengilið</string>
+  <string name="contact_name_hint">Gefðu tengiliðnum stuttnefni</string>
+  <string name="contact_link_intro">Settu hér inn tengilinn frá tengiliðnum þínum</string>
+  <string name="contact_link_hint">Tengill á tengilið</string>
+  <string name="paste_button">Líma</string>
+  <string name="add_contact_button">Bæta við tengilið</string>
+  <string name="copy_button">Afrita</string>
+  <string name="share_button">Deila</string>
+  <string name="send_link_title">Skiptast á tenglum</string>
+  <string name="add_contact_choose_nickname">Veldu stuttnefni</string>
+  <string name="add_contact_choose_a_nickname">Settu inn stuttnefni</string>
+  <string name="nickname_intro">Gefðu tengiliðnum þínum stuttnefni/gælunafn. Einungis þú getur séð það.</string>
+  <string name="your_link">Gefðu þennan tengil til tengiliðarins sem þú ætlar að bæta við</string>
+  <string name="link_clip_label">Briar tengill</string>
+  <string name="link_copied_toast">Tengill afritaður</string>
+  <string name="adding_contact_error">Villa kom upp við að bæta við tengiliðnum.</string>
+  <string name="pending_contact_requests_snackbar">Það eru nokkrar tengiliðabeiðnir sem bíða</string>
+  <string name="pending_contact_requests">Tengiliðabeiðnir sem bíða</string>
+  <string name="no_pending_contacts">Engar tengiliðabeiðnir bíða</string>
  <string name="add_contact_remote_connecting">Tengist…</string>
+  <string name="waiting_for_contact_to_come_online">Bíð eftir að tengiliður tengist netinu…</string>
  <string name="connecting">Tengist…</string>
+  <string name="adding_contact">Bæti við tengilið…</string>
+  <string name="adding_contact_failed">Það mistókst að bæta við tengilið</string>
+  <string name="dialog_title_remove_pending_contact">Staðfesta að fjarlægja</string>
+  <string name="dialog_message_remove_pending_contact">Það er ennþá verið að bæta þessum tengilið við. Ef þú fjarlægir hann núna, verður honum ekki bætt við.</string>
+  <string name="own_link_error">Settu inn tengilinn frá tengiliðnum þínum, ekki þinn eigin</string>
+  <string name="nickname_missing">Settu inn stuttnefni</string>
+  <string name="invalid_link">Ógildur tengill</string>
+  <string name="unsupported_link">Þessi tengill kemur frá nýrri útgáfu af Briar.\n\nUppfærðu í nýjustu útgáfuna og prófaðu síðan aftur.</string>
+  <string name="intent_own_link">Þú opnaðir þinn eigin tengil. Notaðu tengilinn frá tengiliðnum sem þú ætlar að bæta við!</string>
+  <string name="missing_link">Settu inn tengil</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ýjum tengilið bætt við.</item>
+    <item quantity="other">%d nýjum tengiliðum bætt við.</item>
+  </plurals>
+  <string name="adding_contact_slow_warning">Það að bæta við þessum tengilið tekur lengri tíma en venjulega</string>
+  <string name="adding_contact_slow_title">Tekst ekki að tengjast tengiliðnum</string>
+  <string name="adding_contact_slow_text">Það að bæta við þessum tengilið tekur lengri tíma en venjulega\n\nGakktu úr skugga um að tengiliðurinn þinn hafi fengið tengilinn frá þér og bætt þér við hjá sér:</string>
+  <string name="offline_state">Engin internettenging</string>
+  <string name="duplicate_link_dialog_title">Endurtekinn tengill</string>
+  <string name="duplicate_link_dialog_text_1">Þú ert þegar með tengilið í bið sem er með þessum tengli: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Þú ert þegar með tengilið með þessum tengli: %s</string>
  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">Eru %s og %s sami einstaklingurinn?</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">Sami einstaklingur</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">Annar einstaklingur</string>
+  <string name="duplicate_link_dialog_text_3">%s og %s sendu þér sama tengilinn.\n\nAnnar þeirra gæti verið að reyna að finna út hverjir tengiliðirnir þínir eru.\n\nEkki segja þeim að þú hafir fengið sama tengil frá einhverjum öðrum.</string>
+  <string name="pending_contact_updated_toast">Tengiliður í bið uppfærður</string>
  <!--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_menu_item">Útbúa 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_button">Útbúa 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>
@@ -308,7 +365,7 @@
  <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>
+  <string name="blogs_reblog_button">Endurbirta</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>
@@ -330,7 +387,7 @@
  <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_imported">Flutt 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>
--- a/briar-android/src/main/res/values-it/strings.xml
+++ b/briar-android/src/main/res/values-it/strings.xml
@@ -16,7 +16,7 @@
  <string name="name_too_long">Nome troppo lungo</string>
  <string name="password_too_weak">La password è troppo debole</string>
  <string name="passwords_do_not_match">La password non corrisponde</string>
-  <string name="create_account_button">Creare Account</string>
+  <string name="create_account_button">Crea account</string>
  <string name="more_info">Ulteriori Informazioni</string>
  <string name="don_t_ask_again">Non chiedere più</string>
  <string name="setup_huawei_text">Premi il pulsante qua sotto e assicurati che Briar sia protetto nella schermata \"App protette\"</string>
@@ -41,11 +41,10 @@
    <item quantity="one">Questa è una versione di prova di Briar. Il tuo account scadrà fra %d giorno e non può essere rinnovato.</item>
    <item quantity="other">Questa è una versione di prova di Briar. Il tuo account scadrà fra %d giorni e non può essere rinnovato.</item>
  </plurals>
-  <string name="expiry_update">La scadenza della versione di prova è stata prorogata. Il tuo account ora scadrà fra %d giorni.</string>
  <string name="expiry_date_reached">Questo software è scaduto.\nGrazie per il test!</string>
-  <string name="download_briar">Per continuare ad usare Briar, scarica la versione 1.0.</string>
+  <string name="download_briar">Per continuare a utilizzare Briar, scarica l\'ultima versione.</string>
  <string name="create_new_account">Avrai bisogno di creare un nuovo account, ma puoi usare lo stesso nickname.</string>
-  <string name="download_briar_button">Scarica Briar 1.0</string>
+  <string name="download_briar_button">Scarica l\'ultima versione</string>
  <string name="startup_open_database">Decrittazione del database...</string>
  <string name="startup_migrate_database">Aggiornamento del database...</string>
  <string name="startup_compact_database">Compattazione del database…</string>
@@ -110,6 +109,7 @@
  <string name="fix">Correggi</string>
  <string name="help">Aiuto</string>
  <string name="sorry">Scusa</string>
+  <string name="error_start_activity">Non disponibile sul tuo sistema</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Nessun contatto da mostrare</string>
  <string name="no_contacts_action">Tocca l\'icona + per aggiungere un contatto</string>
@@ -128,7 +128,13 @@
  <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="dialog_message_not_deleted_ongoing_both">I messaggi relativi a presentazioni o inviti in corso non possono essere eliminati fino alla loro conclusione.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">I messaggi relativi a presentazioni in corso non posssono essere eliminati fino alla loro conclusione.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">I messaggi relativi a inviti in corso non posssono essere eliminati fino alla loro conclusione.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">I messaggi parzialmente scaricati non possono essere eliminati fino al termine del download.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Per eliminare un invito o presentazione, devi selezionare la richiesta e la risposta.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Per eliminare una presentazione, devi selezionare la richiesta e la risposta.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Per eliminare un invito, devi selezionare la richiesta e la risposta.</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>
--- a/briar-android/src/main/res/values-ja/strings.xml
+++ b/briar-android/src/main/res/values-ja/strings.xml
@@ -40,11 +40,8 @@
  <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>
--- a/briar-android/src/main/res/values-ko/strings.xml
+++ b/briar-android/src/main/res/values-ko/strings.xml
@@ -21,7 +21,7 @@
  <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="setup_huawei_help">Briar를 보호된 앱 목록에 추가하지 않는다면, 백그라운드에서 실행될 수 없습니다.</string>
  <string name="warning_dozed">%s가 백그라운드에서 실행될 수 없었습니다</string>
  <!--Login-->
  <string name="enter_password">비밀번호</string>
@@ -35,16 +35,13 @@
  <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_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>
@@ -52,7 +49,7 @@
  <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="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.-->
@@ -71,16 +68,16 @@
  <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>
+    <item quantity="other">프라이빗 메시지가 %d개 새로 왔습니다.</item>
  </plurals>
  <plurals name="group_message_notification_text">
-    <item quantity="other">새로운 %d개의 모임 메시지가 있습니다.</item>
+    <item quantity="other">모임 메시지가 %d개 새로 왔습니다.</item>
  </plurals>
  <plurals name="forum_post_notification_text">
-    <item quantity="other">새로운 %d개의 포럼 게시물이 있습니다.</item>
+    <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>
@@ -111,14 +108,17 @@
  <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_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="delete_contact">연락처 삭제하기</string>
  <string name="dialog_title_delete_contact">연락처 삭제 확인</string>
-  <string name="dialog_message_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>
@@ -128,20 +128,21 @@
  <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_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">연락처를 추가하려는 사람과 먼저 만나야 합니다.\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="waiting_for_contact_to_scan">지인이 스캔하고 연결하길 기다리고 있습니다\u2026</string>
  <string name="exchanging_contact_details">연락처 세부사항을 교환하고 있습니다\u2026</string>
-  <string name="contact_added_toast">%s: 연락처가 추가됐습니다.</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="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>
@@ -149,43 +150,87 @@
  <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">자신의 링크를 열었습니다. 추가하고 싶은 연락처를 사용하세요!</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_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_not_possible">이미 이 지인 분과 소개시키고 있습니다. 이 과정을 먼저 끝내주세요. 만약 당신이나 지인 분이 자주 온라인이 아니라면, 이 부분은 시간이 좀 걸릴 수 있습니다.</string>
+  <string name="introduction_message_title">지인 소개하기</string>
  <string name="introduction_message_hint">메시지 추가하기(선택 사항)</string>
-  <string name="introduction_button">소개하기</string>
+  <string name="introduction_button">소개시키기</string>
  <string name="introduction_sent">소개시켰습니다.</string>
-  <string name="introduction_error">소개하는 과정에서 문제가 있었습니다.</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_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">%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>
+  <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>
@@ -195,11 +240,11 @@
  </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_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_create_group_hint">프라이빗 모임의 이름을 정하세요</string>
  <string name="groups_invitation_sent">모임 초대장을 보냈습니다</string>
  <string name="groups_member_list">구성원 목록</string>
  <string name="groups_invite_members">구성원 초대하기</string>
@@ -243,7 +288,7 @@
  <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="forum_created_toast">포럼을 만들었습니다</string>
  <string name="no_forum_posts">게시물이 없습니다</string>
  <string name="no_posts">게시글이 없습니다</string>
  <plurals name="posts">
@@ -263,7 +308,7 @@
  <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_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>
@@ -279,10 +324,10 @@
  <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="sharing_status_forum">포럼은 참가한 누구나 지인과 공유할 수 있습니다. 다음 연락처와 포럼을 공유하고 있습니다. 이외 다른 구성원이 더 있을 수 있습니다.</string>
  <string name="shared_with">와(과) 공유하고 있습니다.(%1$d %2$d명 온라인)</string>
  <plurals name="forums_shared">
-    <item quantity="other">연락처와 공유한 %d개의 포럼</item>
+    <item quantity="other">지인과 공유한 %d개의 포럼</item>
  </plurals>
  <string name="nobody">아무도 없음</string>
  <!--Blogs-->
@@ -296,17 +341,17 @@
  <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_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_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>
@@ -316,7 +361,7 @@
  <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>
+  <string name="sharing_status_blog">블로그는 구독한 누구나 지인과 공유할 수 있습니다. 다음 지인 분과 이 블로그를 공유하고 있습니다. 이외 다른 구독자가 더 있을 수 있습니다.</string>
  <!--RSS Feeds-->
  <string name="blogs_rss_feeds_import">RSS 피드 불러오기</string>
  <string name="blogs_rss_feeds_import_button">가져오기</string>
@@ -326,10 +371,10 @@
  <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_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-->
@@ -347,7 +392,7 @@
  <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">인터넷(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>
@@ -356,7 +401,7 @@
  <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>
+  <string name="tor_only_when_charging_summary">충전 중이지 않을 때에는 인터넷 연결을 비활성화</string>
  <!--Settings Security and Panic-->
  <string name="security_settings_title"> 보안</string>
  <string name="pref_lock_title">앱 잠금</string>
@@ -375,7 +420,7 @@
  <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>
@@ -390,21 +435,21 @@
  <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="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="purge_setting_summary">패닉 버튼이 눌리면 Briar 계정을 삭제하기 (주의: 계정, 연락처와 메시지가 영구적으로 지워집니다)</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_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>
--- a/briar-android/src/main/res/values-lt/strings.xml
+++ b/briar-android/src/main/res/values-lt/strings.xml
@@ -43,11 +43,10 @@
    <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="download_briar">Norėdami ir toliau naudotis Briar, atsisiųskite naujausią programos laidą.</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="download_briar_button">Atsisiųsti naujausią laidą</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>
@@ -120,6 +119,7 @@
  <string name="fix">Pataisyti</string>
  <string name="help">Pagalba</string>
  <string name="sorry">Atsiprašome</string>
+  <string name="error_start_activity">Jūsų sistemoje neprieinama</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>
@@ -138,7 +138,13 @@
  <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="dialog_message_not_deleted_ongoing_both">Žinutės, susijusios su vykstančiais pakvietimais ir supažindinimais, negali būti ištrintos, kol nebus išspręstos.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Žinutės, susijusios su vykstančiais supažindinimais, negali būti ištrintos, kol nebus išspręstos.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Žinutės, susijusios su vykstančiais pakvietimais, negali būti ištrintos, kol nebus išspręstos.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Dalinai atsisiųstos žinutės negali būti ištrintos tol, kol nebus užbaigtas jų atsisiuntimas.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Norėdami ištrinti pakvietimą ar supažindinimą, turite pasirinkti užklausą ir atsakymą.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Norėdami ištrinti supažindinimą, turite pasirinkti užklausą ir atsakymą.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Norėdami ištrinti pakvietimą, turite pasirinkti užklausą ir atsakymą.</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>
--- a/briar-android/src/main/res/values-mk/strings.xml
+++ b/briar-android/src/main/res/values-mk/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Ова е тест верзија на Briar. Вашата сметка ќе истече за %d ден и не може да биде обновена.</item>
    <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="download_briar">За да продолжите со користење на Briar, ве молиме преземете го најновото издание.</string>
  <string name="create_new_account">Ќе треба да создадете нова сметка, но можете да го користите истото корисничко име.</string>
-  <string name="download_briar_button">Преземи го Briar 1.0</string>
+  <string name="download_briar_button">Преземи најново издание</string>
  <string name="startup_open_database">Декриптирање на базата на податоци...</string>
  <string name="startup_migrate_database">Ажурирање на базата на податоци...</string>
  <string name="startup_compact_database">Пакување на базата на податоци</string>
@@ -110,6 +109,7 @@
  <string name="fix">Поправи</string>
  <string name="help">Помош</string>
  <string name="sorry">Жал ни е</string>
+  <string name="error_start_activity">Недостапно на вашиот систем</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Нема контакти за прикажување</string>
  <string name="no_contacts_action">Допрете ја + иконата за да додадете контакт</string>
@@ -128,7 +128,13 @@
  <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="dialog_message_not_deleted_ongoing_both">Пораките поврзани со покани и запознавања кои се во тек не можат да бидат избрашини додека не бидат завршени.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Пораките поврзани со запознавања кои се во тек не можат да бидат избрашини додека не бидат завршени.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Пораките поврзани со покани кои се во тек не можат да бидат избрашини додека не бидат завршени.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Делумно преземените пораки не можат да бидат избрашини додека не се преземат целосно.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">За да избришете покана или запознавање, треба да изберете барање и одговор.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">За да избришете запознавање, треба да изберете барање и одговор.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">За да избришете покана, треба да изберете барање и одговор.</string>
  <string name="delete_contact">Избриши контакт</string>
  <string name="dialog_title_delete_contact">Потврди бришење на контакт</string>
  <string name="dialog_message_delete_contact">Дали сте сигурни дека сакате да го избришете овој контакт и сите пораки поврзани со него?</string>
--- a/briar-android/src/main/res/values-nl/strings.xml
+++ b/briar-android/src/main/res/values-nl/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Dit is een testversie van Briar. Je account verloopt binnen %d dag en kan niet worden vernieuwd.</item>
    <item quantity="other">Dit is een testversie van Briar. Je account verloopt binnen %d dagen en kan niet worden vernieuwd.</item>
  </plurals>
-  <string name="expiry_update">De verloopdatum voor de test is vooruitgeschoven. Je account verloopt nu binnen %d dagen.</string>
  <string name="expiry_date_reached">Deze software is verlopen.\nBedankt vor het testen!</string>
-  <string name="download_briar">Om Briar te blijven gebruiken, download alsjeblieft versie 1.0.</string>
+  <string name="download_briar">Download de laatste versie om Briar te kunnen blijven gebruiken.</string>
  <string name="create_new_account">Je moet een nieuw account aanmaken. Je kan dezelfde bijnaam gebruiken.</string>
-  <string name="download_briar_button">Download Briar 1.0</string>
+  <string name="download_briar_button">Download de laatste versie</string>
  <string name="startup_open_database">Database aan het ontsleutelen…</string>
  <string name="startup_migrate_database">Database aan het upgraden…</string>
  <string name="startup_compact_database">Database comprimeren...</string>
@@ -110,6 +109,7 @@
  <string name="fix">Oplossen</string>
  <string name="help">Help</string>
  <string name="sorry">Excuses</string>
+  <string name="error_start_activity">Beschikbaar op jouw systeem</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Er zijn geen contacten om te tonen</string>
  <string name="no_contacts_action">Tik op het +-icoon om een contact toe te voegen</string>
@@ -124,6 +124,10 @@
  <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>
+  <string name="delete_all_messages">Verwijder alle berichten</string>
+  <string name="dialog_title_delete_all_messages">Bevestig verwijderen berichten</string>
+  <string name="dialog_message_delete_all_messages">Weet je zeker dat je alle berichten wil verwijderen?</string>
+  <string name="dialog_title_not_all_messages_deleted">Kon niet alle berichten verwijderen</string>
  <string name="delete_contact">Verwijder bericht</string>
  <string name="dialog_title_delete_contact">Bevestig verwijderen contact</string>
  <string name="dialog_message_delete_contact">Weet je zeker dat je dit contact en alle berichten die met dit contact zijn uitgewisseld wil verwijderen?</string>
@@ -139,6 +143,7 @@
  <string name="dialog_message_no_image_support">Briar van jouw contact ondersteunt nog geen afbeeldingen als bijlagen. Zodat zij upgraden zul je een ander icoon zien.</string>
  <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>
+  <string name="messaging_too_many_attachments_toast">Alleen de eerste %d afbeeldingen worden verstuurd</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>
@@ -206,6 +211,7 @@
  <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>
+  <string name="duplicate_link_dialog_text_1_contact">Je hebt al een 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
--- a/briar-android/src/main/res/values-oc/strings.xml
+++ b/briar-android/src/main/res/values-oc/strings.xml
@@ -43,11 +43,10 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
    <item quantity="one">Aquò es una version de test de Briar. Vòstre compte expirarà d’aquí %d jorn e pòt pas èsser renovat.</item>
    <item quantity="other">Aquò es una version de test de Briar. Vòstre compte expirarà d’aquí %d jorns e pòt pas èsser renovat.</item>
  </plurals>
-  <string name="expiry_update">La data finala pels ensages es passada. Vòstre compte expirarà d’aquí %d jorns.</string>
  <string name="expiry_date_reached">Vòstre logicial s’acabèt.\nMercés d’aver ensajat !</string>
-  <string name="download_briar">Per téner d’utilizar Briar mercés de telecargar la version 1.0.</string>
+  <string name="download_briar">Per tenir d’utilizar Briar, mercés de telecargar la darrièra version.</string>
  <string name="create_new_account">Vos caldrà crear un nòu compte, mas podètz emplegar lo meteis escais-nom.</string>
-  <string name="download_briar_button">Telecargar Briar 1.0</string>
+  <string name="download_briar_button">Telecargar la darrièra version</string>
  <string name="startup_open_database">Deschirament de la basa de donadas…</string>
  <string name="startup_migrate_database">Mesa a nivèl de la basa de donadas…</string>
  <string name="startup_compact_database">Compression de la basa de donadas…</string>
@@ -112,6 +111,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
  <string name="fix">Correccion</string>
  <string name="help">Ajuda</string>
  <string name="sorry">O planhèm</string>
+  <string name="error_start_activity">Pas disponibla per vòstre sistèma</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Cap de contacte de mostrar</string>
  <string name="no_contacts_action">Tocatz l’icòna + per ajustar un contacte</string>
@@ -126,6 +126,10 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
  <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>
+  <string name="delete_all_messages">Suprimir totes los messatges</string>
+  <string name="dialog_title_delete_all_messages">Confirmatz la supression dels messatges</string>
+  <string name="dialog_message_delete_all_messages">Volètz vertadièrament suprimir totes los messatges ?</string>
+  <string name="dialog_title_not_all_messages_deleted">Supression de totes los messatges impossibla</string>
  <string name="delete_contact">Suprimir lo contacte</string>
  <string name="dialog_title_delete_contact">Confirmatz la supression del contacte</string>
  <string name="dialog_message_delete_contact">Sètz segur de voler suprimir lo contacte e los messatges ligats a el ?</string>
@@ -141,6 +145,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
  <string name="dialog_message_no_image_support">Vòstre contacte Briar pòt pas encara recebre d’imatges junts. Un còp qu’aurà mes a jorn sa version veiretz una icòna diferenta.</string>
  <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>
+  <string name="messaging_too_many_attachments_toast">Solament los %d primièrs imatges seràn enviats</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>
@@ -208,6 +213,7 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
  <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>
+  <string name="duplicate_link_dialog_text_1_contact">Avètz ja un contacte 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
--- a/briar-android/src/main/res/values-pl/strings.xml
+++ b/briar-android/src/main/res/values-pl/strings.xml
@@ -43,11 +43,8 @@
    <item quantity="many">To jest testowa wersja Briar. Twoje konto wygaśnie za %d dni i nie będzie odnowione.</item>
    <item quantity="other">To jest testowa wersja Briar. Twoje konto wygaśnie za %d dni i nie będzie odnowione.</item>
  </plurals>
-  <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">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>
--- a/briar-android/src/main/res/values-pt-rBR/strings.xml
+++ b/briar-android/src/main/res/values-pt-rBR/strings.xml
@@ -41,11 +41,8 @@
    <item quantity="one">Esta é uma versão de teste do Briar. Sua conta irá expirar em %d dia e não poderá ser renovada.</item>
    <item quantity="other">Esta é uma versão de teste do Briar. Sua conta irá expirar em %d dias e não poderá ser renovada.</item>
  </plurals>
-  <string name="expiry_update">O prazo de validade da versão de teste foi extendido. Agora sua conta irá expirar em %d dias.</string>
  <string name="expiry_date_reached">Este software expirou.\nObrigado por testar!</string>
-  <string name="download_briar">Para continuar usando o Briar, por favor baixe a versão 1.0.</string>
  <string name="create_new_account">Você precisará criar uma nova conta, mas poderá usar o mesmo nome de usuária.</string>
-  <string name="download_briar_button">Baixar Briar 1.0</string>
  <string name="startup_open_database">Descriptografando Banco de Dados...</string>
  <string name="startup_migrate_database">Atualizando Banco de Dados...</string>
  <string name="startup_compact_database">Compactando Banco de Dados...</string>
--- a/briar-android/src/main/res/values-ro/strings.xml
+++ b/briar-android/src/main/res/values-ro/strings.xml
@@ -42,11 +42,10 @@
    <item quantity="few">Aceasta este o versiune de test pentru Briar. Contul dumneavoastră va expira în %d zile și nu se poate reînnoi.</item>
    <item quantity="other">Aceasta este o versiune de test pentru Briar. Contul dumneavoastră va expira în %d de zile și nu se poate reînnoi.</item>
  </plurals>
-  <string name="expiry_update">Data de expirare a versiunii de test a fost extinsă. Contul dumneavoastră va expira acum în %d zile.</string>
  <string name="expiry_date_reached">Acest program a expirat.\nVă mulțumim că l-ați testat!</string>
-  <string name="download_briar">Pentru a putea să continuați utilizarea Briar, vă rugăm să descărcați versiunea 1.0.</string>
+  <string name="download_briar">Pentru a putea să utilizați Briar în continuare, vă rugăm să descărcați ultima versiune.</string>
  <string name="create_new_account">Va trebui să creați un cont nou, dar puteți să folosiți același nume.</string>
-  <string name="download_briar_button">Descarcă Briar 1.0</string>
+  <string name="download_briar_button">Descarcă ultima versiune</string>
  <string name="startup_open_database">Decriptare bază de date...</string>
  <string name="startup_migrate_database">Actualizare bază de date...</string>
  <string name="startup_compact_database">Compactare bază de date...</string>
@@ -115,6 +114,7 @@
  <string name="fix">Rezolvă</string>
  <string name="help">Ajutor</string>
  <string name="sorry">Ne pare rău</string>
+  <string name="error_start_activity">Indisponibil pentru sistemul dumneavoastră</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Nici un contact de arătat</string>
  <string name="no_contacts_action">Atingeți iconița + pentru a adăuga un contact</string>
@@ -133,7 +133,13 @@
  <string name="dialog_title_delete_all_messages">Confirmare ștergere mesaj</string>
  <string name="dialog_message_delete_all_messages">Sigur doriți să ștergeți toate mesajele?</string>
  <string name="dialog_title_not_all_messages_deleted">Nu s-au putut șterge toate mesajele</string>
-  <string name="dialog_message_not_all_messages_deleted">Mesajele referitoare la recomandări sau invitații în curs nu pot fi șterse înainte de a se încheia.</string>
+  <string name="dialog_message_not_deleted_ongoing_both">Mesajele referitoare la recomandări sau invitații în curs nu pot fi șterse înainte de a se încheia.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Mesajele referitoare la recomandări în curs nu pot fi șterse înainte de a se încheia.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Mesajele referitoare la invitații în curs nu pot fi șterse înainte de a se încheia.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Mesajele descărcate parțial nu pot fi șterse înainte de a se termina de descărcat.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Pentru a șterge o invitație sau o recomandare, trebuie să selectați cererea și răspunsul.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Pentru a șterge o recomandare trebuie să selectați cererea și răspunsul.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Pentru a șterge o invitație trebuie să selectați cererea și răspunsul.</string>
  <string name="delete_contact">Șterge contactul</string>
  <string name="dialog_title_delete_contact">Confirmare ștergere contact</string>
  <string name="dialog_message_delete_contact">Sigur doriți să ștergeți acest contact și toate mesajele schimbate?</string>
--- a/briar-android/src/main/res/values-ru/strings.xml
+++ b/briar-android/src/main/res/values-ru/strings.xml
@@ -45,11 +45,10 @@
    <item quantity="many">Это бета-версия Briar. Срок действия вашего аккаунта закончится через %d дней и не может быть возобновлен.</item>
    <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="download_briar">Для продолжения использования Briar, пожалуйста, скачайте последнюю версию.</string>
  <string name="create_new_account">Вам необходимо создать новую учетную запись, но вы можете использовать тот же псевдоним.</string>
-  <string name="download_briar_button">Загрузить Briar 1.0</string>
+  <string name="download_briar_button">Загрузить последнюю версию</string>
  <string name="startup_open_database">Расшифровка базы данных...</string>
  <string name="startup_migrate_database">Обновление базы данных...</string>
  <string name="startup_compact_database">Сжатие базы данных...</string>
@@ -122,6 +121,7 @@
  <string name="fix">Исправить</string>
  <string name="help">Помощь</string>
  <string name="sorry">Сожалеем</string>
+  <string name="error_start_activity">Недоступно для вашей системы</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Нет контактов для отображения</string>
  <string name="no_contacts_action">Для добавления контакта нажмите значок +</string>
@@ -140,7 +140,13 @@
  <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="dialog_message_not_deleted_ongoing_both">Сообщения, связанные с текущими приглашениями и представлениями, не могут быть удалены до их завершения.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Сообщения, связанные с текущими представлениями, не могут быть удалены до их завершения.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Сообщения, связанные с текущими приглашениями, не могут быть удалены до их завершения.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Частично загруженные сообщения не могут быть удалены, пока они не загрузятся полностью.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Чтобы удалить приглашение или представление, вам необходимо выбрать запрос и ответ.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Чтобы удалить представление, необходимо выбрать запрос и ответ.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Чтобы удалить приглашение, необходимо выбрать запрос и ответ.</string>
  <string name="delete_contact">Удалить контакт</string>
  <string name="dialog_title_delete_contact">Подтвердите удаление контакта</string>
  <string name="dialog_message_delete_contact">Вы действительно хотите удалить этот контакт и все связанные с ним сообщения?</string>
--- a/briar-android/src/main/res/values-sq/strings.xml
+++ b/briar-android/src/main/res/values-sq/strings.xml
@@ -21,8 +21,8 @@
  <string name="don_t_ask_again">Mos pyet sërish</string>
  <string name="setup_huawei_text">Ju lutemi, prekni butoni më poshtë dhe sigurohuni që Briar-i të jetë i mbrojtur, te skena \"Aplikacione të Mbrojtur\".</string>
  <string name="setup_huawei_button">Mbroje Briar-in</string>
-  <string name="setup_huawei_help">Nëse Briar-i s’është shtuar te lista e aplikacioneve të mbrojtur, s’do të jetë në gjendje të xhirojë në prapaskenë.</string>
-  <string name="warning_dozed">%s s’qe në gjendje të xhirojë në prapaskenë</string>
+  <string name="setup_huawei_help">Nëse Briar-i s\’është shtuar te lista e aplikacioneve të mbrojtur, s\’do të jetë në gjendje të xhirojë në prapaskenë.</string>
+  <string name="warning_dozed">%s s\’qe në gjendje të xhirojë në prapaskenë</string>
  <!--Login-->
  <string name="enter_password">Fjalëkalim</string>
  <string name="try_again">Fjalëkalim i gabuar, riprovoni</string>
@@ -33,19 +33,18 @@
  <string name="startup_failed_notification_title">Briar-i s\’u nis dot</string>
  <string name="startup_failed_notification_text">Prekeni për më tepër të dhëna.</string>
  <string name="startup_failed_activity_title">Dështim Nisjeje i Briar-it</string>
-  <string name="startup_failed_db_error">Për ndonjë arsye, baza e të dhënave të Briar-it është e dëmtuar sa nuk ndreqet dot. Llogaria juaj, të dhënat tuaja dhe krejt kontaktet tuaja humbën. Mjerisht, ju duhet të ri-instaloni Briar-in dhe të rregulloni një llogari të re, duke zgjedhur \'Kam harruar fjalëkalimin tim\' te hapi për fjalëkalimin.</string>
-  <string name="startup_failed_data_too_old_error">Llogaria juaj qe krijuar me një version të vjetër të këtij aplikacioni dhe s\’mund të hapet me këtë version. Ose duhet të ri-instaloni versionin e vjetër, ose të fshini llogarinë tuaj të vjetër duke zgjedhur \'Kam harruar fjalëkalimin tim\' te hapi për fjalëkalimin.</string>
+  <string name="startup_failed_db_error">Për ndonjë arsye, baza e të dhënave të Briar-it është e dëmtuar sa nuk ndreqet dot. Llogaria juaj, të dhënat tuaja dhe krejt kontaktet tuaja humbën. Mjerisht, duhet të riinstaloni Briar-in dhe të rregulloni një llogari të re, duke zgjedhur \'Kam harruar fjalëkalimin tim\' te hapi për fjalëkalimin.</string>
+  <string name="startup_failed_data_too_old_error">Llogaria juaj qe krijuar me një version të vjetër të këtij aplikacioni dhe s\’mund të hapet me këtë version. Ose duhet të riinstaloni versionin e vjetër, ose të fshini llogarinë tuaj të vjetër duke zgjedhur \'Kam harruar fjalëkalimin tim\' te hapi për fjalëkalimin.</string>
  <string name="startup_failed_data_too_new_error">Ky version i aplikacionit është shumë i vjetër. Ju lutemi, përmirësojeni me versionin më të ri dhe riprovoni.</string>
-  <string name="startup_failed_service_error">Briar-i s\’arriti të nisë një shtojcë të domosdoshme. Zakonisht këtë problem e zgjidh Ri-instalimi i Briar-it. Por, ju lutemi, kini parasysh se me të do të humbni llogarinë tuaj dhe krejt të dhënat e lidhura me të, ngaqë Briar nuk përdor shërbyes qendrorë për të depozituar në ta të dhënat tuaja.</string>
+  <string name="startup_failed_service_error">Briar-i s\’arriti të nisë një shtojcë të domosdoshme. Zakonisht këtë problem e zgjidh riinstalimi i Briar-it. Por, ju lutemi, kini parasysh se me të do të humbni llogarinë tuaj dhe krejt të dhënat e lidhura me të, ngaqë Briar nuk përdor shërbyes qendrorë për të depozituar në ta të dhënat tuaja.</string>
  <plurals name="expiry_warning">
    <item quantity="one">Ky është një version beta i Briar-it. Llogaria juaj do të skadojë për %d ditë dhe s\’mund të rinovohet.</item>
    <item quantity="other">Ky është një version beta i Briar-it. Llogaria juaj do të skadojë për %d ditë dhe s\’mund të rinovohet.</item>
  </plurals>
-  <string name="expiry_update">Data e skadimit të periudhës së testimit është shtyrë më tej. Tani llogaria juaj do të skadojë për %d ditë.</string>
  <string name="expiry_date_reached">Ky software ka skaduar.\nFaleminderit që e provuat!</string>
-  <string name="download_briar">Që të vazhdoni të përdorni Briar-in, ju lutemi, shkarkoni versionin 1.0.</string>
+  <string name="download_briar">Që të vazhdoni të përdorni Briar-in, ju lutemi shkarkoni versionin më të ri.</string>
  <string name="create_new_account">Do t’ju duhet të krijoni një llogari të re, por mund të përdorni të njëjtën nofkë.</string>
-  <string name="download_briar_button">Shkarko Briar 1.0</string>
+  <string name="download_briar_button">Shkarkoni Hedhjen Më të Re Në Qarkullim</string>
  <string name="startup_open_database">Po shfshehtëzohet Baza e të Dhënave…</string>
  <string name="startup_migrate_database">Po përditësohet Baza e të dhënave…</string>
  <string name="startup_compact_database">Po kompaktësohet Baza e të Dhënave…</string>
@@ -110,6 +109,7 @@
  <string name="fix">Ndreqeni</string>
  <string name="help">Ndihmë</string>
  <string name="sorry">Na ndjeni</string>
+  <string name="error_start_activity">Jo i passhëm në sistemin tuaj</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">S’ka kontakte për shfaqje</string>
  <string name="no_contacts_action">Prekni ikonën + që të shtoni një kontakt</string>
@@ -118,7 +118,7 @@
  <string name="message_hint">Shtypni mesazhin</string>
  <string name="image_caption_hint">Shtoni një titull (na daçi)</string>
  <string name="image_attach">Bashkëngjitni figurë</string>
-  <string name="image_attach_error">S’u bashkëngjit dot figurë(a)</string>
+  <string name="image_attach_error">S\’u bashkëngjit dot figurë(a)</string>
  <string name="image_attach_error_too_big">Figurë shumë e madhe. Kufiri është %d MB.</string>
  <string name="image_attach_error_invalid_mime_type">Format i pambuluar figure: %s</string>
  <string name="set_contact_alias">Ndryshoni emër kontakti</string>
@@ -127,8 +127,14 @@
  <string name="delete_all_messages">Fshiji krejt mesazhet</string>
  <string name="dialog_title_delete_all_messages">Ripohoni Fshirje Mesazhesh</string>
  <string name="dialog_message_delete_all_messages">Jeni i sigurt se doni të fshihen krejt mesazhet?</string>
-  <string name="dialog_title_not_all_messages_deleted">S’u fshinë dot krejt mesazhet</string>
-  <string name="dialog_message_not_all_messages_deleted">Mesazhet që lidhen me hyrje në zhvillim e sipër, ose me ftesa, s’mund të fshihen pa përfunduar.</string>
+  <string name="dialog_title_not_all_messages_deleted">S\’u fshinë dot krejt mesazhet</string>
+  <string name="dialog_message_not_deleted_ongoing_both">Mesazhe të lidhur me ftesa dhe prezantime në kryerje e sipër s\’mund të fshihen para se të kryhen.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Mesazhe të lidhur me prezantime në kryerje e sipër s\’mund të fshihen para se të kryhen.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Mesazhe të lidhur me ftesa në kryerje e sipër s\’mund të fshihen para se të kryhen.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Mesazhe të shkarkuar pjesërisht s\’mund të fshihen para se të përfundojë shkarkimi.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Për të fshirë një ftesë apo prezantim, lypset të përzgjidhni kërkesën dhe përgjigjen.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Për të fshirë një prezantim, lypset të përzgjidhni kërkesën dhe përgjigjen.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Për të fshirë një ftesë, lypset të përzgjidhni kërkesën dhe përgjigjen.</string>
  <string name="delete_contact">Fshije kontaktin</string>
  <string name="dialog_title_delete_contact">Ripohoni Fshirje Kontakti</string>
  <string name="dialog_message_delete_contact">Jeni i sigurt se doni të hiqet ky kontakt dhe krejt mesazhet e shkëmbyer me këtë kontakt?</string>
@@ -137,12 +143,12 @@
  <string name="you">Ju</string>
  <string name="save_image">Ruaje figurën</string>
  <string name="dialog_title_save_image">Të ruhet Figura?</string>
-  <string name="dialog_message_save_image">Ruajta e kësaj figure do t’u lejojë aplikacioneve të tjera ta përdorin.\n\nJeni i sigurt se doni të ruhet?</string>
+  <string name="dialog_message_save_image">Ruajta e kësaj figure do t\’u lejojë aplikacioneve të tjera ta përdorin.\n\nJeni i sigurt se doni të ruhet?</string>
  <string name="save_image_success">Figura u ruajt</string>
-  <string name="save_image_error">Figura s’u ruajt dot</string>
+  <string name="save_image_error">Figura s\’u ruajt dot</string>
  <string name="dialog_title_no_image_support">Figura të Pakapshme</string>
  <string name="dialog_message_no_image_support">Briar-i i kontaktit tuaj nuk i mbulon ende bashkëngjitjet figura. Sapo ta përditësojë, do të shihni tjetër ikonë.</string>
-  <string name="dialog_title_image_support">Tani mund t’i dërgoni figura këtij kontakti</string>
+  <string name="dialog_title_image_support">Tani mund t\’i dërgoni figura këtij kontakti</string>
  <string name="dialog_message_image_support">Prekeni këtë ikonë që të bashkëngjitni figura.</string>
  <string name="messaging_too_many_attachments_toast">Do të dërgohen vetëm %d figurat e para</string>
  <!--Adding Contacts-->
@@ -184,14 +190,14 @@
  <string name="adding_contact_error">Pati një gabim në shtimin e kontaktit.</string>
  <string name="pending_contact_requests_snackbar">Ka kërkesa kontakti pezull</string>
  <string name="pending_contact_requests">Kërkesa Kontakti Pezull</string>
-  <string name="no_pending_contacts">S’ka kontakte pezull</string>
+  <string name="no_pending_contacts">S\’ka kontakte pezull</string>
  <string name="add_contact_remote_connecting">Duke u kyqur...</string>
  <string name="waiting_for_contact_to_come_online">Po pritet që kontakti të jetë në linjë…</string>
  <string name="connecting">Duke u kyqur...</string>
  <string name="adding_contact">Po shtohet kontakti…</string>
  <string name="adding_contact_failed">Shtimi i kontaktit dështoi</string>
  <string name="dialog_title_remove_pending_contact">Ripohoni Heqjen</string>
-  <string name="dialog_message_remove_pending_contact">Ky kontakt ende po shtohet. Nëse e hiqni tani, s’do të shtohet.</string>
+  <string name="dialog_message_remove_pending_contact">Ky kontakt ende po shtohet. Nëse e hiqni tani, s\’do të shtohet.</string>
  <string name="own_link_error">Jepni lidhjen e kontaktit tuaj, jo tuajën</string>
  <string name="nickname_missing">Ju lutemi, jepni një nofkë</string>
  <string name="invalid_link">Lidhje e pavlefshme</string>
@@ -207,9 +213,9 @@
    <item quantity="other">U shtuan %d kontakte të reja.</item>
  </plurals>
  <string name="adding_contact_slow_warning">Shtimi i këtij kontakti po zgjat më shumë se zakonisht</string>
-  <string name="adding_contact_slow_title">S’lidhet Dot Me Kontaktin</string>
+  <string name="adding_contact_slow_title">S\’lidhet Dot Me Kontaktin</string>
  <string name="adding_contact_slow_text">Shtimi i këtij kontakti po zgjat më shumë se zakonisht.\n\nJu lutemi, kontrolloni nëse kontakti juaj e ka marrë lidhjen tuaj dhe ju ka shtuar:</string>
-  <string name="offline_state">S’ka lidhje internet</string>
+  <string name="offline_state">S\’ka lidhje internet</string>
  <string name="duplicate_link_dialog_title">Lidhje e Përsëdytur</string>
  <string name="duplicate_link_dialog_text_1">Keni tashmë një kontakt pezull me këtë lidhje: %s</string>
  <string name="duplicate_link_dialog_text_1_contact">Keni tashmë një kontakt me këtë lidhje: %s</string>
@@ -491,7 +497,7 @@
  <!--Link Warning-->
  <string name="link_warning_title">Sinjalizim Lidhjeje</string>
  <string name="link_warning_intro">Ju ndan një hap nga hapja e lidhjes vijuese me një aplikacion të jashtëm.</string>
-  <string name="link_warning_text">Kjo mund të përdoret për t’ju identifikuar. Sillni në mend nëse i zini besë personit që ju dërgoi lidhjen dhe shihni mundësinë e hapjes së saj me Shfletuesin Tor.</string>
+  <string name="link_warning_text">Kjo mund të përdoret për t\’ju identifikuar. Sillni në mend nëse i zini besë personit që ju dërgoi lidhjen dhe shihni mundësinë e hapjes së saj me Shfletuesin Tor.</string>
  <string name="link_warning_open_link">Hape Lidhjen</string>
  <!--Crash Reporter-->
  <string name="crash_report_title">Njoftim Vithisjesh Briar-i</string>
@@ -513,7 +519,7 @@
  <string name="progress_title_logout">Po dilet nga Briar-i…</string>
  <!--Screen Filters & Tapjacking-->
  <string name="screen_filter_title">U kap dalje jashtë ekrani</string>
-  <string name="screen_filter_body">Sipër Briar-it po vizaton një tjetër aplikacion. Për të mbrojtur sigurinë tuaj, Briar-i nuk do t\’u përgjigjet prekjeve kur një tjetër aplikacion vizaton përsipër.\n\nPërsipër mund të jenë duke vizatuar aplikacionet vijues:\n\n%1$s</string>
+  <string name="screen_filter_body">Sipër Briar-it po vizaton një tjetër aplikacion. Për të mbrojtur sigurinë tuaj, Briar-i s\’do t\’u përgjigjet prekjeve kur një tjetër aplikacion vizaton përsipër.\n\nPërsipër mund të jenë duke vizatuar aplikacionet vijues:\n\n%1$s</string>
  <string name="screen_filter_allow">Lejoji këto aplikacione të vizatojnë përsipër</string>
  <!--Permission Requests-->
  <string name="permission_camera_title">Leje mbi kamerën</string>
@@ -527,7 +533,7 @@
  <string name="show_qr_code_fullscreen">Shfaqe kodin QR sa tërë ekrani</string>
  <!--App Locking-->
  <string name="lock_unlock">Shkyçe Briar-in</string>
-  <string name="lock_unlock_verbose">Që të shkyçet Briar-i, jepni PIN-in, mostrën ose fjalëkalimin e pajisjes tuaj</string>
+  <string name="lock_unlock_verbose">Që të shkyçet Briar-i, jepni PIN-in, rregullsinë ose fjalëkalimin e pajisjes tuaj</string>
  <string name="lock_unlock_fingerprint_description">Që të vazhdohet, prekni me gishtin e regjistruar ndijuesin e shenjave të gishtave</string>
  <string name="lock_unlock_password">Përdor Fjalëkalim</string>
  <string name="lock_is_locked">Briar-i është i kyçur</string>
--- a/briar-android/src/main/res/values-sr/strings.xml
+++ b/briar-android/src/main/res/values-sr/strings.xml
@@ -44,11 +44,8 @@ Izaberite dugačku lozinku koju je teško pogoditi, kao četiri nasumične rije
    <item quantity="few">Ovo je testna verzija Briara. Vaš račun će isteći za %d dana i ne može se obnoviti.</item>
    <item quantity="other">Ovo je testna verzija Briara. Vaš račun će isteći za %d dana i ne može se obnoviti.</item>
  </plurals>
-  <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 je istekao.\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 isti nadimak.</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">Sabijanje baze</string>
--- a/briar-android/src/main/res/values-sv/strings.xml
+++ b/briar-android/src/main/res/values-sv/strings.xml
@@ -41,11 +41,10 @@
    <item quantity="one">Det här är en test-version av Briar. Ditt konto kommer att upphöra om %d dagar och kan ej förnyas.</item>
    <item quantity="other">Det här är en test-version av Briar. Ditt konto kommer att upphöra om %d dag och kan ej förnyas.</item>
  </plurals>
-  <string name="expiry_update">Utgångsdatum för test har förlängts. Ditt konto kommer nu att upphöra om %d dagar.</string>
  <string name="expiry_date_reached">Mjukvaran har gått ut.\nTack för att du bidragit till att testa!</string>
-  <string name="download_briar">Ladda ner version 1.0 för att kunna fortsätta använda Briar.</string>
+  <string name="download_briar">För att fortsätta använda Briar, hämta den senaste utgåvan.</string>
  <string name="create_new_account">Du måste skapa ett nytt konto, men du kan använda samma smeknamn.</string>
-  <string name="download_briar_button">Ladda ner Briar 1.0</string>
+  <string name="download_briar_button">Hämta senaste utgåvan</string>
  <string name="startup_open_database">Dekrypterar databasen...</string>
  <string name="startup_migrate_database">Uppgraderar databasen...</string>
  <string name="startup_compact_database">Komprimerar databasen...</string>
@@ -85,7 +84,7 @@
  </plurals>
  <plurals name="blog_post_notification_text">
    <item quantity="one">Ett nytt blogginlägg.</item>
-    <item quantity="other">%dnya blogginlägg.</item>
+    <item quantity="other">%d nya blogginlägg.</item>
  </plurals>
  <!--Misc-->
  <string name="now">nu</string>
@@ -110,6 +109,7 @@
  <string name="fix">Laga</string>
  <string name="help">Hjälp</string>
  <string name="sorry">Tyvärr</string>
+  <string name="error_start_activity">Otillgänglig på ditt system</string>
  <!--Contacts and Private Conversations-->
  <string name="no_contacts">Inga kontakter</string>
  <string name="no_contacts_action">Tryck på plus-ikonen (+) för att lägga till en kontakt</string>
@@ -124,6 +124,17 @@
  <string name="set_contact_alias">Ändra namn på kontakt</string>
  <string name="set_contact_alias_hint">Kontaktnamn</string>
  <string name="set_alias_button">Ändra</string>
+  <string name="delete_all_messages">Ta bort alla meddelanden</string>
+  <string name="dialog_title_delete_all_messages">Bekräfta meddelande borttagning</string>
+  <string name="dialog_message_delete_all_messages">Är du säker på att du vill ta bort alla meddelanden?</string>
+  <string name="dialog_title_not_all_messages_deleted">Det gick inte att ta bort alla meddelanden</string>
+  <string name="dialog_message_not_deleted_ongoing_both">Meddelanden relaterade till pågående inbjudningar och introduktioner kan inte tas bort förrän de avslutas.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Meddelanden relaterade till pågående introduktioner kan inte tas bort förrän de avslutas.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Meddelanden relaterade till pågående inbjudningar kan inte tas bort förrän de avslutas.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Delvis hämtade meddelanden kan inte tas bort förrän de har hämtats.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">För att ta bort en inbjudan eller introduktion måste du välja förfrågan och svaret.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">För att ta bort en introduktion måste du välja förfrågan och svaret.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">För att ta bort en inbjudan måste du välja förfrågan och svaret.</string>
  <string name="delete_contact">Radera kontakt</string>
  <string name="dialog_title_delete_contact">Bekräfta radering av kontakt</string>
  <string name="dialog_message_delete_contact">Är du säker att du vill radera denna kontakt och alla meddelanden?</string>
@@ -139,6 +150,7 @@
  <string name="dialog_message_no_image_support">Din kontakt använder en version av Briar som inte stödjer bifogade bilder. En annan ikon kommer att visas när denne har uppgraderat.</string>
  <string name="dialog_title_image_support">Du kan nu skicka bilder till den här kontakten</string>
  <string name="dialog_message_image_support">Tryck på denna ikon för att bifoga bilder.</string>
+  <string name="messaging_too_many_attachments_toast">Endast de första %d bilder kommer att skickas</string>
  <!--Adding Contacts-->
  <string name="add_contact_title">Lägg till en närvarande kontakt</string>
  <string name="face_to_face">Du måste personligen träffa den som du vill lägga till som kontakt.\n\nDetta för att undvika att någon senare låtsas vara du eller läser dina meddelanden.</string>
@@ -206,6 +218,7 @@
  <string name="offline_state">Ingen Internetanslutning</string>
  <string name="duplicate_link_dialog_title">Kopiera länk</string>
  <string name="duplicate_link_dialog_text_1">Du har redan en väntande kontakt med den här länken: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Du har redan en kontakt med den här länken: %s</string>
  <!--This is a question asking whether two nicknames refer to the same person-->
  <string name="duplicate_link_dialog_text_2">Är %s och %s samma person?</string>
  <!--This is a button for answering that two nicknames do indeed refer to the same person. This
--- a/briar-android/src/main/res/values-sw/strings.xml
+++ b/briar-android/src/main/res/values-sw/strings.xml
@@ -44,11 +44,8 @@ umepoteza nenosiri</string>
  <string name="startup_failed_data_too_old_error">Akaunti yako imetengenezwa na tolea la zamani la programu hii na Haiwezekani kufungua hili toleo . Nilazima ubadili hili toleo la zamani au utengeneze Akaunti mpaya kwa kuchagua umesahau nenosiri Katika uwanja wa nenosiri </string>
  <string name="startup_failed_data_too_new_error">Hili toleo la programu ulilo tumia nila zamani . Tafathi boresha kuwa toleo jipya na ujaribu tena .</string>
  <string name="startup_failed_service_error">Briar imeshindikan kuanza Unabidi uunganishwe . Hianzishe Briar kama kwawaida kuondoka hilo tatizo . Japo kuwa utapoteza Akaunti yako na data zako zote kutokana na Briar haifathi data zako kwenye seva kuu.</string>
-  <string name="expiry_update">Muda wa majaribio umeongezwa mbele . Akaunti yako itafikia muda wake kuisha %d siku .</string>
  <string name="expiry_date_reached">Hii programu imemaliza muda wake.\nAsante kwa kujaribu </string>
-  <string name="download_briar">kuendelea kutumia Briar, Tafathali pakua toleo 1.0.</string>
  <string name="create_new_account">Unahitajika  kutenege Akaunti Mpaya , ila unaweza endelea kutumia lakabu yako .</string>
-  <string name="download_briar_button">Pakua Briar 1.0</string>
  <string name="startup_open_database">Kupunguka Hifadhidata</string>
  <string name="startup_migrate_database">Boresha Hifadhidata</string>
  <string name="startup_compact_database">Kuingiliana Hifadhidata</string>
--- a/briar-android/src/main/res/values-uk/strings.xml
+++ b/briar-android/src/main/res/values-uk/strings.xml
@@ -43,11 +43,8 @@
    <item quantity="many">Це тестова версія Briar. Термін дії вашого профілю спливає через %d днів. Його не можна продовжити.</item>
    <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>
@@ -89,7 +86,7 @@
    <item quantity="one">Новий допис на форумі.</item>
    <item quantity="few">%d нові дописи на форумі.</item>
    <item quantity="many">%d нових дописів на форумі.</item>
-    <item quantity="other">%dнового допису на форумі.</item>
+    <item quantity="other">%d нового допису на форумі.</item>
  </plurals>
  <plurals name="blog_post_notification_text">
    <item quantity="one">Новий допис у блозі.</item>
@@ -250,8 +247,8 @@
  <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_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>
@@ -342,7 +339,7 @@
  <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_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>
--- a/briar-android/src/main/res/values-zh-rCN/strings.xml
+++ b/briar-android/src/main/res/values-zh-rCN/strings.xml
@@ -40,11 +40,8 @@
  <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>
--- a/briar-android/src/main/res/values-zh-rTW/strings.xml
+++ b/briar-android/src/main/res/values-zh-rTW/strings.xml
@@ -40,11 +40,8 @@
  <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>
--- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
@@ -130,7 +130,8 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 	protected C c0, c1, c2;

 	private final Semaphore messageSemaphore = new Semaphore(0);
-	private final AtomicInteger messageCounter = new AtomicInteger(0);
+	private final AtomicInteger deliveryCounter = new AtomicInteger(0);
+	private final AtomicInteger validationCounter = new AtomicInteger(0);
 	private final AtomicInteger ackCounter = new AtomicInteger(0);
 	private final File testDir = TestUtils.getTestDirectory();
 	private final String AUTHOR0 = "Author 0";
@@ -163,6 +164,9 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 		validationWaiter = new Waiter();
 		deliveryWaiter = new Waiter();
 		ackWaiter = new Waiter();
+		deliveryCounter.set(0);
+		validationCounter.set(0);
+		ackCounter.set(0);

 		createAndRegisterIdentities();
 		startLifecycles();
@@ -212,14 +216,14 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 					if (event.getState() == DELIVERED) {
 						LOG.info("Delivered new message "
 								+ event.getMessageId());
-						messageCounter.addAndGet(1);
+						deliveryCounter.addAndGet(1);
 						loadAndLogMessage(event.getMessageId());
 						deliveryWaiter.resume();
 					} else if (event.getState() == INVALID ||
 							event.getState() == PENDING) {
 						LOG.info("Validated new " + event.getState().name() +
 								" message " + event.getMessageId());
-						messageCounter.addAndGet(1);
+						validationCounter.addAndGet(1);
 						loadAndLogMessage(event.getMessageId());
 						validationWaiter.resume();
 					}
@@ -380,10 +384,13 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone

 		if (valid) {
 			deliveryWaiter.await(TIMEOUT, num);
+			assertEquals("Messages delivered", num,
+					deliveryCounter.getAndSet(0));
 		} else {
 			validationWaiter.await(TIMEOUT, num);
+			assertEquals("Messages validated", num,
+					validationCounter.getAndSet(0));
 		}
-		assertEquals("Messages delivered", num, messageCounter.getAndSet(0));
 		try {
 			messageSemaphore.tryAcquire(num, TIMEOUT, MILLISECONDS);
 		} catch (InterruptedException e) {
@@ -421,7 +428,7 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone

 		ackWaiter.await(TIMEOUT, num);
 		assertEquals("ACKs delivered", num, ackCounter.getAndSet(0));
-		assertEquals("No messages delivered", 0, messageCounter.get());
+		assertEquals("No messages delivered", 0, deliveryCounter.get());
 		try {
 			messageSemaphore.tryAcquire(num, TIMEOUT, MILLISECONDS);
 		} catch (InterruptedException e) {
--- a/briar-headless/README.md
+++ b/briar-headless/README.md
@@ -71,6 +71,8 @@ Returns a JSON array of contacts:
 }
 ```

+Note that the key `alias` isn't guaranteed to be in the response.
+
 ### Adding a contact

 The first step is to get your own link:
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
@@ -96,8 +96,5 @@ internal class HeadlessModule(private val appDir: File) {
    internal fun provideObjectMapper() = ObjectMapper()

    @Provides
-    internal fun provideFeatureFlags() = object : FeatureFlags {
-        override fun shouldEnableImageAttachments() = false
-        override fun shouldEnablePrivateMessageDeletion() = true
-    }
+    internal fun provideFeatureFlags() = FeatureFlags { false }
 }
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt
@@ -63,8 +63,5 @@ internal class HeadlessTestModule(private val appDir: File) {
    internal fun provideObjectMapper() = ObjectMapper()

    @Provides
-    internal fun provideFeatureFlags() = object : FeatureFlags {
-        override fun shouldEnableImageAttachments() = false
-        override fun shouldEnablePrivateMessageDeletion() = true
-    }
+    internal fun provideFeatureFlags() = FeatureFlags { false }
 }