diff --git a/src/main/resources/strings/BriarDesktop_ar.properties b/src/main/resources/strings/BriarDesktop_ar.properties
index 22bab20a3f2ec1eab18ec4ee3bd9c926f87d4ecc..af97c5ebca6acf3b3f6c1cf4a1349e2267d28e9f 100644
--- a/src/main/resources/strings/BriarDesktop_ar.properties
+++ b/src/main/resources/strings/BriarDesktop_ar.properties
@@ -3,9 +3,10 @@ access.attachment_add=إضافة مرفق
 access.attachment_remove=Remove attachment
 access.contacts.add=إضافة جهة إتصال
 access.contact.menu=Show contact menu
-access.contacts.dropdown.connections.expand=Expand connections menu
-access.contacts.dropdown.contacts.expand=Expand contacts menu
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Icon for searching contacts
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Go back to contact screen of introduction process
 access.introduction.close=Close introduction screen
 access.message.jump_to_unread=Jump to next unread message
@@ -14,6 +15,8 @@ access.message.sent=تم إرسال الرسالة
 access.logo=Briar logo
 access.swap=Icon showing errors between two contacts
 access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=لايوجد جهات اتصال مفتوحة
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=حذف جميع الرّسائل
 contacts.dropdown.disappearing=Disappearing messages
 contacts.dropdown.introduction=عمل تقديم
 contacts.search.title=دفتر الاتصالات
+contacts.pending.remove.dialog.title=تأكيد الإزالة 
+contacts.pending.remove.dialog.message=لا زلنا نحاول إضافة جهة الاتصال هذه. إن قمتم بإزاتها الآن، لن نقوم بالإضافة. 
 
 # Conversation
 conversation.message.unread=Unread messages
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=لا يمكن حذ
 conversation.delete.failed.dialog.message.not_all_selected_both=لحذف دعوة أو طلب تعارف، عليكم اختيار الطّلب والرّد.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=لحذف طلب تعارف، عليكم اختيار الطّلب والرّد.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=لحذف دعوة، عليكم اختيار الطّلب والرّد.
+conversation.add.contact.dialog.title=إضافة جهة اتصال عن بعد 
+conversation.add.contact.dialog.contact_link=رابط جهة الاتصال
 conversation.delete.contact.dialog.title=تأكيد حذف جهة الإتصال
 conversation.delete.contact.dialog.message=هل أنت متأكد من أنك تريد حذف جهة الإتصال هذه وكل الرسائل المتبادلة بينكما؟
