diff --git a/Ring/Ring/Resources/ace.lproj/Localizable.strings b/Ring/Ring/Resources/ace.lproj/Localizable.strings
index 358f26246d28f15f77d3b481b3b12db7f757c0d3..6d0c96a6b61b198bddf2e64da90b90643b084df4 100644
--- a/Ring/Ring/Resources/ace.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ace.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "توڠڬوڠ ڤد ماس اين تله مڠمبيل موقعيت توڠڬوڠ ";
-"conversation.explanationReceivingLocationFrom" = "توڠڬوڠ دڤرچايا?? ي موقع يڠ دڤرچايا?? ي";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "دالم ڤردان منتري";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "ڤڠاجرن";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "تيدق اد ڤڠاجرن";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "مڠڬوناكن Jami";
-"createAccount.lookingForUsernameAvailability" = "اونتوق ممڤوڽاءي ڤرلو...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "نام ڤڠڬونا يڠ دڤرچايا?? ي";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "ڤڠاجين";
 "createAccount.UsernameNotRegisteredTitle" = "خطأ شبكه";
 "createAccount.UsernameNotRegisteredMessage" = "ايكون دتولق نامو ڤڠڬونا تيدق دتولق";
 "createAccount.timeoutTitle" = "ايكون دڤرچايا?? ي";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "مڠمبيل";
 "actions.backAction" = "ڤرنه";
 "actions.doneAction" = "ڤرنه";
-"alerts.incomingCallAllertTitle" = "كاوسن يڠ دتاهن دري ";
-"alerts.incomingCallButtonIgnore" = "تيدق ممڤوڽاءي";
-"actions.startAudioCall" = "ڤڠاجين اوندڠ";
-"actions.startVideoCall" = "ڤڠاجين ڤيديو";
 "actions.goToSettings" = "برتڠه دالم سيٽنگ";
 "actions.stopLocationSharing" = "ڤرنه مڠمبيل";
 
 // Calls
-"calls.incomingCallInfo" = "بلياو برتوجو";
 "calls.ringing" = "...تڠه...";
 "calls.connecting" = "ارتباط...";
 "calls.callFinished" = "ڤڠاجين تله دڤرچايا?? ي";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "ڤرودوک";
 "accountPage.settingsHeader" = "سيٽنگون";
 "accountPage.notificationsHeader" = "ڤمبلاجر";
-"accountPage.usernameNotRegistered" = "نام ڤڠڬونا: تيدق دڤرجواڠن";
-"accountPage.credentialsHeader" = "ڤرچاي ڤڠاجين";
 "accountPage.blockedContacts" = "ڤڠاجين يڠ دڤرچايا?? ي";
 "accountPage.unblockContact" = "ڤڠاجرن";
 "accountPage.proxyAddressAlert" = "ممبريكن ڤرودوكسي";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "ڤڠاجين";
 "account.statusUnknown" = "نامعلوم";
 "account.statusConnectionerror" = "خطأ ڤربواتن";
-"account.needMigration" = "حساب ڤرلو دڤرچايا?? ي";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "من";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "ڤڠاجين يڠ دڤرچايا?? ي";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "ڤڠاجين يڠ برمولا";
 "generatedMessage.missedOutgoingCall" = "ڤڠاجرن يڠ تله دڤرچايا?? ي";
 "generatedMessage.missedIncomingCall" = "ڤڠاجرن يڠ دڤرچايا?? ي";
 "generatedMessage.liveLocationSharing" = "ڤڠاجين لوكاسي";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "ڤڠاجرن";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ar.lproj/Localizable.strings b/Ring/Ring/Resources/ar.lproj/Localizable.strings
index 3fb310e052c49556a08d0c0f3a9dcd784590d990..3d88997bb7a4982072001dbf1d71999d9a29229f 100644
--- a/Ring/Ring/Resources/ar.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "إضافة إلى جهات الإتصال؟";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "أنت تشارك موقعك حاليًا مع";
-"conversation.explanationReceivingLocationFrom" = "أنت تتلقى حاليًا موقعًا مباشرًا من";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "في جواب";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "أنت";
 "conversation.edited" = "تحرير";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "لم تــرد أي دعوة";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "انضموا إلى جامي";
-"createAccount.lookingForUsernameAvailability" = "تبحث عن إمكانية الوصول...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "هذا الاسم غير متوفر";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "في طور إضافة حساب";
 "createAccount.UsernameNotRegisteredTitle" = "خطأ في الشبكة";
 "createAccount.UsernameNotRegisteredMessage" = "تم إنشاء حساب ولكن لم يتم تسجيل اسم المستخدم";
 "createAccount.timeoutTitle" = "حساب تم إنشاؤه";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "إحذف";
 "actions.backAction" = "السابق";
 "actions.doneAction" = "منجز";
-"alerts.incomingCallAllertTitle" = "مكالمة قادمة من";
-"alerts.incomingCallButtonIgnore" = "تجاهل";
-"actions.startAudioCall" = "مكالمة صوتية";
-"actions.startVideoCall" = "مكالمة فيديو";
 "actions.goToSettings" = "إذهب إلى الإعدادات";
 "actions.stopLocationSharing" = "إيقاف مشاركة";
 
 // Calls
-"calls.incomingCallInfo" = "يريد التحدث معك";
 "calls.ringing" = "... يرن";
 "calls.connecting" = "اتصال جاري...";
 "calls.callFinished" = "المكالمة انتهت";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "الأجهزة";
 "accountPage.settingsHeader" = "إعدادات";
 "accountPage.notificationsHeader" = "الإشعارات";
-"accountPage.usernameNotRegistered" = "اسم المستخدم: غير مسجل";
-"accountPage.credentialsHeader" = "تفاصيل الحساب";
 "accountPage.blockedContacts" = "جهات إتصال محظورة";
 "accountPage.unblockContact" = "إزالة حظر";
 "accountPage.proxyAddressAlert" = "إعطاء عنوان النظام الأساسي";
@@ -387,7 +375,7 @@
 "accountPage.accountIdentity" = "Account identity";
 "accountPage.bootstrap" = "تشغيل ذاتي";
 "accountPage.dhtConfiguration" = "تهيئة OpenDHT";
-"accountPage.nameServer" = "Name server";
+"accountPage.nameServer" = "اسم خادم";
 
 // Backup Account
 "backupAccount.explanation" = "This Jami account exists only on this device. The account will be lost if this device is lost or if the application is uninstalled. It is recommended to make a backup of this account.";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "يتم الإتصال";
 "account.statusUnknown" = "مجهول";
 "account.statusConnectionerror" = "خطأ الاتصال";
-"account.needMigration" = "الحساب يجب الهجرة";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "شخصي";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "تم تلقي دعوة";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "مكالمة خارجة";
 "generatedMessage.missedOutgoingCall" = "مكالمة خارجة فائتة";
 "generatedMessage.missedIncomingCall" = "مكالمة واردة فائتة";
 "generatedMessage.liveLocationSharing" = "مشاركة الموقع المباشر";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "سبر راي";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
index f7b5c9c4bb053afbcb121d7959bfb42eb9d1d603..e2f865639661c448841c8ba4fb1e5dab552cecb1 100644
--- a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "إضافة إلى جهات الإتصال؟";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "أنت تشارك موقعك حاليًا مع";
-"conversation.explanationReceivingLocationFrom" = "أنت تتلقى حاليًا موقعًا مباشرًا من";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "في جواب";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "أنت";
 "conversation.edited" = "تحرير";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "لم تــرد أي دعوة";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "انضموا إلى جامي";
-"createAccount.lookingForUsernameAvailability" = "تبحث عن إمكانية الوصول...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "هذا الاسم غير متوفر";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "في طور إضافة حساب";
 "createAccount.UsernameNotRegisteredTitle" = "خطأ في الشبكة";
 "createAccount.UsernameNotRegisteredMessage" = "تم إنشاء حساب ولكن لم يتم تسجيل اسم المستخدم";
 "createAccount.timeoutTitle" = "حساب تم إنشاؤه";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "حذف";
 "actions.backAction" = "السابق";
 "actions.doneAction" = "منجز";
-"alerts.incomingCallAllertTitle" = "مكالمة قادمة من";
-"alerts.incomingCallButtonIgnore" = "تجاهل";
-"actions.startAudioCall" = "مكالمة صوتية";
-"actions.startVideoCall" = "مكالمة فيديو";
 "actions.goToSettings" = "إذهب إلى الإعدادات";
 "actions.stopLocationSharing" = "إيقاف المشاركة";
 
 // Calls
-"calls.incomingCallInfo" = "يريد التحدث معك";
 "calls.ringing" = "... يرن";
 "calls.connecting" = "اتصال جاري...";
 "calls.callFinished" = "المكالمة انتهت";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "الأجهزة";
 "accountPage.settingsHeader" = "الإعدادات";
 "accountPage.notificationsHeader" = "الإشعارات";
-"accountPage.usernameNotRegistered" = "اسم المستخدم: غير مسجل";
-"accountPage.credentialsHeader" = "تفاصيل الحساب";
 "accountPage.blockedContacts" = "جهات إتصال محظورة";
 "accountPage.unblockContact" = "إزالة حظر";
 "accountPage.proxyAddressAlert" = "إعطاء عنوان النظام الأساسي";
@@ -387,7 +375,7 @@
 "accountPage.accountIdentity" = "Account identity";
 "accountPage.bootstrap" = "تشغيل ذاتي";
 "accountPage.dhtConfiguration" = "تهيئة OpenDHT";
-"accountPage.nameServer" = "Name server";
+"accountPage.nameServer" = "اسم خادم";
 
 // Backup Account
 "backupAccount.explanation" = "This Jami account exists only on this device. The account will be lost if this device is lost or if the application is uninstalled. It is recommended to make a backup of this account.";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "يتم الإتصال";
 "account.statusUnknown" = "مجهول";
 "account.statusConnectionerror" = "خطأ الاتصال";
-"account.needMigration" = "الحساب يجب الهجرة";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "شخصي";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "تم تلقي دعوة";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "مكالمة صادرة";
 "generatedMessage.missedOutgoingCall" = "مكالمة صادرة فائتة";
 "generatedMessage.missedIncomingCall" = "مكالمة واردة فائتة";
 "generatedMessage.liveLocationSharing" = "مشاركة الموقع المباشر";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "سبر راي";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
index d3b72dfc6ad363ee1ce378f005a95f1aa86da53f..ef2659c67fc99ca6c5df00eb9f6b52ffbe91b27e 100644
--- a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "¿A añadir a los contactos?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "En casu de que nun se pueda identificar la so situación,";
-"conversation.explanationReceivingLocationFrom" = "Nun ye posible que la xente que la conoz reciba un llugar en directo de ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "En respuesta a";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "El so padre.";
 "conversation.edited" = "Ediciones";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Nun hai invitaciones.";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Uníu a Jami";
-"createAccount.lookingForUsernameAvailability" = "Buscando disponibilidá...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Nómase usuariu ya adoptáu";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Contá adicional";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "Creóse una cuenta pero nun se rexistró'l nome d'usuariu";
 "createAccount.timeoutTitle" = "Creáu cuenta";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Esborrar";
 "actions.backAction" = "El so fíu, el so fíu,";
 "actions.doneAction" = "Fináu";
-"alerts.incomingCallAllertTitle" = "Llamada de ";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "La llamada d'únicu soníu";
-"actions.startVideoCall" = "La llamada de video";
 "actions.goToSettings" = "Asegúrese de les configuraciones";
 "actions.stopLocationSharing" = "Pa evitar la compartición";
 
 // Calls
-"calls.incomingCallInfo" = "Quiere falar contigo.";
 "calls.ringing" = "El soníu...";
 "calls.connecting" = "La conexión...";
 "calls.callFinished" = "La llamada terminada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configuración";
 "accountPage.notificationsHeader" = "Notificaciones";
-"accountPage.usernameNotRegistered" = "Nome d'usuariu: non rexistráu";
-"accountPage.credentialsHeader" = "Detalles de la cuenta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Envíe direutamente la dirección de proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conexión";
 "account.statusUnknown" = "Nun se sabe";
 "account.statusConnectionerror" = "Error de conexión";
-"account.needMigration" = "La cuenta tien de ser migrao.";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Yo tamién.";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "La invitación recibida";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "L'escursión de salida";
 "generatedMessage.missedOutgoingCall" = "La llamada saliente perdida";
 "generatedMessage.missedIncomingCall" = "La llamada entrante perdida";
 "generatedMessage.liveLocationSharing" = "Compartir la localización en directo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "La respuesta";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/az.lproj/Localizable.strings b/Ring/Ring/Resources/az.lproj/Localizable.strings
index f4c7de19f9fc3dae1262f37f92cd990db0062264..50f9d26932090e56c58f4bb517b9d12ee05b03e5 100644
--- a/Ring/Ring/Resources/az.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "تماس لری آرتیرماق؟";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "حال بو حالدا یئرینی ایشله ییبسان.";
-"conversation.explanationReceivingLocationFrom" = "ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "جاوابدا";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "سن";
 "conversation.edited" = "ترمیم";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "دعوتلر یوخدور";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "جمیه یه قوشول";
-"createAccount.lookingForUsernameAvailability" = "دريافتي ميخواهيم...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "آدی آلمیش";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "حساب قوشولما";
 "createAccount.UsernameNotRegisteredTitle" = "شبکه خطای";
 "createAccount.UsernameNotRegisteredMessage" = "حساب یارادیلمیش، آمما ایستیفاده چی آدینی ثبت ائتمه میش";
 "createAccount.timeoutTitle" = "حساب یارادیلدی";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "حذف";
 "actions.backAction" = "گئری دؤن";
 "actions.doneAction" = "یئرلشدی";
-"alerts.incomingCallAllertTitle" = "گلیرکن زنگین";
-"alerts.incomingCallButtonIgnore" = "ردّ";
-"actions.startAudioCall" = "صداي زنگ";
-"actions.startVideoCall" = "ویدئو تماس";
 "actions.goToSettings" = "\" تنظیمات \" یه گئدیب";
 "actions.stopLocationSharing" = "اشتراکلاشماغی بوراخ";
 
 // Calls
-"calls.incomingCallInfo" = "ایسته ییر سنله دانیشیق";
 "calls.ringing" = "زنگ میزنه";
 "calls.connecting" = "باغلا...";
 "calls.callFinished" = "تماس تمام شد";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "آلاتلار";
 "accountPage.settingsHeader" = "تنظیمات";
 "accountPage.notificationsHeader" = "اطلاعیه لر";
-"accountPage.usernameNotRegistered" = "آدی: ثبت اولونماييب";
-"accountPage.credentialsHeader" = "حساب بیلگیلری";
 "accountPage.blockedContacts" = "قفل اولونموش تماسلار";
 "accountPage.unblockContact" = "قفلین آچماق";
 "accountPage.proxyAddressAlert" = "پروکسی آدرسونو دن";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "باغلاشما";
 "account.statusUnknown" = "نامعلوم";
 "account.statusConnectionerror" = "اتصال خطيي";
-"account.needMigration" = "حسابي يئرلشديرمه يه لازيمدير";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "منیم";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "دعوت آلدی";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "گئدن چاغ";
 "generatedMessage.missedOutgoingCall" = "گئدن زنگینلیک";
 "generatedMessage.missedIncomingCall" = "گئچن چاغداش چاغداشلار";
 "generatedMessage.liveLocationSharing" = "یاشاییش یئرلری اشتراکلاشماسی";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "ردعمل";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
index 390cfe2f30856440dfd60059014a65baf1745aca..e47576277d2ffd25f97d6465614eaf6fe92021cf 100644
--- a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "تماس لری آرتیرماق؟";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "حال بو حالدا یئرینی ایشله ییبسان.";
-"conversation.explanationReceivingLocationFrom" = "ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی کیمی ایندی";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "جاوابدا";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "سن";
 "conversation.edited" = "ترمیم";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "دعوتلر یوخدور";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "جمیه یه قوشول";
-"createAccount.lookingForUsernameAvailability" = "دريافتي ميخواهيم...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "آدی آلمیش";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "حساب قوشولما";
 "createAccount.UsernameNotRegisteredTitle" = "شبکه خطای";
 "createAccount.UsernameNotRegisteredMessage" = "حساب یارادیلمیش، آمما ایستیفاده چی آدینی ثبت ائتمه میش";
 "createAccount.timeoutTitle" = "حساب یارادیلدی";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "حذف";
 "actions.backAction" = "گئری دؤن";
 "actions.doneAction" = "یئرلشدی";
-"alerts.incomingCallAllertTitle" = "گلیرکن زنگین";
-"alerts.incomingCallButtonIgnore" = "ردّ";
-"actions.startAudioCall" = "صداي زنگ";
-"actions.startVideoCall" = "ویدئو تماس";
 "actions.goToSettings" = "\" تنظیمات \" یه گئدیب";
 "actions.stopLocationSharing" = "اشتراکلاشماغی بوراخ";
 
 // Calls
-"calls.incomingCallInfo" = "ایسته ییر سنله دانیشیق";
 "calls.ringing" = "زنگ میزنه";
 "calls.connecting" = "باغلا...";
 "calls.callFinished" = "تماس تمام شد";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "آلاتلار";
 "accountPage.settingsHeader" = "تنظیمات";
 "accountPage.notificationsHeader" = "اطلاعیه لر";
-"accountPage.usernameNotRegistered" = "آدی: ثبت اولونماييب";
-"accountPage.credentialsHeader" = "حساب بیلگیلری";
 "accountPage.blockedContacts" = "قفل اولونموش تماسلار";
 "accountPage.unblockContact" = "قفلین آچماق";
 "accountPage.proxyAddressAlert" = "پروکسی آدرسونو دن";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "باغلاشما";
 "account.statusUnknown" = "نامعلوم";
 "account.statusConnectionerror" = "اتصال خطيي";
-"account.needMigration" = "حسابي يئرلشديرمه يه لازيمدير";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "منیم";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "دعوت آلدی";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "گئدن چاغ";
 "generatedMessage.missedOutgoingCall" = "گئدن زنگینلیک";
 "generatedMessage.missedIncomingCall" = "گئچن چاغداش چاغداشلار";
 "generatedMessage.liveLocationSharing" = "یاشاییش یئرلری اشتراکلاشماسی";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "ردعمل";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/be.lproj/Localizable.strings b/Ring/Ring/Resources/be.lproj/Localizable.strings
index 5d01b3a154217d921f88d3f293ef885aa20e49ce..a313ccf5ad56b000bfd1c56a098bceafc2221769 100644
--- a/Ring/Ring/Resources/be.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Вы ў цяперашні час дзяліцеся сваім месцам з ";
-"conversation.explanationReceivingLocationFrom" = "Вы ў цяперашні час атрымліваеце жывое месца з ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "У адказ на";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "Рэдагаваны";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ніякіх запрашэнняў";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Далучайцеся да Jami";
-"createAccount.lookingForUsernameAvailability" = "шукаючы даступнасць...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Ужо прыняты імя карыстальніка";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Дададзены рахунак";
 "createAccount.UsernameNotRegisteredTitle" = "Памылка сеткі";
 "createAccount.UsernameNotRegisteredMessage" = "Уліковы запіс быў створаны, але імя карыстальніка не было зарэгістравана";
 "createAccount.timeoutTitle" = "Створаны ўліковы запіс";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Знішчыць";
 "actions.backAction" = "Звярніцеся назад";
 "actions.doneAction" = "Скончаная";
-"alerts.incomingCallAllertTitle" = "Паступае званка ад ";
-"alerts.incomingCallButtonIgnore" = "Ігнаруем";
-"actions.startAudioCall" = "Аўдыёвы званок";
-"actions.startVideoCall" = "Відэазварот";
 "actions.goToSettings" = "Перайсці да Налады";
 "actions.stopLocationSharing" = "Спыніце дзяліцца";
 
 // Calls
-"calls.incomingCallInfo" = "хоча пагаварыць з вамі";
 "calls.ringing" = "Званочак...";
 "calls.connecting" = "Злучэнне...";
 "calls.callFinished" = "Званкі скончаны";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Прылады";
 "accountPage.settingsHeader" = "Налады";
 "accountPage.notificationsHeader" = "Паведамленні";
-"accountPage.usernameNotRegistered" = "імя карыстальніка: не зарэгістраваны";
-"accountPage.credentialsHeader" = "Падрабязнасць рахунку";
 "accountPage.blockedContacts" = "Блокаваныя кантакты";
 "accountPage.unblockContact" = "Адключыць блок";
 "accountPage.proxyAddressAlert" = "Уключыце адрас праксі";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Злучэнне";
 "account.statusUnknown" = "Невядома";
 "account.statusConnectionerror" = "Памылка падлучэння";
-"account.needMigration" = "рахунак трэба перавесці";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Я";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Атрыманая запрашэнне";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Выходны званок";
 "generatedMessage.missedOutgoingCall" = "Адпусцілі выхадны званок";
 "generatedMessage.missedIncomingCall" = "Адпусцілі ўступаючы званок";
 "generatedMessage.liveLocationSharing" = "Ужыванне месцазнаходжання";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Адказ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
index 5d01b3a154217d921f88d3f293ef885aa20e49ce..a313ccf5ad56b000bfd1c56a098bceafc2221769 100644
--- a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Вы ў цяперашні час дзяліцеся сваім месцам з ";
-"conversation.explanationReceivingLocationFrom" = "Вы ў цяперашні час атрымліваеце жывое месца з ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "У адказ на";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "Рэдагаваны";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ніякіх запрашэнняў";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Далучайцеся да Jami";
-"createAccount.lookingForUsernameAvailability" = "шукаючы даступнасць...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Ужо прыняты імя карыстальніка";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Дададзены рахунак";
 "createAccount.UsernameNotRegisteredTitle" = "Памылка сеткі";
 "createAccount.UsernameNotRegisteredMessage" = "Уліковы запіс быў створаны, але імя карыстальніка не было зарэгістравана";
 "createAccount.timeoutTitle" = "Створаны ўліковы запіс";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Знішчыць";
 "actions.backAction" = "Звярніцеся назад";
 "actions.doneAction" = "Скончаная";
-"alerts.incomingCallAllertTitle" = "Паступае званка ад ";
-"alerts.incomingCallButtonIgnore" = "Ігнаруем";
-"actions.startAudioCall" = "Аўдыёвы званок";
-"actions.startVideoCall" = "Відэазварот";
 "actions.goToSettings" = "Перайсці да Налады";
 "actions.stopLocationSharing" = "Спыніце дзяліцца";
 
 // Calls
-"calls.incomingCallInfo" = "хоча пагаварыць з вамі";
 "calls.ringing" = "Званочак...";
 "calls.connecting" = "Злучэнне...";
 "calls.callFinished" = "Званкі скончаны";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Прылады";
 "accountPage.settingsHeader" = "Налады";
 "accountPage.notificationsHeader" = "Паведамленні";
-"accountPage.usernameNotRegistered" = "імя карыстальніка: не зарэгістраваны";
-"accountPage.credentialsHeader" = "Падрабязнасць рахунку";
 "accountPage.blockedContacts" = "Блокаваныя кантакты";
 "accountPage.unblockContact" = "Адключыць блок";
 "accountPage.proxyAddressAlert" = "Уключыце адрас праксі";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Злучэнне";
 "account.statusUnknown" = "Невядома";
 "account.statusConnectionerror" = "Памылка падлучэння";
-"account.needMigration" = "рахунак трэба перавесці";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Я";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Атрыманая запрашэнне";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Выходны званок";
 "generatedMessage.missedOutgoingCall" = "Адпусцілі выхадны званок";
 "generatedMessage.missedIncomingCall" = "Адпусцілі ўступаючы званок";
 "generatedMessage.liveLocationSharing" = "Ужыванне месцазнаходжання";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Адказ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/bg.lproj/Localizable.strings b/Ring/Ring/Resources/bg.lproj/Localizable.strings
index 366bcb26da496ee8b2ca0db1e8a9837ea615d022..baa66e69074a7cdcf0b33b307d3d8dd02de88e68 100644
--- a/Ring/Ring/Resources/bg.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Добавяне към контактите?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "В момента споделяте местоположението си с ";
-"conversation.explanationReceivingLocationFrom" = "В момента получавате живо местоположение от ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "В отговор на";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ти си...";
 "conversation.edited" = "Издадено";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Няма покани.";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Присъединете се към Джами.";
-"createAccount.lookingForUsernameAvailability" = "проверяване дали е свободно…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "потребителското име вече е заето";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Добавяне на профил";
 "createAccount.UsernameNotRegisteredTitle" = "Мрежова грешка";
 "createAccount.UsernameNotRegisteredMessage" = "Профилът бе създаден, но потребителското име не бе регистрирано";
 "createAccount.timeoutTitle" = "Профилът е създаден";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Изтриване";
 "actions.backAction" = "Назад";
 "actions.doneAction" = "Готово";
-"alerts.incomingCallAllertTitle" = "Пристъпващ обаждане от ";
-"alerts.incomingCallButtonIgnore" = "Игнориране";
-"actions.startAudioCall" = "Аудио обаждане";
-"actions.startVideoCall" = "Видео обаждане";
 "actions.goToSettings" = "Отидете в Настройки";
 "actions.stopLocationSharing" = "Спрете да споделяте";
 
 // Calls
-"calls.incomingCallInfo" = "Иска да говори с теб.";
 "calls.ringing" = "Звъня...";
 "calls.connecting" = "Свързваме...";
 "calls.callFinished" = "Обаждането приключи.";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Устройства";
 "accountPage.settingsHeader" = "Настройки";
 "accountPage.notificationsHeader" = "Известия";
-"accountPage.usernameNotRegistered" = "потребителско име: не е регистрирано";
-"accountPage.credentialsHeader" = "Подробности за профила";
 "accountPage.blockedContacts" = "Блокирани контакти";
 "accountPage.unblockContact" = "Отблокиране";
 "accountPage.proxyAddressAlert" = "Посочете адрес на прокси";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Свързване";
 "account.statusUnknown" = "Неизвестно";
 "account.statusConnectionerror" = "Изключение грешка";
-"account.needMigration" = "трябва да се мигрира сметката";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Аз";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Поканата е приета";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Изходящо обаждане";
 "generatedMessage.missedOutgoingCall" = "Пропуснато изходящо обаждане";
 "generatedMessage.missedIncomingCall" = "Пропуснато входящо обаждане";
 "generatedMessage.liveLocationSharing" = "Съвместно разпределение на местоположения";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Обратна връзка";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
index 366bcb26da496ee8b2ca0db1e8a9837ea615d022..baa66e69074a7cdcf0b33b307d3d8dd02de88e68 100644
--- a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Добавяне към контактите?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "В момента споделяте местоположението си с ";
-"conversation.explanationReceivingLocationFrom" = "В момента получавате живо местоположение от ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "В отговор на";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ти си...";
 "conversation.edited" = "Издадено";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Няма покани.";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Присъединете се към Джами.";
-"createAccount.lookingForUsernameAvailability" = "проверяване дали е свободно…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "потребителското име вече е заето";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Добавяне на профил";
 "createAccount.UsernameNotRegisteredTitle" = "Мрежова грешка";
 "createAccount.UsernameNotRegisteredMessage" = "Профилът бе създаден, но потребителското име не бе регистрирано";
 "createAccount.timeoutTitle" = "Профилът е създаден";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Изтриване";
 "actions.backAction" = "Назад";
 "actions.doneAction" = "Готово";
-"alerts.incomingCallAllertTitle" = "Пристъпващ обаждане от ";
-"alerts.incomingCallButtonIgnore" = "Игнориране";
-"actions.startAudioCall" = "Аудио обаждане";
-"actions.startVideoCall" = "Видео обаждане";
 "actions.goToSettings" = "Отидете в Настройки";
 "actions.stopLocationSharing" = "Спрете да споделяте";
 
 // Calls
-"calls.incomingCallInfo" = "Иска да говори с теб.";
 "calls.ringing" = "Звъня...";
 "calls.connecting" = "Свързваме...";
 "calls.callFinished" = "Обаждането приключи.";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Устройства";
 "accountPage.settingsHeader" = "Настройки";
 "accountPage.notificationsHeader" = "Известия";
-"accountPage.usernameNotRegistered" = "потребителско име: не е регистрирано";
-"accountPage.credentialsHeader" = "Подробности за профила";
 "accountPage.blockedContacts" = "Блокирани контакти";
 "accountPage.unblockContact" = "Отблокиране";
 "accountPage.proxyAddressAlert" = "Посочете адрес на прокси";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Свързване";
 "account.statusUnknown" = "Неизвестно";
 "account.statusConnectionerror" = "Изключение грешка";
-"account.needMigration" = "трябва да се мигрира сметката";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Аз";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Поканата е приета";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Изходящо обаждане";
 "generatedMessage.missedOutgoingCall" = "Пропуснато изходящо обаждане";
 "generatedMessage.missedIncomingCall" = "Пропуснато входящо обаждане";
 "generatedMessage.liveLocationSharing" = "Съвместно разпределение на местоположения";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Обратна връзка";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/bn.lproj/Localizable.strings b/Ring/Ring/Resources/bn.lproj/Localizable.strings
index e82b2b61de3230816bb3dc2b1ad5b58faf2f014c..49c47f3f34a8f4ed3b69aaf43d3ac27d69bdc04b 100644
--- a/Ring/Ring/Resources/bn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bn.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "পরিচিতি যোগ করা?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "আপনি বর্তমানে আপনার অবস্থান শেয়ার করছেন ";
-"conversation.explanationReceivingLocationFrom" = "আপনি বর্তমানে একটি লাইভ অবস্থান থেকে প্রাপ্ত ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "উত্তর";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "তুমি";
 "conversation.edited" = "সম্পাদনা";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "আমন্ত্রণ নেই";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "জামিতে যোগদান করুন";
-"createAccount.lookingForUsernameAvailability" = "উপলব্ধতা খুঁজছেন...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "ব্যবহারকারীর নাম ইতিমধ্যে নেওয়া হয়েছে";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "যোগ করা অ্যাকাউন্ট";
 "createAccount.UsernameNotRegisteredTitle" = "নেটওয়ার্ক ত্রুটি";
 "createAccount.UsernameNotRegisteredMessage" = "অ্যাকাউন্ট তৈরি করা হয়েছে কিন্তু ব্যবহারকারীর নাম নিবন্ধিত হয়নি";
 "createAccount.timeoutTitle" = "অ্যাকাউন্ট তৈরি করা হয়েছে";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "মুছে ফেলুন";
 "actions.backAction" = "ফিরে";
 "actions.doneAction" = "সম্পন্ন";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "উপেক্ষা করা";
-"actions.startAudioCall" = "অডিও কল";
-"actions.startVideoCall" = "ভিডিও কল";
 "actions.goToSettings" = "সেটিংসে যান";
 "actions.stopLocationSharing" = "শেয়ারিং বন্ধ করুন";
 
 // Calls
-"calls.incomingCallInfo" = "তোমার সাথে কথা বলতে চায়";
 "calls.ringing" = "- রিং...";
 "calls.connecting" = "সংযোগ...";
 "calls.callFinished" = "কল শেষ";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "ডিভাইস";
 "accountPage.settingsHeader" = "সেটিং";
 "accountPage.notificationsHeader" = "বিজ্ঞপ্তি";
-"accountPage.usernameNotRegistered" = "ব্যবহারকারীর নামঃ নিবন্ধিত নয়";
-"accountPage.credentialsHeader" = "অ্যাকাউন্টের বিবরণ";
 "accountPage.blockedContacts" = "বন্ধ করা পরিচিতি";
 "accountPage.unblockContact" = "ব্লক খুলে দিন";
 "accountPage.proxyAddressAlert" = "প্রক্সি ঠিকানা প্রদান করুন";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "সংযোগ";
 "account.statusUnknown" = "অজানা";
 "account.statusConnectionerror" = "সংযোগ ত্রুটি";
-"account.needMigration" = "অ্যাকাউন্ট স্থানান্তরিত করা দরকার";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "আমি";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "আমন্ত্রণ প্রাপ্তি";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "প্রস্থান কল";
 "generatedMessage.missedOutgoingCall" = "মিস করা কল";
 "generatedMessage.missedIncomingCall" = "মিস করা ইনকামিং কল";
 "generatedMessage.liveLocationSharing" = "লাইভ অবস্থান ভাগ";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "প্রতিক্রিয়া";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ca.lproj/Localizable.strings b/Ring/Ring/Resources/ca.lproj/Localizable.strings
index eca3b17508cd6687d17d374cc1bf7553e23ac895..f54f05c2a695438dce2a184adad5b7d3e9c00bef 100644
--- a/Ring/Ring/Resources/ca.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ca.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Afegir als contactes?";
 "conversation.notContactLabel" = "no està a la llista de contactes";
 "conversation.messagePlaceholder" = "Escriu a";
-"conversation.explanationSendingLocationTo" = "Actualment estàs compartint la teva ubicació amb ";
-"conversation.explanationReceivingLocationFrom" = "Actualment estàs recebint una ubicació en directe de ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "En resposta a";
-"conversation.repliedTo" = "ha respost a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tu";
 "conversation.edited" = "Edicions";
-"conversation.deletedMessage" = "esborra un missatge";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "No hi ha invitacions";
-"invitations.pending" = "pendent";
-"invitations.accepted" = "acceptat";
-"invitations.declined" = "rebutja";
-"invitations.blocked" = "bloquejat";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitacions rebudes";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unir-se a Jami";
-"createAccount.lookingForUsernameAvailability" = "buscant disponibilitat...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Nombre d'usuari ja pres";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "S'està afegint el compte";
 "createAccount.UsernameNotRegisteredTitle" = "Error de xarxa";
 "createAccount.UsernameNotRegisteredMessage" = "Es va crear un compte però no s'ha registrat el nom d'usuari";
 "createAccount.timeoutTitle" = "Creació d'un compte";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Suprimeix";
 "actions.backAction" = "Enrere";
 "actions.doneAction" = "Fet";
-"alerts.incomingCallAllertTitle" = "L' trucada de ";
-"alerts.incomingCallButtonIgnore" = "Ignora";
-"actions.startAudioCall" = "L'audio";
-"actions.startVideoCall" = "L'anàlisi de vídeo";
 "actions.goToSettings" = "Passa a les configuracions";
 "actions.stopLocationSharing" = "Para de compartir";
 
 // Calls
-"calls.incomingCallInfo" = "Vol parlar amb tu";
 "calls.ringing" = "- El son...";
 "calls.connecting" = "Connectant…";
 "calls.callFinished" = "L' trucada acabada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositius";
 "accountPage.settingsHeader" = "Opcions";
 "accountPage.notificationsHeader" = "Notificacions";
-"accountPage.usernameNotRegistered" = "Nom d'usuari: no està registrat";
-"accountPage.credentialsHeader" = "Detalls de compte";
 "accountPage.blockedContacts" = "Contactes bloquejats";
 "accountPage.unblockContact" = "Desbloqeja";
 "accountPage.proxyAddressAlert" = "Enviar l'adreça proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connectant";
 "account.statusUnknown" = "Desconegut";
 "account.statusConnectionerror" = "Error de connexió";
-"account.needMigration" = "cal migrar el compte";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Jo";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "S'ha rebut una invitació";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Trucada sortint";
 "generatedMessage.missedOutgoingCall" = "Trucada sortint perduda";
 "generatedMessage.missedIncomingCall" = "Trucada entrant perduda";
 "generatedMessage.liveLocationSharing" = "Partage de localització en directe";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Comentaris";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/cmn.lproj/Localizable.strings b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
index 9ec652c2fbcad11b86f7fb8d90c030d288a9a44b..da31579c04bb1ba065963c4dd626cc7b1e57147e 100644
--- a/Ring/Ring/Resources/cmn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "添加至通讯录吗?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "您当前正在分享实时位置到";
-"conversation.explanationReceivingLocationFrom" = "您当前正在接收实时位置,来自";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "沒有邀請";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "加入 Jami";
-"createAccount.lookingForUsernameAvailability" = "正在確認是否可用……";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "使用者名稱已被使用";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "添加账户";
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "刪除";
 "actions.backAction" = "前一個";
 "actions.doneAction" = "完成";
-"alerts.incomingCallAllertTitle" = "來電從";
-"alerts.incomingCallButtonIgnore" = "忽略";
-"actions.startAudioCall" = "语音通话";
-"actions.startVideoCall" = "视频通话";
 "actions.goToSettings" = "前往设置";
 "actions.stopLocationSharing" = "停止分享";
 
 // Calls
-"calls.incomingCallInfo" = "想要与您对话";
 "calls.ringing" = "響鈴中……";
 "calls.connecting" = "正在连接…";
 "calls.callFinished" = "通话已结束";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "裝置";
 "accountPage.settingsHeader" = "設定";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "用户名:未被注册";
-"accountPage.credentialsHeader" = "账户详情";
 "accountPage.blockedContacts" = "已屏蔽的联系人";
 "accountPage.unblockContact" = "取消屏蔽";
 "accountPage.proxyAddressAlert" = "提供代理地址";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "連接中";
 "account.statusUnknown" = "未知";
 "account.statusConnectionerror" = "连接错误";
-"account.needMigration" = "该账户需迁移";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "我";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已接受邀请";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "撥出電話";
 "generatedMessage.missedOutgoingCall" = "未接去電";
 "generatedMessage.missedIncomingCall" = "未接來電";
 "generatedMessage.liveLocationSharing" = "实时位置分享";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "回饋";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
index a14101d8bfca37aece3fd0abf7c364f64bcbbd99..ea7a10593cd3a8cb3d6f5266781d584c9a50c387 100644
--- a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Přidat do kontaktů?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Právě sdílíte svou polohu s ";
-"conversation.explanationReceivingLocationFrom" = "Právě přijímáte aktuální polohu od ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "V odpovědi na";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vy";
 "conversation.edited" = "Upraveno";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Žádná pozvání";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Připojit k Jami";
-"createAccount.lookingForUsernameAvailability" = "Zjišťuje se dostupnost…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Uživatelské jméno již zabráno";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Přidávám účet";
 "createAccount.UsernameNotRegisteredTitle" = "Chyba sítě";
 "createAccount.UsernameNotRegisteredMessage" = "Účet byl vytvořen, ale uživatelské jméno nebylo registrováno.";
 "createAccount.timeoutTitle" = "Účet byl vytvořen.";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Odstranit";
 "actions.backAction" = "Zpět";
 "actions.doneAction" = "Hotovo";
-"alerts.incomingCallAllertTitle" = "Příchozí hovor od";
-"alerts.incomingCallButtonIgnore" = "Přehlížet";
-"actions.startAudioCall" = "Audio hovor";
-"actions.startVideoCall" = "Video hovor";
 "actions.goToSettings" = "Jít to nastavení";
 "actions.stopLocationSharing" = "Přestat sdílet";
 
 // Calls
-"calls.incomingCallInfo" = "chce s vámi mluvit";
 "calls.ringing" = "Vyzvání…";
 "calls.connecting" = "Spojuje se…";
 "calls.callFinished" = "Hovor ukončen";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Zařízení";
 "accountPage.settingsHeader" = "Nastavení";
 "accountPage.notificationsHeader" = "Oznámení";
-"accountPage.usernameNotRegistered" = "uživatelské jméno: neregistrováno";
-"accountPage.credentialsHeader" = "Podrobnosti účtu";
 "accountPage.blockedContacts" = "Blokované kontakty";
 "accountPage.unblockContact" = "Odblokovat";
 "accountPage.proxyAddressAlert" = "Poskytnout adresu proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Spojuje se";
 "account.statusUnknown" = "Neznámé";
 "account.statusConnectionerror" = "Chyba spojení";
-"account.needMigration" = "Tento účet musí být převeden.";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Já";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Pozvání přijato";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Odchozí hovor";
 "generatedMessage.missedOutgoingCall" = "Nepřijatý odchozí hovor";
 "generatedMessage.missedIncomingCall" = "Zmeškaný příchozí hovor";
 "generatedMessage.liveLocationSharing" = "Sdílení aktuální polohy";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Zpětná vazba";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/da.lproj/Localizable.strings b/Ring/Ring/Resources/da.lproj/Localizable.strings
index 86fcf40d34e6373507d4c98bc3e27831eeabe510..2bac62d0db91cd9eb4625b06351c7714e864da78 100644
--- a/Ring/Ring/Resources/da.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/da.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Tilføj til kontakter?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Du deler i øjeblikket din lokation med";
-"conversation.explanationReceivingLocationFrom" = "Du modtager i øjeblikket en live lokation fra";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "I svar på";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "- Du er...";
 "conversation.edited" = "Udfærdiget";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ingen invitationer";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Gå med Jami";
-"createAccount.lookingForUsernameAvailability" = "- Jeg er ude efter tilgængelighed.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "brugernavn er allerede anvendt";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Tilføjer konto";
 "createAccount.UsernameNotRegisteredTitle" = "Netværksfejl";
 "createAccount.UsernameNotRegisteredMessage" = "Kontoen blev oprettet men brugernavnet blev ikke registreret.";
 "createAccount.timeoutTitle" = "Konto Oprettet";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Slet";
 "actions.backAction" = "Tilbage";
 "actions.doneAction" = "Færdig";
-"alerts.incomingCallAllertTitle" = "Indgående opkald fra";
-"alerts.incomingCallButtonIgnore" = "Afvis";
-"actions.startAudioCall" = "Lydopkald";
-"actions.startVideoCall" = "Videoopkald";
 "actions.goToSettings" = "Gå til Indstillinger";
 "actions.stopLocationSharing" = "Stop deling";
 
 // Calls
-"calls.incomingCallInfo" = "vil tale med dig";
 "calls.ringing" = "Ringer...";
 "calls.connecting" = "Opretter forbindelse…";
 "calls.callFinished" = "Opkald afsluttet";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Enheder";
 "accountPage.settingsHeader" = "Indstillinger";
 "accountPage.notificationsHeader" = "Notifikationer";
-"accountPage.usernameNotRegistered" = "brugernavn: ikke registreret";
-"accountPage.credentialsHeader" = "Kontodetaljer";
 "accountPage.blockedContacts" = "Blokerede kontakter";
 "accountPage.unblockContact" = "Fjern blokering";
 "accountPage.proxyAddressAlert" = "Angiv proxy-adresse";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Forbinder";
 "account.statusUnknown" = "Ukendt";
 "account.statusConnectionerror" = "Forbindelsesfejl";
-"account.needMigration" = "konto skal migreres";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mig";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation modtaget";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Udgående opkald";
 "generatedMessage.missedOutgoingCall" = "Ubesvarede udgående opkald";
 "generatedMessage.missedIncomingCall" = "Ubesvarede indgående opkald";
 "generatedMessage.liveLocationSharing" = "Live placeringsholding";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Tilbagemelding";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
index 8e0a8dfe25d08e15317cf4acf926a3df79e528b2..0af5a42dd31720efc72d225217c4bd3c79217c19 100644
--- a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
@@ -85,7 +85,7 @@
 "swarm.blocked" = "Blockiert";
 "swarm.unknown" = "Unknown";
 "swarm.inviteMembers" = "Mitglieder einladen";
-"swarm.confirmLeaveConversation" = "Do you want to leave this conversation?";
+"swarm.confirmLeaveConversation" = "Möchten Sie diese Unterhaltung verlassen?";
 "swarm.Leave" = "Leave";
 "swarm.newGroup" = "Neue Gruppe erstellen";
 "swarm.namePlaceholder" = "Gruppenname";
@@ -129,29 +129,26 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
-"conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
+"conversation.errorSavingImage" = "Beim Speichern des Bildes in der Galerie ist ein Fehler aufgetreten.";
 "conversation.receivedRequest" = "%@hat Ihnen eine Unterhaltungseinladung geschickt.";
-"conversation.incomingRequest" = "sent you a conversation invitation.";
+"conversation.incomingRequest" = "hat Ihnen eine Unterhaltungseinladung gesendet.";
 "conversation.requestMessage" = "Hallo,\nMöchten Sie an der Unterhaltung teilnehmen?";
 "conversation.sendRequest" = "Senden Sie ihnen eine Einladung, um sich unterhalten zu können.";
 "conversation.sendRequestTitle" = "Unterhaltungseinladung senden";
 "conversation.synchronizationTitle" = "Sie haben die Unterhaltungseinladung angenommen.";
-"conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
+"conversation.synchronizationMessage" = "Warten auf %@sich zu verbinden um die Unterhaltung zu synchronisieren …";
 "conversation.inReplyTo" = "In reply to";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Du";
 "conversation.edited" = "Bearbeitet";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Kontakt blockiert";
 
 // Invitations
 "invitations.noInvitations" = "No invitations";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "abgelehnt";
-"invitations.blocked" = "blockiert";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blockiert";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Ungültiger Benutzername. Bitte geben Sie einen gültigen Benutzernamen ein.";
-"createAccount.usernameAlreadyTaken" = "username already taken";
-"createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Wird geladen…";
-"createAccount.waitCreateAccountTitle" = "Adding account";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
+"createAccount.usernameValid" = "Der Benutzername ist verfügbar.";
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
@@ -235,10 +230,10 @@
 "alerts.accountLinkedTitle" = "Linking account";
 "alerts.dbFailedTitle" = "An error happened when launching Jami";
 "alerts.dbFailedMessage" = "Please close application and try to open it again";
-"alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
-"alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
-"alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmBlockContact" = "Möchten Sie diesen Kontakt blockieren? Der Unterhaltungsverlauf mit diesem Kontakt wird ebenfalls dauerhaft gelöscht.";
+"alerts.confirmDeleteConversation" = "Möchten Sie diese Unterhaltung dauerhaft löschen?";
+"alerts.confirmDeleteConversationFromContact" = "Möchten Sie die Unterhaltung mit diesem Kontakt löschen?";
+"alerts.confirmDeleteConversationTitle" = "Unterhaltung löschen";
 "alerts.noMediaPermissionsTitle" = "Media permission not granted";
 "alerts.noLibraryPermissionsTitle" = "Access to photo library not granted";
 "alerts.noLocationPermissionsTitle" = "Access to location not granted";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Delete";
 "actions.backAction" = "Back";
 "actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonIgnore" = "Ignore";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "Stop sharing";
 
 // Calls
-"calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
 "calls.callFinished" = "Call finished";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Devices";
 "accountPage.settingsHeader" = "Settings";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
 "accountPage.blockedContacts" = "Blocked contacts";
 "accountPage.unblockContact" = "Entblocken";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -301,7 +289,7 @@
 "accountPage.proxyDisabledAlertTitle" = "Proxy Server Disabled";
 "accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
 "accountPage.removeDeviceTitle" = "Remove device";
-"accountPage.revokeDeviceMessage" = "Do you want to remove this device? This action cannot be undone.";
+"accountPage.revokeDeviceMessage" = "Möchten Sie dieses Gerät entfernen? Diese Aktion kann nicht rückgängig gemacht werden.";
 "accountPage.revokeDeviceButton" = "Revoke";
 "accountPage.revokeDevicePlaceholder" = "Enter your password";
 "accountPage.deviceRevoked" = "Device revocation completed";
@@ -319,7 +307,7 @@
 "accountPage.contactMeOnJamiContant" = "Kontaktieren Sie mich über „%s“ auf der Jami-Plattform für verteilte Kommunikation: https://jami.net";
 "accountPage.passwordPlaceholder" = "Enter account password";
 "accountPage.usernamePlaceholder" = "Enter desired username";
-"accountPage.registerNameErrorMessage" = "The username is unavailable.";
+"accountPage.registerNameErrorMessage" = "Der Benutzername ist nicht verfügbar.";
 "accountPage.usernameRegistering" = "Registering";
 "accountPage.usernameRegisterAction" = "Register";
 "accountPage.usernameRegistrationFailedTitle" = "Registrierung fehlgeschlagen";
@@ -358,7 +346,7 @@
 "accountPage.manageAccount" = "Manage account";
 "accountPage.encryptAccount" = "Encrypt account with a password";
 "accountPage.passwordExplanation" = "Ein Jami-Konto wird nur auf diesem Gerät lokal erstellt und als Archiv mit seinen Kontoschlüsseln gespeichert. Der Zugriff auf das Archiv kann optional mit einem Passwort geschützt werden.";
-"accountPage.passwordsDoNotMatch" = "Passwords do not match.";
+"accountPage.passwordsDoNotMatch" = "Passwörter stimmen nicht überein.";
 "accountPage.passwordCreated" = "Passwort erstellt";
 "accountPage.passwordUpdated" = "Passwort aktualisiert";
 "accountPage.linkedDevices" = "Linked devices";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connecting";
 "account.statusUnknown" = "Unknown";
 "account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Einladung erhalten";
 "generatedMessage.swarmCreated" = "Unterhaltung erstellt";
-"generatedMessage.invitationReceived" = "wurde zur Unterhaltung eingeladen.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Sie sind der Unterhaltung begetreten.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Outgoing call";
 "generatedMessage.missedOutgoingCall" = "Missed outgoing call";
 "generatedMessage.missedIncomingCall" = "Missed incoming call";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Videoeinstellungen";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/de.lproj/Localizable.strings b/Ring/Ring/Resources/de.lproj/Localizable.strings
index d9bde5f5b96a376f0275c38db5ae0446412a888a..016138f92229852da685f857e60978ed73f51f1d 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -85,7 +85,7 @@
 "swarm.blocked" = "Blockiert";
 "swarm.unknown" = "Unbekannt";
 "swarm.inviteMembers" = "Mitglieder einladen";
-"swarm.confirmLeaveConversation" = "Do you want to leave this conversation?";
+"swarm.confirmLeaveConversation" = "Möchten Sie diese Unterhaltung verlassen?";
 "swarm.Leave" = "Verlassen";
 "swarm.newGroup" = "Neue Gruppe erstellen";
 "swarm.namePlaceholder" = "Gruppenname";
@@ -129,29 +129,26 @@
 "conversation.addToContactsLabel" = "Zu Kontakten hinzufügen?";
 "conversation.notContactLabel" = "befindet sich nicht in Ihrer Kontaktliste.";
 "conversation.messagePlaceholder" = "Schreiben an";
-"conversation.explanationSendingLocationTo" = "Sie teilen Ihren Standort derzeit mit";
-"conversation.explanationReceivingLocationFrom" = "Sie erhalten derzeit einen Live-Standort von";
-"conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
+"conversation.errorSavingImage" = "Beim Speichern des Bildes in der Galerie ist ein Fehler aufgetreten.";
 "conversation.receivedRequest" = "%@hat Ihnen eine Unterhaltungseinladung geschickt.";
-"conversation.incomingRequest" = "sent you a conversation invitation.";
+"conversation.incomingRequest" = "hat Ihnen eine Unterhaltungseinladung gesendet.";
 "conversation.requestMessage" = "Hallo,\nMöchten Sie an der Unterhaltung teilnehmen?";
 "conversation.sendRequest" = "Senden Sie ihnen eine Einladung, um sich unterhalten zu können.";
 "conversation.sendRequestTitle" = "Unterhaltungseinladung senden";
 "conversation.synchronizationTitle" = "Sie haben die Unterhaltungseinladung angenommen.";
-"conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
+"conversation.synchronizationMessage" = "Warten auf %@sich zu verbinden um die Unterhaltung zu synchronisieren …";
 "conversation.inReplyTo" = "Als Antwort auf";
-"conversation.repliedTo" = "antwortete auf";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Sie";
 "conversation.edited" = "Bearbeitet";
-"conversation.deletedMessage" = "eine Nachricht wurde gelöscht";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Kontakt blockiert";
 
 // Invitations
 "invitations.noInvitations" = "Keine Einladungen";
-"invitations.pending" = "ausstehend";
-"invitations.accepted" = "angenommen";
-"invitations.declined" = "abgelehnt";
-"invitations.blocked" = "blockiert";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blockiert";
 "invitations.list" = "Einladungen erhalten";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Mitmachen bei Jami";
-"createAccount.lookingForUsernameAvailability" = "Verfügbarkeit des Benutzernamens wird geprüft …";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Ungültiger Benutzername. Bitte geben Sie einen gültigen Benutzernamen ein.";
-"createAccount.usernameAlreadyTaken" = "Dieser Benutzername ist bereits vergeben";
-"createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Wird geladen…";
-"createAccount.waitCreateAccountTitle" = "Konto hinzufügen";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
+"createAccount.usernameValid" = "Der Benutzername ist verfügbar.";
 "createAccount.UsernameNotRegisteredTitle" = "Netzwerkfehler";
 "createAccount.UsernameNotRegisteredMessage" = "Konto wurde erstellt, aber der Benutzername wurde nicht registriert";
 "createAccount.timeoutTitle" = "Konto erstellt";
@@ -235,10 +230,10 @@
 "alerts.accountLinkedTitle" = "Verknüpfe Konto";
 "alerts.dbFailedTitle" = "Beim Starten von Jami ist ein Fehler aufgetreten";
 "alerts.dbFailedMessage" = "Bitte schließen Sie die Anwendung und versuchen Sie, sie erneut zu öffnen";
-"alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
-"alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
-"alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete conversation";
+"alerts.confirmBlockContact" = "Möchten Sie diesen Kontakt blockieren? Der Unterhaltungsverlauf mit diesem Kontakt wird ebenfalls dauerhaft gelöscht.";
+"alerts.confirmDeleteConversation" = "Möchten Sie diese Unterhaltung dauerhaft löschen?";
+"alerts.confirmDeleteConversationFromContact" = "Möchten Sie die Unterhaltung mit diesem Kontakt löschen?";
+"alerts.confirmDeleteConversationTitle" = "Unterhaltung löschen";
 "alerts.noMediaPermissionsTitle" = "Medienzugriff nicht gewährt";
 "alerts.noLibraryPermissionsTitle" = "Zugriff auf die Bildergalerie nicht gewährt";
 "alerts.noLocationPermissionsTitle" = "Zugang zum Standort nicht gewährt";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Löschen";
 "actions.backAction" = "Zurück";
 "actions.doneAction" = "Erledigt";
-"alerts.incomingCallAllertTitle" = "Eingehender Anruf von ";
-"alerts.incomingCallButtonIgnore" = "Ignorieren";
-"actions.startAudioCall" = "Audio-Anruf";
-"actions.startVideoCall" = "Video-Anruf";
 "actions.goToSettings" = "Gehe zu den Einstellungen";
 "actions.stopLocationSharing" = "Teilen beenden";
 
 // Calls
-"calls.incomingCallInfo" = "möchte mit Ihnen sprechen.";
 "calls.ringing" = "Klingelt…";
 "calls.connecting" = "Verbinde…";
 "calls.callFinished" = "Anruf beendet";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Geräte";
 "accountPage.settingsHeader" = "Einstellungen";
 "accountPage.notificationsHeader" = "Benachrichtigungen";
-"accountPage.usernameNotRegistered" = "Benutzername: Nicht registriert";
-"accountPage.credentialsHeader" = "Kontodetails";
 "accountPage.blockedContacts" = "Blockierte Kontakte";
 "accountPage.unblockContact" = "Blockierung aufheben";
 "accountPage.proxyAddressAlert" = "Proxy Adresse angeben";
@@ -301,7 +289,7 @@
 "accountPage.proxyDisabledAlertTitle" = "Proxy Server Deaktiviert";
 "accountPage.proxyDisabledAlertBody" = "Um Benachrichtigungen zu erhalten, bitte Proxy aktivieren";
 "accountPage.removeDeviceTitle" = "Gerät entfernen";
-"accountPage.revokeDeviceMessage" = "Do you want to remove this device? This action cannot be undone.";
+"accountPage.revokeDeviceMessage" = "Möchten Sie dieses Gerät entfernen? Diese Aktion kann nicht rückgängig gemacht werden.";
 "accountPage.revokeDeviceButton" = "Trennen";
 "accountPage.revokeDevicePlaceholder" = "Geben Sie Ihr Passwort ein";
 "accountPage.deviceRevoked" = "Trennung des Gerätes abgeschlossen";
@@ -319,7 +307,7 @@
 "accountPage.contactMeOnJamiContant" = "Kontaktieren Sie mich über „%s“ auf der Jami-Plattform für verteilte Kommunikation: https://jami.net";
 "accountPage.passwordPlaceholder" = "Geben Sie ihr Kontopasswort ein";
 "accountPage.usernamePlaceholder" = "Gewünschten Benutzername eingeben";
-"accountPage.registerNameErrorMessage" = "The username is unavailable.";
+"accountPage.registerNameErrorMessage" = "Der Benutzername ist nicht verfügbar.";
 "accountPage.usernameRegistering" = "Benutzername wird registriert...";
 "accountPage.usernameRegisterAction" = "Registrieren";
 "accountPage.usernameRegistrationFailedTitle" = "Registrierung fehlgeschlagen";
@@ -358,7 +346,7 @@
 "accountPage.manageAccount" = "Konto verwalten";
 "accountPage.encryptAccount" = "Konto mit einem Passwort verschlüsseln";
 "accountPage.passwordExplanation" = "Ein Jami-Konto wird nur auf diesem Gerät lokal erstellt und als Archiv mit seinen Kontoschlüsseln gespeichert. Der Zugriff auf das Archiv kann optional mit einem Passwort geschützt werden.";
-"accountPage.passwordsDoNotMatch" = "Passwords do not match.";
+"accountPage.passwordsDoNotMatch" = "Passwörter stimmen nicht überein.";
 "accountPage.passwordCreated" = "Passwort erstellt";
 "accountPage.passwordUpdated" = "Passwort aktualisiert";
 "accountPage.linkedDevices" = "Verbundene Geräte";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Verbindet";
 "account.statusUnknown" = "Unbekannt";
 "account.statusConnectionerror" = "Verbindungsfehler";
-"account.needMigration" = "Konto muss migriert werden";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ich";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Einladung erhalten";
 "generatedMessage.swarmCreated" = "Unterhaltung erstellt";
-"generatedMessage.invitationReceived" = "wurde zur Unterhaltung eingeladen.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Sie sind der Unterhaltung begetreten.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Ausgehender Anruf";
 "generatedMessage.missedOutgoingCall" = "Ausgehender Anruf fehlgeschlagen";
 "generatedMessage.missedIncomingCall" = "Verpasster eingehender Anruf";
 "generatedMessage.liveLocationSharing" = "Live-Standortfreigabe";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Videoeinstellungen";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Erstellt von";
 "aboutJami.artworkBy" = "Visuelle Gestaltung von";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/el.lproj/Localizable.strings b/Ring/Ring/Resources/el.lproj/Localizable.strings
index d08e87f8017c18b40c8e647de1800655096d759c..bf6b4e862a97c1b730fa588ad8dfd02e7e2cf1fc 100644
--- a/Ring/Ring/Resources/el.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/el.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Προσθήκη στις επαφές;";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Συμμετέχετε τη θέση σας με ";
-"conversation.explanationReceivingLocationFrom" = "Πλέον λαμβάνετε ζωντανή τοποθεσία από";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Απαντώντας";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Εσύ";
 "conversation.edited" = "Επορθωμένο";
-"conversation.deletedMessage" = "διαγράφτηκε ένα μήνυμα";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Δεν υπάρχουν προσκλήσεις.";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Δημιουργήστε λογαριασμό Jami";
-"createAccount.lookingForUsernameAvailability" = "Ψάχνοντας διαθεσιμότητα...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Το όνομα χρήστη ήδη χρησιμοποιείται";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Εισαγωγή λογαριασμού";
 "createAccount.UsernameNotRegisteredTitle" = "Σφάλμα δικτύου";
 "createAccount.UsernameNotRegisteredMessage" = "Δημιουργήθηκε λογαριασμός αλλά δεν καταχωρίστηκε όνομα χρήστη";
 "createAccount.timeoutTitle" = "Δημιουργήθηκε λογαριασμός";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Διαγραφή";
 "actions.backAction" = "Πίσω";
 "actions.doneAction" = "Τελείωσε";
-"alerts.incomingCallAllertTitle" = "Ερχόμενη κλήση από ";
-"alerts.incomingCallButtonIgnore" = "Αγνοήστε";
-"actions.startAudioCall" = "Ηχητική κλήση";
-"actions.startVideoCall" = "Βίντεο κλήση";
 "actions.goToSettings" = "Πηγαίνετε στις ρυθμίσεις";
 "actions.stopLocationSharing" = "Τερματισμός κοινοποίησης";
 
 // Calls
-"calls.incomingCallInfo" = "Θέλει να σου μιλήσει.";
 "calls.ringing" = "- Ακούγεται...";
 "calls.connecting" = "Συνδέοντας...";
 "calls.callFinished" = "Η κλήση ολοκληρώθηκε";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Συσκευές";
 "accountPage.settingsHeader" = "Ρυθμίσεις";
 "accountPage.notificationsHeader" = "Ειδοποιήσεις";
-"accountPage.usernameNotRegistered" = "όνομα χρήστη: μη εγγεγραμμένο";
-"accountPage.credentialsHeader" = "Πληροφορίες λογαριασμού";
 "accountPage.blockedContacts" = "Μπλοκαρισμένες επαφές";
 "accountPage.unblockContact" = "Ανοίξτε την μπλοκ";
 "accountPage.proxyAddressAlert" = "Παρέξτε διεύθυνση αντιπροσωπευτικού χαρακτήρα";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Συνδέεται";
 "account.statusUnknown" = "Άγνωστοι";
 "account.statusConnectionerror" = "Λάθος σύνδεσης";
-"account.needMigration" = "Πρέπει να μεταφερθεί λογαριασμός";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Εγώ";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Η πρόσκληση παραλήφθηκε";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Εξερχόμενη κλήση";
 "generatedMessage.missedOutgoingCall" = "Αναπάντητη εξερχόμενη κλήση";
 "generatedMessage.missedIncomingCall" = "Αναπάντητη εισερχόμενη κλήση";
 "generatedMessage.liveLocationSharing" = "Συνοχή τοποθεσιών ζωντανά";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Σχόλια";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/eo.lproj/Localizable.strings b/Ring/Ring/Resources/eo.lproj/Localizable.strings
index ccd3aac20ba73578d4b04f2dfcb4d9c2470e436c..04883236d070cadc6e0c7133dca49bed54ca6858 100644
--- a/Ring/Ring/Resources/eo.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eo.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Ĉu aldoni al kontaktoj?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Vi nun dividas vian lokon kun ";
-"conversation.explanationReceivingLocationFrom" = "Vi nun ricevas live-lokon de ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "En respondo al";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vi";
 "conversation.edited" = "Redaktita";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Neniu invito";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Aliĝu al Jami";
-"createAccount.lookingForUsernameAvailability" = "serĉante haveblecon...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "uzantnomo jam prenita";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Aldonanta konton";
 "createAccount.UsernameNotRegisteredTitle" = "Reta eraro";
 "createAccount.UsernameNotRegisteredMessage" = "Konto estis kreita sed uzantnomo ne estis registrita";
 "createAccount.timeoutTitle" = "Konto kreita";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Forigi";
 "actions.backAction" = "Reiri";
 "actions.doneAction" = "Finita";
-"alerts.incomingCallAllertTitle" = "Envenanta alvoko de ";
-"alerts.incomingCallButtonIgnore" = "Malatenti";
-"actions.startAudioCall" = "Aŭdio-vokado";
-"actions.startVideoCall" = "Videokalvoko";
 "actions.goToSettings" = "Iru al Agordoj";
 "actions.stopLocationSharing" = "Ĉesu dividi";
 
 // Calls
-"calls.incomingCallInfo" = "Li volas paroli kun vi.";
 "calls.ringing" = "Sonoras...";
 "calls.connecting" = "Konekti...";
 "calls.callFinished" = "La voko finiĝis";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Aparatoj";
 "accountPage.settingsHeader" = "Agordoj";
 "accountPage.notificationsHeader" = "Notifikaĵoj";
-"accountPage.usernameNotRegistered" = "Uzan nomon: ne registrita";
-"accountPage.credentialsHeader" = "Konto detaloj";
 "accountPage.blockedContacts" = "Blokiĝintaj kontaktoj";
 "accountPage.unblockContact" = "Malŝalti la blokon";
 "accountPage.proxyAddressAlert" = "Provizu proxy-adreson";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Konektiĝo";
 "account.statusUnknown" = "Nekonata";
 "account.statusConnectionerror" = "Eraro pri konekto";
-"account.needMigration" = "Konto devas esti migrita";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mi";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invito ricevita";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Eliranta voko";
 "generatedMessage.missedOutgoingCall" = "Maltrafis forirantan telefonon";
 "generatedMessage.missedIncomingCall" = "Maltrafis envenantan telefonon";
 "generatedMessage.liveLocationSharing" = "Viva kunhavado de lokoj";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Reago";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index 837aaa78380a252c324508a522ac1bd85a28d8bf..c9985a56f5b0565b5efd1be2b3bc2f4e53c9dbf6 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "¿Añadir a contactos?";
 "conversation.notContactLabel" = "no está en tu lista de contactos.";
 "conversation.messagePlaceholder" = "Escribir a";
-"conversation.explanationSendingLocationTo" = "Estás compartiendo tu ubicación con";
-"conversation.explanationReceivingLocationFrom" = "Estás recibiendo una ubicación en vivo desde";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
 "conversation.incomingRequest" = "te envié una invitación de conversación.";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Has aceptado la invitación a la conversación.";
 "conversation.synchronizationMessage" = "Esperando a que %@ se conecte para sincronizar la conversación…";
 "conversation.inReplyTo" = "En respuesta a";
-"conversation.repliedTo" = "responder a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tú";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "Eliminar mensaje";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "No hay invitaciones";
-"invitations.pending" = "En espera...";
-"invitations.accepted" = "Aceptada";
-"invitations.declined" = "Rechazada";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqueado";
 "invitations.list" = "Invitaciones recibidas";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "Comprobando disponibilidad...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introduzca un nombre de usuario válido.";
-"createAccount.usernameAlreadyTaken" = "nombre de usuario ya está en uso";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
-"createAccount.loading" = "Cargando…";
-"createAccount.waitCreateAccountTitle" = "Agregando cuenta";
 "createAccount.UsernameNotRegisteredTitle" = "Error en la red";
 "createAccount.UsernameNotRegisteredMessage" = "Registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Borrar";
 "actions.backAction" = "Volver";
 "actions.doneAction" = "Hecho";
-"alerts.incomingCallAllertTitle" = "Llamada entrante de ";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Llamada de voz";
-"actions.startVideoCall" = "Videollamada";
 "actions.goToSettings" = "Ir a Ajustes";
 "actions.stopLocationSharing" = "Dejar de compartir";
 
 // Calls
-"calls.incomingCallInfo" = "quiere hablar contigo";
 "calls.ringing" = "Sonando...";
 "calls.connecting" = "Conectando...";
 "calls.callFinished" = "Llamada finalizada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configuración";
 "accountPage.notificationsHeader" = "Notificaciones";
-"accountPage.usernameNotRegistered" = "nombre de usuario: no registrado";
-"accountPage.credentialsHeader" = "Detalles de la cuenta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Proporcione la dirección proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conectando";
 "account.statusUnknown" = "Desconocido";
 "account.statusConnectionerror" = "Error de conexión";
-"account.needMigration" = "Es necesario migrar su cuenta";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Yo";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitación recibida";
 "generatedMessage.swarmCreated" = "Conversación creada";
-"generatedMessage.invitationReceived" = "fue invitado a unirse a la conversación.";
-"generatedMessage.invitationAccepted" = "se ha unido a la conversación.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Te uniste a la conversación.";
-"generatedMessage.contactBlocked" = "se bloqueó de la conversación.";
-"generatedMessage.contactUnblocked" = "se bloqueó de la conversación.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Llamada saliente";
 "generatedMessage.missedOutgoingCall" = "Llamada saliente perdida";
 "generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
 "generatedMessage.liveLocationSharing" = "Compartición de ubicación en vivo";
-"generatedMessage.contactLeftConversation" = "ha abandonado la conversación.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Ajustes de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Opiniones";
 "aboutJami.createdBy" = "Creado por";
 "aboutJami.artworkBy" = "Ilustraciones realizadas por";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/es_419.lproj/Localizable.strings b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
index e39c1204bd9d91176cba0f5737e707054f0838d1..d4355c50142bfe691ccc30058c6ac181effdb71f 100644
--- a/Ring/Ring/Resources/es_419.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
 "conversation.notContactLabel" = "no está en tu lista de contactos.";
 "conversation.messagePlaceholder" = "Escribir a";
-"conversation.explanationSendingLocationTo" = "Estás compartiendo tu ubicación con";
-"conversation.explanationReceivingLocationFrom" = "Estás recibiendo una ubicación en vivo de";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
 "conversation.incomingRequest" = "te envié una invitación de conversación.";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Has aceptado la invitación a la conversación.";
 "conversation.synchronizationMessage" = "Esperando a que %@ se conecte para sincronizar la conversación…";
 "conversation.inReplyTo" = "En respuesta a";
-"conversation.repliedTo" = "responder a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tú";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "Eliminar mensaje";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "Sin invitaciones";
-"invitations.pending" = "En espera...";
-"invitations.accepted" = "Aceptada";
-"invitations.declined" = "Rechazada";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqueado";
 "invitations.list" = "Invitaciones recibidas";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "buscando disponibilidad ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introduzca un nombre de usuario válido.";
-"createAccount.usernameAlreadyTaken" = "usuario ya en uso";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
-"createAccount.loading" = "Cargando…";
-"createAccount.waitCreateAccountTitle" = "Agregando cuenta";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Eliminar";
 "actions.backAction" = "Atrás";
 "actions.doneAction" = "Hecho";
-"alerts.incomingCallAllertTitle" = "Llamada entrante de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Llamada de voz";
-"actions.startVideoCall" = "Videollamada";
 "actions.goToSettings" = "Ir a Ajustes";
 "actions.stopLocationSharing" = "Dejar de compartir";
 
 // Calls
-"calls.incomingCallInfo" = "quiere hablar con vos";
 "calls.ringing" = "Sonando...";
 "calls.connecting" = "Conectando…";
 "calls.callFinished" = "Llamada finalizada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configuraciones";
 "accountPage.notificationsHeader" = "Notificaciones";
-"accountPage.usernameNotRegistered" = "Nombre de usuario: no registrado";
-"accountPage.credentialsHeader" = "Detalles de cuenta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Provea dirección proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conectado";
 "account.statusUnknown" = "Desconocido";
 "account.statusConnectionerror" = "Error de conexión";
-"account.needMigration" = "cuenta necesita ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Yo";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitación recibida";
 "generatedMessage.swarmCreated" = "Conversación creada";
-"generatedMessage.invitationReceived" = "fue invitado a unirse a la conversación.";
-"generatedMessage.invitationAccepted" = "se ha unido a la conversación.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Te uniste a la conversación.";
-"generatedMessage.contactBlocked" = "se bloqueó de la conversación.";
-"generatedMessage.contactUnblocked" = "se bloqueó de la conversación.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Lllamando a ";
 "generatedMessage.missedOutgoingCall" = "Lllamada saliente perdida";
 "generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
 "generatedMessage.liveLocationSharing" = "Compartición de ubicación en vivo";
-"generatedMessage.contactLeftConversation" = "ha abandonado la conversación.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Ajustes de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Retroalimentación";
 "aboutJami.createdBy" = "Creado por";
 "aboutJami.artworkBy" = "Ilustraciones realizadas por";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 8903d3ec166d90995ce7068eb2f9dc386d2edcb5..deef3fbc459a438519825f24b599694c651b8b7a 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
 "conversation.notContactLabel" = "no está en tu lista de contactos.";
 "conversation.messagePlaceholder" = "Escribir a";
-"conversation.explanationSendingLocationTo" = "Estás compartiendo tu ubicación con";
-"conversation.explanationReceivingLocationFrom" = "Estás recibiendo una ubicación en vivo de";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
 "conversation.incomingRequest" = "te envié una invitación de conversación.";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Has aceptado la invitación a la conversación.";
 "conversation.synchronizationMessage" = "Esperando a que %@ se conecte para sincronizar la conversación…";
 "conversation.inReplyTo" = "En respuesta a";
-"conversation.repliedTo" = "responder a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vos";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "Eliminar mensaje";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "Sin invitaciones";
-"invitations.pending" = "En espera...";
-"invitations.accepted" = "Aceptada";
-"invitations.declined" = "Rechazada";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqueado";
 "invitations.list" = "Invitaciones recibidas";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "buscando disponibilidad ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introduzca un nombre de usuario válido.";
-"createAccount.usernameAlreadyTaken" = "usuario ya en uso";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
-"createAccount.loading" = "Cargando…";
-"createAccount.waitCreateAccountTitle" = "Añadiendo cuenta";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Eliminar";
 "actions.backAction" = "Atrás";
 "actions.doneAction" = "Hecho";
-"alerts.incomingCallAllertTitle" = "Llamada entrante de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Llamada de voz";
-"actions.startVideoCall" = "Videollamada";
 "actions.goToSettings" = "Ir a Ajustes";
 "actions.stopLocationSharing" = "Dejar de compartir";
 
 // Calls
-"calls.incomingCallInfo" = "quiere hablar con vos";
 "calls.ringing" = "Sonando...";
 "calls.connecting" = "Conectando...";
 "calls.callFinished" = "Llamada finalizada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Ajustes";
 "accountPage.notificationsHeader" = "Norificaciones";
-"accountPage.usernameNotRegistered" = "Nombre de usuario: no registrado";
-"accountPage.credentialsHeader" = "Detalles de cuenta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Provea dirección proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conectando";
 "account.statusUnknown" = "Desconocido";
 "account.statusConnectionerror" = "Error de conexión";
-"account.needMigration" = "cuenta necesita ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Yo";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitación recibida";
 "generatedMessage.swarmCreated" = "Conversación creada";
-"generatedMessage.invitationReceived" = "fue invitado a unirse a la conversación.";
-"generatedMessage.invitationAccepted" = "se ha unido a la conversación.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Te uniste a la conversación.";
-"generatedMessage.contactBlocked" = "se bloqueó de la conversación.";
-"generatedMessage.contactUnblocked" = "se bloqueó de la conversación.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Llamada saliente";
 "generatedMessage.missedOutgoingCall" = "Llamada saliente perdida";
 "generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
 "generatedMessage.liveLocationSharing" = "Compartición de ubicación en vivo";
-"generatedMessage.contactLeftConversation" = "ha abandonado la conversación.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Ajustes de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Comentarios";
 "aboutJami.createdBy" = "Creado por";
 "aboutJami.artworkBy" = "Ilustraciones realizadas por";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
index 2eb046e24f6fe9534d889a534c33fd4619debda3..8ca0b945d28448748d12f892cccaa3aded4db2a8 100644
--- a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
 "conversation.notContactLabel" = "no está en tu lista de contactos.";
 "conversation.messagePlaceholder" = "Escribir a";
-"conversation.explanationSendingLocationTo" = "Estás compartiendo tu ubicación con";
-"conversation.explanationReceivingLocationFrom" = "Estás recibiendo una ubicación en vivo de";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
 "conversation.incomingRequest" = "te envié una invitación de conversación.";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Has aceptado la invitación a la conversación.";
 "conversation.synchronizationMessage" = "Esperando a que %@ se conecte para sincronizar la conversación…";
 "conversation.inReplyTo" = "En respuesta a";
-"conversation.repliedTo" = "responder a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tú";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "Eliminar mensaje";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "Sin invitaciones";
-"invitations.pending" = "En espera...";
-"invitations.accepted" = "Aceptada";
-"invitations.declined" = "Rechazada";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqueado";
 "invitations.list" = "Invitaciones recibidas";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "buscando disponibilidad ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introduzca un nombre de usuario válido.";
-"createAccount.usernameAlreadyTaken" = "usuario ya en uso";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
-"createAccount.loading" = "Cargando…";
-"createAccount.waitCreateAccountTitle" = "Agregando cuenta";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Borrar";
 "actions.backAction" = "Atrás";
 "actions.doneAction" = "Hecho";
-"alerts.incomingCallAllertTitle" = "Llamada entrante de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Llamada de voz";
-"actions.startVideoCall" = "Videollamada";
 "actions.goToSettings" = "Ir a Ajustes";
 "actions.stopLocationSharing" = "Dejar de compartir";
 
 // Calls
-"calls.incomingCallInfo" = "quiere hablar con vos";
 "calls.ringing" = "Sonando...";
 "calls.connecting" = "Conectando…";
 "calls.callFinished" = "Llamada finalizada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configuración";
 "accountPage.notificationsHeader" = "Notificaciones";
-"accountPage.usernameNotRegistered" = "Nombre de usuario: no registrado";
-"accountPage.credentialsHeader" = "Detalles de cuenta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Provea dirección proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conectado";
 "account.statusUnknown" = "Desconocido";
 "account.statusConnectionerror" = "Error de conexión";
-"account.needMigration" = "cuenta necesita ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Yo";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitación recibida";
 "generatedMessage.swarmCreated" = "Conversación creada";
-"generatedMessage.invitationReceived" = "fue invitado a unirse a la conversación.";
-"generatedMessage.invitationAccepted" = "se ha unido a la conversación.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Te uniste a la conversación.";
-"generatedMessage.contactBlocked" = "se bloqueó de la conversación.";
-"generatedMessage.contactUnblocked" = "se bloqueó de la conversación.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Lllamando a ";
 "generatedMessage.missedOutgoingCall" = "Lllamada saliente perdida";
 "generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
 "generatedMessage.liveLocationSharing" = "Compartición de ubicación en vivo";
-"generatedMessage.contactLeftConversation" = "ha abandonado la conversación.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Ajustes de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Retroalimentación";
 "aboutJami.createdBy" = "Creado por";
 "aboutJami.artworkBy" = "Ilustraciones realizadas por";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
index 9cca32533e7dd2850d74b99ed31e19feaf08d1c8..a07e1c74dc2574cab2489fb3c86b68136363acd5 100644
--- a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "¿Agregar a contactos?";
 "conversation.notContactLabel" = "no está en tu lista de contactos.";
 "conversation.messagePlaceholder" = "Escribir a";
-"conversation.explanationSendingLocationTo" = "Estás compartiendo tu ubicación con";
-"conversation.explanationReceivingLocationFrom" = "Estás recibiendo una ubicación en vivo de";
 "conversation.errorSavingImage" = "Se produjo un error al guardar la imagen en la galería.";
 "conversation.receivedRequest" = "%@ te envió una invitación de conversación.";
 "conversation.incomingRequest" = "te envié una invitación de conversación.";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Has aceptado la invitación a la conversación.";
 "conversation.synchronizationMessage" = "Esperando a que %@ se conecte para sincronizar la conversación…";
 "conversation.inReplyTo" = "En respuesta a";
-"conversation.repliedTo" = "responder a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tú";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "Eliminar mensaje";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "Sin invitaciones";
-"invitations.pending" = "En espera...";
-"invitations.accepted" = "Aceptada";
-"invitations.declined" = "Rechazada";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqueado";
 "invitations.list" = "Invitaciones recibidas";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "buscando disponibilidad ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nombre de usuario no válido. Por favor, introduzca un nombre de usuario válido.";
-"createAccount.usernameAlreadyTaken" = "usuario ya en uso";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "El nombre de usuario está disponible.";
-"createAccount.loading" = "Cargando…";
-"createAccount.waitCreateAccountTitle" = "Agregando cuenta";
 "createAccount.UsernameNotRegisteredTitle" = "Error de red";
 "createAccount.UsernameNotRegisteredMessage" = "La cuenta fue creada pero el nombre de usuario no fue registrado";
 "createAccount.timeoutTitle" = "Cuenta creada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Eliminar";
 "actions.backAction" = "Atrás";
 "actions.doneAction" = "Hecho";
-"alerts.incomingCallAllertTitle" = "Llamada entrante de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Llamada de voz";
-"actions.startVideoCall" = "Videollamada";
 "actions.goToSettings" = "Ir a Ajustes";
 "actions.stopLocationSharing" = "Dejar de compartir";
 
 // Calls
-"calls.incomingCallInfo" = "quiere hablar con vos";
 "calls.ringing" = "Sonando...";
 "calls.connecting" = "Conectando…";
 "calls.callFinished" = "Llamada finalizada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configuraciones";
 "accountPage.notificationsHeader" = "Notificaciones";
-"accountPage.usernameNotRegistered" = "Nombre de usuario: no registrado";
-"accountPage.credentialsHeader" = "Detalles de cuenta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Provea dirección proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conectado";
 "account.statusUnknown" = "Desconocido";
 "account.statusConnectionerror" = "Error de conexión";
-"account.needMigration" = "cuenta necesita ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Yo";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitación recibida";
 "generatedMessage.swarmCreated" = "Conversación creada";
-"generatedMessage.invitationReceived" = "fue invitado a unirse a la conversación.";
-"generatedMessage.invitationAccepted" = "se ha unido a la conversación.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Te uniste a la conversación.";
-"generatedMessage.contactBlocked" = "se bloqueó de la conversación.";
-"generatedMessage.contactUnblocked" = "se bloqueó de la conversación.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Lllamando a ";
 "generatedMessage.missedOutgoingCall" = "Lllamada saliente perdida";
 "generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
 "generatedMessage.liveLocationSharing" = "Compartición de ubicación en vivo";
-"generatedMessage.contactLeftConversation" = "ha abandonado la conversación.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Ajustes de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Retroalimentación";
 "aboutJami.createdBy" = "Creado por";
 "aboutJami.artworkBy" = "Ilustraciones realizadas por";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/et.lproj/Localizable.strings b/Ring/Ring/Resources/et.lproj/Localizable.strings
index cb6896a956686068c23b03ef5ff4e678d4c14bbf..530510a4b56cbe050a803b52309e1b21792b40a6 100644
--- a/Ring/Ring/Resources/et.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Kas lisame kontaktina?";
 "conversation.notContactLabel" = "ei leidu sinu kontaktides";
 "conversation.messagePlaceholder" = "Kirjuta kasutajale";
-"conversation.explanationSendingLocationTo" = "Sa jagad praegu oma asukoha kasutajaga";
-"conversation.explanationReceivingLocationFrom" = "Hetkel näed reaalajas asukohta kasutajalt";
 "conversation.errorSavingImage" = "Pildi salvestamisel galeriisse tekkis viga.";
 "conversation.receivedRequest" = "%@ saatis sulle vestluskutse.";
 "conversation.incomingRequest" = "saatis sulle vestluskutse.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Sa oled nõustunud vestluskutsega.";
 "conversation.synchronizationMessage" = "Vestluse sünkroniseerimiseks ootame kasutaja %@ ühendust.";
 "conversation.inReplyTo" = "Vastuseks kasutajale";
-"conversation.repliedTo" = "vastusena";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Sina";
 "conversation.edited" = "Muudetud";
-"conversation.deletedMessage" = "kustutas sõnumi";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Kontakt on blokeeritud";
 
 // Invitations
 "invitations.noInvitations" = "Pole kutseid";
-"invitations.pending" = "ootel";
-"invitations.accepted" = "vastuvõetud";
-"invitations.declined" = "keeldumine";
-"invitations.blocked" = "blokeeritud";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blokeeritud";
 "invitations.list" = "Sulle on kutseid";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Liitu Jamiga";
-"createAccount.lookingForUsernameAvailability" = "uurime kättesaadavust...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Kasutajanimi on vigane. Palun sisesta korrektne kasutajanimi.";
-"createAccount.usernameAlreadyTaken" = "kasutajanimi on juba võetud";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "Kasutajanimi on saadaval";
-"createAccount.loading" = "Laadime andmeid…";
-"createAccount.waitCreateAccountTitle" = "Lisame kasutajakontot";
 "createAccount.UsernameNotRegisteredTitle" = "Võrgu viga";
 "createAccount.UsernameNotRegisteredMessage" = "Kasutajakonto on nüüd loodud, kuid kasutajanimi jäi registreereerimata";
 "createAccount.timeoutTitle" = "Kasutajakonto on loodud";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Kustuta";
 "actions.backAction" = "Tagasi";
 "actions.doneAction" = "Tehtud";
-"alerts.incomingCallAllertTitle" = "Sissetulev kõne kasutajalt";
-"alerts.incomingCallButtonIgnore" = "Eira";
-"actions.startAudioCall" = "Häälkõne";
-"actions.startVideoCall" = "Videokõne";
 "actions.goToSettings" = "Ava seadistused";
 "actions.stopLocationSharing" = "Lõpeta jagamine";
 
 // Calls
-"calls.incomingCallInfo" = "soovib sinuga rääkida";
 "calls.ringing" = "Heliseb...";
 "calls.connecting" = "Ühendame...";
 "calls.callFinished" = "Kõne on lõppenud";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Seadmed";
 "accountPage.settingsHeader" = "Seadistused";
 "accountPage.notificationsHeader" = "Teavitused";
-"accountPage.usernameNotRegistered" = "kasutajanimi: registreerimata";
-"accountPage.credentialsHeader" = "Kasutajakonto üksikasjad";
 "accountPage.blockedContacts" = "Blokeeritud kontaktid";
 "accountPage.unblockContact" = "Eemalda blokeering";
 "accountPage.proxyAddressAlert" = "Sisesta proksiserveri aadress";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Ühendame";
 "account.statusUnknown" = "Pole teada";
 "account.statusConnectionerror" = "Ühenduse viga ";
-"account.needMigration" = "kasutajakonto peab olema üle kolitud";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mina";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Said kutse";
 "generatedMessage.swarmCreated" = "Vestlus on loodud";
-"generatedMessage.invitationReceived" = "sai kutse liitumiseks vestlusega.";
-"generatedMessage.invitationAccepted" = "on liitunud vestlusega.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Sina liitusid vestlusega.";
-"generatedMessage.contactBlocked" = "blokeeriti sellest vestlusest.";
-"generatedMessage.contactUnblocked" = "blokeering sellest vestlusest eemaldati.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Väljuv kõne";
 "generatedMessage.missedOutgoingCall" = "Väljuv kõne jäi märkamata";
 "generatedMessage.missedIncomingCall" = "Saabuv kõne jäi märkamata";
 "generatedMessage.liveLocationSharing" = "Asukoha jagamine reaalajas";
-"generatedMessage.contactLeftConversation" = "on lahkunud vestlusest.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video seadistused";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Tagasiside";
 "aboutJami.createdBy" = "Rakenduse autor:";
 "aboutJami.artworkBy" = "Kujunduse autor:";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/eu.lproj/Localizable.strings b/Ring/Ring/Resources/eu.lproj/Localizable.strings
index 30a16ea2389facd3c456f2523c44842d5c729503..36b606481788a3291fa1564ebbc423c0f870ef6c 100644
--- a/Ring/Ring/Resources/eu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eu.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Gehitu kontaktuetara?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Orain zure kokapena partekatzen ari zara.";
-"conversation.explanationReceivingLocationFrom" = "Oraintxe bertan, zuzenean ari zara entzuten.";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Erantzun";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Zuk";
 "conversation.edited" = "Eusko Jaurlaritzaren laguntzarekin egindako azpitituluak";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ez dago gonbidapenik.";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Jar zaitez Jami-rekin.";
-"createAccount.lookingForUsernameAvailability" = "-Eskaintza bila.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "erabiltzaile-izena hartuta dago";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Kontua gehitzen";
 "createAccount.UsernameNotRegisteredTitle" = "Sare errorea";
 "createAccount.UsernameNotRegisteredMessage" = "Kontua sortu zen, baina erabiltzaile izena ez zen erregistratu.";
 "createAccount.timeoutTitle" = "Kontua sortua";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Ezabatu";
 "actions.backAction" = "Atzera";
 "actions.doneAction" = "Egina";
-"alerts.incomingCallAllertTitle" = "Dei bat dator.";
-"alerts.incomingCallButtonIgnore" = "Ezikusi";
-"actions.startAudioCall" = "Deiak audioz";
-"actions.startVideoCall" = "Bideo deialdia";
 "actions.goToSettings" = "Joan ezarpenetara";
 "actions.stopLocationSharing" = "Utzi partekatzeari";
 
 // Calls
-"calls.incomingCallInfo" = "Zurekin hitz egin nahi du.";
 "calls.ringing" = "-Badakit.";
 "calls.connecting" = "Konektatzen...";
 "calls.callFinished" = "Deiak amaitu dira.";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Gailuak";
 "accountPage.settingsHeader" = "Ezarpenak";
 "accountPage.notificationsHeader" = "Oharrak";
-"accountPage.usernameNotRegistered" = "Erabiltzaile izena: ez dago erregistratuta.";
-"accountPage.credentialsHeader" = "Kontuaren xehetasunak";
 "accountPage.blockedContacts" = "Blokeatutako kontaktuak";
 "accountPage.unblockContact" = "Desblokeatu";
 "accountPage.proxyAddressAlert" = "Eman helbide proxy bat";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Konektatzen";
 "account.statusUnknown" = "Ezezaguna";
 "account.statusConnectionerror" = "Lotura-hutsegitea";
-"account.needMigration" = "Kontua mugitu behar da.";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ni";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Gonbidapena jasota";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Irteera-deia";
 "generatedMessage.missedOutgoingCall" = "Galdutako irteera-deia";
 "generatedMessage.missedIncomingCall" = "Galdutako sarrera-deia";
 "generatedMessage.liveLocationSharing" = "Toki partekatzea zuzenean";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Iruzkinak";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
index 55a5fce858022def0f8e00211d845dbcba27646b..cbd4bfa20e1340f267c7c09949d74dcc521c2962 100644
--- a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "افزودن به مخاطبان؟";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "در حال حاضر مکان خود را به اشتراک می‌گذارید";
-"conversation.explanationReceivingLocationFrom" = "در حال حاضر مکان زنده را دریافت می‌کنید از";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "در پاسخ به";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "شما";
 "conversation.edited" = "ویرایش شده";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "بدون دعوت‌نامه";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "دعوت‌نامه‌های دریافت شده";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "با جمی هم همراهی کن";
-"createAccount.lookingForUsernameAvailability" = "بررسی در‌دسترس بودن…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "نام کاربری قبلاً برداشته شده";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "در حال افزودن حساب";
 "createAccount.UsernameNotRegisteredTitle" = "خطای شبکه";
 "createAccount.UsernameNotRegisteredMessage" = "حساب ایجاد شده، اما نام‌کاربری ثبت نشده است";
 "createAccount.timeoutTitle" = "حساب کاربری ایجاد شد";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "حذف";
 "actions.backAction" = "بازگشت";
 "actions.doneAction" = "انجام شد";
-"alerts.incomingCallAllertTitle" = "تماس دریافتی از";
-"alerts.incomingCallButtonIgnore" = "رد";
-"actions.startAudioCall" = "تماس صوتی";
-"actions.startVideoCall" = "تماس تصویری";
 "actions.goToSettings" = "برو به تنظیمات";
 "actions.stopLocationSharing" = "توقف اشتراک‌گذاری";
 
 // Calls
-"calls.incomingCallInfo" = "میخواهد با شما حرف بزند";
 "calls.ringing" = "در حال زنگ خوردن...";
 "calls.connecting" = "در حال اتصال...";
 "calls.callFinished" = "تماس پایان یافت";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "دستگاه ها";
 "accountPage.settingsHeader" = "تنظیمات";
 "accountPage.notificationsHeader" = "اعلان‌ها";
-"accountPage.usernameNotRegistered" = "نام کاربری: ثبت نشده";
-"accountPage.credentialsHeader" = "جزییات حساب کاربری";
 "accountPage.blockedContacts" = "مخاطبین مسدود‌شده";
 "accountPage.unblockContact" = "رفع مسدودی";
 "accountPage.proxyAddressAlert" = "تامین آدرس پروکسی";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "در حال اتصال";
 "account.statusUnknown" = "ناشناخته";
 "account.statusConnectionerror" = "خطای ارتباط";
-"account.needMigration" = "نیاز است که حساب شما انتقال یابد.";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "من";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "دعوت‌نامه دریافت شد";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "تماس خروجی";
 "generatedMessage.missedOutgoingCall" = "تماس خروجی از‌دست‌رفته";
 "generatedMessage.missedIncomingCall" = "تماس ورودی از‌دست‌رفته";
 "generatedMessage.liveLocationSharing" = "هم‌رسانی زنده مکان";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "بازخورد";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fa.lproj/Localizable.strings b/Ring/Ring/Resources/fa.lproj/Localizable.strings
index f77a922f3cf29a3d3341d778b6722e9120f29e7b..b13371a87049a505b3d12cb41bfce22e699d5941 100644
--- a/Ring/Ring/Resources/fa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "افزودن به مخاطبان؟";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "در حال حاضر مکان خود را به اشتراک می‌گذارید";
-"conversation.explanationReceivingLocationFrom" = "در حال حاضر مکان زنده را دریافت می‌کنید از";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "در پاسخ به";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "شما";
 "conversation.edited" = "ویرایش شده";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "بدون دعوت‌نامه";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "دعوت‌نامه‌های دریافت شد";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "با جمی هم همراهی کن";
-"createAccount.lookingForUsernameAvailability" = "بررسی در‌دسترس بودن…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "نام کاربری قبلاً انتخاب شده";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "در حال افزودن حساب";
 "createAccount.UsernameNotRegisteredTitle" = "خطای شبکه";
 "createAccount.UsernameNotRegisteredMessage" = "حساب ایجاد شده، اما نام‌کاربری ثبت نشده است";
 "createAccount.timeoutTitle" = "حساب کاربری ایجاد شد";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "حذف";
 "actions.backAction" = "بازگشت";
 "actions.doneAction" = "انجام شد";
-"alerts.incomingCallAllertTitle" = "تماس دریافتی از";
-"alerts.incomingCallButtonIgnore" = "رد";
-"actions.startAudioCall" = "تماس صوتی";
-"actions.startVideoCall" = "تماس تصویری";
 "actions.goToSettings" = "برو به تنظیمات";
 "actions.stopLocationSharing" = "توقف اشتراک‌گذاری";
 
 // Calls
-"calls.incomingCallInfo" = "میخواهد با شما حرف بزند";
 "calls.ringing" = "در حال زنگ خوردن...";
 "calls.connecting" = "در حال اتصال...";
 "calls.callFinished" = "تماس پایان یافت";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "دستگاه ها";
 "accountPage.settingsHeader" = "تنظیمات";
 "accountPage.notificationsHeader" = "اعلان‌ها";
-"accountPage.usernameNotRegistered" = "نام کاربری: ثبت نشده";
-"accountPage.credentialsHeader" = "جزییات حساب کاربری";
 "accountPage.blockedContacts" = "مخاطبین مسدود‌شده";
 "accountPage.unblockContact" = "رفع مسدودی";
 "accountPage.proxyAddressAlert" = "تامین آدرس پروکسی";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "در حال اتصال";
 "account.statusUnknown" = "ناشناخته";
 "account.statusConnectionerror" = "خطای ارتباط";
-"account.needMigration" = "نیاز است که حساب شما انتقال یابد.";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "من";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "دعوت‌نامه دریافت شد";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "تماس خروجی";
 "generatedMessage.missedOutgoingCall" = "تماس خروجی بی پاسخ";
 "generatedMessage.missedIncomingCall" = "تماس ورودی بی پاسخ";
 "generatedMessage.liveLocationSharing" = "هم‌رسانی زنده مکان";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "بازخورد";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index 78d7d00ef19a18816820a114787509d3760174dd..b60ec549c069bef7f9d840f212ce9125537584f1 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Lisätäänkö yhteystietoihin?";
 "conversation.notContactLabel" = "ei ole yhteystiedoissa";
 "conversation.messagePlaceholder" = "Kirjoita...";
-"conversation.explanationSendingLocationTo" = "Jaat sijaintisi tällä hetkellä";
-"conversation.explanationReceivingLocationFrom" = "Saat parhaillaan suoraa sijaintia";
 "conversation.errorSavingImage" = "Virhe tallennettaessa kuvaa galleriaan.";
 "conversation.receivedRequest" = "%@ lähetti sinulle keskustelukutsun.";
 "conversation.incomingRequest" = "lähetti sinulle keskustelukutsun.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Olet hyväksynyt keskustelukutsun.";
 "conversation.synchronizationMessage" = "Odotetaan, että %@ synkronoi keskustelun…";
 "conversation.inReplyTo" = "Vastauksena";
-"conversation.repliedTo" = " vastaus...";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Sinä";
 "conversation.edited" = "Muokattu";
-"conversation.deletedMessage" = "poisti viestin";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Henkilö estetty";
 
 // Invitations
 "invitations.noInvitations" = "Ei kutsuja";
-"invitations.pending" = "odottaa";
-"invitations.accepted" = "hyväksytty";
-"invitations.declined" = "hylätty";
-"invitations.blocked" = "estetty";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Estetty";
 "invitations.list" = "Kutsut vastaanotettu";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Liity Jamiin";
-"createAccount.lookingForUsernameAvailability" = "etsitään saatavuutta…";
-"createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Käyttäjänimi on jo varattu";
-"createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Lisätään tiliä";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
+"createAccount.invalidUsername" = "Virheellinen käyttäjänimi Anna kelvollinen käyttäjänimi.";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
+"createAccount.usernameValid" = "Käyttäjänimi on saatavilla.";
 "createAccount.UsernameNotRegisteredTitle" = "Verkkovirhe";
 "createAccount.UsernameNotRegisteredMessage" = "Tili luotiin, mutta käyttäjänimeä ei rekisteröity";
 "createAccount.timeoutTitle" = "Tili luotu";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Poista";
 "actions.backAction" = "Takaisin";
 "actions.doneAction" = "Valmis";
-"alerts.incomingCallAllertTitle" = "Saapuva puhelu";
-"alerts.incomingCallButtonIgnore" = "Sivuuta";
-"actions.startAudioCall" = "Äänipuhelu";
-"actions.startVideoCall" = "Videopuhelu";
 "actions.goToSettings" = "Mene asetuksiin";
 "actions.stopLocationSharing" = "Lopeta jakaminen";
 
 // Calls
-"calls.incomingCallInfo" = "haluaa puhua kanssasi";
 "calls.ringing" = "Soi...";
 "calls.connecting" = "Yhdistää...";
 "calls.callFinished" = "Puhelu päättynyt";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Laitteet";
 "accountPage.settingsHeader" = "Asetukset";
 "accountPage.notificationsHeader" = "Ilmoitukset";
-"accountPage.usernameNotRegistered" = "käyttäjätunnus: ei rekisteröity";
-"accountPage.credentialsHeader" = "Tilin tiedot";
 "accountPage.blockedContacts" = "Estetyt henkilöt";
 "accountPage.unblockContact" = "Poista esto";
 "accountPage.proxyAddressAlert" = "Anna välityspalvelimen osoite";
@@ -319,7 +307,7 @@
 "accountPage.contactMeOnJamiContant" = "Ota minuun yhteyttä \"%s\" Jami viestintäalustan kautta:  https://jami.net";
 "accountPage.passwordPlaceholder" = "Anna tilin salasana";
 "accountPage.usernamePlaceholder" = "Kirjoita haluamasi käyttäjänimi";
-"accountPage.registerNameErrorMessage" = "The username is unavailable.";
+"accountPage.registerNameErrorMessage" = "Käyttäjänimi ei ole saatavilla.";
 "accountPage.usernameRegistering" = "Rekisteröidään";
 "accountPage.usernameRegisterAction" = "Rekistöröi";
 "accountPage.usernameRegistrationFailedTitle" = "Rekisteröinti epäonnistui";
@@ -358,7 +346,7 @@
 "accountPage.manageAccount" = "Hallinnoi tiliä";
 "accountPage.encryptAccount" = "Salaa tili salasanalla";
 "accountPage.passwordExplanation" = "Jami-tili luodaan ja tallennetaan paikallisesti vain tälle laitteelle. Tilin avain on pakattuna ja pääsy tähän voidaan valinnaisesti suojata salasanalla.";
-"accountPage.passwordsDoNotMatch" = "Passwords do not match.";
+"accountPage.passwordsDoNotMatch" = "Salasanat eivät täsmää.";
 "accountPage.passwordCreated" = "Salasana luotu";
 "accountPage.passwordUpdated" = "Salasana päivitetty";
 "accountPage.linkedDevices" = "Linkitetyt laitteet";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Yhdistetään";
 "account.statusUnknown" = "Tuntematon";
 "account.statusConnectionerror" = "Yhteysvirhe";
-"account.needMigration" = "tili on siirrettävä";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Minä";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Kutsu vastaanotettu";
 "generatedMessage.swarmCreated" = "Keskustelu luotu";
-"generatedMessage.invitationReceived" = "kutsuttiin keskusteluun.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Liityit keskusteluun.";
-"generatedMessage.contactBlocked" = "estettiin keskustelusta.";
-"generatedMessage.contactUnblocked" = "keskustelun esto poistettiin.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Lähtevä puhelu";
 "generatedMessage.missedOutgoingCall" = "Vastaamaton lähtevä puhelu";
 "generatedMessage.missedIncomingCall" = "Vastaamaton puhelu";
 "generatedMessage.liveLocationSharing" = "Suoran sijainnin jakaminen";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Videoasetukset";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Palaute";
 "aboutJami.createdBy" = "Luonut:";
 "aboutJami.artworkBy" = "Ulkoasu:";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
index 03bfbfc8335c98dc46dc801fac029e8bf1158aae..dae0c951b2e82e5f9a5759ae63e1e1316791c425 100644
--- a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Ajouter au contacts ?";
 "conversation.notContactLabel" = "ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
-"conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
-"conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
 "conversation.incomingRequest" = "vous a envoyé une demande de conversation";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Vous avez accepté la demande de conversation";
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
-"conversation.repliedTo" = "répondre à";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vous";
 "conversation.edited" = "Modifié";
-"conversation.deletedMessage" = "a supprimé le message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact bloqué";
 
 // Invitations
 "invitations.noInvitations" = "Aucune invitation";
-"invitations.pending" = "En attente ...";
-"invitations.accepted" = "Accepté";
-"invitations.declined" = "Décliné";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqué";
 "invitations.list" = "Invitations reçues";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
-"createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir un nom d'utilisateur valide.";
-"createAccount.usernameAlreadyTaken" = "nom d'utilisateur déjà pris";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
-"createAccount.loading" = "Chargement...";
-"createAccount.waitCreateAccountTitle" = "Ajout d'un compte";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Supprimer";
 "actions.backAction" = "Précédent";
 "actions.doneAction" = "Effectué";
-"alerts.incomingCallAllertTitle" = "Appel entrant de";
-"alerts.incomingCallButtonIgnore" = "Ignorer";
-"actions.startAudioCall" = "Appel audio";
-"actions.startVideoCall" = "Appel vidéo";
 "actions.goToSettings" = "Aller aux Paramètres";
 "actions.stopLocationSharing" = "Arrêter le partage";
 
 // Calls
-"calls.incomingCallInfo" = "veut vous parler";
 "calls.ringing" = "Sonne...";
 "calls.connecting" = "En cours de connexion ...";
 "calls.callFinished" = "Appel terminé";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Appareils";
 "accountPage.settingsHeader" = "Paramètres";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "Le nom d'utilisateur n'est pas enregistré";
-"accountPage.credentialsHeader" = "Détails du compte";
 "accountPage.blockedContacts" = "Contacts bloqués";
 "accountPage.unblockContact" = "Débloquer";
 "accountPage.proxyAddressAlert" = "Fournir l'adresse du nœud délégataire";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "En cours de connexion";
 "account.statusUnknown" = "Inconnu";
 "account.statusConnectionerror" = "Erreur de connexion";
-"account.needMigration" = "Votre compte doit être migré";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Moi";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation reçue";
 "generatedMessage.swarmCreated" = "La conversation a été créée";
-"generatedMessage.invitationReceived" = "a été invité à rejoindre la conversation";
-"generatedMessage.invitationAccepted" = " a rejoint la conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Vous avez rejoint la conversation.";
-"generatedMessage.contactBlocked" = "a été bloqué de la conversation.";
-"generatedMessage.contactUnblocked" = "a été réintégré dans la conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Appel sortant";
 "generatedMessage.missedOutgoingCall" = "Appel sortant manqué";
 "generatedMessage.missedIncomingCall" = "Appel entrant manqué";
 "generatedMessage.liveLocationSharing" = "Partage de position en temps réel";
-"generatedMessage.contactLeftConversation" = "a quitté la conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Paramètres vidéo ";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Retour d'information";
 "aboutJami.createdBy" = "Créés par";
 "aboutJami.artworkBy" = "Création graphique";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Ajouter le compte";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
index 405521390d53296a890e57e088215b29fae26263..5022f74cffe60857e1182d9ce263e74df58c3fd7 100644
--- a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Ajouter au contacts ?";
 "conversation.notContactLabel" = "ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
-"conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
-"conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
 "conversation.incomingRequest" = "vous a envoyé une demande de conversation";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Vous avez accepté la demande de conversation";
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
-"conversation.repliedTo" = "répondre à";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vous";
 "conversation.edited" = "Modifié";
-"conversation.deletedMessage" = "a supprimé le message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact bloqué";
 
 // Invitations
 "invitations.noInvitations" = "Aucune invitation";
-"invitations.pending" = "En attente ...";
-"invitations.accepted" = "Accepté";
-"invitations.declined" = "Décliné";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqué";
 "invitations.list" = "Invitations reçues";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
-"createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir un nom d'utilisateur valide.";
-"createAccount.usernameAlreadyTaken" = "nom d'utilisateur déjà pris";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
-"createAccount.loading" = "Chargement...";
-"createAccount.waitCreateAccountTitle" = "Ajouter un compte";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Supprimer";
 "actions.backAction" = "Précédent";
 "actions.doneAction" = "Effectué";
-"alerts.incomingCallAllertTitle" = "Appel entrant de";
-"alerts.incomingCallButtonIgnore" = "Ignorer";
-"actions.startAudioCall" = "Appel audio";
-"actions.startVideoCall" = "Appel vidéo";
 "actions.goToSettings" = "Aller aux Paramètres";
 "actions.stopLocationSharing" = "Arrêter le partage";
 
 // Calls
-"calls.incomingCallInfo" = "veut vous parler";
 "calls.ringing" = "Sonne...";
 "calls.connecting" = "En cours de connexion ...";
 "calls.callFinished" = "Appel terminé";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Appareils";
 "accountPage.settingsHeader" = "Réglages";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "Le nom d'utilisateur n'est pas enregistré";
-"accountPage.credentialsHeader" = "Détails du compte";
 "accountPage.blockedContacts" = "Contacts bloqués";
 "accountPage.unblockContact" = "Débloquer";
 "accountPage.proxyAddressAlert" = "Fournir l'adresse du nœud délégataire";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connexion en cours";
 "account.statusUnknown" = "Inconnu";
 "account.statusConnectionerror" = "Erreur de connexion";
-"account.needMigration" = "Votre compte doit être migré";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Moi";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation reçue";
 "generatedMessage.swarmCreated" = "La conversation a été créée";
-"generatedMessage.invitationReceived" = "a été invité à rejoindre la conversation";
-"generatedMessage.invitationAccepted" = " a rejoint la conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Vous avez rejoint la conversation.";
-"generatedMessage.contactBlocked" = "a été bloqué de la conversation.";
-"generatedMessage.contactUnblocked" = "a été réintégré dans la conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Appel sortant";
 "generatedMessage.missedOutgoingCall" = "Appel sortant manqué";
 "generatedMessage.missedIncomingCall" = "Appel entrant manqué";
 "generatedMessage.liveLocationSharing" = "Partage de position en temps réel";
-"generatedMessage.contactLeftConversation" = "a quitté la conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Paramètres vidéo ";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Commentaires";
 "aboutJami.createdBy" = "Créés par";
 "aboutJami.artworkBy" = "Création graphique";
+
+// Accessibility
+"accessibility.close" = "Fermer";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Ajouter le compte";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
index 2e433cbfc08eb1895eb9827c969c885f7f917c55..5cd28e62740b129a22bfdbe18c427f7da9dbe06f 100644
--- a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Ajouter au contacts ?";
 "conversation.notContactLabel" = "ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
-"conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
-"conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
 "conversation.incomingRequest" = "vous a envoyé une demande de conversation";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Vous avez accepté la demande de conversation";
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
-"conversation.repliedTo" = "répondre à";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vous";
 "conversation.edited" = "Modifié";
-"conversation.deletedMessage" = "a supprimé le message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact bloqué";
 
 // Invitations
 "invitations.noInvitations" = "Aucune invitation";
-"invitations.pending" = "En attente ...";
-"invitations.accepted" = "Accepté";
-"invitations.declined" = "Décliné";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqué";
 "invitations.list" = "Invitations reçues";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
-"createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir un nom d'utilisateur valide.";
-"createAccount.usernameAlreadyTaken" = "nom d'utilisateur déjà pris";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
-"createAccount.loading" = "Chargement...";
-"createAccount.waitCreateAccountTitle" = "Ajout d'un compte";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Supprimer";
 "actions.backAction" = "Précédent";
 "actions.doneAction" = "Effectué";
-"alerts.incomingCallAllertTitle" = "Appel entrant de";
-"alerts.incomingCallButtonIgnore" = "Ignorer";
-"actions.startAudioCall" = "Appel audio";
-"actions.startVideoCall" = "Appel vidéo";
 "actions.goToSettings" = "Aller aux Paramètres";
 "actions.stopLocationSharing" = "Arrêter le partage";
 
 // Calls
-"calls.incomingCallInfo" = "veut vous parler";
 "calls.ringing" = "Sonne...";
 "calls.connecting" = "En cours de connexion ...";
 "calls.callFinished" = "Appel terminé";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Appareils";
 "accountPage.settingsHeader" = "Paramètres";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "Le nom d'utilisateur n'est pas enregistré";
-"accountPage.credentialsHeader" = "Détails du compte";
 "accountPage.blockedContacts" = "Contacts bloqués";
 "accountPage.unblockContact" = "Débloquer";
 "accountPage.proxyAddressAlert" = "Fournir l'adresse du nœud délégataire";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "En cours de connexion";
 "account.statusUnknown" = "Inconnu";
 "account.statusConnectionerror" = "Erreur de connexion";
-"account.needMigration" = "Votre compte doit être migré";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Moi";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation reçue";
 "generatedMessage.swarmCreated" = "La conversation a été créée";
-"generatedMessage.invitationReceived" = "a été invité à rejoindre la conversation";
-"generatedMessage.invitationAccepted" = " a rejoint la conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Vous avez rejoint la conversation.";
-"generatedMessage.contactBlocked" = "a été bloqué de la conversation.";
-"generatedMessage.contactUnblocked" = "a été réintégré dans la conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Appel sortant";
 "generatedMessage.missedOutgoingCall" = "Appel sortant manqué";
 "generatedMessage.missedIncomingCall" = "Appel entrant manqué";
 "generatedMessage.liveLocationSharing" = "Partage de position en temps réel";
-"generatedMessage.contactLeftConversation" = "a quitté la conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Paramètres vidéo ";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Retour d'information";
 "aboutJami.createdBy" = "Créés par";
 "aboutJami.artworkBy" = "Création graphique";
+
+// Accessibility
+"accessibility.close" = "Fermer";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Ajouter le compte";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
index e8a26b5ac4d4e618bf05cc10808f0648811290ae..e2d1fa2c443738581d2a12f73134c5e432c0cb9d 100644
--- a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Ajouter aux contacts ?";
 "conversation.notContactLabel" = "ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
-"conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
-"conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
 "conversation.incomingRequest" = "vous a envoyé une demande de conversation";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Vous avez accepté la demande de conversation";
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
-"conversation.repliedTo" = "répondre à";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vous";
 "conversation.edited" = "Modifié";
-"conversation.deletedMessage" = "a supprimé le message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact bloqué";
 
 // Invitations
 "invitations.noInvitations" = "Aucune invitation";
-"invitations.pending" = "En attente ...";
-"invitations.accepted" = "Accepté";
-"invitations.declined" = "Décliné";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqué";
 "invitations.list" = "Invitations reçues";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
-"createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir un nom d'utilisateur valide.";
-"createAccount.usernameAlreadyTaken" = "nom d'utilisateur non disponible";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
-"createAccount.loading" = "Chargement...";
-"createAccount.waitCreateAccountTitle" = "Ajout du compte";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Supprimer";
 "actions.backAction" = "Retour";
 "actions.doneAction" = "Effectué";
-"alerts.incomingCallAllertTitle" = "Appel entrant de";
-"alerts.incomingCallButtonIgnore" = "Ignorer";
-"actions.startAudioCall" = "Appel audio";
-"actions.startVideoCall" = "Appel vidéo";
 "actions.goToSettings" = "Aller aux Paramètres";
 "actions.stopLocationSharing" = "Arrêter le partage";
 
 // Calls
-"calls.incomingCallInfo" = "veut vous parler";
 "calls.ringing" = "Sonne...";
 "calls.connecting" = "En cours de connexion ...";
 "calls.callFinished" = "Appel terminé";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Appareils";
 "accountPage.settingsHeader" = "Réglages";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "Le nom d'utilisateur n'est pas enregistré";
-"accountPage.credentialsHeader" = "Détails du compte";
 "accountPage.blockedContacts" = "Contacts bloqués";
 "accountPage.unblockContact" = "Débloquer";
 "accountPage.proxyAddressAlert" = "Fournir l'adresse du nœud délégataire";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "En cours de connexion";
 "account.statusUnknown" = "Inconnu";
 "account.statusConnectionerror" = "Erreur de connexion";
-"account.needMigration" = "Votre compte doit être migré";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Moi ";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation reçue";
 "generatedMessage.swarmCreated" = "La conversation a été créée";
-"generatedMessage.invitationReceived" = "a été invité à rejoindre la conversation";
-"generatedMessage.invitationAccepted" = " a rejoint la conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Vous avez rejoint la conversation.";
-"generatedMessage.contactBlocked" = "a été bloqué de la conversation.";
-"generatedMessage.contactUnblocked" = "a été réintégré dans la conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Appel sortant";
 "generatedMessage.missedOutgoingCall" = "Appel sortant manqué";
 "generatedMessage.missedIncomingCall" = "Appel entrant manqué";
 "generatedMessage.liveLocationSharing" = "Partage de position en temps réel";
-"generatedMessage.contactLeftConversation" = "a quitté la conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Paramètres vidéo ";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Retour";
 "aboutJami.createdBy" = "Créés par";
 "aboutJami.artworkBy" = "Création graphique";
+
+// Accessibility
+"accessibility.close" = "Fermer";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Ajouter le compte";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index b4a0b2348d5ed145ed9fac7c79d6c98c4ad3921b..9bedd7213c0be24aa3d6d0b859a39f85a5ce1ebb 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Ajouter aux contacts ?";
 "conversation.notContactLabel" = "ne fait pas partie de vos contacts.";
 "conversation.messagePlaceholder" = "Écrire à";
-"conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
-"conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Une erreur s'est produite en sauvegardant l'image dans la galerie.";
 "conversation.receivedRequest" = "%@ vous a envoyé une invitation.";
 "conversation.incomingRequest" = "vous a envoyé une demande de conversation";
@@ -140,17 +138,16 @@
 "conversation.synchronizationTitle" = "Vous avez accepté la demande de conversation.";
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
-"conversation.repliedTo" = "répondre à";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vous";
 "conversation.edited" = "Modifié";
-"conversation.deletedMessage" = "a supprimé le message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact bloqué";
 
 // Invitations
 "invitations.noInvitations" = "Aucune invitation";
-"invitations.pending" = "En attente ...";
-"invitations.accepted" = "Accepté";
-"invitations.declined" = "Décliné";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
 "invitations.blocked" = "Bloqué";
 "invitations.list" = "Invitations reçues";
 
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Rejoindre Jami";
-"createAccount.lookingForUsernameAvailability" = "Vérification de la disponibilité...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nom d'utilisateur incorrect. Veuillez saisir un nom d'utilisateur valide.";
-"createAccount.usernameAlreadyTaken" = "Ce nom d'utilisateur est déjà utilisé";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "Le nom d'utilisateur est disponible.";
-"createAccount.loading" = "Chargement...";
-"createAccount.waitCreateAccountTitle" = "Ajout du compte";
 "createAccount.UsernameNotRegisteredTitle" = "Erreur de réseau";
 "createAccount.UsernameNotRegisteredMessage" = "Le compte a été créé mais le nom d'utilisateur n'a pas été enregistré";
 "createAccount.timeoutTitle" = "Compte créé";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Supprimer";
 "actions.backAction" = "Précédent";
 "actions.doneAction" = "Effectué";
-"alerts.incomingCallAllertTitle" = "Appel entrant de";
-"alerts.incomingCallButtonIgnore" = "Ignorer";
-"actions.startAudioCall" = "Appel audio";
-"actions.startVideoCall" = "Appel vidéo";
 "actions.goToSettings" = "Aller aux Paramètres";
 "actions.stopLocationSharing" = "Arrêter le partage";
 
 // Calls
-"calls.incomingCallInfo" = "veut vous parler";
 "calls.ringing" = "Sonne...";
 "calls.connecting" = "En cours de connexion ...";
 "calls.callFinished" = "Appel terminé";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Appareils";
 "accountPage.settingsHeader" = "Paramètres";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "Le nom d'utilisateur n'est pas enregistré";
-"accountPage.credentialsHeader" = "Détails du compte";
 "accountPage.blockedContacts" = "Contacts bloqués";
 "accountPage.unblockContact" = "Débloquer";
 "accountPage.proxyAddressAlert" = "Fournir l'adresse du nœud délégataire";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "En cours de connexion";
 "account.statusUnknown" = "Inconnu";
 "account.statusConnectionerror" = "Erreur de connexion";
-"account.needMigration" = "Votre compte doit être migré";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Moi";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation reçue";
 "generatedMessage.swarmCreated" = "La conversation a été créée";
-"generatedMessage.invitationReceived" = "a été invité à rejoindre la conversation";
-"generatedMessage.invitationAccepted" = " a rejoint la conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Vous avez rejoint la conversation.";
-"generatedMessage.contactBlocked" = "a été exclu de la conversation.";
-"generatedMessage.contactUnblocked" = "a été réintégré dans la conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Appel sortant";
 "generatedMessage.missedOutgoingCall" = "Appel sortant manqué";
 "generatedMessage.missedIncomingCall" = "Appel entrant manqué";
 "generatedMessage.liveLocationSharing" = "Partage de position en temps réel";
-"generatedMessage.contactLeftConversation" = "a quitté la conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Paramètres vidéo ";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Commentaires";
 "aboutJami.createdBy" = "Créés par";
 "aboutJami.artworkBy" = "Création graphique";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ga.lproj/Localizable.strings b/Ring/Ring/Resources/ga.lproj/Localizable.strings
index 8b4b50977843cefe6f30a2e2cd10913c10725a9a..581f164d2f783cf822f245e48800992e43356580 100644
--- a/Ring/Ring/Resources/ga.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ga.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Tá tú ag roinnt do shuíomh faoi láthair le ";
-"conversation.explanationReceivingLocationFrom" = "Tá tú ag fáil suíomh beo faoi láthair ó ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "I dtuarascáil do";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "A athchóiriú";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ní iarratais";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Téigh le Jami";
-"createAccount.lookingForUsernameAvailability" = "ag lorg ar fáil...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "ainm úsáideora a glacadh cheana féin";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Cunntas breise";
 "createAccount.UsernameNotRegisteredTitle" = "Measáin";
 "createAccount.UsernameNotRegisteredMessage" = "Cruthaíodh cuntas ach níor chláraigh ainm úsáideora";
 "createAccount.timeoutTitle" = "Cunntas a chruthú";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Scriosadh";
 "actions.backAction" = "Ar ais";
 "actions.doneAction" = "Ar deireadh";
-"alerts.incomingCallAllertTitle" = "Glao ar fáil ó ";
-"alerts.incomingCallButtonIgnore" = "Ignorate";
-"actions.startAudioCall" = "Glao as an gcliabhra";
-"actions.startVideoCall" = "Glaoigh físe";
 "actions.goToSettings" = "Téigh go dtí Suíomh";
 "actions.stopLocationSharing" = "Stop ag roinnt";
 
 // Calls
-"calls.incomingCallInfo" = "Tá sé ag iarraidh labhairt leat";
 "calls.ringing" = "Ag glaoch...";
 "calls.connecting" = "Ceangal...";
 "calls.callFinished" = "Glao críochnaithe";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Iarratais";
 "accountPage.settingsHeader" = "Cinntí";
 "accountPage.notificationsHeader" = "Feidhmeanna";
-"accountPage.usernameNotRegistered" = "ainm úsáideora: gan chlárú";
-"accountPage.credentialsHeader" = "sonraí cuntas";
 "accountPage.blockedContacts" = "Contaeanna blocaithe";
 "accountPage.unblockContact" = "Fág an blocaíocht";
 "accountPage.proxyAddressAlert" = "Cuir seoladh proxy ar fáil";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Ceangal";
 "account.statusUnknown" = "Ní aithnítear";
 "account.statusConnectionerror" = "Measadh Cearrbhachas";
-"account.needMigration" = "Ní mór an cuntas a aistriú";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mé féin";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Ag iarraidh a fháil";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Glacadh amach";
 "generatedMessage.missedOutgoingCall" = "Ag iarraidh glaoch a fháil";
 "generatedMessage.missedIncomingCall" = "Ag iarraidh glaoch a fháil";
 "generatedMessage.liveLocationSharing" = "Comparáid suíomh beo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Freagra";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Dlúth";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Cuid ar an cuntas";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/gl.lproj/Localizable.strings b/Ring/Ring/Resources/gl.lproj/Localizable.strings
index 92fe90d3af2434b846924df364c91f1a895fbce9..5f75faa5d1a2415bee4d6304970a0e82690f66ae 100644
--- a/Ring/Ring/Resources/gl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gl.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Engadir a contactos?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Actualmente está compartiendo a súa localización con ";
-"conversation.explanationReceivingLocationFrom" = "Actualmente está a recibir unha localización en directo de ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "En resposta a";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ti";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Non hai invitacións";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Convites recibidos";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Unirse a Jami";
-"createAccount.lookingForUsernameAvailability" = "Buscando disponibilidade...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "o nome de usuaria xa está collido";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Engadindo conta";
 "createAccount.UsernameNotRegisteredTitle" = "Fallo na rede";
 "createAccount.UsernameNotRegisteredMessage" = "Creou conta pero non rexistrou o nome de usuario";
 "createAccount.timeoutTitle" = "Creación de conta";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Eliminar";
 "actions.backAction" = "Atrás";
 "actions.doneAction" = "Feito";
-"alerts.incomingCallAllertTitle" = "Llamada de entrada de ";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Chamadas de audio";
-"actions.startVideoCall" = "Video chamada";
 "actions.goToSettings" = "Vai a Configuración";
 "actions.stopLocationSharing" = "Deixar de compartir";
 
 // Calls
-"calls.incomingCallInfo" = "quere falar contigo";
 "calls.ringing" = "Sonando...";
 "calls.connecting" = "Conectando...";
 "calls.callFinished" = "Llamada terminada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Axuste";
 "accountPage.notificationsHeader" = "Notificacións";
-"accountPage.usernameNotRegistered" = "Nome de usuario: non rexistrado";
-"accountPage.credentialsHeader" = "Detalles da conta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Indicar dirección de proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conectando";
 "account.statusUnknown" = "Descoñecido";
 "account.statusConnectionerror" = "Erro de conexión";
-"account.needMigration" = "conta debe ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Eu";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Convite recibido";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Chamada saínte";
 "generatedMessage.missedOutgoingCall" = "Chamada sen resposta";
 "generatedMessage.missedIncomingCall" = "Chamada entrante perdida";
 "generatedMessage.liveLocationSharing" = "Compartillo de localización en directo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "A túa opinión";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Casi";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Engadir conta";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/gu.lproj/Localizable.strings b/Ring/Ring/Resources/gu.lproj/Localizable.strings
index f0b7c0668a5c0c62e01ee214f3226215aea72ef8..3ddca864337084906d889fdac26f0ac6765f56cc 100644
--- a/Ring/Ring/Resources/gu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gu.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "સંપર્કમાં ઉમેરો?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "તમે હાલમાં તમારી સ્થાન શેર કરી રહ્યા છો ";
-"conversation.explanationReceivingLocationFrom" = "તમે હાલમાં ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "જવાબમાં";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "તમે";
 "conversation.edited" = "સંપાદિત";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "કોઈ આમંત્રણ નહીં";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "જમી સાથે જોડાઓ";
-"createAccount.lookingForUsernameAvailability" = "ઉપલબ્ધતા માટે જોઈ રહ્યા છીએ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "પહેલેથી જ લેવામાં વપરાશકર્તા નામ";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "ઉમેરાયેલ ખાતું";
 "createAccount.UsernameNotRegisteredTitle" = "નેટવર્ક ભૂલ";
 "createAccount.UsernameNotRegisteredMessage" = "એકાઉન્ટ બનાવવામાં આવ્યું હતું પરંતુ વપરાશકર્તા નામ નોંધાયેલ નથી";
 "createAccount.timeoutTitle" = "એકાઉન્ટ બનાવ્યું";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "કાઢી નાખો";
 "actions.backAction" = "પાછા";
 "actions.doneAction" = "પૂર્ણ";
-"alerts.incomingCallAllertTitle" = " થી આવનારી કૉલ";
-"alerts.incomingCallButtonIgnore" = "અવગણો";
-"actions.startAudioCall" = "ઑડિઓ કૉલ";
-"actions.startVideoCall" = "વિડિયો કૉલ";
 "actions.goToSettings" = "સેટિંગ્સ પર જાઓ";
 "actions.stopLocationSharing" = "શેર કરવાનું બંધ કરો";
 
 // Calls
-"calls.incomingCallInfo" = "તમારી સાથે વાત કરવા માંગે છે";
 "calls.ringing" = "રિંગિંગ.";
 "calls.connecting" = "કનેક્ટિંગ.";
 "calls.callFinished" = "કૉલ સમાપ્ત";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "ઉપકરણો";
 "accountPage.settingsHeader" = "સેટિંગ્સ";
 "accountPage.notificationsHeader" = "સૂચનાઓ";
-"accountPage.usernameNotRegistered" = "વપરાશકર્તા નામઃ નોંધાયેલ નથી";
-"accountPage.credentialsHeader" = "એકાઉન્ટ વિગતો";
 "accountPage.blockedContacts" = "અવરોધિત સંપર્કો";
 "accountPage.unblockContact" = "અવરોધિત કરો";
 "accountPage.proxyAddressAlert" = "પ્રોક્સી સરનામું પ્રદાન કરો";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "કનેક્ટિંગ";
 "account.statusUnknown" = "અજ્ઞાત";
 "account.statusConnectionerror" = "કનેક્શન ભૂલ";
-"account.needMigration" = "એકાઉન્ટને સ્થાનાંતરિત કરવાની જરૂર છે";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "હું";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "પ્રાપ્ત આમંત્રણ";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "બહાર નીકળો કૉલ";
 "generatedMessage.missedOutgoingCall" = "બહાર નીકળો કૉલ ચૂકી";
 "generatedMessage.missedIncomingCall" = "ઇનકમિંગ કૉલ ચૂકી";
 "generatedMessage.liveLocationSharing" = "લાઇવ સ્થાન શેરિંગ";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "પ્રતિસાદ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "બંધ";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "એકાઉન્ટ ઉમેરો";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/hak.lproj/Localizable.strings b/Ring/Ring/Resources/hak.lproj/Localizable.strings
index 9ec652c2fbcad11b86f7fb8d90c030d288a9a44b..bba776f0b394779e8dedd0a992f83650c83dfdde 100644
--- a/Ring/Ring/Resources/hak.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hak.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "添加至通讯录吗?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "您当前正在分享实时位置到";
-"conversation.explanationReceivingLocationFrom" = "您当前正在接收实时位置,来自";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "沒有邀請";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "加入 Jami";
-"createAccount.lookingForUsernameAvailability" = "正在確認是否可用……";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "使用者名稱已被使用";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "添加账户";
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "刪除";
 "actions.backAction" = "前一個";
 "actions.doneAction" = "完成";
-"alerts.incomingCallAllertTitle" = "來電從";
-"alerts.incomingCallButtonIgnore" = "忽略";
-"actions.startAudioCall" = "语音通话";
-"actions.startVideoCall" = "视频通话";
 "actions.goToSettings" = "前往设置";
 "actions.stopLocationSharing" = "停止分享";
 
 // Calls
-"calls.incomingCallInfo" = "想要与您对话";
 "calls.ringing" = "響鈴中……";
 "calls.connecting" = "正在连接…";
 "calls.callFinished" = "通话已结束";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "裝置";
 "accountPage.settingsHeader" = "設定";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "用户名:未被注册";
-"accountPage.credentialsHeader" = "账户详情";
 "accountPage.blockedContacts" = "已屏蔽的联系人";
 "accountPage.unblockContact" = "取消屏蔽";
 "accountPage.proxyAddressAlert" = "提供代理地址";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "連接中";
 "account.statusUnknown" = "未知";
 "account.statusConnectionerror" = "连接错误";
-"account.needMigration" = "该账户需迁移";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "我";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已接受邀请";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "撥出電話";
 "generatedMessage.missedOutgoingCall" = "未接去電";
 "generatedMessage.missedIncomingCall" = "未接來電";
 "generatedMessage.liveLocationSharing" = "实时位置分享";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "回饋";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "關閉";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "添加账户";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index de2c16ce1c4bcefb71f446a22bdc0560c2392731..08889abf1b1d73729872a88192f41cc9df5a88aa 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "אתה חולק את המיקום שלך עם ";
-"conversation.explanationReceivingLocationFrom" = "אתה מקבל כרגע מיקום חי מ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "בתשובה";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "מאורגן";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "אין הזמנות";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "הצטרף לג'מי.";
-"createAccount.lookingForUsernameAvailability" = "מחפשים זמינות...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "שם המשתמש כבר נלקח";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "הוספת חשבון";
 "createAccount.UsernameNotRegisteredTitle" = "טעות רשת";
 "createAccount.UsernameNotRegisteredMessage" = "חשבון נוצר אבל שם משתמש לא נרשם";
 "createAccount.timeoutTitle" = "חשבון נוצר";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "מחק";
 "actions.backAction" = "חזרה";
 "actions.doneAction" = "סיים";
-"alerts.incomingCallAllertTitle" = "שיחת כולה מ";
-"alerts.incomingCallButtonIgnore" = "להתעלם";
-"actions.startAudioCall" = "שיחת קול";
-"actions.startVideoCall" = "שיחת וידאו";
 "actions.goToSettings" = "לכו להגדיר";
 "actions.stopLocationSharing" = "תפסיק לחלוק";
 
 // Calls
-"calls.incomingCallInfo" = "רוצה לדבר איתך.";
 "calls.ringing" = "זה מצלצל...";
 "calls.connecting" = "חיבור...";
 "calls.callFinished" = "שיחת הודעה נגמרה.";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "התקנים";
 "accountPage.settingsHeader" = "הגדרות";
 "accountPage.notificationsHeader" = "הודעות";
-"accountPage.usernameNotRegistered" = "שם משתמש: לא רשום";
-"accountPage.credentialsHeader" = "פרטים על החשבון";
 "accountPage.blockedContacts" = "אנשי קשר חסומים";
 "accountPage.unblockContact" = "פותח את הבלוק";
 "accountPage.proxyAddressAlert" = "תורם כתובת פרוקסי";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "מתחבר";
 "account.statusUnknown" = "לא מוכר";
 "account.statusConnectionerror" = "טעות חיבור";
-"account.needMigration" = "חשבון צריך לעבור";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "אני";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "הזמנה התקבלה";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "שיחה יוצאת";
 "generatedMessage.missedOutgoingCall" = "פספסתי שיחת פנויה";
 "generatedMessage.missedIncomingCall" = "פספסתי שיחת כניסה";
 "generatedMessage.liveLocationSharing" = "שיתוף מיקום חי";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "משוב";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "סגירה";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "הוספת חשבון";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
index 716802990f5d3adcd5b13de9431973227f8622ef..f84e82c844c7d5c697213796e8b26f777d9890c7 100644
--- a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "संपर्क जोड़ें?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "आप वर्तमान में अपने स्थान को साझा कर रहे हैं ";
-"conversation.explanationReceivingLocationFrom" = "आप वर्तमान में एक लाइव स्थान प्राप्त कर रहे हैं ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "उत्तर में";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "तुम";
 "conversation.edited" = "सम्पादित";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "कोई निमंत्रण नहीं";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "आमंत्रण प्राप्त हुवा";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "जामी में शामिल हों";
-"createAccount.lookingForUsernameAvailability" = "उपलब्धता की तलाश में...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "पहले से ही लिया गया उपयोगकर्ता नाम";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "खाता जोड़ना";
 "createAccount.UsernameNotRegisteredTitle" = "नेटवर्क त्रुटि";
 "createAccount.UsernameNotRegisteredMessage" = "खाता बनाया गया था लेकिन उपयोगकर्ता नाम पंजीकृत नहीं किया गया था";
 "createAccount.timeoutTitle" = "खाता बनाया गया";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "हटाएँ";
 "actions.backAction" = "वापस";
 "actions.doneAction" = "हो गया";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "अनदेखा करें";
-"actions.startAudioCall" = "ऑडियो कॉल";
-"actions.startVideoCall" = "वीडियो कॉल";
 "actions.goToSettings" = "सेटिंग्स पर जाएं";
 "actions.stopLocationSharing" = "साझा करना बंद";
 
 // Calls
-"calls.incomingCallInfo" = "आपसे बात करना चाहता है";
 "calls.ringing" = "बज रहा है...";
 "calls.connecting" = "कनेक्टिंग...";
 "calls.callFinished" = "कॉल समाप्त";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "उपकरण";
 "accountPage.settingsHeader" = "सेटिंग्स";
 "accountPage.notificationsHeader" = "सूचनाएं";
-"accountPage.usernameNotRegistered" = "उपयोगकर्ता नामः पंजीकृत नहीं";
-"accountPage.credentialsHeader" = "खाता विवरण";
 "accountPage.blockedContacts" = "अवरुद्ध संपर्क";
 "accountPage.unblockContact" = "अवरोधन को अनब्लॉक करें";
 "accountPage.proxyAddressAlert" = "प्रॉक्सी पता प्रदान करें";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "कनेक्ट करना";
 "account.statusUnknown" = "अज्ञात";
 "account.statusConnectionerror" = "कनेक्शन त्रुटि";
-"account.needMigration" = "खाता को स्थानांतरित करना होगा";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "मैं";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "प्राप्त निमंत्रण";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "आउटगोइंग कॉल";
 "generatedMessage.missedOutgoingCall" = "आउटगोइंग कॉल छूट गयी ";
 "generatedMessage.missedIncomingCall" = "मिस्ड इनकमिंग कॉल";
 "generatedMessage.liveLocationSharing" = "स्थान साझा करने के लिए लाइव";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "प्रतिपुष्टि (फीड्बैक)";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "बंद करे";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "खाता जोड़ें";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/hi.lproj/Localizable.strings b/Ring/Ring/Resources/hi.lproj/Localizable.strings
index 0da77e77b67511913bc287be95b78a593bcc1673..ffcde81bf0bd36c4f0602ef0f1c386cf925d7d97 100644
--- a/Ring/Ring/Resources/hi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "संपर्क जोड़ें?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "आप वर्तमान में अपने स्थान को साझा कर रहे हैं ";
-"conversation.explanationReceivingLocationFrom" = "आप वर्तमान में एक लाइव स्थान प्राप्त कर रहे हैं ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "उत्तर में";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "तुम";
 "conversation.edited" = "सम्पादित";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "कोई निमंत्रण नहीं";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "आमंत्रण प्राप्त हुवा";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "जामी में शामिल हों";
-"createAccount.lookingForUsernameAvailability" = "उपलब्धता की तलाश में...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "पहले से ही लिया गया उपयोगकर्ता नाम";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "खाता जोड़ना";
 "createAccount.UsernameNotRegisteredTitle" = "नेटवर्क त्रुटि";
 "createAccount.UsernameNotRegisteredMessage" = "खाता बनाया गया था लेकिन उपयोगकर्ता नाम पंजीकृत नहीं किया गया था";
 "createAccount.timeoutTitle" = "खाता बनाया गया";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "हटाएँ";
 "actions.backAction" = "वापस";
 "actions.doneAction" = "हो गया";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "अनदेखा करें";
-"actions.startAudioCall" = "ऑडियो कॉल";
-"actions.startVideoCall" = "वीडियो कॉल";
 "actions.goToSettings" = "सेटिंग्स पर जाएं";
 "actions.stopLocationSharing" = "साझा करना बंद";
 
 // Calls
-"calls.incomingCallInfo" = "आपसे बात करना चाहता है";
 "calls.ringing" = "बज रहा है...";
 "calls.connecting" = "कनेक्टिंग...";
 "calls.callFinished" = "कॉल समाप्त";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "उपकरण";
 "accountPage.settingsHeader" = "सेटिंग्स";
 "accountPage.notificationsHeader" = "सूचनाएं";
-"accountPage.usernameNotRegistered" = "उपयोगकर्ता नामः पंजीकृत नहीं";
-"accountPage.credentialsHeader" = "खाता विवरण";
 "accountPage.blockedContacts" = "अवरुद्ध संपर्क";
 "accountPage.unblockContact" = "अवरोधन को अनब्लॉक करें";
 "accountPage.proxyAddressAlert" = "प्रॉक्सी पता प्रदान करें";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "कनेक्ट करना";
 "account.statusUnknown" = "अज्ञात";
 "account.statusConnectionerror" = "कनेक्शन त्रुटि";
-"account.needMigration" = "खाता को स्थानांतरित करना होगा";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "मैं";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "प्राप्त निमंत्रण";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "आउटगोइंग कॉल";
 "generatedMessage.missedOutgoingCall" = "मिस्ड आउटगोइंग कॉल";
 "generatedMessage.missedIncomingCall" = "मिस्ड इनकमिंग कॉल";
 "generatedMessage.liveLocationSharing" = "स्थान साझा करने के लिए लाइव";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "फीड्बैक";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "बंद करे";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "खाता जोड़ें";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/hr.lproj/Localizable.strings b/Ring/Ring/Resources/hr.lproj/Localizable.strings
index b707810363d30204096900b994fb35595b355ad7..2503e087bfad4a901bf43aaff39496e2f8553481 100644
--- a/Ring/Ring/Resources/hr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Dodati u kontakte?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Trenutno dijelite svoju lokaciju s ";
-"conversation.explanationReceivingLocationFrom" = "Trenutno primaš uživo lokaciju od ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "U odgovor na";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ti si";
 "conversation.edited" = "U redigiranju";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Nema poziva";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Pridruži se Jamiju.";
-"createAccount.lookingForUsernameAvailability" = "Traže dostupnost...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "korisničko ime je već zauzeto";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Dodajem račun";
 "createAccount.UsernameNotRegisteredTitle" = "Greška mreže";
 "createAccount.UsernameNotRegisteredMessage" = "Stvoreno je račun, ali korisničko ime nije registrirano";
 "createAccount.timeoutTitle" = "Stvoreni račun";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Izbriši";
 "actions.backAction" = "Natrag";
 "actions.doneAction" = "Učinjeno";
-"alerts.incomingCallAllertTitle" = "Približeći poziv iz ";
-"alerts.incomingCallButtonIgnore" = "Ignoriraj";
-"actions.startAudioCall" = "Audio poziv";
-"actions.startVideoCall" = "Video poziv";
 "actions.goToSettings" = "Idi u postavke";
 "actions.stopLocationSharing" = "Prestani dijeliti";
 
 // Calls
-"calls.incomingCallInfo" = "Želi razgovarati s tobom.";
 "calls.ringing" = "Zvuči...";
 "calls.connecting" = "Povezivanje...";
 "calls.callFinished" = "Zvatak završen";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Uređaji";
 "accountPage.settingsHeader" = "Postavke";
 "accountPage.notificationsHeader" = "Uloga za obavještavanje";
-"accountPage.usernameNotRegistered" = "korisničko ime: nije registrirano";
-"accountPage.credentialsHeader" = "Podrobnosti o računu";
 "accountPage.blockedContacts" = "Blokirani kontakti";
 "accountPage.unblockContact" = "Deblokiraj";
 "accountPage.proxyAddressAlert" = "Ustavite proxy adresu";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Spajanje";
 "account.statusUnknown" = "Nepoznato";
 "account.statusConnectionerror" = "Pogreška povezivanja";
-"account.needMigration" = "računa mora biti migrirana";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ja";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Poziv primljen";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Odlazni poziv";
 "generatedMessage.missedOutgoingCall" = "Propušteni odlazni poziv";
 "generatedMessage.missedIncomingCall" = "Propušteni dolazni poziv";
 "generatedMessage.liveLocationSharing" = "Udio lokacije uživo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Povratna informacija";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "-U blizini.";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Dodaj račun";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
index b707810363d30204096900b994fb35595b355ad7..2503e087bfad4a901bf43aaff39496e2f8553481 100644
--- a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Dodati u kontakte?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Trenutno dijelite svoju lokaciju s ";
-"conversation.explanationReceivingLocationFrom" = "Trenutno primaš uživo lokaciju od ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "U odgovor na";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ti si";
 "conversation.edited" = "U redigiranju";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Nema poziva";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Pridruži se Jamiju.";
-"createAccount.lookingForUsernameAvailability" = "Traže dostupnost...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "korisničko ime je već zauzeto";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Dodajem račun";
 "createAccount.UsernameNotRegisteredTitle" = "Greška mreže";
 "createAccount.UsernameNotRegisteredMessage" = "Stvoreno je račun, ali korisničko ime nije registrirano";
 "createAccount.timeoutTitle" = "Stvoreni račun";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Izbriši";
 "actions.backAction" = "Natrag";
 "actions.doneAction" = "Učinjeno";
-"alerts.incomingCallAllertTitle" = "Približeći poziv iz ";
-"alerts.incomingCallButtonIgnore" = "Ignoriraj";
-"actions.startAudioCall" = "Audio poziv";
-"actions.startVideoCall" = "Video poziv";
 "actions.goToSettings" = "Idi u postavke";
 "actions.stopLocationSharing" = "Prestani dijeliti";
 
 // Calls
-"calls.incomingCallInfo" = "Želi razgovarati s tobom.";
 "calls.ringing" = "Zvuči...";
 "calls.connecting" = "Povezivanje...";
 "calls.callFinished" = "Zvatak završen";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Uređaji";
 "accountPage.settingsHeader" = "Postavke";
 "accountPage.notificationsHeader" = "Uloga za obavještavanje";
-"accountPage.usernameNotRegistered" = "korisničko ime: nije registrirano";
-"accountPage.credentialsHeader" = "Podrobnosti o računu";
 "accountPage.blockedContacts" = "Blokirani kontakti";
 "accountPage.unblockContact" = "Deblokiraj";
 "accountPage.proxyAddressAlert" = "Ustavite proxy adresu";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Spajanje";
 "account.statusUnknown" = "Nepoznato";
 "account.statusConnectionerror" = "Pogreška povezivanja";
-"account.needMigration" = "računa mora biti migrirana";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ja";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Poziv primljen";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Odlazni poziv";
 "generatedMessage.missedOutgoingCall" = "Propušteni odlazni poziv";
 "generatedMessage.missedIncomingCall" = "Propušteni dolazni poziv";
 "generatedMessage.liveLocationSharing" = "Udio lokacije uživo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Povratna informacija";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "-U blizini.";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Dodaj račun";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/hu.lproj/Localizable.strings b/Ring/Ring/Resources/hu.lproj/Localizable.strings
index 4aafc149b3b92942a12681b877114b9ed0425a29..e22b5d76ec5702f3fa679a845e474dba21aa1859 100644
--- a/Ring/Ring/Resources/hu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hu.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Hozzáadás a kapcsolattartók közé?";
 "conversation.notContactLabel" = "nem szerepel a kapcsolattartólistában";
 "conversation.messagePlaceholder" = "Írás a következő(k)nek:";
-"conversation.explanationSendingLocationTo" = "Ön megosztja valós idejű helyét a következővel:";
-"conversation.explanationReceivingLocationFrom" = "Jelenleg valós idejű helyet kap a következőtől:";
 "conversation.errorSavingImage" = "Hiba történt a kép gyűjteménybe történő mentése közben.";
 "conversation.receivedRequest" = "%@ beszélgetésre szóló meghívót küldött Önnek.";
 "conversation.incomingRequest" = "beszélgetésre szóló meghívót küldött Önnek.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Ön elfogadott a beszélgetési meghívást.";
 "conversation.synchronizationMessage" = "Várakozás a(z) %@ csatlakozásra a beszélgetés összehangolásához…";
 "conversation.inReplyTo" = "Válaszul erre:";
-"conversation.repliedTo" = "válaszolt neki:";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ön";
 "conversation.edited" = "Szerkesztve";
-"conversation.deletedMessage" = "Törölt üzenet";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Kapcsolattartó letiltva";
 
 // Invitations
 "invitations.noInvitations" = "Nincs meghívás";
-"invitations.pending" = "függőben levő…";
-"invitations.accepted" = "elfogadott";
-"invitations.declined" = "elutasítva";
-"invitations.blocked" = "letiltva";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Letiltva";
 "invitations.list" = "Meghívások megérkeztek";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Jami csatlakozása";
-"createAccount.lookingForUsernameAvailability" = "a rendelkezésre állás keresése…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Érvénytelen felhasználónév. Kérjük, adjon meg egy érvényes felhasználónevet.";
-"createAccount.usernameAlreadyTaken" = "A felhasználó név már foglalt";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Betöltés…";
-"createAccount.waitCreateAccountTitle" = "Fiók hozzáadása";
 "createAccount.UsernameNotRegisteredTitle" = "Hálózati hiba";
 "createAccount.UsernameNotRegisteredMessage" = "A fiók létrehozva de a felhasználónevét nincs bejegyzett";
 "createAccount.timeoutTitle" = "Fiók létrehozva";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Törlés";
 "actions.backAction" = "Vissza";
 "actions.doneAction" = "Kész";
-"alerts.incomingCallAllertTitle" = "Bejövő hívás a következőtől: ";
-"alerts.incomingCallButtonIgnore" = "Figyelmen kívül hagy";
-"actions.startAudioCall" = "Hanghívás";
-"actions.startVideoCall" = "Videohívás";
 "actions.goToSettings" = "Beállítások megnyitása";
 "actions.stopLocationSharing" = "Megosztás leállítása";
 
 // Calls
-"calls.incomingCallInfo" = "szeretne Önnel beszélni";
 "calls.ringing" = "Csörögni…";
 "calls.connecting" = "Kapcsolódás…";
 "calls.callFinished" = "A hívás befejeződött";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Eszközök";
 "accountPage.settingsHeader" = "Beállítások";
 "accountPage.notificationsHeader" = "Értesítések";
-"accountPage.usernameNotRegistered" = "felhasználónév: nincs bejegyzett";
-"accountPage.credentialsHeader" = "Fiók részletek";
 "accountPage.blockedContacts" = "Letiltott kapcsolattartók";
 "accountPage.unblockContact" = "Letiltás feloldása";
 "accountPage.proxyAddressAlert" = "Adja meg a meghatalmazott címet";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Kapcsolódás";
 "account.statusUnknown" = "Ismeretlen";
 "account.statusConnectionerror" = "Csatlakozási hiba";
-"account.needMigration" = "Fiókáttelepítés szükséges";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Én";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Meghívás megérkezett";
 "generatedMessage.swarmCreated" = "Beszélgetés létrehozva";
-"generatedMessage.invitationReceived" = "meghívást kapott, hogy csatlakozzon a beszélgetéshez.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Ön csatlakozott a beszélgetéshez.";
-"generatedMessage.contactBlocked" = "le lett tiltva a beszélgetésből.";
-"generatedMessage.contactUnblocked" = "beszélgetés letiltása fel lett oldva.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Kimenő hívás";
 "generatedMessage.missedOutgoingCall" = "Nem fogadott kimenő hívás";
 "generatedMessage.missedIncomingCall" = "Nem fogadott bejövő hívás";
 "generatedMessage.liveLocationSharing" = "Valós idejű hely megosztása";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Videóbeállítások";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Visszajelzés";
 "aboutJami.createdBy" = "Készítette";
 "aboutJami.artworkBy" = "Művész";
+
+// Accessibility
+"accessibility.close" = "Bezárás";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Fiók hozzáadása";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Névjegykép";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/hy.lproj/Localizable.strings b/Ring/Ring/Resources/hy.lproj/Localizable.strings
index dcba9003e8b9c7228a709685e844a9f4ef69b9ea..1d97a0b0ad1f108649a9540a8590990afca9dfca 100644
--- a/Ring/Ring/Resources/hy.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hy.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Բարձրացնել կոնտակտներին:";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Դուք ներկայումս կիսում եք ձեր գտնվելու վայրը ";
-"conversation.explanationReceivingLocationFrom" = "Դուք ներկայումս ստանում եք կենդանի տեղակայման ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Պատասխանելով";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Դուք";
 "conversation.edited" = "Կարգավորվել";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ոչ մի հրավիրում";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Միացեք Ջամիին";
-"createAccount.lookingForUsernameAvailability" = "փնտրում է առկայություն...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "օգտագործողի անունը արդեն վերցված է";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Բաժին ավելացում";
 "createAccount.UsernameNotRegisteredTitle" = "Համացանցի սխալ";
 "createAccount.UsernameNotRegisteredMessage" = "Հաշիվ է ստեղծվել, բայց օգտատերերի անունը չի գրանցվել";
 "createAccount.timeoutTitle" = "Հաշիվ ստեղծվել";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Հեռացնել";
 "actions.backAction" = "Վերադարձ";
 "actions.doneAction" = "Կատարված";
-"alerts.incomingCallAllertTitle" = "Հեռախոսազանգ ";
-"alerts.incomingCallButtonIgnore" = "Անտեսել";
-"actions.startAudioCall" = "Ձայնային զանգ";
-"actions.startVideoCall" = "Տեսագրական զանգ";
 "actions.goToSettings" = "Գնացեք Կարգավորումների էջ";
 "actions.stopLocationSharing" = "Սեղմեք կիսումը";
 
 // Calls
-"calls.incomingCallInfo" = "ուզում է խոսել քեզ հետ";
 "calls.ringing" = "Զանգում է...";
 "calls.connecting" = "Կապակցում...";
 "calls.callFinished" = "Հանգիստը ավարտված է";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "սարքավորումներ";
 "accountPage.settingsHeader" = "Կարգավորումներ";
 "accountPage.notificationsHeader" = "Հրավերներ";
-"accountPage.usernameNotRegistered" = "օգտագործողի անունը. գրանցված չէ";
-"accountPage.credentialsHeader" = "Հաշվետու մանրամասներ";
 "accountPage.blockedContacts" = "Պակված շփումներ";
 "accountPage.unblockContact" = "Բաց թողնել";
 "accountPage.proxyAddressAlert" = "Պատվիրել պրոկսի հասցեն";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Կապակցում";
 "account.statusUnknown" = "Անհայտ";
 "account.statusConnectionerror" = "Կապման սխալ";
-"account.needMigration" = "հաշիվը պետք է տեղափոխվի";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ես";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Հրավիրություն";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Արտաքին զանգ";
 "generatedMessage.missedOutgoingCall" = "Հեռացվող զանգը բացակայում է";
 "generatedMessage.missedIncomingCall" = "Հեռացած ներկա զանգ";
 "generatedMessage.liveLocationSharing" = "Կայքի առցանց փոխանակում";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Վերադարձ կապ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Մոտակայքում";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Բաժնորդագրություն ավելացնել";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Պրոֆիլային նկար";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/id.lproj/Localizable.strings b/Ring/Ring/Resources/id.lproj/Localizable.strings
index 0cd424801ac4ca99d2af2472c53a00a68979a180..d99a9a205286806bfeed5bfe54aea766700af639 100644
--- a/Ring/Ring/Resources/id.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/id.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Tambah ke kontak?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Anda saat ini berbagi lokasi Anda dengan";
-"conversation.explanationReceivingLocationFrom" = "Saat ini Anda sedang menerima lokasi langsung dari";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Sebagai balasan";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Anda";
 "conversation.edited" = "Diedit";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Tidak ada undangan";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Gabung Jami";
-"createAccount.lookingForUsernameAvailability" = "Memeriksa ketersediaan...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Nama pengguna sudah diambil";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Menambahkan akun";
 "createAccount.UsernameNotRegisteredTitle" = "Galat jaringan";
 "createAccount.UsernameNotRegisteredMessage" = "Akun telah dibuat tetapi nama pengguna tidak terdaftar";
 "createAccount.timeoutTitle" = "Akun Dibuat";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Hapus";
 "actions.backAction" = "Kembali";
 "actions.doneAction" = "Selesai";
-"alerts.incomingCallAllertTitle" = "Panggilan masuk dari";
-"alerts.incomingCallButtonIgnore" = "Abaikan";
-"actions.startAudioCall" = "Panggilan suara";
-"actions.startVideoCall" = "Panggilan video";
 "actions.goToSettings" = "Ke pengaturan";
 "actions.stopLocationSharing" = "Berhenti berbagi";
 
 // Calls
-"calls.incomingCallInfo" = "ingin berbicara dengan Anda";
 "calls.ringing" = "Berdering...";
 "calls.connecting" = "Menghubungkan...";
 "calls.callFinished" = "Panggilan selesai";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Perangkat";
 "accountPage.settingsHeader" = "Setelan";
 "accountPage.notificationsHeader" = "Notifikasi";
-"accountPage.usernameNotRegistered" = "Nama pengguna: tidak terdaftar";
-"accountPage.credentialsHeader" = "Detail Akun";
 "accountPage.blockedContacts" = "Kontak yang diblokir";
 "accountPage.unblockContact" = "Buka blokir";
 "accountPage.proxyAddressAlert" = "Masukkan alamat proksi";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Menghubungkan";
 "account.statusUnknown" = "Tidak diketahui";
 "account.statusConnectionerror" = "Gangguan koneksi";
-"account.needMigration" = "akun perlu dimigrasikan";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Saya";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Undangan diterima";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Panggilan keluar";
 "generatedMessage.missedOutgoingCall" = "Panggilan keluar tidak terjawab";
 "generatedMessage.missedIncomingCall" = "Panggilan masuk tidak terjawab";
 "generatedMessage.liveLocationSharing" = "Berbagi lokasi secara live";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Umpan balik";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Tutup";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Tambah akun";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Foto profil";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ig.lproj/Localizable.strings b/Ring/Ring/Resources/ig.lproj/Localizable.strings
index 262e5651389990a8bfb5850ca3f18dae69643382..b053d41fef75919d52cce1e3db0828c0fa3fe30e 100644
--- a/Ring/Ring/Resources/ig.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ig.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Ị na-ekere òkè ugbu a na ọnọdụ gị na ";
-"conversation.explanationReceivingLocationFrom" = "Ị na-enweta ugbu a a a ndụ ọnọdụ site ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Na nzaghachi";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "E Deziiri Ya";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Enweghị akwụkwọ ịkpọ òkù";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Soro Jami";
-"createAccount.lookingForUsernameAvailability" = "na-achọ nnweta...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "aha njirimara e weghaara";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Ihe ndekọ";
 "createAccount.UsernameNotRegisteredTitle" = "Njehie netwọk";
 "createAccount.UsernameNotRegisteredMessage" = "E mepụtara akaụntụ ma aha njirimara edeghị aha";
 "createAccount.timeoutTitle" = "E Mepụtara Akaụntụ";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Ihichapụ";
 "actions.backAction" = "Ịlaghachi azụ";
 "actions.doneAction" = "E mechaala";
-"alerts.incomingCallAllertTitle" = "N' olu dị ala, ọ na- esi n' ụlọ ọrụ ahụ abịa.";
-"alerts.incomingCallButtonIgnore" = "Echefula ya";
-"actions.startAudioCall" = "Oku Audio";
-"actions.startVideoCall" = "N'Ịkpọ Òkù Site na Vidio";
 "actions.goToSettings" = "Gaa na Ntọala";
 "actions.stopLocationSharing" = "Kwụsị ịkekọrịta";
 
 // Calls
-"calls.incomingCallInfo" = "Ọ chọrọ ịgwa gị okwu";
 "calls.ringing" = "Ọ na-akpọ.";
 "calls.connecting" = "Ịkpọtụrụ...";
 "calls.callFinished" = "Oku ahụ agwụla";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Ngwaọrụ";
 "accountPage.settingsHeader" = "Ntọala";
 "accountPage.notificationsHeader" = "Nkwupụta";
-"accountPage.usernameNotRegistered" = "aha njirimara: edebanyere ahaghị aha";
-"accountPage.credentialsHeader" = "Ihe ndekọ ego";
 "accountPage.blockedContacts" = "Ndị a na-egbochi";
 "accountPage.unblockContact" = "Ịgbanwee";
 "accountPage.proxyAddressAlert" = "Nye adreesị nnọchiteanya";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Njikọ";
 "account.statusUnknown" = "A maghị";
 "account.statusConnectionerror" = "Njehie Njikọ";
-"account.needMigration" = "a ga-akwaga akaụntụ ahụ";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mụ onwe m";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Òkù a kpọrọ";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "N'imepụta oku";
 "generatedMessage.missedOutgoingCall" = "Ọ dịghị onye na-akpọ gị";
 "generatedMessage.missedIncomingCall" = "Ọ dịghị onye na-akpọ gị";
 "generatedMessage.liveLocationSharing" = "Ịkekọrịta ọnọdụ ndụ";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Nzaghachi";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Ọ ga-abụ na ọ dị nso.";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Tinye akaụntụ";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Foto profaịlụ";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
index 0f25bfbce7bbb75dbad17eda6721476108ed465e..c9e6e7eba5e117af80b0c69b1a6ea52fbcbf89b4 100644
--- a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Aggiungere ai contatti?";
 "conversation.notContactLabel" = "non è nei tuoi contatti";
 "conversation.messagePlaceholder" = "Scrivi a";
-"conversation.explanationSendingLocationTo" = "Stai condividendo la tua posizione con ";
-"conversation.explanationReceivingLocationFrom" = "Stai ricevendo una posizione in diretta da ";
 "conversation.errorSavingImage" = "Si è verificato un errore durante il salvataggio dell'immagine.";
 "conversation.receivedRequest" = "%@ ti ha mandato un invito alla conversazione.";
 "conversation.incomingRequest" = "ti ha mandato un invito alla conversazione.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Hai accettato l'invito alla conversazione.";
 "conversation.synchronizationMessage" = "In attesa che %@ si connetta per sincronizzare la conversazione…";
 "conversation.inReplyTo" = "In risposta a";
-"conversation.repliedTo" = " ha risposto a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tu";
 "conversation.edited" = "Modificato";
-"conversation.deletedMessage" = "ha cancellato il messaggio";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contatto bloccato";
 
 // Invitations
 "invitations.noInvitations" = "Nessun invito";
-"invitations.pending" = "in attesa";
-"invitations.accepted" = "accettato";
-"invitations.declined" = "rifiutato";
-"invitations.blocked" = "bloccato";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Bloccato";
 "invitations.list" = "Inviti ricevuti";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Usa Jami";
-"createAccount.lookingForUsernameAvailability" = "ricerca disponibilità…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "nome utente già utilizzato";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Aggiunta dell'account";
 "createAccount.UsernameNotRegisteredTitle" = "Errore di rete";
 "createAccount.UsernameNotRegisteredMessage" = "L'account è stato creato ma il nome utente non è stato registrato";
 "createAccount.timeoutTitle" = "Account creato";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Elimina";
 "actions.backAction" = "Indietro";
 "actions.doneAction" = "Fatto";
-"alerts.incomingCallAllertTitle" = "Chiamata in arrivo da ";
-"alerts.incomingCallButtonIgnore" = "Ignora";
-"actions.startAudioCall" = "Chiamata vocale";
-"actions.startVideoCall" = "Videochiamata";
 "actions.goToSettings" = "Vai alle impostazioni";
 "actions.stopLocationSharing" = "Ferma condivisione";
 
 // Calls
-"calls.incomingCallInfo" = "vuole parlare con te";
 "calls.ringing" = "Squilla...";
 "calls.connecting" = "Connessione in corso...";
 "calls.callFinished" = "Chiamata terminata";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivi";
 "accountPage.settingsHeader" = "Impostazioni";
 "accountPage.notificationsHeader" = "Notifiche";
-"accountPage.usernameNotRegistered" = "nome utente: non registrato";
-"accountPage.credentialsHeader" = "Dettagli account";
 "accountPage.blockedContacts" = "Contatti bloccati";
 "accountPage.unblockContact" = "Sblocca";
 "accountPage.proxyAddressAlert" = "Inserire indirizzo proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connessione in corso";
 "account.statusUnknown" = "Sconosciuto";
 "account.statusConnectionerror" = "Errore di connessione";
-"account.needMigration" = "l'account deve essere migrato";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invito ricevuto";
 "generatedMessage.swarmCreated" = "Conversazione creata";
-"generatedMessage.invitationReceived" = "è stato invitato a partecipare alla conversazione.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Partecipi alla conversazione.";
-"generatedMessage.contactBlocked" = "è stato bloccato dalla conversazione.";
-"generatedMessage.contactUnblocked" = "è stato sbloccato dalla conversazione.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Chiamata in uscita";
 "generatedMessage.missedOutgoingCall" = "Chiamata in uscita persa";
 "generatedMessage.missedIncomingCall" = "Chiamata in arrivo persa";
 "generatedMessage.liveLocationSharing" = "Condivisione della posizione in diretta";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Impostazioni video";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Creato da";
 "aboutJami.artworkBy" = "Grafica di";
+
+// Accessibility
+"accessibility.close" = "Chiudi";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Aggiungi account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Foto di profilo";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index 61e6e5bd22ae619fb97a15455001dad395e2418a..4461e0e97b080abe377d7b04539a86fbbfe22b47 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Aggiungere ai contatti?";
 "conversation.notContactLabel" = "non è nei tuoi contatti";
 "conversation.messagePlaceholder" = "Scrivi a";
-"conversation.explanationSendingLocationTo" = "Stai condividendo la tua posizione con ";
-"conversation.explanationReceivingLocationFrom" = "Stai ricevendo una posizione in diretta da ";
 "conversation.errorSavingImage" = "Si è verificato un errore durante il salvataggio dell'immagine.";
 "conversation.receivedRequest" = "%@ ti ha mandato un invito alla conversazione.";
 "conversation.incomingRequest" = "ti ha mandato un invito alla conversazione.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Hai accettato l'invito alla conversazione.";
 "conversation.synchronizationMessage" = "In attesa che %@ si connetta per sincronizzare la conversazione…";
 "conversation.inReplyTo" = "In risposta a";
-"conversation.repliedTo" = " ha risposto a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tu";
 "conversation.edited" = "Modificato";
-"conversation.deletedMessage" = "ha cancellato il messaggio";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contatto bloccato";
 
 // Invitations
 "invitations.noInvitations" = "Nessun invito";
-"invitations.pending" = "in attesa";
-"invitations.accepted" = "accettato";
-"invitations.declined" = "rifiutato";
-"invitations.blocked" = "bloccato";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Bloccato";
 "invitations.list" = "Inviti ricevuti";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Usa Jami";
-"createAccount.lookingForUsernameAvailability" = "ricerca disponibilità...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "nome utente già utilizzato";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Aggiunta dell'account";
 "createAccount.UsernameNotRegisteredTitle" = "Errore di rete";
 "createAccount.UsernameNotRegisteredMessage" = "L'account è stato creato ma il nome utente non è stato registrato";
 "createAccount.timeoutTitle" = "Account creato";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Cancella";
 "actions.backAction" = "Indietro";
 "actions.doneAction" = "Fatto";
-"alerts.incomingCallAllertTitle" = "Chiamata in arrivo da ";
-"alerts.incomingCallButtonIgnore" = "Ignora";
-"actions.startAudioCall" = "Chiamata vocale";
-"actions.startVideoCall" = "Videochiamata";
 "actions.goToSettings" = "Vai alle impostazioni";
 "actions.stopLocationSharing" = "Ferma condivisione";
 
 // Calls
-"calls.incomingCallInfo" = "vuole parlare con te";
 "calls.ringing" = "Squilla...";
 "calls.connecting" = "Connessione in corso...";
 "calls.callFinished" = "Chiamata terminata";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivi";
 "accountPage.settingsHeader" = "Impostazioni";
 "accountPage.notificationsHeader" = "Notifiche";
-"accountPage.usernameNotRegistered" = "nome utente: non registrato";
-"accountPage.credentialsHeader" = "Dettagli account";
 "accountPage.blockedContacts" = "Contatti bloccati";
 "accountPage.unblockContact" = "Sblocca";
 "accountPage.proxyAddressAlert" = "Inserire indirizzo proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connessione in corso ";
 "account.statusUnknown" = "Sconosciuto";
 "account.statusConnectionerror" = "Errore di connessione";
-"account.needMigration" = "l'account deve essere migrato";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invito ricevuto";
 "generatedMessage.swarmCreated" = "Conversazione creata";
-"generatedMessage.invitationReceived" = "è stato invitato a partecipare alla conversazione.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Partecipi alla conversazione.";
-"generatedMessage.contactBlocked" = "è stato bloccato dalla conversazione.";
-"generatedMessage.contactUnblocked" = "è stato sbloccato dalla conversazione.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Chiamata in uscita";
 "generatedMessage.missedOutgoingCall" = "Chiamata in uscita persa";
 "generatedMessage.missedIncomingCall" = "Chiamata in arrivo persa";
 "generatedMessage.liveLocationSharing" = "Condivisione della posizione in diretta";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Impostazioni video";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Creato da";
 "aboutJami.artworkBy" = "Grafica di";
+
+// Accessibility
+"accessibility.close" = "Chiudi";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Aggiungi account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Foto di profilo";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index df3c54fcc21bce8de377d9055bc2add8c92eaa79..72e1d7e621a28a2397832d73fb9e3c60028ad79b 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "連絡先を追加しますか?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "現在地の共有相手: ";
-"conversation.explanationReceivingLocationFrom" = "現在地を受信している相手: ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "メッセージへの返信";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "自分";
 "conversation.edited" = "編集";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "招待はありません";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "招待を受信しました";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Jamiに登録";
-"createAccount.lookingForUsernameAvailability" = "利用可能か確認しています…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "この利用者名は既に取得されています。";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "アカウントを追加";
 "createAccount.UsernameNotRegisteredTitle" = "ネットワークエラー";
 "createAccount.UsernameNotRegisteredMessage" = "アカウントは作成されましたが、ユーザー名がまだ登録されていません";
 "createAccount.timeoutTitle" = "アカウントを作成しました";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "削除";
 "actions.backAction" = "戻る";
 "actions.doneAction" = "完了";
-"alerts.incomingCallAllertTitle" = "からの電話";
-"alerts.incomingCallButtonIgnore" = "無視";
-"actions.startAudioCall" = "  音声通話";
-"actions.startVideoCall" = "  ビデオ通話";
 "actions.goToSettings" = "設定へ移動";
 "actions.stopLocationSharing" = "共有を停止";
 
 // Calls
-"calls.incomingCallInfo" = "あなたと話したい";
 "calls.ringing" = "鳴ってる";
 "calls.connecting" = "接続中…";
 "calls.callFinished" = "呼び出し終了";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "デバイス";
 "accountPage.settingsHeader" = "設定";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "ユーザー名:登録されていない";
-"accountPage.credentialsHeader" = "アカウント詳細";
 "accountPage.blockedContacts" = "着信拒否した連絡先";
 "accountPage.unblockContact" = "ブロック解除";
 "accountPage.proxyAddressAlert" = "代理アドレスを入力する";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "接続中";
 "account.statusUnknown" = "不明";
 "account.statusConnectionerror" = "接続エラー";
-"account.needMigration" = "口座を移動する必要がある";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "自分";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "招待を受信しました";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "発信";
 "generatedMessage.missedOutgoingCall" = "不在発信";
 "generatedMessage.missedIncomingCall" = "不在着信";
 "generatedMessage.liveLocationSharing" = "リアルタイムでの位置共有";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "フィードバック";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "閉じる";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "アカウントを追加";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "プロフィール画像";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/kk.lproj/Localizable.strings b/Ring/Ring/Resources/kk.lproj/Localizable.strings
index 68ffca40e8754d6120968864fd496224cbfa9b3c..1e35c6440d209459f694921b9b85027b576da4ca 100644
--- a/Ring/Ring/Resources/kk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kk.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Байланыстарға қосыл?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Сіз қазір орналасқан жеріңізді ";
-"conversation.explanationReceivingLocationFrom" = "Сіз қазір ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Жауап ретінде";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Сендер";
 "conversation.edited" = "Жазу";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Шақыру жоқ";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Жамиге қосыл";
-"createAccount.lookingForUsernameAvailability" = "қолжетімділікті іздеу...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "пайдаланушы аты алынды";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Қосымша есеп";
 "createAccount.UsernameNotRegisteredTitle" = "Желі қатесі";
 "createAccount.UsernameNotRegisteredMessage" = "Тіркелгі құрылды, бірақ пайдаланушы аты тіркелмеген";
 "createAccount.timeoutTitle" = "Тіркелгі құрылды";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Өшіру";
 "actions.backAction" = "Қайта оралу";
 "actions.doneAction" = "Жарайды";
-"alerts.incomingCallAllertTitle" = "             ";
-"alerts.incomingCallButtonIgnore" = "Игіліксіз";
-"actions.startAudioCall" = "Аудио шақыру";
-"actions.startVideoCall" = "Видео шақыру";
 "actions.goToSettings" = "Параметрлерге өту";
 "actions.stopLocationSharing" = "Ортақ қатынастарды тоқтату";
 
 // Calls
-"calls.incomingCallInfo" = "Сізбен сөйлесуді қалайды";
 "calls.ringing" = "Зыңғырады...";
 "calls.connecting" = "Қосылу...";
 "calls.callFinished" = "Зұрауы аяқталды";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Құрылғылар";
 "accountPage.settingsHeader" = "Параметрлері";
 "accountPage.notificationsHeader" = "Хабарламалар";
-"accountPage.usernameNotRegistered" = "пайдаланушы аты: тіркелмеген";
-"accountPage.credentialsHeader" = "Есепшоттың деректері";
 "accountPage.blockedContacts" = "Ашық контакттар";
 "accountPage.unblockContact" = "Блокадасын ашу";
 "accountPage.proxyAddressAlert" = "Прокси мекенжайы";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Қосылу";
 "account.statusUnknown" = "Белгісіз";
 "account.statusConnectionerror" = "Қосылу қатесі";
-"account.needMigration" = "шот көшірілуі қажет";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Мен...";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Қабылданған шақыру";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Шығушы шақыру";
 "generatedMessage.missedOutgoingCall" = "Шығып жатқан шақыруды жоғалтқан";
 "generatedMessage.missedIncomingCall" = "Келесі шақыруды жіберген";
 "generatedMessage.liveLocationSharing" = "Тікелей орналасқан жерді бөлісу";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Сапар";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Жақында";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Есепті қосу";
+"accessibility.aboutJamiTitle" = "Жами туралы";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Профиль түсірілімі";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/kn.lproj/Localizable.strings b/Ring/Ring/Resources/kn.lproj/Localizable.strings
index 861f470b161e3f98b8a0c9d8a213f2edd0723811..7377454159d0fe5041059d12c2c4de6ffef24653 100644
--- a/Ring/Ring/Resources/kn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kn.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸುವುದೇ?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "ನೀವು ಪ್ರಸ್ತುತ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದೀರಿ ";
-"conversation.explanationReceivingLocationFrom" = "ನೀವು ಪ್ರಸ್ತುತ ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "ಇದಕ್ಕೆ ಪ್ರತಿಕ್ರಿಯೆಯಾಗಿ";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "ನೀನೇ";
 "conversation.edited" = "ಸಂಪಾದನೆ";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "ಆಹ್ವಾನಗಳಿಲ್ಲ";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "ಜಾಮಿಗೆ ಸೇರಿ";
-"createAccount.lookingForUsernameAvailability" = "ಲಭ್ಯತೆಗಾಗಿ ಹುಡುಕುತ್ತಿರುವ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "ಈಗಾಗಲೇ ತೆಗೆದ ಬಳಕೆದಾರ ಹೆಸರು";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "ಖಾತೆ ಸೇರ್ಪಡೆ";
 "createAccount.UsernameNotRegisteredTitle" = "ನೆಟ್ವರ್ಕ್ ದೋಷ";
 "createAccount.UsernameNotRegisteredMessage" = "ಖಾತೆಯನ್ನು ರಚಿಸಲಾಗಿದೆ ಆದರೆ ಬಳಕೆದಾರ ಹೆಸರು ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ";
 "createAccount.timeoutTitle" = "ಖಾತೆ ರಚನೆ";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "ಅಳಿಸು";
 "actions.backAction" = "ಹಿಂದಕ್ಕೆ";
 "actions.doneAction" = "ಮುಗಿದಿದೆ";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "ನಿರ್ಲಕ್ಷಿಸಿ";
-"actions.startAudioCall" = "ಆಡಿಯೋ ಕರೆ";
-"actions.startVideoCall" = "ವಿಡಿಯೋ ಕರೆ";
 "actions.goToSettings" = "ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಹೋಗಿ";
 "actions.stopLocationSharing" = "ಹಂಚಿಕೆ ನಿಲ್ಲಿಸಿ";
 
 // Calls
-"calls.incomingCallInfo" = "ನಿಮ್ಮೊಂದಿಗೆ ಮಾತನಾಡಲು ಬಯಸಿದೆ";
 "calls.ringing" = "ರಿಂಗಿಂಗ್.";
 "calls.connecting" = "ಸಂಪರ್ಕಿಸುವಿಕೆ.";
 "calls.callFinished" = "ಕರೆ ಮುಗಿದ";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "ಉಪಕರಣಗಳು";
 "accountPage.settingsHeader" = "ಸೆಟ್ಟಿಂಗ್ಗಳು";
 "accountPage.notificationsHeader" = "ಅಧಿಸೂಚನೆಗಳು";
-"accountPage.usernameNotRegistered" = "ಬಳಕೆದಾರ ಹೆಸರುಃ ನೋಂದಾಯಿತವಲ್ಲ";
-"accountPage.credentialsHeader" = "ಖಾತೆ ವಿವರಗಳು";
 "accountPage.blockedContacts" = "ನಿರ್ಬಂಧಿತ ಸಂಪರ್ಕಗಳು";
 "accountPage.unblockContact" = "ಅನಿರ್ಬಂಧವನ್ನು ತೆರವುಗೊಳಿಸಿ";
 "accountPage.proxyAddressAlert" = "ಪ್ರಾಕ್ಸಿ ವಿಳಾಸವನ್ನು ಒದಗಿಸಿ";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "ಸಂಪರ್ಕ";
 "account.statusUnknown" = "ಅಜ್ಞಾತ";
 "account.statusConnectionerror" = "ಸಂಪರ್ಕ ದೋಷ";
-"account.needMigration" = "ಖಾತೆಯನ್ನು ಸ್ಥಳಾಂತರಿಸಬೇಕಾಗಿದೆ";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "ನಾನು";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "ಸ್ವೀಕರಿಸಿದ ಆಹ್ವಾನ";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "ಹೊರಹೋಗುವ ಕರೆ";
 "generatedMessage.missedOutgoingCall" = "ತಪ್ಪಿಸಿಕೊಂಡ ಹೊರಹೋಗುವ ಕರೆ";
 "generatedMessage.missedIncomingCall" = "ತಪ್ಪಿದ ಕರೆ";
 "generatedMessage.liveLocationSharing" = "ಲೈವ್ ಸ್ಥಳ ಹಂಚಿಕೆ";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "ಪ್ರತಿಕ್ರಿಯೆ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "ಹತ್ತಿರ";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "ಖಾತೆಯನ್ನು ಸೇರಿಸಿ";
+"accessibility.aboutJamiTitle" = "ಜಾಮಿ ಬಗ್ಗೆ";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "ಪ್ರೊಫೈಲ್ ಚಿತ್ರ";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
index 9da8a5d8c65c7460460fa97582a4df594336fcd7..0c3044125698820ae2db45769a3a441b154ba84c 100644
--- a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "연락처를 추가할 수 있을까요?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "현재 위치와 공유하고 있습니다.";
-"conversation.explanationReceivingLocationFrom" = "현재 ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "이에 대한 답변";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "- 네";
 "conversation.edited" = "편집";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "초대도 없습니다";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "자미에 합류해";
-"createAccount.lookingForUsernameAvailability" = "가용성을 찾고 있습니다.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "이미 사용 이름";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "추가 계좌";
 "createAccount.UsernameNotRegisteredTitle" = "네트워크 오류";
 "createAccount.UsernameNotRegisteredMessage" = "계정 생성, 사용자 이름 등록되지 않았습니다";
 "createAccount.timeoutTitle" = "계정 생성";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "삭제";
 "actions.backAction" = "돌아와";
 "actions.doneAction" = "완료";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "무시";
-"actions.startAudioCall" = "오디오 호출";
-"actions.startVideoCall" = "비디오 통화";
 "actions.goToSettings" = "설정에 가";
 "actions.stopLocationSharing" = "공유를 그만 두세요";
 
 // Calls
-"calls.incomingCallInfo" = "당신과 얘기하고 싶어";
 "calls.ringing" = "울리는 소리...";
 "calls.connecting" = "연결...";
 "calls.callFinished" = "전화 종료";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "장치";
 "accountPage.settingsHeader" = "설정";
 "accountPage.notificationsHeader" = "통지";
-"accountPage.usernameNotRegistered" = "사용자 이름: 등록되지 않은";
-"accountPage.credentialsHeader" = "계좌 세부 사항";
 "accountPage.blockedContacts" = "차단된 연락처";
 "accountPage.unblockContact" = "차단 해제";
 "accountPage.proxyAddressAlert" = "프록시 주소를 입력";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "연결";
 "account.statusUnknown" = "알 수 없는";
 "account.statusConnectionerror" = "연결 오류";
-"account.needMigration" = "계좌를 마이그레이션해야 합니다";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "나";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "초대 받은 것";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "출력 전화";
 "generatedMessage.missedOutgoingCall" = "출력 전화가 빠진 것";
 "generatedMessage.missedIncomingCall" = "수신 전화가 빠진 것";
 "generatedMessage.liveLocationSharing" = "실시간 위치 공유";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "피드백";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "가까이";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "계정 추가";
+"accessibility.aboutJamiTitle" = "자미 에 관한 것";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "프로필 사진";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ko.lproj/Localizable.strings b/Ring/Ring/Resources/ko.lproj/Localizable.strings
index 9da8a5d8c65c7460460fa97582a4df594336fcd7..0c3044125698820ae2db45769a3a441b154ba84c 100644
--- a/Ring/Ring/Resources/ko.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "연락처를 추가할 수 있을까요?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "현재 위치와 공유하고 있습니다.";
-"conversation.explanationReceivingLocationFrom" = "현재 ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "이에 대한 답변";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "- 네";
 "conversation.edited" = "편집";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "초대도 없습니다";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "자미에 합류해";
-"createAccount.lookingForUsernameAvailability" = "가용성을 찾고 있습니다.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "이미 사용 이름";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "추가 계좌";
 "createAccount.UsernameNotRegisteredTitle" = "네트워크 오류";
 "createAccount.UsernameNotRegisteredMessage" = "계정 생성, 사용자 이름 등록되지 않았습니다";
 "createAccount.timeoutTitle" = "계정 생성";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "삭제";
 "actions.backAction" = "돌아와";
 "actions.doneAction" = "완료";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "무시";
-"actions.startAudioCall" = "오디오 호출";
-"actions.startVideoCall" = "비디오 통화";
 "actions.goToSettings" = "설정에 가";
 "actions.stopLocationSharing" = "공유를 그만 두세요";
 
 // Calls
-"calls.incomingCallInfo" = "당신과 얘기하고 싶어";
 "calls.ringing" = "울리는 소리...";
 "calls.connecting" = "연결...";
 "calls.callFinished" = "전화 종료";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "장치";
 "accountPage.settingsHeader" = "설정";
 "accountPage.notificationsHeader" = "통지";
-"accountPage.usernameNotRegistered" = "사용자 이름: 등록되지 않은";
-"accountPage.credentialsHeader" = "계좌 세부 사항";
 "accountPage.blockedContacts" = "차단된 연락처";
 "accountPage.unblockContact" = "차단 해제";
 "accountPage.proxyAddressAlert" = "프록시 주소를 입력";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "연결";
 "account.statusUnknown" = "알 수 없는";
 "account.statusConnectionerror" = "연결 오류";
-"account.needMigration" = "계좌를 마이그레이션해야 합니다";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "나";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "초대 받은 것";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "출력 전화";
 "generatedMessage.missedOutgoingCall" = "출력 전화가 빠진 것";
 "generatedMessage.missedIncomingCall" = "수신 전화가 빠진 것";
 "generatedMessage.liveLocationSharing" = "실시간 위치 공유";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "피드백";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "가까이";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "계정 추가";
+"accessibility.aboutJamiTitle" = "자미 에 관한 것";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "프로필 사진";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/lt.lproj/Localizable.strings b/Ring/Ring/Resources/lt.lproj/Localizable.strings
index 79d3ba07df3d3d82ca713082c83aad3c597319ed..765a16a0e3e11e2712f2d2bdcb9060dbfd8b62ab 100644
--- a/Ring/Ring/Resources/lt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/lt.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Pridėti prie adresatų?";
 "conversation.notContactLabel" = "nėra jūsų adresatų sąraše";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "In reply to";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Jūs";
-"conversation.edited" = "Išdavinimas";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.edited" = "Edited";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Adresatas užblokuotas";
 
 // Invitations
 "invitations.noInvitations" = "Pakvietimų nėra";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "tikrinamas prieinamumas…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "naudotojo vardas jau užimtas";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Pridedama paskyra";
 "createAccount.UsernameNotRegisteredTitle" = "Tinklo klaida";
 "createAccount.UsernameNotRegisteredMessage" = "Paskyra buvo sukurta, bet naudotojo vardas nebuvo užregistruotas";
 "createAccount.timeoutTitle" = "Paskyra sukurta";
@@ -204,7 +199,7 @@
 "linkToAccount.explanationMessage" = "A PIN code is required to use an existing Jami account on this device.";
 "linkToAccount.pinPlaceholder" = "PIN kodas";
 "linkToAccount.pinLabel" = "Enter PIN code";
-"linkToAccount.scanQRCode" = "Scan QR code";
+"linkToAccount.scanQRCode" = "Skenuokite QR kodą";
 "linkToAccount.explanationPinMessage" = "To generate the PIN code, go to the account management settings on the device containing the account you want to link to. Select “Link new device”. You will receive the necessary PIN code to complete this form. The PIN code will expire in 10 minutes.";
 
 // Import from Archive
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Ištrinti";
 "actions.backAction" = "Atgal";
 "actions.doneAction" = "Atlikta";
-"alerts.incomingCallAllertTitle" = "Gaunamasis skambutis nuo ";
-"alerts.incomingCallButtonIgnore" = "Nepaisyti";
-"actions.startAudioCall" = "Garso skambutis";
-"actions.startVideoCall" = "Vaizdo skambutis";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "Stop sharing";
 
 // Calls
-"calls.incomingCallInfo" = "nori su jumis pakalbėti";
 "calls.ringing" = "Skambinama…";
 "calls.connecting" = "Jungiamasi…";
 "calls.callFinished" = "Skambutis užbaigtas";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Įrenginiai";
 "accountPage.settingsHeader" = "Nustatymai";
 "accountPage.notificationsHeader" = "Pranešimai";
-"accountPage.usernameNotRegistered" = "naudotojo vardas: neregistruotas";
-"accountPage.credentialsHeader" = "Išsamesnė paskyros informacija";
 "accountPage.blockedContacts" = "Užblokuoti adresatai";
 "accountPage.unblockContact" = "Atblokuoti";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Sujungiama";
 "account.statusUnknown" = "Nežinomas";
 "account.statusConnectionerror" = "Ryšio klaida";
-"account.needMigration" = "paskyra turi būti perkelta";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Aš";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Gautas pakvietimas";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Išsiunčiamasis skambutis";
 "generatedMessage.missedOutgoingCall" = "Missed outgoing call";
 "generatedMessage.missedIncomingCall" = "Praleistas gaunamasis skambutis";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Vaizdo nustatymai";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Atsiliepimai";
 "aboutJami.createdBy" = "Sukūrė";
 "aboutJami.artworkBy" = "Apipavidalino";
+
+// Accessibility
+"accessibility.close" = "Užverti";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Pridėti paskyrą";
+"accessibility.aboutJamiTitle" = "Apie Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ml.lproj/Localizable.strings b/Ring/Ring/Resources/ml.lproj/Localizable.strings
index dad4a7f88cade809e43a6dfe7a201ea670dd86f2..d28104214e13a2e8fa63ba24afa196b838dd2128 100644
--- a/Ring/Ring/Resources/ml.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ml.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "ബന്ധുക്കളെ കൂട്ടിച്ചേർക്കണോ?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "നിങ്ങൾ നിലവിൽ നിങ്ങളുടെ സ്ഥാനം പങ്കുവെക്കുന്നു ";
-"conversation.explanationReceivingLocationFrom" = "∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "ഇതിന് മറുപടിയായി";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "നീ";
 "conversation.edited" = "പരിഷ്ക്കരിക്കുക";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "ക്ഷണങ്ങളില്ല";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "അംഗീകരിച്ചു";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "ജാമിയിൽ ചേരുക";
-"createAccount.lookingForUsernameAvailability" = "ലഭ്യമായതിനായി അന്വേഷിക്കുന്നു.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "ഇതിനകം ഉപയോഗിച്ച ഉപയോക്തൃനാമം";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "അക്കൌണ്ട് കൂട്ടിച്ചേർക്കൽ";
 "createAccount.UsernameNotRegisteredTitle" = "നെറ്റ് വർക്ക് പിശക്";
 "createAccount.UsernameNotRegisteredMessage" = "അക്കൌണ്ട് സൃഷ്ടിച്ചു, പക്ഷേ ഉപയോക്തൃനാമം രജിസ്റ്റർ ചെയ്തിട്ടില്ല";
 "createAccount.timeoutTitle" = "അക്കൌണ്ട് സൃഷ്ടിച്ചു";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "ഇല്ലാതാക്കുക";
 "actions.backAction" = "തിരിച്ചുപോവുക";
 "actions.doneAction" = "പൂർത്തിയായി";
-"alerts.incomingCallAllertTitle" = "∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙";
-"alerts.incomingCallButtonIgnore" = "അവഗണിക്കുക";
-"actions.startAudioCall" = "ഓഡിയോ കോൾ";
-"actions.startVideoCall" = "വീഡിയോ കോൾ";
 "actions.goToSettings" = "ക്രമീകരണങ്ങളിലേക്ക് പോകുക";
 "actions.stopLocationSharing" = "പങ്കിടുന്നത് അവസാനിപ്പിക്കുക";
 
 // Calls
-"calls.incomingCallInfo" = "നിന്നോട് സംസാരിക്കാന് ആഗ്രഹിക്കുന്നു";
 "calls.ringing" = "- വിളിക്കുന്നു.";
 "calls.connecting" = "ബന്ധിപ്പിക്കുന്ന...";
 "calls.callFinished" = "വിളി പൂർത്തിയായി";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "ഉപകരണങ്ങൾ";
 "accountPage.settingsHeader" = "ക്രമീകരണങ്ങൾ";
 "accountPage.notificationsHeader" = "അറിയിപ്പുകൾ";
-"accountPage.usernameNotRegistered" = "ഉപയോക്തൃനാമംഃ രജിസ്റ്റർ ചെയ്തിട്ടില്ല";
-"accountPage.credentialsHeader" = "അക്കൌണ്ട് വിശദാംശങ്ങൾ";
 "accountPage.blockedContacts" = "തടഞ്ഞ കോൺടാക്റ്റുകൾ";
 "accountPage.unblockContact" = "തടയൽ നീക്കം ചെയ്യുക";
 "accountPage.proxyAddressAlert" = "പ്രോക്സി വിലാസം നൽകുക";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "ബന്ധിപ്പിക്കൽ";
 "account.statusUnknown" = "അജ്ഞാതമായത്";
 "account.statusConnectionerror" = "കണക്ഷൻ പിശക്";
-"account.needMigration" = "അക്കൌണ്ട് നീക്കം ചെയ്യണം";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "ഞാനെന്റെ";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "ക്ഷണം ലഭിച്ചത്";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "പുറപ്പെടുന്ന വിളി";
 "generatedMessage.missedOutgoingCall" = "നഷ്ടപ്പെട്ട വിളി";
 "generatedMessage.missedIncomingCall" = "നഷ്ടപ്പെട്ട കോൾ";
 "generatedMessage.liveLocationSharing" = "ലൈവ് ലൊക്കേഷൻ പങ്കിടൽ";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "പ്രതികരണങ്ങൾ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "അടുത്തു";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "അക്കൌണ്ട് ചേർക്കുക";
+"accessibility.aboutJamiTitle" = "ജാമിയെ കുറിച്ച്";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "പ്രൊഫൈല് ചിത്രം";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
index 6fd0915272348028c9181675cbe46725a9e14841..eebda7978a0f96a0ce7c8526f45ce61e0e580d80 100644
--- a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Та нар ч гэсэн холбоотондоо нэмж байна уу?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Та одоо байр сууриа хуваалцаж байна.";
-"conversation.explanationReceivingLocationFrom" = "Та одоо ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Хэвлэл мэдээллийн хэрэгсэл";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Та нар";
 "conversation.edited" = "Хөгжүүлэн";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Нэр дэвшүүлэггүй";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Хөгжиж байна";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Жэмид нэгдээрэй";
-"createAccount.lookingForUsernameAvailability" = "...хүхлэг байдлыг хайж байна...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "хэрэглэгчдийн нэр аль хэдийн авсан";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Нэвтрүүлэг";
 "createAccount.UsernameNotRegisteredTitle" = "Хүлжээний алдаа";
 "createAccount.UsernameNotRegisteredMessage" = "Хилсэл бий болсон боловч хэрэглэгчдийн нэр бүртгэгдээгүй";
 "createAccount.timeoutTitle" = "Хэтгэлэг үүсгэн байгуулагдсан";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Хасах";
 "actions.backAction" = "Хурд";
 "actions.doneAction" = "Сураг";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "Үргэлж";
-"actions.startAudioCall" = "Зөгнөлийн дуудлага";
-"actions.startVideoCall" = "Видео утас";
 "actions.goToSettings" = "Байгууллага руу яв";
 "actions.stopLocationSharing" = "Хөдөлмөрийг хуваалцахыг зогсоо";
 
 // Calls
-"calls.incomingCallInfo" = "Татай ярилцахыг хүсч байна";
 "calls.ringing" = "-Хэрэгтээ...";
 "calls.connecting" = "Байгууллага...";
 "calls.callFinished" = "Зудлага дууссан";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Утасны хэрэгсэл";
 "accountPage.settingsHeader" = "Байгууллага";
 "accountPage.notificationsHeader" = "Хэвлэлт";
-"accountPage.usernameNotRegistered" = "хэрэглэгчийн нэр: бүртгэгдээгүй";
-"accountPage.credentialsHeader" = "Санхүүгийн мэдээллийг";
 "accountPage.blockedContacts" = "Хаалттай холбоо";
 "accountPage.unblockContact" = "Блокийг нээж";
 "accountPage.proxyAddressAlert" = "Прокси хаягийг өгөө";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Харилцаа холбоо";
 "account.statusUnknown" = "Мэдээгүй";
 "account.statusConnectionerror" = "Холбоолалтын алдаа";
-"account.needMigration" = "дансыг нүүлгэн шилжүүлэх шаардлагатай";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Би";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Нээлтийг хүлээн авсан";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Урьдчилсан дуудлага";
 "generatedMessage.missedOutgoingCall" = "Удахгүй дууссан";
 "generatedMessage.missedIncomingCall" = "Улаан дуудлага алдсан";
 "generatedMessage.liveLocationSharing" = "Амьдрал байршуулын хуваалц";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Хэтгэлэг";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Тэнд нь";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Хэтгэлэг нэмнэ";
+"accessibility.aboutJamiTitle" = "Жэмигийн тухай";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Профилийн зураг";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/mr.lproj/Localizable.strings b/Ring/Ring/Resources/mr.lproj/Localizable.strings
index 17037e90ea290c9e399673c95cd8e1e4734ac39f..a6a10f6114ed5142bb3a4efb9e5c5b7d52e89b80 100644
--- a/Ring/Ring/Resources/mr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mr.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "संपर्क जोडण्यासाठी?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "तुम्ही सध्या तुमच्या स्थानाची माहिती ";
-"conversation.explanationReceivingLocationFrom" = "तुम्हाला सध्या ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "उत्तर";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "तू";
 "conversation.edited" = "संपादित";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "आमंत्रण नाही";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "स्वीकारले";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "जामीमध्ये सामील व्हा";
-"createAccount.lookingForUsernameAvailability" = "उपलब्धता शोधत आहे.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "आधीच वापरकर्ता नाव";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "खाते जोडणे";
 "createAccount.UsernameNotRegisteredTitle" = "नेटवर्क त्रुटी";
 "createAccount.UsernameNotRegisteredMessage" = "खाते तयार केले परंतु वापरकर्तानाव नोंदणीकृत नाही";
 "createAccount.timeoutTitle" = "खाते तयार केले";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "हटवा";
 "actions.backAction" = "परत";
 "actions.doneAction" = "पूर्ण";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "दुर्लक्ष करा";
-"actions.startAudioCall" = "ऑडिओ कॉल";
-"actions.startVideoCall" = "व्हिडिओ कॉल";
 "actions.goToSettings" = "सेटिंग्ज वर जा";
 "actions.stopLocationSharing" = "सामायिक करणे बंद करा";
 
 // Calls
-"calls.incomingCallInfo" = "तुझ्याशी बोलायचं आहे";
 "calls.ringing" = "- गप्पा मारत आहे.";
 "calls.connecting" = "जोडणी.";
 "calls.callFinished" = "कॉल पूर्ण";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "उपकरणे";
 "accountPage.settingsHeader" = "सेटिंग्ज";
 "accountPage.notificationsHeader" = "सूचना";
-"accountPage.usernameNotRegistered" = "नावः नोंदणीकृत नाही";
-"accountPage.credentialsHeader" = "खात्याची माहिती";
 "accountPage.blockedContacts" = "अवरोधित संपर्क";
 "accountPage.unblockContact" = "अवरोधित करा";
 "accountPage.proxyAddressAlert" = "प्रॉक्सी पत्ता प्रविष्ट करा";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "जोडणी";
 "account.statusUnknown" = "अज्ञात";
 "account.statusConnectionerror" = "कनेक्शन त्रुटी";
-"account.needMigration" = "खाते स्थलांतरित करणे आवश्यक आहे";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "मी";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "प्राप्त आमंत्रण";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "बाहेरचा कॉल";
 "generatedMessage.missedOutgoingCall" = "गमावलेला प्रस्थान कॉल";
 "generatedMessage.missedIncomingCall" = "गमावलेला कॉल";
 "generatedMessage.liveLocationSharing" = "थेट स्थान सामायिकरण";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "अभिप्राय";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "जवळ";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "खाते जोडा";
+"accessibility.aboutJamiTitle" = "जेमी बद्दल";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "प्रोफाइल चित्र";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ms.lproj/Localizable.strings b/Ring/Ring/Resources/ms.lproj/Localizable.strings
index fa87fcd3224f47eb8fa9c1753e4b3f560b669424..37cc5da22c57fccc1d07c31d65c74e18b4b04666 100644
--- a/Ring/Ring/Resources/ms.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ms.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "ബന്ധുക്കളെ കൂട്ടിച്ചേർക്കണോ?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "നിങ്ങൾ നിലവിൽ നിങ്ങളുടെ സ്ഥാനം പങ്കുവെക്കുന്നു ";
-"conversation.explanationReceivingLocationFrom" = "∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "ഇതിന് മറുപടിയായി";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "നീ";
 "conversation.edited" = "പരിഷ്ക്കരിക്കുക";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "ക്ഷണങ്ങളില്ല";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "അംഗീകരിച്ചു";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "ജാമിയിൽ ചേരുക";
-"createAccount.lookingForUsernameAvailability" = "ലഭ്യമായതിനായി അന്വേഷിക്കുന്നു.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "ഇതിനകം ഉപയോഗിച്ച ഉപയോക്തൃനാമം";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Mencipta akaun";
 "createAccount.UsernameNotRegisteredTitle" = "Rangkaian gagal";
 "createAccount.UsernameNotRegisteredMessage" = "അക്കൌണ്ട് സൃഷ്ടിച്ചു, പക്ഷേ ഉപയോക്തൃനാമം രജിസ്റ്റർ ചെയ്തിട്ടില്ല";
 "createAccount.timeoutTitle" = "അക്കൌണ്ട് സൃഷ്ടിച്ചു";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Hapus";
 "actions.backAction" = "തിരിച്ചുപോവുക";
 "actions.doneAction" = "പൂർത്തിയായി";
-"alerts.incomingCallAllertTitle" = "∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙ ∙";
-"alerts.incomingCallButtonIgnore" = "അവഗണിക്കുക";
-"actions.startAudioCall" = "ഓഡിയോ കോൾ";
-"actions.startVideoCall" = "വീഡിയോ കോൾ";
 "actions.goToSettings" = "ക്രമീകരണങ്ങളിലേക്ക് പോകുക";
 "actions.stopLocationSharing" = "പങ്കിടുന്നത് അവസാനിപ്പിക്കുക";
 
 // Calls
-"calls.incomingCallInfo" = "നിന്നോട് സംസാരിക്കാന് ആഗ്രഹിക്കുന്നു";
 "calls.ringing" = "- വിളിക്കുന്നു.";
 "calls.connecting" = "ബന്ധിപ്പിക്കുന്ന...";
 "calls.callFinished" = "വിളി പൂർത്തിയായി";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Perangkat";
 "accountPage.settingsHeader" = "Tetapan";
 "accountPage.notificationsHeader" = "അറിയിപ്പുകൾ";
-"accountPage.usernameNotRegistered" = "ഉപയോക്തൃനാമംഃ രജിസ്റ്റർ ചെയ്തിട്ടില്ല";
-"accountPage.credentialsHeader" = "അക്കൌണ്ട് വിശദാംശങ്ങൾ";
 "accountPage.blockedContacts" = "തടഞ്ഞ കോൺടാക്റ്റുകൾ";
 "accountPage.unblockContact" = "തടയൽ നീക്കം ചെയ്യുക";
 "accountPage.proxyAddressAlert" = "പ്രോക്സി വിലാസം നൽകുക";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Menyambung";
 "account.statusUnknown" = "Tidak diketahui";
 "account.statusConnectionerror" = "കണക്ഷൻ പിശക്";
-"account.needMigration" = "അക്കൌണ്ട് നീക്കം ചെയ്യണം";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Saya";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "ക്ഷണം ലഭിച്ചത്";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Panggilan keluar";
 "generatedMessage.missedOutgoingCall" = "നഷ്ടപ്പെട്ട വിളി";
 "generatedMessage.missedIncomingCall" = "നഷ്ടപ്പെട്ട കോൾ";
 "generatedMessage.liveLocationSharing" = "ലൈവ് ലൊക്കേഷൻ പങ്കിടൽ";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "പ്രതികരണങ്ങൾ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "അടുത്തു";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "അക്കൌണ്ട് ചേർക്കുക";
+"accessibility.aboutJamiTitle" = "ജാമിയെ കുറിച്ച്";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "പ്രൊഫൈല് ചിത്രം";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/nan.lproj/Localizable.strings b/Ring/Ring/Resources/nan.lproj/Localizable.strings
index f849a29ba3164c852d5272281435837d7a4f82d6..9bd5d42400031b1eeb424fa27252fa74208af819 100644
--- a/Ring/Ring/Resources/nan.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nan.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "添加至通讯录吗?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "No invitations";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "已接受";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "username already taken";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Adding account";
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Delete";
 "actions.backAction" = "Back";
 "actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonIgnore" = "Ignore";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "Stop sharing";
 
 // Calls
-"calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
 "calls.callFinished" = "Call finished";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Devices";
 "accountPage.settingsHeader" = "Settings";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
 "accountPage.blockedContacts" = "Blocked contacts";
 "accountPage.unblockContact" = "取消屏蔽";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connecting";
 "account.statusUnknown" = "Unknown";
 "account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已接受邀请";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Outgoing call";
 "generatedMessage.missedOutgoingCall" = "Missed outgoing call";
 "generatedMessage.missedIncomingCall" = "Missed incoming call";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "回饋";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "關閉";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "添加账户";
+"accessibility.aboutJamiTitle" = "关于 Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "个人资料图片";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index 6793a4734dad025b860cff2b4e55119272b5c79e..64f18e5887b777235b61954c4042a9ff2685ad59 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Legg til kontakter?";
 "conversation.notContactLabel" = "er ikke i kontaktlisten din";
 "conversation.messagePlaceholder" = "Skriv til";
-"conversation.explanationSendingLocationTo" = "Du deler for tiden din lokasjon med";
-"conversation.explanationReceivingLocationFrom" = "Du mottar for øyeblikket en live lokasjon fra";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "I svar til";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Deg";
 "conversation.edited" = "Redigert";
-"conversation.deletedMessage" = "slettet en melding";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ingen invitasjoner";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Godkjent";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitasjoner mottatt";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Bli med Jami";
-"createAccount.lookingForUsernameAvailability" = "leter etter tilgjengelighet...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "brukernavn allerede i bruk";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Legger til konto";
 "createAccount.UsernameNotRegisteredTitle" = "Nettverksfeil";
 "createAccount.UsernameNotRegisteredMessage" = "Konto ble opprettet men brukernavn ble ikke registrert";
 "createAccount.timeoutTitle" = "Konto opprettet";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Slett";
 "actions.backAction" = "Tilbake";
 "actions.doneAction" = "Ferdig";
-"alerts.incomingCallAllertTitle" = "Innkommende anrop fra";
-"alerts.incomingCallButtonIgnore" = "Ignorer";
-"actions.startAudioCall" = "Lydsamtale";
-"actions.startVideoCall" = "Videosamtale";
 "actions.goToSettings" = "Gå til innstillinger";
 "actions.stopLocationSharing" = "Stopp delingen";
 
 // Calls
-"calls.incomingCallInfo" = "ønsker å snakke med deg";
 "calls.ringing" = "Ringer...";
 "calls.connecting" = "Kobler opp...";
 "calls.callFinished" = "Samtale fullført";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Enheter";
 "accountPage.settingsHeader" = "Innstillinger";
 "accountPage.notificationsHeader" = "Varsler";
-"accountPage.usernameNotRegistered" = "brukernavn: ikke registrert";
-"accountPage.credentialsHeader" = "Kontodetaljer";
 "accountPage.blockedContacts" = "Blokkerte kontakter";
 "accountPage.unblockContact" = "Fjern blokkering";
 "accountPage.proxyAddressAlert" = "Angi mellomtjeneradresse";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Kobler opp";
 "account.statusUnknown" = "Ukjent";
 "account.statusConnectionerror" = "Tilkoblingsfeil";
-"account.needMigration" = "konto må overføres";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Meg";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitasjon mottatt";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Utgående samtale";
 "generatedMessage.missedOutgoingCall" = "Tapt utgående anrop";
 "generatedMessage.missedIncomingCall" = "Tapt innkommende anrop";
 "generatedMessage.liveLocationSharing" = "Live posisjonsdeling";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Tilbakemelding";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Lukk";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Legg til konto";
+"accessibility.aboutJamiTitle" = "Om Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profilbilde";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ne.lproj/Localizable.strings b/Ring/Ring/Resources/ne.lproj/Localizable.strings
index dfeb90c0ffd8857910dbd80b94bcc38bd9f73acd..a8b5911df3e3c9c52b9b6b700416bec6bb0cb9fb 100644
--- a/Ring/Ring/Resources/ne.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ne.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "सम्पर्कमा थप्न?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "तपाईँ अहिले आफ्नो स्थान साझेदारी गर्दै हुनुहुन्छ ।";
-"conversation.explanationReceivingLocationFrom" = "तपाईँले हाल ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "जवाफमा";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "तिमी";
 "conversation.edited" = "सम्पादन";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "निमन्त्रणा छैन";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "स्वीकार गरियो";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "जामीमा सामेल हुनुहोस्";
-"createAccount.lookingForUsernameAvailability" = "उपलब्धता खोज्दै...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "प्रयोगकर्ता नाम पहिले नै लिइएको";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "खाता थप";
 "createAccount.UsernameNotRegisteredTitle" = "नेटवर्क त्रुटि";
 "createAccount.UsernameNotRegisteredMessage" = "खाता सिर्जना गरिएको थियो तर प्रयोगकर्ता नाम दर्ता गरिएको थिएन";
 "createAccount.timeoutTitle" = "खाता सिर्जना";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "हटाउनु";
 "actions.backAction" = "पछाडि";
 "actions.doneAction" = "सम्पन्न";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "बेवास्ता गर्नु";
-"actions.startAudioCall" = "अडियो कल";
-"actions.startVideoCall" = "भिडियो कल";
 "actions.goToSettings" = "सेटिङमा जानुहोस्";
 "actions.stopLocationSharing" = "साझा गर्न बन्द गर्नुहोस्";
 
 // Calls
-"calls.incomingCallInfo" = "तपाईसँग कुरा गर्न चाहन्छ";
 "calls.ringing" = "बजिरहेको छ...";
 "calls.connecting" = "जोड्ने...";
 "calls.callFinished" = "कल समाप्त";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "उपकरणहरू";
 "accountPage.settingsHeader" = "सेटिंग्स";
 "accountPage.notificationsHeader" = "सूचनाहरू";
-"accountPage.usernameNotRegistered" = "प्रयोगकर्ता नामः दर्ता गरिएको छैन";
-"accountPage.credentialsHeader" = "खाता विवरण";
 "accountPage.blockedContacts" = "सम्पर्कहरू रोकिने";
 "accountPage.unblockContact" = "अनब्लक";
 "accountPage.proxyAddressAlert" = "प्रोक्सी ठेगाना प्रदान गर्नुहोस्";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "जडान";
 "account.statusUnknown" = "अज्ञात";
 "account.statusConnectionerror" = "जडान त्रुटि";
-"account.needMigration" = "खातामा स्थानान्तरण गर्न आवश्यक छ";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "म";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "निमन्त्रणा प्राप्त";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "आउटगोइंग कल";
 "generatedMessage.missedOutgoingCall" = "अपाङ्गित प्रस्थान कल";
 "generatedMessage.missedIncomingCall" = "अनुपस्थित आगमन कल";
 "generatedMessage.liveLocationSharing" = "प्रत्यक्ष स्थान साझेदारी";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "प्रतिक्रिया";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "नजिक";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "खाता थप्नुहोस्";
+"accessibility.aboutJamiTitle" = "जमीको बारेमा";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "प्रोफाइल चित्र";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/nl.lproj/Localizable.strings b/Ring/Ring/Resources/nl.lproj/Localizable.strings
index bf094de3896f0052ccfe1885f4408c2c0446a739..976db3acafd123875f5e9de9128abdb0d7f42e50 100644
--- a/Ring/Ring/Resources/nl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Toevoegen aan contacten?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "U deelt uw locatie momenteel met ";
-"conversation.explanationReceivingLocationFrom" = "U ontvangt momenteel een live locatie van ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "In antwoord op";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Jij?";
 "conversation.edited" = "Gecorrigeerd";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Geen uitnodigingen";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Geaccepteerd";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Uitnodigingen ontvangen";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Neem deel aan Jami.";
-"createAccount.lookingForUsernameAvailability" = "beschikbaarheid wordt gecontroleerd…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "gebruikersnaam reeds in gebruik";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Account wordt toegevoegd";
 "createAccount.UsernameNotRegisteredTitle" = "Netwerkfout";
 "createAccount.UsernameNotRegisteredMessage" = "Het account is aangemaakt, maar de gebruikersnaam is niet geregistreerd";
 "createAccount.timeoutTitle" = "Account aangemaakt";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Verwijderen";
 "actions.backAction" = "Terug";
 "actions.doneAction" = "Klaar";
-"alerts.incomingCallAllertTitle" = "Inkomende oproep van";
-"alerts.incomingCallButtonIgnore" = "Negeren";
-"actions.startAudioCall" = "Audio-oproep";
-"actions.startVideoCall" = "Video oproep";
 "actions.goToSettings" = "Ga naar instellingen";
 "actions.stopLocationSharing" = "Stop met delen";
 
 // Calls
-"calls.incomingCallInfo" = "wil met u praten";
 "calls.ringing" = "Gaat over…";
 "calls.connecting" = "Bezig met verbinden…";
 "calls.callFinished" = "Oproep beëindigd";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Apparaten";
 "accountPage.settingsHeader" = "Instellingen";
 "accountPage.notificationsHeader" = "Meldingen";
-"accountPage.usernameNotRegistered" = "gebruikersnaam: niet geregistreerd";
-"accountPage.credentialsHeader" = "Accountgegevens";
 "accountPage.blockedContacts" = "Geblokkeerde contacten";
 "accountPage.unblockContact" = "Deblokkeren";
 "accountPage.proxyAddressAlert" = "Voer proxyadres in";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Verbinden";
 "account.statusUnknown" = "Onbekend";
 "account.statusConnectionerror" = "Verbindingsfout";
-"account.needMigration" = "rekening moet worden migreerd";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ik";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Uitnodiging ontvangen";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Uitgaande oproep";
 "generatedMessage.missedOutgoingCall" = "Gemiste uitgaande oproep";
 "generatedMessage.missedIncomingCall" = "Gemiste inkomende oproep";
 "generatedMessage.liveLocationSharing" = "Live locatie delen";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Terugkoppeling";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Sluiten";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Account toevoegen";
+"accessibility.aboutJamiTitle" = "Over Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profielfoto";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/nn.lproj/Localizable.strings b/Ring/Ring/Resources/nn.lproj/Localizable.strings
index ee1017f1ba82d16c1ff6328357e29ce01e0e9208..257bb112c707b00d7bdc21a488b767e84250c8c9 100644
--- a/Ring/Ring/Resources/nn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nn.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Legg til kontakt?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Du delar no med deg av plasseringa med ";
-"conversation.explanationReceivingLocationFrom" = "Du får for tiden ein live-platsing frå ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "I svar på";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Du er det";
 "conversation.edited" = "Redigert";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ingen invitasjonar";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Aksept";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Kom til Jami";
-"createAccount.lookingForUsernameAvailability" = "ser etter tilgjengelighet...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "brukernavn som er tekne";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Tilleggsrekning";
 "createAccount.UsernameNotRegisteredTitle" = "Netverksfeil";
 "createAccount.UsernameNotRegisteredMessage" = "Konto vart oppretta men brukernavn vart ikkje registrert";
 "createAccount.timeoutTitle" = "Konto opprett";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Ta bort";
 "actions.backAction" = "Tilbaka";
 "actions.doneAction" = "Gjort";
-"alerts.incomingCallAllertTitle" = "Innkommende samtal frå ";
-"alerts.incomingCallButtonIgnore" = "Ignorera";
-"actions.startAudioCall" = "Lyddeal";
-"actions.startVideoCall" = "Video ring";
 "actions.goToSettings" = "Gå til Settings";
 "actions.stopLocationSharing" = "Sluta å dela";
 
 // Calls
-"calls.incomingCallInfo" = "vil snakke med deg";
 "calls.ringing" = "Ringing ringing...";
 "calls.connecting" = "Kjøp saman...";
 "calls.callFinished" = "Ringing ferdig";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Enhet";
 "accountPage.settingsHeader" = "Innstillingar";
 "accountPage.notificationsHeader" = "Meddelegheiningar";
-"accountPage.usernameNotRegistered" = "Brukarnamn: ikkje registrert";
-"accountPage.credentialsHeader" = "Kontoinformasjon";
 "accountPage.blockedContacts" = "Bloka kontakt";
 "accountPage.unblockContact" = "Avbløka";
 "accountPage.proxyAddressAlert" = "Gjev ut proxy-adress";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Kopplande";
 "account.statusUnknown" = "Ukenne";
 "account.statusConnectionerror" = "Fell på tilkobling";
-"account.needMigration" = "kontoen må flytta";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Eg er berre ein";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Innbyding motteke";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Utgående samtale";
 "generatedMessage.missedOutgoingCall" = "Miska utgående samtale";
 "generatedMessage.missedIncomingCall" = "Miska innkomne samtal";
 "generatedMessage.liveLocationSharing" = "Live lokasjon deling";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Tilbakemelding";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Nær";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Legg til konto";
+"accessibility.aboutJamiTitle" = "Om Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profilbilde";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/oc.lproj/Localizable.strings b/Ring/Ring/Resources/oc.lproj/Localizable.strings
index 9f13ab7f047743f11f258e980e622560183b0179..b806c9b8d3449bdbfe168e29cf50e8233cf5cb71 100644
--- a/Ring/Ring/Resources/oc.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/oc.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Ajustar a los contactes?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Vos partagez actualament la vòstra localizacion amb ";
-"conversation.explanationReceivingLocationFrom" = "Recebís actualament una localizacion en viu de ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "En respònd a";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tu";
 "conversation.edited" = "Edicion";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Cap d’invitacion";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Acceptat";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "S' unís a Jami";
-"createAccount.lookingForUsernameAvailability" = "cercant la disponibilitat...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "nom d'utilizaire ja pres";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Apondon de compte";
 "createAccount.UsernameNotRegisteredTitle" = "Error ret";
 "createAccount.UsernameNotRegisteredMessage" = "Un compte es creat mas lo nom d' utilizaire es pas enregistrat";
 "createAccount.timeoutTitle" = "Compte creat";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Suprimir";
 "actions.backAction" = "Tornar";
 "actions.doneAction" = "Finida";
-"alerts.incomingCallAllertTitle" = "Sonada de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Apèl audio";
-"actions.startVideoCall" = "Apèl de vidèo";
 "actions.goToSettings" = "Virar a las configuracions";
 "actions.stopLocationSharing" = "Cau pas de partejar";
 
 // Calls
-"calls.incomingCallInfo" = "vòl vos parlar";
 "calls.ringing" = "Sonèt...";
 "calls.connecting" = "Connexion…";
 "calls.callFinished" = "Sonada acabada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Aparelhs";
 "accountPage.settingsHeader" = "Paramètres";
 "accountPage.notificationsHeader" = "Notificacions";
-"accountPage.usernameNotRegistered" = "Nom d'utilizaire: pas inscrich";
-"accountPage.credentialsHeader" = "Detalhs del compte";
 "accountPage.blockedContacts" = "Contactes blocats";
 "accountPage.unblockContact" = "Desbloquejar";
 "accountPage.proxyAddressAlert" = "Foir una adreça proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connexion";
 "account.statusUnknown" = "Desconegut";
 "account.statusConnectionerror" = "Error desconeguda";
-"account.needMigration" = "compte deu èsser migrats";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ieu";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitacion recebuda";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Apèl sortent";
 "generatedMessage.missedOutgoingCall" = "Sonada sortissenta mancada";
 "generatedMessage.missedIncomingCall" = "Sonada dintrada mancada";
 "generatedMessage.liveLocationSharing" = "Partatge de localizacion en viu";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Repòrts";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Tampar";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Ajustar compte";
+"accessibility.aboutJamiTitle" = "A prepaus de Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Fotografia de perfil";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/or.lproj/Localizable.strings b/Ring/Ring/Resources/or.lproj/Localizable.strings
index ca4469ad45a5b33336564d032af0186e37f95699..89755ac7b5306aa8f99f44c431bf64a9ac2006ff 100644
--- a/Ring/Ring/Resources/or.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/or.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "In reply to";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "Edited";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "ସମ୍ପର୍କ ଅବରୋଧ";
 
 // Invitations
 "invitations.noInvitations" = "No invitations";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "username already taken";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Adding account";
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Delete";
 "actions.backAction" = "Back";
 "actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonIgnore" = "Ignore";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "Stop sharing";
 
 // Calls
-"calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
 "calls.callFinished" = "Call finished";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Devices";
 "accountPage.settingsHeader" = "Settings";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
 "accountPage.blockedContacts" = "Blocked contacts";
 "accountPage.unblockContact" = "Unblock";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connecting";
 "account.statusUnknown" = "Unknown";
 "account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation received";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Outgoing call";
 "generatedMessage.missedOutgoingCall" = "Missed outgoing call";
 "generatedMessage.missedIncomingCall" = "Missed incoming call";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "ପ୍ରୋଫାଇଲ୍ ଫଟୋ";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index c23ec9108330fd2b9f6136be5c0430c8895fab7d..eff6171ff2d31d5cc4c7b333fd321e30f4112257 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "ਸੰਪਰਕਾਂ ਵਿੱਚ ਜੋੜੀਏ?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "In reply to";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "Edited";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "No invitations";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
 "createAccount.usernameAlreadyTaken" = "ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲਿਆ ਗਿਆ";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "ਖਾਤਾ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ";
 "createAccount.UsernameNotRegisteredTitle" = "ਨੈੱਟਵਰਕ ਗੜਬੜ";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "ਮਿਟਾਓ";
 "actions.backAction" = "ਪਿੱਛੇ";
 "actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonIgnore" = "Ignore";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "ਸਾਂਝਾ ਕਰਨਾ ਬੰਦ ਕਰੋ";
 
 // Calls
-"calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
 "calls.callFinished" = "Call finished";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "ਡੀਵਾਈਸ";
 "accountPage.settingsHeader" = "ਸੈਟਿੰਗਾਂ";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
 "accountPage.blockedContacts" = "ਬਲਾਕ ਕੀਤੇ ਸੰਪਰਕ";
 "accountPage.unblockContact" = "ਅਣਬਲਾਕ ਕਰੋ";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ";
 "account.statusUnknown" = "ਅਣਪਛਾਤਾ";
 "account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "ਮੈਂ";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "ਸੱਦਾ ਮਿਲਿਆ";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "ਜਾਂਦੀ ਕਾਲ";
 "generatedMessage.missedOutgoingCall" = "ਖੁੰਝੀ ਜਾਂਦੀ ਕਾਲ";
 "generatedMessage.missedIncomingCall" = "ਖੁੰਝੀ ਆਉਂਦੀ ਕਾਲ";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "ਪ੍ਰਤੀਕਰਮ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "ਖਾਤਾ ਜੋੜੋ";
+"accessibility.aboutJamiTitle" = "Jami ਬਾਰੇ";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/pl.lproj/Localizable.strings b/Ring/Ring/Resources/pl.lproj/Localizable.strings
index 800f33558c482d16f17dd332f330b81bce7de337..fb6afb3ec158726b5fcdef22d66c54e59f589840 100644
--- a/Ring/Ring/Resources/pl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl.lproj/Localizable.strings
@@ -57,23 +57,23 @@
 "global.time" = "Czas";
 "global.editPassword" = "Edytuj hasło";
 "global.confirmPassword" = "Potwierdź hasło";
-"global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.cameraDisabled" = "Dostęp do kamery jest wyłączony. Włącz go w ustawieniach urządzenia, aby skorzystać z tej funkcji.";
 
 // Scan
 "scan.badQrCode" = "Niepoprawny kod QR";
 
 // SwarmCreation
-"swarmcreation.searchBar" = "Search for contact…";
-"swarmcreation.addDescription" = "Add description";
+"swarmcreation.searchBar" = "Szukaj kontaktu...";
+"swarmcreation.addDescription" = "Dodaj opis";
 // Swarm
 "swarm.muteConversation" = "Nie mówcie nic.";
 "swarm.leaveConversation" = "/Nie mówcie o tym.";
 "swarm.chooseColor" = "Kolor";
-"swarm.typeOfSwarm" = "Conversation type";
+"swarm.typeOfSwarm" = "Typ konwersacji";
 "swarm.identifier" = "Identyfikator";
 "swarm.settings" = "Ustawienia";
 "swarm.members" = "Użytkownicy";
-"swarm.addDescription" = "Add description";
+"swarm.addDescription" = "Dodaj opis";
 "swarm.oneToOne" = "Prywatne";
 "swarm.adminInvitesOnly" = "Grupy prywatne (z ograniczoną zaproszeniem)";
 "swarm.invitesOnly" = "Grupy prywatne";
@@ -82,37 +82,37 @@
 "swarm.member" = "Członek";
 "swarm.invited" = "Zaproszone";
 "swarm.admin" = "Administrator";
-"swarm.blocked" = "Blocked";
+"swarm.blocked" = "Zablokowany";
 "swarm.unknown" = "Nieznane";
-"swarm.inviteMembers" = "Invite members";
-"swarm.confirmLeaveConversation" = "Do you want to leave this conversation?";
+"swarm.inviteMembers" = "Zaproś członków";
+"swarm.confirmLeaveConversation" = "Czy chcesz opuścić tę konwersację?";
 "swarm.Leave" = "Wyjdź";
 "swarm.newGroup" = "Utwórz nową grupę";
-"swarm.namePlaceholder" = "Group name";
-"swarm.explanationText" = "Members can be invited at any time after the group has been created.";
-"swarm.customizeProfile" = "Customize group profile";
-"swarm.changePicture" = "Change group picture";
-"swarm.customize" = "Customize group";
+"swarm.namePlaceholder" = "Nazwa grupy";
+"swarm.explanationText" = "Członkowie mogą być zaproszeni w każdej chwili po tym, jak grupa zostanie utworzona.";
+"swarm.customizeProfile" = "Dostosuj profil grupy";
+"swarm.changePicture" = "Zmień zdjęcie grupy";
+"swarm.customize" = "Dostosuj grupę";
 "swarm.selectContacts" = "Wybierz kontakty";
 
 // Smartlist
 "smartlist.yesterday" = "Wczoraj";
 "smartlist.results" = "Publiczny katalog";
-"smartlist.jamsResults" = "Search result";
+"smartlist.jamsResults" = "Wynik wyszukiwania";
 "smartlist.conversations" = "Rozmowy";
 "smartlist.noConversationsFound" = "Żadne rozmowy nie pasują do wyszukiwania";
-"smartlist.newContact" = "New contact";
-"smartlist.newGroup" = "New group";
+"smartlist.newContact" = "Nowy kontakt";
+"smartlist.newGroup" = "Nowa grupa";
 "smartlist.accounts" = "Konta";
 "smartlist.invitationReceived" = "Otrzymano zaproszenia";
 "smartlist.noResults" = "Brak rezultatów";
 "smartlist.noConversation" = "Brak konwersacji";
-"smartlist.searchBarPlaceholder" = "Enter name…";
+"smartlist.searchBarPlaceholder" = "Wprowadź nazwę...";
 "smartlist.searchBar" = "Szukaj";
 "smartlist.noNetworkConnectivity" = "Brak połączenia z siecią";
 "smartlist.cellularAccess" = "Upewnij się, że dostęp do sieci komórkowej jest dozwolony w ustawieniach";
 "smartlist.accountsTitle" = "Konta";
-"smartlist.addAccountButton" = "+ Add account";
+"smartlist.addAccountButton" = "+ Dodaj konto";
 "smartlist.noNumber" = "Zaznaczony kontakt nie ma żadnego numeru";
 "smartlist.selectOneNumber" = "Wybierz jeden z numerów";
 "smartlist.invitations" = "Zaproszenia";
@@ -129,29 +129,26 @@
 "conversation.addToContactsLabel" = "Dodać do kontaktów?";
 "conversation.notContactLabel" = "nie znajduje się na liście kontaktów";
 "conversation.messagePlaceholder" = "Napisz do";
-"conversation.explanationSendingLocationTo" = "Udostępniasz teraz lokalizację dla ";
-"conversation.explanationReceivingLocationFrom" = "Otrzymujesz teraz lokalizację na żywo od";
-"conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
-"conversation.receivedRequest" = "%@ sent you a conversation invitation.";
-"conversation.incomingRequest" = "sent you a conversation invitation.";
-"conversation.requestMessage" = "Hello,\nDo you want to join the conversation?";
-"conversation.sendRequest" = "Send them an invitation to be able converse.";
-"conversation.sendRequestTitle" = "Send conversation invitation";
-"conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
-"conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
+"conversation.errorSavingImage" = "Wystąpił błąd podczas zapisywania zdjęcia do galerii.";
+"conversation.receivedRequest" = "%@ wysłał Tobie zaproszenie do konwersacji.";
+"conversation.incomingRequest" = "wysłał Tobie zaproszenie do konwersacji.";
+"conversation.requestMessage" = "Cześć, \nCzy chciałbyś dołączyć do rozmowy?";
+"conversation.sendRequest" = "Wyślij im zaproszenie, aby móc rozmawiać.";
+"conversation.sendRequestTitle" = "Wyślij zaproszenie do konwersacji";
+"conversation.synchronizationTitle" = "Zaakceptowałeś zaproszenie do konwersacji.";
+"conversation.synchronizationMessage" = "Czekanie, aż %@ podłączy się, żeby zsynchronizować rozmowę...";
 "conversation.inReplyTo" = "W odpowiedzi na";
-"conversation.repliedTo" = "odpowiedział";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ty";
 "conversation.edited" = "Wydany w wersji";
-"conversation.deletedMessage" = "skasował wiadomość";
-"conversation.contactBlocked" = "Contact blocked";
+"conversation.deletedMessage" = "%@ usunął wiadomość";
+"conversation.contactBlocked" = "Kontakt zablokowany";
 
 // Invitations
 "invitations.noInvitations" = "Brak zaproszeń";
-"invitations.pending" = "w toku";
-"invitations.accepted" = "zaakceptowane";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Zaakceptowane";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Zablokowany";
 "invitations.list" = "Otrzymano zaproszenia";
 
 // Walkthrough
@@ -163,7 +160,7 @@
 "welcome.linkDevice" = "Importuje się z innego urządzenia";
 "welcome.linkBackup" = "Importuj z archiwum kopii zapasowej";
 "welcome.createAccount" = "Dołączył się";
-"welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
+"welcome.connectToJAMS" = "Połącz się z serwerem zarządzania kontami Jami (JAMS)";
 
 // Creation Profile Screen
 "createProfile.skipCreateProfile" = "Pomiń";
@@ -172,16 +169,14 @@
 "createProfile.enterNameLabel" = "Wprowadź nazwę, która będzie wyświetlana";
 "createProfile.enterNamePlaceholder" = "Wprowadź nazwę";
 "createProfile.subtitle" = "Twój profil będzie udostępniany twoim kontaktom. Możesz zmienić to kiedy chcesz.";
-"createProfile.createProfilePicture" = "Create profile picture";
+"createProfile.createProfilePicture" = "Stwórz zdjęcie profilowe";
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Dołącz do Jami";
-"createAccount.lookingForUsernameAvailability" = "sprawdzanie dostępności...";
-"createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "nazwa użytkownika jest już zajęta";
-"createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Dodawanie konta";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
+"createAccount.invalidUsername" = "Nieprawidłowa nazwa użytkownika. Proszę wpisać prawidłową nazwę.";
+"createAccount.usernameAlreadyTaken" = "Nazwa użytkownika zajęta";
+"createAccount.usernameValid" = "Nazwa użytkownika jest dostępna.";
 "createAccount.UsernameNotRegisteredTitle" = "Błąd sieci";
 "createAccount.UsernameNotRegisteredMessage" = "Konto zostało stworzone, ale nazwa użytkownika nie została zarejestrowana";
 "createAccount.timeoutTitle" = "Konto Stworzone";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Usuń";
 "actions.backAction" = "Wstecz";
 "actions.doneAction" = "Gotowe";
-"alerts.incomingCallAllertTitle" = "Połączenie przychodzące od";
-"alerts.incomingCallButtonIgnore" = "Zignoruj";
-"actions.startAudioCall" = "Połączenie Głosowe";
-"actions.startVideoCall" = "Połączenie Wideo";
 "actions.goToSettings" = "Idź do Ustawień";
 "actions.stopLocationSharing" = "Zatrzymaj udostępnianie";
 
 // Calls
-"calls.incomingCallInfo" = "chce z tobą rozmawiać";
 "calls.ringing" = "Dzwonienie...";
 "calls.connecting" = "Łączenie...";
 "calls.callFinished" = "Rozmowa zakończona";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Urządzenia";
 "accountPage.settingsHeader" = "Ustawienia";
 "accountPage.notificationsHeader" = "Powiadomienia";
-"accountPage.usernameNotRegistered" = "nazwa użytkownika: nie zarejestrowana";
-"accountPage.credentialsHeader" = "Szczegóły konta";
 "accountPage.blockedContacts" = "Zablokowane kontakty";
 "accountPage.unblockContact" = "Odblokuj";
 "accountPage.proxyAddressAlert" = "Dostarcz adres proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Łączenie";
 "account.statusUnknown" = "Nieznane";
 "account.statusConnectionerror" = "Błąd Połączenia";
-"account.needMigration" = "konto musi zostać przeniesione";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ja";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Otrzymano zaproszenie";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Połączenie wychodzące";
 "generatedMessage.missedOutgoingCall" = "Nieodebrane połączenie wychodzące";
 "generatedMessage.missedIncomingCall" = "Nieodebrane połączenie przychodzące";
 "generatedMessage.liveLocationSharing" = "Udostępnianie lokalizacji na żywo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Opinia";
 "aboutJami.createdBy" = "Utworzony przez";
 "aboutJami.artworkBy" = "Grafika autorstwa";
+
+// Accessibility
+"accessibility.close" = "Zamknij";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Dodaj konto";
+"accessibility.aboutJamiTitle" = "O Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Zdjęcie profilu";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
index f44ef22d4f154bf9d76300a61ba191cbd432739e..97ef93105bd5c8b34e8d9481b7a17d0ef4d0e072 100644
--- a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
@@ -57,23 +57,23 @@
 "global.time" = "Czas";
 "global.editPassword" = "Edytuj hasło";
 "global.confirmPassword" = "Potwierdź hasło";
-"global.cameraDisabled" = "Camera access is disabled. Enable it in device settings in order to use this feature.";
+"global.cameraDisabled" = "Dostęp do kamery jest wyłączony. Włącz go w ustawieniach urządzenia, aby skorzystać z tej funkcji.";
 
 // Scan
 "scan.badQrCode" = "Niepoprawny kod QR";
 
 // SwarmCreation
-"swarmcreation.searchBar" = "Search for contact…";
-"swarmcreation.addDescription" = "Add description";
+"swarmcreation.searchBar" = "Szukaj kontaktu...";
+"swarmcreation.addDescription" = "Dodaj opis";
 // Swarm
 "swarm.muteConversation" = "Wycisz konwersację";
 "swarm.leaveConversation" = "/Nie mówcie o tym.";
 "swarm.chooseColor" = "Kolor";
-"swarm.typeOfSwarm" = "Conversation type";
+"swarm.typeOfSwarm" = "Typ konwersacji";
 "swarm.identifier" = "Identyfikator";
 "swarm.settings" = "Ustawienia";
 "swarm.members" = "Użytkownicy";
-"swarm.addDescription" = "Add description";
+"swarm.addDescription" = "Dodaj opis";
 "swarm.oneToOne" = "Prywatne";
 "swarm.adminInvitesOnly" = "Grupy prywatne (z ograniczoną zaproszeniem)";
 "swarm.invitesOnly" = "Grupy prywatne";
@@ -82,37 +82,37 @@
 "swarm.member" = "Członek";
 "swarm.invited" = "Zaproszone";
 "swarm.admin" = "Administrator";
-"swarm.blocked" = "Blocked";
+"swarm.blocked" = "Zablokowany";
 "swarm.unknown" = "Nieznane";
-"swarm.inviteMembers" = "Invite members";
-"swarm.confirmLeaveConversation" = "Do you want to leave this conversation?";
+"swarm.inviteMembers" = "Zaproś członków";
+"swarm.confirmLeaveConversation" = "Czy chcesz opuścić tę konwersację?";
 "swarm.Leave" = "Wyjdź";
 "swarm.newGroup" = "Utwórz nową grupę";
-"swarm.namePlaceholder" = "Group name";
-"swarm.explanationText" = "Members can be invited at any time after the group has been created.";
-"swarm.customizeProfile" = "Customize group profile";
-"swarm.changePicture" = "Change group picture";
-"swarm.customize" = "Customize group";
+"swarm.namePlaceholder" = "Nazwa grupy";
+"swarm.explanationText" = "Członkowie mogą być zaproszeni w każdej chwili po tym, jak grupa zostanie utworzona.";
+"swarm.customizeProfile" = "Dostosuj profil grupy";
+"swarm.changePicture" = "Zmień zdjęcie grupy";
+"swarm.customize" = "Dostosuj grupę";
 "swarm.selectContacts" = "Wybierz kontakty";
 
 // Smartlist
 "smartlist.yesterday" = "Wczoraj";
 "smartlist.results" = "Publiczny katalog";
-"smartlist.jamsResults" = "Search result";
+"smartlist.jamsResults" = "Wynik wyszukiwania";
 "smartlist.conversations" = "Rozmowy";
 "smartlist.noConversationsFound" = "Żadne rozmowy nie pasują do wyszukiwania";
-"smartlist.newContact" = "New contact";
-"smartlist.newGroup" = "New group";
+"smartlist.newContact" = "Nowy kontakt";
+"smartlist.newGroup" = "Nowa grupa";
 "smartlist.accounts" = "Konta";
 "smartlist.invitationReceived" = "Otrzymano zaproszenia";
 "smartlist.noResults" = "Brak rezultatów";
 "smartlist.noConversation" = "Brak konwersacji";
-"smartlist.searchBarPlaceholder" = "Enter name…";
+"smartlist.searchBarPlaceholder" = "Wprowadź imię...";
 "smartlist.searchBar" = "Szukaj";
 "smartlist.noNetworkConnectivity" = "Brak połączenia z siecią";
 "smartlist.cellularAccess" = "Upewnij się, że dostęp do sieci komórkowej jest dozwolony w ustawieniach";
 "smartlist.accountsTitle" = "Konta";
-"smartlist.addAccountButton" = "+ Add account";
+"smartlist.addAccountButton" = "+ Dodaj konto";
 "smartlist.noNumber" = "Zaznaczony kontakt nie ma żadnego numeru";
 "smartlist.selectOneNumber" = "Wybierz jeden z numerów";
 "smartlist.invitations" = "Zaproszenia";
@@ -129,29 +129,26 @@
 "conversation.addToContactsLabel" = "Dodać do kontaktów?";
 "conversation.notContactLabel" = "nie znajduje się na liście kontaktów";
 "conversation.messagePlaceholder" = "Napisz do";
-"conversation.explanationSendingLocationTo" = "Udostępniasz teraz lokalizację dla ";
-"conversation.explanationReceivingLocationFrom" = "Otrzymujesz teraz lokalizację na żywo od";
-"conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
-"conversation.receivedRequest" = "%@ sent you a conversation invitation.";
-"conversation.incomingRequest" = "sent you a conversation invitation.";
-"conversation.requestMessage" = "Hello,\nDo you want to join the conversation?";
-"conversation.sendRequest" = "Send them an invitation to be able converse.";
-"conversation.sendRequestTitle" = "Send conversation invitation";
-"conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
-"conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
+"conversation.errorSavingImage" = "Wystąpił błąd podczas zapisywania zdjęcia do galerii.";
+"conversation.receivedRequest" = "%@ wysłał Tobie zaproszenie do konwersacjiZ";
+"conversation.incomingRequest" = "wysłał Tobie zaproszenie do konwersacji.";
+"conversation.requestMessage" = "Cześć, \nCzy chciałbyś dołączyć do rozmowy?";
+"conversation.sendRequest" = "Wyślij im zaproszenie, aby móc rozmawiać.";
+"conversation.sendRequestTitle" = "Wysłał zaproszenie do konwersacji";
+"conversation.synchronizationTitle" = "Zaakceptowałeś zaproszenie do konwersacji.";
+"conversation.synchronizationMessage" = "Czekanie, aż %@ podłączy się, żeby zsynchronizować rozmowę...";
 "conversation.inReplyTo" = "W odpowiedzi na";
-"conversation.repliedTo" = "odpowiedział";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ty";
 "conversation.edited" = "Edytowany";
-"conversation.deletedMessage" = "skasował wiadomość";
-"conversation.contactBlocked" = "Contact blocked";
+"conversation.deletedMessage" = "1%@ usunął wiadomość";
+"conversation.contactBlocked" = "Kontakt zablokowany";
 
 // Invitations
 "invitations.noInvitations" = "Brak zaproszeń";
-"invitations.pending" = "w toku";
-"invitations.accepted" = "zaakceptowane";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Zaakceptowane";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Zablokowany";
 "invitations.list" = "Otrzymano zaproszenia";
 
 // Walkthrough
@@ -163,7 +160,7 @@
 "welcome.linkDevice" = "Importuje się z innego urządzenia";
 "welcome.linkBackup" = "Importuj z archiwum kopii zapasowej";
 "welcome.createAccount" = "Dołączył się";
-"welcome.connectToJAMS" = "Connect to Jami Account Management Server (JAMS)";
+"welcome.connectToJAMS" = "Połącz się z serwerem zarządzania kontami Jami (JAMS)";
 
 // Creation Profile Screen
 "createProfile.skipCreateProfile" = "Pomiń";
@@ -172,16 +169,14 @@
 "createProfile.enterNameLabel" = "Wprowadź nazwę, która będzie wyświetlana";
 "createProfile.enterNamePlaceholder" = "Wprowadź nazwę";
 "createProfile.subtitle" = "Twój profil będzie udostępniany twoim kontaktom. Możesz zmienić to kiedy chcesz.";
-"createProfile.createProfilePicture" = "Create profile picture";
+"createProfile.createProfilePicture" = "Stwórz zdjęcie profilowe";
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Dołącz do Jami";
-"createAccount.lookingForUsernameAvailability" = "sprawdzanie dostępności...";
-"createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "nazwa użytkownika jest już zajęta";
-"createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Dodawanie konta";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
+"createAccount.invalidUsername" = "Nieprawidłowa nazwa użytkownika. Proszę wpisać prawidłową nazwę.";
+"createAccount.usernameAlreadyTaken" = "Nazwa użytkownika zajęta";
+"createAccount.usernameValid" = "Nazwa użytkownika jest dostępna.";
 "createAccount.UsernameNotRegisteredTitle" = "Błąd sieci";
 "createAccount.UsernameNotRegisteredMessage" = "Konto zostało stworzone, ale nazwa użytkownika nie została zarejestrowana";
 "createAccount.timeoutTitle" = "Konto Stworzone";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Usuń";
 "actions.backAction" = "Wstecz";
 "actions.doneAction" = "Gotowe";
-"alerts.incomingCallAllertTitle" = "Połączenie przychodzące od";
-"alerts.incomingCallButtonIgnore" = "Zignoruj";
-"actions.startAudioCall" = "Połączenie Głosowe";
-"actions.startVideoCall" = "Połączenie Wideo";
 "actions.goToSettings" = "Idź do Ustawień";
 "actions.stopLocationSharing" = "Zatrzymaj udostępnianie";
 
 // Calls
-"calls.incomingCallInfo" = "chce z tobą rozmawiać";
 "calls.ringing" = "Dzwonienie...";
 "calls.connecting" = "Łączenie...";
 "calls.callFinished" = "Rozmowa zakończona";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Urządzenia";
 "accountPage.settingsHeader" = "Ustawienia";
 "accountPage.notificationsHeader" = "Powiadomienia";
-"accountPage.usernameNotRegistered" = "nazwa użytkownika: nie zarejestrowana";
-"accountPage.credentialsHeader" = "Szczegóły konta";
 "accountPage.blockedContacts" = "Zablokowane kontakty";
 "accountPage.unblockContact" = "Odblokuj";
 "accountPage.proxyAddressAlert" = "Dostarcz adres proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Łączenie";
 "account.statusUnknown" = "Nieznane";
 "account.statusConnectionerror" = "Błąd Połączenia";
-"account.needMigration" = "konto musi zostać przeniesione";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ja";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Otrzymano zaproszenie";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Połączenie wychodzące";
 "generatedMessage.missedOutgoingCall" = "Nieodebrane połączenie wychodzące";
 "generatedMessage.missedIncomingCall" = "Nieodebrane połączenie przychodzące";
 "generatedMessage.liveLocationSharing" = "Udostępnianie lokalizacji na żywo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Opinia";
 "aboutJami.createdBy" = "Utworzony przez";
 "aboutJami.artworkBy" = "Grafika autorstwa";
+
+// Accessibility
+"accessibility.close" = "Zamknij";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Dodaj konto";
+"accessibility.aboutJamiTitle" = "O Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Zdjęcie profilu";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index 700c1048883acb86bf515075a7ec73930520932f..0375b0a06466949a6e5e265f6d4faed94c9a27d4 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Adicionar aos contatos?";
 "conversation.notContactLabel" = "não está na sua lista de contatos";
 "conversation.messagePlaceholder" = "Escrever para";
-"conversation.explanationSendingLocationTo" = "Atualmente você está compartilhando sua localização com";
-"conversation.explanationReceivingLocationFrom" = "Você está recebendo atualmente uma localização real de";
 "conversation.errorSavingImage" = "Ocorreu um erro ao guardar a imagem na galeria.";
 "conversation.receivedRequest" = "%@ enviou-lhe um convite para uma conversa.";
 "conversation.incomingRequest" = "enviou-lhe um convite para uma conversa.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Aceitou o convite para conversar.";
 "conversation.synchronizationMessage" = "À espera que %@ se conecte para sincronizar a conversa…";
 "conversation.inReplyTo" = "Em resposta à";
-"conversation.repliedTo" = "respondeu a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Você";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "excluiu uma mensagem";
+"conversation.deletedMessage" = "%@ apagou uma mensagem";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "Sem convites";
-"invitations.pending" = "pendente";
-"invitations.accepted" = "aceitou";
-"invitations.declined" = "recusou";
-"invitations.blocked" = "bloqueou";
+"invitations.accepted" = "Aceito";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Bloqueado";
 "invitations.list" = "Convites recebidos";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Junte-se a Jami";
-"createAccount.lookingForUsernameAvailability" = "buscando disponibilidade…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nome de utilizador inválido. Introduza um nome de utilizador válido.";
-"createAccount.usernameAlreadyTaken" = "nome de usuário já existente";
+"createAccount.usernameAlreadyTaken" = "Nome de usuário já em uso";
 "createAccount.usernameValid" = "O nome de utilizador está disponível.";
-"createAccount.loading" = "A carregar…";
-"createAccount.waitCreateAccountTitle" = "Adicionando conta";
 "createAccount.UsernameNotRegisteredTitle" = "Erro de rede";
 "createAccount.UsernameNotRegisteredMessage" = "A conta foi criada, mas o nome de usuário não foi registrado";
 "createAccount.timeoutTitle" = "Conta criada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Excluir";
 "actions.backAction" = "Voltar";
 "actions.doneAction" = "Feito";
-"alerts.incomingCallAllertTitle" = "Recebendo chamada de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Chamada de áudio";
-"actions.startVideoCall" = "Chamada de vídeo";
 "actions.goToSettings" = "Ir para configurações";
 "actions.stopLocationSharing" = "Parar de compartilhar";
 
 // Calls
-"calls.incomingCallInfo" = "quer conversar com você";
 "calls.ringing" = "Toque…";
 "calls.connecting" = "Conectando…";
 "calls.callFinished" = "Chamada terminada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configurações";
 "accountPage.notificationsHeader" = "Notificações";
-"accountPage.usernameNotRegistered" = "nome de usuário: não registrado";
-"accountPage.credentialsHeader" = "Detalhes da conta";
 "accountPage.blockedContacts" = "Contatos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Forneça o endereço do proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Conectando";
 "account.statusUnknown" = "Desconhecido";
 "account.statusConnectionerror" = "Erro de conexão";
-"account.needMigration" = "conta precisa ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Eu";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Convite recebido";
 "generatedMessage.swarmCreated" = "Conversa criada";
-"generatedMessage.invitationReceived" = "foi convidado a juntar-se à conversa.";
-"generatedMessage.invitationAccepted" = "juntou-se à conversa.";
+"generatedMessage.invitationReceived" = "%@ foi convidado a juntar-se à conversa.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Você entrou na conversa.";
-"generatedMessage.contactBlocked" = "foi bloqueado da conversa.";
-"generatedMessage.contactUnblocked" = "foi desbloqueado da conversa.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Chamada efetuada";
 "generatedMessage.missedOutgoingCall" = "Chamadas efetuadas perdidas";
 "generatedMessage.missedIncomingCall" = "Chamadas recebidas perdidas";
 "generatedMessage.liveLocationSharing" = "Compartilhamento de localização atual";
-"generatedMessage.contactLeftConversation" = "saiu da conversa.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Configurações de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Criado por";
 "aboutJami.artworkBy" = "Arte por";
+
+// Accessibility
+"accessibility.close" = "Fechar";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Adicionar conta";
+"accessibility.aboutJamiTitle" = "Sobre Jami";
+"accessibility.welcomeToJamiTitle" = "Bem-vindo ao Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Imagem de perfil";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/pt.lproj/Localizable.strings b/Ring/Ring/Resources/pt.lproj/Localizable.strings
index b7830ab7d6560db31b219a20a79e60cf22516dd5..b28a0fa8e5506605ec9a660faa9f04985b1c7b50 100644
--- a/Ring/Ring/Resources/pt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Adicionar aos contactos?";
 "conversation.notContactLabel" = "não está na sua lista de contactos";
 "conversation.messagePlaceholder" = "Escrever para";
-"conversation.explanationSendingLocationTo" = "Está atualmente a partilhar a sua localização com";
-"conversation.explanationReceivingLocationFrom" = "Está atualmente a receber uma localização em direto de ";
 "conversation.errorSavingImage" = "Ocorreu um erro ao guardar a imagem na galeria.";
 "conversation.receivedRequest" = "%@ enviou-lhe um convite para uma conversa.";
 "conversation.incomingRequest" = "enviou-lhe um convite para uma conversa.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Aceitou o convite para conversar.";
 "conversation.synchronizationMessage" = "À espera que %@ se conecte para sincronizar a conversa…";
 "conversation.inReplyTo" = "Em resposta a";
-"conversation.repliedTo" = "respondeu a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Você";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "eliminou uma mensagem";
+"conversation.deletedMessage" = "%@ eliminou uma mensagem";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "Sem convites";
-"invitations.pending" = "pendente";
-"invitations.accepted" = "aceitou";
-"invitations.declined" = "recusou";
-"invitations.blocked" = "bloqueou";
+"invitations.accepted" = "Aceite";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Bloqueado";
 "invitations.list" = "Convites recebidos";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Aderir ao Jami";
-"createAccount.lookingForUsernameAvailability" = "a procurar pela disponibilidade…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nome de utilizador inválido. Introduza um nome de utilizador válido.";
-"createAccount.usernameAlreadyTaken" = "o nome de utilizador já existe";
+"createAccount.usernameAlreadyTaken" = "O nome de utilizador já está registado";
 "createAccount.usernameValid" = "O nome de utilizador está disponível.";
-"createAccount.loading" = "A carregar…";
-"createAccount.waitCreateAccountTitle" = "Adicionar conta";
 "createAccount.UsernameNotRegisteredTitle" = "Erro de rede";
 "createAccount.UsernameNotRegisteredMessage" = "A conta foi criada mas o nome de utilizador não foi registado";
 "createAccount.timeoutTitle" = "Conta criada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Eliminar";
 "actions.backAction" = "Voltar";
 "actions.doneAction" = "Feito";
-"alerts.incomingCallAllertTitle" = "A receber chamada de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Chamada de áudio";
-"actions.startVideoCall" = "Chamada de vídeo";
 "actions.goToSettings" = "Ir às configurações";
 "actions.stopLocationSharing" = "Parar a partilha";
 
 // Calls
-"calls.incomingCallInfo" = "quer conversar consigo";
 "calls.ringing" = "A tocar…";
 "calls.connecting" = "A conectar…";
 "calls.callFinished" = "Chamada terminada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configurações";
 "accountPage.notificationsHeader" = "Notificações";
-"accountPage.usernameNotRegistered" = "utilizador: não registado";
-"accountPage.credentialsHeader" = "Detalhes da conta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Forneça o endereço do proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "A conectar";
 "account.statusUnknown" = "Desconhecido";
 "account.statusConnectionerror" = "Erro de conexão";
-"account.needMigration" = "conta precisa ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Eu";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Convite recebido";
 "generatedMessage.swarmCreated" = "Conversa criada";
-"generatedMessage.invitationReceived" = "foi convidado a juntar-se à conversa.";
-"generatedMessage.invitationAccepted" = "juntou-se à conversa.";
+"generatedMessage.invitationReceived" = "%@ foi convidado a juntar-se à conversa.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Você entrou na conversa.";
-"generatedMessage.contactBlocked" = "foi bloqueado da conversa.";
-"generatedMessage.contactUnblocked" = "foi desbloqueado da conversa.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Chamada efetuada";
 "generatedMessage.missedOutgoingCall" = "Chamada efetuada perdida";
 "generatedMessage.missedIncomingCall" = "Chamada recebida perdida";
 "generatedMessage.liveLocationSharing" = "Partilha de localização em tempo real";
-"generatedMessage.contactLeftConversation" = "saiu da conversa.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Configurações de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Comentários";
 "aboutJami.createdBy" = "Criado por";
 "aboutJami.artworkBy" = "Arte por";
+
+// Accessibility
+"accessibility.close" = "Fechar";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Adicionar conta";
+"accessibility.aboutJamiTitle" = "Sobre o Jami";
+"accessibility.welcomeToJamiTitle" = "Bem-vindo(a) ao Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Imagem do perfil";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
index 51681045ebf3e4d51b84e901893e7edbd8299a3e..6552d72ef41b70efdb87b1fc8b509106830c567a 100644
--- a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Adicionar aos contactos?";
 "conversation.notContactLabel" = "não está na sua lista de contactos";
 "conversation.messagePlaceholder" = "Escrever para";
-"conversation.explanationSendingLocationTo" = "Está atualmente a partilhar a sua localização com";
-"conversation.explanationReceivingLocationFrom" = "Está atualmente a receber uma localização em direto de ";
 "conversation.errorSavingImage" = "Ocorreu um erro ao guardar a imagem na galeria.";
 "conversation.receivedRequest" = "%@ enviou-lhe um convite para uma conversa.";
 "conversation.incomingRequest" = "enviou-lhe um convite para uma conversa.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Aceitou o convite para conversar.";
 "conversation.synchronizationMessage" = "À espera que %@ se conecte para sincronizar a conversa…";
 "conversation.inReplyTo" = "Em resposta a";
-"conversation.repliedTo" = "respondeu a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Você";
 "conversation.edited" = "Editado";
-"conversation.deletedMessage" = "eliminou uma mensagem";
+"conversation.deletedMessage" = "%@ eliminou uma mensagem";
 "conversation.contactBlocked" = "Contacto bloqueado";
 
 // Invitations
 "invitations.noInvitations" = "Sem convites";
-"invitations.pending" = "pendente";
-"invitations.accepted" = "aceitou";
-"invitations.declined" = "recusou";
-"invitations.blocked" = "bloqueou";
+"invitations.accepted" = "Aceite";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Bloqueado";
 "invitations.list" = "Convites recebidos";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Aderir ao Jami";
-"createAccount.lookingForUsernameAvailability" = "a procurar pela disponibilidade…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Nome de utilizador inválido. Introduza um nome de utilizador válido.";
-"createAccount.usernameAlreadyTaken" = "o nome de utilizador já existe";
+"createAccount.usernameAlreadyTaken" = "O nome de utilizador já está registado";
 "createAccount.usernameValid" = "O nome de utilizador está disponível.";
-"createAccount.loading" = "A carregar…";
-"createAccount.waitCreateAccountTitle" = "Adicionar conta";
 "createAccount.UsernameNotRegisteredTitle" = "Erro de rede";
 "createAccount.UsernameNotRegisteredMessage" = "A conta foi criada mas o nome de utilizador não foi registado";
 "createAccount.timeoutTitle" = "Conta criada";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Eliminar";
 "actions.backAction" = "Voltar";
 "actions.doneAction" = "Feito";
-"alerts.incomingCallAllertTitle" = "A receber chamada de";
-"alerts.incomingCallButtonIgnore" = "Ignorar";
-"actions.startAudioCall" = "Chamada de áudio";
-"actions.startVideoCall" = "Chamada de vídeo";
 "actions.goToSettings" = "Ir às configurações";
 "actions.stopLocationSharing" = "Parar a partilha";
 
 // Calls
-"calls.incomingCallInfo" = "quer conversar consigo";
 "calls.ringing" = "A tocar…";
 "calls.connecting" = "A conectar…";
 "calls.callFinished" = "Chamada terminada";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Dispositivos";
 "accountPage.settingsHeader" = "Configurações";
 "accountPage.notificationsHeader" = "Notificações";
-"accountPage.usernameNotRegistered" = "utilizador: não registado";
-"accountPage.credentialsHeader" = "Detalhes da conta";
 "accountPage.blockedContacts" = "Contactos bloqueados";
 "accountPage.unblockContact" = "Desbloquear";
 "accountPage.proxyAddressAlert" = "Forneça o endereço do proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "A conectar";
 "account.statusUnknown" = "Desconhecido";
 "account.statusConnectionerror" = "Erro de conexão";
-"account.needMigration" = "conta precisa ser migrada";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Eu";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Convite recebido";
 "generatedMessage.swarmCreated" = "Conversa criada";
-"generatedMessage.invitationReceived" = "foi convidado a juntar-se à conversa.";
-"generatedMessage.invitationAccepted" = "juntou-se à conversa.";
+"generatedMessage.invitationReceived" = "%@ foi convidado a juntar-se à conversa.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Você entrou na conversa.";
-"generatedMessage.contactBlocked" = "foi bloqueado da conversa.";
-"generatedMessage.contactUnblocked" = "foi desbloqueado da conversa.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Chamada efetuada";
 "generatedMessage.missedOutgoingCall" = "Chamada efetuada perdida";
 "generatedMessage.missedIncomingCall" = "Chamada recebida perdida";
 "generatedMessage.liveLocationSharing" = "Partilha de localização em tempo real";
-"generatedMessage.contactLeftConversation" = "saiu da conversa.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Configurações de vídeo";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Comentários";
 "aboutJami.createdBy" = "Criado por";
 "aboutJami.artworkBy" = "Arte por";
+
+// Accessibility
+"accessibility.close" = "Fechar";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Adicionar conta";
+"accessibility.aboutJamiTitle" = "Sobre o Jami";
+"accessibility.welcomeToJamiTitle" = "Bem-vindo(a) ao Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Imagem do perfil";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ro.lproj/Localizable.strings b/Ring/Ring/Resources/ro.lproj/Localizable.strings
index 1e2a91d246f4b197f31db4f3ef581e53d9993dc4..04fc96522e8eba0828cb46c99e24b306979b66f6 100644
--- a/Ring/Ring/Resources/ro.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Adaugi la contacte?";
 "conversation.notContactLabel" = "nu este în contactele tale";
 "conversation.messagePlaceholder" = "Scrie pentru";
-"conversation.explanationSendingLocationTo" = "Acum, poziția ta este distribuită către ";
-"conversation.explanationReceivingLocationFrom" = "Acum, primești poziția în direct de la ";
 "conversation.errorSavingImage" = "A apărut o eroare în timpul salvării imaginii.";
 "conversation.receivedRequest" = "%@ ți-a trimis o invitație la conversație.";
 "conversation.incomingRequest" = "ți-a trimis o invitație la conversație.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Ai acceptat invitația la conversație.";
 "conversation.synchronizationMessage" = "Se așteaptă ca %@ să se conecteze pentru a sincroniza conversația…";
 "conversation.inReplyTo" = "Răspuns pentru";
-"conversation.repliedTo" = " a răspuns pentru";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tu";
 "conversation.edited" = "Modificat";
-"conversation.deletedMessage" = "a șters mesajul";
+"conversation.deletedMessage" = "%@ a șters mesajul";
 "conversation.contactBlocked" = "Contact blocat";
 
 // Invitations
 "invitations.noInvitations" = "Nicio invitație";
-"invitations.pending" = "în așteptare";
-"invitations.accepted" = "acceptat";
-"invitations.declined" = "refuzat";
-"invitations.blocked" = "blocat";
+"invitations.accepted" = "Acceptat";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocat";
 "invitations.list" = "Invitații primite";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Folosește Jami";
-"createAccount.lookingForUsernameAvailability" = "caut disponibilitatea...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Numele este greșit. Trebuie introdus un nume corect.";
-"createAccount.usernameAlreadyTaken" = "nume ales deja";
+"createAccount.usernameAlreadyTaken" = "Nume ales deja";
 "createAccount.usernameValid" = "Numele este disponibil.";
-"createAccount.loading" = "Se încarcă…";
-"createAccount.waitCreateAccountTitle" = "Se adaugă contul";
 "createAccount.UsernameNotRegisteredTitle" = "Eroare de rețea";
 "createAccount.UsernameNotRegisteredMessage" = "Contul a fost creat, dar numele de utilizator nu a fost înscris";
 "createAccount.timeoutTitle" = "Cont creat";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Șterge";
 "actions.backAction" = "Înapoi";
 "actions.doneAction" = "Făcut";
-"alerts.incomingCallAllertTitle" = "Apel primit de la ";
-"alerts.incomingCallButtonIgnore" = "Ignoră";
-"actions.startAudioCall" = "  Apel vocal";
-"actions.startVideoCall" = "  Apel video";
 "actions.goToSettings" = "Du-te la Reglări";
 "actions.stopLocationSharing" = "Oprește distribuirea";
 
 // Calls
-"calls.incomingCallInfo" = "vrea să vorbească cu tine";
 "calls.ringing" = "Sună...";
 "calls.connecting" = "Se conectează...";
 "calls.callFinished" = "Apel terminat";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Aparate";
 "accountPage.settingsHeader" = "Reglări";
 "accountPage.notificationsHeader" = "Notificări";
-"accountPage.usernameNotRegistered" = "nume de utilizator: neînscris";
-"accountPage.credentialsHeader" = "Detaliile contului";
 "accountPage.blockedContacts" = "Contacte blocate";
 "accountPage.unblockContact" = "Deblochează";
 "accountPage.proxyAddressAlert" = "Introdu adresa proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Se conectează";
 "account.statusUnknown" = "Necunoscut";
 "account.statusConnectionerror" = "Eroare de conectare";
-"account.needMigration" = "contul trebuie transferat";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mine";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitație primită";
 "generatedMessage.swarmCreated" = "Conversație creată";
-"generatedMessage.invitationReceived" = "a fost invitat să participe la conversație.";
-"generatedMessage.invitationAccepted" = "participă la conversație.";
+"generatedMessage.invitationReceived" = "%@ a fost invitat să participe la conversație.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Participi la conversație.";
-"generatedMessage.contactBlocked" = "a fost blocat din conversație.";
-"generatedMessage.contactUnblocked" = "a fost deblocat din conversație.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Apel efectuat";
 "generatedMessage.missedOutgoingCall" = "Apel efectuat nepreluat";
 "generatedMessage.missedIncomingCall" = "Apel pierdut";
 "generatedMessage.liveLocationSharing" = "Distribuirea poziției în direct";
-"generatedMessage.contactLeftConversation" = "a părăsit conversația.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Reglări video";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Părere";
 "aboutJami.createdBy" = "Creat de";
 "aboutJami.artworkBy" = "Grafică de";
+
+// Accessibility
+"accessibility.close" = "Închide";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Adaugă un cont";
+"accessibility.aboutJamiTitle" = "Despre Jami";
+"accessibility.welcomeToJamiTitle" = "Bine ai venit pe Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Poză de profil";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index f352b5770c43f9149e33638f4653821fe6fe17b4..a466f7172f26781c1393f70b7060c22ab21c61a9 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Adaugi la contacte?";
 "conversation.notContactLabel" = "nu este în contactele tale";
 "conversation.messagePlaceholder" = "Scrie pentru";
-"conversation.explanationSendingLocationTo" = "Acum, poziția ta este distribuită către ";
-"conversation.explanationReceivingLocationFrom" = "Acum, primești poziția în direct de la ";
 "conversation.errorSavingImage" = "A apărut o eroare în timpul salvării imaginii.";
 "conversation.receivedRequest" = "%@ ți-a trimis o invitație la conversație.";
 "conversation.incomingRequest" = "ți-a trimis o invitație la conversație.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Ai acceptat invitația la conversație.";
 "conversation.synchronizationMessage" = "Se așteaptă ca %@ să se conecteze pentru a sincroniza conversația…";
 "conversation.inReplyTo" = "Răspuns pentru";
-"conversation.repliedTo" = " a răspuns pentru";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Tu";
 "conversation.edited" = "Modificat";
-"conversation.deletedMessage" = "a șters mesajul";
+"conversation.deletedMessage" = "%@ a șters mesajul";
 "conversation.contactBlocked" = "Contact blocat";
 
 // Invitations
 "invitations.noInvitations" = "Nicio invitație";
-"invitations.pending" = "în așteptare";
-"invitations.accepted" = "acceptat";
-"invitations.declined" = "refuzat";
-"invitations.blocked" = "blocat";
+"invitations.accepted" = "Acceptat";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocat";
 "invitations.list" = "Invitații primite";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Folosește Jami";
-"createAccount.lookingForUsernameAvailability" = "caut disponibilitatea...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Numele este greșit. Trebuie introdus un nume corect.";
-"createAccount.usernameAlreadyTaken" = "nume ales deja";
+"createAccount.usernameAlreadyTaken" = "Nume ales deja";
 "createAccount.usernameValid" = "Numele este disponibil.";
-"createAccount.loading" = "Se încarcă…";
-"createAccount.waitCreateAccountTitle" = "Se adaugă contul";
 "createAccount.UsernameNotRegisteredTitle" = "Eroare de rețea";
 "createAccount.UsernameNotRegisteredMessage" = "Contul a fost creat, dar numele de utilizator nu a fost înscris";
 "createAccount.timeoutTitle" = "Cont creat";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Șterge";
 "actions.backAction" = "Înapoi";
 "actions.doneAction" = "Făcut";
-"alerts.incomingCallAllertTitle" = "Apel primit de la ";
-"alerts.incomingCallButtonIgnore" = "Ignoră";
-"actions.startAudioCall" = "  Apel vocal";
-"actions.startVideoCall" = "  Apel video";
 "actions.goToSettings" = "Du-te la Reglări";
 "actions.stopLocationSharing" = "Oprește distribuirea";
 
 // Calls
-"calls.incomingCallInfo" = "vrea să vorbească cu tine";
 "calls.ringing" = "Sună...";
 "calls.connecting" = "Se conectează...";
 "calls.callFinished" = "Apel terminat";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Aparate";
 "accountPage.settingsHeader" = "Reglări";
 "accountPage.notificationsHeader" = "Notificări";
-"accountPage.usernameNotRegistered" = "nume de utilizator: neînscris";
-"accountPage.credentialsHeader" = "Detaliile contului";
 "accountPage.blockedContacts" = "Contacte blocate";
 "accountPage.unblockContact" = "Deblochează";
 "accountPage.proxyAddressAlert" = "Introdu adresa proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Se conectează";
 "account.statusUnknown" = "Necunoscut";
 "account.statusConnectionerror" = "Eroare de conectare";
-"account.needMigration" = "contul trebuie transferat";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mine";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitație primită";
 "generatedMessage.swarmCreated" = "Conversație creată";
-"generatedMessage.invitationReceived" = "a fost invitat să participe la conversație.";
-"generatedMessage.invitationAccepted" = "participă la conversație.";
+"generatedMessage.invitationReceived" = "%@ a fost invitat să participe la conversație.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Participi la conversație.";
-"generatedMessage.contactBlocked" = "a fost blocat din conversație.";
-"generatedMessage.contactUnblocked" = "a fost deblocat din conversație.";
+"generatedMessage.contactBlocked" = "%@ a fost blocat din conversație.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Apel efectuat";
 "generatedMessage.missedOutgoingCall" = "Apel efectuat nepreluat";
 "generatedMessage.missedIncomingCall" = "Apel pierdut";
 "generatedMessage.liveLocationSharing" = "Distribuirea poziției în direct";
-"generatedMessage.contactLeftConversation" = "a părăsit conversația.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Reglări video";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Părere";
 "aboutJami.createdBy" = "Creat de";
 "aboutJami.artworkBy" = "Grafică de";
+
+// Accessibility
+"accessibility.close" = "Închide";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Adaugă un cont";
+"accessibility.aboutJamiTitle" = "Despre Jami";
+"accessibility.welcomeToJamiTitle" = "Bine ai venit pe Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Poză de profil";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index d2ff42e6861ef7ea7ded26b3046bec7a52908193..61be1fa62dc37637e55e320fd32be17d39c4ad55 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Добавить в контакты? ";
 "conversation.notContactLabel" = "не входит в ваш список контактов";
 "conversation.messagePlaceholder" = "Написать сообщение";
-"conversation.explanationSendingLocationTo" = "В настоящее время вы делитесь своим местоположением с";
-"conversation.explanationReceivingLocationFrom" = "В настоящее время вы получаете текущее местоположение от";
 "conversation.errorSavingImage" = "При сохранении изображения в галерею произошла ошибка.";
 "conversation.receivedRequest" = "%@отправил(а) вам приглашение для беседы.";
 "conversation.incomingRequest" = "отправил(а) вам приглашение для беседы.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Вы приняли приглашение для беседы.";
 "conversation.synchronizationMessage" = "Ждем %@ для подключения к синхронизации беседы…";
 "conversation.inReplyTo" = "В ответ на";
-"conversation.repliedTo" = "в ответ на";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Вы";
 "conversation.edited" = "Отредактировано";
-"conversation.deletedMessage" = "удалённое сообщение";
+"conversation.deletedMessage" = "Cообщение удалено (%@)";
 "conversation.contactBlocked" = "Контакт заблокирован";
 
 // Invitations
 "invitations.noInvitations" = "Приглашений нет";
-"invitations.pending" = "ожидает";
-"invitations.accepted" = "принято";
-"invitations.declined" = "отклонён";
-"invitations.blocked" = "заблокирован";
+"invitations.accepted" = "Принято";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Заблокирован";
 "invitations.list" = "Приглашения получены";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Присоединиться к Jami";
-"createAccount.lookingForUsernameAvailability" = "проверка доступности…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Неверное имя пользователя. Введите верное.";
-"createAccount.usernameAlreadyTaken" = "имя пользователя уже занято";
+"createAccount.usernameAlreadyTaken" = "Имя пользователя уже занято";
 "createAccount.usernameValid" = "Имя пользователя доступно.";
-"createAccount.loading" = "Загрузка…";
-"createAccount.waitCreateAccountTitle" = "Добавление аккаунта";
 "createAccount.UsernameNotRegisteredTitle" = "Ошибка сети";
 "createAccount.UsernameNotRegisteredMessage" = "Аккаунт был создан но имя пользователя не было зарегистрировано";
 "createAccount.timeoutTitle" = "Аккаунт создан";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Удалить";
 "actions.backAction" = "Назад";
 "actions.doneAction" = "Ок";
-"alerts.incomingCallAllertTitle" = "Входящий вызов от";
-"alerts.incomingCallButtonIgnore" = "Игнорировать";
-"actions.startAudioCall" = "Голосовой звонок";
-"actions.startVideoCall" = "Видео звонок";
 "actions.goToSettings" = "Перейти к настройкам";
 "actions.stopLocationSharing" = "Прекратить делиться";
 
 // Calls
-"calls.incomingCallInfo" = "хочет поговорить с вами";
 "calls.ringing" = "Вызов…";
 "calls.connecting" = "Соединение…";
 "calls.callFinished" = "Вызов завершен";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Устройства";
 "accountPage.settingsHeader" = "Настройки";
 "accountPage.notificationsHeader" = "Уведомления";
-"accountPage.usernameNotRegistered" = "имя пользователя: не зарегистрировано";
-"accountPage.credentialsHeader" = "Информация об аккаунте";
 "accountPage.blockedContacts" = "Заблокированные контакты";
 "accountPage.unblockContact" = "Разблокировать";
 "accountPage.proxyAddressAlert" = "Укажите адрес прокси";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Подключение";
 "account.statusUnknown" = "Неизвестно";
 "account.statusConnectionerror" = "Ошибка подключения";
-"account.needMigration" = "аккаунт нуждается в переносе";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Я";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Получено приглашение";
 "generatedMessage.swarmCreated" = "Беседа создана";
-"generatedMessage.invitationReceived" = "был(а) приглашен(а) присоединиться к беседе.";
-"generatedMessage.invitationAccepted" = "присоединяется к беседе.";
+"generatedMessage.invitationReceived" = "%@был(а) приглашен(а) присоединиться к беседе.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Вы присоединились к беседе.";
-"generatedMessage.contactBlocked" = "был(а) заблокирован(а) в беседе.";
-"generatedMessage.contactUnblocked" = "был(а) разблокирован(а) в беседе.";
+"generatedMessage.contactBlocked" = "%@был(а) заблокирован(а) для участия в беседе.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Исходящий вызов";
 "generatedMessage.missedOutgoingCall" = "Пропущенный исходящий";
 "generatedMessage.missedIncomingCall" = "Пропущенный входящий";
 "generatedMessage.liveLocationSharing" = "Совместное использование местоположения в реальном времени";
-"generatedMessage.contactLeftConversation" = "покидает беседу.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Настройки видео";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Обратная связь";
 "aboutJami.createdBy" = "Создано";
 "aboutJami.artworkBy" = "Художественное оформление";
+
+// Accessibility
+"accessibility.close" = "Закрыть";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Добавить аккаунт";
+"accessibility.aboutJamiTitle" = "О Jami";
+"accessibility.welcomeToJamiTitle" = "Добро пожаловать в Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Фото профиля";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index accb0023f1fc76ef35d53e499072ba815e5bcff9..64f305727cd557fe2eaa6c57711c2338acd4b3d9 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Добавить в контакты?";
 "conversation.notContactLabel" = "не входит в ваш список контактов";
 "conversation.messagePlaceholder" = "Написать сообщение";
-"conversation.explanationSendingLocationTo" = "В настоящее время вы делитесь своим местоположением с";
-"conversation.explanationReceivingLocationFrom" = "В настоящее время вы получаете текущее местоположение от";
 "conversation.errorSavingImage" = "При сохранении изображения в галерею произошла ошибка.";
 "conversation.receivedRequest" = "%@отправил(а) вам приглашение для беседы.";
 "conversation.incomingRequest" = "отправил(а) вам приглашение для беседы.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Вы приняли приглашение для беседы.";
 "conversation.synchronizationMessage" = "Ждем %@ для подключения к синхронизации беседы…";
 "conversation.inReplyTo" = "В ответ на";
-"conversation.repliedTo" = "в ответ на";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Вы";
 "conversation.edited" = "Отредактировано";
-"conversation.deletedMessage" = "удалённое сообщение";
+"conversation.deletedMessage" = "Cообщение удалено (%@)";
 "conversation.contactBlocked" = "Контакт заблокирован";
 
 // Invitations
 "invitations.noInvitations" = "Приглашений нет";
-"invitations.pending" = "ожидает";
-"invitations.accepted" = "принято";
-"invitations.declined" = "отклонён";
-"invitations.blocked" = "заблокирован";
+"invitations.accepted" = "Принято";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Заблокирован";
 "invitations.list" = "Приглашения получены";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Присоединиться к Джами";
-"createAccount.lookingForUsernameAvailability" = "проверка доступности…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Неверное имя пользователя. Введите верное.";
-"createAccount.usernameAlreadyTaken" = "имя пользователя уже занято";
+"createAccount.usernameAlreadyTaken" = "Имя пользователя уже занято";
 "createAccount.usernameValid" = "Имя пользователя доступно.";
-"createAccount.loading" = "Загрузка…";
-"createAccount.waitCreateAccountTitle" = "Добавление аккаунта";
 "createAccount.UsernameNotRegisteredTitle" = "Ошибка сети";
 "createAccount.UsernameNotRegisteredMessage" = "Аккаунт был создан, но имя пользователя не было зарегистрировано";
 "createAccount.timeoutTitle" = "Аккаунт создан";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Удалить";
 "actions.backAction" = "Назад";
 "actions.doneAction" = "Готово";
-"alerts.incomingCallAllertTitle" = "Входящий вызов от";
-"alerts.incomingCallButtonIgnore" = "Игнорировать";
-"actions.startAudioCall" = "Аудиовызов";
-"actions.startVideoCall" = "Видеовызов";
 "actions.goToSettings" = "Перейти к настройкам";
 "actions.stopLocationSharing" = "Остановить трансляцию";
 
 // Calls
-"calls.incomingCallInfo" = "хочет поговорить с вами";
 "calls.ringing" = "Вызов…";
 "calls.connecting" = "Соединение…";
 "calls.callFinished" = "Вызов завершен";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Устройства";
 "accountPage.settingsHeader" = "Настройки";
 "accountPage.notificationsHeader" = "Уведомления";
-"accountPage.usernameNotRegistered" = "имя пользователя: не зарегистрировано";
-"accountPage.credentialsHeader" = "Информация об аккаунте";
 "accountPage.blockedContacts" = "Заблокированные контакты";
 "accountPage.unblockContact" = "Разблокировать";
 "accountPage.proxyAddressAlert" = "Укажите адрес прокси";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Подключение";
 "account.statusUnknown" = "Неизвестно";
 "account.statusConnectionerror" = "Ошибка подключения";
-"account.needMigration" = "аккаунт нуждается в переносе";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Я";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Получено приглашение";
 "generatedMessage.swarmCreated" = "Беседа создана";
-"generatedMessage.invitationReceived" = "был(а) приглашен(а) присоединиться к беседе.";
-"generatedMessage.invitationAccepted" = "присоединяется к беседе.";
+"generatedMessage.invitationReceived" = "%@был(а) приглашен(а) присоединиться к беседе.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Вы присоединились к беседе.";
-"generatedMessage.contactBlocked" = "был(а) заблокирован(а) в беседе.";
-"generatedMessage.contactUnblocked" = "был(а) разблокирован(а) в беседе.";
+"generatedMessage.contactBlocked" = "%@был(а) заблокирован(а) для участия в беседе.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Исходящий вызов";
 "generatedMessage.missedOutgoingCall" = "Непринятый исходящий вызов";
 "generatedMessage.missedIncomingCall" = "Пропущенный входящий вызов";
 "generatedMessage.liveLocationSharing" = "Совместное использование местоположения в реальном времени";
-"generatedMessage.contactLeftConversation" = "покидает беседу.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Настройки видео";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Обратная связь";
 "aboutJami.createdBy" = "Авторы:";
 "aboutJami.artworkBy" = "Художник:";
+
+// Accessibility
+"accessibility.close" = "Закрыть";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Добавить аккаунт";
+"accessibility.aboutJamiTitle" = "О программе Джами";
+"accessibility.welcomeToJamiTitle" = "Добро пожаловать в Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Фото профиля";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/si.lproj/Localizable.strings b/Ring/Ring/Resources/si.lproj/Localizable.strings
index 2c368c36c58dd61f920f7acffc21fb5007a23937..f9e80ce52bfee6e5cec69c323e8ad08f6bdae423 100644
--- a/Ring/Ring/Resources/si.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/si.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "In reply to";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "Edited";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "No invitations";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepted";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "username already taken";
+"createAccount.usernameAlreadyTaken" = "Username already taken";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Adding account";
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Delete";
 "actions.backAction" = "Back";
 "actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonIgnore" = "Ignore";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "Stop sharing";
 
 // Calls
-"calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
 "calls.callFinished" = "Call finished";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Devices";
 "accountPage.settingsHeader" = "සැකසුම්";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
 "accountPage.blockedContacts" = "Blocked contacts";
 "accountPage.unblockContact" = "Unblock";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connecting";
 "account.statusUnknown" = "Unknown";
 "account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation received";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Outgoing call";
 "generatedMessage.missedOutgoingCall" = "Missed outgoing call";
 "generatedMessage.missedIncomingCall" = "Missed incoming call";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Close";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Add account";
+"accessibility.aboutJamiTitle" = "About Jami";
+"accessibility.welcomeToJamiTitle" = "Welcome to Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profile picture";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index 22c35b711542ad3e326f15e85f4014d3bccac217..8d809131bce4de818c5dc355a6f4de8efeba18da 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Pridať do kontaktov?";
 "conversation.notContactLabel" = "nie je vo vašom zozname kontaktov";
 "conversation.messagePlaceholder" = "Písať";
-"conversation.explanationSendingLocationTo" = "V súčasnosti zdieľate svoju polohu s ";
-"conversation.explanationReceivingLocationFrom" = "Momentálne dostávate živú lokalitu od ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "V odpovedi na";
-"conversation.repliedTo" = "Odpovedať";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ty...";
 "conversation.edited" = "Vytvorené";
-"conversation.deletedMessage" = "odstránil správu";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Žiadne pozvánky";
-"invitations.pending" = "čakajúce";
-"invitations.accepted" = "prijaté";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Prijaté";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Prijaté pozvania";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Pridajte sa k Jami";
-"createAccount.lookingForUsernameAvailability" = "Overovanie dostupnosti...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "používateľské meno je už použité";
+"createAccount.usernameAlreadyTaken" = "Používateľské meno je už použité";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Pridávanie účtu";
 "createAccount.UsernameNotRegisteredTitle" = "Chyba siete";
 "createAccount.UsernameNotRegisteredMessage" = "Účet bol vytvorený, ale používateľské meno nebolo zaregistrované";
 "createAccount.timeoutTitle" = "Účet vytvorený";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Vymazať";
 "actions.backAction" = "Späť";
 "actions.doneAction" = "Hotovo";
-"alerts.incomingCallAllertTitle" = "Prichádzajúci hovor od";
-"alerts.incomingCallButtonIgnore" = "Ignorovať";
-"actions.startAudioCall" = "Zvukový hovor";
-"actions.startVideoCall" = "Videovolanie";
 "actions.goToSettings" = "Prejdite do Nastavenia";
 "actions.stopLocationSharing" = "Ukončiť zdieľanie";
 
 // Calls
-"calls.incomingCallInfo" = "chce s vami hovoriť";
 "calls.ringing" = "Zvoní...";
 "calls.connecting" = "Pripájanie...";
 "calls.callFinished" = "Hovor bol ukončený";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Zariadenia";
 "accountPage.settingsHeader" = "Nastavenia";
 "accountPage.notificationsHeader" = "Upozornenia";
-"accountPage.usernameNotRegistered" = "používateľské meno: nezaregistrované";
-"accountPage.credentialsHeader" = "Podrobnosti účtu";
 "accountPage.blockedContacts" = "Blokované kontakty";
 "accountPage.unblockContact" = "Odblokovať";
 "accountPage.proxyAddressAlert" = "Zadajte adresu proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Pripájanie";
 "account.statusUnknown" = "Neznámy";
 "account.statusConnectionerror" = "Chyba pripojenia";
-"account.needMigration" = "Váš účet musí byť migrovaný";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ja";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Bola prijatá pozvánka";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Odchádzajúci hovor";
 "generatedMessage.missedOutgoingCall" = "Zmeškaný odchádzajúci hovory";
 "generatedMessage.missedIncomingCall" = "Zmeškaný príchodzí hovor";
 "generatedMessage.liveLocationSharing" = "Živo zdieľanie polohy";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Spätná väzba";
 "aboutJami.createdBy" = "Vytvoril";
 "aboutJami.artworkBy" = "Ilustrácia od";
+
+// Accessibility
+"accessibility.close" = "Zavrieť";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Pridať účet";
+"accessibility.aboutJamiTitle" = "O programe Jami";
+"accessibility.welcomeToJamiTitle" = "Vitajte v Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profilu";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sk.lproj/Localizable.strings b/Ring/Ring/Resources/sk.lproj/Localizable.strings
index e69e5bd18257afdc76f6192aac0234e273dc6ab3..439b358ebc5dd9312e835585d01dfeadb69f9552 100644
--- a/Ring/Ring/Resources/sk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Pridať do kontaktov?";
 "conversation.notContactLabel" = "nie je vo vašom zozname kontaktov";
 "conversation.messagePlaceholder" = "Písať";
-"conversation.explanationSendingLocationTo" = "V súčasnosti zdieľate svoju polohu s ";
-"conversation.explanationReceivingLocationFrom" = "Momentálne dostávate živú lokalitu od ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "V odpovedi na";
-"conversation.repliedTo" = "Odpovedať";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ty...";
 "conversation.edited" = "Vytvorené";
-"conversation.deletedMessage" = "odstránil správu";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Žiadne pozvánky";
-"invitations.pending" = "čakajúce";
-"invitations.accepted" = "prijaté";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Prijaté";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Prijaté pozvania";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Pridajte sa k Jami";
-"createAccount.lookingForUsernameAvailability" = "Overovanie dostupnosti...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "používateľské meno je už použité";
+"createAccount.usernameAlreadyTaken" = "Používateľské meno už je použité";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Pridávanie účtu";
 "createAccount.UsernameNotRegisteredTitle" = "Chyba siete";
 "createAccount.UsernameNotRegisteredMessage" = "Účet bol vytvorený, ale používateľské meno nebolo zaregistrované";
 "createAccount.timeoutTitle" = "Účet vytvorený";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Vymazať";
 "actions.backAction" = "Späť";
 "actions.doneAction" = "Hotovo";
-"alerts.incomingCallAllertTitle" = "Prichádzajúci hovor od";
-"alerts.incomingCallButtonIgnore" = "Ignorovať";
-"actions.startAudioCall" = "Zvukový hovor";
-"actions.startVideoCall" = "Videovolanie";
 "actions.goToSettings" = "Prejdite do Nastavenia";
 "actions.stopLocationSharing" = "Ukončiť zdieľanie";
 
 // Calls
-"calls.incomingCallInfo" = "chce s vami hovoriť";
 "calls.ringing" = "Zvoní...";
 "calls.connecting" = "Pripájanie...";
 "calls.callFinished" = "Hovor bol ukončený";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Zariadenia";
 "accountPage.settingsHeader" = "Nastavenia";
 "accountPage.notificationsHeader" = "Upozornenia";
-"accountPage.usernameNotRegistered" = "používateľské meno: nezaregistrované";
-"accountPage.credentialsHeader" = "Podrobnosti účtu";
 "accountPage.blockedContacts" = "Blokované kontakty";
 "accountPage.unblockContact" = "Odblokovať";
 "accountPage.proxyAddressAlert" = "Zadajte adresu proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Pripájanie";
 "account.statusUnknown" = "Neznámy";
 "account.statusConnectionerror" = "Chyba pripojenia";
-"account.needMigration" = "Váš účet musí byť migrovaný";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ja";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Bola prijatá pozvánka";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Odchádzajúci hovor";
 "generatedMessage.missedOutgoingCall" = "Zmeškaný odchádzajúci hovor";
 "generatedMessage.missedIncomingCall" = "Zmeškaný prichádzajúci hovor";
 "generatedMessage.liveLocationSharing" = "Živo zdieľanie polohy";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Spätná väzba";
 "aboutJami.createdBy" = "Vytvoril";
 "aboutJami.artworkBy" = "Ilustrácia od";
+
+// Accessibility
+"accessibility.close" = "Zavrieť";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Pridať účet";
+"accessibility.aboutJamiTitle" = "O programe Jami";
+"accessibility.welcomeToJamiTitle" = "Vitajte v Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profilu";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sl.lproj/Localizable.strings b/Ring/Ring/Resources/sl.lproj/Localizable.strings
index 07332642349427451de028004092967354870a4f..f7fc2fec3bce4e81ef5faba8fb9f14e401f8aefa 100644
--- a/Ring/Ring/Resources/sl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sl.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Dodam med stike?";
 "conversation.notContactLabel" = "ni na seznamu vaših stikov";
 "conversation.messagePlaceholder" = "Piši";
-"conversation.explanationSendingLocationTo" = "Trenutno v živo delite svojo lokacijo z ";
-"conversation.explanationReceivingLocationFrom" = "Trenutno v živo pridobivate podatek o lokaciji od";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Kot odgovor";
-"conversation.repliedTo" = "je odgovoril_a";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Vi";
 "conversation.edited" = "Urejeno";
-"conversation.deletedMessage" = "je izbrisal/a sporočilo";
+"conversation.deletedMessage" = "%@ je izbrisal/a sporočilo";
 "conversation.contactBlocked" = "Stik blokiran";
 
 // Invitations
 "invitations.noInvitations" = "Ni povabil";
-"invitations.pending" = "na čakanju";
-"invitations.accepted" = "sprejet";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Sprejeto";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blokiran/a";
 "invitations.list" = "Prejetih povabil";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Pridruži se Jami";
-"createAccount.lookingForUsernameAvailability" = "preverjanje dosegljivosti ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "uporabniško ime je zasedeno";
+"createAccount.usernameAlreadyTaken" = "Uporabniško ime je že oddano";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Dodajanje računa";
 "createAccount.UsernameNotRegisteredTitle" = "Napaka na omrežju";
 "createAccount.UsernameNotRegisteredMessage" = "Račun je bil ustvarjen, vendar uporabniško ime ni bilo registrirano";
 "createAccount.timeoutTitle" = "Račun je ustvarjen";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Izbriši";
 "actions.backAction" = "Nazaj";
 "actions.doneAction" = "Opravljeno";
-"alerts.incomingCallAllertTitle" = "Dohodni klic od";
-"alerts.incomingCallButtonIgnore" = "Prezri";
-"actions.startAudioCall" = "Zvočni klic";
-"actions.startVideoCall" = "Videoklic";
 "actions.goToSettings" = "Pojdi na nastavitve";
 "actions.stopLocationSharing" = "Prenehaj deliti";
 
 // Calls
-"calls.incomingCallInfo" = "želi govoriti z vami";
 "calls.ringing" = "Zvonenje ...";
 "calls.connecting" = "Povezovanje ...";
 "calls.callFinished" = "Klic je končan";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Naprave";
 "accountPage.settingsHeader" = "Nastavitve";
 "accountPage.notificationsHeader" = "Obveščanje";
-"accountPage.usernameNotRegistered" = "uporabniško ime: ni registrirano";
-"accountPage.credentialsHeader" = "Podrobnosti računa";
 "accountPage.blockedContacts" = "Blokirani stiki";
 "accountPage.unblockContact" = "Odblokiraj";
 "accountPage.proxyAddressAlert" = "Posredujte naslov posredniškega strežnika";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Povezovanje";
 "account.statusUnknown" = "Neznano";
 "account.statusConnectionerror" = "Napaka pri povezovanju";
-"account.needMigration" = "račun mora biti preseljen";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Jaz";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Povabilo je prejeto";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Odhodni klic";
 "generatedMessage.missedOutgoingCall" = "Zgrešen odhodni klic";
 "generatedMessage.missedIncomingCall" = "Zgrešen dohodni klic";
 "generatedMessage.liveLocationSharing" = "Deljenje lokacije v živo";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Nastavitve videa";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Povratna informacija";
 "aboutJami.createdBy" = "Ustvaril/a";
 "aboutJami.artworkBy" = "Grafična podoba";
+
+// Accessibility
+"accessibility.close" = "Zapri";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Dodajanje računa";
+"accessibility.aboutJamiTitle" = "O programu Jami";
+"accessibility.welcomeToJamiTitle" = "Dobrodošli v Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Slika profila";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index 14947aee666baac057c6fc78466973870e15b9ce..5c6234db46f38a0ddceefebf47084bff78b10110 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Të shtohet te kontaktet?";
 "conversation.notContactLabel" = "s’është në listën e kontakteve tuaj";
 "conversation.messagePlaceholder" = "Shkruajini";
-"conversation.explanationSendingLocationTo" = "Aktualisht e ndani vendndodhjen tuaj me ";
-"conversation.explanationReceivingLocationFrom" = "Aktualisht merrni drejtpërdrejt vendndodhje nga";
 "conversation.errorSavingImage" = "Ndodhi një gabim teksa ruhej figura te galeria.";
 "conversation.receivedRequest" = "%@ ju dërgoi një ftesë bisede.";
 "conversation.incomingRequest" = "ju dërgoi një ftesë për bisedë.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "Keni pranuar ftesën e bisedës.";
 "conversation.synchronizationMessage" = "Po pritet që %@ të lidhet, që të njëkohësohet biseda…";
 "conversation.inReplyTo" = "Në përgjigje të";
-"conversation.repliedTo" = "iu përgjigj";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ju";
 "conversation.edited" = "U përpunua";
-"conversation.deletedMessage" = "fshiu një mesazh";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Kontakti u bllokua ";
 
 // Invitations
 "invitations.noInvitations" = "S’ka ftesa";
-"invitations.pending" = "pezull";
-"invitations.accepted" = "pranuar";
-"invitations.declined" = "hedhur poshtë";
-"invitations.blocked" = "bllokuar";
+"invitations.accepted" = "E pranuar";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Bllokuar";
 "invitations.list" = "Ftesat u morën";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Bëhuni pjesë e Jami-t";
-"createAccount.lookingForUsernameAvailability" = "po shihet për pasje…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Emër i pavlefshëm përdoruesi. Ju lutemi, jepni një emër përdoruesi të vlefshëm.";
-"createAccount.usernameAlreadyTaken" = "emër përdoruesi tashmë i zënë";
+"createAccount.usernameAlreadyTaken" = "Emër përdoruesi tashmë i zënë";
 "createAccount.usernameValid" = "Emri i përdoruesit është i lirë.";
-"createAccount.loading" = "Po ngarkohet…";
-"createAccount.waitCreateAccountTitle" = "Po shtohet llogaria";
 "createAccount.UsernameNotRegisteredTitle" = "Gabim rrjeti";
 "createAccount.UsernameNotRegisteredMessage" = "Llogaria u krijua, por emri i përdoruesit s’u regjistrua";
 "createAccount.timeoutTitle" = "Llogaria u Krijua";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Fshije";
 "actions.backAction" = "Mbrapsht";
 "actions.doneAction" = "U bë";
-"alerts.incomingCallAllertTitle" = "Thirrje nga";
-"alerts.incomingCallButtonIgnore" = "Shpërfille";
-"actions.startAudioCall" = "Thirrje Audio";
-"actions.startVideoCall" = "Thirrje Video";
 "actions.goToSettings" = "Kalo te Rregullimet";
 "actions.stopLocationSharing" = "Resht së dhëni";
 
 // Calls
-"calls.incomingCallInfo" = "dëshiron të flasë me ju";
 "calls.ringing" = "Po thirret…";
 "calls.connecting" = "Po lidhet…";
 "calls.callFinished" = "Thirrja përfundoi";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Pajisje";
 "accountPage.settingsHeader" = "Rregullime";
 "accountPage.notificationsHeader" = "Njoftime";
-"accountPage.usernameNotRegistered" = "emër përdoruesi: jo i regjistruar";
-"accountPage.credentialsHeader" = "Hollësi Llogarie";
 "accountPage.blockedContacts" = "Kontakte të bllokuar";
 "accountPage.unblockContact" = "Zhbllokoje";
 "accountPage.proxyAddressAlert" = "Jepni adresë ndërmjetësi";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Po lidhet";
 "account.statusUnknown" = "I panjohur";
 "account.statusConnectionerror" = "Gabim Lidhjeje";
-"account.needMigration" = "llogari që duhet migruar";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Unë";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Ftesa u mor";
 "generatedMessage.swarmCreated" = "Biseda ui krijua";
-"generatedMessage.invitationReceived" = "u ftua të marrë pjesë në bisedë.";
-"generatedMessage.invitationAccepted" = "erdhi në bisedë.";
+"generatedMessage.invitationReceived" = "%@ u ftua të marrë pjesë në bisedë.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "Erdhët në bisedë.";
-"generatedMessage.contactBlocked" = "u bllokua prej bisede.";
-"generatedMessage.contactUnblocked" = "u zhbllokua prej bisede.";
+"generatedMessage.contactBlocked" = "%@ u bllokua prej bisede.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Thirrje për";
 "generatedMessage.missedOutgoingCall" = "Thirrje ikse të humbura";
 "generatedMessage.missedIncomingCall" = "Thirrje ardhëse të humbura";
 "generatedMessage.liveLocationSharing" = "Dhënie e vendndodhjes drejtpërsëdrejti";
-"generatedMessage.contactLeftConversation" = "iku nga biseda.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Rregullime videoje";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Përshtypje";
 "aboutJami.createdBy" = "Krijuar nga";
 "aboutJami.artworkBy" = "Ana grafike nga";
+
+// Accessibility
+"accessibility.close" = "Mbylle";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Shtoni llogari";
+"accessibility.aboutJamiTitle" = "Mbi Jami-n";
+"accessibility.welcomeToJamiTitle" = "Mirë se vini te Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Foto profili";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sr.lproj/Localizable.strings b/Ring/Ring/Resources/sr.lproj/Localizable.strings
index b9a5ec2af458c293c5765b3a8bd283b1f1258fc3..86b8abbef6b21d4ca0bc68ffe06b9abb21a6328f 100644
--- a/Ring/Ring/Resources/sr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Dodaj u kontakte?";
 "conversation.notContactLabel" = "nije u tvojoj kontakt listi";
 "conversation.messagePlaceholder" = "Pišite";
-"conversation.explanationSendingLocationTo" = "Trenutno delite svoju lokaciju sa";
-"conversation.explanationReceivingLocationFrom" = "Trenutno primate lokaciju uživo od";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "Dobili ste pozivnicu za razgovor od %@.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Odgovor na";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ti";
 "conversation.edited" = "Редактирана";
-"conversation.deletedMessage" = "obrisao poruku";
+"conversation.deletedMessage" = "%@ obrisao poruku";
 "conversation.contactBlocked" = "Kontakt blokiran";
 
 // Invitations
 "invitations.noInvitations" = "Nema pozivnica";
-"invitations.pending" = "na čekanju";
-"invitations.accepted" = "prihvaćeno";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Прихваћен";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blokiran";
 "invitations.list" = "Primljene pozivnice";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Pridruži se Jamiju";
-"createAccount.lookingForUsernameAvailability" = "traži dostupnost…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "korisničko ime je već zauzeto";
+"createAccount.usernameAlreadyTaken" = "Korisničko ime je zauzeto";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Dodavanje naloga";
 "createAccount.UsernameNotRegisteredTitle" = "Greška na mreži";
 "createAccount.UsernameNotRegisteredMessage" = "Nalog je kreiran, ali korisničko ime nije registrovano";
 "createAccount.timeoutTitle" = "Nalog je napravljen";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Izbriši";
 "actions.backAction" = "Nazad";
 "actions.doneAction" = "Gotovo";
-"alerts.incomingCallAllertTitle" = "Dolazni poziv od";
-"alerts.incomingCallButtonIgnore" = "Ignoriši";
-"actions.startAudioCall" = "  Audio poziv";
-"actions.startVideoCall" = "  Video poziv";
 "actions.goToSettings" = "Idi na Podešavanja";
 "actions.stopLocationSharing" = "Prestani da deliš";
 
 // Calls
-"calls.incomingCallInfo" = "želi da razgovara sa tobom";
 "calls.ringing" = "Zvoni…";
 "calls.connecting" = "Povezivanje…";
 "calls.callFinished" = "Poziv je završen";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Uređaji";
 "accountPage.settingsHeader" = "Podešavanja";
 "accountPage.notificationsHeader" = "Obaveštenja";
-"accountPage.usernameNotRegistered" = "korisničko ime: nije registrovano";
-"accountPage.credentialsHeader" = "Detalji naloga";
 "accountPage.blockedContacts" = "Blokirani kontakti";
 "accountPage.unblockContact" = "Deblokiraj";
 "accountPage.proxyAddressAlert" = "Navedite adresu proksija";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Povezivanje";
 "account.statusUnknown" = "Nepoznato";
 "account.statusConnectionerror" = "Greška pri povezivanju";
-"account.needMigration" = "nalog treba migrirati";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ja";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Pozivnica je primljena";
 "generatedMessage.swarmCreated" = "Konverzacija je napravljena";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Poziva se";
 "generatedMessage.missedOutgoingCall" = "Propušten odlazeći poziv";
 "generatedMessage.missedIncomingCall" = "Propušten dolazeći poziv";
 "generatedMessage.liveLocationSharing" = "Поделивање локације на живо";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Povratna informacija";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Zatvori";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Dodaj nalog";
+"accessibility.aboutJamiTitle" = "O Jamiju";
+"accessibility.welcomeToJamiTitle" = "Dobrodošli u Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Фотографија профила";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
index 0d8557a3e17955c7f8cf3c03a96f0fc7f049ea46..887088e9091c2806145d7a9a73d01b18f1ddff88 100644
--- a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Додај у контакте?";
 "conversation.notContactLabel" = "није у твојој контакт листи";
 "conversation.messagePlaceholder" = "Pišite";
-"conversation.explanationSendingLocationTo" = "У овом тренутку делите своју локацију са ";
-"conversation.explanationReceivingLocationFrom" = "У овом тренутку добијате живо место од ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "Dobili ste pozivnicu za razgovor od %@.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "У одговору на";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ти";
 "conversation.edited" = "Редактирана";
-"conversation.deletedMessage" = "обрисао поруку";
+"conversation.deletedMessage" = "%@ обрисао поруку";
 "conversation.contactBlocked" = "Kontakt blokiran";
 
 // Invitations
 "invitations.noInvitations" = "Нема покана";
-"invitations.pending" = "на чекању";
-"invitations.accepted" = "прихваћено";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Прихваћено";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blokiran";
 "invitations.list" = "Позивнице примљене";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Придружи се Јамију";
-"createAccount.lookingForUsernameAvailability" = "тражим доступност...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Име корисника већ преузето";
+"createAccount.usernameAlreadyTaken" = "Корисничко име је већ заузето";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Додавање налога";
 "createAccount.UsernameNotRegisteredTitle" = "Мрежна грешка";
 "createAccount.UsernameNotRegisteredMessage" = "Налог је креиран, али корисничко име није регистровано";
 "createAccount.timeoutTitle" = "Налог је направљен";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Избриши";
 "actions.backAction" = "Назад";
 "actions.doneAction" = "Готово";
-"alerts.incomingCallAllertTitle" = "Долазни позив од";
-"alerts.incomingCallButtonIgnore" = "Игнориши";
-"actions.startAudioCall" = "Аудио позив";
-"actions.startVideoCall" = "Видео позив";
 "actions.goToSettings" = "Идите у подешавања";
 "actions.stopLocationSharing" = "Prestani sa deljenjem";
 
 // Calls
-"calls.incomingCallInfo" = "Жели да разговара са тобом.";
 "calls.ringing" = "Звучи...";
 "calls.connecting" = "Сврзавање...";
 "calls.callFinished" = "Позив завршен";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Уреди";
 "accountPage.settingsHeader" = "Podešavanja";
 "accountPage.notificationsHeader" = "Уведомљења";
-"accountPage.usernameNotRegistered" = "Име корисника: није регистровано";
-"accountPage.credentialsHeader" = "Детаљи рачуна";
 "accountPage.blockedContacts" = "Блокирани контакти";
 "accountPage.unblockContact" = "Одблокирај";
 "accountPage.proxyAddressAlert" = "Устави прокси адресу";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Povezivanje";
 "account.statusUnknown" = "Nepoznat";
 "account.statusConnectionerror" = "Грешка повезивања";
-"account.needMigration" = "рачуна мора бити мигрирана";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ја сам.";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Позивница је примљена";
 "generatedMessage.swarmCreated" = "Konverzacija je napravljena";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Poziva se";
 "generatedMessage.missedOutgoingCall" = "Propušten odlazeći poziv";
 "generatedMessage.missedIncomingCall" = "Propušten dolazeći poziv";
 "generatedMessage.liveLocationSharing" = "Поделивање локације на живо";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Повратна информација";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Затвори";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Додај налог";
+"accessibility.aboutJamiTitle" = "О Јамију";
+"accessibility.welcomeToJamiTitle" = "Добродошли у Јами";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Фотографија профила";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sv.lproj/Localizable.strings b/Ring/Ring/Resources/sv.lproj/Localizable.strings
index b76ce39119fe24808b936e866bbaf9910b26504b..4c978d68411c8229d0a85e08d28f8ea0608bfa95 100644
--- a/Ring/Ring/Resources/sv.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sv.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Lägga till i kontakter?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Du delar nu din plats med ";
-"conversation.explanationReceivingLocationFrom" = "Du tar emot en live sändning från ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "I svar till";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Du";
 "conversation.edited" = "Redigerad";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Inga inbjudningar";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Accepterat";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Gå med Jami.";
-"createAccount.lookingForUsernameAvailability" = "söker tillgänglighet...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Användarnamnet är upptaget";
+"createAccount.usernameAlreadyTaken" = "Användarnamnet finns redan";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Lägger till konto";
 "createAccount.UsernameNotRegisteredTitle" = "Nätverksfel";
 "createAccount.UsernameNotRegisteredMessage" = "Konto har skapats men användarnamn har inte registrerats";
 "createAccount.timeoutTitle" = "Konto skapat";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Ta bort";
 "actions.backAction" = "Tillbaka";
 "actions.doneAction" = "Klar";
-"alerts.incomingCallAllertTitle" = "Inkommande samtal från";
-"alerts.incomingCallButtonIgnore" = "Ignorera";
-"actions.startAudioCall" = "Röstsamtal";
-"actions.startVideoCall" = "Videosamtal";
 "actions.goToSettings" = "Gå till Inställningar";
 "actions.stopLocationSharing" = "Sluta dela";
 
 // Calls
-"calls.incomingCallInfo" = "vill prata med dig";
 "calls.ringing" = "Ringer...";
 "calls.connecting" = "Ansluter...";
 "calls.callFinished" = "Samtalet avslutat";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Enheter";
 "accountPage.settingsHeader" = "Inställningar";
 "accountPage.notificationsHeader" = "Aviseringar";
-"accountPage.usernameNotRegistered" = "Användarnamn: Inte registrerat";
-"accountPage.credentialsHeader" = "Kontoinformation";
 "accountPage.blockedContacts" = "Blockerade kontakter";
 "accountPage.unblockContact" = "Ta bort blockering";
 "accountPage.proxyAddressAlert" = "Ange proxyadress";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Ansluter";
 "account.statusUnknown" = "Okänd";
 "account.statusConnectionerror" = "Anslutningsfel";
-"account.needMigration" = "Kontot måste migreras";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Jag";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Inbjudan mottagen";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Utgående samtal";
 "generatedMessage.missedOutgoingCall" = "Missat utgående samtal";
 "generatedMessage.missedIncomingCall" = "Missat inkommande samtal";
 "generatedMessage.liveLocationSharing" = "Live platsdelning ";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Återkoppling";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Stäng";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Lägg till konto";
+"accessibility.aboutJamiTitle" = "Om Jami";
+"accessibility.welcomeToJamiTitle" = "Välkommen till Jami!";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profilbild";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/sw.lproj/Localizable.strings b/Ring/Ring/Resources/sw.lproj/Localizable.strings
index 3db2f88bfadc90c51635fa638b651b48125d6ea6..bde2fa7f5df72965e11c46abcb2365c0e8f3bd84 100644
--- a/Ring/Ring/Resources/sw.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sw.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Kuongeza mawasiliano?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Kwa sasa unashiriki eneo lako na ";
-"conversation.explanationReceivingLocationFrom" = "Kwa sasa unapata eneo moja kwa moja kutoka ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Kwa kujibu";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Wewe";
 "conversation.edited" = "Iliyohaririwa";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Hakuna mwaliko";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Kubaliwa";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Jiunge Jami";
-"createAccount.lookingForUsernameAvailability" = "kutafuta upatikanaji...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "jina la mtumiaji tayari imechukuliwa";
+"createAccount.usernameAlreadyTaken" = "Jina la mtumiaji tayari limechukuliwa";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Kuongeza akaunti";
 "createAccount.UsernameNotRegisteredTitle" = "Kosa la mtandao";
 "createAccount.UsernameNotRegisteredMessage" = "Akaunti iliundwa lakini jina la mtumiaji halikuandikishwa";
 "createAccount.timeoutTitle" = "Akaunti Iliyotengenezwa";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Futa";
 "actions.backAction" = "Kurudi";
 "actions.doneAction" = "Imefanywa";
-"alerts.incomingCallAllertTitle" = "Simu inayokuja kutoka ";
-"alerts.incomingCallButtonIgnore" = "Puuza";
-"actions.startAudioCall" = "Simu ya sauti";
-"actions.startVideoCall" = "Video ya Kuita";
 "actions.goToSettings" = "Nenda kwenye Mipangilio";
 "actions.stopLocationSharing" = "Acha kushiriki";
 
 // Calls
-"calls.incomingCallInfo" = "anataka kuzungumza na wewe";
 "calls.ringing" = "Kupiga simu...";
 "calls.connecting" = "Kuunganisha...";
 "calls.callFinished" = "Wito umekamilika";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Vifaa";
 "accountPage.settingsHeader" = "Mipangilio";
 "accountPage.notificationsHeader" = "Maarifa";
-"accountPage.usernameNotRegistered" = "Jina la mtumiaji: halijasajiliwa";
-"accountPage.credentialsHeader" = "Maelezo ya Akaunti";
 "accountPage.blockedContacts" = "Mawasiliano yaliyopigwa";
 "accountPage.unblockContact" = "Kufungua kizuizi";
 "accountPage.proxyAddressAlert" = "Toa anwani ya proxy";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Kuunganisha";
 "account.statusUnknown" = "Haijulikani";
 "account.statusConnectionerror" = "Kosa la Kuunganisha";
-"account.needMigration" = "akaunti inahitaji kuhamishwa";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Mimi";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Mwaliko uliopokelewa";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Kuondoka simu";
 "generatedMessage.missedOutgoingCall" = "Kupoteza wito wa nje";
 "generatedMessage.missedIncomingCall" = "Kupoteza simu ya ndani";
 "generatedMessage.liveLocationSharing" = "Kushiriki eneo la kuishi";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Maoni ya kurudia";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Karibu";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Ongeza akaunti";
+"accessibility.aboutJamiTitle" = "Kuhusu Jami";
+"accessibility.welcomeToJamiTitle" = "Karibu Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Picha ya wasifu";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/ta.lproj/Localizable.strings b/Ring/Ring/Resources/ta.lproj/Localizable.strings
index 65417a48054483a8d084c17ad43f8616ed673152..48506be24c1e43a33c32b28ea4e26d611dbded40 100644
--- a/Ring/Ring/Resources/ta.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ta.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "தொடர்புகளை சேர்க்க?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "நீங்கள் தற்போது உங்கள் இருப்பிடத்தை பகிர்ந்துகொள்கிறீர்கள் ";
-"conversation.explanationReceivingLocationFrom" = "நீங்கள் தற்போது ல் இருந்து ஒரு நேரடி இருப்பிடத்தை பெறுகிறீர்கள்";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "பதில்";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "நீ";
 "conversation.edited" = "தொகுப்பு";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "அழைப்பிதழ்கள் இல்லை";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "ஏற்றுக்கொள்ளப்பட்டது";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "ஜாமிக்கு சேரவும்";
-"createAccount.lookingForUsernameAvailability" = "கிடைக்கும் தன்மையை தேடும்...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
 "createAccount.usernameAlreadyTaken" = "ஏற்கனவே எடுக்கப்பட்ட பயனர் பெயர்";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "கணக்கு சேர்க்கல்";
 "createAccount.UsernameNotRegisteredTitle" = "நெட்வொர்க் தவறு";
 "createAccount.UsernameNotRegisteredMessage" = "கணக்கு உருவாக்கப்பட்டது ஆனால் பயனர் பெயர் பதிவு செய்யப்படவில்லை";
 "createAccount.timeoutTitle" = "கணக்கு உருவாக்கப்பட்டது";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "நீக்கவும்";
 "actions.backAction" = "திரும்பி";
 "actions.doneAction" = "முடிந்தது";
-"alerts.incomingCallAllertTitle" = "ல் இருந்து வருகின்ற அழைப்பு";
-"alerts.incomingCallButtonIgnore" = "புறக்கணிக்கவும்";
-"actions.startAudioCall" = "ஆடியோ அழைப்பு";
-"actions.startVideoCall" = "வீடியோ அழைப்பு";
 "actions.goToSettings" = "அமைப்புகள் பக்கம் செல்லவும்";
 "actions.stopLocationSharing" = "பகிர்வதை நிறுத்து";
 
 // Calls
-"calls.incomingCallInfo" = "உங்களுடன் பேச விரும்புகிறார்";
 "calls.ringing" = "- ஒலிக்கிறது.";
 "calls.connecting" = "இணைப்பு.";
 "calls.callFinished" = "அழைப்பு முடிந்தது";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "சாதனங்கள்";
 "accountPage.settingsHeader" = "அமைப்புகள்";
 "accountPage.notificationsHeader" = "அறிவிப்புகள்";
-"accountPage.usernameNotRegistered" = "பயனர் பெயர்ஃ பதிவு செய்யப்படவில்லை";
-"accountPage.credentialsHeader" = "கணக்கு விவரங்கள்";
 "accountPage.blockedContacts" = "தடுக்கப்பட்ட தொடர்புகள்";
 "accountPage.unblockContact" = "தடுக்கலை திறக்கவும்";
 "accountPage.proxyAddressAlert" = "பிரதி முகவரியை வழங்கவும்";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "இணைப்பு";
 "account.statusUnknown" = "அறியப்படாதது";
 "account.statusConnectionerror" = "இணைப்பு தவறு";
-"account.needMigration" = "கணக்கு இடமாற்றம் செய்யப்பட வேண்டும்";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "நான்";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "அழைப்பு";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "வெளியேறும் அழைப்பு";
 "generatedMessage.missedOutgoingCall" = "தொலைபேசி அழைப்பு தவறியது";
 "generatedMessage.missedIncomingCall" = "தவறவிட்ட அழைப்பு";
 "generatedMessage.liveLocationSharing" = "நேரடி இருப்பிட பகிர்வு";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "பின்னூட்டம்";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "நெருக்கமாக";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "கணக்கை சேர்க்கவும்";
+"accessibility.aboutJamiTitle" = "ஜாமி பற்றி";
+"accessibility.welcomeToJamiTitle" = "ஜாமிக்கு வரவேற்கிறோம்";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "சுயவிவரப் படம்";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/te.lproj/Localizable.strings b/Ring/Ring/Resources/te.lproj/Localizable.strings
index ca1f1d14dab735344cdb184663b22f614dd37a9c..5cf75c5cb505173a393fa7b663ace4ce0e7cfe24 100644
--- a/Ring/Ring/Resources/te.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/te.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "పరిచయాలకు జోడించండి?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "మీరు ప్రస్తుతం మీ స్థానాన్ని పంచుకుంటున్నారు ";
-"conversation.explanationReceivingLocationFrom" = "మీరు ప్రస్తుతం  నుండి ఒక ప్రత్యక్ష స్థానం అందుకుంటున్న";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "దీనికి ప్రతిస్పందనగా";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "మీరు";
 "conversation.edited" = "సవరణ";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "ఆహ్వానాలు లేవు";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "ఆమోదము";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "జామితో చేరండి";
-"createAccount.lookingForUsernameAvailability" = "లభ్యత కోసం చూస్తున్న.";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "ఇప్పటికే తీసుకున్న వాడుకరి పేరు";
+"createAccount.usernameAlreadyTaken" = "ఇప్పటికే తీసుకోబడిన వాడుకరి పేరు";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "ఖాతా జోడించడం";
 "createAccount.UsernameNotRegisteredTitle" = "నెట్వర్క్ లోపం";
 "createAccount.UsernameNotRegisteredMessage" = "ఖాతా సృష్టించబడింది కాని వినియోగదారు పేరు నమోదు చేయబడలేదు";
 "createAccount.timeoutTitle" = "ఖాతా సృష్టించడం";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "తొలగించు";
 "actions.backAction" = "తిరిగి";
 "actions.doneAction" = "పూర్తి";
-"alerts.incomingCallAllertTitle" = " నుండి ఇన్కమింగ్ కాల్";
-"alerts.incomingCallButtonIgnore" = "విస్మరించు";
-"actions.startAudioCall" = "ఆడియో కాల్";
-"actions.startVideoCall" = "వీడియో కాల్";
 "actions.goToSettings" = "సెట్టింగులకు వెళ్లండి";
 "actions.stopLocationSharing" = "భాగస్వామ్యం చేయడాన్ని ఆపండి";
 
 // Calls
-"calls.incomingCallInfo" = "మీతో మాట్లాడాలనుకుంటుంది";
 "calls.ringing" = "రింగ్.";
 "calls.connecting" = "కనెక్ట్.";
 "calls.callFinished" = "కాల్ పూర్తయింది";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "పరికరాలు";
 "accountPage.settingsHeader" = "సెట్టింగులు";
 "accountPage.notificationsHeader" = "నోటిఫికేషన్లు";
-"accountPage.usernameNotRegistered" = "వాడుకరి పేరుః నమోదు చేయబడలేదు";
-"accountPage.credentialsHeader" = "ఖాతా వివరాలు";
 "accountPage.blockedContacts" = "అడ్డుకున్న పరిచయాలు";
 "accountPage.unblockContact" = "బ్లాక్ ను అన్బ్లాక్ చేయండి";
 "accountPage.proxyAddressAlert" = "ప్రాక్సీ చిరునామాను అందించండి";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "కనెక్షన్";
 "account.statusUnknown" = "తెలియని";
 "account.statusConnectionerror" = "కనెక్షన్ లోపం";
-"account.needMigration" = "ఖాతా వలస అవసరం";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "నేను";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "అందుకున్న ఆహ్వానం";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "బయటి కాల్";
 "generatedMessage.missedOutgoingCall" = "మిస్ అవుట్గోయింగ్ కాల్";
 "generatedMessage.missedIncomingCall" = "మిస్డ్ ఇన్కమింగ్ కాల్";
 "generatedMessage.liveLocationSharing" = "ప్రత్యక్ష స్థానం భాగస్వామ్యం";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "అభిప్రాయపత్రాలు";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "దగ్గరగా";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "ఖాతా జోడించండి";
+"accessibility.aboutJamiTitle" = "జామి గురించి";
+"accessibility.welcomeToJamiTitle" = "జామికి స్వాగతం";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "ప్రొఫైల్ చిత్రం";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/th.lproj/Localizable.strings b/Ring/Ring/Resources/th.lproj/Localizable.strings
index 90566eb9994c575afe50689a95488b756940cd77..4b0d4e9fc2eef8875a040dab924327cde01fc149 100644
--- a/Ring/Ring/Resources/th.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/th.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "เพิ่มในรายชื่อติดต่อไหม";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "คุณกําลังแบ่งปันสถานที่ของคุณกับ ";
-"conversation.explanationReceivingLocationFrom" = "คุณกําลังรับข้อมูลที่ตั้งสดจาก ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "ตอบ";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "คุณ";
 "conversation.edited" = "ปรับแต่ง";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "ไม่มีการเชิญ";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "รับรอง";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "เข้าร่วมกับจามิ";
-"createAccount.lookingForUsernameAvailability" = "กําลังมองหาความสามารถ...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "ชื่อผู้ใช้ถูกนำไปใช้แล้ว";
+"createAccount.usernameAlreadyTaken" = "ชื่อผู้ใช้ที่ได้รับแล้ว";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "กำลังเพิ่มบัญชี";
 "createAccount.UsernameNotRegisteredTitle" = "ความผิดพลาดในเครือข่าย";
 "createAccount.UsernameNotRegisteredMessage" = "การสร้างบัญชี แต่ชื่อผู้ใช้ไม่ได้ลงทะเบียน";
 "createAccount.timeoutTitle" = "การสร้างบัญชี";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "ลบ";
 "actions.backAction" = "กลับ";
 "actions.doneAction" = "ทําแล้ว";
-"alerts.incomingCallAllertTitle" = "โทรศัพท์ที่เข้ามาจาก ";
-"alerts.incomingCallButtonIgnore" = "หมอง";
-"actions.startAudioCall" = "การเรียกเสียง";
-"actions.startVideoCall" = "โทรศัพท์วีดีโอ";
 "actions.goToSettings" = "ไปยัง การตั้งค่า";
 "actions.stopLocationSharing" = "หยุดแบ่งปัน";
 
 // Calls
-"calls.incomingCallInfo" = "อยากคุยกับเธอ";
 "calls.ringing" = "เสียงร้อง";
 "calls.connecting" = "การเชื่อมต่อ...";
 "calls.callFinished" = "โทรศัพท์เสร็จ";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "อุปกรณ์";
 "accountPage.settingsHeader" = "การตั้งค่า";
 "accountPage.notificationsHeader" = "การแจ้งเตือน";
-"accountPage.usernameNotRegistered" = "ชื่อผู้ใช้: ไม่ลงทะเบียน";
-"accountPage.credentialsHeader" = "รายละเอียดบัญชี";
 "accountPage.blockedContacts" = "ผู้ติดต่อที่ถูกบล็อก";
 "accountPage.unblockContact" = "เลิกบล็อก";
 "accountPage.proxyAddressAlert" = "ให้ที่อยู่ตัวแทน";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "กำลังเชื่อมต่อ";
 "account.statusUnknown" = "ไม่ทราบ";
 "account.statusConnectionerror" = "ความผิดพลาดการเชื่อมต่อ";
-"account.needMigration" = "ต้องย้ายบัญชี";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "ฉัน";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "ได้รับคำเชิญ";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "โทรออก";
 "generatedMessage.missedOutgoingCall" = "สายที่ไม่ได้รับ";
 "generatedMessage.missedIncomingCall" = "สายเรียกเข้าที่ไม่ได้รับ";
 "generatedMessage.liveLocationSharing" = "การแบ่งปันสถานที่สด";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "ข้อเสนอแนะ";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "ใกล้";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "เพิ่มบัญชี";
+"accessibility.aboutJamiTitle" = "เกี่ยวกับ Jami";
+"accessibility.welcomeToJamiTitle" = "ยินดีต้อนรับสู่ Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "รูปแบบ";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/tr.lproj/Localizable.strings b/Ring/Ring/Resources/tr.lproj/Localizable.strings
index f5068388a218548750f3460295fd84bb30be9cf6..30ea6bc1c29869573c4ba5881204cf39bcdcb9bb 100644
--- a/Ring/Ring/Resources/tr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Kişilere eklensin mi?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Şu anda konum bilginizi şu kişiyle paylaşıyorsunuz:";
-"conversation.explanationReceivingLocationFrom" = "Şu anda şu kişiden canlı konum alıyorsunuz:";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Cevap olarak";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Siz";
 "conversation.edited" = "Düzenlendi";
-"conversation.deletedMessage" = "bir mesajı sildi";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Davetiye yok";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Kabul edildi";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Alınan davetler";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Jami'ye katılın.";
-"createAccount.lookingForUsernameAvailability" = "kullanılabilirliğine bakılıyor...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "kullanıcı adı önceden alınmış";
+"createAccount.usernameAlreadyTaken" = "Kullanıcı adı önceden alınmış";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Hesap ekleniyor";
 "createAccount.UsernameNotRegisteredTitle" = "Ağ hatası";
 "createAccount.UsernameNotRegisteredMessage" = "Hesap oluşturuldu fakat kullanıcı adı kaydedilmedi";
 "createAccount.timeoutTitle" = "Hesap Oluşturuldu";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Sil";
 "actions.backAction" = "Geri";
 "actions.doneAction" = "Tamam";
-"alerts.incomingCallAllertTitle" = "Adlı kişiden gelen çağrı";
-"alerts.incomingCallButtonIgnore" = "Göz ardı et";
-"actions.startAudioCall" = "Sesli Çağrı";
-"actions.startVideoCall" = "Görüntülü Çağrı";
 "actions.goToSettings" = "Ayarlara Git";
 "actions.stopLocationSharing" = "Paylaşmayı durdur";
 
 // Calls
-"calls.incomingCallInfo" = "seninle konuşmak istiyor";
 "calls.ringing" = "Çalıyor...";
 "calls.connecting" = "Bağlanıyor...";
 "calls.callFinished" = "Çağrı sonlandırıldı";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Aygıtlar";
 "accountPage.settingsHeader" = "Ayarlar";
 "accountPage.notificationsHeader" = "Bildirimler";
-"accountPage.usernameNotRegistered" = "kullanıcı adı: kayıtlı değil";
-"accountPage.credentialsHeader" = "Hesap ayrıntıları";
 "accountPage.blockedContacts" = "Engellenmiş kişiler";
 "accountPage.unblockContact" = "Engeli kaldır";
 "accountPage.proxyAddressAlert" = "Vekil sunucu adresi sağlayın";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Bağlanılıyor";
 "account.statusUnknown" = "Bilinmeyen";
 "account.statusConnectionerror" = "Bağlantı hatası";
-"account.needMigration" = "Hesabın taşınması gerekiyor";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Ben";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Davetiye alındı";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Giden çağrı";
 "generatedMessage.missedOutgoingCall" = "Cevapsız giden çağrı";
 "generatedMessage.missedIncomingCall" = "Cevapsız gelen çağrı";
 "generatedMessage.liveLocationSharing" = "Canlı konum paylaşımı";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Geri bildirim";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Kapat";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Hesap ekle";
+"accessibility.aboutJamiTitle" = "Jami Hakkında";
+"accessibility.welcomeToJamiTitle" = "Jami ye Hoş geldin";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Profil görseli";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/tt.lproj/Localizable.strings b/Ring/Ring/Resources/tt.lproj/Localizable.strings
index 92484a709b430669529313b138e6827797b25562..25839b578c6ca1587b6a5f8832f76969952cb27a 100644
--- a/Ring/Ring/Resources/tt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tt.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Сез хәзерге вакытта ";
-"conversation.explanationReceivingLocationFrom" = "Сез хәзерге вакытта ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Бу сорауларга җавап итеп:";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "Редакция";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Чакырулар юк";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Кабул ителгән";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Җәмигә кушылыгыз";
-"createAccount.lookingForUsernameAvailability" = "Барлык нәрсәләрне эзлибез...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "инде алынган кулланучы исеме";
+"createAccount.usernameAlreadyTaken" = "Инде алынган кулланучы исеме";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Өстәмә исәп";
 "createAccount.UsernameNotRegisteredTitle" = "Аварияләр";
 "createAccount.UsernameNotRegisteredMessage" = "Хисап төзелгән, әмма кулланучы исеме теркәлмәгән";
 "createAccount.timeoutTitle" = "Хисапны булдыру";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Ачу";
 "actions.backAction" = "Кайт!";
 "actions.doneAction" = "Эшләнгән";
-"alerts.incomingCallAllertTitle" = "";
-"alerts.incomingCallButtonIgnore" = "Игътибар итмәгез";
-"actions.startAudioCall" = "Аудиокызылыш";
-"actions.startVideoCall" = "Видеокүршетү";
 "actions.goToSettings" = "Категорияләргә күчегез";
 "actions.stopLocationSharing" = "Бүлешүне туктатыгыз";
 
 // Calls
-"calls.incomingCallInfo" = "синең белән сөйләшергә тели";
 "calls.ringing" = "- Чаллыда...";
 "calls.connecting" = "Бергә тоташтыру...";
 "calls.callFinished" = "Чакыру тәмамланды";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Кораллар";
 "accountPage.settingsHeader" = "Калыплар";
 "accountPage.notificationsHeader" = "Билгеләүләр";
-"accountPage.usernameNotRegistered" = "Исем: теркәлмәгән";
-"accountPage.credentialsHeader" = "Хисапның тулылыгы";
 "accountPage.blockedContacts" = "Тотылган контактлар";
 "accountPage.unblockContact" = "Блокны ачыгыз";
 "accountPage.proxyAddressAlert" = "Прокси адресны күрсәтү";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Бәйләнеш";
 "account.statusUnknown" = "Билгесез";
 "account.statusConnectionerror" = "Бәйләнеш хатасы";
-"account.needMigration" = "хисапны күчерү кирәк";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Мин.";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Чакыру кабул ителгән";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Чыгышлы чакыру";
 "generatedMessage.missedOutgoingCall" = "Чыгышны югалткан чакыру";
 "generatedMessage.missedIncomingCall" = "Килгән чакыруны югалту";
 "generatedMessage.liveLocationSharing" = "Тере урынны бүлешү";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Фидбэк";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Якында";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Аккаунт өстәгез";
+"accessibility.aboutJamiTitle" = "Җәми турында";
+"accessibility.welcomeToJamiTitle" = "Җәмигә рәхим итегез.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Профиль рәсеме";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/uk.lproj/Localizable.strings b/Ring/Ring/Resources/uk.lproj/Localizable.strings
index b65e0e9ce9439f426768c01d1543c8b66c2a9249..bfb7c3d73bef16576fe9853699cd88b88b3a186a 100644
--- a/Ring/Ring/Resources/uk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/uk.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Додати до контактів?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Ви зараз ділитеся своїм місцем розташуванням з ";
-"conversation.explanationReceivingLocationFrom" = "Ви зараз отримуєте пряму локацію від ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Відповідно до";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "Ви";
 "conversation.edited" = "Редагування";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Ніяких запрошень";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Прийнято";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Запрошення отримані";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Приєднуйся до Jami";
-"createAccount.lookingForUsernameAvailability" = "шукаючи доступність...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Уживальне ім'я вже прийнято";
+"createAccount.usernameAlreadyTaken" = "Ім'я користувача вже зайнято";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Додавання облікового запису";
 "createAccount.UsernameNotRegisteredTitle" = "Збій мережі";
 "createAccount.UsernameNotRegisteredMessage" = "Уведено обліковий запис, але ім'я користувача не зареєстровано";
 "createAccount.timeoutTitle" = "Обліковий запис створено";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Видалити";
 "actions.backAction" = "Назад";
 "actions.doneAction" = "Готово";
-"alerts.incomingCallAllertTitle" = "Позванка з ";
-"alerts.incomingCallButtonIgnore" = "Ігнорувати";
-"actions.startAudioCall" = "Зов'янок з аудіо";
-"actions.startVideoCall" = "Віддіові дзвінки";
 "actions.goToSettings" = "Перейти до Настройки";
 "actions.stopLocationSharing" = "Зупинити поширення";
 
 // Calls
-"calls.incomingCallInfo" = "Хоче розмовляти з тобою";
 "calls.ringing" = "Звон...";
 "calls.connecting" = "З'єднавши...";
 "calls.callFinished" = "Зов'язок завершений";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Пристрої";
 "accountPage.settingsHeader" = "Налаштування";
 "accountPage.notificationsHeader" = "За повідомленнями";
-"accountPage.usernameNotRegistered" = "користувацьке ім'я: не зареєстровано";
-"accountPage.credentialsHeader" = "Відомості про обліковий запис";
 "accountPage.blockedContacts" = "Заблоковані контакти";
 "accountPage.unblockContact" = "Розблокувати";
 "accountPage.proxyAddressAlert" = "Додайте прокси-адрес";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "З'єднання";
 "account.statusUnknown" = "Невідомий";
 "account.statusConnectionerror" = "Помилка з'єднання";
-"account.needMigration" = "рахунку потрібно перевести";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Я";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Отримано запрошення";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Вихідний виклик";
 "generatedMessage.missedOutgoingCall" = "Пропущений вихідний виклик";
 "generatedMessage.missedIncomingCall" = "Пропущений вхідний виклик";
 "generatedMessage.liveLocationSharing" = "Поділення місцями на живо";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Відгук";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Закрити";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Додати обліковий запис";
+"accessibility.aboutJamiTitle" = "Про Jami";
+"accessibility.welcomeToJamiTitle" = "Вітаємо в Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Фото профілю";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/vi.lproj/Localizable.strings b/Ring/Ring/Resources/vi.lproj/Localizable.strings
index becec51545f4b4ac6e0ef4113c07307405004f36..a043025d47b037eec92af6f3e8f6a7ddb9ed95bf 100644
--- a/Ring/Ring/Resources/vi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/vi.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "Bạn đang chia sẻ vị trí của mình với ";
-"conversation.explanationReceivingLocationFrom" = "Bạn đang nhận được một địa điểm trực tiếp từ ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "Trả lời";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "You";
 "conversation.edited" = "Được biên tập";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "Không có lời mời";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "Được chấp nhận";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "Blocked";
 "invitations.list" = "Lời mời nhận được";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Tham gia Jami";
-"createAccount.lookingForUsernameAvailability" = "tìm kiếm khả năng sẵn sàng...";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "Username đã được lấy";
+"createAccount.usernameAlreadyTaken" = "Tên người dùng đã được lấy";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Tài khoản bổ sung";
 "createAccount.UsernameNotRegisteredTitle" = "Hầm mạng";
 "createAccount.UsernameNotRegisteredMessage" = "Tài khoản đã được tạo nhưng tên người dùng đã không được đăng ký";
 "createAccount.timeoutTitle" = "Tài khoản được tạo ra";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Xóa";
 "actions.backAction" = "Trở lại";
 "actions.doneAction" = "Được làm";
-"alerts.incomingCallAllertTitle" = "Tiếp đến từ ";
-"alerts.incomingCallButtonIgnore" = "Tránh bỏ";
-"actions.startAudioCall" = "Hỗng gọi âm thanh";
-"actions.startVideoCall" = "Video Call";
 "actions.goToSettings" = "Đi đến Settings";
 "actions.stopLocationSharing" = "Ngừng chia sẻ";
 
 // Calls
-"calls.incomingCallInfo" = "muốn nói chuyện với anh";
 "calls.ringing" = "- Anh nghe thấy...";
 "calls.connecting" = "Kết nối...";
 "calls.callFinished" = "Tiếp tục cuộc gọi";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Thiết bị";
 "accountPage.settingsHeader" = "Cài đặt";
 "accountPage.notificationsHeader" = "Thông báo";
-"accountPage.usernameNotRegistered" = "Tên người dùng: không đăng ký";
-"accountPage.credentialsHeader" = "Thông tin chi tiết tài khoản";
 "accountPage.blockedContacts" = "Các liên lạc bị chặn";
 "accountPage.unblockContact" = "Tháo khóa";
 "accountPage.proxyAddressAlert" = "Cung cấp địa chỉ đại diện";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Kết nối";
 "account.statusUnknown" = "Không biết";
 "account.statusConnectionerror" = "Hầm kết nối";
-"account.needMigration" = "tài khoản cần phải di chuyển";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Tôi.";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Thỉnh cầu được nhận";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@ was invited to join the conversation.";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@ was blocked from the conversation.";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Tiếp tục gọi";
 "generatedMessage.missedOutgoingCall" = "Lỡ cuộc gọi ra ngoài";
 "generatedMessage.missedIncomingCall" = "Lỡ cuộc gọi tiếp nhận";
 "generatedMessage.liveLocationSharing" = "Chia sẻ địa điểm trực tiếp";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Nhận phản hồi";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "Artwork by";
+
+// Accessibility
+"accessibility.close" = "Gần";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "Thêm tài khoản";
+"accessibility.aboutJamiTitle" = "Về Jami";
+"accessibility.welcomeToJamiTitle" = "Chào mừng đến với Jami.";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "Hình ảnh hồ sơ";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index 99d5f37fe3a67dbda15e66f43c852c0146bea709..4347e7b15f0397e4144ca221997a7d530252991e 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "添加至通讯录吗?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "您当前正在分享实时位置到";
-"conversation.explanationReceivingLocationFrom" = "您当前正在接收实时位置,来自";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "没有邀请";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "已接受";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "加入 Jami";
-"createAccount.lookingForUsernameAvailability" = "正在验证可用性";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "用户名已被他人使用";
+"createAccount.usernameAlreadyTaken" = "用户名已被占用";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "添加账户";
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已创建账户";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "删除";
 "actions.backAction" = "上一步";
 "actions.doneAction" = "完成";
-"alerts.incomingCallAllertTitle" = "通话来自";
-"alerts.incomingCallButtonIgnore" = "忽略";
-"actions.startAudioCall" = "语音通话";
-"actions.startVideoCall" = "视频通话";
 "actions.goToSettings" = "前往设置";
 "actions.stopLocationSharing" = "停止分享";
 
 // Calls
-"calls.incomingCallInfo" = "想要与您对话";
 "calls.ringing" = "正在呼叫...";
 "calls.connecting" = "正在连接…";
 "calls.callFinished" = "通话已结束";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "设备";
 "accountPage.settingsHeader" = "设置";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "用户名:未被注册";
-"accountPage.credentialsHeader" = "账户详情";
 "accountPage.blockedContacts" = "已屏蔽的联系人";
 "accountPage.unblockContact" = "取消屏蔽";
 "accountPage.proxyAddressAlert" = "提供代理地址";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "正在连接";
 "account.statusUnknown" = "未知";
 "account.statusConnectionerror" = "连接错误";
-"account.needMigration" = "该账户需迁移";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "我";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已接受邀请";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@被邀请加入对话。";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@被这个群组屏蔽。";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "去电";
 "generatedMessage.missedOutgoingCall" = "去电未接";
 "generatedMessage.missedIncomingCall" = "未接来电";
 "generatedMessage.liveLocationSharing" = "实时位置分享";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "反馈";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "关闭";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "添加账户";
+"accessibility.aboutJamiTitle" = "关于 Jami";
+"accessibility.welcomeToJamiTitle" = "欢迎使用 Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "个人资料图片";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index 04e7327aa12ed785a6b1b3a5bfc77df84f78e3f1..6a13b9f701fdd8c16c227da009a496cce3b761f4 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "新增到聯絡人?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "您目前正在分享您的位置,與";
-"conversation.explanationReceivingLocationFrom" = "您正收到即時位置,從";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "沒有邀請";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "已接受";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "加入 Jami";
-"createAccount.lookingForUsernameAvailability" = "正在確認是否可用……";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "使用者名稱已被使用";
+"createAccount.usernameAlreadyTaken" = "已取得的使用者名稱";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "正在加入帳號";
 "createAccount.UsernameNotRegisteredTitle" = "網路錯誤";
 "createAccount.UsernameNotRegisteredMessage" = "帳號已建立,但未註冊使用者名稱";
 "createAccount.timeoutTitle" = "已建立帳號";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "刪除";
 "actions.backAction" = "前一個";
 "actions.doneAction" = "完成";
-"alerts.incomingCallAllertTitle" = "來電從";
-"alerts.incomingCallButtonIgnore" = "忽略";
-"actions.startAudioCall" = "音訊通話";
-"actions.startVideoCall" = "視訊通話";
 "actions.goToSettings" = "前往設定";
 "actions.stopLocationSharing" = "停止分享";
 
 // Calls
-"calls.incomingCallInfo" = "想要與您交談";
 "calls.ringing" = "響鈴中……";
 "calls.connecting" = "正在連線……";
 "calls.callFinished" = "通話結束";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "裝置";
 "accountPage.settingsHeader" = "設定";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "使用者名稱:未註冊";
-"accountPage.credentialsHeader" = "帳號詳細資訊";
 "accountPage.blockedContacts" = "已阻擋的聯絡人";
 "accountPage.unblockContact" = "取消封鎖";
 "accountPage.proxyAddressAlert" = "提供代理伺服器附加元件";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "連接中";
 "account.statusUnknown" = "未知";
 "account.statusConnectionerror" = "連線錯誤";
-"account.needMigration" = "需要遷移帳號";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "我";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已收到邀請";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@被邀请加入对话。";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@被阻止参与对话。";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "撥出電話";
 "generatedMessage.missedOutgoingCall" = "未接去電";
 "generatedMessage.missedIncomingCall" = "未接來電";
 "generatedMessage.liveLocationSharing" = "即時位置分享";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "回饋";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "關閉";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "加入帳號";
+"accessibility.aboutJamiTitle" = "關於 Jami";
+"accessibility.welcomeToJamiTitle" = "歡迎來到 Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "个人资料图片";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
index f849a29ba3164c852d5272281435837d7a4f82d6..ccd38f1bd7c97f1f2f057b6270ce0350a7fc295c 100644
--- a/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hant.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "添加至通讯录吗?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "No invitations";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "已接受";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "username already taken";
+"createAccount.usernameAlreadyTaken" = "已取得的使用者名稱";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Adding account";
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Delete";
 "actions.backAction" = "Back";
 "actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonIgnore" = "Ignore";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "Stop sharing";
 
 // Calls
-"calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
 "calls.callFinished" = "Call finished";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Devices";
 "accountPage.settingsHeader" = "Settings";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
 "accountPage.blockedContacts" = "Blocked contacts";
 "accountPage.unblockContact" = "取消屏蔽";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connecting";
 "account.statusUnknown" = "Unknown";
 "account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已接受邀请";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@被邀请加入对话。";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@被阻止参与对话。";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Outgoing call";
 "generatedMessage.missedOutgoingCall" = "Missed outgoing call";
 "generatedMessage.missedIncomingCall" = "Missed incoming call";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "回饋";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "關閉";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "添加账户";
+"accessibility.aboutJamiTitle" = "关于 Jami";
+"accessibility.welcomeToJamiTitle" = "欢迎来到 Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "个人资料图片";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index d9b0b383a95ffffbd604fc4862edaf6450ad9304..d2561e197e10f5a3ef56f5afce412c3e68091378 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "添加至通讯录吗?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "您当前正在分享实时位置到";
-"conversation.explanationReceivingLocationFrom" = "您当前正在接收实时位置,来自";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "沒有邀請";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "已接受";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "加入 Jami";
-"createAccount.lookingForUsernameAvailability" = "正在確認是否可用……";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "使用者名稱已被使用";
+"createAccount.usernameAlreadyTaken" = "已取得的使用者名稱";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "添加账户";
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "刪除";
 "actions.backAction" = "前一個";
 "actions.doneAction" = "完成";
-"alerts.incomingCallAllertTitle" = "來電從";
-"alerts.incomingCallButtonIgnore" = "忽略";
-"actions.startAudioCall" = "语音通话";
-"actions.startVideoCall" = "视频通话";
 "actions.goToSettings" = "前往设置";
 "actions.stopLocationSharing" = "停止分享";
 
 // Calls
-"calls.incomingCallInfo" = "想要与您对话";
 "calls.ringing" = "響鈴中……";
 "calls.connecting" = "正在连接…";
 "calls.callFinished" = "通话已结束";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "裝置";
 "accountPage.settingsHeader" = "設定";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "用户名:未被注册";
-"accountPage.credentialsHeader" = "账户详情";
 "accountPage.blockedContacts" = "已屏蔽的联系人";
 "accountPage.unblockContact" = "取消屏蔽";
 "accountPage.proxyAddressAlert" = "提供代理地址";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "連接中";
 "account.statusUnknown" = "未知";
 "account.statusConnectionerror" = "连接错误";
-"account.needMigration" = "该账户需迁移";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "我";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已接受邀请";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@被邀请加入对话。";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@被阻止参与对话。";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "撥出電話";
 "generatedMessage.missedOutgoingCall" = "未接去電";
 "generatedMessage.missedIncomingCall" = "未接來電";
 "generatedMessage.liveLocationSharing" = "实时位置分享";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "回饋";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "關閉";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "添加账户";
+"accessibility.aboutJamiTitle" = "关于 Jami";
+"accessibility.welcomeToJamiTitle" = "欢迎来到 Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "个人资料图片";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/zh_CN.GB2312.lproj/Localizable.strings b/Ring/Ring/Resources/zh_CN.GB2312.lproj/Localizable.strings
index e4a8202606bd6e722447cf9a428be01a64cfc2f1..52e206f272a31cccce33d8e6ec2bfa58ca6f766b 100644
--- a/Ring/Ring/Resources/zh_CN.GB2312.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh_CN.GB2312.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "Add to contacts?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "You are currently sharing your location with ";
-"conversation.explanationReceivingLocationFrom" = "You are currently receiving a live location from ";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "In reply to";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "deleted a message";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "Contact blocked";
 
 // Invitations
 "invitations.noInvitations" = "No invitations";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "已接受";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "Invitations received";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "Join Jami";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "username already taken";
+"createAccount.usernameAlreadyTaken" = "已取得的使用者名稱";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "Adding account";
 "createAccount.UsernameNotRegisteredTitle" = "Network error";
 "createAccount.UsernameNotRegisteredMessage" = "Account was created but username was not registered";
 "createAccount.timeoutTitle" = "Account Created";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "Delete";
 "actions.backAction" = "Back";
 "actions.doneAction" = "Done";
-"alerts.incomingCallAllertTitle" = "Incoming call from ";
-"alerts.incomingCallButtonIgnore" = "Ignore";
-"actions.startAudioCall" = "  Audio Call";
-"actions.startVideoCall" = "  Video Call";
 "actions.goToSettings" = "Go to Settings";
 "actions.stopLocationSharing" = "Stop sharing";
 
 // Calls
-"calls.incomingCallInfo" = "wants to talk to you";
 "calls.ringing" = "Ringing…";
 "calls.connecting" = "Connecting…";
 "calls.callFinished" = "Call finished";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "Devices";
 "accountPage.settingsHeader" = "Settings";
 "accountPage.notificationsHeader" = "Notifications";
-"accountPage.usernameNotRegistered" = "username: not registered";
-"accountPage.credentialsHeader" = "Account Details";
 "accountPage.blockedContacts" = "Blocked contacts";
 "accountPage.unblockContact" = "Unblock";
 "accountPage.proxyAddressAlert" = "Provide proxy address";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "Connecting";
 "account.statusUnknown" = "Unknown";
 "account.statusConnectionerror" = "Connection Error";
-"account.needMigration" = "account need to be migrated";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "Me";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "Invitation received";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@被邀请加入对话。";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@被阻止参与对话。";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "Outgoing call";
 "generatedMessage.missedOutgoingCall" = "Missed outgoing call";
 "generatedMessage.missedIncomingCall" = "Missed incoming call";
 "generatedMessage.liveLocationSharing" = "Live location sharing";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "Feedback";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "關閉";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "添加账户";
+"accessibility.aboutJamiTitle" = "关于 Jami";
+"accessibility.welcomeToJamiTitle" = "欢迎来到 Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "个人资料图片";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";
diff --git a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
index e57ea09eabaff342f7ef1fd57b33baa4df809926..16d70396c10f6a17727e9302859c66e8ff6e9dc3 100644
--- a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
@@ -129,8 +129,6 @@
 "conversation.addToContactsLabel" = "添加至通讯录吗?";
 "conversation.notContactLabel" = "is not in your contact list";
 "conversation.messagePlaceholder" = "Write to";
-"conversation.explanationSendingLocationTo" = "您当前正在分享实时位置到";
-"conversation.explanationReceivingLocationFrom" = "您当前正在接收实时位置,来自";
 "conversation.errorSavingImage" = "An error occurred while saving the image to the gallery.";
 "conversation.receivedRequest" = "%@ sent you a conversation invitation.";
 "conversation.incomingRequest" = "sent you a conversation invitation.";
@@ -140,18 +138,17 @@
 "conversation.synchronizationTitle" = "You have accepted the conversation invitation.";
 "conversation.synchronizationMessage" = "Waiting for %@ to connect to synchronize the conversation…";
 "conversation.inReplyTo" = "在回复中";
-"conversation.repliedTo" = "replied to";
+"conversation.repliedTo" = "%@ replied to %@";
 "conversation.yourself" = "您";
 "conversation.edited" = "已编辑";
-"conversation.deletedMessage" = "删除了一封邮件";
+"conversation.deletedMessage" = "%@ deleted a message";
 "conversation.contactBlocked" = "联系人被封锁";
 
 // Invitations
 "invitations.noInvitations" = "沒有邀請";
-"invitations.pending" = "pending";
-"invitations.accepted" = "accepted";
-"invitations.declined" = "declined";
-"invitations.blocked" = "blocked";
+"invitations.accepted" = "已接受";
+"invitations.declined" = "Declined";
+"invitations.blocked" = "已封鎖";
 "invitations.list" = "邀请已发送";
 
 // Walkthrough
@@ -176,12 +173,10 @@
 
 // Create Account form
 "createAccount.createAccountFormTitle" = "加入 Jami";
-"createAccount.lookingForUsernameAvailability" = "正在確認是否可用……";
+"createAccount.lookingForUsernameAvailability" = "Looking for availability…";
 "createAccount.invalidUsername" = "Invalid username. Please enter a valid username.";
-"createAccount.usernameAlreadyTaken" = "使用者名稱已被使用";
+"createAccount.usernameAlreadyTaken" = "已取得的使用者名稱";
 "createAccount.usernameValid" = "The username is available.";
-"createAccount.loading" = "Loading…";
-"createAccount.waitCreateAccountTitle" = "添加账户";
 "createAccount.UsernameNotRegisteredTitle" = "网络错误";
 "createAccount.UsernameNotRegisteredMessage" = "账户已创建,但用户名未注册";
 "createAccount.timeoutTitle" = "已建立帳號";
@@ -261,15 +256,10 @@
 "actions.deleteAction" = "刪除";
 "actions.backAction" = "前一個";
 "actions.doneAction" = "完成";
-"alerts.incomingCallAllertTitle" = "來電從";
-"alerts.incomingCallButtonIgnore" = "忽略";
-"actions.startAudioCall" = "语音通话";
-"actions.startVideoCall" = "视频通话";
 "actions.goToSettings" = "前往设置";
 "actions.stopLocationSharing" = "停止分享";
 
 // Calls
-"calls.incomingCallInfo" = "想要与您对话";
 "calls.ringing" = "響鈴中……";
 "calls.connecting" = "正在连接…";
 "calls.callFinished" = "通话已结束";
@@ -286,8 +276,6 @@
 "accountPage.devicesListHeader" = "裝置";
 "accountPage.settingsHeader" = "設定";
 "accountPage.notificationsHeader" = "通知";
-"accountPage.usernameNotRegistered" = "用户名:未被注册";
-"accountPage.credentialsHeader" = "账户详情";
 "accountPage.blockedContacts" = "已屏蔽的联系人";
 "accountPage.unblockContact" = "取消屏蔽";
 "accountPage.proxyAddressAlert" = "提供代理地址";
@@ -420,7 +408,7 @@
 "account.statusConnecting" = "連接中";
 "account.statusUnknown" = "未知";
 "account.statusConnectionerror" = "连接错误";
-"account.needMigration" = "该账户需迁移";
+"account.needMigration" = "Account requires migration.";
 "account.me" = "我";
 
 // Block List Page
@@ -464,16 +452,18 @@
 // Generated Message
 "generatedMessage.contactAdded" = "已接受邀请";
 "generatedMessage.swarmCreated" = "Conversation created";
-"generatedMessage.invitationReceived" = "was invited to join the conversation.";
-"generatedMessage.invitationAccepted" = "has joined the conversation.";
+"generatedMessage.invitationReceived" = "%@被邀请加入对话。";
+"generatedMessage.invitationAccepted" = "%@ has joined the conversation.";
 "generatedMessage.youJoined" = "You joined the conversation.";
-"generatedMessage.contactBlocked" = "was blocked from the conversation.";
-"generatedMessage.contactUnblocked" = "was unblocked from the conversation.";
+"generatedMessage.contactBlocked" = "%@被阻止参与对话。";
+"generatedMessage.contactUnblocked" = "%@ was unblocked from the conversation.";
 "generatedMessage.outgoingCall" = "撥出電話";
 "generatedMessage.missedOutgoingCall" = "未接去電";
 "generatedMessage.missedIncomingCall" = "未接來電";
 "generatedMessage.liveLocationSharing" = "实时位置分享";
-"generatedMessage.contactLeftConversation" = "has left the conversation.";
+"generatedMessage.contactLeftConversation" = "%@ has left the conversation.";
+"generatedMessage.nonSwarmInvitationReceived" = "You sent an invitation.";
+"generatedMessage.nonSwarmInvitationAccepted" = "Your invitation was accepted.";
 
 // General Settings
 "generalSettings.videoSettings" = "Video settings";
@@ -514,3 +504,14 @@
 "aboutJami.feedback" = "回饋";
 "aboutJami.createdBy" = "Created by";
 "aboutJami.artworkBy" = "美術設計";
+
+// Accessibility
+"accessibility.close" = "關閉";
+"accessibility.smartListSwitchAccounts" = "Switch account";
+"accessibility.smartListConnectedAs" = "Your current account is %@";
+"accessibility.smartListAddAccount" = "添加账户";
+"accessibility.aboutJamiTitle" = "关于 Jami";
+"accessibility.welcomeToJamiTitle" = "欢迎来到 Jami";
+"accessibility.createAccountVerifyUsernamePrompt" = "Enter a username to verify if it's available";
+"accessibility.profilePicturePicker" = "个人资料图片";
+"accessibility.profilePicturePickerHint" = "Double-tap to take a picture or select a picture from the library";