Bump version numbers for 1.2.7 release.

Don't overwrite listener references with null during fragment changes

Closes #1707, #1706, #1704, and #1697

See merge request briar/briar!1227

bramble-android/build.gradle

@@ -11,8 +11,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 28
-		versionCode 10205
+		versionCode 10207
-		versionName "1.2.5"
+		versionName "1.2.7"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java

@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
@@ -47,7 +46,10 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
 import static android.bluetooth.BluetoothAdapter.STATE_OFF;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
 import static android.bluetooth.BluetoothDevice.ACTION_FOUND;
+import static android.bluetooth.BluetoothDevice.DEVICE_TYPE_LE;
 import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Collections.shuffle;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
@@ -240,11 +242,15 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 						break;
 					} else if (ACTION_FOUND.equals(action)) {
 						BluetoothDevice d = i.getParcelableExtra(EXTRA_DEVICE);
-						String address = d.getAddress();
+						// Ignore Bluetooth LE devices
-						if (LOG.isLoggable(INFO))
+						if (SDK_INT < 18 || d.getType() != DEVICE_TYPE_LE) {
-							LOG.info("Discovered " + scrubMacAddress(address));
+							String address = d.getAddress();
-						if (!addresses.contains(address))
+							if (LOG.isLoggable(INFO))
-							addresses.add(address);
+								LOG.info("Discovered " +
+										scrubMacAddress(address));
+							if (!addresses.contains(address))
+								addresses.add(address);
+						}
 					}
 					now = clock.currentTimeMillis();
 				}
@@ -260,7 +266,7 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 			appContext.unregisterReceiver(receiver);
 		}
 		// Shuffle the addresses so we don't always try the same one first
-		Collections.shuffle(addresses);
+		shuffle(addresses);
 		return addresses;
 	}
 

briar-android/build.gradle