+conversation.change.alias.dialog.title=تعديل إسم جهة الاتصال
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=تم إنشاؤها بواسطة {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=The introduction to {0} was automatically de
 introduction.response.accepted.received=لقد وافق {0} على تقديمه إلى {1}.
 introduction.response.declined.received=لقد رفض {0} تقديمه إلى {1}.
 introduction.response.declined.received_by_introducee=ي/تقول {0} أن {1} قد رفض/ت التقدمة.
-introduction.error.own_link=Please enter contact's link, not your own
-introduction.error.remote_invalid=Remote handshake link is invalid
-introduction.error.alias_invalid=Alias is invalid
-introduction.error.link_invalid=Link is invalid: {0}
-introduction.error.public_key_invalid=Public key is invalid: {0}
-introduction.error.adding_failed=Adding contact failed
-introduction.error.contact_already_exists=You already have a contact with this link: {0}
-introduction.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
-introduction.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
+# Add Contact Remotely
+contact.add.title_dialog=إضافة جهة اتصال
+contact.add.remote.title=إضافة جهة اتصال عن بعد 
+contact.add.remote.your_link=أرسلوا هذا الرّابط لجهة الاتصال التي تودّون إضافتها 
+contact.add.remote.copy_tooltip=نسخ
+contact.add.remote.contact_link=أدخلوا الرّابط المرسل من جهة الاتصال هنا 
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=لصق
+contact.add.remote.nickname_intro=إعطاء اسم مستعار لجهة الاتصال بإمكانكم رؤيته فقط. 
+contact.add.remote.choose_nickname=إدخال اسم مستعار
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
 # Private Group Sharing
 group.invitation.received=قام {0} بدعوتك للإنضمام لمجموعة "{1}".
@@ -126,6 +150,7 @@ welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
 about.copyright=حقوق النسخ والنشر
 about.license=ترخيص
 about.version=النسخة
+about.version.core=Core Version
 about.contact=للتواصل
 about.website=موقع
 
@@ -134,6 +159,8 @@ cancel=إلغاء
 delete=احدف
 ok=موافق
 accept=قبول
+add=إضافة
+change=تعديل
 decline=رفض
 back=الرجوع
 next=التالي
@@ -142,6 +169,13 @@ sorry=معذرة
 error=هناك خطأ
 warning=تحذير
 unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=حذف
+
+# Compose text edit actions
+copy=نسخ
+cut=قُص
+paste=لصق
+select_all=اختر الكل
 
 # Startup screen
 startup.title.registration=مرحبًا بك في Briar (براير)
@@ -169,7 +203,7 @@ startup.failed.db_error=Briar was unable to open the database containing your ac
 startup.failed.data_too_old_error=حسابك تم إنشاؤه بواسطة إصدار قديم من هذا التطبيق ولا يمكن فتحه بهذا الإصدار.\n\nيتوجب إعادة تثبيت الإصدار القديم أو أن تنشئ حسابا جديدًا باختيار "نسيت كلمة السر" عند سؤالك عنها.
 startup.failed.data_too_new_error=Your account was created with a newer version of this app and cannot be opened with this version.\n\nPlease upgrade to the latest version and try again.
 startup.failed.service_error=Briar was unable to start a required component.\n\nPlease upgrade to the latest version of the app and try again.
-startup.database.creating=جاري إنشاء الحساب...
+startup.database.creating=Creating Account…
 startup.database.opening=جارِ فك تشفير قاعدة البيانات...
 startup.database.migrating=جارِ ترقية قاعدة البيانات...
 startup.database.compacting=جارِ ضغظ قاعدة البيانات…
@@ -185,13 +219,25 @@ settings.general.title=عام
 
 # Settings Display
 settings.display.title=العرض
+# todo: to be removed
 settings.display.theme=الثيمة المعتمة
+settings.display.theme.title=السمة
+settings.display.theme.auto=الافتراضي بالنظام
+settings.display.theme.dark=ليلي
+settings.display.theme.light=نهاري
+settings.display.language.title=لغة
+settings.display.language.auto=الافتراضي بالنظام
 
 # Settings Connections
 settings.connections.title=شبكات الاتصال
 
 # Settings Security
 settings.security.title=الأمان
+settings.security.password.change=تغيير كلمة السر
+settings.security.password.current=كلمة السر الحالية
+settings.security.password.choose=كلمة السر الجديدة
+settings.security.password.confirm=تأكيد كلمة السر الجديدة
+settings.security.password.changed=تم تغيير كلمة السر
 
 # Settings Notifications
 settings.notifications.title=التنبيهات
diff --git a/src/main/resources/strings/BriarDesktop_bg.properties b/src/main/resources/strings/BriarDesktop_bg.properties
index bc8599a91b179d1888a8ad979d16b1d89f7f1b38..b2cf7f2e18bff9bb8300a5703e653a8df9df77c9 100644
--- a/src/main/resources/strings/BriarDesktop_bg.properties
+++ b/src/main/resources/strings/BriarDesktop_bg.properties
@@ -3,9 +3,10 @@ access.attachment_add=Прикачване на файл
 access.attachment_remove=Премахване на прикачен файл
 access.contacts.add=Добавяне на контакт
 access.contact.menu=Меню с контакти
-access.contacts.dropdown.connections.expand=Разгъване на меню Свързаност
-access.contacts.dropdown.contacts.expand=Отваряне на меню с контакти
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Пиктограма за търсене на контакти
+access.contacts.pending.remove=Премахване на заявка за контакт
 access.introduction.back.contact=Назад към екрана на въведението за контактите
 access.introduction.close=Затваряне на екран с въведение
 access.message.jump_to_unread=Следващо непрочетено съобщение
@@ -14,11 +15,13 @@ access.message.sent=Съобщението е изпратено
 access.logo=Логотип на Briar
 access.swap=Пиктограма, изобразяваща грешка между два контакта
 access.about_briar_desktop=Относно Briar за настолно устройство
+access.password.show=Показване на паролата
+access.password.hide=Скриване на паролата
 
 # Contacts
 contacts.none_selected.title=Няма избран контакт
 contacts.none_selected.hint=За да започнете разговор изберете контакт
-contacts.pending_selected.title=Избрана е чакаща заявка контакт
+contacts.pending_selected.title=Чакаща заявка за контакт
 contacts.pending_selected.hint=You need to wait until the process of adding each other as contacts has finished before you can start chatting.
 contacts.card.nothing=Няма съобщения.
 contacts.dropdown.connections=Свързаност
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Премахване на всички
 contacts.dropdown.disappearing=Изчезващи съобщения
 contacts.dropdown.introduction=Запознаване
 contacts.search.title=Контакти
+contacts.pending.remove.dialog.title=Потвърждение на премахване
+contacts.pending.remove.dialog.message=Контактът е в процес на добавяне. Ако сега го премахнете няма да бъде добавен.
 
 # Conversation
 conversation.message.unread=Непрочетено съобщение
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Съобщения
 conversation.delete.failed.dialog.message.not_all_selected_both=За да премахнете покана или запознанство трябва да изберете заявката и отговора.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=За да премахнете запознанство трябва да изберете заявката и отговора.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=За да премахнете покана трябва да изберете заявката и отговора.
+conversation.add.contact.dialog.title=Добавяне на контакт отдалечено
+conversation.add.contact.dialog.contact_link=Препратка от контакт
 conversation.delete.contact.dialog.title=Потвърждение на премахване на контакт
 conversation.delete.contact.dialog.message=Сигурни ли сте, че желаете да бъде премахнат този контакт и всички обменени с него съобщения?
+conversation.change.alias.dialog.title=Преименуване
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=Основател {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Запознанството с/ъс {0} е
 introduction.response.accepted.received={0} приема запознанство с/ъс {1}.
 introduction.response.declined.received={0} отказа запознанство с/ъс {1}.
 introduction.response.declined.received_by_introducee={0} казва, че {1} отказва запознанство.
-introduction.error.own_link=Please enter contact's link, not your own
-introduction.error.remote_invalid=Remote handshake link is invalid
-introduction.error.alias_invalid=Alias is invalid
-introduction.error.link_invalid=Link is invalid: {0}
-introduction.error.public_key_invalid=Public key is invalid: {0}
-introduction.error.adding_failed=Adding contact failed
-introduction.error.contact_already_exists=You already have a contact with this link: {0}
-introduction.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
-introduction.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
+# Add Contact Remotely
+contact.add.title_dialog=Add Contact
+contact.add.remote.title=Добавяне на контакт отдалечено
+contact.add.remote.your_link=Споделете тази препратка с контакта, когото добавяте
+contact.add.remote.copy_tooltip=Копиране
+contact.add.remote.contact_link=Въведете препратката на контакта, когото добавяте
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Поставяне
+contact.add.remote.nickname_intro=Изберете прякор на контакта. Той е видим само за вас.
+contact.add.remote.choose_nickname=Прякор
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
 # Private Group Sharing
 group.invitation.received={0} has invited you to join the group "{1}".
@@ -123,9 +147,10 @@ welcome.title=Добре дошли в Briar
 welcome.text=Все още нямате контакти. За да добавите, докоснете бутона +:
 
 # About
-about.copyright=Copyright
+about.copyright=Запазена марка
 about.license=Лиценз
 about.version=Издание
+about.version.core=Core Version
 about.contact=Контакт
 about.website=Уебсайт
 
@@ -134,6 +159,8 @@ cancel=Отмяна
 delete=Премахване
 ok=Добре
 accept=Приемане
+add=Добавяне
+change=Променяне
 decline=Отказване
 back=Назад
 next=Следваща
@@ -142,6 +169,13 @@ sorry=Съжаляваме
 error=Грешка
 warning=Внимание
 unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=Премахване
+
+# Compose text edit actions
+copy=Копиране
+cut=Изрежи
+paste=Поставяне
+select_all=Избиране на всички
 
 # Startup screen
 startup.title.registration=Добре дошли в Briar
@@ -173,7 +207,7 @@ startup.database.creating=Създава се профил…
 startup.database.opening=Хранилището се дешифрира…
 startup.database.migrating=Хранилището се обновява…
 startup.database.compacting=Хранилището се уплътнява…
-expiration.banner.part1.zero=This is a test version of Briar that will expire today.
+expiration.banner.part1.zero=Това е пробно издание на Briar, валидно до днес.
 expiration.banner.part1.nozero={0, plural, one {This is a test version of Briar that will expire tomorrow.} other {This is a test version of Briar that will expire in {0} days.}}
 expiration.banner.part2=Please update to a newer version in time.
 
@@ -185,13 +219,25 @@ settings.general.title=Общи
 
 # Settings Display
 settings.display.title=Външен вид
+# todo: to be removed
 settings.display.theme=Тъмна тема
+settings.display.theme.title=Тема
+settings.display.theme.auto=Спрямо системата
+settings.display.theme.dark=Тъмна
+settings.display.theme.light=Светла
+settings.display.language.title=Език
+settings.display.language.auto=Спрямо системата
 
 # Settings Connections
 settings.connections.title=Свързаност
 
 # Settings Security
 settings.security.title=Сигурност
+settings.security.password.change=Промяна на парола
+settings.security.password.current=Текуща парола
+settings.security.password.choose=Нова парола
+settings.security.password.confirm=Потвърдете новата парола
+settings.security.password.changed=Паролата е променена.
 
 # Settings Notifications
 settings.notifications.title=Известия
diff --git a/src/main/resources/strings/BriarDesktop_de.properties b/src/main/resources/strings/BriarDesktop_de.properties
index 10c2bfab51903351ba465a56974d6b5df11e5f88..c43eb841cd8a8b0e1aad8b7c0bfdb37b1b4cb137 100644
--- a/src/main/resources/strings/BriarDesktop_de.properties
+++ b/src/main/resources/strings/BriarDesktop_de.properties
@@ -6,6 +6,7 @@ access.contact.menu=Kontaktmenü anzeigen
 access.contacts.dropdown.connections.expand=Verbindungsmenü erweitern
 access.contacts.dropdown.contacts.expand=Kontaktmenü erweitern
 access.contacts.search=Symbol für Kontaktsuche
+access.contacts.pending.remove=Ausstehenden Kontakt entfernen
 access.introduction.back.contact=Zurück zum Kontaktbildschirm der Einführung
 access.introduction.close=Einführungsbildschirm schließen
 access.message.jump_to_unread=Zur nächsten ungelesenen Nachricht springen
@@ -14,6 +15,8 @@ access.message.sent=Nachricht gesendet
 access.logo=Briar-Logo
 access.swap=Symbol für die Fehleranzeige zwischen zwei Kontakten
 access.about_briar_desktop=Ãœber Briar Desktop
+access.password.show=Passwort anzeigen
+access.password.hide=Passwort verstecken
 
 # Contacts
 contacts.none_selected.title=Kein Kontakt ausgewählt
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Alle Nachrichten löschen
 contacts.dropdown.disappearing=Selbstlöschende Nachrichten
 contacts.dropdown.introduction=Kontaktempfehlung abgeben
 contacts.search.title=Kontakte
+contacts.pending.remove.dialog.title=Entfernung bestätigen
+contacts.pending.remove.dialog.message=Dieser Kontakt befindet sich noch beim Hinzufügen. Wenn er jetzt entfernt wird, wird das Hinzufügen abgebrochen.
 
 # Conversation
 conversation.message.unread=Ungelesene Nachrichten
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Nachrichten, die s
 conversation.delete.failed.dialog.message.not_all_selected_both=Um eine Einladung oder Kontaktempfehlung zu löschen, musst du die Anfrage und die Antwort auswählen.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Um eine Kontaktempfehlung zu löschen, musst du die Anfrage und die Antwort auswählen.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Um eine Einladung zu löschen, musst du die Anfrage und die Antwort auswählen.
+conversation.add.contact.dialog.title=Kontakt aus der Ferne hinzufügen
+conversation.add.contact.dialog.contact_link=Kontakt Link
 conversation.delete.contact.dialog.title=Löschen des Kontakts bestätigen
 conversation.delete.contact.dialog.message=Bist du sicher, dass du diesen Kontakt und alle dazugehörigen Nachrichten löschen möchtest?
+conversation.change.alias.dialog.title=Kontaktnamen ändern
+conversation.change.alias.dialog.description=Bitte gib einen neuen Namen für diesen Kontakt ein (er ist nur für dich sichtbar):
 
 # Private Groups
 groups.card.created=Erstellt von {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Die Kontaktempfehlung mit {0} wurde automati
 introduction.response.accepted.received={0} hat die Kontaktempfehlung für {1} angenommen.
 introduction.response.declined.received={0} hat die Kontaktempfehlung von {1} abgelehnt.
 introduction.response.declined.received_by_introducee={0} meldet, dass {1} die Kontaktempfehlung abgelehnt hat.
-introduction.error.own_link=Bitte gib den Link des Kontakts ein, nicht deinen eigenen
-introduction.error.remote_invalid=Kontaktempfehlungslink ist ungültig
-introduction.error.alias_invalid=Alias ist ungültig
-introduction.error.link_invalid=Link ist ungültig: {0}
-introduction.error.public_key_invalid=Öffentlicher Schlüssel ist ungültig: {0}
-introduction.error.adding_failed=Hinzufügen des Kontakts fehlgeschlagen
-introduction.error.contact_already_exists=Du hast bereits einen Kontakt mit diesem Link: {0}
-introduction.error.pending_contact_already_exists=Du hast bereits einen ausstehenden Kontakt mit diesem Link: {0}
-introduction.error.duplicate_contact_explainer=Bitte sei vorsichtig, weil {0} nicht dieselbe Person wie {1} ist.\n\nMöglicherweise versucht einer der beiden mehr über deine Kontakte zu erfahren\n\nDu solltest deswegen niemandem sagen, dass du diesen Link auch von jemand anderem erhalten hast.
 
+# Add Contact Remotely
+contact.add.title_dialog=Kontakt hinzufügen
+contact.add.remote.title=Kontakt aus der Ferne hinzufügen
+contact.add.remote.your_link=Gib diesen Link dem Kontakt, den du hinzufügen möchtest
+contact.add.remote.copy_tooltip=Kopieren
+contact.add.remote.contact_link=Füge hier den Link des Kontakts ein, den du hinzufügen möchtest:
+contact.add.remote.contact_link_hint=Kontakt-Link
+contact.add.remote.paste_tooltip=Einfügen
+contact.add.remote.nickname_intro=Gib deinem Kontakt einen Spitznamen. Nur du kannst ihn sehen.
+contact.add.remote.choose_nickname=Gib einen Spitznamen ein
+contact.add.remote.link_copied_snackbar=Briar-Link in Zwischenablage kopiert.
+contact.add.remote.link_pasted_snackbar=Aus Zwischenablage eingefügt.
+contact.add.remote.paste_error_snackbar=Deine Zwischenablage ist leer.
+contact.add.remote.outgoing_arrow=Nach außen gerichteter Pfeil
+contact.add.remote.incoming_arrow=Nach innen gerichteter Pfeil
+contact.add.error.own_link=Bitte gib den Link des Kontakts ein, nicht deinen eigenen
+contact.add.error.remote_invalid=Kontaktempfehlungslink ist ungültig
+contact.add.error.alias_invalid=Alias ist ungültig
+contact.add.error.link_invalid=Link ist ungültig: {0}
+contact.add.error.public_key_invalid=Öffentlicher Schlüssel ist ungültig: {0}
+contact.add.error.adding_failed=Hinzufügen des Kontakts fehlgeschlagen
+contact.add.error.contact_already_exists=Du hast bereits einen Kontakt mit diesem Link: {0}
+contact.add.error.pending_contact_already_exists=Du hast bereits einen ausstehenden Kontakt mit diesem Link: {0}
+contact.add.error.duplicate_contact_explainer=Bitte sei vorsichtig, weil {0} nicht dieselbe Person wie {1} ist.\n\nMöglicherweise versucht einer der beiden mehr über deine Kontakte zu erfahren\n\nDu solltest deswegen niemandem sagen, dass du diesen Link auch von jemand anderem erhalten hast.
 
 # Private Group Sharing
 group.invitation.received={0} hat dich eingeladen, der Gruppe "{1}" beizutreten.
@@ -126,6 +150,7 @@ welcome.text=Du hast noch keine Kontakte. Tippe auf das + Symbol, um einen Konta
 about.copyright=Urheberrecht
 about.license=Lizenz
 about.version=Version
+about.version.core=Core-Version
 about.contact=Kontakt
 about.website=Webseite
 
@@ -134,6 +159,8 @@ cancel=Abbrechen
 delete=Löschen
 ok=OK
 accept=Zustimmen
+add=Hinzufügen
+change=Ändern
 decline=Ablehnen
 back=Zurück
 next=Weiter
@@ -142,6 +169,13 @@ sorry=Entschuldigung
 error=Fehler
 warning=Warnung
 unsupported_feature=Leider wird diese Funktion noch nicht von Briar Desktop unterstützt.
+remove=Entfernen
+
+# Compose text edit actions
+copy=Kopieren
+cut=Ausschneiden
+paste=Einfügen
+select_all=Alle auswählen
 
 # Startup screen
 startup.title.registration=Willkommen bei Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar konnte die Datenbank mit deinem Konto, deinen Kont
 startup.failed.data_too_old_error=Dein Konto wurde mit einer alten Version dieser App erstellt und kann mit dieser Version nicht geöffnet werden.\n\nInstalliere entweder die alte Version oder richte ein neues Konto ein, indem du "Ich habe mein Passwort vergessen" auswählst, wenn du zur Eingabe deines Passworts aufgefordert wirst.
 startup.failed.data_too_new_error=Dein Konto wurde mit einer neueren Version dieser App erstellt und kann mit dieser Version nicht geöffnet werden.\n\nBitte aktualisiere auf die neueste Version und versuche es erneut.
 startup.failed.service_error=Briar konnte eine erforderliche Komponente nicht starten.\n\nBitte aktualisiere auf die neueste Version der App und versuche es erneut.
-startup.database.creating=Konto wird erstellt...
+startup.database.creating=Konto wird erstellt…
 startup.database.opening=Datenbank wird entschlüsselt...
 startup.database.migrating=Datenbank wird aktualisiert...
-startup.database.compacting=Datenbank wird komprimiert...
+startup.database.compacting=Datenbank wird komprimiert…
 expiration.banner.part1.zero=Dies ist eine Testversion von Briar, die heute abläuft.
 expiration.banner.part1.nozero={0, plural, one {Dies ist eine Testversion von Briar, die morgen abläuft.} other {Dies ist eine Testversion von Briar, die in {0} Tagen abläuft.}}
 expiration.banner.part2=Bitte aktualisiere sie rechtzeitig auf eine neuere Version.
@@ -185,13 +219,25 @@ settings.general.title=Allgemein
 
 # Settings Display
 settings.display.title=Anzeige
+# todo: to be removed
 settings.display.theme=Dunkles Design
+settings.display.theme.title=Design
+settings.display.theme.auto=Systemstandard
+settings.display.theme.dark=Dunkel
+settings.display.theme.light=Hell
+settings.display.language.title=Sprache
+settings.display.language.auto=Systemstandard
 
 # Settings Connections
 settings.connections.title=Verbindungen
 
 # Settings Security
 settings.security.title=Sicherheit
+settings.security.password.change=Passwort ändern
+settings.security.password.current=Aktuelles Passwort
+settings.security.password.choose=Neues Passwort
+settings.security.password.confirm=Neues Passwort bestätigen
+settings.security.password.changed=Passwort wurde geändert.
 
 # Settings Notifications
 settings.notifications.title=Benachrichtigungen
diff --git a/src/main/resources/strings/BriarDesktop_es.properties b/src/main/resources/strings/BriarDesktop_es.properties
index 7b8cf66fc5cbeeda3844990c8f42165d52394b72..88fe3d58c4ca8871926745baebf0dce990451190 100644
--- a/src/main/resources/strings/BriarDesktop_es.properties
+++ b/src/main/resources/strings/BriarDesktop_es.properties
@@ -3,9 +3,10 @@ access.attachment_add=Añadir adjunto
 access.attachment_remove=Remover adjunto
 access.contacts.add=Añadir el contacto
 access.contact.menu=Mostrar menú de contactos
-access.contacts.dropdown.connections.expand=Expandir menú de conexiones
-access.contacts.dropdown.contacts.expand=Expandir menú de contactos
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Ícono para buscar contactos
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Volver a la pantalla de contacto del proceso de introducción
 access.introduction.close=Cerrar pantalla de introducción
 access.message.jump_to_unread=Saltar al siguiente mensaje no leído
@@ -14,6 +15,8 @@ access.message.sent=Mensaje enviado
 access.logo=Logo de Briar
 access.swap=Ícono mostrando errores entre dos contactos
 access.about_briar_desktop=Acerca de Briar para Escritorio
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Ningún contacto seleccionado
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Eliminar todos los mensajes
 contacts.dropdown.disappearing=Mensajes con caducidad
 contacts.dropdown.introduction=Hacer presentación
 contacts.search.title=Contactos
+contacts.pending.remove.dialog.title=Confirmar la eliminación
+contacts.pending.remove.dialog.message=Este contacto todavía está siendo añadido. Si lo quita ahora, no se añadirá.
 
 # Conversation
 conversation.message.unread=Mensajes no leídos
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Los mensajes relac
 conversation.delete.failed.dialog.message.not_all_selected_both=Para borrar una invitación o presentación, debes seleccionar la petición y la respuesta.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Para eliminar una introducción, debes seleccionar la solicitud y la respuesta.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Para eliminar una invitación, debes seleccionar la solicitud y la respuesta.
+conversation.add.contact.dialog.title=Añadir un Contacto a Distancia
+conversation.add.contact.dialog.contact_link=Enlace de contacto
 conversation.delete.contact.dialog.title=Confirmar eliminación de contacto
 conversation.delete.contact.dialog.message=¿Seguro que quieres eliminar este contacto y todos los mensajes intercambiados con él?
+conversation.change.alias.dialog.title=Cambiar nombre del contacto
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=Creado por {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=La introducción a {0} fue automáticamente
 introduction.response.accepted.received={0} aceptó la introducción a {1}.
 introduction.response.declined.received={0} rechazó la introducción a {1}.
 introduction.response.declined.received_by_introducee={0} dice que {1} declinó la introducción.
-introduction.error.own_link=Por favor, introduce el enlace del contacto, no el tuyo
-introduction.error.remote_invalid=El vínculo de sincronización remota no es válido
-introduction.error.alias_invalid=El alias es inválido
-introduction.error.link_invalid=El vínculo es inválido: {0}
-introduction.error.public_key_invalid=La clave pública es inválida: {0}
-introduction.error.adding_failed=Fallo al añadir contacto
-introduction.error.contact_already_exists=Ya tienes un contacto con este enlace: {0}
-introduction.error.pending_contact_already_exists=Ya tienes un contacto pendiente con este enlace: {0}
-introduction.error.duplicate_contact_explainer=Ten cuidado si {0} no es la misma persona que {1}.\n\nUno de ellos puede estar intentando descubrir quiénes son tus contactos.\n\nNo les digas que recibiste el mismo enlace de otra persona.
 
+# Add Contact Remotely
+contact.add.title_dialog=Añadir contacto
+contact.add.remote.title=Añadir un Contacto a Distancia
+contact.add.remote.your_link=Déle este enlace al contacto que desea añadir
+contact.add.remote.copy_tooltip=Copiar
+contact.add.remote.contact_link=Introduzca el enlace de su contacto aquí
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Pegar
+contact.add.remote.nickname_intro=Dele a su contacto un sobrenombre. Sólo usted puede verlo.
+contact.add.remote.choose_nickname=Ingrese un sobrenombre
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Por favor, introduce el enlace del contacto, no el tuyo
+contact.add.error.remote_invalid=El vínculo de sincronización remota no es válido
+contact.add.error.alias_invalid=El alias es inválido
+contact.add.error.link_invalid=El vínculo es inválido: {0}
+contact.add.error.public_key_invalid=La clave pública es inválida: {0}
+contact.add.error.adding_failed=Fallo al añadir contacto
+contact.add.error.contact_already_exists=Ya tienes un contacto con este enlace: {0}
+contact.add.error.pending_contact_already_exists=Ya tienes un contacto pendiente con este enlace: {0}
+contact.add.error.duplicate_contact_explainer=Ten cuidado si {0} no es la misma persona que {1}.\n\nUno de ellos puede estar intentando descubrir quiénes son tus contactos.\n\nNo les digas que recibiste el mismo enlace de otra persona.
 
 # Private Group Sharing
 group.invitation.received={0} te ha invitado a unirte al grupo "{1}".
@@ -126,6 +150,7 @@ welcome.text=Aún no tienes ningún contacto. Pulsa el ícono + para agregar un
 about.copyright=Derechos de copia
 about.license=Licencia
 about.version=Versión
+about.version.core=Core Version
 about.contact=Contacto
 about.website=Sitio web
 
@@ -134,6 +159,8 @@ cancel=Cancelar
 delete=Eliminar
 ok=OK
 accept=Aceptar
+add=Añadir
+change=Cambiar
 decline=Declinar
 back=Regresar
 next=Siguiente
@@ -142,6 +169,13 @@ sorry=Disculpa
 error=Error
 warning=Advertencia
 unsupported_feature=Desafortunadamente, esta característica todavía no está soportada por Briar Desktop.
+remove=Eliminar
+
+# Compose text edit actions
+copy=Copiar
+cut=Cortar
+paste=Pegar
+select_all=Seleccionar todo
 
 # Startup screen
 startup.title.registration=Bienvenida a Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar no fue capaz de abrir la base de datos conteniendo
 startup.failed.data_too_old_error=Tu cuenta fue creada con una versión antigua de esta aplicación y no se puede abrir con esta versión.\n\nDebes reinstalar la versión antigua o configurar una nueva cuenta seleccionando "He olvidado mi contraseña" donde se solicita la misma.
 startup.failed.data_too_new_error=Tu cuenta fue creada con una versión más nueva de esta aplicación y no se puede abrir con esta versión.\n\nPor favor, actualiza a la última versión e inténtalo de nuevo.
 startup.failed.service_error=Briar no fue capaz de iniciar un componente requerido.\n\nPor favor, actualiza a la última versión de la aplicación e inténtalo de nuevo.
-startup.database.creating=Creando Cuenta...
-startup.database.opening=Descifrando la Base de Datos...
-startup.database.migrating=Actualizando la Base de Datos...
-startup.database.compacting=Compactando la Base de Datos...
+startup.database.creating=Creating Account…
+startup.database.opening=Descifrando la base de datos...
+startup.database.migrating=Actualizando la base de datos...
+startup.database.compacting=Compactando base de datos...
 expiration.banner.part1.zero=Esta es una versión de prueba de Briar que expirará hoy.
 expiration.banner.part1.nozero={0, plural, one {Esta es una versión de prueba de Briar que expirará mañana.} other {Esta es una versión de prueba de Briar que expirará en {0} días.}}
 expiration.banner.part2=Por favor actualiza a una versión más nueva a tiempo.
@@ -185,13 +219,25 @@ settings.general.title=General
 
 # Settings Display
 settings.display.title=Mostrar
+# todo: to be removed
 settings.display.theme=Tema Oscuro
+settings.display.theme.title=Tema
+settings.display.theme.auto=Predeterminado del sistema
+settings.display.theme.dark=Oscuro
+settings.display.theme.light=Claro
+settings.display.language.title=Idioma
+settings.display.language.auto=Predeterminado del sistema
 
 # Settings Connections
 settings.connections.title=Conexiones
 
 # Settings Security
 settings.security.title=Seguridad
+settings.security.password.change=Cambiar contraseña
+settings.security.password.current=Contraseña actual
+settings.security.password.choose=Nueva contraseña
+settings.security.password.confirm=Confirmar la nueva contraseña
+settings.security.password.changed=La contraseña ha sido cambiada.
 
 # Settings Notifications
 settings.notifications.title=Notificaciones
diff --git a/src/main/resources/strings/BriarDesktop_fa.properties b/src/main/resources/strings/BriarDesktop_fa.properties
index 320c1abd694f158a03aff9b0543e076eaf9616da..53938f483fb0d8b61f54c75d25b2875035ea1233 100644
--- a/src/main/resources/strings/BriarDesktop_fa.properties
+++ b/src/main/resources/strings/BriarDesktop_fa.properties
@@ -3,9 +3,10 @@ access.attachment_add=افزودن پیوست
 access.attachment_remove=حذف پیوست
 access.contacts.add=افزودن مخاطب
 access.contact.menu=نمایش منوی مخاطب
-access.contacts.dropdown.connections.expand=باز کردن منوی ارتباطات
-access.contacts.dropdown.contacts.expand=باز کردن منوی مخاطبین
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=آیکون برای جستجوی مخاطبین
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=به صفحه تماس از پروسه معرفی برگردید
 access.introduction.close=بستن صفحه معرفی
 access.message.jump_to_unread=رفتن به پیام خوانده‌نشده بعدی
@@ -14,6 +15,8 @@ access.message.sent=پیام فرستاده شد
 access.logo=لوگو Briar
 access.swap=آیکون نمایش خطاهای بین دو مخاطب
 access.about_briar_desktop=درباره Briar دسکتاپ
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=هیچ مخاطبی انتخاب نشده است
@@ -33,13 +36,15 @@ contacts.dropdown.delete.all=حذف تمام پیام ها
 contacts.dropdown.disappearing=پیام‌های ناپدید شونده
 contacts.dropdown.introduction=معرفی کردن
 contacts.search.title=مخاطبان
+contacts.pending.remove.dialog.title=تایید حذف
+contacts.pending.remove.dialog.message=این مخاطب هنوز در حال اضافه شدن می باشد. اگر اکنون آن را حذف کنید، دیگر افزوده نخواهد شد.
 
 # Conversation
 conversation.message.unread=پیام‌های خوانده‌نشده
 conversation.message.new=پیام جدید
 conversation.delete.all.dialog.title=تایید حذف پیام
-conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
-conversation.delete.single=Delete message for me
+conversation.delete.all.dialog.message=آیا مطمئن هستید که می‌خواهید همه پیام‌های موجود در این گفتگو را از دستگاه خود حذف کنید؟
+conversation.delete.single=حذف پیام‌ها برای خودم
 conversation.delete.failed.dialog.title=حذف تمام پیام‌ ها امکان پذیر نیست
 conversation.delete.failed.dialog.message.ongoing_both=پیام های مرتبط با دعوت ها و معرفی های جاری نمی توانند حذف شوند تا زمانی که به نتیجه برسند.
 conversation.delete.failed.dialog.message.ongoing_introductions=پیام های مرتبط با معرفی های جاری نمی توانند حذف شوند تا زمانی که به نتیجه برسند.
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=پیام های م
 conversation.delete.failed.dialog.message.not_all_selected_both=برای حذف یک دعوت نامه یا معرفی، باید درخواست و پاسخ را انتخاب کنید.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=برای حذف یک معرفی، باید درخواست و پاسخ را انتخاب کنید.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=برای حذف یک دعوت نامه، باید درخواست و پاسخ آن را انتخاب کنید.
+conversation.add.contact.dialog.title=افزودن مخاطب از دور
+conversation.add.contact.dialog.contact_link=پیوند مخاطب
 conversation.delete.contact.dialog.title=تایید حذف مخاطب
 conversation.delete.contact.dialog.message=آیا مطمئن هستید که میخواهید این مخاطب و تمام پیام های تبادل شده با آن را حذف کنید؟
+conversation.change.alias.dialog.title=تغییر نام مخاطب
+conversation.change.alias.dialog.description=لطفا یک نام جدید برای این مخاطب وارد کنید (فقط برای شما قابل مشاهده است):
 
 # Private Groups
 groups.card.created=ایجاد شده توسط {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=معرفی به {0} به صورت خودکا
 introduction.response.accepted.received={0} درخواست معرفی به {1} را پذیرفت.
 introduction.response.declined.received={0} درخواست معرفی به {1} را رد کرد.
 introduction.response.declined.received_by_introducee={0} می‌گوید که {1} درخواست معرفی را رد کرده است.
-introduction.error.own_link=لطفا پیوند مخاطب را وارد کنید، نه خودتان را
-introduction.error.remote_invalid=پیوند دست دادن از راه دور نامعتبر است
-introduction.error.alias_invalid=نام مستعار نامعتبر است
-introduction.error.link_invalid=پیوند نامعتبر است: {0}
-introduction.error.public_key_invalid=کلید عمومی نامعتبر است: {0}
-introduction.error.adding_failed=افزودن مخاطب ناموفق بود
-introduction.error.contact_already_exists=شما هم‌اکنون یک مخاطب با این پیوند دارید: {0}
-introduction.error.pending_contact_already_exists=شما هم‌اکنون یک مخاطب در حال انتظار با این پیوند دارید: {0}
-introduction.error.duplicate_contact_explainer=مراقب باشید اگر {0} همان شخص {1} نیست.\n\nیکی از آنها ممکن است در تلاش باشد تا بفهمد مخاطبین شما چه کسانی هستند.\n\nبه آن‌ها نگویید که همان پیوند را از شخص دیگری دریافت کرده‌اید. 
 
+# Add Contact Remotely
+contact.add.title_dialog=افزودن مخاطب
+contact.add.remote.title=افزودن مخاطب از دور
+contact.add.remote.your_link=برای افزودن مخاطب این پیوند را به او بدهید
+contact.add.remote.copy_tooltip=کپی
+contact.add.remote.contact_link=پیوند آمده از مخاطب خود را اینجا وارد کنید
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=چسباندن
+contact.add.remote.nickname_intro=به مخاطب خود یک نام مستعار بدهید. فقط شما قادر به دیدن آن می باشید.
+contact.add.remote.choose_nickname=یک نام مستعار وارد کنید
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=لطفا پیوند مخاطب را وارد کنید، نه خودتان را
+contact.add.error.remote_invalid=پیوند دست دادن از راه دور نامعتبر است
+contact.add.error.alias_invalid=نام مستعار نامعتبر است
+contact.add.error.link_invalid=پیوند نامعتبر است: {0}
+contact.add.error.public_key_invalid=کلید عمومی نامعتبر است: {0}
+contact.add.error.adding_failed=افزودن مخاطب ناموفق بود
+contact.add.error.contact_already_exists=شما هم‌اکنون یک مخاطب با این پیوند دارید: {0}
+contact.add.error.pending_contact_already_exists=شما هم‌اکنون یک مخاطب در حال انتظار با این پیوند دارید: {0}
+contact.add.error.duplicate_contact_explainer=مراقب باشید اگر {0} همان شخص {1} نیست.\n\nیکی از آنها ممکن است در تلاش باشد تا بفهمد مخاطبین شما چه کسانی هستند.\n\nبه آن‌ها نگویید که همان پیوند را از شخص دیگری دریافت کرده‌اید. 
 
 # Private Group Sharing
 group.invitation.received={0} شما را به پیوستن به گروه "{1}" دعوت کرده است.
@@ -126,6 +150,7 @@ welcome.text=شما هنوز هیچ مخاطبی ندارید. برای افزو
 about.copyright=کپی‌رایت
 about.license=لایسنس
 about.version=نسخه
+about.version.core=نسخه هسته
 about.contact=تماس
 about.website=پایگاه اینترنتی
 
@@ -134,6 +159,8 @@ cancel=لغو
 delete=حذف
 ok=تایید
 accept=پذیرفتن
+add=افزودن
+change=تغییر
 decline=رد کردن
 back=بازگشت
 next=بعدی
@@ -142,6 +169,13 @@ sorry=پوزش
 error=خطا
 warning=هشدار
 unsupported_feature=متاسفانه این ویژگی هنوز در Briar دسکتاپ پشتیبانی نمی‌شود.
+remove=پاک کردن
+
+# Compose text edit actions
+copy=کپی
+cut=برش
+paste=چسباندن
+select_all=انتخاب همه
 
 # Startup screen
 startup.title.registration=به Briar خوش آمدید
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar قادر به باز کردن پایگاه داد
 startup.failed.data_too_old_error=حساب شما با نسخه قدیمی این برنامه ایجاد شده است و با این نسخه باز نمی‌شود.\n\nشما باید نسخه قدیمی را مجددا نصب کنید یا با انتخاب «رمز عبور خود را فراموش کرده‌ام» در صفحه ورود رمز عبور، یک حساب کاربری جدید راه اندازی کنید.
 startup.failed.data_too_new_error=حساب شما با نسخه جدیدتر این برنامه ایجاد شده است و با این نسخه باز نمی شود.\n\nلطفا به آخرین نسخه ارتقا دهید و دوباره امتحان کنید.
 startup.failed.service_error=Briar نتوانست یک مولفه مورد نیاز را راه‌اندازی کند.\n\nلطفا به آخرین نسخه برنامه ارتقا دهید و دوباره امتحان کنید.
-startup.database.creating=در حال ایجاد حساب کاربری...
-startup.database.opening=در حال رمزگشایی پایگاه داده...
-startup.database.migrating=در حال ارتقا پایگاه داده...
-startup.database.compacting=در حال فشرده سازی پایگاه داده...
+startup.database.creating=Creating Account…
+startup.database.opening=در حال رمزگشایی سیستم ...
+startup.database.migrating=در حال ارتقا سیستم ...
+startup.database.compacting=درحال فشرده‌ سازی پایگاه داده...
 expiration.banner.part1.zero=این یک نسخه آزمایشی از Briar است که امروز منقضی می‌شود.
 expiration.banner.part1.nozero={0, plural, one {این یک نسخه آزمایشی از Briar است که فردا منقضی می‌شود.} other {این یک نسخه آزمایشی از Briar است که پس از {0} روز منقضی می‌شود.}}
 expiration.banner.part2=لطفا به موقع به نسخه جدیدتر به‌روزرسانی کنید.
@@ -185,13 +219,25 @@ settings.general.title=کلی
 
 # Settings Display
 settings.display.title=نمایش
+# todo: to be removed
 settings.display.theme=قالب تیره
+settings.display.theme.title=قالب
+settings.display.theme.auto=پیش فرض سیستم
+settings.display.theme.dark=تاریک
+settings.display.theme.light=روشن
+settings.display.language.title=زبان
+settings.display.language.auto=پیش فرض سیستم
 
 # Settings Connections
 settings.connections.title=اتصالات
 
 # Settings Security
 settings.security.title=امنیت
+settings.security.password.change=تغییر گذرواژه
+settings.security.password.current=گذرواژهٔ فعلی
+settings.security.password.choose=گذرواژهٔ جدید
+settings.security.password.confirm=تائید گذرواژه جدید
+settings.security.password.changed=گذرواژه تغییر کرده است
 
 # Settings Notifications
 settings.notifications.title=نوتیفیکیشن ها
diff --git a/src/main/resources/strings/BriarDesktop_fr.properties b/src/main/resources/strings/BriarDesktop_fr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..62c6551ca43c57a2c25c17d82517843f0f3901bb
--- /dev/null
+++ b/src/main/resources/strings/BriarDesktop_fr.properties
@@ -0,0 +1,246 @@
+# Accessibility
+access.attachment_add=Ajouter un fichier joint
+access.attachment_remove=Supprimer le fichier joint
+access.contacts.add=Ajouter un contact
+access.contact.menu=Afficher le menu du contact
+access.contacts.dropdown.connections.expand=Développer le menu des déconnexions
+access.contacts.dropdown.contacts.expand=Développer le menu des contacts
+access.contacts.search=Icône pour chercher des contacts
+access.contacts.pending.remove=Supprimer le contact en attente
+access.introduction.back.contact=Revenir à l’écran des contacts du processus de présentation
+access.introduction.close=Fermer l’écran de présentation
+access.message.jump_to_unread=Passer au prochain message non lu
+access.message.send=Envoyer le message
+access.message.sent=Le message a été envoyé
+access.logo=Logo de Briar
+access.swap=Icône qui affiche des erreurs entre deux contacts
+access.about_briar_desktop=À propos de Briar pour ordinateur
+access.password.show=Afficher le mot de passe
+access.password.hide=Cacher le mot de passe
+
+# Contacts
+contacts.none_selected.title=Aucun contact n’est sélectionné
+contacts.none_selected.hint=Sélectionnez un contact pour commencer à dialoguer
+contacts.pending_selected.title=Un contact en attente est sélectionné
+contacts.pending_selected.hint=Avant de converser, vous devez attendre la fin du processus d’ajout mutuel en tant que contact.
+contacts.card.nothing=Il n’y a aucun message.
+contacts.dropdown.connections=Connexions
+contacts.dropdown.connections.title=Connexions
+contacts.dropdown.connections.bluetooth=Se connecter par Bluetooth
+contacts.dropdown.connections.removable=Se connecter par un lecteur amovible
+contacts.dropdown.contact=Contact
+contacts.dropdown.contact.title=Contact
+contacts.dropdown.contact.change=Changer le nom du contact
+contacts.dropdown.contact.delete=Supprimer le contact
+contacts.dropdown.delete.all=Supprimer tous les messages
+contacts.dropdown.disappearing=Messages éphémères
+contacts.dropdown.introduction=Faire les présentations
+contacts.search.title=Contacts
+contacts.pending.remove.dialog.title=Confirmer la suppression
+contacts.pending.remove.dialog.message=Le contact est encore en cours d’ajout. Si vous le supprimez maintenant, il ne sera pas ajouté.
+
+# Conversation
+conversation.message.unread=Messages non lus
+conversation.message.new=Nouveau message
+conversation.delete.all.dialog.title=Confirmer la suppression des messages
+conversation.delete.all.dialog.message=Voulez-vous vraiment supprimer tous les messages de cette conversation de votre appareil ?
+conversation.delete.single=Supprimer le message pour moi
+conversation.delete.failed.dialog.title=Impossible de supprimer tous les messages
+conversation.delete.failed.dialog.message.ongoing_both=Les messages relatifs aux invitations et présentations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.
+conversation.delete.failed.dialog.message.ongoing_introductions=Les messages relatifs aux présentations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.
+conversation.delete.failed.dialog.message.ongoing_invitations=Les messages relatifs aux invitations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.
+conversation.delete.failed.dialog.message.not_all_selected_both=Pour supprimer une invitation ou une présentation, vous devez sélectionner la demande et la réponse.
+conversation.delete.failed.dialog.message.not_all_selected_introductions=Pour supprimer une présentation, vous devez sélectionner la demande et la réponse.
+conversation.delete.failed.dialog.message.not_all_selected_invitations=Pour supprimer une invitation, vous devez sélectionner la demande et la réponse.
+conversation.add.contact.dialog.title=Ajouter un contact éloigné
+conversation.add.contact.dialog.contact_link=Lien de votre contact
+conversation.delete.contact.dialog.title=Confirmer la suppression du contact
+conversation.delete.contact.dialog.message=Voulez-vous vraiment supprimer ce contact et tous les messages associés ?
+conversation.change.alias.dialog.title=Changer le nom du contact
+conversation.change.alias.dialog.description=Veuillez saisir un nouveau nom pour ce contact (seulement visible par vous) :
+
+# Private Groups
+groups.card.created=Créé par {0}
+groups.card.messages={0, plural, one {{0} message} other {{0} messages}}
+
+# Introduction
+introduction.introduce=Faire les présentations
+introduction.message=Ajouter un message (facultatif)
+introduction.title_first=Présenter {0} à
+introduction.title_second=Présenter des contacts
+introduction.request.sent=Vous avez demandé de présenter {0} à {1}.
+introduction.request.received={0} a demandé à vous présenter à {1}. Voulez-vous ajouter {1} à votre liste de contacts ?
+introduction.request.exists.received={0} a demandé à vous présenter à {1}, mais {1} est déjà dans votre liste de contacts. Comme {0} ne le sait peut-être pas, vous pouvez quand même réponse :
+introduction.request.answered.received={0} a demandé de vous présenter à {1}.
+introduction.response.accepted.sent=Vous avez accepté d’être présenté à {0}.
+introduction.response.accepted.sent.info=Avant que {0} soit ajoutée à vos contacts, cette personne doit aussi accepter la présentation. Cela pourrait prendre du temps.
+introduction.response.declined.sent=Vous avez refusé d’être présenté à {0}.
+introduction.response.declined.auto=La présentation à {0} a été refusée automatiquement.
+introduction.response.accepted.received={0} avez accepté d’être présenté à {1}.
+introduction.response.declined.received={0} avez refusé d’être présenté à {1}.
+introduction.response.declined.received_by_introducee={0} annonce que {1} a refusé la présentation.
+
+# Add Contact Remotely
+contact.add.title_dialog=Ajouter le contact
+contact.add.remote.title=Ajouter un contact éloigné
+contact.add.remote.your_link=Donnez ce lien au contact que vous souhaitez ajouter
+contact.add.remote.copy_tooltip=Copier
+contact.add.remote.contact_link=Saisissez ici le lien de votre contact
+contact.add.remote.contact_link_hint=Lien du contact
+contact.add.remote.paste_tooltip=Coller
+contact.add.remote.nickname_intro=Donnez un pseudonyme à votre contact. Il n’est vu que par vous.
+contact.add.remote.choose_nickname=Saisissez un pseudonyme
+contact.add.remote.link_copied_snackbar=Le lien Briar a été copié dans le presse-papiers.
+contact.add.remote.link_pasted_snackbar=A été collé du presse-papiers.
+contact.add.remote.paste_error_snackbar=Votre presse-papiers est vide.
+contact.add.remote.outgoing_arrow=Flèche sortante
+contact.add.remote.incoming_arrow=Flèche entrante
+contact.add.error.own_link=Veuillez saisir le lien du contact, pas le vôtre
+contact.add.error.remote_invalid=Le lien de prise de contact à distance est invalide
+contact.add.error.alias_invalid=L’alias est invalide
+contact.add.error.link_invalid=Le lien est invalide : {0}
+contact.add.error.public_key_invalid=La clé publique est invalide : {0}
+contact.add.error.adding_failed=Échec d’ajout du contact
+contact.add.error.contact_already_exists=Vous avez déjà un contact avec ce lien : {0}
+contact.add.error.pending_contact_already_exists=Vous avez déjà un contact en attente avec ce lien : {0}
+contact.add.error.duplicate_contact_explainer=Faites attention si {0} n’est pas la personne que {1}.\n\nL’une de ces personnes pourrait tenter de découvrir qui sont vos contacts.\n\nNe lui dites pas que vous avez reçu le même lien de quelqu’un d’autre.
+
+# Private Group Sharing
+group.invitation.received={0} vous a invité à vous joindre au groupe « {1} ».
+group.invitation.sent=Vous avez invité {0} à se joindre au groupe « {1} ».
+group.invitation.response.accepted.sent=Vous avez accepté l’invitation de groupe de {0}.
+group.invitation.response.declined.sent=Vous avez refusé l’invitation de groupe de {0}.
+group.invitation.response.declined.auto=L’invitation au groupe provenant de {0} a été refusée automatiquement.
+group.invitation.response.accepted.received={0} a accepté l’invitation au groupe.
+group.invitation.response.declined.received={0} a refusé l’invitation au groupe.
+
+# Forum Sharing
+forum.invitation.received={0} a partagé le forum « {1} » avec vous.
+forum.invitation.sent=Vous avez partagé le forum « {0}  » avec {1}.
+forum.invitation.response.accepted.sent=Vous avez accepté l’invitation de {0} au forum.
+forum.invitation.response.declined.sent=Vous avez refusé l’invitation de {0} au forum.
+forum.invitation.response.declined.auto=L’invitation au forum provenant de {0} a été refusée automatiquement.
+forum.invitation.response.accepted.received={0} a accepté l’invitation au forum.
+forum.invitation.response.declined.received={0} a refusé l’invitation au forum.
+
+# Blog Sharing
+blog.invitation.received={0} a partagé le blogue « {1} » avec vous.
+blog.invitation.sent=Vous avez partagé le blogue « {0} » avec {1}.
+blog.invitation.response.accepted.sent=Vous avez accepté l’invitation de {0} au blogue.
+blog.invitation.response.declined.sent=Vous avez refusé l’invitation de {0} au blogue.
+blog.invitation.response.declined.auto=L’invitation au blogue provenant de {0} a été refusée automatiquement.
+blog.invitation.response.accepted.received={0} a accepté l’invitation au blogue.
+blog.invitation.response.declined.received={0} a refusé l’invitation au blogue.
+
+
+# Main
+main.title=Briar pour ordinateur
+main.help.title=Client Briar pour ordinateur
+main.help.debug=Activer l’impression des messages de débogage
+main.help.verbose=Imprimer des messages détaillés de journalisation
+main.help.data=Le répertoire où Briar stockera ses fichiers. Par défaut : {0}
+main.help.tor.port.socks=Port Socks de Tor
+main.help.tor.port.control=Port de contrôle de Tor
+
+# Welcome
+welcome.title=Bienvenue à Briar
+welcome.text=Vous n’avez pas encore de contacts. Touchez l’icône + pour en ajouter un.
+
+# About
+about.copyright=Tous droits réservés
+about.license=Licence
+about.version=Version
+about.version.core=Version de Briar Core
+about.contact=Contact
+about.website=Site Web
+
+# Miscellaneous
+cancel=Annuler
+delete=Supprimer
+ok=Valider
+accept=Accepter
+add=Ajouter
+change=Modifier
+decline=Refuser
+back=Retour
+next=Suivant
+open=Ouvrir
+sorry=Désolé
+error=Erreur
+warning=Avertissement
+unsupported_feature=Malheureusement, cette fonction n’est pas encore prise en charge par Briar pour ordinateur
+remove=Supprimer
+
+# Compose text edit actions
+copy=Copier
+cut=Couper
+paste=Coller
+select_all=Tout sélectionner
+
+# Startup screen
+startup.title.registration=Bienvenue à Briar
+startup.title.login=Heureux de vous revoir
+startup.field.nickname=Pseudonyme
+startup.field.nickname.explanation=Votre pseudonyme sera affiché à côté de tout contenu que vous publierez. Vous pourrez le modifier après avoir créé votre compte.
+startup.field.password=Mot de passe
+startup.field.password.explanation=Votre compte Briar est enregistré chiffré sur votre appareil et non dans le nuage. Si vous oubliez votre mot de passe ou désinstallez Briar, votre compte ne peut pas être récupéré.\n\nChoisissez un mot de passe long qui sera difficile à deviner, par exemple quatre mots au hasard ou dix lettres, chiffres et symboles au hasard.
+startup.field.password_confirmation=Confirmer le mot de passe
+startup.button.register=Créer un compte
+startup.button.login=Connexion
+startup.error.name_too_long=Le nom est trop long
+startup.error.password_too_weak=Le mot de passe est trop faible
+startup.error.passwords_not_match=Les mots de passe ne correspondent pas
+startup.error.password_wrong=Le mot de passe est erroné, réessayez
+startup.error.decryption.title=Impossible de vérifier le mot de passe
+startup.error.decryption.text=Briar ne peut pas vérifier votre mot de passe. Veuillez essayer de redémarrer votre appareil pour résoudre ce problème.
+startup.password_forgotten.button=J’ai oublié mon mot de passe
+startup.password_forgotten.title=Mot de passe oublié
+startup.password_forgotten.text=Votre compte Briar est enregistré chiffré sur votre appareil, pas dans le nuage, et nous ne pouvons donc pas réinitialiser votre mot de passe. Voulez-vous supprimer votre compte et recommencer ?\n\nAttention : vos identités, contacts et messages seront perdus irrémédiablement.
+startup.failed.expired=Ce logiciel est expiré. Nous vous remercions de l’avoir testé. Pour continuer à utiliser Briar, veuillez télécharger la version la plus récente. Vous pourrez continuer à utiliser votre compte.
+startup.failed.registration=Briar n’a pas pu créer votre compte.\n\nVeuillez mettre l’appli à jour vers la version la plus récente et réessayer.
+startup.failed.clock_error=Briar n’a pas pu démarrer, car l’horloge de votre appareil n’est pas à l’heure.\n\nVeuillez mettre l’horloge de votre appareil à l’heure et réessayer.
+startup.failed.db_error=Briar n’a pas pu ouvrir la base de données qui comprend votre compte, vos contacts et messages.\n\nVeuillez vérifier si Briar est déjà en cours d’exécution sur cet ordinateur. Autrement, mettez l’appli à jour vers la version la plus récente et réessayez, ou créez un nouveau compte en choisissant « J’ai oublié mon mot de passe » à l’invite de mot de passe.
+startup.failed.data_too_old_error=Votre compte a été créé avec une ancienne version de cette appli et ne peut pas être ouvert avec cette version.\n\nVous devez soit réinstaller l’ancienne version, soit créer un nouveau compte en choisissant « J’ai oublié mon mot de passe » dans l’invite de mot de passe.
+startup.failed.data_too_new_error=Votre compte a été créé avec une version plus récente de cette appli et ne peut être ouvert avec cette version.\n\nVeuillez mettre l’appli à jour vers la version la plus récente et réessayer.
+startup.failed.service_error=Briar n’a pas pu lancer un composant essentiel.\n\nVeuillez mettre l’appli à jour vers la version la plus récente et réessayer.
+startup.database.creating=Création du compte…
+startup.database.opening=Déchiffrement de la base de données…
+startup.database.migrating=Mise à niveau de la base de données…
+startup.database.compacting=Compactage de la base de données…
+expiration.banner.part1.zero=Ceci est une version d’essai de Briar qui arrivera à expiration aujourd’hui.
+expiration.banner.part1.nozero={0, plural, one {Ceci est une version d’essai de Briar qui arrivera à expiration demain.} other {Ceci est une version d’essai de Briar qui arrivera à expiration dans {0} jours.}}
+expiration.banner.part2=Veuillez mettre l’appli à niveau vers une version plus récente à temps.
+
+# Settings
+settings.title=Paramètres
+
+# Settings General
+settings.general.title=Général
+
+# Settings Display
+settings.display.title=Affichage
+# todo: to be removed
+settings.display.theme=Thème sombre
+settings.display.theme.title=Thème
+settings.display.theme.auto=Valeur par défaut du système
+settings.display.theme.dark=Sombre
+settings.display.theme.light=Clair
+settings.display.language.title=Langue
+settings.display.language.auto=Valeur par défaut du système
+
+# Settings Connections
+settings.connections.title=Connexions
+
+# Settings Security
+settings.security.title=Sécurité
+settings.security.password.change=Changer le mot de passe
+settings.security.password.current=Mot de passe actuel
+settings.security.password.choose=Nouveau mot de passe
+settings.security.password.confirm=Confirmer le nouveau mot de passe
+settings.security.password.changed=Le mot de passe a été changé.
+
+# Settings Notifications
+settings.notifications.title=Notifications
+
+# Settings Actions
+settings.actions.title=Actions
diff --git a/src/main/resources/strings/BriarDesktop_gl.properties b/src/main/resources/strings/BriarDesktop_gl.properties
index f7638810644797bc3f8b85d2e393f14e751e0eb9..b270e1deb5aacb40130e88cd0a467991f8e46c31 100644
--- a/src/main/resources/strings/BriarDesktop_gl.properties
+++ b/src/main/resources/strings/BriarDesktop_gl.properties
@@ -3,9 +3,10 @@ access.attachment_add=Engadir anexo
 access.attachment_remove=Eliminar anexo
 access.contacts.add=Engadir contacto
 access.contact.menu=Mostrar menú de contacto
-access.contacts.dropdown.connections.expand=Despregar menú de conexións
-access.contacts.dropdown.contacts.expand=Despregar menú de contactos
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Icona para buscar contactos
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Atrás a pantalla do contacto para o proceso de presentación
 access.introduction.close=Pechar pantalla de presentación
 access.message.jump_to_unread=Ir á seguinte mensaxe sen ler
@@ -14,6 +15,8 @@ access.message.sent=Mensaxe enviada
 access.logo=Logo Briar
 access.swap=Icona que mostra erros entre dous contactos
 access.about_briar_desktop=Acerca Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Sen contacto seleccionado
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Borrar tódalas mensaxes
 contacts.dropdown.disappearing=Mensaxes efémeras
 contacts.dropdown.introduction=Preséntate
 contacts.search.title=Contactos
+contacts.pending.remove.dialog.title=Confirma a eliminación
+contacts.pending.remove.dialog.message=Este contacto aínda está a ser engadido. Se o eliminas agora, non será engadido.
 
 # Conversation
 conversation.message.unread=Mensaxes sen ler
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=As mensaxes relaci
 conversation.delete.failed.dialog.message.not_all_selected_both=Para borrar un convite ou presentación, debes seleccionar a solicitude e a resposta.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Para borrar unha presentación, debes seleccionar a solicitude e a resposta.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Para borrar un convite, debes seleccionar a solicitude e a resposta.
+conversation.add.contact.dialog.title=Engadir contacto a distancia
+conversation.add.contact.dialog.contact_link=Ligazón do contacto
 conversation.delete.contact.dialog.title=Confirma a eliminación do contacto
 conversation.delete.contact.dialog.message=Segura de querer eliminar este contacto e todas as mensaxes que intercambiaron?
+conversation.change.alias.dialog.title=Cambiar o nome do contacto
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=Creado por {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=A presentación a {0} foi rexeitada automát
 introduction.response.accepted.received={0} aceptou a presentación a {1}.
 introduction.response.declined.received={0} rexeitou a presentación a {1}.
 introduction.response.declined.received_by_introducee={0} di que {1} rexeitou a presentación.
-introduction.error.own_link=Escribe a ligazón do teu contacto, non a túa
-introduction.error.remote_invalid=A ligazón remota de presentación non é válida
-introduction.error.alias_invalid=O alias non é válido
-introduction.error.link_invalid=A ligazón non é válida: {0}
-introduction.error.public_key_invalid=A chave pública non é válida: {0}
-introduction.error.adding_failed=Fallou a adición do contacto
-introduction.error.contact_already_exists=Xa tes un contacto con esta ligazón: {0}
-introduction.error.pending_contact_already_exists=Xa tes un contacto pendente con esta ligazón: {0}
-introduction.error.duplicate_contact_explainer=Mira ben que {0} non sexa a mesma persoa que {1}.\n\nUnha delas podería estar intentando descubrir cales son os teus contactos.\n\nNon lles digas que recibiches a mesma ligazón de alguén máis.
 
+# Add Contact Remotely
+contact.add.title_dialog=Add Contact
+contact.add.remote.title=Engadir contacto a distancia
+contact.add.remote.your_link=Envía esta ligazón ao contacto que queres engadir
+contact.add.remote.copy_tooltip=Copiar
+contact.add.remote.contact_link=Introducir aquí a ligazón do teu contacto
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Pegar
+contact.add.remote.nickname_intro=Dálle un alcume ao contacto. Só ti pode velo.
+contact.add.remote.choose_nickname=Escribe un alcume
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Escribe a ligazón do teu contacto, non a túa
+contact.add.error.remote_invalid=A ligazón remota de presentación non é válida
+contact.add.error.alias_invalid=O alias non é válido
+contact.add.error.link_invalid=A ligazón non é válida: {0}
+contact.add.error.public_key_invalid=A chave pública non é válida: {0}
+contact.add.error.adding_failed=Fallou a adición do contacto
+contact.add.error.contact_already_exists=Xa tes un contacto con esta ligazón: {0}
+contact.add.error.pending_contact_already_exists=Xa tes un contacto pendente con esta ligazón: {0}
+contact.add.error.duplicate_contact_explainer=Mira ben que {0} non sexa a mesma persoa que {1}.\n\nUnha delas podería estar intentando descubrir cales son os teus contactos.\n\nNon lles digas que recibiches a mesma ligazón de alguén máis.
 
 # Private Group Sharing
 group.invitation.received={0} convidoute ao grupo "{1}".
@@ -126,6 +150,7 @@ welcome.text=Aínda non tes contactos. Toca na icona "+" para engadir un contact
 about.copyright=Copyright
 about.license=Licenza
 about.version=Versión
+about.version.core=Core Version
 about.contact=Contacto
 about.website=Sitio web
 
@@ -134,6 +159,8 @@ cancel=Cancelar
 delete=Eliminar
 ok=Aceptar
 accept=Aceptar
+add=Engadir
+change=Cambiar
 decline=Rexeitar
 back=Anterior
 next=Seguinte
@@ -142,6 +169,13 @@ sorry=Desculpa
 error=Erro
 warning=Aviso
 unsupported_feature=Desafortunadamente esta característica aínda non ten soporte en Briar Desktop.
+remove=Quitar
+
+# Compose text edit actions
+copy=Copiar
+cut=Cortar
+paste=Pegar
+select_all=Seleccionar todo
 
 # Startup screen
 startup.title.registration=Benvida a Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar non puido abrir a base de datos que contén a túa
 startup.failed.data_too_old_error=A túa conta foi creada cunha versión antiga desta app e non se pode abrir con esta versión.\n\nPodes reinstalar a versión antiga ou ben configurar unha nova conta elexindo 'Esquecín o contrasinal' cando che pida escribir o contrasinal.
 startup.failed.data_too_new_error=A túa conta foi creada nunha versión máis moderna da app e non se pode abrir nesta versión.\n\nActualiza á última versión e inténtao outra vez.
 startup.failed.service_error=Briar non puido iniciar o compoñente requerido.\n\nActualiza á última versión da app e inténtao outra vez.
-startup.database.creating=Creando a Conta...
-startup.database.opening=Descifrando a Base de Datos...
-startup.database.migrating=Actulizando a Base de Datos...
-startup.database.compacting=Compactando a Base de Datos...
+startup.database.creating=Creating Account…
+startup.database.opening=Descifrando a Base de datos...
+startup.database.migrating=Actualizando a Base de datos...
+startup.database.compacting=Compactando a base de datos...
 expiration.banner.part1.zero=Esta é unha versión de proba de Briar que caduca hoxe.
 expiration.banner.part1.nozero={0, plural, one {Esta é unha versión de proba de Briar que caduca mañán.} other {Esta é unha versión de proba de Briar que caduca en {0} días.}}
 expiration.banner.part2=Por favor actualiza á nova versión.
@@ -185,13 +219,25 @@ settings.general.title=Xeral
 
 # Settings Display
 settings.display.title=Pantalla
+# todo: to be removed
 settings.display.theme=Decorado Escuro
+settings.display.theme.title=Decorado
+settings.display.theme.auto=Por defecto no sistema
+settings.display.theme.dark=Escuro
+settings.display.theme.light=Claro
+settings.display.language.title=Lingua
+settings.display.language.auto=Por defecto no sistema
 
 # Settings Connections
 settings.connections.title=Conexións
 
 # Settings Security
 settings.security.title=Seguranza
+settings.security.password.change=Trocar o contrasinal
+settings.security.password.current=Contrasinal actual
+settings.security.password.choose=Novo contrasinal
+settings.security.password.confirm=Confirma o novo contrasinal
+settings.security.password.changed=Cambiaches o contrasinal
 
 # Settings Notifications
 settings.notifications.title=Notificacións
diff --git a/src/main/resources/strings/BriarDesktop_he.properties b/src/main/resources/strings/BriarDesktop_he.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e9b01a7cf0b113f5cb4bec63f9b47b41051edd55
--- /dev/null
+++ b/src/main/resources/strings/BriarDesktop_he.properties
@@ -0,0 +1,246 @@
+# Accessibility
+access.attachment_add=הוסף קובץ מצורף
+access.attachment_remove=Remove attachment
+access.contacts.add=הוסף איש קשר
+access.contact.menu=Show contact menu
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
+access.contacts.search=Icon for searching contacts
+access.contacts.pending.remove=Remove pending contact
+access.introduction.back.contact=Go back to contact screen of introduction process
+access.introduction.close=Close introduction screen
+access.message.jump_to_unread=Jump to next unread message
+access.message.send=Send message
+access.message.sent=הודעה נשלחה
+access.logo=Briar logo
+access.swap=Icon showing errors between two contacts
+access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
+
+# Contacts
+contacts.none_selected.title=איש קשר לא נבחר
+contacts.none_selected.hint=בחר איש קשר כדי להתחיל להתכתב
+contacts.pending_selected.title=Pending contact selected
+contacts.pending_selected.hint=You need to wait until the process of adding each other as contacts has finished before you can start chatting.
+contacts.card.nothing=אין הודעות.
+contacts.dropdown.connections=חיבורים
+contacts.dropdown.connections.title=חיבורים
+contacts.dropdown.connections.bluetooth=התחבר באמצעות שן כחולה
+contacts.dropdown.connections.removable=Connect via Removable Drive
+contacts.dropdown.contact=צרו קשר
+contacts.dropdown.contact.title=צרו קשר
+contacts.dropdown.contact.change=שינוי שם איש הקשר
+contacts.dropdown.contact.delete=מחק איש קשר
+contacts.dropdown.delete.all=מחיקת כל ההודעות
+contacts.dropdown.disappearing=Disappearing messages
+contacts.dropdown.introduction=בצע היכרות
+contacts.search.title=אנשי קשר
+contacts.pending.remove.dialog.title=אשר הסרה
+contacts.pending.remove.dialog.message=איש קשר זה מתווסף. אם תסיר אותו כעת, הוא לא יתווסף.
+
+# Conversation
+conversation.message.unread=הודעות שלא נקראו
+conversation.message.new=New Message
+conversation.delete.all.dialog.title=אשר מחיקת הודעה
+conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
+conversation.delete.single=Delete message for me
+conversation.delete.failed.dialog.title=לא היה ניתן למחוק את כל ההודעות
+conversation.delete.failed.dialog.message.ongoing_both=הודעות שקשורות אל הזמנות והיכרויות מתמשכות אינן יכולות להימחק עד שההיכרויות או ההזמנות יסוימו.
+conversation.delete.failed.dialog.message.ongoing_introductions=הודעות שקשורות אל היכרויות מתמשכות אינן יכולות להימחק עד שהההיכרויות יסוימו.
+conversation.delete.failed.dialog.message.ongoing_invitations=הודעות שקשורות אל הזמנות מתמשכות אינן יכולות להימחק עד שההזמנות יסוימו.
+conversation.delete.failed.dialog.message.not_all_selected_both=כדי למחוק הזמנה או היכרות, צריך לבחור את הבקשה והתגובה.
+conversation.delete.failed.dialog.message.not_all_selected_introductions=כדי למחוק את ההיכרות, צריך לבחור את הבקשה והתגובה.
+conversation.delete.failed.dialog.message.not_all_selected_invitations=כדי למחוק את ההזמנה, צריך לבחור את הבקשה והתגובה.
+conversation.add.contact.dialog.title=הוסף איש קשר בקרבה
+conversation.add.contact.dialog.contact_link=קישור של איש קשר
+conversation.delete.contact.dialog.title=אשר מחיקת איש קשר
+conversation.delete.contact.dialog.message=האם אכן ברצונך למחוק איש קשר זה ואת כל ההודעות שהוחלפו עם איש קשר זה?
+conversation.change.alias.dialog.title=שינוי שם איש הקשר
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
+
+# Private Groups
+groups.card.created=Created by {0}
+groups.card.messages={0, plural, one {{0} message} two {{0} messages} many {{0} messages} other {{0} messages}}
+
+# Introduction
+introduction.introduce=בצע היכרות
+introduction.message=הוסף הודעה (רשותי)
+introduction.title_first=Introduce {0} to
+introduction.title_second=הכר בין אנשי קשר
+introduction.request.sent=ביקשת להכיר את {0} בפני {1}.
+introduction.request.received={0} has asked to introduce you to {1}. Do you want to add {1} to your contact list?
+introduction.request.exists.received={0} has asked to introduce you to {1}, but {1} is already in your contact list. Since {0} might not know that, you can still respond:
+introduction.request.answered.received={0} ביקש להכיר אותך בפני {1}.
+introduction.response.accepted.sent=הסכמת אל ההיכרות בפני %1$s{0}.
+introduction.response.accepted.sent.info=בטרם {0} יוכל להתווסף אל אנשי הקשר שלך, הוא צריך לקבל את ההיכרות בנוסף. זה עשוי לקחת זמן מה.
+introduction.response.declined.sent=סירבת אל ההיכרות בפני {0}.
+introduction.response.declined.auto=The introduction to {0} was automatically declined.
+introduction.response.accepted.received={0} הסכים אל ההיכרות בפני {1}.
+introduction.response.declined.received={0} declined the introduction to {1}.
+introduction.response.declined.received_by_introducee={0} says that {1} declined the introduction.
+
+# Add Contact Remotely
+contact.add.title_dialog=הוסף אנשי קשר
+contact.add.remote.title=הוסף איש קשר בקרבה
+contact.add.remote.your_link=יש לתת את הקישור הזה לאיש הקשר שברצונך להוסיף
+contact.add.remote.copy_tooltip=העתק
+contact.add.remote.contact_link=הכנס את הקישור מאיש הקשר שלך כאן
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=הדבק
+contact.add.remote.nickname_intro=יש לתת את הכינוי לאיש הקשר שלך. רק את/ה יכול/ה לראות אותו.
+contact.add.remote.choose_nickname=הכנס כינוי
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
+
+# Private Group Sharing
+group.invitation.received={0} has invited you to join the group "{1}".
+group.invitation.sent=You have invited {0} to join the group "{1}".
+group.invitation.response.accepted.sent=You accepted the group invitation from {0}.
+group.invitation.response.declined.sent=You declined the group invitation from {0}.
+group.invitation.response.declined.auto=The group invitation from {0} was automatically declined.
+group.invitation.response.accepted.received={0} accepted the group invitation.
+group.invitation.response.declined.received={0} declined the group invitation.
+
+# Forum Sharing
+forum.invitation.received={0} has shared the forum "{1}" with you.
+forum.invitation.sent=You have shared the forum "{0}" with {1}.
+forum.invitation.response.accepted.sent=You accepted the forum invitation from {0}.
+forum.invitation.response.declined.sent=You declined the forum invitation from {0}.
+forum.invitation.response.declined.auto=The forum invitation from {0} was automatically declined.
+forum.invitation.response.accepted.received={0} accepted the forum invitation.
+forum.invitation.response.declined.received={0} declined the forum invitation.
+
+# Blog Sharing
+blog.invitation.received={0} has shared the blog "{1}" with you.
+blog.invitation.sent=You have shared the blog "{0}" with {1}.
+blog.invitation.response.accepted.sent=You accepted the blog invitation from {0}.
+blog.invitation.response.declined.sent=You declined the blog invitation from {0}.
+blog.invitation.response.declined.auto=The blog invitation from {0} was automatically declined.
+blog.invitation.response.accepted.received={0} accepted the blog invitation.
+blog.invitation.response.declined.received={0} declined the blog invitation.
+
+
+# Main
+main.title=Briar Desktop
+main.help.title=Briar Desktop Client
+main.help.debug=Enable printing of debug messages
+main.help.verbose=Print verbose log messages
+main.help.data=The directory where Briar will store its files. Default: {0}
+main.help.tor.port.socks=Tor Socks Port
+main.help.tor.port.control=Tor Control Port
+
+# Welcome
+welcome.title=ברוך בואך אל Briar
+welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
+
+# About
+about.copyright=Copyright
+about.license=רישיון
+about.version=גירסה
+about.version.core=Core Version
+about.contact=צרו קשר
+about.website=אתר
+
+# Miscellaneous
+cancel=ביטול
+delete=מחיקה
+ok=אישור
+accept=קבל
+add=הוסף
+change=שינוי
+decline=סרב
+back=הקודם
+next=הבא
+open=פתיחה
+sorry=עמך הסליחה
+error=שגיאה
+warning=אזהרה
+unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=הסר
+
+# Compose text edit actions
+copy=העתק
+cut=גזור
+paste=הדבק
+select_all=בחר הכל
+
+# Startup screen
+startup.title.registration=ברוך בואך אל Briar
+startup.title.login=Welcome back
+startup.field.nickname=כינוי
+startup.field.nickname.explanation=כינויך יוראה ליד תוכן כלשהו שתכתוב. אינך יכול לשנות אותו לאחר יצירת חשבונך.
+startup.field.password=סיסמה
+startup.field.password.explanation=Your Briar account is stored encrypted on your device, not in the cloud. If you forget your password or uninstall Briar, there's no way to recover your account.\n\nChoose a long password that's hard to guess, such as four random words, or ten random letters, numbers and symbols.
+startup.field.password_confirmation=אשר סיסמה
+startup.button.register=יצירת חשבון
+startup.button.login=כניסה למערכת
+startup.error.name_too_long=השם ארוך מדי
+startup.error.password_too_weak=הסיסמה חלשה מדי
+startup.error.passwords_not_match=הסיסמאות אינן תואמות
+startup.error.password_wrong=סיסמה שגויה, נסה שוב
+startup.error.decryption.title=לא יכול לבדוק סיסמה
+startup.error.decryption.text=Briar לא יכול לבדוק את הסיסמה שלך. אנא נסה לאתחל מחדש את המכשיר שלך כדי לפתור בעיה זאת.
+startup.password_forgotten.button=שכחתי את הסיסמה שלי
+startup.password_forgotten.title=סיסמה אבודה
+startup.password_forgotten.text=Your Briar account is stored encrypted on your device, not in the cloud, so we can't reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.
+startup.failed.expired=This software has expired. Thank you for testing!\n\nTo continue using Briar, please download the latest release. You will be able to continue using your account.
+startup.failed.registration=Briar was unable to create your account.\n\nPlease upgrade to the latest version and try again.
+startup.failed.clock_error=Briar was unable to start because your device's clock is wrong.\n\nPlease set your device's clock to the right time and try again.
+startup.failed.db_error=Briar was unable to open the database containing your account, your contacts and your messages.\n\nPlease check if Briar is already running on this device. Otherwise, upgrade to the latest version of the app and try again, or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_old_error=Your account was created with an old version of this app and cannot be opened with this version.\n\nYou must either reinstall the old version or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_new_error=Your account was created with a newer version of this app and cannot be opened with this version.\n\nPlease upgrade to the latest version and try again.
+startup.failed.service_error=Briar was unable to start a required component.\n\nPlease upgrade to the latest version of the app and try again.
+startup.database.creating=Creating Account…
+startup.database.opening=מפענח מסד נתונים…
+startup.database.migrating=משדרג מסד נתונים…
+startup.database.compacting=מצופף מסד נתונים…
+expiration.banner.part1.zero=This is a test version of Briar that will expire today.
+expiration.banner.part1.nozero={0, plural, one {This is a test version of Briar that will expire tomorrow.} two {This is a test version of Briar that will expire in {0} days.} many {This is a test version of Briar that will expire in {0} days.} other {This is a test version of Briar that will expire in {0} days.}}
+expiration.banner.part2=Please update to a newer version in time.
+
+# Settings
+settings.title=הגדרות
+
+# Settings General
+settings.general.title=כללי
+
+# Settings Display
+settings.display.title=תצוגה
+# todo: to be removed
+settings.display.theme=Dark Theme
+settings.display.theme.title=ערכת נושא
+settings.display.theme.auto=ברירת מחדל של מערכת
+settings.display.theme.dark=×›×”×”
+settings.display.theme.light=בהיר
+settings.display.language.title=שפה
+settings.display.language.auto=ברירת מחדל של מערכת
+
+# Settings Connections
+settings.connections.title=חיבורים
+
+# Settings Security
+settings.security.title=אבטחה
+settings.security.password.change=שינוי הסיסמה
+settings.security.password.current=סיסמה נוכחית
+settings.security.password.choose=סיסמא חדשה
+settings.security.password.confirm=אשר סיסמה חדשה
+settings.security.password.changed=סיסמה שונתה.
+
+# Settings Notifications
+settings.notifications.title=התראות
+
+# Settings Actions
+settings.actions.title=פעולות
diff --git a/src/main/resources/strings/BriarDesktop_hu.properties b/src/main/resources/strings/BriarDesktop_hu.properties
index 108319601c4167bf599ac9178c1f8a3b4ee755f4..0f572ac067aca38a39ea7267fe3a4373773672db 100644
--- a/src/main/resources/strings/BriarDesktop_hu.properties
+++ b/src/main/resources/strings/BriarDesktop_hu.properties
@@ -3,9 +3,10 @@ access.attachment_add=Csatolmány hozzáadása
 access.attachment_remove=Csatolmány eltávolítása
 access.contacts.add=Kapcsolat hozzáadása
 access.contact.menu=Kapcsolat menü megjelenítése
-access.contacts.dropdown.connections.expand=Hálózati kapcsolatok menü kinyitása
-access.contacts.dropdown.contacts.expand=Kapcsolatok menü kinyitása
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Ikon a kapcsolatok kereséséhez
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Menjen vissza kapcsolatok képernyőre a bemutatkozási folyamathoz
 access.introduction.close=Bemutató képernyő bezárása
 access.message.jump_to_unread=Ugrás a következő olvasatlan üzenetre
@@ -14,6 +15,8 @@ access.message.sent=Üzenet elküldve
 access.logo=Briar logo
 access.swap=Ikon, ami hibákat jelez két kapcsolat között
 access.about_briar_desktop=A Briar Desktop névjegye
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Nincs kapcsolat kiválasztva
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Minden üzenet törlése
 contacts.dropdown.disappearing=Eltűnő üzenetek
 contacts.dropdown.introduction=Bemutatkozás készítése
 contacts.search.title=Kontaktok
+contacts.pending.remove.dialog.title=Eltávolítás megerősítése
+contacts.pending.remove.dialog.message=A kapcsolat még hozzáadás alatt. Ha törli, akkor nem kerül hozzá adásra.
 
 # Conversation
 conversation.message.unread=Olvasatlan üzenetek
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=A folyamatban lév
 conversation.delete.failed.dialog.message.not_all_selected_both=Egy meghívás vagy bemutatkozás törléséhez ki kell jelölnie a kérelmet és a választ.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Egy bemutatkozás törléséhez ki kell jelölnie a kérelmet és a választ.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Egy meghívás törléséhez ki kell jelölnie a kérelmet és a választ.
+conversation.add.contact.dialog.title=Távoli kapcsolat hozzá adása
+conversation.add.contact.dialog.contact_link=Kapcsolat linkje
 conversation.delete.contact.dialog.title=Kapcsolat törlésének megerősítése
 conversation.delete.contact.dialog.message=Biztosan eltávolítja ezt a kapcsolatot és minden vele történt üzenetváltását?
+conversation.change.alias.dialog.title=Kapcsolat nevének megváltoztatása
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=Létrehozta {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=A bemutatás {0} számára automatikusan elu
 introduction.response.accepted.received={0} elfogadta a bemutatkozást {1} számára.
 introduction.response.declined.received={0} elutasította a bemutatkozást {1} számára.
 introduction.response.declined.received_by_introducee={0} szerint {1} elutasította a bemutatkozást.
-introduction.error.own_link=A kapcsolata linkjét adja meg, ne a sajátját
-introduction.error.remote_invalid=A távoli kézfogás link érvénytelen
-introduction.error.alias_invalid=Az alias érvénytelen
-introduction.error.link_invalid=A link érvénytelen: {0}
-introduction.error.public_key_invalid=A publikus kulcs érvénytelen: {0}
-introduction.error.adding_failed=Kapcsolat hozzáadása sikertelen
-introduction.error.contact_already_exists=Önnek már van kapcsolata ezzel a linkkel: {0}
-introduction.error.pending_contact_already_exists=Önnek már van várakozó kapcsolata ezzel a linkkel: {0}
-introduction.error.duplicate_contact_explainer=Legyen óvatos, ha {0} és {1} nem ugyanaz a személy.\n\nEgyikük megpróbálja kideríteni, hogy kik az Ön kapcsolatai.\n\nNe árulja el nekik, hogy már megkapta ezt a linket valaki mástól.
 
+# Add Contact Remotely
+contact.add.title_dialog=Kapcsolat hozzáadása
+contact.add.remote.title=Távoli kapcsolat hozzá adása
+contact.add.remote.your_link=Adja oda ezt a linket annak a kapcsolatának, akit hozzá szeretne adni
+contact.add.remote.copy_tooltip=Másol
+contact.add.remote.contact_link=Írj a be a linket a kapcsolatától ide
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Beilleszt
+contact.add.remote.nickname_intro=Adja meg a kontakt becenevét. Csak ön láthatja.
+contact.add.remote.choose_nickname=Becenév megadása
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=A kapcsolata linkjét adja meg, ne a sajátját
+contact.add.error.remote_invalid=A távoli kézfogás link érvénytelen
+contact.add.error.alias_invalid=Az alias érvénytelen
+contact.add.error.link_invalid=A link érvénytelen: {0}
+contact.add.error.public_key_invalid=A publikus kulcs érvénytelen: {0}
+contact.add.error.adding_failed=Kapcsolat hozzáadása sikertelen
+contact.add.error.contact_already_exists=Önnek már van kapcsolata ezzel a linkkel: {0}
+contact.add.error.pending_contact_already_exists=Önnek már van várakozó kapcsolata ezzel a linkkel: {0}
+contact.add.error.duplicate_contact_explainer=Legyen óvatos, ha {0} és {1} nem ugyanaz a személy.\n\nEgyikük megpróbálja kideríteni, hogy kik az Ön kapcsolatai.\n\nNe árulja el nekik, hogy már megkapta ezt a linket valaki mástól.
 
 # Private Group Sharing
 group.invitation.received={0} meghívta Önt, hogy csatlakozzon a(z) "{1}" csoporthoz.
@@ -126,6 +150,7 @@ welcome.text=Még nincsenek kapcsolatai! Koppintson a + ikonra egy kapcsolat hoz
 about.copyright=Copyright
 about.license=Licensz
 about.version=Verzió
+about.version.core=Core Version
 about.contact=Kapcsolat
 about.website=Weboldal
 
@@ -134,6 +159,8 @@ cancel=Mégsem
 delete=Törlés
 ok=Rendben
 accept=Elfogad
+add=Hozzáad
+change=Módosítás
 decline=Megtagad
 back=Vissza
 next=Következő
@@ -142,6 +169,13 @@ sorry=Sajnáljuk
 error=Hiba
 warning=Figyelem
 unsupported_feature=Sajnos ez a funkció még nem érhető el a Briar Desktop-ból.
+remove=Eltávolít
+
+# Compose text edit actions
+copy=Másol
+cut=Kivág
+paste=Beilleszt
+select_all=Összes kiválasztása
 
 # Startup screen
 startup.title.registration=Köszöntjük a Briar-ban
@@ -169,7 +203,7 @@ startup.failed.db_error=A Briar nem tudja megnyitni az adatbázist, ami a fiókj
 startup.failed.data_too_old_error=A fiókja egy régi app verzióval volt létrehozva, és nem nyitható meg ezzel a verzióval. \n\nVagy visszatelepíti a régi verziót, vagy létrehoz egy új fiókot az 'Elfelejtettem a jelszavam' menüpont alatt, amikor a jelszóbekérés történik.
 startup.failed.data_too_new_error=A fiókja az app újabb verziójával került létrehozásra és nem nyitható meg ezzel a verzióval.\n\nKérjük frissítsen a legutolsó verzióra és próbálja újra.
 startup.failed.service_error=A Briar nem tudja elindítani a szükséges komponenst.\n\nKérjük frissítsen a legutolsó verzióra és próbálja újra.
-startup.database.creating=Fiók létrehozása...
+startup.database.creating=Creating Account…
 startup.database.opening=Adatbázis dekódolása...
 startup.database.migrating=Adatbázis frissítése
 startup.database.compacting=Adatbázis tömörítése...
@@ -185,13 +219,25 @@ settings.general.title=Általános
 
 # Settings Display
 settings.display.title=Megjelenítés
+# todo: to be removed
 settings.display.theme=Sötét téma
+settings.display.theme.title=Téma
+settings.display.theme.auto=Rendszer alapértelmezett
+settings.display.theme.dark=Sötét
+settings.display.theme.light=Világos
+settings.display.language.title=Nyelv
+settings.display.language.auto=Rendszer alapértelmezett
 
 # Settings Connections
 settings.connections.title=Kapcsolatok
 
 # Settings Security
 settings.security.title=Biztonság
+settings.security.password.change=Jelszó megváltoztatása
+settings.security.password.current=Aktuális jelszó
+settings.security.password.choose=Új jelszó
+settings.security.password.confirm=Új jelszó megerősítése
+settings.security.password.changed=A jelszó megváltozott
 
 # Settings Notifications
 settings.notifications.title=Értesítések
diff --git a/src/main/resources/strings/BriarDesktop_is.properties b/src/main/resources/strings/BriarDesktop_is.properties
index ec51b29616af7770e8071fdfe4d9e25d952b1f74..14779b6c38d822580e2a43c532defe2bd61bd636 100644
--- a/src/main/resources/strings/BriarDesktop_is.properties
+++ b/src/main/resources/strings/BriarDesktop_is.properties
@@ -3,9 +3,10 @@ access.attachment_add=Bæta við viðhengi
 access.attachment_remove=Fjarlægja viðhengi
 access.contacts.add=Bæta við tengilið
 access.contact.menu=Birta valmynd tengiliða
-access.contacts.dropdown.connections.expand=Fletta út tengingavalmynd
-access.contacts.dropdown.contacts.expand=Fletta út tengiliðavalmynd
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Táknmynd fyrir leit að tengiliðum
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Fara til baka á tengiliðaskjá kynningarferlis
 access.introduction.close=Loka kynningarskjá
 access.message.jump_to_unread=Fara í næstu ólesnu skilaboð
@@ -14,6 +15,8 @@ access.message.sent=Skilaboð send
 access.logo=Briar-táknmynd
 access.swap=Táknmynd sem sýnir villur milli tveggja tengiliða
 access.about_briar_desktop=Um Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Enginn tengiliður valinn
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Eyða öllum skilaboðum
 contacts.dropdown.disappearing=Sjálfeyðandi skilaboð
 contacts.dropdown.introduction=Útbúa kynningu
 contacts.search.title=Tengiliðir
+contacts.pending.remove.dialog.title=Staðfesta að fjarlægja
+contacts.pending.remove.dialog.message=Það er ennþá verið að bæta þessum tengilið við. Ef þú fjarlægir hann núna, verður honum ekki bætt við.
 
 # Conversation
 conversation.message.unread=Ólesin skilaboð
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Skilaboð sem teng
 conversation.delete.failed.dialog.message.not_all_selected_both=Til að eyða boði eða kynningu, þarftu að velja beiðnina og svarið.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Til að eyða kynningu, þarftu að velja beiðnina og svarið.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Til að eyða boði, þarftu að velja beiðnina og svarið.
+conversation.add.contact.dialog.title=Bæta við fjarlægum tengilið
+conversation.add.contact.dialog.contact_link=Tengill á tengilið
 conversation.delete.contact.dialog.title=Staðfesta eyðingu tengiliðar
 conversation.delete.contact.dialog.message=Ertu viss að þú viljir fjarlægja þennan tengilið ásamt öllum þeim skilaboðum sem ykkur hafa farið á milli?
+conversation.change.alias.dialog.title=Breyta nafni tengiliðar
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=Búið til af {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Kynningu við {0} var sjálfvirkt hafnað.
 introduction.response.accepted.received={0} samþykkti kynningu við {1}.
 introduction.response.declined.received={0} hafnaði kynningu við {1}.
 introduction.response.declined.received_by_introducee={0} segir að {1} hafi hafnað kynningunni.
-introduction.error.own_link=Settu inn tengilinn frá tengiliðnum, ekki þinn eigin
-introduction.error.remote_invalid=Tengill á fjartengt handaband er ógildur
-introduction.error.alias_invalid=Stuttnefni er ógilt
-introduction.error.link_invalid=Tengill er ógildur: {0}
-introduction.error.public_key_invalid=Dreifilykill er ógildur: {0}
-introduction.error.adding_failed=Mistókst að bæta við tengilið
-introduction.error.contact_already_exists=Þú ert þegar með tengilið með þessum tengli: {0}
-introduction.error.pending_contact_already_exists=Þú ert þegar með tengilið í bið sem er með þessum tengli: {0}
-introduction.error.duplicate_contact_explainer=Athugaðu vandlega hvort {0} sé nokkuð sami aðili og {1}.\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.
 
+# Add Contact Remotely
+contact.add.title_dialog=Bæta við tengilið
+contact.add.remote.title=Bæta við fjarlægum tengilið
+contact.add.remote.your_link=Gefðu þennan tengil til tengiliðarins sem þú ætlar að bæta við
+contact.add.remote.copy_tooltip=Afrita
+contact.add.remote.contact_link=Settu hér inn tengilinn frá tengiliðnum þínum
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Líma
+contact.add.remote.nickname_intro=Gefðu tengiliðnum þínum stuttnefni/gælunafn. Einungis þú getur séð það.
+contact.add.remote.choose_nickname=Settu inn stuttnefni
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Settu inn tengilinn frá tengiliðnum, ekki þinn eigin
+contact.add.error.remote_invalid=Tengill á fjartengt handaband er ógildur
+contact.add.error.alias_invalid=Stuttnefni er ógilt
+contact.add.error.link_invalid=Tengill er ógildur: {0}
+contact.add.error.public_key_invalid=Dreifilykill er ógildur: {0}
+contact.add.error.adding_failed=Mistókst að bæta við tengilið
+contact.add.error.contact_already_exists=Þú ert þegar með tengilið með þessum tengli: {0}
+contact.add.error.pending_contact_already_exists=Þú ert þegar með tengilið í bið sem er með þessum tengli: {0}
+contact.add.error.duplicate_contact_explainer=Athugaðu vandlega hvort {0} sé nokkuð sami aðili og {1}.\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.
 
 # Private Group Sharing
 group.invitation.received={0} bauð þér í hópinn "{1}".
@@ -126,6 +150,7 @@ welcome.text=Þú ert ekki með neina tengiliði. Ýttu á + táknið til að b
 about.copyright=Höfundarréttur
 about.license=Notkunarleyfi
 about.version=Útgáfa
+about.version.core=Core Version
 about.contact=Tengiliður
 about.website=Vefsvæði
 
@@ -134,6 +159,8 @@ cancel=Hætta við
 delete=Eyða
 ok=Í lagi
 accept=Samþykkja
+add=Bæta við
+change=Breyta
 decline=Hafna
 back=Til baka
 next=Næsta
@@ -142,6 +169,13 @@ sorry=Því miður
 error=Villa
 warning=Aðvörun
 unsupported_feature=Því miður er þessi eiginleiki ekki studdur í Briar Desktop forritinu.
+remove=Fjarlægja
+
+# Compose text edit actions
+copy=Afrita
+cut=Cut
+paste=Líma
+select_all=Select all
 
 # Startup screen
 startup.title.registration=Velkomin í Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar tókst ekki að opna gagnagrunninn sem inniheldur
 startup.failed.data_too_old_error=Notandaaðgangurinn þinn var útbúinn með eldri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu.\n\nÞú þarft annað hvort að setja gömlu útgáfuna aftur, eða setja upp nýjan notandaaðgang með því að velja 'Ég hef gleymt lykilorðinu mínu' þegar beðið er um lykilorð.
 startup.failed.data_too_new_error=Notandaaðgangurinn þinn var útbúinn með nýrri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu.\n\nÞú þarft að setja upp nýjustu útgáfuna og prófa svo aftur.
 startup.failed.service_error=Briar tókst ekki að ræsa nauðsynlega einingu.\n\nUppfærðu í nýjustu útgáfuna og prófaðu síðan aftur.
-startup.database.creating=Bý til notandaaðgang...
-startup.database.opening=Afkóða gagnagrunn...
-startup.database.migrating=Uppfæri gagnagrunn...
-startup.database.compacting=Þjappa gagnagrunni...
+startup.database.creating=Creating Account…
+startup.database.opening=Afkóða gagnagrunn…
+startup.database.migrating=Uppfæri gagnagrunn…
+startup.database.compacting=Þjappa gagnagrunni…
 expiration.banner.part1.zero=Þetta er prófunarútgáfa Briar sem mun renna út í dag.
 expiration.banner.part1.nozero={0, plural, one {Þetta er prófunarútgáfa Briar sem mun renna út á morgun.} other {Þetta er prófunarútgáfa Briar sem mun renna út eftir {0} daga.}}
 expiration.banner.part2=Uppfærðu tímanlega í nýrri útgáfu.
@@ -185,13 +219,25 @@ settings.general.title=Almennt
 
 # Settings Display
 settings.display.title=Birting
+# todo: to be removed
 settings.display.theme=Dökkt þema
+settings.display.theme.title=Þema
+settings.display.theme.auto=Sjálfgefið í kerfinu
+settings.display.theme.dark=Dökkt
+settings.display.theme.light=Ljóst
+settings.display.language.title=Tungumál
+settings.display.language.auto=Sjálfgefið í kerfinu
 
 # Settings Connections
 settings.connections.title=Tengingar
 
 # Settings Security
 settings.security.title=Öryggi
+settings.security.password.change=Breyta lykilorði
+settings.security.password.current=Núverandi lykilorð
+settings.security.password.choose=Nýtt lykilorð
+settings.security.password.confirm=Staðfestu nýtt lykilorð
+settings.security.password.changed=Lykilorðinu hefur verið breytt
 
 # Settings Notifications
 settings.notifications.title=Tilkynningar
diff --git a/src/main/resources/strings/BriarDesktop_it.properties b/src/main/resources/strings/BriarDesktop_it.properties
index 0e83a57d3a3996eeea17d773cd69cc0a059fe6bf..5ea444442ebbc144dce6b9d8d5426a013286c82d 100644
--- a/src/main/resources/strings/BriarDesktop_it.properties
+++ b/src/main/resources/strings/BriarDesktop_it.properties
@@ -3,9 +3,10 @@ access.attachment_add=Aggiungi allegato
 access.attachment_remove=Rimuovi allegato
 access.contacts.add=Aggiungi contatto
 access.contact.menu=Mostra menu contatto
-access.contacts.dropdown.connections.expand=Espandi menu connessioni
-access.contacts.dropdown.contacts.expand=Espandi menu contatti
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Icona per cercare contatti
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Torna alla schemata contatti del processo introduttivo
 access.introduction.close=Chiudi schermata introduttiva
 access.message.jump_to_unread=Salta al successivo messaggio non letto
@@ -14,6 +15,8 @@ access.message.sent=Messaggio inviato
 access.logo=Logo di Briar
 access.swap=Icona per mostrare errori tra due contatti
 access.about_briar_desktop=Informazioni su Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Nessun contatto selezionato
@@ -33,13 +36,15 @@ contacts.dropdown.delete.all=Elimina tutti i messaggi
 contacts.dropdown.disappearing=Messaggi dissolventi
 contacts.dropdown.introduction=Crea l'introduzione
 contacts.search.title=Contatti
+contacts.pending.remove.dialog.title=Conferma la rimozione
+contacts.pending.remove.dialog.message=Questo contatto sta ancora per essere aggiunto. Se lo rimuovi ora, non verrà aggiunto.
 
 # Conversation
 conversation.message.unread=Messaggi non letti
 conversation.message.new=Nuovo messaggio
 conversation.delete.all.dialog.title=Conferma l'eliminazione dei messaggi
-conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
-conversation.delete.single=Delete message for me
+conversation.delete.all.dialog.message=Vuoi davvero eliminare tutti i messaggi in questa conversazione dal tuo dispositivo?
+conversation.delete.single=Elimina i messaggi per me
 conversation.delete.failed.dialog.title=Impossibile eliminare i messaggi
 conversation.delete.failed.dialog.message.ongoing_both=I messaggi relativi a presentazioni o inviti in corso non possono essere eliminati fino alla loro conclusione.
 conversation.delete.failed.dialog.message.ongoing_introductions=I messaggi relativi a presentazioni in corso non posssono essere eliminati fino alla loro conclusione.
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=I messaggi relativ
 conversation.delete.failed.dialog.message.not_all_selected_both=Per eliminare un invito o presentazione, devi selezionare la richiesta e la risposta.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Per eliminare una presentazione, devi selezionare la richiesta e la risposta.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Per eliminare un invito, devi selezionare la richiesta e la risposta.
+conversation.add.contact.dialog.title=Aggiungi contatto distante
+conversation.add.contact.dialog.contact_link=Link del contatto
 conversation.delete.contact.dialog.title=Conferma cancellazione contatto
 conversation.delete.contact.dialog.message=Vuoi veramente rimuovere questo contatto e tutti i messaggi scambiati con esso?
+conversation.change.alias.dialog.title=Cambia il nome del contatto
+conversation.change.alias.dialog.description=Inserisci un nuovo nome per questo contatto (visibile solo a te)
 
 # Private Groups
 groups.card.created=Creato da {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=La presentazione a {0} è stata rifiutata au
 introduction.response.accepted.received={0} ha accettato di presentarsi a {1}.
 introduction.response.declined.received={0} ha rifiutato di presentarsi a {1}.
 introduction.response.declined.received_by_introducee={0} dice che {1} ha rifiutato di presentarsi.
-introduction.error.own_link=Inserisci il collegamento del contatto, non il tuo
-introduction.error.remote_invalid=Collegamento di handshake remoto non valido
-introduction.error.alias_invalid=Alias non valido
-introduction.error.link_invalid=Collegamento non valido: {0}
-introduction.error.public_key_invalid=Chiave pubblica non valida: {0}
-introduction.error.adding_failed=Aggiunta contatto fallita
-introduction.error.contact_already_exists=Hai già un contatto con questo collegamento: {0}
-introduction.error.pending_contact_already_exists=Hai già un contatto in attesa con questo collegamento: {0}
-introduction.error.duplicate_contact_explainer=Fai attenzione se {0} non è la stessa persona di {1}.\n\nUno di essi forse sta tentando di scoprire chi sono i tuoi contatti.\n\nNon dire loro che hai ricevuto lo stesso collegamento da qualcun altro.
 
+# Add Contact Remotely
+contact.add.title_dialog=Aggiungi Contatto
+contact.add.remote.title=Aggiungi contatto distante
+contact.add.remote.your_link=Dai questo link al contatto che vuoi aggiungere
+contact.add.remote.copy_tooltip=Copia
+contact.add.remote.contact_link=Inserisci qui il link dal tuo contatto
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Incolla
+contact.add.remote.nickname_intro=Dai un nickname al tuo contatto. Solo tu puoi vederlo.
+contact.add.remote.choose_nickname=Inserisci un nickname
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Inserisci il collegamento del contatto, non il tuo
+contact.add.error.remote_invalid=Collegamento di handshake remoto non valido
+contact.add.error.alias_invalid=Alias non valido
+contact.add.error.link_invalid=Collegamento non valido: {0}
+contact.add.error.public_key_invalid=Chiave pubblica non valida: {0}
+contact.add.error.adding_failed=Aggiunta contatto fallita
+contact.add.error.contact_already_exists=Hai già un contatto con questo collegamento: {0}
+contact.add.error.pending_contact_already_exists=Hai già un contatto in attesa con questo collegamento: {0}
+contact.add.error.duplicate_contact_explainer=Fai attenzione se {0} non è la stessa persona di {1}.\n\nUno di essi forse sta tentando di scoprire chi sono i tuoi contatti.\n\nNon dire loro che hai ricevuto lo stesso collegamento da qualcun altro.
 
 # Private Group Sharing
 group.invitation.received={0} ti ha invitato ad entrare nel gruppo "{1}".
@@ -126,6 +150,7 @@ welcome.text=Non hai ancora alcun contatto. Clicca l'icona + per aggiungere un c
 about.copyright=Copyright
 about.license=Licenza
 about.version=Versione
+about.version.core=Versione Core
 about.contact=Contatti
 about.website=Sito web
 
@@ -134,6 +159,8 @@ cancel=Annulla
 delete=Rimuovi
 ok=OK
 accept=Accetto
+add=Aggiungi
+change=Cambia
 decline=Rifiuta
 back=Indietro
 next=Avanti
@@ -142,6 +169,13 @@ sorry=Scusa
 error=Errore
 warning=Attenzione
 unsupported_feature=Purtroppo questa funzione non è ancora supportata da Briar Desktop.
+remove=Rimuovi
+
+# Compose text edit actions
+copy=Copia
+cut=Taglia
+paste=Incolla
+select_all=Seleziona tutto
 
 # Startup screen
 startup.title.registration=Benvenuti su Briar
@@ -169,7 +203,7 @@ startup.failed.db_error=Briar non ha potuto aprire il database contenente il tuo
 startup.failed.data_too_old_error=Il tuo account è stato creato con una vecchia versione dell'app e non può essere aperto in questa versione.\n\nDevi reinstallare la vecchia versione oppure impostare un nuovo account scegliendo 'Ho dimenticato la password' alla richiesta di password.
 startup.failed.data_too_new_error=Il tuo account è stato creato con una versione più recente dell'app e non può esere aperto in questa versione.\n\nAggiorna all'ultima versione e riprova.
 startup.failed.service_error=Briar non ha potuto avviare un componente necessario.\n\nAggiorna all'ultima versione dell'app e riprova.
-startup.database.creating=Creazione account..
+startup.database.creating=Creating Account…
 startup.database.opening=Decrittazione del database...
 startup.database.migrating=Aggiornamento del database...
 startup.database.compacting=Compattazione del database…
@@ -185,13 +219,25 @@ settings.general.title=Generale
 
 # Settings Display
 settings.display.title=Visualizza
+# todo: to be removed
 settings.display.theme=Tema scuro
+settings.display.theme.title=Tema
+settings.display.theme.auto=Default del sistema
+settings.display.theme.dark=Scuro
+settings.display.theme.light=Chiaro
+settings.display.language.title=Lingua
+settings.display.language.auto=Default del sistema
 
 # Settings Connections
 settings.connections.title=Connessioni
 
 # Settings Security
 settings.security.title=Sicurezza
+settings.security.password.change=Cambia password
+settings.security.password.current=Password attuale
+settings.security.password.choose=Nuova password
+settings.security.password.confirm=Conferma la nuova password
+settings.security.password.changed=La password è stata cambiata.
 
 # Settings Notifications
 settings.notifications.title=Notifiche
diff --git a/src/main/resources/strings/BriarDesktop_ja.properties b/src/main/resources/strings/BriarDesktop_ja.properties
new file mode 100644
index 0000000000000000000000000000000000000000..56f59d1770c1f6cb0430e5a1ccf1edb1f517597c
--- /dev/null
+++ b/src/main/resources/strings/BriarDesktop_ja.properties
@@ -0,0 +1,246 @@
+# Accessibility
+access.attachment_add=Add attachment
+access.attachment_remove=Remove attachment
+access.contacts.add=連絡相手を追加
+access.contact.menu=Show contact menu
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
+access.contacts.search=Icon for searching contacts
+access.contacts.pending.remove=Remove pending contact
+access.introduction.back.contact=Go back to contact screen of introduction process
+access.introduction.close=Close introduction screen
+access.message.jump_to_unread=Jump to next unread message
+access.message.send=Send message
+access.message.sent=Message sent
+access.logo=Briar logo
+access.swap=Icon showing errors between two contacts
+access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
+
+# Contacts
+contacts.none_selected.title=連絡先未選択
+contacts.none_selected.hint=会話を開始する連絡先を選択
+contacts.pending_selected.title=Pending contact selected
+contacts.pending_selected.hint=You need to wait until the process of adding each other as contacts has finished before you can start chatting.
+contacts.card.nothing=メッセージがありません。
+contacts.dropdown.connections=接続数
+contacts.dropdown.connections.title=接続数
+contacts.dropdown.connections.bluetooth=Bluetooth経由で接続する
+contacts.dropdown.connections.removable=Connect via Removable Drive
+contacts.dropdown.contact=連絡先
+contacts.dropdown.contact.title=連絡先
+contacts.dropdown.contact.change=連絡先を変更
+contacts.dropdown.contact.delete=この連絡先を削除
+contacts.dropdown.delete.all=全てのメッセージを削除
+contacts.dropdown.disappearing=消えたメッセージ
+contacts.dropdown.introduction=はじめに
+contacts.search.title=連絡先
+contacts.pending.remove.dialog.title=削除の確認
+contacts.pending.remove.dialog.message=この連絡先はまだ追加中です。 今削除すると、追加されません。
+
+# Conversation
+conversation.message.unread=未読メッセージ
+conversation.message.new=新着メッセージ
+conversation.delete.all.dialog.title=メッセージの削除時に確認
+conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
+conversation.delete.single=Delete message for me
+conversation.delete.failed.dialog.title=全てのメッセージを削除不可能
+conversation.delete.failed.dialog.message.ongoing_both=継続中の招待と紹介に関わるメッセージは、終了するまで削除できません。
+conversation.delete.failed.dialog.message.ongoing_introductions=継続中の紹介に関わるメッセージは、終了するまで削除できません。
+conversation.delete.failed.dialog.message.ongoing_invitations=継続中の招待に関わるメッセージは、終了するまで削除できません。
+conversation.delete.failed.dialog.message.not_all_selected_both=招待と紹介を削除するには、要求と応答を選択する必要があります。
+conversation.delete.failed.dialog.message.not_all_selected_introductions=紹介を削除するには、要求と応答を選択する必要があります。
+conversation.delete.failed.dialog.message.not_all_selected_invitations=招待を削除するには、要求と応答を選択する必要があります。
+conversation.add.contact.dialog.title=離れた場所にいる相手を連絡先に追加
+conversation.add.contact.dialog.contact_link=連絡相手のリンク
+conversation.delete.contact.dialog.title=連絡先の削除時に確認
+conversation.delete.contact.dialog.message=この連絡先と、この連絡先とのすべてのメッセージを削除してもよろしいですか？
+conversation.change.alias.dialog.title=連絡先を変更
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
+
+# Private Groups
+groups.card.created=Created by {0}
+groups.card.messages={0, plural, other {{0} messages}}
+
+# Introduction
+introduction.introduce=はじめに
+introduction.message=メッセージを追加する（任意）
+introduction.title_first=Introduce {0} to
+introduction.title_second=連絡相手を紹介する
+introduction.request.sent=You have asked to introduce {0} to {1}.
+introduction.request.received={0} has asked to introduce you to {1}. Do you want to add {1} to your contact list?
+introduction.request.exists.received={0} has asked to introduce you to {1}, but {1} is already in your contact list. Since {0} might not know that, you can still respond:
+introduction.request.answered.received={0} has asked to introduce you to {1}.
+introduction.response.accepted.sent=You accepted the introduction to {0}.
+introduction.response.accepted.sent.info=Before {0} gets added to your contacts, they need to accept the introduction as well. This might take some time.
+introduction.response.declined.sent=You declined the introduction to {0}.
+introduction.response.declined.auto=The introduction to {0} was automatically declined.
+introduction.response.accepted.received={0} accepted the introduction to {1}.
+introduction.response.declined.received={0} declined the introduction to {1}.
+introduction.response.declined.received_by_introducee={0} says that {1} declined the introduction.
+
+# Add Contact Remotely
+contact.add.title_dialog=連絡先を追加
+contact.add.remote.title=離れた場所にいる相手を連絡先に追加
+contact.add.remote.your_link=リンクを共有する連絡相手を追加する
+contact.add.remote.copy_tooltip=コピー
+contact.add.remote.contact_link=連絡相手のリンクをここに入力してください
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=貼り付け
+contact.add.remote.nickname_intro=この連絡相手にニックネームを付けます。 あなただけがそれを見ることができます。
+contact.add.remote.choose_nickname=ニックネームを入力してください
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
+
+# Private Group Sharing
+group.invitation.received={0} has invited you to join the group "{1}".
+group.invitation.sent=You have invited {0} to join the group "{1}".
+group.invitation.response.accepted.sent=You accepted the group invitation from {0}.
+group.invitation.response.declined.sent=You declined the group invitation from {0}.
+group.invitation.response.declined.auto=The group invitation from {0} was automatically declined.
+group.invitation.response.accepted.received={0} accepted the group invitation.
+group.invitation.response.declined.received={0} declined the group invitation.
+
+# Forum Sharing
+forum.invitation.received={0} has shared the forum "{1}" with you.
+forum.invitation.sent=You have shared the forum "{0}" with {1}.
+forum.invitation.response.accepted.sent=You accepted the forum invitation from {0}.
+forum.invitation.response.declined.sent=You declined the forum invitation from {0}.
+forum.invitation.response.declined.auto=The forum invitation from {0} was automatically declined.
+forum.invitation.response.accepted.received={0} accepted the forum invitation.
+forum.invitation.response.declined.received={0} declined the forum invitation.
+
+# Blog Sharing
+blog.invitation.received={0} has shared the blog "{1}" with you.
+blog.invitation.sent=You have shared the blog "{0}" with {1}.
+blog.invitation.response.accepted.sent=You accepted the blog invitation from {0}.
+blog.invitation.response.declined.sent=You declined the blog invitation from {0}.
+blog.invitation.response.declined.auto=The blog invitation from {0} was automatically declined.
+blog.invitation.response.accepted.received={0} accepted the blog invitation.
+blog.invitation.response.declined.received={0} declined the blog invitation.
+
+
+# Main
+main.title=Briar Desktop
+main.help.title=Briar Desktop Client
+main.help.debug=Enable printing of debug messages
+main.help.verbose=Print verbose log messages
+main.help.data=The directory where Briar will store its files. Default: {0}
+main.help.tor.port.socks=Tor Socks Port
+main.help.tor.port.control=Tor Control Port
+
+# Welcome
+welcome.title=Briarへようこそ
+welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
+
+# About
+about.copyright=Copyright
+about.license=ライセンス
+about.version=バージョン
+about.version.core=Core Version
+about.contact=連絡先
+about.website=ウェブサイト
+
+# Miscellaneous
+cancel=キャンセル
+delete=削除
+ok=OK
+accept=承認
+add=追加
+change=変更
+decline=却下
+back=戻る
+next=次へ
+open=オープン
+sorry=申し訳ありません
+error=エラー
+warning=警告
+unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=削除
+
+# Compose text edit actions
+copy=コピー
+cut=切り取り
+paste=貼り付け
+select_all=すべて選択
+
+# Startup screen
+startup.title.registration=Briarへようこそ
+startup.title.login=Welcome back
+startup.field.nickname=ニックネーム
+startup.field.nickname.explanation=あなたのニックネームは、常に、あなたが投稿するコンテンツとともに表示されます。プロフィール作成後、編集はできません。
+startup.field.password=パスワード
+startup.field.password.explanation=Your Briar account is stored encrypted on your device, not in the cloud. If you forget your password or uninstall Briar, there's no way to recover your account.\n\nChoose a long password that's hard to guess, such as four random words, or ten random letters, numbers and symbols.
+startup.field.password_confirmation=パスワードを確認
+startup.button.register=アカウントを作成
+startup.button.login=ログイン
+startup.error.name_too_long=名前が長過ぎます。
+startup.error.password_too_weak=パスワードが弱すぎます。
+startup.error.passwords_not_match=パスワードが一致しません
+startup.error.password_wrong=パスワードが間違っています。もう一度入力してください。
+startup.error.decryption.title=パスワードを確認できません
+startup.error.decryption.text=Briarはあなたのパスワードを確認できません。この問題を解決するため、デバイスの再起動を試してください。
+startup.password_forgotten.button=パスワードを忘れました
+startup.password_forgotten.title=パスワードを紛失
+startup.password_forgotten.text=Your Briar account is stored encrypted on your device, not in the cloud, so we can't reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.
+startup.failed.expired=This software has expired. Thank you for testing!\n\nTo continue using Briar, please download the latest release. You will be able to continue using your account.
+startup.failed.registration=Briar was unable to create your account.\n\nPlease upgrade to the latest version and try again.
+startup.failed.clock_error=Briar was unable to start because your device's clock is wrong.\n\nPlease set your device's clock to the right time and try again.
+startup.failed.db_error=Briar was unable to open the database containing your account, your contacts and your messages.\n\nPlease check if Briar is already running on this device. Otherwise, upgrade to the latest version of the app and try again, or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_old_error=Your account was created with an old version of this app and cannot be opened with this version.\n\nYou must either reinstall the old version or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_new_error=Your account was created with a newer version of this app and cannot be opened with this version.\n\nPlease upgrade to the latest version and try again.
+startup.failed.service_error=Briar was unable to start a required component.\n\nPlease upgrade to the latest version of the app and try again.
+startup.database.creating=Creating Account…
+startup.database.opening=データベースの復号化中…
+startup.database.migrating=データベースをアップグレード中…
+startup.database.compacting=データベースの圧縮中…
+expiration.banner.part1.zero=This is a test version of Briar that will expire today.
+expiration.banner.part1.nozero={0, plural, other {This is a test version of Briar that will expire in {0} days.}}
+expiration.banner.part2=Please update to a newer version in time.
+
+# Settings
+settings.title=設定
+
+# Settings General
+settings.general.title=全般
+
+# Settings Display
+settings.display.title=表示
+# todo: to be removed
+settings.display.theme=Dark Theme
+settings.display.theme.title=テーマ
+settings.display.theme.auto=システムのデフォルト
+settings.display.theme.dark=ダーク
+settings.display.theme.light=ライト
+settings.display.language.title=言語
+settings.display.language.auto=システムのデフォルト
+
+# Settings Connections
+settings.connections.title=接続数
+
+# Settings Security
+settings.security.title=セキュリティ
+settings.security.password.change=パスワードの変更
+settings.security.password.current=現在のパスワード
+settings.security.password.choose=新しいパスワード
+settings.security.password.confirm=新しいパスワードの確認
+settings.security.password.changed=パスワードが変更されました。
+
+# Settings Notifications
+settings.notifications.title=通知
+
+# Settings Actions
+settings.actions.title=操作
diff --git a/src/main/resources/strings/BriarDesktop_ko.properties b/src/main/resources/strings/BriarDesktop_ko.properties
new file mode 100644
index 0000000000000000000000000000000000000000..49e47ae6c488708acc30fe47327e127e18910b75
--- /dev/null
+++ b/src/main/resources/strings/BriarDesktop_ko.properties
@@ -0,0 +1,246 @@
+# Accessibility
+access.attachment_add=첨부파일 추가
+access.attachment_remove=Remove attachment
+access.contacts.add=연락처 추가하기
+access.contact.menu=Show contact menu
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
+access.contacts.search=Icon for searching contacts
+access.contacts.pending.remove=Remove pending contact
+access.introduction.back.contact=Go back to contact screen of introduction process
+access.introduction.close=Close introduction screen
+access.message.jump_to_unread=Jump to next unread message
+access.message.send=Send message
+access.message.sent=Message sent
+access.logo=Briar logo
+access.swap=Icon showing errors between two contacts
+access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
+
+# Contacts
+contacts.none_selected.title=선택된 연락처 없음
+contacts.none_selected.hint=연락처를 선택해 채팅을 시작하세요
+contacts.pending_selected.title=Pending contact selected
+contacts.pending_selected.hint=You need to wait until the process of adding each other as contacts has finished before you can start chatting.
+contacts.card.nothing=메시지가 없습니다.
+contacts.dropdown.connections=ì—°ê²°
+contacts.dropdown.connections.title=ì—°ê²°
+contacts.dropdown.connections.bluetooth=블루투스로 연결하기
+contacts.dropdown.connections.removable=Connect via Removable Drive
+contacts.dropdown.contact=문의
+contacts.dropdown.contact.title=문의
+contacts.dropdown.contact.change=연락처 이름 바꾸기
+contacts.dropdown.contact.delete=연락처 삭제하기
+contacts.dropdown.delete.all=모든 메시지 지우기
+contacts.dropdown.disappearing=Disappearing messages
+contacts.dropdown.introduction=소개시키기
+contacts.search.title=문의
+contacts.pending.remove.dialog.title=빼기 확인하기
+contacts.pending.remove.dialog.message=연락처가 아직 추가되고 있습니다. 지금 제거하면 추가되지 않게 됩니다.
+
+# Conversation
+conversation.message.unread=Unread messages
+conversation.message.new=새 메세지
+conversation.delete.all.dialog.title=메시지 삭제 확인
+conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
+conversation.delete.single=Delete message for me
+conversation.delete.failed.dialog.title=모든 메시지를 지울 수는 없었습니다
+conversation.delete.failed.dialog.message.ongoing_both=진행 중인 초대와 소개와 관련된 메시지는 완료되기 전에는 지울 수 없습니다.
+conversation.delete.failed.dialog.message.ongoing_introductions=진행 중인 소개와 관련된 메시지는 완료되기 전에는 지울 수 없습니다.
+conversation.delete.failed.dialog.message.ongoing_invitations=진행 중인 초대와 관련된 메시지는 완료되기 전에는 지울 수 없습니다.
+conversation.delete.failed.dialog.message.not_all_selected_both=초대나 소개를 지우기 위해서는 요청을 선택하고 답을 주셔야 합니다.
+conversation.delete.failed.dialog.message.not_all_selected_introductions=소개를 지우기 위해서는 요청을 선택하고 답을 주셔야 합니다.
+conversation.delete.failed.dialog.message.not_all_selected_invitations=초대를 지우기 위해서는 요청을 선택하고 답을 주셔야 합니다.
+conversation.add.contact.dialog.title=원거리에서 연락처 추가하기
+conversation.add.contact.dialog.contact_link=지인 분의 링크
+conversation.delete.contact.dialog.title=연락처 삭제 확인
+conversation.delete.contact.dialog.message=정말로 이 연락처, 그리고 이 연락처와의 메시지를 모두 제거하시겠어요?
+conversation.change.alias.dialog.title=연락처 이름 바꾸기
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
+
+# Private Groups
+groups.card.created=Created by {0}
+groups.card.messages={0, plural, other {{0} messages}}
+
+# Introduction
+introduction.introduce=소개시키기
+introduction.message=메시지 추가하기(선택 사항)
+introduction.title_first=Introduce {0} to
+introduction.title_second=지인 소개하기
+introduction.request.sent=You have asked to introduce {0} to {1}.
+introduction.request.received={0} has asked to introduce you to {1}. Do you want to add {1} to your contact list?
+introduction.request.exists.received={0} has asked to introduce you to {1}, but {1} is already in your contact list. Since {0} might not know that, you can still respond:
+introduction.request.answered.received={0} has asked to introduce you to {1}.
+introduction.response.accepted.sent=You accepted the introduction to {0}.
+introduction.response.accepted.sent.info=Before {0} gets added to your contacts, they need to accept the introduction as well. This might take some time.
+introduction.response.declined.sent=You declined the introduction to {0}.
+introduction.response.declined.auto=The introduction to {0} was automatically declined.
+introduction.response.accepted.received={0} accepted the introduction to {1}.
+introduction.response.declined.received={0} declined the introduction to {1}.
+introduction.response.declined.received_by_introducee={0} says that {1} declined the introduction.
+
+# Add Contact Remotely
+contact.add.title_dialog=Add Contact
+contact.add.remote.title=원거리에서 연락처 추가하기
+contact.add.remote.your_link=추가하고 싶은 지인에게 이 링크를 보내세요
+contact.add.remote.copy_tooltip=복사하기
+contact.add.remote.contact_link=지인 분에게서 받은 링크를 여기에 입력하세요
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=붙여 넣기
+contact.add.remote.nickname_intro=연락처에 별명을 붙이세요. 다른 사람에게는 보여지지 않습니다.
+contact.add.remote.choose_nickname=별명을 입력하세요
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
+
+# Private Group Sharing
+group.invitation.received={0} has invited you to join the group "{1}".
+group.invitation.sent=You have invited {0} to join the group "{1}".
+group.invitation.response.accepted.sent=You accepted the group invitation from {0}.
+group.invitation.response.declined.sent=You declined the group invitation from {0}.
+group.invitation.response.declined.auto=The group invitation from {0} was automatically declined.
+group.invitation.response.accepted.received={0} accepted the group invitation.
+group.invitation.response.declined.received={0} declined the group invitation.
+
+# Forum Sharing
+forum.invitation.received={0} has shared the forum "{1}" with you.
+forum.invitation.sent=You have shared the forum "{0}" with {1}.
+forum.invitation.response.accepted.sent=You accepted the forum invitation from {0}.
+forum.invitation.response.declined.sent=You declined the forum invitation from {0}.
+forum.invitation.response.declined.auto=The forum invitation from {0} was automatically declined.
+forum.invitation.response.accepted.received={0} accepted the forum invitation.
+forum.invitation.response.declined.received={0} declined the forum invitation.
+
+# Blog Sharing
+blog.invitation.received={0} has shared the blog "{1}" with you.
+blog.invitation.sent=You have shared the blog "{0}" with {1}.
+blog.invitation.response.accepted.sent=You accepted the blog invitation from {0}.
+blog.invitation.response.declined.sent=You declined the blog invitation from {0}.
+blog.invitation.response.declined.auto=The blog invitation from {0} was automatically declined.
+blog.invitation.response.accepted.received={0} accepted the blog invitation.
+blog.invitation.response.declined.received={0} declined the blog invitation.
+
+
+# Main
+main.title=Briar Desktop
+main.help.title=Briar Desktop Client
+main.help.debug=Enable printing of debug messages
+main.help.verbose=Print verbose log messages
+main.help.data=The directory where Briar will store its files. Default: {0}
+main.help.tor.port.socks=Tor Socks Port
+main.help.tor.port.control=Tor Control Port
+
+# Welcome
+welcome.title=Briar에 오신 것을 환영합니다
+welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
+
+# About
+about.copyright=Copyright
+about.license=라이선스
+about.version=버젼
+about.version.core=Core Version
+about.contact=문의
+about.website=웹사이트
+
+# Miscellaneous
+cancel=취소
+delete=삭제
+ok=OK
+accept=받아들이기
+add=추가
+change=바꾸기
+decline=거절하기
+back=뒤로
+next=다음
+open=열림
+sorry=죄송합니다
+error=오류
+warning=경고
+unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=제거하기
+
+# Compose text edit actions
+copy=복사하기
+cut=잘라내기
+paste=붙여 넣기
+select_all=모두 선택
+
+# Startup screen
+startup.title.registration=Briar에 오신 것을 환영합니다
+startup.title.login=Welcome back
+startup.field.nickname=별명
+startup.field.nickname.explanation=별명은 게시한 모든 컨텐츠 옆에 보여지게 됩니다. 별명은 계정을 만든 후에는 바꿀 수 없습니다.
+startup.field.password=비밀번호
+startup.field.password.explanation=Your Briar account is stored encrypted on your device, not in the cloud. If you forget your password or uninstall Briar, there's no way to recover your account.\n\nChoose a long password that's hard to guess, such as four random words, or ten random letters, numbers and symbols.
+startup.field.password_confirmation=비밀번호 확인
+startup.button.register=계정 만들기
+startup.button.login=로그인
+startup.error.name_too_long=이름이 너무 깁니다.
+startup.error.password_too_weak=비밀번호가 너무 약합니다
+startup.error.passwords_not_match=비밀번호가 일치하지 않습니다
+startup.error.password_wrong=잘못된 비밀번호입니다. 다시 시도하세요.
+startup.error.decryption.title=비밀번호를 확인할 수 없습니다
+startup.error.decryption.text=비밀번호를 확인할 수 없었습니다. 이 문제를 해결하기 위해 기기를 재시작 해 보세요.
+startup.password_forgotten.button=비밀번호를 잊어버렸습니다
+startup.password_forgotten.title=비밀번호 분실
+startup.password_forgotten.text=Your Briar account is stored encrypted on your device, not in the cloud, so we can't reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.
+startup.failed.expired=This software has expired. Thank you for testing!\n\nTo continue using Briar, please download the latest release. You will be able to continue using your account.
+startup.failed.registration=Briar was unable to create your account.\n\nPlease upgrade to the latest version and try again.
+startup.failed.clock_error=Briar was unable to start because your device's clock is wrong.\n\nPlease set your device's clock to the right time and try again.
+startup.failed.db_error=Briar was unable to open the database containing your account, your contacts and your messages.\n\nPlease check if Briar is already running on this device. Otherwise, upgrade to the latest version of the app and try again, or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_old_error=Your account was created with an old version of this app and cannot be opened with this version.\n\nYou must either reinstall the old version or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_new_error=Your account was created with a newer version of this app and cannot be opened with this version.\n\nPlease upgrade to the latest version and try again.
+startup.failed.service_error=Briar was unable to start a required component.\n\nPlease upgrade to the latest version of the app and try again.
+startup.database.creating=Creating Account…
+startup.database.opening=데이터베이스를 복호화하고 있습니다....
+startup.database.migrating=데이터베이스를 업그레이드 하고 있습니다...
+startup.database.compacting=데이터베이스를 작게 만들고 있습니다...
+expiration.banner.part1.zero=This is a test version of Briar that will expire today.
+expiration.banner.part1.nozero={0, plural, other {This is a test version of Briar that will expire in {0} days.}}
+expiration.banner.part2=Please update to a newer version in time.
+
+# Settings
+settings.title=설정
+
+# Settings General
+settings.general.title=일반
+
+# Settings Display
+settings.display.title=화면
+# todo: to be removed
+settings.display.theme=Dark Theme
+settings.display.theme.title=테마
+settings.display.theme.auto=기본 설정
+settings.display.theme.dark=ì–´ë‘ 
+settings.display.theme.light=ë¹›
+settings.display.language.title=언어
+settings.display.language.auto=기본 설정
+
+# Settings Connections
+settings.connections.title=ì—°ê²°
+
+# Settings Security
+settings.security.title=보안
+settings.security.password.change=비밀번호 바꾸기
+settings.security.password.current=현재 비밀번호
+settings.security.password.choose=새 비밀번호
+settings.security.password.confirm=새 비밀번호 확인:
+settings.security.password.changed=비밀번호가 바꼈습니다.
+
+# Settings Notifications
+settings.notifications.title=알림
+
+# Settings Actions
+settings.actions.title=Actions
diff --git a/src/main/resources/strings/BriarDesktop_lt.properties b/src/main/resources/strings/BriarDesktop_lt.properties
index 6cf4e4e2c5bd873e4bfbca1187257400c4deba0b..81362bf6e7fbf91de6b3450315bd2ea11090c50d 100644
--- a/src/main/resources/strings/BriarDesktop_lt.properties
+++ b/src/main/resources/strings/BriarDesktop_lt.properties
@@ -3,9 +3,10 @@ access.attachment_add=PridÄ—ti priedÄ…
 access.attachment_remove=Å alinti priedÄ…
 access.contacts.add=PridÄ—ti adresatÄ…
 access.contact.menu=Show contact menu
-access.contacts.dropdown.connections.expand=Išskleisti ryšių meniu
-access.contacts.dropdown.contacts.expand=Expand contacts menu
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Adresatų paieškos piktograma
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Go back to contact screen of introduction process
 access.introduction.close=Close introduction screen
 access.message.jump_to_unread=Peršokti į kitą neskaitytą žinutę
@@ -14,6 +15,8 @@ access.message.sent=Žinutė išsiųsta
 access.logo=Briar logotipas
 access.swap=Piktograma, rodanti klaidas tarp dviejų adresatų
 access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Nepasirinktas kontaktas
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Ištrinti visas žinutes
 contacts.dropdown.disappearing=Išnykstančios žinutės
 contacts.dropdown.introduction=Supažindinti
 contacts.search.title=Adresatai
+contacts.pending.remove.dialog.title=Patvirtinkite Å¡alinimÄ…
+contacts.pending.remove.dialog.message=Šis adresatas yra vis dar pridedamas. Jeigu jį dabar pašalinsite, jis nebus pridėtas.
 
 # Conversation
 conversation.message.unread=Neskaityti laiškai
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Žinutės, susijus
 conversation.delete.failed.dialog.message.not_all_selected_both=Norėdami ištrinti pakvietimą ar supažindinimą, turite pasirinkti užklausą ir atsakymą.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Norėdami ištrinti supažindinimą, turite pasirinkti užklausą ir atsakymą.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Norėdami ištrinti pakvietimą, turite pasirinkti užklausą ir atsakymą.
+conversation.add.contact.dialog.title=PridÄ—ti adresatÄ… per atstumÄ…
+conversation.add.contact.dialog.contact_link=Adresato nuoroda
 conversation.delete.contact.dialog.title=Patvirtinkite adresato ištrynimą
 conversation.delete.contact.dialog.message=Ar tikrai norite pašalinti šį adresatą ir visas žinutes, kuriomis apsikeitėte su šiuo adresatu ?
+conversation.change.alias.dialog.title=Pakeisti adresato vardÄ…
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=Sukūrė {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=The introduction to {0} was automatically de
 introduction.response.accepted.received={0} accepted the introduction to {1}.
 introduction.response.declined.received={0} declined the introduction to {1}.
 introduction.response.declined.received_by_introducee={0} sako, kad {1} atmetė supažindinimą.
-introduction.error.own_link=Įveskite adresato nuorodą, o ne savo asmeninę
-introduction.error.remote_invalid=Nuotolinio išankstinio suderinimo nuoroda neteisinga
-introduction.error.alias_invalid=Alias is invalid
-introduction.error.link_invalid=Nuoroda yra neteisinga: {0}
-introduction.error.public_key_invalid=Viešasis raktas negalioja: {0}
-introduction.error.adding_failed=Adresato pridÄ—ti nepavyko
-introduction.error.contact_already_exists=Jau turite adresatÄ… su Å¡ia nuoroda: {0}
-introduction.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
-introduction.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
+# Add Contact Remotely
+contact.add.title_dialog=PridÄ—ti adresatÄ…
+contact.add.remote.title=PridÄ—ti adresatÄ… per atstumÄ…
+contact.add.remote.your_link=Perduokite šią nuorodą adresatui, kurį norite pridėti
+contact.add.remote.copy_tooltip=Kopijuoti
+contact.add.remote.contact_link=Čia įveskite iš adresato gautą nuorodą
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Įdėti
+contact.add.remote.nickname_intro=Suteikite savo adresatui slapyvardį. Slapyvardį matysite tik jūs.
+contact.add.remote.choose_nickname=Įveskite slapyvardį
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Įveskite adresato nuorodą, o ne savo asmeninę
+contact.add.error.remote_invalid=Nuotolinio išankstinio suderinimo nuoroda neteisinga
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Nuoroda yra neteisinga: {0}
+contact.add.error.public_key_invalid=Viešasis raktas negalioja: {0}
+contact.add.error.adding_failed=Adresato pridÄ—ti nepavyko
+contact.add.error.contact_already_exists=Jau turite adresatÄ… su Å¡ia nuoroda: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
 # Private Group Sharing
 group.invitation.received={0} pakvietė jus prisijungti prie grupės „{1}“.
@@ -126,6 +150,7 @@ welcome.text=Jūs kol kas neturite jokių adresatų. Norėdami pridėti adresat
 about.copyright=Autorių teisės
 about.license=Licencija
 about.version=Versija
+about.version.core=Core Version
 about.contact=Susisiekti
 about.website=InternetinÄ— svetainÄ—
 
@@ -134,6 +159,8 @@ cancel=Atsisakyti
 delete=IÅ¡trinti
 ok=Gerai
 accept=Priimti
+add=PridÄ—ti
+change=Pakeisti
 decline=Atmesti
 back=Atgal
 next=Kitas
@@ -142,6 +169,13 @@ sorry=Atsiprašome
 error=Klaida
 warning=Įspėjimas
 unsupported_feature=Deja, Briar Desktop kol kas nepalaiko Å¡ios ypatybÄ—s.
+remove=IÅ¡trinti
+
+# Compose text edit actions
+copy=Kopijuoti
+cut=IÅ¡kirpti
+paste=Įdėti
+select_all=Žymėti viską
 
 # Startup screen
 startup.title.registration=Sveiki atvykę į Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar was unable to open the database containing your ac
 startup.failed.data_too_old_error=Jūsų paskyra buvo sukurta, naudojant seną šios programos versiją, ir negali būti atverta naudojant šią versiją.\n\nJūs privalote arba iš naujo įdiegti seną versiją, arba nusistatyti naują paskyrą, slaptažodžio užklausoje, pasirinkdami „Aš pamiršau savo slaptažodį“.
 startup.failed.data_too_new_error=Jūsų paskyra buvo sukurta naudojant naujesnę šios programos versiją ir negali būti atverta naudojant šią versiją.\n\nAtnaujinkite programą į naujausią versiją ir bandykite dar kartą.
 startup.failed.service_error=Briar nepavyko paleisti reikiamo komponento.\n\nAtnaujinkite programą į naujausią versiją ir bandykite dar kartą.
-startup.database.creating=Kuriama paskyra...
-startup.database.opening=Iššifruojama duomenų bazė...
-startup.database.migrating=Naujinama duomenų bazė...
-startup.database.compacting=Glaudinama duomenų bazė...
+startup.database.creating=Creating Account…
+startup.database.opening=Iššifruojama duomenų bazė…
+startup.database.migrating=Naujinama duomenų bazė…
+startup.database.compacting=Suspaudžiama duomenų bazė…
 expiration.banner.part1.zero=Tai yra bandomoji Briar versija, kuri Å¡iandien nustos galioti.
 expiration.banner.part1.nozero={0, plural, one {Tai yra bandomoji Briar versija, kuri rytoj nustos galioti.} few {Tai yra bandomoji Briar versija, kuri po {0} dienų nustos galioti.} many {Tai yra bandomoji Briar versija, kuri po {0} dienų nustos galioti.} other {Tai yra bandomoji Briar versija, kuri po {0} dienos nustos galioti.}}
 expiration.banner.part2=Per tą laiką atsinaujinkite į naujesnę versiją.
@@ -185,13 +219,25 @@ settings.general.title=Bendra
 
 # Settings Display
 settings.display.title=Rodinys
+# todo: to be removed
 settings.display.theme=Tamsus apipavidalinimas
+settings.display.theme.title=Apipavidalinimas
+settings.display.theme.auto=Sistemos numatytasis
+settings.display.theme.dark=Tamsus
+settings.display.theme.light=Å viesus
+settings.display.language.title=Kalba
+settings.display.language.auto=Sistemos numatytasis
 
 # Settings Connections
 settings.connections.title=Ryšiai
 
 # Settings Security
 settings.security.title=Saugumas
+settings.security.password.change=Pakeisti slaptažodį
+settings.security.password.current=Dabartinis slaptažodis
+settings.security.password.choose=Naujas slaptažodis
+settings.security.password.confirm=Pakartokite naują slaptažodį
+settings.security.password.changed=Slaptažodis pakeistas.
 
 # Settings Notifications
 settings.notifications.title=Pranešimai
diff --git a/src/main/resources/strings/BriarDesktop_my.properties b/src/main/resources/strings/BriarDesktop_my.properties
index 7cdb4f3cf70ebeebfb99e3dd7f099b3af4508bf6..18d116f363ef33b5f406390fd2696e6ff076335d 100644
--- a/src/main/resources/strings/BriarDesktop_my.properties
+++ b/src/main/resources/strings/BriarDesktop_my.properties
@@ -3,9 +3,10 @@ access.attachment_add=ပူးတွဲဖိုင် ထည့်ရန်
 access.attachment_remove=ပူးတွဲဖိုင်ကို ဖယ်ရှားပါ
 access.contacts.add=အဆက်အသွယ် ထည့်မယ်
 access.contact.menu=အဆက်အသွယ် မီနူးကို ပြပါ
-access.contacts.dropdown.connections.expand=ချိတ်ဆက်မှုများ မီနူးကို ချဲ့ပါ
-access.contacts.dropdown.contacts.expand=အဆက်အသွယ်များ မီနူးကို ချဲ့ပါ
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=အဆက်အသွယ်များကို ရှာဖွေသော အိုင်ကွန်
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=မိတ်ဆက်ခြင်းလုပ်ငန်းစဉ်၏ အဆက်အသွယ်မျက်နှာပြင်သို့ ပြန်သွားမည်
 access.introduction.close=မိတ်ဆက်စခရင်ကို ပိတ်ပါ
 access.message.jump_to_unread=မဖတ်ရသေးသော မက်ဆေ့သို့ သွားရန်
@@ -14,12 +15,14 @@ access.message.sent=မက်ဆေ့ချ်ပို့ပြီးပြီ
 access.logo=Briar လိုဂို
 access.swap=အဆက်အသွယ် နှစ်ခုကြားတွင် အမှားအယွင်းများကို ပြသသည့် အိုင်ကွန်
 access.about_briar_desktop=Briar Desktop အကြောင်း
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=အဆက်အသွယ် ရွေးမထားပါ
 contacts.none_selected.hint=စကားစမြည်စပြောရန် အဆက်အသွယ်ရွေးပါ
 contacts.pending_selected.title=ဆိုင်းငံ့ထားသော အဆက်အသွယ်ကို ရွေးထားသည်
-contacts.pending_selected.hint=You need to wait until the process of adding each other as contacts has finished before you can start chatting.
+contacts.pending_selected.hint=စကားစမြည်မစမီ အဆက်အသွယ်များ ပြီးသွားသဖြင့် အချင်းချင်း ပေါင်းထည့်ခြင်းလုပ်ငန်းစဉ် မပြီးမချင်း စောင့်ရပါမည်။
 contacts.card.nothing=မက်ဆေ့ချ်များ မရှိပါ။
 contacts.dropdown.connections=ချိတ်ဆက်မှုများ
 contacts.dropdown.connections.title=ချိတ်ဆက်မှုများ
@@ -33,13 +36,15 @@ contacts.dropdown.delete.all=မက်ဆေ့ချ်အားလုံးက
 contacts.dropdown.disappearing=ပျောက်နေသော မက်ဆေ့ချ်များ
 contacts.dropdown.introduction=မိတ်ဆက်ခြင်း ပြုလုပ်ပါ
 contacts.search.title=အဆက်အသွယ်များ
+contacts.pending.remove.dialog.title=ဖယ်ရှားခြင်းကို အတည်ပြုပါ
+contacts.pending.remove.dialog.message=ဒီအဆက်အသွယ်လိပ်စာကို ခုထိထည့်သွင်းထားပါသည်။ ခုဖယ်ရှားပါက ထည့်တော့မည်မဟုတ်ပါ။
 
 # Conversation
 conversation.message.unread=မဖတ်ရသေးသော မက်ဆေ့ချ်
 conversation.message.new=မက်ဆေ့ချ် အသစ်
 conversation.delete.all.dialog.title=မက်ဆေ့ချ်ပယ်ဖျက်ခြင်းအား အတည်ပြုမယ်
-conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
-conversation.delete.single=Delete message for me
+conversation.delete.all.dialog.message=ဤစကားခန်းရှိ မက်ဆေ့ချ်အားလုံးကို သင့်စက်မှ ဖျက်လိုသည်မှာ သေချာပါသလား။
+conversation.delete.single=ကျွန်ုပ်အတွက် မက်ဆေ့ချ်ကို ဖျက်ပါ
 conversation.delete.failed.dialog.title=မက်ဆေ့ချ်များအားလုံးကို အပြီးပယ်ဖျက်၍ မရနိုင်ပါ
 conversation.delete.failed.dialog.message.ongoing_both=လက်ရှိဖိတ်ကြားမှု၊ မိတ်ဆက်မှုတို့နှင့် သက်ဆိုင်သည့် မက်ဆေ့ချ်များကို ၎င်းတို့ အပြီးသတ်သည်အထိ ဖျက်၍မရပါ။
 conversation.delete.failed.dialog.message.ongoing_introductions=လက်ရှိမိတ်ဆက်မှုတို့နှင့် သက်ဆိုင်သည့် မက်ဆေ့ချ်များကို ၎င်းတို့ အပြီးသတ်သည်အထိ ဖျက်၍မရပါ။
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=လက်ရှိ
 conversation.delete.failed.dialog.message.not_all_selected_both=ဖိတ်ကြားခြင်း သို့မဟုတ် မိတ်ဆက်ခြင်းအား ပယ်ဖျက်ရန် တောင်းဆိုချက်နှင့် တုံ့ပြန်ချက်အား သင်ရွေးထားရပါသည်။
 conversation.delete.failed.dialog.message.not_all_selected_introductions=မိတ်ဆက်ခြင်းအား ပယ်ဖျက်ရန် တောင်းဆိုချက်နှင့် တုံ့ပြန်ချက်အား သင်ရွေးထားရပါသည်။
 conversation.delete.failed.dialog.message.not_all_selected_invitations=ဖိတ်ကြားခြင်းအား ပယ်ဖျက်ရန် တောင်းဆိုချက်နှင့် တုံ့ပြန်ချက်အား သင်ရွေးထားရပါမည်။
+conversation.add.contact.dialog.title=အဝေးက အဆက်အသွယ်လိပ်စာကို ထည့်သွင်းမယ်
+conversation.add.contact.dialog.contact_link=အဆက်အသွယ်၏ လင့်ခ်
 conversation.delete.contact.dialog.title=အဆက်အသွယ်ကို အပြီးပယ်ဖျက်ခြင်းအား အတည်ပြုမည်
 conversation.delete.contact.dialog.message=ဤအဆက်အသွယ်အပြင် ၎င်းနှင့်ပြောထားသမျှ မက်ဆေ့ချ်အားလုံးကို ဖယ်ရှားချင်တာ သေချာပါသလား။
+conversation.change.alias.dialog.title=အဆက်အသွယ်အမည်အား ပြောင်းမယ်
+conversation.change.alias.dialog.description=ကျေးဇူးပြု၍ ဤအဆက်အသွယ်အတွက် အမည်အသစ်ကို ထည့်ပါ (သင်တစ်ဦးတည်းသာ မြင်နိုင်သည်) - 
 
 # Private Groups
 groups.card.created={0} မှ ဖန်တီးခဲ့သည်
@@ -57,7 +66,7 @@ groups.card.messages={0, plural, other {မက်ဆေ့ချ် {0} ခု}}
 # Introduction
 introduction.introduce=မိတ်ဆက်ခြင်း ပြုလုပ်ပါ
 introduction.message=မက်ဆေ့ချ် ထည့်သွင်းပါ (မဖြစ်မနေ မဟုတ်ပါ)
-introduction.title_first=Introduce {0} to
+introduction.title_first={0} ကို မိတ်ဆက်ပေးပါ
 introduction.title_second= အဆက်အသွယ်များကို မိတ်ဆက်ပေးပါ
 introduction.request.sent=သင်မှ {0} ကို {1} နှင့် မိတ်ဆက်ပေးဖို့  တောင်းဆိုလိုက်ပါသည်။
 introduction.request.received={0} မှ သင့်ကို {1} နှင့် မိတ်ဆက်ပေးဖို့ တောင်းဆိုပါသည်။ သင့် အဆက်အသွယ်စာရင်းထဲသို့ {1} အားပေါင်းထည့်ချင်ပါသလား။
@@ -70,16 +79,31 @@ introduction.response.declined.auto={0} နှင့် မိတ်ဆက်မ
 introduction.response.accepted.received={1} နှင့် မိတ်ဆက်ခြင်းကို {0} က လက်ခံခဲ့ပါသည်။
 introduction.response.declined.received={1} နှင့် မိတ်ဆက်ခြင်းကို {0} က ငြင်းဆိုခဲ့ပါသည်။
 introduction.response.declined.received_by_introducee={1} မှ မိတ်ဆက်ခြင်းအား ငြင်းဆိုခဲ့သည်ကို {0} မှ ပြောပါသည်။
-introduction.error.own_link=Please enter contact's link, not your own
-introduction.error.remote_invalid=Remote handshake link is invalid
-introduction.error.alias_invalid=Alias is invalid
-introduction.error.link_invalid=Link is invalid: {0}
-introduction.error.public_key_invalid=Public key is invalid: {0}
-introduction.error.adding_failed=အဆက်အသွယ်လိပ်စာထည့်သွင်းခြင်း မအောင်မြင်ပါ
-introduction.error.contact_already_exists=သင့်မှာ ဒီလင့်ခ်နဲ့ အဆက်အသွယ်လိပ်စာ ရှိပြီးဖြစ်သည်: {0}
-introduction.error.pending_contact_already_exists=သင့်တွင် ဤလင့်ခ် - {0} နှင့်ပတ်သက်သည့် ဆိုင်းငံ့ထားသောအဆက်အသွယ်တစ်ခု ရှိပြီးဖြစ်သည်
-introduction.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
+# Add Contact Remotely
+contact.add.title_dialog=Add Contact
+contact.add.remote.title=အဝေးက အဆက်အသွယ်လိပ်စာကို ထည့်သွင်းမယ်
+contact.add.remote.your_link=သင်ထည့်ချင်သည့် အဆက်အသွယ်အား ဤလင့်ခ်ကို ပေးပါ
+contact.add.remote.copy_tooltip=ကူးမယ်
+contact.add.remote.contact_link=သင့်အဆက်အသွယ်ထံမှလင့်ခ်ကို ဤနေရာတွင် ဖြည့်ပါ
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=ကူးထားသောအရာ တင်မယ်
+contact.add.remote.nickname_intro=သင်၏ အဆက်အသွယ်အား နာမည်ပြောင်ပေးပါ။ ဤအရာကို သင်သာလျှင် မြင်နိုင်ပါသည်။
+contact.add.remote.choose_nickname=နာမည်ပြောင် ထည့်သွင်းမယ်
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=သင့်ကိုယ်ပိုင်မဟုတ်သော အဆက်အသွယ်၏ လင့်ကို ထည့်သွင်းပါ။
+contact.add.error.remote_invalid=အဝေးထိန်း လက်ဆွဲလင့်သည် မှားနေသည်။
+contact.add.error.alias_invalid=အမည်ဝှက် မှားနေသည်
+contact.add.error.link_invalid=လင့်မှားနေသည်: {0}\n
+contact.add.error.public_key_invalid=အများသုံးသော့သည် မမှန်ကန်ပါ - {0}
+contact.add.error.adding_failed=အဆက်အသွယ်လိပ်စာထည့်သွင်းခြင်း မအောင်မြင်ပါ
+contact.add.error.contact_already_exists=သင့်မှာ ဒီလင့်ခ်နဲ့ အဆက်အသွယ်လိပ်စာ ရှိပြီးဖြစ်သည်: {0}
+contact.add.error.pending_contact_already_exists=သင့်တွင် ဤလင့်ခ် - {0} နှင့်ပတ်သက်သည့် ဆိုင်းငံ့ထားသောအဆက်အသွယ်တစ်ခု ရှိပြီးဖြစ်သည်
+contact.add.error.duplicate_contact_explainer={0} သည် {1} ကဲ့သို့ လူတူမဟုတ်ပါက သတိထားပါ။\n\n၎င်းတို့ထဲမှ တစ်ဦးသည် သင့်အဆက်အသွယ်များ မည်သူဖြစ်သည်ကို ရှာဖွေတွေ့ရှိရန် ကြိုးစားနေပေမည်။\n\nသင်သည် အခြားသူတစ်ဦးထံမှ တူညီသောလင့်ခ်ကို ရရှိထားကြောင်း ၎င်းတို့အား မပြောပါနှင့်။
 
 # Private Group Sharing
 group.invitation.received={0} မှ သင့်ကို "{1}" အဖွဲ့သို့ ပါဝင်ရန် ဖိတ်ခေါ်ခဲ့ပါသည်။
@@ -113,19 +137,20 @@ blog.invitation.response.declined.received={0} သည် ဘလော့ဂ်
 main.title=Briar Desktop 
 main.help.title=Briar Desktop ကွန်ပျုတာ
 main.help.debug=အမှားအယွင်း မက်ဆေ့ချ်များ ပုံနှိပ်ခြင်းကို ဖွင့်ပါ
-main.help.verbose=Print verbose log messages
-main.help.data=The directory where Briar will store its files. Default: {0}
+main.help.verbose=မှတ်တမ်း အသေးစိပ် မက်ဆေ့များကို ပုံနှိပ်ပါ
+main.help.data=Briar သည် ၎င်း၏ဖိုင်များကို သိမ်းဆည်းမည့် လမ်းကြောင်း။ မူရင်း - {0}
 main.help.tor.port.socks=Tor ထိန်းချုပ်မှုပေါ့တ်
 main.help.tor.port.control=Tor ထိန်းချုပ်နေရာ
 
 # Welcome
 welcome.title=Briar မှ ကြိုဆိုပါသည်
-welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
+welcome.text=သင့်တွင် အဆက်အသွယ်များ မရှိသေးပါ။ အဆက်အသွယ်တစ်ခုထည့်ရန် + အိုင်ကွန်ကို နှိပ်ပါ -
 
 # About
 about.copyright=မူပိုင်ခွင့်
 about.license=လိုင်စင်
 about.version=ဗားရှင်း
+about.version.core=Core ဗားရှင်း
 about.contact=ဆက်သွယ်ရန်
 about.website=ဝဘ်ဆိုက်
 
@@ -134,6 +159,8 @@ cancel=ပယ်ဖျက်ရန်
 delete=ဖျက်မယ်
 ok=အိုကေ
 accept=လက်ခံသည်
+add=ထည့်မည်
+change=ပြောင်းလဲရန်
 decline=ငြင်းဆန်သည်
 back=နောက်သို့
 next=ရှေ့သို့
@@ -141,7 +168,14 @@ open=ဖွင့်မယ်
 sorry=ဝမ်းနည်းပါတယ်
 error=ချို့ယွင်းချက်
 warning=သတိပေးချက်
-unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+unsupported_feature=ကံမကောင်းစွာဖြင့်၊ ဤအင်္ဂါရပ်ကို Briar Desktop မှ ပံ့ပိုးမှု မပေးသေးပါ။
+remove=ဖယ်ရှားမည်
+
+# Compose text edit actions
+copy=ကူးမယ်
+cut=ဖြတ်ယူရန်
+paste=ကူးထားသောအရာ တင်မယ်
+select_all=အားလုံးကို ရွေးချယ်ရန်
 
 # Startup screen
 startup.title.registration=Briar မှ ကြိုဆိုပါသည်
@@ -162,20 +196,20 @@ startup.error.decryption.text=Briar က သင့်စကားဝှက်က
 startup.password_forgotten.button=ကျွန်ုပ်၏ စကားဝှက်ကို မေ့သွားပါသည်
 startup.password_forgotten.title=စကားဝှက်ပျောက်ဆုံး
 startup.password_forgotten.text=သင့် Briar အကောင့်ကို ကလောက်တွင်မဟုတ်ဘဲ သင့်ကိရိယာတွင်သာ လျှို့ဝှက်ကုဒ်ပြောင်းသိမ်းဆည်းထားသောကြောင့် သင့်စကားဝှက်ကို ပြန်လည်သတ်မှတ်မပေးနိုင်ပါ။ သင့်အကောင့်ကို ဖျက်ပစ်ပြီး အသစ်ပြန်ဖွင့်ချင်ပါသလား။\n\nသတိ - သင့်ကိုယ်ပိုင်အချက်အလက်များ၊ အဆက်အသွယ်များနှင့် မက်ဆေ့ချ်များအားလုံး အပြီးပျက်သွားပါလိမ့်မည်။
-startup.failed.expired=This software has expired. Thank you for testing!\n\nTo continue using Briar, please download the latest release. You will be able to continue using your account.
-startup.failed.registration=Briar was unable to create your account.\n\nPlease upgrade to the latest version and try again.
+startup.failed.expired=ဤဆော့ဖ်ဝဲ သက်တမ်းကုန်သွားပါပြီ။ စမ်းသပ်မှုအတွက် ကျေးဇူးတင်ပါသည်။\n\nBriar ကို ဆက်လက်အသုံးပြုရန် နောက်ဆုံးထွက်ဗားရှင်းကို ဒေါင်းလုဒ်လုပ်ပါ။ သင့်အကောင့်ကို ဆက်လက် အသုံးပြုနိုင်မည် ဖြစ်သည်။
+startup.failed.registration=Briar သည် သင့်အကောင့်ကို ဖန်တီး၍ မရပါ။ \n\nကျေးဇူးပြု၍ နောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်မံစမ်းကြည့်ပါ။\n
 startup.failed.clock_error=သင့်ကိရိယာ၏နာရီသည် မှားနေပါသဖြင့် Briar မစတင်နိုင်ပါ။\n\nသင့်ကိရိယာ၏နာရီကို အချိန်မှန်အောင်တိုက်ပြီး ပြန်စမ်းကြည့်ပါ။
-startup.failed.db_error=Briar was unable to open the database containing your account, your contacts and your messages.\n\nPlease check if Briar is already running on this device. Otherwise, upgrade to the latest version of the app and try again, or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.db_error=Briar သည် သင့်အကောင့်၊ သင့်အဆက်အသွယ်များနှင့် သင့်မက်ဆေ့ချ်များပါရှိသော ဒေတာဘေ့စ်ကို ဖွင့်၍မရပါ။\n\nကျေးဇူးပြု၍ Briar သည် ဤစက်ပစ္စည်းပေါ်တွင် အလုပ်လုပ်နေပြီလားဆိုတာ စစ်ဆေးပါ။ မဟုတ်ပါက၊ အက်ပ်၏နောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ သို့မဟုတ် စကားဝှက်အမှာစာတွင် 'ကျွန်ုပ်၏ စကားဝှက်ကို မေ့သွားပါပြီ' ကို ရွေးချယ်ခြင်းဖြင့် အကောင့်အသစ်တစ်ခုကို စနစ်ထည့်သွင်းပါ။
 startup.failed.data_too_old_error=သင့်အကောင့်ကို ဤအက်ပ်၏ဗားရှင်းအဟောင်းတစ်ခုဖြင့် ဖွင့်ခဲ့သောကြောင့် ယခုဗားရှင်းဖြင့် ဖွင့်၍မရပါ။ ဗားရှင်းအဟောင်းကို ပြန်ထည့်သွင်းရပါမည် (သို့) စကားဝှက်တောင်းသည့်နေရာတွင် 'ကျွန်ုပ်၏စကားဝှက်ကို မေ့သွားပါသည်' ကို ရွေးချယ်ပြီး အကောင့်အသစ်တစ်ခု ဖွင့်နိုင်ပါသည်။
 startup.failed.data_too_new_error=သင့်အကောင့်ကို ဤအက်ပ်ဗားရှင်းထက်နောက်ကျသောဗားရှင်းတစ်ခုဖြင့် ဖွင့်ခဲ့သောကြောင့် ယခုဗားရှင်းဖြင့် ဖွင့်၍မရပါ။\n\nနောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ။
 startup.failed.service_error=Briar သည် လိုအပ်သည့် အစိတ်အပိုင်းတစ်ခုကို မဖွင့်နိုင်ပါ။\n\nအက်ပ်နောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ။
-startup.database.creating=အကောင့်ဖွင့်နေသည်
+startup.database.creating=အကောင့်ဖွင့်နေပါသည် ...
 startup.database.opening=အချက်အလက်အစုကို ပြန်ဖြည်နေသည်…
 startup.database.migrating=အချက်အလက်အစုကို အဆင့်မြှင့်နေသည်…
 startup.database.compacting=အချက်အလက်အစုကို သိပ်သည်းစေရန်လုပ်နေသည်…
-expiration.banner.part1.zero=This is a test version of Briar that will expire today.
-expiration.banner.part1.nozero={0, plural, other {This is a test version of Briar that will expire in {0} days.}}
-expiration.banner.part2=Please update to a newer version in time.
+expiration.banner.part1.zero=၎င်းသည် ယနေ့ သက်တမ်းကုန်ဆုံးမည့် Briar ၏ စမ်းသပ်ဗားရှင်း ဖြစ်သည်။
+expiration.banner.part1.nozero={0, plural, other {၎င်းသည် {0} ရက်အတွင်း သက်တမ်းကုန်ဆုံးမည့် Briar ၏ စမ်းသပ်ဗားရှင်း ဖြစ်သည်။ }}
+expiration.banner.part2=ကျေးဇူးပြု၍ အချိန်မီ ဗားရှင်းအသစ်သို့ မြှင့်တင်ပါ။
 
 # Settings
 settings.title=ဆက်တင်များ
@@ -185,13 +219,25 @@ settings.general.title=ယေဘုယျ
 
 # Settings Display
 settings.display.title=ရုပ်ထင်မှန်သား
-settings.display.theme=Dark Theme
+# todo: to be removed
+settings.display.theme=အမှောင် အပြင်အဆင်
+settings.display.theme.title=ပြသမှု အပြင်အဆင်
+settings.display.theme.auto=နဂိုမူလ စနစ်
+settings.display.theme.dark=အနက်ရောင်
+settings.display.theme.light=အနုရောင်
+settings.display.language.title=ဘာသာစကား
+settings.display.language.auto=နဂိုမူလ စနစ်
 
 # Settings Connections
 settings.connections.title=ချိတ်ဆက်မှုများ
 
 # Settings Security
 settings.security.title=လုံခြုံရေး
+settings.security.password.change=စကားဝှက် ပြောင်းလဲရန်
+settings.security.password.current=လက်ရှိ စကားဝှက်
+settings.security.password.choose=စကား၀ှက်အသစ်
+settings.security.password.confirm=စကားဝှက် အသစ်အား အတည်ပြုမယ်
+settings.security.password.changed=စကားဝှက် အားပြောင်းလဲပြီးပါပြီ
 
 # Settings Notifications
 settings.notifications.title=အသိပေးချက်များ
diff --git a/src/main/resources/strings/BriarDesktop_nl.properties b/src/main/resources/strings/BriarDesktop_nl.properties
new file mode 100644
index 0000000000000000000000000000000000000000..1620a593ac70ac2cc1cde310ae7eb9ecb4f41d18
--- /dev/null
+++ b/src/main/resources/strings/BriarDesktop_nl.properties
@@ -0,0 +1,246 @@
+# Accessibility
+access.attachment_add=Voeg bijlage toe
+access.attachment_remove=Remove attachment
+access.contacts.add=Contact toevoegen
+access.contact.menu=Show contact menu
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
+access.contacts.search=Icon for searching contacts
+access.contacts.pending.remove=Remove pending contact
+access.introduction.back.contact=Go back to contact screen of introduction process
+access.introduction.close=Close introduction screen
+access.message.jump_to_unread=Jump to next unread message
+access.message.send=Verstuur bericht
+access.message.sent=Bericht is verstuurd
+access.logo=Briar logo
+access.swap=Icon showing errors between two contacts
+access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
+
+# Contacts
+contacts.none_selected.title=Geen contact geselecteerd
+contacts.none_selected.hint=Kies een contact om te beginnen met chatten
+contacts.pending_selected.title=Pending contact selected
+contacts.pending_selected.hint=You need to wait until the process of adding each other as contacts has finished before you can start chatting.
+contacts.card.nothing=Geen berichten.
+contacts.dropdown.connections=Verbindingen
+contacts.dropdown.connections.title=Verbindingen
+contacts.dropdown.connections.bluetooth=Verbind via Bluetooth
+contacts.dropdown.connections.removable=Connect via Removable Drive
+contacts.dropdown.contact=Contact
+contacts.dropdown.contact.title=Contact
+contacts.dropdown.contact.change=Verander naam van contact
+contacts.dropdown.contact.delete=Contact verwijderen
+contacts.dropdown.delete.all=Verwijder alle berichten
+contacts.dropdown.disappearing=Disappearing messages
+contacts.dropdown.introduction=Introduceer
+contacts.search.title=Contacten
+contacts.pending.remove.dialog.title=Bevestig verwijderen
+contacts.pending.remove.dialog.message=Dit contact wordt nog toegevoegd. Als je het nu verwijderd, zal het niet worden toegevoegd.
+
+# Conversation
+conversation.message.unread=Ongelezen berichten
+conversation.message.new=Nieuw bericht
+conversation.delete.all.dialog.title=Bevestig verwijderen berichten
+conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
+conversation.delete.single=Delete message for me
+conversation.delete.failed.dialog.title=Kon niet alle berichten verwijderen
+conversation.delete.failed.dialog.message.ongoing_both=Berichten gerelateerd aan uitgaande uitnodigingen of introducties kunnen niet worden verwijderd totdat ze zijn afgerond.
+conversation.delete.failed.dialog.message.ongoing_introductions=Berichten gerelateerd aan uitgaande introducties kunnen niet worden verwijderd totdat ze zijn afgerond.
+conversation.delete.failed.dialog.message.ongoing_invitations=Berichten gerelateerd aan uitgaande uitnodigingen kunnen niet worden verwijderd totdat ze zijn afgerond.
+conversation.delete.failed.dialog.message.not_all_selected_both=Om een uitnodiging of introductie te verwijderen met je het verzoek en het antwoord selecteren.
+conversation.delete.failed.dialog.message.not_all_selected_introductions=Om een introductie te verwijderen met je het verzoek en het antwoord selecteren.
+conversation.delete.failed.dialog.message.not_all_selected_invitations=Om een uitnodiging te verwijderen met je het verzoek en het antwoord selecteren.
+conversation.add.contact.dialog.title=Voeg een contact ver weg toe
+conversation.add.contact.dialog.contact_link=Link van contact
+conversation.delete.contact.dialog.title=Bevestig verwijderen van contact
+conversation.delete.contact.dialog.message=Weet je zeker dat je dit contact en alle bijbehorende berichten wilt verwijderen?
+conversation.change.alias.dialog.title=Verander naam van contact
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
+
+# Private Groups
+groups.card.created=Created by {0}
+groups.card.messages={0, plural, one {{0} message} other {{0} messages}}
+
+# Introduction
+introduction.introduce=Introduceer
+introduction.message=Voeg een bericht toe (optioneel)
+introduction.title_first=Introduce {0} to
+introduction.title_second=Intoduceer contacten
+introduction.request.sent=You have asked to introduce {0} to {1}.
+introduction.request.received={0} has asked to introduce you to {1}. Do you want to add {1} to your contact list?
+introduction.request.exists.received={0} has asked to introduce you to {1}, but {1} is already in your contact list. Since {0} might not know that, you can still respond:
+introduction.request.answered.received={0} has asked to introduce you to {1}.
+introduction.response.accepted.sent=You accepted the introduction to {0}.
+introduction.response.accepted.sent.info=Before {0} gets added to your contacts, they need to accept the introduction as well. This might take some time.
+introduction.response.declined.sent=You declined the introduction to {0}.
+introduction.response.declined.auto=The introduction to {0} was automatically declined.
+introduction.response.accepted.received={0} accepted the introduction to {1}.
+introduction.response.declined.received={0} declined the introduction to {1}.
+introduction.response.declined.received_by_introducee={0} says that {1} declined the introduction.
+
+# Add Contact Remotely
+contact.add.title_dialog=Contact toevoegen
+contact.add.remote.title=Voeg een contact ver weg toe
+contact.add.remote.your_link=Geef deze link aan de contact die je toe wil voegen
+contact.add.remote.copy_tooltip=Kopiëren
+contact.add.remote.contact_link=Voer de link van je contact hier in
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Plakken
+contact.add.remote.nickname_intro=Geef je contact een bijnaam. Alleen jij dat dit zien.
+contact.add.remote.choose_nickname=Voer bijnaam in
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
+
+# Private Group Sharing
+group.invitation.received={0} has invited you to join the group "{1}".
+group.invitation.sent=You have invited {0} to join the group "{1}".
+group.invitation.response.accepted.sent=You accepted the group invitation from {0}.
+group.invitation.response.declined.sent=You declined the group invitation from {0}.
+group.invitation.response.declined.auto=The group invitation from {0} was automatically declined.
+group.invitation.response.accepted.received={0} accepted the group invitation.
+group.invitation.response.declined.received={0} declined the group invitation.
+
+# Forum Sharing
+forum.invitation.received={0} has shared the forum "{1}" with you.
+forum.invitation.sent=You have shared the forum "{0}" with {1}.
+forum.invitation.response.accepted.sent=You accepted the forum invitation from {0}.
+forum.invitation.response.declined.sent=You declined the forum invitation from {0}.
+forum.invitation.response.declined.auto=The forum invitation from {0} was automatically declined.
+forum.invitation.response.accepted.received={0} accepted the forum invitation.
+forum.invitation.response.declined.received={0} declined the forum invitation.
+
+# Blog Sharing
+blog.invitation.received={0} has shared the blog "{1}" with you.
+blog.invitation.sent=You have shared the blog "{0}" with {1}.
+blog.invitation.response.accepted.sent=You accepted the blog invitation from {0}.
+blog.invitation.response.declined.sent=You declined the blog invitation from {0}.
+blog.invitation.response.declined.auto=The blog invitation from {0} was automatically declined.
+blog.invitation.response.accepted.received={0} accepted the blog invitation.
+blog.invitation.response.declined.received={0} declined the blog invitation.
+
+
+# Main
+main.title=Briar Desktop
+main.help.title=Briar Desktop Client
+main.help.debug=Enable printing of debug messages
+main.help.verbose=Print verbose log messages
+main.help.data=The directory where Briar will store its files. Default: {0}
+main.help.tor.port.socks=Tor Socks Port
+main.help.tor.port.control=Tor Control Port
+
+# Welcome
+welcome.title=Welkom bij Briar
+welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
+
+# About
+about.copyright=Copyright
+about.license=Licentie
+about.version=Versie
+about.version.core=Core Version
+about.contact=Contact
+about.website=Website
+
+# Miscellaneous
+cancel=Annuleren
+delete=Verwijderen
+ok=Oke
+accept=Accepteer
+add=Toevoegen
+change=Wijzigen
+decline=Wijs af
+back=Terug
+next=Volgende
+open=Open
+sorry=Excuses
+error=Fout
+warning=Waarschuwing
+unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=Verwijderen
+
+# Compose text edit actions
+copy=Kopiëren
+cut=Knippen
+paste=Plakken
+select_all=Alles selecteren
+
+# Startup screen
+startup.title.registration=Welkom bij Briar
+startup.title.login=Welcome back
+startup.field.nickname=Bijnaam
+startup.field.nickname.explanation=Je bijnaam wordt getoond bij alle content die je post. Nadat je account is aangemaakt is het niet mogelijk je bijnaam te wijzigen.
+startup.field.password=Wachtwoord
+startup.field.password.explanation=Your Briar account is stored encrypted on your device, not in the cloud. If you forget your password or uninstall Briar, there's no way to recover your account.\n\nChoose a long password that's hard to guess, such as four random words, or ten random letters, numbers and symbols.
+startup.field.password_confirmation=Wachtwoord bevestigen
+startup.button.register=Account maken
+startup.button.login=Login
+startup.error.name_too_long=Naam is te lang
+startup.error.password_too_weak=Wachtwoord is te zwak
+startup.error.passwords_not_match=Wachtwoorden komen niet overeen
+startup.error.password_wrong=Verkeerd wachtwoord, probeer het nog een keer
+startup.error.decryption.title=Kan wachtwoord niet controleren
+startup.error.decryption.text=Briar kan je wachtwoord niet controleren. Start je apparaat opnieuw op en probeer het nog eens.
+startup.password_forgotten.button=Ik ben mijn wachtwoord vergeten
+startup.password_forgotten.title=Wachtwoord vergeten
+startup.password_forgotten.text=Your Briar account is stored encrypted on your device, not in the cloud, so we can't reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.
+startup.failed.expired=This software has expired. Thank you for testing!\n\nTo continue using Briar, please download the latest release. You will be able to continue using your account.
+startup.failed.registration=Briar was unable to create your account.\n\nPlease upgrade to the latest version and try again.
+startup.failed.clock_error=Briar was unable to start because your device's clock is wrong.\n\nPlease set your device's clock to the right time and try again.
+startup.failed.db_error=Briar was unable to open the database containing your account, your contacts and your messages.\n\nPlease check if Briar is already running on this device. Otherwise, upgrade to the latest version of the app and try again, or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_old_error=Your account was created with an old version of this app and cannot be opened with this version.\n\nYou must either reinstall the old version or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_new_error=Your account was created with a newer version of this app and cannot be opened with this version.\n\nPlease upgrade to the latest version and try again.
+startup.failed.service_error=Briar was unable to start a required component.\n\nPlease upgrade to the latest version of the app and try again.
+startup.database.creating=Creating Account…
+startup.database.opening=Database aan het ontsleutelen…
+startup.database.migrating=Database aan het upgraden…
+startup.database.compacting=Database comprimeren...
+expiration.banner.part1.zero=This is a test version of Briar that will expire today.
+expiration.banner.part1.nozero={0, plural, one {This is a test version of Briar that will expire tomorrow.} other {This is a test version of Briar that will expire in {0} days.}}
+expiration.banner.part2=Please update to a newer version in time.
+
+# Settings
+settings.title=Instellingen
+
+# Settings General
+settings.general.title=Algemeen
+
+# Settings Display
+settings.display.title=Weergave
+# todo: to be removed
+settings.display.theme=Dark Theme
+settings.display.theme.title=Thema
+settings.display.theme.auto=Systeemstandaard
+settings.display.theme.dark=Donker
+settings.display.theme.light=Licht
+settings.display.language.title=Taal
+settings.display.language.auto=Systeemstandaard
+
+# Settings Connections
+settings.connections.title=Verbindingen
+
+# Settings Security
+settings.security.title=Beveiliging
+settings.security.password.change=Wachtwoord wijzigen
+settings.security.password.current=Huidig wachtwoord
+settings.security.password.choose=Nieuw wachtwoord
+settings.security.password.confirm=Nieuw wachtwoord bevestigen
+settings.security.password.changed=Wachtwoord is gewijzigd
+
+# Settings Notifications
+settings.notifications.title=Meldingen
+
+# Settings Actions
+settings.actions.title=Acties
diff --git a/src/main/resources/strings/BriarDesktop_pl.properties b/src/main/resources/strings/BriarDesktop_pl.properties
index 2b215c6670e6581dabcbefcc595b6c1a37933f29..b81f4c6f50673e9eb2d02066384bc2b34758a61b 100644
--- a/src/main/resources/strings/BriarDesktop_pl.properties
+++ b/src/main/resources/strings/BriarDesktop_pl.properties
@@ -3,9 +3,10 @@ access.attachment_add=Dodaj załącznik
 access.attachment_remove=Usuń załącznik
 access.contacts.add=Dodaj kontakt
 access.contact.menu=Pokaż menu kontaktu
-access.contacts.dropdown.connections.expand=Rozwiń menu połączeń
-access.contacts.dropdown.contacts.expand=Rozwiń menu kontaktów
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Ikona dla szukania kontaktów
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Wróć do ekranu przedstawiania kontaktu
 access.introduction.close=Zamknij ekran powitalny
 access.message.jump_to_unread=Idź do następnej nieprzeczytanej wiadomości
@@ -14,6 +15,8 @@ access.message.sent=Wiadomość wysłana
 access.logo=logo Briar
 access.swap=Ikona wskazująca błędy pomiędzy dwoma kontaktami
 access.about_briar_desktop=O Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Nie wybrano kontaktu
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Usuń wszystkie wiadomości
 contacts.dropdown.disappearing=Znikające wiadomości
 contacts.dropdown.introduction=Wykonaj przedstawienie
 contacts.search.title=Kontakty
+contacts.pending.remove.dialog.title=Potwierdź Usunięcie
+contacts.pending.remove.dialog.message=Ten kontakt jest nadal dodawany. Jeżeli go teraz usuniesz, nie zostanie on dodany.
 
 # Conversation
 conversation.message.unread=Nieprzeczytane wiadomości
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Wiadomości związ
 conversation.delete.failed.dialog.message.not_all_selected_both=Aby usunąć zaproszenie lub przedstawienie należy wybrać prośbę i odpowiedź
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Aby usunąć przedstawienie należy wybrać prośbę i odpowiedź
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Aby usunąć zaproszenie należy wybrać prośbę i odpowiedź
+conversation.add.contact.dialog.title=Dodaj Kontakt na odległość
+conversation.add.contact.dialog.contact_link=Link kontaktu
 conversation.delete.contact.dialog.title=Potwierdź usunięcie kontaktu
 conversation.delete.contact.dialog.message=Czy na pewno chcesz usunąć ten kontakt i wszystkie wymienione z nim wiadomości?
+conversation.change.alias.dialog.title=Zmień nazwę kontaktu
+conversation.change.alias.dialog.description=Wprowadź nową nazwę dla tego kontaktu (widoczną tylko dla Ciebie)
 
 # Private Groups
 groups.card.created=Stworzone przez {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Przedstawienie kontaktowi {0} zostało autom
 introduction.response.accepted.received={0} zaakceptował przedstawienie {1}.
 introduction.response.declined.received={0} odrzucił przedstawienie {1}.
 introduction.response.declined.received_by_introducee={0} informuje, że {1} odrzucił przedstawienie
-introduction.error.own_link=Wprowadź link kontaktu zamiast swojego
-introduction.error.remote_invalid=Łącze zdalnego przywitania jest nieprawidłowe.
-introduction.error.alias_invalid=Alias jest nieprawidłowy
-introduction.error.link_invalid=Link jest nieprawidłowy: {0}
-introduction.error.public_key_invalid=Klucz publiczny jest nieprawidłowy: {0}
-introduction.error.adding_failed=Dodawanie kontaktu się nie powiodło
-introduction.error.contact_already_exists=Masz już kontakt z tym linkiem: {0}
-introduction.error.pending_contact_already_exists=Masz już oczekujący kontakt z tym linkiem: {0}
-introduction.error.duplicate_contact_explainer=Zachowaj ostrożność jeśli {0} nie jest tą samą osobą co {1}.\n\nJedna z nich może próbować odkryć kim są Twoje kontakty\n\nN.ie mów im, że otrzymałeś ten sam link od kogoś innego.
 
+# Add Contact Remotely
+contact.add.title_dialog=Dodaj Kontakt
+contact.add.remote.title=Dodaj Kontakt na odległość
+contact.add.remote.your_link=Podaj ten link kontaktowi, którego chcesz dodać
+contact.add.remote.copy_tooltip=Kopiuj
+contact.add.remote.contact_link=Wprowadź tutaj link od swojego kontaktu
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Wklej
+contact.add.remote.nickname_intro=Nadaj pseudonim swojemu kontaktowi. Tylko ty możesz go widzieć.
+contact.add.remote.choose_nickname=Wprowadź pseudonim
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Wprowadź link kontaktu zamiast swojego
+contact.add.error.remote_invalid=Łącze zdalnego przywitania jest nieprawidłowe.
+contact.add.error.alias_invalid=Alias jest nieprawidłowy
+contact.add.error.link_invalid=Link jest nieprawidłowy: {0}
+contact.add.error.public_key_invalid=Klucz publiczny jest nieprawidłowy: {0}
+contact.add.error.adding_failed=Dodawanie kontaktu się nie powiodło
+contact.add.error.contact_already_exists=Masz już kontakt z tym linkiem: {0}
+contact.add.error.pending_contact_already_exists=Masz już oczekujący kontakt z tym linkiem: {0}
+contact.add.error.duplicate_contact_explainer=Zachowaj ostrożność jeśli {0} nie jest tą samą osobą co {1}.\n\nJedna z nich może próbować odkryć kim są Twoje kontakty\n\nN.ie mów im, że otrzymałeś ten sam link od kogoś innego.
 
 # Private Group Sharing
 group.invitation.received={0} zaprosił Cię do dołączenia do grupy "{1}".
@@ -126,6 +150,7 @@ welcome.text=Nie dodałeś jeszcze żadnych kontaktów. Kliknij ikonę + aby dod
 about.copyright=Prawa autorskie
 about.license=Licencja
 about.version=Wersja
+about.version.core=Wersja jÄ…dra
 about.contact=Kontakt
 about.website=Strona domowa
 
@@ -134,6 +159,8 @@ cancel=Anuluj
 delete=Usuń
 ok=OK
 accept=Akceptuj
+add=Dodaj
+change=Zmień
 decline=Odrzuć
 back=Wstecz
 next=Następny
@@ -142,6 +169,13 @@ sorry=Przepraszam
 error=BÅ‚Ä…d
 warning=Ostrzeżenie
 unsupported_feature=Niestety ta funkcja nie jest jeszcze wspierana przez Briar Desktop.
+remove=Usuń
+
+# Compose text edit actions
+copy=Kopiuj
+cut=Wytnij
+paste=Wklej
+select_all=Zaznacz wszystko
 
 # Startup screen
 startup.title.registration=Witaj w Briar
@@ -169,7 +203,7 @@ startup.failed.db_error=Briar nie mógł otworzyć bazy danych zawierającej Two
 startup.failed.data_too_old_error=Twoje konto zostało utworzone w starej wersji aplikacji i nie może być otworzone przez tą wersję.\n\nMusisz  zainstalować starą wersję aplikacji lub utworzyć nowe konto przez wybranie opcji "Zapomniałem hasła" przy prośbie o podanie hasła.
 startup.failed.data_too_new_error=Twoje konto zostało utworzone przez nowszą wersję aplikacji i nie może być otworzone przez tą wersję.\n\nUaktualnij aplikację do najnowszej wersji i spróbuj ponownie
 startup.failed.service_error=Briar nie mógł uruchomić wymaganego komponentu\n\nUaktualnij do najnowszej wersji aplikacji i spróbuj ponownie
-startup.database.creating=Tworzenie konta...
+startup.database.creating=Creating Account…
 startup.database.opening=DeszyfrujÄ™ BazÄ™ Danych...
 startup.database.migrating=AktualizujÄ™ BazÄ™ Danych...
 startup.database.compacting=Kompaktowanie Bazy Danych…
@@ -185,13 +219,25 @@ settings.general.title=Ogólne
 
 # Settings Display
 settings.display.title=Wyświetlacz
+# todo: to be removed
 settings.display.theme=Ciemny motyw
+settings.display.theme.title=Motyw
+settings.display.theme.auto=Domyślny systemu
+settings.display.theme.dark=Ciemny
+settings.display.theme.light=Jasny
+settings.display.language.title=Język
+settings.display.language.auto=Domyślny systemu
 
 # Settings Connections
 settings.connections.title=Połączenia
 
 # Settings Security
 settings.security.title=Bezpieczeństwo
+settings.security.password.change=Zmień hasło
+settings.security.password.current=Obecne hasło
+settings.security.password.choose=Nowe hasło
+settings.security.password.confirm=Potwierdź nowe hasło
+settings.security.password.changed=Hasło zostało zmienione.
 
 # Settings Notifications
 settings.notifications.title=Powiadomienia
diff --git a/src/main/resources/strings/BriarDesktop_pt_BR.properties b/src/main/resources/strings/BriarDesktop_pt_BR.properties
new file mode 100644
index 0000000000000000000000000000000000000000..6f90dfc5a8b542ab018fd31ae63eb39af860dde7
--- /dev/null
+++ b/src/main/resources/strings/BriarDesktop_pt_BR.properties
@@ -0,0 +1,246 @@
+# Accessibility
+access.attachment_add=Adicionar anexo
+access.attachment_remove=Remove attachment
+access.contacts.add=Adicionar contato
+access.contact.menu=Show contact menu
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
+access.contacts.search=Icon for searching contacts
+access.contacts.pending.remove=Remove pending contact
+access.introduction.back.contact=Go back to contact screen of introduction process
+access.introduction.close=Close introduction screen
+access.message.jump_to_unread=Jump to next unread message
+access.message.send=Enviar mensagem
+access.message.sent=Mensagem enviada
+access.logo=Briar logo
+access.swap=Icon showing errors between two contacts
+access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
+
+# Contacts
+contacts.none_selected.title=Nenhum contacto foi selecionado
+contacts.none_selected.hint=Select a contact to start chatting
+contacts.pending_selected.title=Pending contact selected
+contacts.pending_selected.hint=You need to wait until the process of adding each other as contacts has finished before you can start chatting.
+contacts.card.nothing=Sem Mensagens
+contacts.dropdown.connections=Conexões
+contacts.dropdown.connections.title=Conexões
+contacts.dropdown.connections.bluetooth=Conectar via Bluetooth
+contacts.dropdown.connections.removable=Connect via Removable Drive
+contacts.dropdown.contact=Contato
+contacts.dropdown.contact.title=Contato
+contacts.dropdown.contact.change=Alterar nome do contato
+contacts.dropdown.contact.delete=Apagar contato
+contacts.dropdown.delete.all=Deletar todas as mensagens
+contacts.dropdown.disappearing=Disappearing messages
+contacts.dropdown.introduction=Fazer apresentação
+contacts.search.title=Contatos
+contacts.pending.remove.dialog.title=Confirme a remoção 
+contacts.pending.remove.dialog.message=Esse contato ainda está sendo adicionado. Se você removê-lo agora, o mesmo não será adicionado
+
+# Conversation
+conversation.message.unread=Mensagens não lidas
+conversation.message.new=Nova mensagem
+conversation.delete.all.dialog.title=Confirmar exclusão de mensagem
+conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
+conversation.delete.single=Delete message for me
+conversation.delete.failed.dialog.title=Não foi possível apagar todas as mensagens
+conversation.delete.failed.dialog.message.ongoing_both=Mensagens relacionadas a convites e apresentações em andamento não podem ser deletadas até que o convite ou apresentação seja concluído. 
+conversation.delete.failed.dialog.message.ongoing_introductions=Mensagens relacionadas a apresentações em andamento não podem ser deletadas até que a apresentação seja concluída.
+conversation.delete.failed.dialog.message.ongoing_invitations=Mensagens relacionadas a apresentações em andamento não podem ser deletadas até que a apresentação seja concluída.
+conversation.delete.failed.dialog.message.not_all_selected_both=Para deletar um convite ou apresentação, você precisa selecionar a solicitação e a resposta.
+conversation.delete.failed.dialog.message.not_all_selected_introductions=Para deletar uma apresentação, você precisa selecionar a solicitação e a resposta.
+conversation.delete.failed.dialog.message.not_all_selected_invitations=Para deletar um convite, você precisa selecionar a solicitação e a resposta.
+conversation.add.contact.dialog.title=Adicionar contato à distância
+conversation.add.contact.dialog.contact_link=Link do contato
+conversation.delete.contact.dialog.title=Confirmar remoção do contato
+conversation.delete.contact.dialog.message=Você tem certeza que quer remover este contato e todas mensagens trocadas com ele?
+conversation.change.alias.dialog.title=Alterar nome do contato
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
+
+# Private Groups
+groups.card.created=Created by {0}
+groups.card.messages={0, plural, one {{0} message} other {{0} messages}}
+
+# Introduction
+introduction.introduce=Fazer apresentação
+introduction.message=Adicionar uma mensagem (opcional)
+introduction.title_first=Introduce {0} to
+introduction.title_second=Apresentar contatos
+introduction.request.sent=You have asked to introduce {0} to {1}.
+introduction.request.received={0} has asked to introduce you to {1}. Do you want to add {1} to your contact list?
+introduction.request.exists.received={0} has asked to introduce you to {1}, but {1} is already in your contact list. Since {0} might not know that, you can still respond:
+introduction.request.answered.received={0} has asked to introduce you to {1}.
+introduction.response.accepted.sent=You accepted the introduction to {0}.
+introduction.response.accepted.sent.info=Before {0} gets added to your contacts, they need to accept the introduction as well. This might take some time.
+introduction.response.declined.sent=You declined the introduction to {0}.
+introduction.response.declined.auto=The introduction to {0} was automatically declined.
+introduction.response.accepted.received={0} accepted the introduction to {1}.
+introduction.response.declined.received={0} declined the introduction to {1}.
+introduction.response.declined.received_by_introducee={0} says that {1} declined the introduction.
+
+# Add Contact Remotely
+contact.add.title_dialog=Adicionar Contato
+contact.add.remote.title=Adicionar contato à distância
+contact.add.remote.your_link=Passe esse link para o contato que você quer adicionar
+contact.add.remote.copy_tooltip=Copiar
+contact.add.remote.contact_link=Insira o link do seu contato aqui
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Colar
+contact.add.remote.nickname_intro=Dê um apelido ao contato. Somente você pode ver esse apelido. 
+contact.add.remote.choose_nickname=Insira um apelido
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
+
+# Private Group Sharing
+group.invitation.received={0} has invited you to join the group "{1}".
+group.invitation.sent=You have invited {0} to join the group "{1}".
+group.invitation.response.accepted.sent=You accepted the group invitation from {0}.
+group.invitation.response.declined.sent=You declined the group invitation from {0}.
+group.invitation.response.declined.auto=The group invitation from {0} was automatically declined.
+group.invitation.response.accepted.received={0} accepted the group invitation.
+group.invitation.response.declined.received={0} declined the group invitation.
+
+# Forum Sharing
+forum.invitation.received={0} has shared the forum "{1}" with you.
+forum.invitation.sent=You have shared the forum "{0}" with {1}.
+forum.invitation.response.accepted.sent=You accepted the forum invitation from {0}.
+forum.invitation.response.declined.sent=You declined the forum invitation from {0}.
+forum.invitation.response.declined.auto=The forum invitation from {0} was automatically declined.
+forum.invitation.response.accepted.received={0} accepted the forum invitation.
+forum.invitation.response.declined.received={0} declined the forum invitation.
+
+# Blog Sharing
+blog.invitation.received={0} has shared the blog "{1}" with you.
+blog.invitation.sent=You have shared the blog "{0}" with {1}.
+blog.invitation.response.accepted.sent=You accepted the blog invitation from {0}.
+blog.invitation.response.declined.sent=You declined the blog invitation from {0}.
+blog.invitation.response.declined.auto=The blog invitation from {0} was automatically declined.
+blog.invitation.response.accepted.received={0} accepted the blog invitation.
+blog.invitation.response.declined.received={0} declined the blog invitation.
+
+
+# Main
+main.title=Briar Desktop
+main.help.title=Briar Desktop Client
+main.help.debug=Enable printing of debug messages
+main.help.verbose=Print verbose log messages
+main.help.data=The directory where Briar will store its files. Default: {0}
+main.help.tor.port.socks=Tor Socks Port
+main.help.tor.port.control=Tor Control Port
+
+# Welcome
+welcome.title=Boas-vindas ao Briar
+welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
+
+# About
+about.copyright=Direitos Autorais
+about.license=Licença
+about.version=Versão
+about.version.core=Core Version
+about.contact=Contato
+about.website=Website
+
+# Miscellaneous
+cancel=Cancelar
+delete=Apagar
+ok=OK
+accept=Aceitar
+add=Adicionar
+change=Alterar
+decline=Recusar
+back=Voltar
+next=Próximo
+open=Abrir
+sorry=Sentimos muito
+error=Erro
+warning=Aviso
+unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=Remover
+
+# Compose text edit actions
+copy=Copiar
+cut=Cortar
+paste=Colar
+select_all=Selecionar tudo
+
+# Startup screen
+startup.title.registration=Boas-vindas ao Briar
+startup.title.login=Welcome back
+startup.field.nickname=Apelido
+startup.field.nickname.explanation=Seu nome de usuária será mostrado próximo a qualquer conteúdo que você publicar. Você não pode mudá-lo depois que criar sua conta,
+startup.field.password=Senha
+startup.field.password.explanation=Your Briar account is stored encrypted on your device, not in the cloud. If you forget your password or uninstall Briar, there's no way to recover your account.\n\nChoose a long password that's hard to guess, such as four random words, or ten random letters, numbers and symbols.
+startup.field.password_confirmation=Confirme a Senha
+startup.button.register=Criar Conta
+startup.button.login=Entrar
+startup.error.name_too_long=O nome está muito grande
+startup.error.password_too_weak=A senha está muito fraca
+startup.error.passwords_not_match=As palavras-passe não são iguais
+startup.error.password_wrong=Senha Incorreta, tente novamente
+startup.error.decryption.title=Não foi possível verificar sua senha
+startup.error.decryption.text=O Briar não conseguiu verificar sua senha. Por favor, tente reiniciar o aparelho para resolver o problema.
+startup.password_forgotten.button=Esqueci minha senha
+startup.password_forgotten.title=Perdeu a senha
+startup.password_forgotten.text=Your Briar account is stored encrypted on your device, not in the cloud, so we can't reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.
+startup.failed.expired=This software has expired. Thank you for testing!\n\nTo continue using Briar, please download the latest release. You will be able to continue using your account.
+startup.failed.registration=Briar was unable to create your account.\n\nPlease upgrade to the latest version and try again.
+startup.failed.clock_error=Briar was unable to start because your device's clock is wrong.\n\nPlease set your device's clock to the right time and try again.
+startup.failed.db_error=Briar was unable to open the database containing your account, your contacts and your messages.\n\nPlease check if Briar is already running on this device. Otherwise, upgrade to the latest version of the app and try again, or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_old_error=Your account was created with an old version of this app and cannot be opened with this version.\n\nYou must either reinstall the old version or set up a new account by choosing 'I have forgotten my password' at the password prompt.
+startup.failed.data_too_new_error=Your account was created with a newer version of this app and cannot be opened with this version.\n\nPlease upgrade to the latest version and try again.
+startup.failed.service_error=Briar was unable to start a required component.\n\nPlease upgrade to the latest version of the app and try again.
+startup.database.creating=Creating Account…
+startup.database.opening=Descriptografando Banco de Dados...
+startup.database.migrating=Atualizando Banco de Dados...
+startup.database.compacting=Compactando Banco de Dados...
+expiration.banner.part1.zero=This is a test version of Briar that will expire today.
+expiration.banner.part1.nozero={0, plural, one {This is a test version of Briar that will expire tomorrow.} other {This is a test version of Briar that will expire in {0} days.}}
+expiration.banner.part2=Please update to a newer version in time.
+
+# Settings
+settings.title=Definições
+
+# Settings General
+settings.general.title=Geral
+
+# Settings Display
+settings.display.title=Visualização
+# todo: to be removed
+settings.display.theme=Dark Theme
+settings.display.theme.title=Tema
+settings.display.theme.auto=Padrão do sistema
+settings.display.theme.dark=Escuro
+settings.display.theme.light=Claro
+settings.display.language.title=Idioma
+settings.display.language.auto=Padrão do sistema
+
+# Settings Connections
+settings.connections.title=Conexões
+
+# Settings Security
+settings.security.title=Segurança
+settings.security.password.change=Mudar Senha
+settings.security.password.current=Senha atual
+settings.security.password.choose=Nova palavra-passe
+settings.security.password.confirm=Confirmar nova senha
+settings.security.password.changed=Senha alterada com sucesso.
+
+# Settings Notifications
+settings.notifications.title=Notificaçőes
+
+# Settings Actions
+settings.actions.title=Ações
diff --git a/src/main/resources/strings/BriarDesktop_ro.properties b/src/main/resources/strings/BriarDesktop_ro.properties
index 88e5ebc798f536890fae69722217e30fb2ea2ffb..a85805bb0799573b19d3752e11740e883e03bd19 100644
--- a/src/main/resources/strings/BriarDesktop_ro.properties
+++ b/src/main/resources/strings/BriarDesktop_ro.properties
@@ -3,9 +3,10 @@ access.attachment_add=Adăugare atașament
 access.attachment_remove=Elimină atașament
 access.contacts.add=Adaugă contact
 access.contact.menu=Afișați meniul de contact
-access.contacts.dropdown.connections.expand=Extindeți meniul conexiunilor
-access.contacts.dropdown.contacts.expand=Extindeți meniul de contacte
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Pictograma pentru căutarea contactelor
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Reveniți la ecranul de contact al procesului de introducere
 access.introduction.close=Închideți ecranul de introducere
 access.message.jump_to_unread=Salt la următorul mesaj necitit
@@ -14,6 +15,8 @@ access.message.sent=Mesaj trimis
 access.logo=Logo Briar
 access.swap=Pictograma care arată erorile dintre două contacte
 access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Nici un contact selectat
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Șterge toate mesajele
 contacts.dropdown.disappearing=Mesaje ce dispar
 contacts.dropdown.introduction=Fă o recomandare
 contacts.search.title=Contacte
+contacts.pending.remove.dialog.title=Confirmați eliminarea
+contacts.pending.remove.dialog.message=Acest contact este în curs de adăugare. Eliminănd acum, nu v-a mai fi adăugat.
 
 # Conversation
 conversation.message.unread=mesaje necitite
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Mesajele referitoa
 conversation.delete.failed.dialog.message.not_all_selected_both=Pentru a șterge o invitație sau o recomandare, trebuie să selectați cererea și răspunsul.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Pentru a șterge o recomandare trebuie să selectați cererea și răspunsul.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Pentru a șterge o invitație trebuie să selectați cererea și răspunsul.
+conversation.add.contact.dialog.title=Adaugă un contact la distanță
+conversation.add.contact.dialog.contact_link=Adresa contactului
 conversation.delete.contact.dialog.title=Confirmare ștergere contact
 conversation.delete.contact.dialog.message=Sigur doriți să ștergeți acest contact și toate mesajele schimbate?
+conversation.change.alias.dialog.title=Schimbă nume contact
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created=Creat de {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Introducerea la {0} a fost refuzată în mod
 introduction.response.accepted.received={0} a acceptat introducerea lui {1}.
 introduction.response.declined.received={0} a refuzat introducerea în {1}.
 introduction.response.declined.received_by_introducee={0} spune că {1} a refuzat introducerea.
-introduction.error.own_link=Please enter contact's link, not your own
-introduction.error.remote_invalid=Remote handshake link is invalid
-introduction.error.alias_invalid=Alias is invalid
-introduction.error.link_invalid=Link is invalid: {0}
-introduction.error.public_key_invalid=Public key is invalid: {0}
-introduction.error.adding_failed=Adding contact failed
-introduction.error.contact_already_exists=You already have a contact with this link: {0}
-introduction.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
-introduction.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
+# Add Contact Remotely
+contact.add.title_dialog=Adaugă contact
+contact.add.remote.title=Adaugă un contact la distanță
+contact.add.remote.your_link=Dați această adresă contactului pe care doriți să-l adăugați
+contact.add.remote.copy_tooltip=Copiază
+contact.add.remote.contact_link=Introduceți adresa contactului dumneavoastră aici
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Lipește
+contact.add.remote.nickname_intro=Introduceți un nume pentru contact. Vizibil doar pentru dumneavoastră.
+contact.add.remote.choose_nickname=Introduceți un nume
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
 # Private Group Sharing
 group.invitation.received={0} te-a invitat să te alături grupului "{1}".
@@ -126,6 +150,7 @@ welcome.text=Nu aveți încă niciun contact. Atingeți pictograma + pentru a ad
 about.copyright=Copyright
 about.license=Licenţă
 about.version=Versiune
+about.version.core=Core Version
 about.contact=Contact
 about.website=Site web
 
@@ -134,6 +159,8 @@ cancel=Anulare
 delete=Ștergeți
 ok=OK
 accept=Acceptă
+add=Adaugă
+change=Modifică
 decline=Refuză
 back=ÃŽnapoi
 next=ÃŽnainte
@@ -142,6 +169,13 @@ sorry=Ne pare rău
 error=Eroare
 warning=Avertizare
 unsupported_feature=Din păcate, această funcție nu este încă acceptată de Briar Desktop.
+remove=Eliminare
+
+# Compose text edit actions
+copy=Copiază
+cut=Taie
+paste=Lipește
+select_all=Selectează tot
 
 # Startup screen
 startup.title.registration=Bine ați venit la Briar
@@ -169,8 +203,8 @@ startup.failed.db_error=Briar nu a reușit să deschidă baza de date care conț
 startup.failed.data_too_old_error=Contul dumneavoastră a fost creat cu o versiune veche al acestui app și nu poate fi deschis cu această versiune.\n\nTrebuie fie să reinstalați versiunea veche, fie să creați un cont nou alegând "Mi-am uitat parola" la solicitarea de parolă.
 startup.failed.data_too_new_error=Contul dumneavoastră a fost creat cu o versiune mai nouă al acestui app și nu poate fi deschis cu această versiune.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune și să încercați din nou.
 startup.failed.service_error=Briar nu a reușit să pornească o componentă necesară.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune la app și să încercați din nou.
-startup.database.creating=Crearea contului...
-startup.database.opening=Decriptarea bazei de date...
+startup.database.creating=Creating Account…
+startup.database.opening=Decriptare bază de date...
 startup.database.migrating=Actualizare bază de date...
 startup.database.compacting=Compactare bază de date...
 expiration.banner.part1.zero=This is a test version of Briar that will expire today.
@@ -185,13 +219,25 @@ settings.general.title=General
 
 # Settings Display
 settings.display.title=Ecran
+# todo: to be removed
 settings.display.theme=Temă întunecată
+settings.display.theme.title=Temă
+settings.display.theme.auto=Implicit sistem
+settings.display.theme.dark=Închisă
+settings.display.theme.light=Deschisă
+settings.display.language.title=Limbă
+settings.display.language.auto=Implicit sistem
 
 # Settings Connections
 settings.connections.title=Conexiuni
 
 # Settings Security
 settings.security.title=Securitate
+settings.security.password.change=Schimbă parola
+settings.security.password.current=Parolă curentă
+settings.security.password.choose=Parolă nouă
+settings.security.password.confirm=Confirmați parola nouă
+settings.security.password.changed=Parola a fost schimbată.
 
 # Settings Notifications
 settings.notifications.title=Notificări
diff --git a/src/main/resources/strings/BriarDesktop_ru.properties b/src/main/resources/strings/BriarDesktop_ru.properties
index d1186048313493457a47d148a8aa865cb24b15b2..3dbc4f1e559e4968304e5fc6a64f775f3d186e86 100644
--- a/src/main/resources/strings/BriarDesktop_ru.properties
+++ b/src/main/resources/strings/BriarDesktop_ru.properties
@@ -3,9 +3,10 @@ access.attachment_add=Добавить вложение
 access.attachment_remove=Удалить вложение
 access.contacts.add=Добавить контакт
 access.contact.menu=Показать меню контакта
-access.contacts.dropdown.connections.expand=Развернуть меню подключений
-access.contacts.dropdown.contacts.expand=Развернуть меню контакта
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Значок поиска контактов
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Вернуться к экрану контактов процесса ознакомления
 access.introduction.close=Закрыть экран ознакомления
 access.message.jump_to_unread=Перейти к следующему непрочитанному сообщению
@@ -14,6 +15,8 @@ access.message.sent=Сообщение отправлено
 access.logo=Логотип Briar
 access.swap=Значок, показывающий ошибки между двумя контактами
 access.about_briar_desktop=О Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Контакт не выбран
@@ -33,13 +36,15 @@ contacts.dropdown.delete.all=Удалить все сообщения
 contacts.dropdown.disappearing=Исчезающие сообщения
 contacts.dropdown.introduction=Сделать представление
 contacts.search.title=Контакты
+contacts.pending.remove.dialog.title=Подтвердите удаление
+contacts.pending.remove.dialog.message=Этот контакт находится в процессе добавления. Если вы удалите его сейчас, он не будет добавлен.
 
 # Conversation
 conversation.message.unread=Непрочитанные сообщения
 conversation.message.new=Новое сообщение
 conversation.delete.all.dialog.title=Подтверждение удаления сообщений
-conversation.delete.all.dialog.message=Are you sure that you want to delete all messages in this chat from your device?
-conversation.delete.single=Delete message for me
+conversation.delete.all.dialog.message=Вы уверены, что хотите удалить все сообщения в этом чате со своего устройства?
+conversation.delete.single=Удалить сообщение у меня
 conversation.delete.failed.dialog.title=Не удалось удалить все сообщения
 conversation.delete.failed.dialog.message.ongoing_both=Сообщения, связанные с текущими приглашениями и знакомствами, не могут быть удалены до их завершения.
 conversation.delete.failed.dialog.message.ongoing_introductions=Сообщения, связанные с текущими знакомствами, не могут быть удалены до их завершения.
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Сообщения
 conversation.delete.failed.dialog.message.not_all_selected_both=Чтобы удалить приглашение или знакомство, вам необходимо выбрать запрос и ответ.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Чтобы удалить знакомство, необходимо выбрать запрос и ответ.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Чтобы удалить приглашение, необходимо выбрать запрос и ответ.
+conversation.add.contact.dialog.title=Добавление контакта на расстоянии
+conversation.add.contact.dialog.contact_link=Ссылка контакта
 conversation.delete.contact.dialog.title=Подтверждение удаления контакта
 conversation.delete.contact.dialog.message=Вы действительно хотите удалить этот контакт и все связанные с ним сообщения?
+conversation.change.alias.dialog.title=Изменить имя контакта
+conversation.change.alias.dialog.description=Введите новое имя для этого контакта (видимое только вам):
 
 # Private Groups
 groups.card.created=Создано {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Знакомство с {0} было отк
 introduction.response.accepted.received={0} принял(-а) знакомство с {1}.
 introduction.response.declined.received={0} отказался(-лась) от знакомства с {1}.
 introduction.response.declined.received_by_introducee={0} сообщает, что {1} отказался(-лась) от знакомства.
-introduction.error.own_link=Введите ссылку вашего контакта, а не свою
-introduction.error.remote_invalid=Ссылка удаленного рукопожатия недействительна
-introduction.error.alias_invalid=Псевдоним недействителен
-introduction.error.link_invalid=Ссылка недействительна: {0}
-introduction.error.public_key_invalid=Открытый ключ недействителен: {0}
-introduction.error.adding_failed=Не удалось добавить контакт
-introduction.error.contact_already_exists= У вас уже есть контакт с этой ссылкой: {0}
-introduction.error.pending_contact_already_exists=У вас уже есть ожидающий контакт с этой ссылкой: {0}
-introduction.error.duplicate_contact_explainer=Будьте осторожны, если {0} - не тот же человек, что и {1}.\n\nОдин из них, возможно, пытается выяснить, кто ваши контакты.\n\nНе сообщайте им, что вы получили ту же самую ссылку от кого-то еще.
 
+# Add Contact Remotely
+contact.add.title_dialog=Добавить контакт
+contact.add.remote.title=Добавление контакта на расстоянии
+contact.add.remote.your_link=Передайте эту ссылку контакту, который вы хотите добавить.
+contact.add.remote.copy_tooltip=Скопировать
+contact.add.remote.contact_link=Введите ссылку от вашего контакта здесь
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Вставить
+contact.add.remote.nickname_intro=Дайте вашему контакту псевдоним. Увидеть его сможете только вы.
+contact.add.remote.choose_nickname=Введите псевдоним
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Введите ссылку вашего контакта, а не свою
+contact.add.error.remote_invalid=Ссылка удаленного рукопожатия недействительна
+contact.add.error.alias_invalid=Псевдоним недействителен
+contact.add.error.link_invalid=Ссылка недействительна: {0}
+contact.add.error.public_key_invalid=Открытый ключ недействителен: {0}
+contact.add.error.adding_failed=Не удалось добавить контакт
+contact.add.error.contact_already_exists= У вас уже есть контакт с этой ссылкой: {0}
+contact.add.error.pending_contact_already_exists=У вас уже есть ожидающий контакт с этой ссылкой: {0}
+contact.add.error.duplicate_contact_explainer=Будьте осторожны, если {0} - не тот же человек, что и {1}.\n\nОдин из них, возможно, пытается выяснить, кто ваши контакты.\n\nНе сообщайте им, что вы получили ту же самую ссылку от кого-то еще.
 
 # Private Group Sharing
 group.invitation.received={0} пригласил(-а) вас присоединиться к группе "{1}".
@@ -126,6 +150,7 @@ welcome.text=У вас пока нет контактов. Нажмите зна
 about.copyright=Авторское право
 about.license=Лицензия
 about.version=Версия
+about.version.core=Версия ядра
 about.contact=Контакты
 about.website=Cайт
 
@@ -134,6 +159,8 @@ cancel=Отменить
 delete=Удалить
 ok=OK
 accept=Принять
+add=Добавить
+change=Изменить
 decline=Отклонить
 back=Назад
 next=Далее
@@ -142,6 +169,13 @@ sorry=Сожалеем
 error=Ошибка
 warning=Предупреждение
 unsupported_feature=К сожалению, эта функция пока не поддерживается Briar Desktop.
+remove=Удалить
+
+# Compose text edit actions
+copy=Скопировать
+cut=Вырезать
+paste=Вставить
+select_all=Выбрать все
 
 # Startup screen
 startup.title.registration=Добро пожаловать в Briar
@@ -169,7 +203,7 @@ startup.failed.db_error=Briar не смог открыть базу данных
 startup.failed.data_too_old_error=Ваша учетная запись была создана в старой версии Briar, поэтому открыть ее в этой версии приложения не удастся.\n\nВам необходимо либо установить старую версию, либо создать новый аккаунт, выбрав 'я забыл свой пароль' на этапе авторизации в приложении.
 startup.failed.data_too_new_error=Ваш аккаунт был создан в более новой версии этого приложения и не может быть открыт в текущей версии.\n\nПожалуйста, обновите приложение до последней версии и повторите попытку.
 startup.failed.service_error=Briar не смог запустить необходимый компонент.\n\nПожалуйста, обновите приложение до последней версии и повторите попытку.
-startup.database.creating=Создание аккаунта...
+startup.database.creating=Creating Account…
 startup.database.opening=Расшифровка базы данных...
 startup.database.migrating=Обновление базы данных...
 startup.database.compacting=Сжатие базы данных...
@@ -185,13 +219,25 @@ settings.general.title=Общие
 
 # Settings Display
 settings.display.title=Отображение
+# todo: to be removed
 settings.display.theme=Темная тема
+settings.display.theme.title=Тема
+settings.display.theme.auto=По умолчанию
+settings.display.theme.dark=Темная
+settings.display.theme.light=Светлая
+settings.display.language.title=Язык
+settings.display.language.auto=По умолчанию
 
 # Settings Connections
 settings.connections.title=Подключения
 
 # Settings Security
 settings.security.title=Безопасность
+settings.security.password.change=Изменить пароль
+settings.security.password.current=Текущий пароль
+settings.security.password.choose=Новый пароль
+settings.security.password.confirm=Подтвердите новый пароль
+settings.security.password.changed=Пароль был изменен.
 
 # Settings Notifications
 settings.notifications.title=Уведомления
diff --git a/src/main/resources/strings/BriarDesktop_sk.properties b/src/main/resources/strings/BriarDesktop_sk.properties
index 1e30c7673e08da01c80cc2627f78fa1dc3107fd2..ad08a4b6928f58933f49119fa00058c7350a74a3 100644
--- a/src/main/resources/strings/BriarDesktop_sk.properties
+++ b/src/main/resources/strings/BriarDesktop_sk.properties
@@ -3,9 +3,10 @@ access.attachment_add=Pridať prílohu
 access.attachment_remove=Odstrániť prílohu
 access.contacts.add=Pridať kontakt
 access.contact.menu=Zobraziť ponuku kontaktov
-access.contacts.dropdown.connections.expand=Rozbaliť ponuku prepojení
+access.contacts.dropdown.connections.expand=Rozbaliť ponuku pripojenia
 access.contacts.dropdown.contacts.expand=Rozbaliť ponuku kontaktov
 access.contacts.search=Ikona vyhľadávania kontaktov
+access.contacts.pending.remove=Odstrániť čakajúci kontakt
 access.introduction.back.contact=Vráťte sa na kontaktnú obrazovku procesu predstavenia
 access.introduction.close=Zavrieť úvodnú obrazovku
 access.message.jump_to_unread=Prejsť na ďalšiu neprečítanú správu
@@ -14,6 +15,8 @@ access.message.sent=Správa odoslaná
 access.logo=Logo Briar
 access.swap=Ikona zobrazujúca chyby medzi dvoma kontaktmi
 access.about_briar_desktop=O aplikácii Briar Desktop
+access.password.show=Zobraziť heslo
+access.password.hide=Skryť heslo
 
 # Contacts
 contacts.none_selected.title=Žiadny kontakt nebol vybratý
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Odstrániť všetky správy
 contacts.dropdown.disappearing=Miznúce správy
 contacts.dropdown.introduction=Zoznámenie
 contacts.search.title=Kontakty
+contacts.pending.remove.dialog.title=Potvrdiť odstránenie
+contacts.pending.remove.dialog.message=Tento kontakt sa stále pridáva. Ak ho teraz odstránite, nebude pridaný.
 
 # Conversation
 conversation.message.unread=Neprečítané správy
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Správy súvisiace
 conversation.delete.failed.dialog.message.not_all_selected_both=Ak chcete odstrániť pozvanie alebo predstavenie, musíte vybrať žiadosť a odpoveď.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Ak chcete odstrániť predstavenie, musíte vybrať žiadosť a odpoveď.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Ak chcete odstrániť pozvanie, musíte vybrať žiadosť a odpoveď.
+conversation.add.contact.dialog.title=Pridať vzdialený kontakt
+conversation.add.contact.dialog.contact_link=Odkaz kontaktu
 conversation.delete.contact.dialog.title=Potvrdiť odstránenie kontaktu
 conversation.delete.contact.dialog.message=Ste si istí, že chcete odstrániť tento kontakt a všetky správy vymenené s týmto kontaktom?
+conversation.change.alias.dialog.title=Zmeniť meno kontaktu
+conversation.change.alias.dialog.description=Zadajte prosím nové meno tohto kontaktu (viditeľné len pre vás):
 
 # Private Groups
 groups.card.created=Vytvoril {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Zoznámenie s {0} bolo automaticky odmietnut
 introduction.response.accepted.received={0} prijal zoznámenie s {1}.
 introduction.response.declined.received={0} odmietol zoznámenie s {1}.
 introduction.response.declined.received_by_introducee={0} hovorí, že {1} odmietol zoznámenie.
-introduction.error.own_link=Zadajte odkaz na kontakt, nie svoj vlastný
-introduction.error.remote_invalid=Vzdialené handshake prepojenie je neplatné
-introduction.error.alias_invalid=Alias nie je platný
-introduction.error.link_invalid=Odkaz nie je platný: {0}
-introduction.error.public_key_invalid=Verejný kľúč je neplatný: {0}
-introduction.error.adding_failed=Pridanie kontaktu zlyhalo
-introduction.error.contact_already_exists=Už máte kontakt s týmto odkazom: {0}
-introduction.error.pending_contact_already_exists=Už máte čakajúci kontakt s týmto odkazom: {0}
-introduction.error.duplicate_contact_explainer=Buďte opatrní, ak {0} nie je tá istá osoba ako {1}.\n\nJeden z nich sa môže snažiť zistiť, kto sú vaše kontakty.\n\nNehovorte im, že ste dostali rovnaký odkaz od niekoho iného.
 
+# Add Contact Remotely
+contact.add.title_dialog=Pridať kontakt
+contact.add.remote.title=Pridať vzdialený kontakt
+contact.add.remote.your_link=Poskytnite tento odkaz kontaktu, ktorý chcete pridať
+contact.add.remote.copy_tooltip=Kopírovať
+contact.add.remote.contact_link=Sem zadajte odkaz od vášho kontaktu
+contact.add.remote.contact_link_hint=Odkaz na kontakt
+contact.add.remote.paste_tooltip=Vložiť
+contact.add.remote.nickname_intro=Dajte svojmu kontaktu prezývku. Len vy ju môžete vidieť.
+contact.add.remote.choose_nickname=Zadajte prezývku
+contact.add.remote.link_copied_snackbar=Odkaz Briar skopírovaný do schránky.
+contact.add.remote.link_pasted_snackbar=Vložené zo schránky.
+contact.add.remote.paste_error_snackbar=Vaša schránka je prázdna.
+contact.add.remote.outgoing_arrow=Odchádzajúca šípka
+contact.add.remote.incoming_arrow=Prichádzajúca šípka
+contact.add.error.own_link=Zadajte odkaz na kontakt, nie svoj vlastný
+contact.add.error.remote_invalid=Vzdialené handshake prepojenie je neplatné
+contact.add.error.alias_invalid=Alias nie je platný
+contact.add.error.link_invalid=Odkaz nie je platný: {0}
+contact.add.error.public_key_invalid=Verejný kľúč je neplatný: {0}
+contact.add.error.adding_failed=Pridanie kontaktu zlyhalo
+contact.add.error.contact_already_exists=Už máte kontakt s týmto odkazom: {0}
+contact.add.error.pending_contact_already_exists=Už máte čakajúci kontakt s týmto odkazom: {0}
+contact.add.error.duplicate_contact_explainer=Buďte opatrní, ak {0} nie je tá istá osoba ako {1}.\n\nJeden z nich sa môže snažiť zistiť, kto sú vaše kontakty.\n\nNehovorte im, že ste dostali rovnaký odkaz od niekoho iného.
 
 # Private Group Sharing
 group.invitation.received={0} vás pozval do skupiny "{1}".
@@ -126,6 +150,7 @@ welcome.text=Zatiaľ nemáte žiadne kontakty. Ťuknite na ikonu + a pridajte ko
 about.copyright=Autorské práva
 about.license=Licencia
 about.version=Verzia
+about.version.core=Verzia jadra
 about.contact=Kontakt
 about.website=Webová stránka
 
@@ -134,6 +159,8 @@ cancel=Zrušiť
 delete=Odstrániť
 ok=OK
 accept=Prijať
+add=Pridať
+change=Zmeniť
 decline=Odmietnuť
 back=Späť
 next=ÄŽalej
@@ -142,6 +169,13 @@ sorry=Prepáčte
 error=Chyba
 warning=Varovanie
 unsupported_feature=Bohužiaľ, táto funkcia zatiaľ nie je podporovaná v aplikácii Briar Desktop.
+remove=Odstrániť
+
+# Compose text edit actions
+copy=Kopírovať
+cut=Vystrihnúť
+paste=Vložiť
+select_all=Označiť všetko
 
 # Startup screen
 startup.title.registration=Vitajte v Briar
@@ -185,13 +219,25 @@ settings.general.title=Všeobecné
 
 # Settings Display
 settings.display.title=Zobrazenie
+# todo: to be removed
 settings.display.theme=Tmavý motív
+settings.display.theme.title=Téma
+settings.display.theme.auto=Predvolené systémom
+settings.display.theme.dark=Tmavá
+settings.display.theme.light=Svetlá
+settings.display.language.title=Jazyk
+settings.display.language.auto=Predvolené systémom
 
 # Settings Connections
 settings.connections.title=Pripojenia
 
 # Settings Security
 settings.security.title=Bezpečnosť
+settings.security.password.change=Zmeniť heslo
+settings.security.password.current=Aktuálne heslo
+settings.security.password.choose=Nové heslo
+settings.security.password.confirm=Potvrdiť nové heslo
+settings.security.password.changed=Heslo bolo zmenené.
 
 # Settings Notifications
 settings.notifications.title=Oznámenia
diff --git a/src/main/resources/strings/BriarDesktop_sq.properties b/src/main/resources/strings/BriarDesktop_sq.properties
index df0e90aab45889adfef91a1b10a983d14ec2ce5a..6be9d3c656edc6893d779380f83f09f263cb9fb2 100644
--- a/src/main/resources/strings/BriarDesktop_sq.properties
+++ b/src/main/resources/strings/BriarDesktop_sq.properties
@@ -3,17 +3,20 @@ access.attachment_add=Shtoni bashkëngjitje
 access.attachment_remove=Hiqe bashkëngjitjen
 access.contacts.add=Shtoni kontakt
 access.contact.menu=Shfaq menu kontaktesh
-access.contacts.dropdown.connections.expand=Zgjero menunë e lidhjes
-access.contacts.dropdown.contacts.expand=Zgjero menunë e kontakteve
+access.contacts.dropdown.connections.expand=Zgjeroni menu lidhjesh
+access.contacts.dropdown.contacts.expand=Zgjeroni menu kontaktesh
 access.contacts.search=Ikonë për kërkim kontaktesh
+access.contacts.pending.remove=Hiq kontakt pezull
 access.introduction.back.contact=Kthehu te skena e kontaktit të procesit të prezantimit
-access.introduction.close=Mbylle skenën e prezantimi
+access.introduction.close=Mbylle skenën e prezantimit
 access.message.jump_to_unread=Hidhu te mesazhi pasues i palexuar
 access.message.send=Dërgoni mesazh
 access.message.sent=Mesazhi u dërgua
 access.logo=Stemë Briar-i
 access.swap=Ikonë që shfaq gabime mes dy kontaktesh
 access.about_briar_desktop=Rreth Briar-it për Desktop
+access.password.show=Shfaq fjalëkalimin
+access.password.hide=Fshihe fjalëkalimin
 
 # Contacts
 contacts.none_selected.title=S’ka kontakt të përzgjedhur
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Fshiji krejt mesazhet
 contacts.dropdown.disappearing=Mesazhe që treten
 contacts.dropdown.introduction=Bëje prezantimin
 contacts.search.title=Kontakte
+contacts.pending.remove.dialog.title=Ripohoni Heqjen
+contacts.pending.remove.dialog.message=Ky kontakt ende po shtohet. Nëse e hiqni tani, s\’do të shtohet.
 
 # Conversation
 conversation.message.unread=Mesazhet e palexuar
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Mesazhe të lidhur
 conversation.delete.failed.dialog.message.not_all_selected_both=Për të fshirë një ftesë apo prezantim, lypset të përzgjidhni kërkesën dhe përgjigjen.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Për të fshirë një prezantim, lypset të përzgjidhni kërkesën dhe përgjigjen.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Për të fshirë një ftesë, lypset të përzgjidhni kërkesën dhe përgjigjen.
+conversation.add.contact.dialog.title=Shtoni Kontakt në Largësi
+conversation.add.contact.dialog.contact_link=Lidhje e kontaktit
 conversation.delete.contact.dialog.title=Ripohoni Fshirje Kontakti
 conversation.delete.contact.dialog.message=Jeni i sigurt se doni të hiqet ky kontakt dhe krejt mesazhet e shkëmbyer me këtë kontakt?
+conversation.change.alias.dialog.title=Ndryshoni emër kontakti
+conversation.change.alias.dialog.description=Ju lutemi, jepni një emër të ri për këtë kontakt (i dukshëm vetëm për ju):
 
 # Private Groups
 groups.card.created=Krijuar nga {0}
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Prezantimi te {0} u hodh poshtë automatikis
 introduction.response.accepted.received={0} pranoi prezantimin te {1}.
 introduction.response.declined.received={0} hodhi poshtë prezantimin te {1}.
 introduction.response.declined.received_by_introducee={0} thotë se {1} hodhi poshtë prezantimin.
-introduction.error.own_link=Ju lutemi, jepni lidhjen e kontaktit, jo tuajën
-introduction.error.remote_invalid=Lidhja për duarshtrëngim së largëti është e pavlefshme
-introduction.error.alias_invalid=Aliasi është i pavlefshëm
-introduction.error.link_invalid=Lidhja është e pavlefshme: {0}
-introduction.error.public_key_invalid=Kyçi publik është i pavlefshëm: {0}
-introduction.error.adding_failed=Shtimi i kontaktit dështoi
-introduction.error.contact_already_exists=Keni tashmë një kontakt me këtë lidhje: {0}
-introduction.error.pending_contact_already_exists=Keni tashmë një kontakt pezull me këtë lidhje: {0}
-introduction.error.duplicate_contact_explainer=Jini i kujdesshëm, nëse {0} s’është i njëjti person me {1}.\n\nNjë prej tyre mund të jetë duke u rrekur të zbulojë cilët janë kontaktet tuaj.\n\nMos u thoni që morët të njëjtën lidhje nga dikush tjetër.
 
+# Add Contact Remotely
+contact.add.title_dialog=Shtoni Kontakt
+contact.add.remote.title=Shtoni Kontakt në Largësi
+contact.add.remote.your_link=Jepjani këtë lidhje kontaktit që doni të shtoni
+contact.add.remote.copy_tooltip=Kopjojeni
+contact.add.remote.contact_link=Jepni këtu lidhjen prej kontaktit tuaj
+contact.add.remote.contact_link_hint=Lidhje e kontaktit
+contact.add.remote.paste_tooltip=Ngjiteni
+contact.add.remote.nickname_intro=Jepini kontaktit tuaj një nofkë. Vetëm ju mund ta shihni.
+contact.add.remote.choose_nickname=Jepni një nofkë
+contact.add.remote.link_copied_snackbar=Lidhja Briar u kopjua në të papastër.
+contact.add.remote.link_pasted_snackbar=Ngjitur nga e papastra.
+contact.add.remote.paste_error_snackbar=E papastra juaj është e zbrazët.
+contact.add.remote.outgoing_arrow=Shigjetë Për Ikëset
+contact.add.remote.incoming_arrow=Shigjetë Për Ardhëset
+contact.add.error.own_link=Ju lutemi, jepni lidhjen e kontaktit, jo tuajën
+contact.add.error.remote_invalid=Lidhja për duarshtrëngim së largëti është e pavlefshme
+contact.add.error.alias_invalid=Aliasi është i pavlefshëm
+contact.add.error.link_invalid=Lidhja është e pavlefshme: {0}
+contact.add.error.public_key_invalid=Kyçi publik është i pavlefshëm: {0}
+contact.add.error.adding_failed=Shtimi i kontaktit dështoi
+contact.add.error.contact_already_exists=Keni tashmë një kontakt me këtë lidhje: {0}
+contact.add.error.pending_contact_already_exists=Keni tashmë një kontakt pezull me këtë lidhje: {0}
+contact.add.error.duplicate_contact_explainer=Jini i kujdesshëm, nëse {0} s’është i njëjti person me {1}.\n\nNjë prej tyre mund të jetë duke u rrekur të zbulojë cilët janë kontaktet tuaj.\n\nMos u thoni që morët të njëjtën lidhje nga dikush tjetër.
 
 # Private Group Sharing
 group.invitation.received={0} ju ka ftuar të bëheni pjesë e grupit “{1}”.
@@ -126,6 +150,7 @@ welcome.text=Ende s’keni kontakte. Prekni ikonën + që të shtoni një kontak
 about.copyright=Të drejta kopjimi
 about.license=Licencia
 about.version=Version
+about.version.core=Version Bazë
 about.contact=Kontakt
 about.website=Sajt
 
@@ -134,6 +159,8 @@ cancel=Zrušiť
 delete=Odstrániť
 ok=OK
 accept=Pranoje
+add=Shtoje
+change=Ndryshoje
 decline=Hidhe poshtë
 back=Mbrapsht
 next=ÄŽalej
@@ -142,6 +169,13 @@ sorry=Na ndjeni
 error=Gabim
 warning=Varovanie
 unsupported_feature=Mjerisht, kjo veçori nuk mbulohet ende nga Briar-i për Desktop.
+remove=Hiqe
+
+# Compose text edit actions
+copy=Kopjojeni
+cut=Priteni
+paste=Ngjiteni
+select_all=Përzgjidhi krejt
 
 # Startup screen
 startup.title.registration=Mirë se vini në Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar-i s’qe në gjendje të hapte bazën e të dhëna
 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.\n\nOse duhet të riinstaloni versionin e vjetër, ose të ujdisni një llogari të re duke zgjedhur “Kam harruar fjalëkalimin tim”, te pjesa e fjalëkalimit.
 startup.failed.data_too_new_error=Llogaria juaj qe krijuar me një version më të ri të këtij aplikacioni dhe s’mund të hapet me këtë version.\n\nJu lutemi, përmirësojeni me versionin më të ri dhe riprovoni.
 startup.failed.service_error=Briar-i s’qe në gjendje të niste një përbërës të domosdoshëm.\n\nJu lutemi, përmirësojeni me versionin më të ri të aplikacionit dhe riprovoni.
-startup.database.creating=Po krijohet Llogari…
+startup.database.creating=Po krijohet Llogaria…
 startup.database.opening=Po shfshehtëzohet Baza e të Dhënave…
-startup.database.migrating=Po përmirësohet Baza e të Dhënave…
-startup.database.compacting=Po ngjeshet Baza e të Dhënave…
+startup.database.migrating=Po përditësohet Baza e të dhënave…
+startup.database.compacting=Po kompaktësohet Baza e të Dhënave…
 expiration.banner.part1.zero=Ky është një version test i Briar-it, që do të skadojë sot.
 expiration.banner.part1.nozero={0, plural, one {Ky është një version test i Briar-it që do të skadojë nesër.} other {Ky është një version test i Briar-it që do të skadojë për {0} ditë.}}
 expiration.banner.part2=Ju lutemi, përditësojeni me një version të ri, brenda kohës.
@@ -185,13 +219,25 @@ settings.general.title=Të përgjithshme
 
 # Settings Display
 settings.display.title=Shfaqje
+# todo: to be removed
 settings.display.theme=Temë e Errët
+settings.display.theme.title=Temë
+settings.display.theme.auto=Parazgjedhje sistemi
+settings.display.theme.dark=E errët
+settings.display.theme.light=E çelët
+settings.display.language.title=Gjuhë
+settings.display.language.auto=Parazgjedhje sistemi
 
 # Settings Connections
 settings.connections.title=Lidhje
 
 # Settings Security
 settings.security.title=Bezpečnosť
+settings.security.password.change=Ndryshoni fjalëkalimin
+settings.security.password.current=Fjalëkalimi i tanishëm
+settings.security.password.choose=Fjalëkalim i ri
+settings.security.password.confirm=Riopohoni fjalëkalimin e ri
+settings.security.password.changed=Fjalëkalimi u ndryshua.
 
 # Settings Notifications
 settings.notifications.title=Njoftime
diff --git a/src/main/resources/strings/BriarDesktop_sv.properties b/src/main/resources/strings/BriarDesktop_sv.properties
index 17152b70abdd0d7efc302f17d66a0a9dc900813e..193304e9c4f2fddac34fe920696485a4e627a3f1 100644
--- a/src/main/resources/strings/BriarDesktop_sv.properties
+++ b/src/main/resources/strings/BriarDesktop_sv.properties
@@ -3,9 +3,10 @@ access.attachment_add=Lägg till bilaga
 access.attachment_remove=Ta bort bilaga
 access.contacts.add=Lägg till kontakt
 access.contact.menu=Visa kontaktmeny
-access.contacts.dropdown.connections.expand=Expandera anslutningmeny
-access.contacts.dropdown.contacts.expand=Expandera kontaktmeny
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=Ikon för att söka genom kontakter
+access.contacts.pending.remove=Ta bort väntade kontakt
 access.introduction.back.contact=Gå tillbaka till kontaktskärmen för introduktionsprocessen
 access.introduction.close=Stäng introduktionsskärmen
 access.message.jump_to_unread=Hoppa till nästa olästa meddelande
@@ -14,6 +15,8 @@ access.message.sent=Meddelandet har skickats
 access.logo=Briar-logotyp
 access.swap=Ikon som visar fel mellan två kontakter
 access.about_briar_desktop=Om Briar-skrivbordsmiljö
+access.password.show=Visa lösenord
+access.password.hide=Göm lösenord
 
 # Contacts
 contacts.none_selected.title=Ingen kontakt vald
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Ta bort alla meddelanden
 contacts.dropdown.disappearing=Försvinnande meddelanden
 contacts.dropdown.introduction=Presentera kontakt
 contacts.search.title=Kontakter
+contacts.pending.remove.dialog.title=Bekräfta borttagning
+contacts.pending.remove.dialog.message=Denna kontakt håller på att läggas till. Om du tar bort den nu kommer den ej läggas till.
 
 # Conversation
 conversation.message.unread=Olästa meddelanden
@@ -47,11 +52,15 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Meddelanden relate
 conversation.delete.failed.dialog.message.not_all_selected_both=För att ta bort en inbjudan eller introduktion måste du välja förfrågan och svaret.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=För att ta bort en introduktion måste du välja förfrågan och svaret.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=För att ta bort en inbjudan måste du välja förfrågan och svaret.
+conversation.add.contact.dialog.title=Lägg till en kontakt på avstånd
+conversation.add.contact.dialog.contact_link=Kontaktens länk
 conversation.delete.contact.dialog.title=Bekräfta radering av kontakt
 conversation.delete.contact.dialog.message=Är du säker att du vill radera denna kontakt och alla meddelanden?
+conversation.change.alias.dialog.title=Ändra namn på kontakt
+conversation.change.alias.dialog.description=Ange ett nytt namn för denna kontakt (syns endast för dig):
 
 # Private Groups
-groups.card.created=Skapat av {0}
+groups.card.created=Skapad av {0}
 groups.card.messages={0, plural, one {(0) meddelande} other {{0} meddelanden}}
 
 # Introduction
@@ -70,16 +79,31 @@ introduction.response.declined.auto=Introduktionen av {0} avböjdes automatiskt.
 introduction.response.accepted.received={0} accepterade introduktionen av {1}.
 introduction.response.declined.received={0} avböjde introduktionen av {1}.
 introduction.response.declined.received_by_introducee={0} säger att {1} avböjde introduktionen.
-introduction.error.own_link=Ange in kontaktens länk, inte din egen
-introduction.error.remote_invalid=Länk för fjärrhandskakning är ogiltig
-introduction.error.alias_invalid=Alias är ogiltigt
-introduction.error.link_invalid=Länk är ogiltig: {0}
-introduction.error.public_key_invalid=Publik nyckel är ogiltig: {0}
-introduction.error.adding_failed=Misslyckades med att lägga till kontakt
-introduction.error.contact_already_exists=Du har redan en kontakt med denna länk: {0}
-introduction.error.pending_contact_already_exists=Du har redan en väntade kontakt med denna länk: {0}
-introduction.error.duplicate_contact_explainer=Var uppmärksam om {0} inte är samma person som {1}.\n\nEn av den kanske försöker ta reda på vilka dina kontakter är.\n\nBerätta inte för dem att du fått samma länk från någon annan.
 
+# Add Contact Remotely
+contact.add.title_dialog=Lägg till kontakt
+contact.add.remote.title=Lägg till en kontakt på avstånd
+contact.add.remote.your_link=Ge den här länken till kontakten du vill lägga till
+contact.add.remote.copy_tooltip=Kopiera
+contact.add.remote.contact_link=Skriv in länken från din kontakt här
+contact.add.remote.contact_link_hint=Kontaktens länk
+contact.add.remote.paste_tooltip=Klistra in
+contact.add.remote.nickname_intro=Ge din kontakt ett smeknamn. Bara du kan se detta.
+contact.add.remote.choose_nickname=Skriv ett smeknamn
+contact.add.remote.link_copied_snackbar=Briar-länk kopierad till utklipp.
+contact.add.remote.link_pasted_snackbar=Inklistrat från urklipp.
+contact.add.remote.paste_error_snackbar=Urklipp är tom.
+contact.add.remote.outgoing_arrow=Utgående pil
+contact.add.remote.incoming_arrow=Inkommande pil
+contact.add.error.own_link=Ange in kontaktens länk, inte din egen
+contact.add.error.remote_invalid=Länk för fjärrhandskakning är ogiltig
+contact.add.error.alias_invalid=Alias är ogiltigt
+contact.add.error.link_invalid=Länk är ogiltig: {0}
+contact.add.error.public_key_invalid=Publik nyckel är ogiltig: {0}
+contact.add.error.adding_failed=Misslyckades med att lägga till kontakt
+contact.add.error.contact_already_exists=Du har redan en kontakt med denna länk: {0}
+contact.add.error.pending_contact_already_exists=Du har redan en väntade kontakt med denna länk: {0}
+contact.add.error.duplicate_contact_explainer=Var uppmärksam om {0} inte är samma person som {1}.\n\nEn av den kanske försöker ta reda på vilka dina kontakter är.\n\nBerätta inte för dem att du fått samma länk från någon annan.
 
 # Private Group Sharing
 group.invitation.received={0} har bjudit in dig att gå med i gruppen ”{1}".
@@ -126,6 +150,7 @@ welcome.text=Du har inte några kontakter än. Klicka på +-ikonen för att läg
 about.copyright=Upphovsrätt
 about.license=Licens
 about.version=Version
+about.version.core=Kärnversion
 about.contact=Kontakt
 about.website=Webbsida
 
@@ -134,6 +159,8 @@ cancel=Avbryt
 delete=Ta bort
 ok=OK
 accept=Acceptera
+add=Lägg till
+change=Ändra
 decline=Neka
 back=Tillbaka
 next=Nästa
@@ -142,6 +169,13 @@ sorry=Tyvärr
 error=Fel
 warning=Varning
 unsupported_feature=Denna funktion stöds tyvärr inte av Briar Skrivbord än.
+remove=Ta bort
+
+# Compose text edit actions
+copy=Kopiera
+cut=Klipp ut
+paste=Klistra in
+select_all=Markera alla
 
 # Startup screen
 startup.title.registration=Välkommen till Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar kunde inte öppna databasen som innehåller ditt k
 startup.failed.data_too_old_error=Ditt konto skapades med en gammal version av denna app och kan inte öppnas med denna version.\n\nDu måste antingen återinstallera den gamla versionen eller sätta upp ett nytt konto genom att välja ”Jag har glömt mitt lösenord” vid lösenordsförfrågan.
 startup.failed.data_too_new_error=Ditt konto skapades med en nyare versoin av denna app och kan inte öppnas med denna version.\n\nUppgradera till den senaste versionen och försök igen.
 startup.failed.service_error=Briar kunde inte starta en nödvändig komponent.\n\nUppgradera till den senaste versionen av appen och försök igen.
-startup.database.creating=Skapar konto…
-startup.database.opening=Dekrypterar databas…
-startup.database.migrating=Uppgraderar databas…
-startup.database.compacting=Komprimerar databas…
+startup.database.creating=Creating Account…
+startup.database.opening=Dekrypterar databasen...
+startup.database.migrating=Uppgraderar databasen...
+startup.database.compacting=Komprimerar databasen...
 expiration.banner.part1.zero=Detta är en testversion av Briar som kommer att gå ut idag.
 expiration.banner.part1.nozero={0, plural, one {Detta är en testversion av Briar som kommer att gå ut imorgon.} other {Detta är en testversion av Briar som kommer att gå ut om {0} dagar.}}
 expiration.banner.part2=Uppdatera till enyare version i tid.
@@ -185,13 +219,25 @@ settings.general.title=Generell
 
 # Settings Display
 settings.display.title=Visa
+# todo: to be removed
 settings.display.theme=Mörkt tema
+settings.display.theme.title=Tema
+settings.display.theme.auto=Systemets förval
+settings.display.theme.dark=Mörkt
+settings.display.theme.light=Ljust
+settings.display.language.title=Språk
+settings.display.language.auto=Systemets förval
 
 # Settings Connections
 settings.connections.title=Anslutningar
 
 # Settings Security
 settings.security.title=Säkerhet
+settings.security.password.change=Ändra lösenord
+settings.security.password.current=Nuvarande lösenord
+settings.security.password.choose=Nytt lösenord
+settings.security.password.confirm=Bekräfta nytt lösenord
+settings.security.password.changed=Lösenordet har ändrats.
 
 # Settings Notifications
 settings.notifications.title=Notifikationer
diff --git a/src/main/resources/strings/BriarDesktop_tr.properties b/src/main/resources/strings/BriarDesktop_tr.properties
index 5331ff3550335c8f9dc471fecb7b97a01183afae..6fc4f07661e0abca81651d179e5d19e2cbc4160c 100644
--- a/src/main/resources/strings/BriarDesktop_tr.properties
+++ b/src/main/resources/strings/BriarDesktop_tr.properties
@@ -3,9 +3,10 @@ access.attachment_add=Eklenti ekle
 access.attachment_remove=Eki kaldır
 access.contacts.add=KiÅŸi ekle
 access.contact.menu=Kişi menüsünü göster
-access.contacts.dropdown.connections.expand=Bağlantılar menüsünü genişlet
-access.contacts.dropdown.contacts.expand=Kişiler menüsünü genişlet
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=KiÅŸileri arama simgesi
+access.contacts.pending.remove=Remove pending contact
 access.introduction.back.contact=Tanıtım sürecinin kişi ekranına geri dön
 access.introduction.close=Tanıtım ekranını kapat
 access.message.jump_to_unread=Sonraki okunmamış iletiye geç
@@ -14,6 +15,8 @@ access.message.sent=Mesaj gönderildi
 access.logo=Briar logosu
 access.swap=İki kişi arasındaki hataları gösteren simge
 access.about_briar_desktop=About Briar Desktop
+access.password.show=Show password
+access.password.hide=Hide password
 
 # Contacts
 contacts.none_selected.title=Kişi seçilmedi
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=Tüm iletileri sil
 contacts.dropdown.disappearing=Kaybolan iletiler
 contacts.dropdown.introduction=Tanıştır
 contacts.search.title=KiÅŸiler
+contacts.pending.remove.dialog.title=Kaldırmayı Onayla
+contacts.pending.remove.dialog.message=Bu kişi hala ekleniyor. Şimdi kaldırırsanız eklenmez.
 
 # Conversation
 conversation.message.unread=Okunmamış İletiler
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=Devam eden davetle
 conversation.delete.failed.dialog.message.not_all_selected_both=Bir daveti veya tanıştırmayı silmek için isteği ve yanıtı seçmeniz gerekir.
 conversation.delete.failed.dialog.message.not_all_selected_introductions=Bir tanıştırmayı silmek için isteği ve yanıtı seçmeniz gerekir.
 conversation.delete.failed.dialog.message.not_all_selected_invitations=Bir daveti silmek için isteği ve yanıtı seçmeniz gerekir.
+conversation.add.contact.dialog.title=Uzaktaki KiÅŸiyi Ekle
+conversation.add.contact.dialog.contact_link=Kişinin bağlantısı
 conversation.delete.contact.dialog.title=KiÅŸi Silmeyi Onayla
 conversation.delete.contact.dialog.message=Bu kişiyi ve bu kişiyle ilgili tüm iletileri kaldırmak istediğinize emin misiniz?
+conversation.change.alias.dialog.title=Kişi adını değiştir
+conversation.change.alias.dialog.description=Please enter a new name for this contact (only visible to you):
 
 # Private Groups
 groups.card.created={0} tarafından oluşturuldu
@@ -70,16 +79,31 @@ introduction.response.declined.auto=The introduction to {0} was automatically de
 introduction.response.accepted.received={0} accepted the introduction to {1}.
 introduction.response.declined.received={0} declined the introduction to {1}.
 introduction.response.declined.received_by_introducee={0} says that {1} declined the introduction.
-introduction.error.own_link=Please enter contact's link, not your own
-introduction.error.remote_invalid=Remote handshake link is invalid
-introduction.error.alias_invalid=Alias is invalid
-introduction.error.link_invalid=Link is invalid: {0}
-introduction.error.public_key_invalid=Public key is invalid: {0}
-introduction.error.adding_failed=Adding contact failed
-introduction.error.contact_already_exists=You already have a contact with this link: {0}
-introduction.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
-introduction.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
+# Add Contact Remotely
+contact.add.title_dialog=KiÅŸi Ekle
+contact.add.remote.title=Uzaktaki KiÅŸiyi Ekle
+contact.add.remote.your_link=Bu bağlantıyı eklemek istediğiniz kişiye verin
+contact.add.remote.copy_tooltip=Kopyala
+contact.add.remote.contact_link=Kişinizden gelen bağlantıyı buraya girin
+contact.add.remote.contact_link_hint=Contact\'s link
+contact.add.remote.paste_tooltip=Yapıştır
+contact.add.remote.nickname_intro=Kişinize bir takma ad verin. Bunu sadece siz görebilirsiniz.
+contact.add.remote.choose_nickname=Bir takma ad girin
+contact.add.remote.link_copied_snackbar=Briar link copied to clipboard.
+contact.add.remote.link_pasted_snackbar=Pasted from clipboard.
+contact.add.remote.paste_error_snackbar=Your clipboard is empty.
+contact.add.remote.outgoing_arrow=Outgoing Arrow
+contact.add.remote.incoming_arrow=Incoming Arrow
+contact.add.error.own_link=Please enter contact's link, not your own
+contact.add.error.remote_invalid=Remote handshake link is invalid
+contact.add.error.alias_invalid=Alias is invalid
+contact.add.error.link_invalid=Link is invalid: {0}
+contact.add.error.public_key_invalid=Public key is invalid: {0}
+contact.add.error.adding_failed=Adding contact failed
+contact.add.error.contact_already_exists=You already have a contact with this link: {0}
+contact.add.error.pending_contact_already_exists=You already have a pending contact with this link: {0}
+contact.add.error.duplicate_contact_explainer=Be careful if {0} is not the same person as {1}.\n\nOne of them may be trying to discover who your contacts are.\n\nDon't tell them you received the same link from someone else.
 
 # Private Group Sharing
 group.invitation.received={0} has invited you to join the group "{1}".
@@ -126,6 +150,7 @@ welcome.text=You don't have any contacts yet. Tap the + icon to add a contact:
 about.copyright=Telif hakları
 about.license=Lisans
 about.version=Sürüm
+about.version.core=Core Version
 about.contact=Ä°letiÅŸim
 about.website=Web sitesi
 
@@ -134,6 +159,8 @@ cancel=Ä°ptal
 delete=Sil
 ok=Tamam
 accept=Onayla
+add=Ekle
+change=DeÄŸiÅŸtir
 decline=Reddet
 back=Geri
 next=Sonraki
@@ -142,6 +169,13 @@ sorry=Üzgünüm
 error=Hata
 warning=Uyarı
 unsupported_feature=Unfortunately, this feature is not yet supported by Briar Desktop.
+remove=Sil
+
+# Compose text edit actions
+copy=Kopyala
+cut=Kes
+paste=Yapıştır
+select_all=Tümünü seç
 
 # Startup screen
 startup.title.registration=Briar'a HoÅŸgeldiniz
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar was unable to open the database containing your ac
 startup.failed.data_too_old_error=Your account was created with an old version of this app and cannot be opened with this version.\n\nYou must either reinstall the old version or set up a new account by choosing 'I have forgotten my password' at the password prompt.
 startup.failed.data_too_new_error=Your account was created with a newer version of this app and cannot be opened with this version.\n\nPlease upgrade to the latest version and try again.
 startup.failed.service_error=Briar was unable to start a required component.\n\nPlease upgrade to the latest version of the app and try again.
-startup.database.creating=Creating Account...
-startup.database.opening=Decrypting Database...
-startup.database.migrating=Upgrading Database...
-startup.database.compacting=Compacting Database...
+startup.database.creating=Creating Account…
+startup.database.opening=Veritabanı Şifresi Çözülüyor...
+startup.database.migrating=Veritabanı Yükseltiliyor...
+startup.database.compacting=Veritabanı Sıkıştırılıyor...
 expiration.banner.part1.zero=This is a test version of Briar that will expire today.
 expiration.banner.part1.nozero={0, plural, one {This is a test version of Briar that will expire tomorrow.} other {This is a test version of Briar that will expire in {0} days.}}
 expiration.banner.part2=Please update to a newer version in time.
@@ -185,13 +219,25 @@ settings.general.title=Genel
 
 # Settings Display
 settings.display.title=Görüntüle
+# todo: to be removed
 settings.display.theme=Dark Theme
+settings.display.theme.title=Tema
+settings.display.theme.auto=Sistemde öntanımlı olan
+settings.display.theme.dark=Koyu
+settings.display.theme.light=Açık
+settings.display.language.title=Dil
+settings.display.language.auto=Sistemde öntanımlı olan
 
 # Settings Connections
 settings.connections.title=Bağlantılar
 
 # Settings Security
 settings.security.title=Güvenlik
+settings.security.password.change=Parolayı değiştir
+settings.security.password.current=Åžimdiki parola
+settings.security.password.choose=Yeni parola
+settings.security.password.confirm=Yeni parolayı onaylayın
+settings.security.password.changed=Parolanız başarıyla değişti.
 
 # Settings Notifications
 settings.notifications.title=Bildirimler
diff --git a/src/main/resources/strings/BriarDesktop_zh_CN.properties b/src/main/resources/strings/BriarDesktop_zh_CN.properties
index 3ac3a94a8b5877d281c67f4cb0f19b1208081c4e..5df5d55745b80f8d85daa798db2b47cb9d05d038 100644
--- a/src/main/resources/strings/BriarDesktop_zh_CN.properties
+++ b/src/main/resources/strings/BriarDesktop_zh_CN.properties
@@ -3,9 +3,10 @@ access.attachment_add=添加附件
 access.attachment_remove=删除附件
 access.contacts.add=添加联系人
 access.contact.menu=显示联系人菜单
-access.contacts.dropdown.connections.expand=展开连接菜单
-access.contacts.dropdown.contacts.expand=展开联系人菜单
+access.contacts.dropdown.connections.expand=Expand connection menu
+access.contacts.dropdown.contacts.expand=Expand contact menu
 access.contacts.search=联系人搜索的图标
+access.contacts.pending.remove=删除待处理联系人
 access.introduction.back.contact=返回向导过程的联系人屏幕
 access.introduction.close=关闭向导屏幕
 access.message.jump_to_unread=跳到下一条未读消息
@@ -14,6 +15,8 @@ access.message.sent=消息已发送
 access.logo=Briar 徽标
 access.swap=显示两个联系人之间错误的图标
 access.about_briar_desktop=关于 Briar Desktop
+access.password.show=显示密码
+access.password.hide=隐藏密码
 
 # Contacts
 contacts.none_selected.title=没有联系人被选中
@@ -33,6 +36,8 @@ contacts.dropdown.delete.all=删除全部消息
 contacts.dropdown.disappearing=让消息自动消失 
 contacts.dropdown.introduction=做介绍
 contacts.search.title=联系人
+contacts.pending.remove.dialog.title=确认移除
+contacts.pending.remove.dialog.message=这个联系人还在添加中。如果您现在移除，则此联系人不会被添加。
 
 # Conversation
 conversation.message.unread=未读消息
@@ -47,8 +52,12 @@ conversation.delete.failed.dialog.message.ongoing_invitations=与正在进行的
 conversation.delete.failed.dialog.message.not_all_selected_both=如要删除邀请或介绍，您需要选择该请求和回应。
 conversation.delete.failed.dialog.message.not_all_selected_introductions=如要删除介绍，您需要选择该请求和回应。
 conversation.delete.failed.dialog.message.not_all_selected_invitations=如要删除邀请，您需要选择该请求和回应。
+conversation.add.contact.dialog.title=添加远处的联系人
+conversation.add.contact.dialog.contact_link=联系人的链接
 conversation.delete.contact.dialog.title=确认删除联系人
 conversation.delete.contact.dialog.message=确认要删除该联系人和与之交流的所有消息吗？
+conversation.change.alias.dialog.title=更改联系人姓名
+conversation.change.alias.dialog.description=请输入此联系人的新名称（仅对你可见）：
 
 # Private Groups
 groups.card.created=由 {0} 创建
@@ -70,16 +79,31 @@ introduction.response.declined.auto=向 {0} 的介绍被自动拒绝了
 introduction.response.accepted.received={0} 已接受和 {1} 建立联系
 introduction.response.declined.received={0} 已拒绝和 {1} 建立联系
 introduction.response.declined.received_by_introducee={0} 表示 {1} 谢绝了介绍
-introduction.error.own_link=输入联系人的链接，不要输入自己的
-introduction.error.remote_invalid=远程握手链接无效
-introduction.error.alias_invalid=别名无效
-introduction.error.link_invalid=链接无效：{0}
-introduction.error.public_key_invalid=公钥无效：{0}
-introduction.error.adding_failed=添加联系人失败
-introduction.error.contact_already_exists=您已经有此链接的联系人：{0}
-introduction.error.pending_contact_already_exists=您已经有此链接的待处理联系人：{0}
-introduction.error.duplicate_contact_explainer=如 {0} 和 {1} 不是同一人请小心。\n\n其中的一个可能在试图找出谁是你的联系人。\n\n不要告诉他们你从别人那里收到了相同的链接。
 
+# Add Contact Remotely
+contact.add.title_dialog=添加联系人
+contact.add.remote.title=添加远处的联系人
+contact.add.remote.your_link=将此链接发送给您希望添加的联系人
+contact.add.remote.copy_tooltip=复制
+contact.add.remote.contact_link=在此输入您联系人的链接
+contact.add.remote.contact_link_hint=联系人链接
+contact.add.remote.paste_tooltip=粘贴
+contact.add.remote.nickname_intro=为联系人添加一个昵称。仅您可见。
+contact.add.remote.choose_nickname=输入昵称
+contact.add.remote.link_copied_snackbar=已复制 Briar 链接到剪贴板
+contact.add.remote.link_pasted_snackbar=粘贴自剪贴板
+contact.add.remote.paste_error_snackbar=你的剪贴板是空的
+contact.add.remote.outgoing_arrow=离去箭头
+contact.add.remote.incoming_arrow=进入箭头
+contact.add.error.own_link=输入联系人的链接，不要输入自己的
+contact.add.error.remote_invalid=远程握手链接无效
+contact.add.error.alias_invalid=别名无效
+contact.add.error.link_invalid=链接无效：{0}
+contact.add.error.public_key_invalid=公钥无效：{0}
+contact.add.error.adding_failed=添加联系人失败
+contact.add.error.contact_already_exists=您已经有此链接的联系人：{0}
+contact.add.error.pending_contact_already_exists=您已经有此链接的待处理联系人：{0}
+contact.add.error.duplicate_contact_explainer=如 {0} 和 {1} 不是同一人请小心。\n\n其中的一个可能在试图找出谁是你的联系人。\n\n不要告诉他们你从别人那里收到了相同的链接。
 
 # Private Group Sharing
 group.invitation.received={0} 已邀请你加入群组 ”{1}”
@@ -126,6 +150,7 @@ welcome.text=您还没有任何联系人！点击 ”+“ 图标添加一个。
 about.copyright=版权
 about.license=许可证
 about.version=版本
+about.version.core=核心版本
 about.contact=联系人
 about.website=网站
 
@@ -134,6 +159,8 @@ cancel=取消
 delete=删除
 ok=确定
 accept=接受
+add=添加
+change=更改
 decline=谢绝
 back=返回
 next=下一步
@@ -142,6 +169,13 @@ sorry=抱歉
 error=错误
 warning=警告
 unsupported_feature=很不幸，Briar 桌面版尚不支持此功能
+remove=删除
+
+# Compose text edit actions
+copy=复制
+cut=剪切
+paste=粘贴
+select_all=全选
 
 # Startup screen
 startup.title.registration=欢迎来到 Briar
@@ -169,10 +203,10 @@ startup.failed.db_error=Briar 无法打开包含你的账户、联系人和信
 startup.failed.data_too_old_error=你的帐户是用旧版本的应用程序创建的，不能用这个版本打开。\n\n你必须重新安装旧版本，或者在密码提示时选择“我忘记了密码”，建立一个新帐户。
 startup.failed.data_too_new_error=您的帐户是用这个应用程序的较新版本创建的，不能用这个版本打开。\n\n请升级到最新版本，然后重试。
 startup.failed.service_error=Briar 无法启动必需的组件。\n\n请升级到最新版并重新尝试。
-startup.database.creating=创建账户...
-startup.database.opening=正在解密数据库…
-startup.database.migrating=正在升级数据库…
-startup.database.compacting=正在压缩数据库…
+startup.database.creating=Creating Account…
+startup.database.opening=正在解密数据库……
+startup.database.migrating=正在更新数据库……
+startup.database.compacting=正在压缩数据库……
 expiration.banner.part1.zero=这是 Briar 的测试版，将于今天过期。
 expiration.banner.part1.nozero={0, plural, other {这是 Briar 的测试版，将于 {0} 天内过期}}
 expiration.banner.part2=请及时更新到新版本。
@@ -185,13 +219,25 @@ settings.general.title=常规
 
 # Settings Display
 settings.display.title=显示
+# todo: to be removed
 settings.display.theme=深色主题
+settings.display.theme.title=主题
+settings.display.theme.auto=系统默认
+settings.display.theme.dark=深色
+settings.display.theme.light=浅色
+settings.display.language.title=语言
+settings.display.language.auto=系统默认
 
 # Settings Connections
 settings.connections.title=连接
 
 # Settings Security
 settings.security.title=安全
+settings.security.password.change=更改密码
+settings.security.password.current=当前密码
+settings.security.password.choose=新密码
+settings.security.password.confirm=确认新密码
+settings.security.password.changed=密码已更改。
 
 # Settings Notifications
 settings.notifications.title=消息通知