@@ -22,8 +22,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 28
-		versionCode 10205
+		versionCode 10207
-		versionName "1.2.5"
+		versionName "1.2.7"
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
@@ -98,7 +98,7 @@ dependencies {
 	implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
 	implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 	implementation 'com.google.android.material:material:1.1.0-beta01'
-	implementation 'androidx.recyclerview:recyclerview-selection:1.0.0'
+	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0-rc01'
 
 	implementation 'ch.acra:acra:4.11'
 	implementation 'info.guardianproject.panic:panic:1.0'

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

@@ -9,7 +9,6 @@ import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
 
 import java.util.Collection;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 @NotNullByDefault
@@ -18,7 +17,10 @@ public interface BlogController extends BaseController {
 	void setGroupId(GroupId g);
 
 	@UiThread
-	void setBlogSharingListener(@Nullable BlogSharingListener listener);
+	void setBlogSharingListener(BlogSharingListener listener);
+
+	@UiThread
+	void unsetBlogSharingListener(BlogSharingListener listener);
 
 	void loadBlogPosts(
 			ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler);

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

@@ -96,10 +96,15 @@ class BlogControllerImpl extends BaseControllerImpl
 	}
 
 	@Override
-	public void setBlogSharingListener(@Nullable BlogSharingListener listener) {
+	public void setBlogSharingListener(BlogSharingListener listener) {
 		this.listener = listener;
 	}
 
+	@Override
+	public void unsetBlogSharingListener(BlogSharingListener listener) {
+		if (this.listener == listener) this.listener = null;
+	}
+
 	@Override
 	public void eventOccurred(Event e) {
 		if (groupId == null || listener == null)

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

@@ -141,7 +141,8 @@ public class BlogFragment extends BaseFragment
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
-		blogController.setBlogSharingListener(null);
+		blogController.unsetBlogSharingListener(this);
+		sharingController.unsetSharingListener(this);
 	}
 
 	@Override

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

@@ -7,7 +7,6 @@ import org.briarproject.briar.api.blog.Blog;
 
 import java.util.Collection;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 @NotNullByDefault
@@ -19,7 +18,10 @@ public interface FeedController extends BaseController {
 	void loadPersonalBlog(ResultExceptionHandler<Blog, DbException> handler);
 
 	@UiThread
-	void setFeedListener(@Nullable FeedListener listener);
+	void setFeedListener(FeedListener listener);
+
+	@UiThread
+	void unsetFeedListener(FeedListener listener);
 
 	@NotNullByDefault
 	interface FeedListener extends BlogListener {

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

@@ -69,10 +69,15 @@ class FeedControllerImpl extends BaseControllerImpl implements FeedController {
 	}
 
 	@Override
-	public void setFeedListener(@Nullable FeedListener listener) {
+	public void setFeedListener(FeedListener listener) {
 		this.listener = listener;
 	}
 
+	@Override
+	public void unsetFeedListener(FeedListener listener) {
+		if (this.listener == listener) this.listener = null;
+	}
+
 	@Override
 	public void eventOccurred(Event e) {
 		if (listener == null) throw new IllegalStateException();

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

@@ -134,7 +134,7 @@ public class FeedFragment extends BaseFragment implements
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
-		feedController.setFeedListener(null);
+		feedController.unsetFeedListener(this);
 	}
 
 	@Override

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

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

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

@@ -54,8 +54,6 @@ class PendingContactViewHolder extends ViewHolder {
 				status.setText(R.string.waiting_for_contact_to_come_online);
 				break;
 			case OFFLINE:
-				color = ContextCompat
-						.getColor(status.getContext(), R.color.briar_yellow);
 				status.setText("");
 				break;
 			case CONNECTING:

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java

@@ -16,6 +16,12 @@ public interface SharingController {
 	@UiThread
 	void setSharingListener(SharingListener listener);
 
+	/**
+	 * Unsets the listener.
+	 */
+	@UiThread
+	void unsetSharingListener(SharingListener listener);
+
 	/**
 	 * Call this when your lifecycle starts,
 	 * so the listener will be called when information changes.

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java

@@ -43,6 +43,11 @@ public class SharingControllerImpl implements SharingController, EventListener {
 		this.listener = listener;
 	}
 
+	@Override
+	public void unsetSharingListener(SharingListener listener) {
+		if (this.listener == listener) this.listener = null;
+	}
+
 	@Override
 	public void onStart() {
 		eventBus.addListener(this);

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

@@ -10,8 +10,6 @@ import org.briarproject.briar.api.privategroup.GroupMessageHeader;
 
 import java.util.Collection;
 
-import javax.annotation.Nullable;
-
 import androidx.annotation.UiThread;
 
 @NotNullByDefault
@@ -21,7 +19,10 @@ interface GroupListController extends DbController {
 	 * The listener must be set right after the controller was injected
 	 */
 	@UiThread
-	void setGroupListListener(@Nullable GroupListListener listener);
+	void setGroupListListener(GroupListListener listener);
+
+	@UiThread
+	void unsetGroupListListener(GroupListListener listener);
 
 	@UiThread
 	void onStart();

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

@@ -80,10 +80,15 @@ class GroupListControllerImpl extends DbControllerImpl
 	}
 
 	@Override
-	public void setGroupListListener(@Nullable GroupListListener listener) {
+	public void setGroupListListener(GroupListListener listener) {
 		this.listener = listener;
 	}
 
+	@Override
+	public void unsetGroupListListener(GroupListListener listener) {
+		if (this.listener == listener) this.listener = null;
+	}
+
 	@Override
 	@CallSuper
 	public void onStart() {

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

@@ -112,7 +112,7 @@ public class GroupListFragment extends BaseFragment implements
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
-		controller.setGroupListListener(null);
+		controller.unsetGroupListListener(this);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java

@@ -1,6 +1,7 @@
 package org.briarproject.briar.android.widget;
 
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -10,6 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -22,6 +24,7 @@ import androidx.fragment.app.DialogFragment;
 
 import static android.content.Intent.ACTION_VIEW;
 import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
+import static android.widget.Toast.LENGTH_SHORT;
 import static java.util.Objects.requireNonNull;
 
 @MethodsNotNullByDefault
@@ -64,18 +67,23 @@ public class LinkDialogFragment extends DialogFragment {
 		urlView.setText(url);
 
 		// prepare normal intent or intent chooser
+		Context ctx = requireContext();
 		Intent i = new Intent(ACTION_VIEW, Uri.parse(url));
-		PackageManager packageManager =
+		PackageManager packageManager = ctx.getPackageManager();
-				requireNonNull(getContext()).getPackageManager();
+		List activities =
-		List activities = packageManager.queryIntentActivities(i,
+				packageManager.queryIntentActivities(i, MATCH_DEFAULT_ONLY);
-				MATCH_DEFAULT_ONLY);
 		boolean choice = activities.size() > 1;
 		Intent intent = choice ? Intent.createChooser(i,
 				getString(R.string.link_warning_open_link)) : i;
 
 		Button openButton = v.findViewById(R.id.openButton);
 		openButton.setOnClickListener(v1 -> {
-			startActivity(intent);
+			if (intent.resolveActivity(packageManager) != null) {
+				startActivity(intent);
+			} else {
+				Toast.makeText(ctx, R.string.error_start_activity, LENGTH_SHORT)
+						.show();
+			}
 			getDialog().dismiss();
 		});
 

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

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <!--Setup-->
   <string name="setup_title">Willkommen bei Briar</string>
   <string name="setup_name_explanation">Dein Benutzername wird neben deinem geposteten Inhalt angezeigt. Du kannst diesen nicht mehr ändern, nachdem du dein Konto erstellt hast.</string>

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

@@ -125,9 +125,16 @@
   <string name="set_contact_alias_hint">Nombre del contacto</string>
   <string name="set_alias_button">Cambiar</string>
   <string name="delete_all_messages">Eliminar todos los mensajes</string>
-  <string name="dialog_title_delete_all_messages">Confirmar la eliminación del mensaje</string>
+  <string name="dialog_title_delete_all_messages">Confirmar eliminación de mensajes</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_deleted_ongoing_both">Los mensajes relacionados con presentaciones o invitaciones en curso no se pueden eliminar hasta que finalicen.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Los mensajes relacionados con presentaciones o invitaciones en curso no se pueden eliminar hasta que finalicen.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Los mensajes relacionados a invitaciones en curso no pueden ser borrados hasta su conclusión.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Los mensajes parcialmente descargados no se pueden eliminar hasta que haya finalizado la descarga.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Para borrar una invitación o presentación, debes seleccionar la petición y la respuesta.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Para eliminar una introducción, debe seleccionar la solicitud y la respuesta.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Para eliminar una invitación, debe seleccionar la solicitud y la respuesta.</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>

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

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <!--Setup-->
   <string name="setup_title">ברוך הבא אל Briar</string>
   <string name="setup_name_explanation">כינויך יוראה ליד תוכן כלשהו שתכתוב. אינך יכול לשנות אותו לאחר יצירת חשבונך.</string>

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

@@ -128,6 +128,13 @@
   <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="dialog_message_not_deleted_ongoing_both">Skilaboð sem tengjast fyrirliggjandi kynningum fyrirliggjandi boðum og kynningum er ekki hægt að eyða fyrr en viðkomandi ferli er lokið.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Skilaboð sem tengjast fyrirliggjandi kynningum fyrirliggjandi kynningum er ekki hægt að eyða fyrr en viðkomandi ferli er lokið.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Skilaboð sem tengjast fyrirliggjandi kynningum fyrirliggjandi boðum er ekki hægt að eyða fyrr en viðkomandi ferli er lokið.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Skilaboðum sem sótt hafa verið að hluta er ekki hægt að eyða fyrr en niðurhali þeirra er lokið.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Til að eyða boði eða kynningu, þarftu að velja beiðnina og svarið.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Til að eyða kynningu, þarftu að velja beiðnina og svarið.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Til að eyða boði, þarftu að velja beiðnina og svarið.</string>
   <string name="delete_contact">Eyða tengilið</string>
   <string name="dialog_title_delete_contact">Staðfesta eyðingu tengiliðar</string>
   <string name="dialog_message_delete_contact">Ertu viss að þú viljir fjarlægja þennan tengilið ásamt öllum þeim skilaboðum sem ykkur hafa farið á milli?</string>

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

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <!--Setup-->
   <string name="setup_title">Sveiki atvykę į Briar</string>
   <string name="setup_name_explanation">Jūsų slapyvardis bus rodomas šalia bet kokio jūsų skelbiamo turinio. Sukūrę paskyrą, slapyvardžio pakeisti nebegalėsite.</string>

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

@@ -128,6 +128,13 @@
   <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="dialog_message_not_deleted_ongoing_both">Berichten gerelateerd aan uitgaande uitnodigingen of introducties kunnen niet worden verwijderd totdat ze zijn afgerond.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Berichten gerelateerd aan uitgaande introducties kunnen niet worden verwijderd totdat ze zijn afgerond.</string>
+  <string name="dialog_message_not_deleted_ongoing_invitations">Berichten gerelateerd aan uitgaande uitnodigingen kunnen niet worden verwijderd totdat ze zijn afgerond.</string>
+  <string name="dialog_message_not_deleted_partly_downloaded">Gedeeltelijk gedownloade berichten kunnen niet worden verwijderd totdat ze volledig zijn gedownload.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_both">Om een uitnodiging of introductie te verwijderen met je het verzoek en het antwoord selecteren.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Om een introductie te verwijderen met je het verzoek en het antwoord selecteren.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Om een uitnodiging te verwijderen met je het verzoek en het antwoord selecteren.</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>

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

@@ -258,11 +258,11 @@
   <string name="introduction_error">Произошла ошибка во время представления.</string>
   <string name="introduction_response_error">Ошибка при ответе на представление</string>
   <string name="introduction_request_sent">Вы сделали представление %1$s %2$s.</string>
-  <string name="introduction_request_received">%1$s попросил вас представить %2$s. Вы хотите добавить %2$s в ваш список контактов?</string>
+  <string name="introduction_request_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_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_request_answered_received">%1$s попросил(-а) вас представить %2$s.</string>
   <string name="introduction_response_accepted_sent">Вы приняли представление %1$s.</string>
-  <string name="introduction_response_accepted_sent_info">Прежде чем добавить %1$s в свои контакты, необходимо чтобы он принял представление. Это может занять некоторое время.</string>
+  <string name="introduction_response_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>
@@ -303,8 +303,8 @@
   <!--Private Group Invitations-->
   <string name="groups_invitations_title">Приглашения в группу</string>
   <string name="groups_invitations_invitation_sent">Вы пригласили %1$s присоединиться к группе \"%2$s\".</string>
-  <string name="groups_invitations_invitation_received">%1$s пригласил вас присоединиться к группе \"%2$s\".</string>
+  <string name="groups_invitations_invitation_received">%1$s пригласил(-а) вас присоединиться к группе \"%2$s\".</string>
-  <string name="groups_invitations_joined">Присоединился к группе</string>
+  <string name="groups_invitations_joined">Присоединился(-лась) к группе</string>
   <string name="groups_invitations_declined">Приглашение в группу отклонено</string>
   <plurals name="groups_invitations_open">
     <item quantity="one">%d открытое приглашение в группу</item>
@@ -360,10 +360,10 @@
   <string name="forum_invitation_sent">Вы поделились форумом \"%1$s\" с %2$s.</string>
   <string name="forum_invitations_title">Приглашения на форум</string>
   <string name="forum_invitation_exists">Вы уже приняли приглашение на этот форум.\n\nПринятие большего количества приглашений сделает вашу связь с форумом более быстрой и надежной.</string>
-  <string name="forum_joined_toast">Присоединился к форуму</string>
+  <string name="forum_joined_toast">Присоединился(-лась) к форуму</string>
   <string name="forum_declined_toast">Приглашение отклонено</string>
   <string name="shared_by_format">Совместно %s</string>
-  <string name="forum_invitation_already_sharing">Уже поделился</string>
+  <string name="forum_invitation_already_sharing">Уже поделился(-лась)</string>
   <string name="forum_invitation_response_accepted_sent">Вы приняли приглашение на форум от %s.</string>
   <string name="forum_invitation_response_declined_sent">Вы отклонили приглашение на форум от %s.</string>
   <string name="forum_invitation_response_accepted_received">%s принял(-а) приглашение на форум.</string>
@@ -399,12 +399,12 @@
   <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>
   <string name="blogs_sharing_response_declined_received">%s отклонил(-а) приглашение в блог.</string>
-  <string name="blogs_sharing_invitation_received">%1$s поделился блогом \"%2$s\" с вами.</string>
+  <string name="blogs_sharing_invitation_received">%1$s поделился(-лась) блогом \"%2$s\" с вами.</string>
   <string name="blogs_sharing_invitation_sent">Вы поделились блогом \"%1$s\" с %2$s.</string>
   <string name="blogs_sharing_invitations_title">Приглашения в блог</string>
   <string name="blogs_sharing_joined_toast">Подписка на блог</string>

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

@@ -168,7 +168,7 @@
   <string name="authenticating_with_device">Autentiserar med enhet\u2026</string>
   <string name="connection_error_title">Kunde ej ansluta till din kontakt</string>
   <string name="connection_error_explanation">Kontrollera att ni båda är anslutna på samma Wi-Fi-nätverk.</string>
-  <string name="connection_error_feedback">Om det här problemet kvarstår, vänligen<a href="feedback">ge återkoppling</a> så vi kan förbättra appan.</string>
+  <string name="connection_error_feedback">Om det här problemet kvarstår, vänligen lämna <a href="feedback">synpunkter</a> så vi kan förbättra appen.</string>
   <!--Adding Contacts Remotely-->
   <string name="add_contact_remotely_title_case">Lägg till en kontakt på avstånd</string>
   <string name="add_contact_nearby_title">Lägg till en närvarande kontakt</string>
@@ -492,8 +492,8 @@
   <string name="choose_ringtone_title">Välj ringsignal</string>
   <string name="cannot_load_ringtone">Kan ej ladda ringsignal</string>
   <!--Settings Feedback-->
-  <string name="feedback_settings_title">Återkoppling</string>
+  <string name="feedback_settings_title">Synpunkter</string>
-  <string name="send_feedback">Ge återkoppling</string>
+  <string name="send_feedback">Lämna synpunkter</string>
   <!--Link Warning-->
   <string name="link_warning_title">Länkvarning</string>
   <string name="link_warning_intro">Följande länk är på väg att öppnas i en extern app.</string>
@@ -505,9 +505,9 @@
   <string name="not_your_fault">Detta är inte ditt fel.</string>
   <string name="please_send_report">Hjälp oss att förbättra Briar genom att skicka en felrapport.</string>
   <string name="report_is_encrypted">Vi lovar att felrapporten är krypterad och skickas säkert.</string>
-  <string name="feedback_title">Återkoppling</string>
+  <string name="feedback_title">Synpunkter</string>
   <string name="describe_crash">Beskriv vad som hänt (valfritt)</string>
-  <string name="enter_feedback">Ge din återkoppling</string>
+  <string name="enter_feedback">Skriv ner dina synpunkter</string>
   <string name="optional_contact_email">Din e-postadress (valfritt)</string>
   <string name="include_debug_report_crash">Inkludera anonym data om krashen.</string>
   <string name="include_debug_report_feedback">Inkludera anonym data om den här enheten</string>

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

@@ -1,24 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <!--Setup-->
+  <string name="setup_title">Briar\'a Hoşgeldiniz</string>
   <string name="setup_next">Sonraki</string>
+  <string name="setup_password_intro">Bir Parola Seçin</string>
+  <string name="setup_doze_title">Arkaplan Bağlantıları</string>
+  <string name="setup_doze_button">Bağlantılara İzin Ver</string>
   <string name="choose_nickname">Kullanıcı adınızı belirleyin</string>
   <string name="choose_password">Parolanızı belirleyin</string>
   <string name="confirm_password">Parolanızı doğrulayın</string>
   <string name="name_too_long">İsim çok uzun</string>
   <string name="password_too_weak">Parola çok zayıf</string>
-  <string name="passwords_do_not_match">Girdiğiniz iki parola uyuşmuyor</string>
+  <string name="passwords_do_not_match">Parolalar uyuşmuyor</string>
-  <string name="create_account_button">Hesabı Oluştur</string>
+  <string name="create_account_button">Hesap Oluştur</string>
+  <string name="more_info">Daha Fazla Bilgi</string>
+  <string name="don_t_ask_again">Tekrar sorma</string>
+  <string name="setup_huawei_text">Lütfen aşağıdaki düğmeye dokunun ve Briar\'ın \"Korunan Uygulamalar\" ekranında korunduğundan emin olun.</string>
+  <string name="setup_huawei_button">Briar\'ı Koru</string>
+  <string name="setup_huawei_help">Briar korunan uygulamalar listesine eklenmezse, arka planda çalışamaz.</string>
+  <string name="warning_dozed">%s arka planda çalışamadı</string>
   <!--Login-->
   <string name="enter_password">Parola</string>
   <string name="try_again">Parola yanlış, tekrar deneyin</string>
-  <string name="sign_in_button">Giriş Yap</string>
+  <string name="sign_in_button">Oturum Aç</string>
   <string name="forgotten_password">Parolamı unuttum</string>
   <string name="dialog_title_lost_password">Kayıp Parola</string>
   <string name="dialog_message_lost_password">Briar hesabınız, bulutta değil şifreli olarak cihazınızda saklanır, bu nedenle şifrenizi sıfırlayamıyoruz. Hesabınızı silmek ve tekrar başlamak ister misiniz? \n\nUyarı: Kimlikleriniz, kişileriniz ve iletileriniz kaybolur.</string>
   <string name="startup_failed_notification_title">Briar başlayamadı</string>
+  <string name="startup_failed_notification_text">Daha fazla bilgi için dokunun.</string>
   <string name="startup_failed_activity_title">Briar Başlangıç Hatası</string>
   <string name="startup_failed_service_error">Briar gerekli bir eklentiyi başlatamadı. Briar\'ı yeniden yüklemek genellikle bu sorunu çözer. Bununla birlikte, lütfen Briar\'ın verilerinizi depolamak için merkezi sunucuları kullanmadığından hesabınızı ve onunla ilişkili tüm verileri kaybedeceğinizi unutmayın.</string>
+  <string name="download_briar">Briar\'ı kullanmaya devam etmek için lütfen en son dağıtımı indirin.</string>
+  <string name="create_new_account">Yeni bir hesap oluşturmanız gerekecek, fakat aynı takma adı kullanabilirsiniz.</string>
+  <string name="download_briar_button">En Son Sürümü İndir</string>
+  <string name="startup_open_database">Veritabanı Şifresi Çözülüyor...</string>
+  <string name="startup_migrate_database">Veritabanı Yükseltiliyor...</string>
+  <string name="startup_compact_database">Veritabanı Derli Toplu Hale Getiriliyor...</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Gezinme çekmecesini aç</string>
   <string name="nav_drawer_close_description">Gezinme çekmecesini kapat</string>
@@ -35,6 +52,10 @@
   <string name="transport_bt">Bluetooth</string>
   <string name="transport_lan">Wi-Fi</string>
   <!--Notifications-->
+  <string name="reminder_notification_title">Briar oturumunu kapatma</string>
+  <string name="reminder_notification_text">Tekrar oturum açmak için dokunun</string>
+  <string name="reminder_notification_channel_title">Briar Oturum Açma Anımsatıcı</string>
+  <string name="reminder_notification_dismiss">Vazgeç</string>
   <string name="ongoing_notification_title">Briar\'a giriş yapıldı</string>
   <string name="ongoing_notification_text">Briar\'ı açmak için dokunun</string>
   <plurals name="private_message_notification_text">
@@ -73,16 +94,43 @@
   <string name="ellipsis">…</string>
   <string name="text_too_long">Girilen metin çok uzun</string>
   <string name="show_onboarding">Yardım Penceresini Göster</string>
+  <string name="fix">Düzeltme</string>
   <string name="help">Yardım</string>
+  <string name="sorry">Üzgünüm</string>
+  <string name="error_start_activity">Sisteminizde mevcut değil</string>
   <!--Contacts and Private Conversations-->
+  <string name="no_contacts">Gösterilecek kişi yok</string>
+  <string name="no_contacts_action">kişi eklemek için + simgesine dokunun</string>
   <string name="date_no_private_messages">Hiç mesaj yok.</string>
+  <string name="no_private_messages">Gösterilecek ileti yok</string>
   <string name="message_hint">Mesaj yazın</string>
+  <string name="image_attach">Resim ekle</string>
+  <string name="image_attach_error">Resim(ler) eklenemedi</string>
+  <string name="image_attach_error_too_big">Resim çok büyük. Sınır %d MB.</string>
+  <string name="image_attach_error_invalid_mime_type">Resim biçimi desteklenmedi: %s</string>
+  <string name="set_contact_alias">Kişi adını değiştir</string>
+  <string name="set_contact_alias_hint">Ad</string>
+  <string name="set_alias_button">Değiştirme</string>
+  <string name="delete_all_messages">Tüm iletileri sil</string>
+  <string name="dialog_title_delete_all_messages">İleti Silmeyi Onayla</string>
+  <string name="dialog_message_delete_all_messages">Tüm iletileri silmek istediğinizden emin misiniz?</string>
+  <string name="dialog_title_not_all_messages_deleted">Tüm iletiler silinemedi</string>
   <string name="delete_contact">Kişiyi sil</string>
   <string name="dialog_title_delete_contact">Kişi Silmeyi Onayla</string>
   <string name="dialog_message_delete_contact">Bu kişiyi ve bu kişiyle ilgili tüm iletileri kaldırmak istediğinize emin misiniz?</string>
   <string name="contact_deleted_toast">Kişi silindi</string>
+  <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
+  <string name="you">Siz</string>
+  <string name="save_image">Resmi Kaydet</string>
+  <string name="dialog_title_save_image">Resim Kaydedilsin mi?</string>
+  <string name="save_image_success">Resim kaydedildi</string>
+  <string name="save_image_error">Resim kaydedilemedi</string>
+  <string name="dialog_title_no_image_support">Resimler mevcut değil</string>
+  <string name="dialog_title_image_support">Artık bu kişiye resim gönderebilirsiniz</string>
+  <string name="dialog_message_image_support">Resim eklemek için bu simgeye dokunun.</string>
+  <string name="messaging_too_many_attachments_toast">Yalnızca ilk %d resim gönderilecek</string>
   <!--Adding Contacts-->
-  <string name="add_contact_title">Kişi ekle</string>
+  <string name="add_contact_title">Yakındaki Kişiyi Ekle</string>
   <string name="face_to_face">Kişi olarak eklemek istediğiniz kişiyle buluşmanız gerekir.\n\nBu, gelecekte başkalarının sizin kimliğinize bürünmesini veya mesajlarınızı okumasını engelleyecektir.</string>
   <string name="continue_button">Devam et</string>
   <string name="try_again_button">Tekrar deneyin</string>
@@ -91,14 +139,67 @@
   <string name="contact_added_toast">Kişi eklendi: %s</string>
   <string name="contact_already_exists"> %s kişisi zaten var</string>
   <string name="qr_code_invalid">QR kod hatalı</string>
+  <string name="camera_error">Kamera hatası</string>
   <string name="connecting_to_device">Cihaza bağlanıyor\u2026</string>
   <string name="authenticating_with_device">Cihazla kimlik doğrulama\u2026</string>
+  <!--Adding Contacts Remotely-->
+  <string name="add_contact_nearby_title">Yakındaki kişiyi ekle</string>
+  <string name="add_contact_remotely_title">Uzaktaki kişiyi ekle</string>
+  <string name="contact_name_hint">Kişiye bir takma ad verin</string>
+  <string name="contact_link_intro">Buraya kişinizden bağlantı girin</string>
+  <string name="contact_link_hint">Kişinin bağlantısı</string>
+  <string name="paste_button">Yapıştır</string>
+  <string name="add_contact_button">Kişi ekle</string>
+  <string name="copy_button">Kopyala</string>
+  <string name="share_button">Paylaş</string>
+  <string name="send_link_title">Değiş tokuş bağlantıları</string>
+  <string name="add_contact_choose_nickname">Takma Ad Seçin</string>
+  <string name="add_contact_choose_a_nickname">Bir takma ad girin</string>
+  <string name="nickname_intro">Kişinize bir takma ad verin. Onu sadece siz görebilirsiniz.</string>
+  <string name="your_link">Bu bağlantıyı eklemek istediğiniz kişiye verin</string>
+  <string name="link_clip_label">Briar bağlantısı</string>
+  <string name="link_copied_toast">Bağlantı kopyalandı</string>
+  <string name="adding_contact_error">Kişi eklenirken bir hata oluştu.</string>
+  <string name="pending_contact_requests_snackbar">Bekleyen iletişim istekleri var</string>
+  <string name="pending_contact_requests">Bekleyen İletişim İstekleri</string>
+  <string name="no_pending_contacts">Bekleyen kişi yok</string>
+  <string name="add_contact_remote_connecting">Bağlantı kuruluyor…</string>
+  <string name="waiting_for_contact_to_come_online">Kişinin çevrimiçi olması bekleniyor...</string>
+  <string name="connecting">Bağlantı kuruluyor…</string>
+  <string name="adding_contact">Kişi Ekleniyor...</string>
+  <string name="adding_contact_failed">Kişi ekleme başarısız oldu</string>
+  <string name="dialog_title_remove_pending_contact">Kaldırmayı Onayla</string>
+  <string name="dialog_message_remove_pending_contact">Bu kişi hala ekleniyor. Şimdi kaldırırsanız eklenmez.</string>
+  <string name="own_link_error">Kişinizin bağlantısını girin, kendi bağlantınızı değil</string>
+  <string name="nickname_missing">Lütfen bir takma ad girin.</string>
+  <string name="invalid_link">Geçersiz bağlantı</string>
+  <string name="missing_link">Lütfen bir bağlantı girin</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">Yeni kişi eklendi.</item>
+    <item quantity="other">%d yeni kişi eklendi.</item>
+  </plurals>
+  <string name="offline_state">İnternet bağlantısı yok</string>
+  <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%s ve %s aynı kişi mi?</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">Aynı Kişi</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">Farklı Kişi</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Kişilerinizi tanıştırın</string>
   <string name="introduction_onboarding_text">Kişilerinizi birbirinize tanıtabilirsiniz, bu nedenle Briar\'a bağlanmak için şahsen bir araya gelmeniz gerekmez.</string>
   <string name="introduction_menu_item">Tanıştır</string>
   <string name="introduction_activity_title">Kişi seç</string>
   <string name="introduction_message_title">Kişileri Tanıştırın</string>
+  <string name="introduction_message_hint">Bir ileti ekle (isteğe bağlı)</string>
   <string name="introduction_button">Tanıştır</string>
   <string name="introduction_sent">Tanıştırma isteğiniz gönderildi.</string>
   <string name="introduction_error">Tanıştırma isteği yaparken bir hata oluştu.</string>
@@ -112,11 +213,8 @@
   <string name="introduction_response_accepted_received">%1$s, %2$s ile tanışmayı kabul etti.</string>
   <string name="introduction_response_declined_received">%1$s, %2$s ile tanışmayı reddetti.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s, %2$s kişisinin tanışmayı reddettiğini söyledi.</string>
-  <plurals name="contact_added_notification_text">
-    <item quantity="one">Yeni kişi eklendi.</item>
-    <item quantity="other">%d yeni kişi eklendi.</item>
-  </plurals>
   <!--Private Groups-->
+  <string name="groups_list_empty">Gösterilecek grup yok</string>
   <string name="groups_created_by">%s tarafından oluşturuldu</string>
   <plurals name="messages">
     <item quantity="one">%d mesaj</item>
@@ -128,8 +226,8 @@
   <string name="groups_create_group_title">Özel Grup Oluştur</string>
   <string name="groups_create_group_button">Grup Oluştur</string>
   <string name="groups_create_group_invitation_button">Davetiye Gönder</string>
+  <string name="groups_create_group_hint">Özel grubunuz için bir ad belirleyin</string>
   <string name="groups_invitation_sent">Grup davetiyesi gönderildi</string>
-  <string name="groups_message_sent">Mesaj gönderildi</string>
   <string name="groups_member_list">Üye Listesi</string>
   <string name="groups_invite_members">Üyeleri Davet Edin</string>
   <string name="groups_member_created_you">Grubu siz oluşturdunuz</string>
@@ -168,28 +266,38 @@
   <string name="groups_reveal_visible_revealed_by_contact">Kişi ilişkileri grup tarafından görülebilir (%s görünür yaptı)</string>
   <string name="groups_reveal_invisible">Kişi ilişkisi grup tarafından görülemez</string>
   <!--Forums-->
+  <string name="no_forums">Gösterilecek forum yok</string>
   <string name="create_forum_title">Forumu Ouştur</string>
+  <string name="choose_forum_hint">Forumunuz için bir ad belirleyin</string>
   <string name="create_forum_button">Forumu Ouştur</string>
   <string name="forum_created_toast">Forum Oluşturuldu</string>
+  <string name="no_forum_posts">Gösterilecek posta yok</string>
   <string name="no_posts">Gönderi yok</string>
   <plurals name="posts">
     <item quantity="one">%d gönderi</item>
     <item quantity="other">%d gönderi</item>
   </plurals>
+  <string name="forum_new_message_hint">Yeni Posta</string>
   <string name="forum_message_reply_hint">Yeni Cevap</string>
   <string name="btn_reply">Cevapla</string>
   <string name="forum_leave">Forumdan Ayrıl</string>
   <string name="dialog_title_leave_forum">Forumdan Ayrılmayı Onayla</string>
+  <string name="dialog_message_leave_forum">Bu forumdan ayrılmak istediğinize emin misiniz?\n\Bu forumu paylaştığınız kişiler güncelleme almayı durdurabilir.</string>
   <string name="dialog_button_leave">Ayrıl</string>
   <!--Forum Sharing-->
   <string name="forum_share_button">Forumu Paylaş</string>
   <string name="contacts_selected">Kişiler Seçildi</string>
   <string name="activity_share_toolbar_header">Kişi Seç</string>
+  <string name="no_contacts_selector">Gösterilecek kişi yok</string>
+  <string name="no_contacts_selector_action">Kişi ekledikten sonra lütfen buraya geri dönün</string>
   <string name="forum_shared_snackbar">Forum, seçilen kişiler ile paylaşıldı</string>
+  <string name="forum_share_message">Bir ileti ekle (isteğe bağlı)</string>
   <string name="forum_share_error">Forumu paylaşırken bir hata meydana geldi.</string>
   <string name="forum_invitation_received">%1$s sizinle \"%2$s\" forumunu paylaştı.</string>
   <string name="forum_invitation_sent">\"%1$s\" forumunu %2$s ile paylaştınız.</string>
   <string name="forum_invitations_title">Forum Davetleri</string>
+  <string name="forum_joined_toast">Foruma katıldı</string>
+  <string name="forum_declined_toast">Davetiye reddedildi</string>
   <string name="shared_by_format">%s tarafından paylaşıldı</string>
   <string name="forum_invitation_already_sharing">Zaten paylaşılıyor</string>
   <string name="forum_invitation_response_accepted_sent">%s tarafından yapılan forum davetini kabul ettiniz.</string>
@@ -205,15 +313,20 @@
   </plurals>
   <string name="nobody">Hiç kimse</string>
   <!--Blogs-->
+  <string name="blogs_other_blog_empty_state">Gösterilecek posta yok</string>
   <string name="read_more">daha fazlasını oku</string>
   <string name="blogs_write_blog_post">Blog Gönderisi Yaz</string>
+  <string name="blogs_write_blog_post_body_hint">Blog gönderinizi yazın</string>
   <string name="blogs_publish_blog_post">Yayınla</string>
   <string name="blogs_blog_post_created">Blog Gönderisi Oluşturuldu</string>
   <string name="blogs_blog_post_received">Yeni Blog Gönderisi Alındı</string>
   <string name="blogs_blog_post_scroll_to">Kaydırma</string>
+  <string name="blogs_feed_empty_state">Gösterilecek posta yok</string>
   <string name="blogs_remove_blog">Blog\'u sil</string>
   <string name="blogs_remove_blog_ok">Tuşu Sil</string>
-  <string name="blogs_reblog_button">Tekrar Blogla</string>
+  <string name="blogs_blog_removed">Blog kaldırıldı</string>
+  <string name="blogs_reblog_comment_hint">Bir yorum ekle (isteğe bağlı)</string>
+  <string name="blogs_reblog_button">Yeniden blogda yayınla</string>
   <!--Blog Sharing-->
   <string name="blogs_sharing_share">Blog\'u Paylaş</string>
   <string name="blogs_sharing_error">Blog\'u paylaşırken bir hata meydana geldi.</string>
@@ -223,7 +336,11 @@
   <string name="blogs_sharing_response_declined_sent">%s kişisinden gelen blog davetini reddettiniz.</string>
   <string name="blogs_sharing_response_accepted_received">%s blog davetini kabul etti.</string>
   <string name="blogs_sharing_response_declined_received">%s blog davetini reddetti.</string>
+  <string name="blogs_sharing_invitation_received">%1$s sizinle %2$s blogunu paylaştı.</string>
+  <string name="blogs_sharing_invitation_sent">%1$s blogunu %2$s ile paylaştınız.</string>
   <string name="blogs_sharing_invitations_title">Blog Davetleri</string>
+  <string name="blogs_sharing_joined_toast">Bloga abone olundu</string>
+  <string name="blogs_sharing_declined_toast">Davetiye reddedildi</string>
   <string name="sharing_status_blog">Bir blog\'a abone olan herkes, blog\'u kişileriyle paylaşabilir. Bu blog\'u şu kişilerle paylaşıyorsunuz. Göremediğiniz diğer aboneler de olabilir.</string>
   <!--RSS Feeds-->
   <string name="blogs_rss_feeds_import">RSS kaynaklarını içeri aktar</string>
@@ -239,26 +356,48 @@
   <string name="blogs_rss_feeds_manage_delete_error">Besleme silinemedi!</string>
   <string name="blogs_rss_feeds_manage_error">Beslemeleriniz yüklenirken bir hata meydana geldi. Lütfen daha sonra tekrar deneyin.</string>
   <!--Settings Display-->
+  <string name="pref_language_changed">Briar\'ı yeniden başlattığınızda bu ayar geçerli olacaktır. Lütfen çıkın ve Briar\'ı yeniden başlatın.</string>
+  <string name="pref_language_default">Sistem öntanımlısı</string>
   <string name="display_settings_title">Görüntüle</string>
+  <string name="pref_theme_title">Tema</string>
+  <string name="pref_theme_light">Açık</string>
+  <string name="pref_theme_dark">Koyu</string>
+  <string name="pref_theme_auto">Otomatik (Gündüz)</string>
+  <string name="pref_theme_system">Sistem öntanımlısı</string>
   <!--Settings Network-->
   <string name="network_settings_title">Ağlar</string>
   <string name="bluetooth_setting">Bluetooth ile Bağlan</string>
   <string name="bluetooth_setting_enabled">Yakınlardaki her kişi</string>
   <string name="bluetooth_setting_disabled">Yalnızca kişi eklerken</string>
+  <string name="tor_network_setting">İnternet üzerinden Bağlan (Tor)</string>
+  <string name="tor_network_setting_automatic">Konuma göre otomatik</string>
+  <string name="tor_network_setting_without_bridges">Tor\'u köprüsüz kullanın</string>
+  <string name="tor_network_setting_with_bridges">Tor\'u köprü ile kullanın</string>
+  <string name="tor_network_setting_never">Bağlanma!</string>
   <!--How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus)-->
+  <string name="tor_network_setting_summary">Otomatik: %1$s (%2$siçinde)</string>
+  <string name="tor_mobile_data_title">Mobil veri kullan</string>
+  <string name="tor_only_when_charging_title">Sadece şarj ederken internet (Tor) üzerinden bağlan</string>
+  <string name="tor_only_when_charging_summary">Aygıt pilde çalışırken internet bağlantısını devre dışı bırak</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Güvenlik</string>
+  <string name="pref_lock_title">Uygulama kilidi</string>
   <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
   <!--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 dakika</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
   <string name="pref_lock_timeout_5">5 dakika</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_15">15 dakika</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
+  <string name="pref_lock_timeout_30">30 dakika</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 saat</string>
   <string name="pref_lock_timeout_never">Asla</string>
-  <string name="change_password">Parola değiştir</string>
+  <string name="pref_lock_timeout_never_summary">Briar\'ı asla otomatik olarak kilitleme</string>
+  <string name="change_password">Parolayı değiştir</string>
+  <string name="current_password">Şimdiki parola</string>
+  <string name="choose_new_password">Yeni parola</string>
   <string name="confirm_new_password">Yeni parolayı onaylayın</string>
   <string name="password_changed">Parolanız başarıyla değişti.</string>
   <string name="panic_setting">Panik buton ayarları</string>
@@ -270,6 +409,7 @@
   <string name="panic_app_setting_none">Yok</string>
   <string name="dialog_title_connect_panic_app">Panik Uygulaması Doğrulama</string>
   <string name="dialog_message_connect_panic_app">%1$s kişisinin yıkıcı panik düğmesi eylemlerini tetiklemesine izin vermek istediğinizden emin misiniz?</string>
+  <string name="panic_setting_destructive_action">Yıkıcı Eylemler</string>
   <string name="panic_setting_signout_title">Çıkış Yap</string>
   <string name="panic_setting_signout_summary">Panik Butonuna basıldığında Briar\'dan çıkış yap</string>
   <string name="purge_setting_title">Hesabı Sil</string>
@@ -278,24 +418,31 @@
   <string name="uninstall_setting_summary">Bu, bir panik olayında manuel onay gerektirir</string>
   <!--Settings Notifications-->
   <string name="notification_settings_title">Bildirimler</string>
-  <string name="notify_private_messages_setting_title">Özel Mesajlar</string>
+  <string name="notify_private_messages_setting_title">Özel İletiler</string>
-  <string name="notify_private_messages_setting_summary">Özel mesajlar için uyarıları göster</string>
+  <string name="notify_private_messages_setting_summary">Özel iletiler için uyarıları göster</string>
+  <string name="notify_private_messages_setting_summary_26">Özel iletiler için uyarıları yapılandır</string>
+  <string name="notify_group_messages_setting_title">Grup iletileri</string>
   <string name="notify_group_messages_setting_summary">Grup mesajları için uyarıları göster</string>
+  <string name="notify_group_messages_setting_summary_26">Grup iletileri için uyarıları yapılandır</string>
+  <string name="notify_forum_posts_setting_title">Forum gönderileri</string>
   <string name="notify_forum_posts_setting_summary">Forum gönderileri için uyarıları göster</string>
+  <string name="notify_forum_posts_setting_summary_26">Forum gönderileri için uyarıları yapılandır</string>
+  <string name="notify_blog_posts_setting_title">Blog gönderileri</string>
   <string name="notify_blog_posts_setting_summary">Blog gönderileri için uyarıları göster</string>
+  <string name="notify_blog_posts_setting_summary_26">Blog gönderileri için uyarıları yapılandır</string>
   <string name="notify_vibration_setting">Titretişim</string>
-  <string name="notify_lock_screen_setting_title">Ekranı Kilitle</string>
   <string name="notify_sound_setting">Ses</string>
   <string name="notify_sound_setting_default">Varsayılan zil sesi</string>
   <string name="notify_sound_setting_disabled">Yok</string>
   <string name="choose_ringtone_title">Zil sesi seçin</string>
+  <string name="cannot_load_ringtone">Zil sesi yüklenemiyor</string>
   <!--Settings Feedback-->
   <string name="feedback_settings_title">Geri bildirim</string>
   <string name="send_feedback">Geri bildirim gönder</string>
   <!--Link Warning-->
   <string name="link_warning_title">Uyarı Bağlantısı</string>
   <string name="link_warning_intro">Aşağıdaki bağlantıyı harici bir uygulamayla açmak üzeresiniz.</string>
-  <string name="link_warning_text">Bu kimliğinizi ele geçirmek için kullanılabilir. Bu bağlantıyı gönderen kişiye güvenip güvenmediğinize karar verin ve Orfox ile açmayı deneyin.</string>
+  <string name="link_warning_text">Bu sizi tanımlamak için kullanılabilir. Size bu bağlantıyı gönderen kişiye güvenip güvenmediğinizi düşünün ve Tor Tarayıcı ile açın.</string>
   <string name="link_warning_open_link">Bağlantı Aç</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Briar Çökme Raporu</string>
@@ -316,6 +463,33 @@
   <!--Sign Out-->
   <string name="progress_title_logout">Briar\'dan çıkılıyor...</string>
   <!--Screen Filters & Tapjacking-->
+  <string name="screen_filter_title">Ekran bindirme algılandı</string>
+  <string name="screen_filter_allow">Bu uygulamaların üstte çizim yapmasına izin ver</string>
   <!--Permission Requests-->
+  <string name="permission_camera_title">Kamera izinleri</string>
+  <string name="permission_camera_request_body">QR kodunu taramak için Briar\'ın kameraya erişmesi gerekiyor.</string>
+  <string name="permission_location_title">Konum izinleri</string>
+  <string name="permission_camera_location_title">Kamera ve konum</string>
+  <string name="qr_code">QR kodu</string>
+  <string name="show_qr_code_fullscreen">QR kodu tam ekran göster</string>
   <!--App Locking-->
+  <string name="lock_unlock">Briar\'ın Kilidini Aç</string>
+  <string name="lock_unlock_verbose">Briar\'ın kilidini açmak için aygıtınızın PİN kodunu, parolasını veya desenini girin</string>
+  <string name="lock_unlock_fingerprint_description">Devam etmek için, parmak izi algılayıcısına kayıtlı parmağınızla dokunun</string>
+  <string name="lock_unlock_password">Parola Kullanın</string>
+  <string name="lock_is_locked">Briar kilitli</string>
+  <string name="lock_tap_to_unlock">Kilitlemek için dokunun</string>
+  <!--Screenshots-->
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_alice">Alice</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_bob">Bob</string>
+  <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
+  <string name="screenshot_carol">Carol</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Bob!-->
+  <string name="screenshot_message_1">Selam Bob!</string>
+  <!--This is a message to be used in screenshots. Please use the same translation for Alice!-->
+  <string name="screenshot_message_2">Selam Alice! Bana Briar\'ı anlattığın için teşekkürler</string>
+  <!--This is a message to be used in screenshots.-->
+  <string name="screenshot_message_3">Sorun değil, umarım beğenirsin 😀</string>
 </resources>

briar-android/witness.gradle

@@ -36,8 +36,8 @@ dependencyVerification {
         'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0:localbroadcastmanager-1.0.0.aar:e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8',
         'androidx.preference:preference:1.1.0:preference-1.1.0.aar:6cf1a099b03b3254041b04701841865b2708c0b546b9036c8b0dada0aa59de57',
         'androidx.print:print:1.0.0:print-1.0.0.aar:1d5c7f3135a1bba661fc373fd72e11eb0a4adbb3396787826dd8e4190d5d9edd',
-        'androidx.recyclerview:recyclerview-selection:1.0.0:recyclerview-selection-1.0.0.aar:db3db72af8cfcd701ab6ed7a080327a2e993e3a429f5efb8f0c108bff38c4922',
+        'androidx.recyclerview:recyclerview-selection:1.1.0-rc01:recyclerview-selection-1.1.0-rc01.aar:8a1c0e75430e528ac325554a0be05aba4c52ac05fbbc5882187fb61271d89e8f',
-        'androidx.recyclerview:recyclerview:1.1.0-beta04:recyclerview-1.1.0-beta04.aar:c3c8310eb058a660a845cf814a54f56e6f448b7855f9ccea2a5ad18189f57f69',
+        'androidx.recyclerview:recyclerview:1.1.0:recyclerview-1.1.0.aar:f0d2b5a67d0a91ee1b1c73ef2b636a81f3563925ddd15a1d4e1c41ec28de7a4f',
         'androidx.savedstate:savedstate:1.0.0:savedstate-1.0.0.aar:2510a5619c37579c9ce1a04574faaf323cd0ffe2fc4e20fa8f8f01e5bb402e83',
         'androidx.test.espresso:espresso-contrib:3.2.0:espresso-contrib-3.2.0.aar:9e43811e5845e84f2964f0032fd50cd11dca3dc8d3b0703626dd12d50433bb35',
         'androidx.test.espresso:espresso-core:3.2.0:espresso-core-3.2.0.aar:beb4712c2520c1da30ac1f25506871f16ea5b83ee686ece5a258769df1a01e15',

briar-core/src/main/java/org/briarproject/briar/client/MessageTreeImpl.java

@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
@@ -19,10 +20,16 @@ import javax.annotation.concurrent.ThreadSafe;
 public class MessageTreeImpl<T extends MessageTree.MessageNode>
 		implements MessageTree<T> {
 
+	@GuardedBy("this")
 	private final Map<MessageId, List<T>> nodeMap = new HashMap<>();
+
+	@GuardedBy("this")
 	private final List<T> roots = new ArrayList<>();
+
+	@GuardedBy("this")
 	private final List<List<T>> unsortedLists = new ArrayList<>();
 
+	@SuppressWarnings("UseCompareMethod")
 	private Comparator<T> comparator = (o1, o2) ->
 			Long.valueOf(o1.getTimestamp()).compareTo(o2.getTimestamp());
 
@@ -50,11 +57,13 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
 		add(Collections.singletonList(node));
 	}
 
+	@GuardedBy("this")
 	private void markAsUnsorted(List<T> list) {
 		if (!unsortedLists.contains(list))
 			unsortedLists.add(list);
 	}
 
+	@GuardedBy("this")
 	private void parseNode(T node) {
 		if (node.getParentId() == null) {
 			roots.add(node);
@@ -67,6 +76,7 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
 		}
 	}
 
+	@GuardedBy("this")
 	private void sortUnsorted() {
 		for (List<T> list : unsortedLists) {
 			Collections.sort(list, comparator);
@@ -74,6 +84,7 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
 		unsortedLists.clear();
 	}
 
+	@GuardedBy("this")
 	private void traverse(List<T> list, T node, int level) {
 		list.add(node);
 		List<T> children = nodeMap.get(node.getId());
@@ -103,7 +114,7 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
 	}
 
 	@Override
-	public boolean contains(MessageId m) {
+	public synchronized boolean contains(MessageId m) {
 		return nodeMap.containsKey(m);
 	}
 }

briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/SessionParserImpl.java

@@ -71,7 +71,10 @@ class SessionParserImpl implements SessionParser {
 	@Override
 	public CreatorSession parseCreatorSession(GroupId contactGroupId,
 			BdfDictionary d) throws FormatException {
-		if (getRole(d) != CREATOR) throw new IllegalArgumentException();
+		if (getRole(d) != CREATOR) {
+			throw new IllegalArgumentException(
+					"Expected creator, but found " + getRole(d).name());
+		}
 		return new CreatorSession(contactGroupId, getPrivateGroupId(d),
 				getLastLocalMessageId(d), getLastRemoteMessageId(d),
 				getLocalTimestamp(d), getInviteTimestamp(d),