diff --git a/Ring/Ring/Resources/ar.lproj/Localizable.strings b/Ring/Ring/Resources/ar.lproj/Localizable.strings
index a055b994e43d11aa7a39bcf2a0c7799ff6b37d2c..c7f7678859043dee3cf999e4e8eeba26ff4e2446 100644
--- a/Ring/Ring/Resources/ar.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "محادثات";
-"global.contactRequestsTabBarTitle" = "الدعوات";
-"global.meTabBarTitle" = "حساب";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "موافق";
 "global.versionName" = "معا";
 "global.close" = "إغلاق";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "البارحة";
-"smartlist.results" = "نتائج البحث";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "محادثات";
 "smartlist.searching" = "جاري البحث...";
 "smartlist.noResults" = "لا يوجد نتائج";
 "smartlist.noConversation" = "لا يوجد محادثات";
 "smartlist.searchBarPlaceholder" = "ادخال اسم...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "الاتصال بالشبكة غير متوفر";
 "smartlist.cellularAccess" = "تأكد من السماح للوصول النقال الخلوي في إعدادتك";
 "smartlist.accountsTitle" = "حسابات";
 "smartlist.addAccountButton" = "+اضافة حساب";
 "smartlist.noNumber" = "لا تحتوى جهة الاتصال المحددة على أى رقم";
 "smartlist.selectOneNumber" = "حدد أحد الأرقام";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/bg.lproj/Localizable.strings b/Ring/Ring/Resources/bg.lproj/Localizable.strings
index 0e594454532d745630865cef6fa777bce69c279f..def7e20a639c9488bbcd235d4048e6da6446470a 100644
--- a/Ring/Ring/Resources/bg.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Разговори";
-"global.contactRequestsTabBarTitle" = "Покани";
-"global.meTabBarTitle" = "Профил";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Добре";
 "global.versionName" = "Together";
 "global.close" = "Затваряне";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Вчера";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Разговори";
 "smartlist.searching" = "Търсене...";
 "smartlist.noResults" = "Няма резултати";
 "smartlist.noConversation" = "Няма разговори";
 "smartlist.searchBarPlaceholder" = "Въведете име…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Няма връзка с мрежата";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Профили";
 "smartlist.addAccountButton" = "Добавяне на профил";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/ca.lproj/Localizable.strings b/Ring/Ring/Resources/ca.lproj/Localizable.strings
index bad0905db5ec26e425eb2aba7d409cf8027482ba..4c69fead6501f46a32cf969299e0780b09e0f2c8 100644
--- a/Ring/Ring/Resources/ca.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ca.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Converses";
-"global.contactRequestsTabBarTitle" = "Invitacions";
-"global.meTabBarTitle" = "Compte";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "D'acord";
 "global.versionName" = "Together";
 "global.close" = "Tanca";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ahir";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Converses";
 "smartlist.searching" = "Cercant...";
 "smartlist.noResults" = "Sense resultats";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No hi ha connexió a la xarxa";
 "smartlist.cellularAccess" = "Assegureu-vos que l’accés al mòbil s’atorga a la vostra configuració";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Preferències generals";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
index 9759d9bd26a47fd1de25f2251cee0aad61dd39e1..8aa6312bd9c01efbbba3f95c3747e95da3854ca9 100644
--- a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Konverzace";
-"global.contactRequestsTabBarTitle" = "Pozvání";
-"global.meTabBarTitle" = "Účet";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "Zavřít";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Včera";
-"smartlist.results" = "Výsledky hledání";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Konverzace";
 "smartlist.searching" = "Hledá se...";
 "smartlist.noResults" = "Žádné výsledky";
 "smartlist.noConversation" = "Žádné konverzace";
 "smartlist.searchBarPlaceholder" = "Zadejte jméno...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Chybí připojení";
 "smartlist.cellularAccess" = "Ujistěte se, že je v nastavení zaručen buňkový (místní) přístup";
 "smartlist.accountsTitle" = "Účty";
 "smartlist.addAccountButton" = "+ Přidat účet";
 "smartlist.noNumber" = "Vybraný kontakt nemá žádné číslo.";
 "smartlist.selectOneNumber" = "Vyberte jedno z čísel.";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Sdílení aktuální polohy";
 
 //General Settings
-"generalSettings.title" = "Obecná nastavení";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Povolit zrychlení videa";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/da.lproj/Localizable.strings b/Ring/Ring/Resources/da.lproj/Localizable.strings
index e305978490bbe31381ccf2e95901c45509f45fa8..44812f65974cb6cdb14e8ac075c4cca5046feb75 100644
--- a/Ring/Ring/Resources/da.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/da.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Samtaler";
-"global.contactRequestsTabBarTitle" = "Invitationer";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Luk";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "I går";
-"smartlist.results" = "Søgeresultat";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Samtaler";
 "smartlist.searching" = "Søger...";
 "smartlist.noResults" = "Ingen resultater";
 "smartlist.noConversation" = "Ingen samtaler";
 "smartlist.searchBarPlaceholder" = "Indtast navn...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Ingen netværksforbindelse";
 "smartlist.cellularAccess" = "Kontroller at rettigheder til mobildata er givet i indstillinger";
 "smartlist.accountsTitle" = "Konti";
 "smartlist.addAccountButton" = "+Tilføj Konto";
 "smartlist.noNumber" = "Den valgte kontakt har ikke noget nummer";
 "smartlist.selectOneNumber" = "Vælg et af numrene";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Generelle indstillinger";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
index 1c1097c61bfcb1e119dfabf7eb23e2ba7a7a24fe..301bb92c32e7801e5b395d1a9d588515a03e43e2 100644
--- a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Gespräche";
-"global.contactRequestsTabBarTitle" = "Einladungen";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Gemeinsam";
 "global.close" = "Schließen";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Gestern";
-"smartlist.results" = "Suchergebnis";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Gespräche";
 "smartlist.searching" = "Suche...";
 "smartlist.noResults" = "Keine Ergebnisse";
 "smartlist.noConversation" = "Keine Unterhaltungen";
 "smartlist.searchBarPlaceholder" = "Name eingeben...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Keine Netzwerkkonnektivität";
 "smartlist.cellularAccess" = "Bitte stellen Sie sicher, dass in den Einstellungen Mobilfunkzugriff gewährt wurde.";
 "smartlist.accountsTitle" = "Konten";
 "smartlist.addAccountButton" = "+ Konto hinzufügen";
 "smartlist.noNumber" = "Der ausgewählte Kontakt hat keine Nummer";
 "smartlist.selectOneNumber" = "Wählen Sie eine der Zahlen";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Standort live mitteilen";
 
 //General Settings
-"generalSettings.title" = "Allgemeine Einstellungen";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Video-Beschleunigung einschalten";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/de.lproj/Localizable.strings b/Ring/Ring/Resources/de.lproj/Localizable.strings
index c81f4ea93932b04b9bf147114204febec5674633..9db660de285bb198c12de3f8a21b3937bb23593a 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Unterhaltungen";
-"global.contactRequestsTabBarTitle" = "Einladungen";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Zusammen";
 "global.close" = "Schließen";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Gestern";
-"smartlist.results" = "Suchergebnis";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Unterhaltungen";
 "smartlist.searching" = "Suchen...";
 "smartlist.noResults" = "Keine Ergebnisse";
 "smartlist.noConversation" = "Keine Unterhaltungen";
 "smartlist.searchBarPlaceholder" = "Namen eingeben…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Keine Netzwerkverbindung";
 "smartlist.cellularAccess" = "Vergewissern Sie sich, dass der Mobilfunkzugang in Ihren Einstellungen erlaubt ist.";
 "smartlist.accountsTitle" = "Konten";
 "smartlist.addAccountButton" = "+ Konto hinzufügen";
 "smartlist.noNumber" = "Der ausgewählte Kontakt hat keine Nummer";
 "smartlist.selectOneNumber" = "Eine der Nummern auswählen";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live-Standortfreigabe";
 
 //General Settings
-"generalSettings.title" = "Allgemeine Einstellungen";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Videobeschleunigung aktivieren";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/el.lproj/Localizable.strings b/Ring/Ring/Resources/el.lproj/Localizable.strings
index 7d5bd26a01583647eaa576a4e6fe67703148ed4e..15dcc53817602602dc9b187717ea99437e9cccde 100644
--- a/Ring/Ring/Resources/el.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/el.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Συνομιλίες";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Λογαριασμός";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Εντάξει";
 "global.versionName" = "Together";
 "global.close" = "Κλείσιμο";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Χθες";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Συνομιλίες";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Καμία σύνδεση στο δίκτυο";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Λογαριασμοί";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/eo.lproj/Localizable.strings b/Ring/Ring/Resources/eo.lproj/Localizable.strings
index 59c0b1767e375a3cc88981c6f69d45e9f627d060..8b4a4793c81d26db2c903981a7d4cf8358d3b3a3 100644
--- a/Ring/Ring/Resources/eo.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eo.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Konversacioj";
-"global.contactRequestsTabBarTitle" = "Invitoj";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Okej";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Hieraŭ";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Konversacioj";
 "smartlist.searching" = "Serĉas";
 "smartlist.noResults" = "Nula trovaĵon";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sen reta konekto";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Kontoj";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index 666f93d905223cbd1a4b37df5884b6310c971ddd..6e4d60f22c87c84ed126ec89676bac316ecd9dd4 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversaciones";
-"global.contactRequestsTabBarTitle" = "Invitaciones";
-"global.meTabBarTitle" = "Cuenta";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Aceptar";
 "global.versionName" = "Juntos";
 "global.close" = "Cerrar";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ayer";
-"smartlist.results" = "Resultado de búsqueda";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversaciones";
 "smartlist.searching" = "Buscando...";
 "smartlist.noResults" = "Sin resultados";
 "smartlist.noConversation" = "No hay conversaciones";
 "smartlist.searchBarPlaceholder" = "Introducir nombre...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sin conexión a la red";
 "smartlist.cellularAccess" = "Asegúrese de que el acceso a la red móvil haya sido otorgado en las opciones";
 "smartlist.accountsTitle" = "Cuentas";
 "smartlist.addAccountButton" = "+ Añadir cuenta";
 "smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
 "smartlist.selectOneNumber" = "Seleccione uno de los números";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Compartición de ubicación en vivo";
 
 //General Settings
-"generalSettings.title" = "Ajustes generales";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Habilitar aceleración de video";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index d5246af8c428d60fb5d4d858345575b2110855c7..fead29cfc926ff467858f6ae767754af1c6ba1e3 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversaciones";
-"global.contactRequestsTabBarTitle" = "Invitaciones";
-"global.meTabBarTitle" = "Cuenta";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Okay";
 "global.versionName" = "Juntos";
 "global.close" = "Cerrar";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ayer";
-"smartlist.results" = "Resultados de la Búsqueda";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversaciones";
 "smartlist.searching" = "Buscando...";
 "smartlist.noResults" = "Sin resultados";
 "smartlist.noConversation" = "Sin conversaciones";
 "smartlist.searchBarPlaceholder" = "Ingresá tu nombre...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sin conexión a la red";
 "smartlist.cellularAccess" = "Asegúrate de que el acceso a la red móvil esté activado en tu configuración";
 "smartlist.accountsTitle" = "Cuentas";
 "smartlist.addAccountButton" = "+ Añadir cuenta";
 "smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
 "smartlist.selectOneNumber" = "Seleccioná uno de los números";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Compartición de ubicación en vivo";
 
 //General Settings
-"generalSettings.title" = "Configuración general";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Habilitar aceleración de video";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
index ef308f7474bdaf12c9251029efbd8c91e7426870..a8cdfc47a1ff7df667f6774b646c9ecec3ddf85f 100644
--- a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversaciones";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Cuenta";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversaciones";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Configuración general";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
index 6393d55787369002b97a4d2ce646ca3703b27c25..fa7ac39638a5ac827f421f9423649c2af522a428 100644
--- a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversaciones";
-"global.contactRequestsTabBarTitle" = "Invitaciones";
-"global.meTabBarTitle" = "Cuenta";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ayer";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversaciones";
 "smartlist.searching" = "Buscando…";
 "smartlist.noResults" = "Sin resultados";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sin conexión de red";
 "smartlist.cellularAccess" = "Verifique que el acceso celular está permitido en las configuraciones";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/et.lproj/Localizable.strings b/Ring/Ring/Resources/et.lproj/Localizable.strings
index 89d11d6b79c0f108f6e6195fe14bd1f6839192a2..ef06a6d7b611d735d021db649ac9cfa317bef865 100644
--- a/Ring/Ring/Resources/et.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Vestlused";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Vestlused";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/eu.lproj/Localizable.strings b/Ring/Ring/Resources/eu.lproj/Localizable.strings
index ee281c40d742f504be3636ca1c3f80037bbcb206..55cfba3dc690b8f6310e884479e8b6dc48064428 100644
--- a/Ring/Ring/Resources/eu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eu.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Elkarrizketak";
-"global.contactRequestsTabBarTitle" = "Gonbidapenak";
-"global.meTabBarTitle" = "Kontua";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ados";
 "global.versionName" = "Together";
 "global.close" = "Itxi";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Atzo";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Elkarrizketak";
 "smartlist.searching" = "Bilatzen...";
 "smartlist.noResults" = "Emaitzarik ez";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Ez dago sare-konexiorik";
 "smartlist.cellularAccess" = "Egiaztatu sare mugikorrera sarbidea eman dela ezarpenetan";
 "smartlist.accountsTitle" = "Kontuak";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
index 9dff6077d22a8484581b91092a9b671166c85129..584fc16aecbe1a0c9206b60bf0ded3c2a26942b5 100644
--- a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "گفتگو‌ها";
-"global.contactRequestsTabBarTitle" = "دعوت ها";
-"global.meTabBarTitle" = "حساب";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "قبول";
 "global.versionName" = "یکدیگر";
 "global.close" = "بستن";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "دیروز";
-"smartlist.results" = "نتیجه جستجو";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "گفتگو‌ها";
 "smartlist.searching" = "در حال جستجو...";
 "smartlist.noResults" = "بدون نتیجه";
 "smartlist.noConversation" = "بدون گفتگو";
 "smartlist.searchBarPlaceholder" = "نام را وارد کنید...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "بدون اتصال شبکه";
 "smartlist.cellularAccess" = "اطمینان حاصل کنید که دسترسی به تلفن همراه در تنظیمات شما اعمال شده";
 "smartlist.accountsTitle" = "حساب‌ها";
 "smartlist.addAccountButton" = "افزودن حساب...";
 "smartlist.noNumber" = "مخاطب انتخاب‌شده شماره‌ای ندارد";
 "smartlist.selectOneNumber" = "یکی از شماره‌ها را انتخاب کنید";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "هم‌رسانی زنده مکان";
 
 //General Settings
-"generalSettings.title" = "تنظیمات کلی";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "فعال‌سازی شتاب‌دهی ویدیو";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fa.lproj/Localizable.strings b/Ring/Ring/Resources/fa.lproj/Localizable.strings
index d63df6ae5c7821204f04620be80bc2c6bc9e662c..75f6e4ce36239f5ee47afd16e78c4ea763d76517 100644
--- a/Ring/Ring/Resources/fa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "قطع ارتباط با شبکه";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index 2feeb707f5365d8abdadfd014fcef8ba12111e40..8691526b6b3754e0b44cca9858c3c287d5e07c23 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -20,15 +20,14 @@
 
 // Global
 "global.homeTabBarTitle" = "Keskustelu";
-"global.contactRequestsTabBarTitle" = "Kutsut";
-"global.meTabBarTitle" = "Tunnus";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Vahvista";
 "global.versionName" = "Yhdessä";
 "global.close" = "Sulje";
 "global.share" = "Jako";
-"global.forward" = "Forward";
+"global.forward" = "Välitä";
 "global.save" = "Tallenna";
-"global.resend" = "Resend";
+"global.resend" = "Uudelleen";
 "global.preview" = "Esikatselu";
 
 // Scan
@@ -37,24 +36,29 @@
 
 // Smartlist
 "smartlist.yesterday" = "Eilen";
-"smartlist.results" = "Hakutulos";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Keskustelu";
 "smartlist.searching" = "Etsitään...";
 "smartlist.noResults" = "Ei tuloksia";
 "smartlist.noConversation" = "Ei keskusteluja";
 "smartlist.searchBarPlaceholder" = "Syötä nimi...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Ei verkkoyhteyttä";
 "smartlist.cellularAccess" = "Varmista, että matkapuhelinverkon käyttö on sallittu asetuksissasi";
 "smartlist.accountsTitle" = "Tunnukset";
 "smartlist.addAccountButton" = "+ Lisää tunnus";
 "smartlist.noNumber" = "Valitulla yhteyshenkilöllä ei ole numeroa";
 "smartlist.selectOneNumber" = "Valitse yksi numeroista";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write message to ";
+"conversation.messagePlaceholder" = "Kirjoita viesti";
 "conversation.explanationSendingLocationTo" = "Jaat sijaintisi tällä hetkellä";
 "conversation.explanationReceivingLocationFrom" = "Saat parhaillaan suoraa sijaintia";
-"conversation.errorSavingImage" = "Failed to save image to galery";
+"conversation.errorSavingImage" = "Kuvan tallennus galleriaan epäonnistui";
 
 //Invitations
 "invitations.noInvitations" = "Ei kutsuja";
@@ -88,7 +92,7 @@
 "createAccount.lookingForUsernameAvailability" = "etsitään saatavuutta…";
 "createAccount.invalidUsername" = "käyttäjätunnus ei kelpaa";
 "createAccount.usernameAlreadyTaken" = "käyttäjätunnus on jo varattu";
-"createAccount.usernameValid" = "username is available";
+"createAccount.usernameValid" = "Tunnus on saatavilla";
 "createAccount.loading" = "Ladataan";
 "createAccount.waitCreateAccountTitle" = "Lisätään tunnusta";
 "createAccount.RegisterAUsername" = "Rekisteröi käyttäjänimi";
@@ -185,10 +189,10 @@
 "calls.haghUp" = "katkaise puhelu";
 "calls.maximize" = "suurenna";
 "calls.minimize" = "pienennä";
-"calls.setModerator" = "set moderator";
-"calls.removeModerator" = "unset moderator";
-"calls.muteAudio" = "mute audio";
-"calls.unmuteAudio" = "unmute audio";
+"calls.setModerator" = "aseta valvoja";
+"calls.removeModerator" = "poista valvoja";
+"calls.muteAudio" = "mykistä ääni";
+"calls.unmuteAudio" = "poista mykistys";
 
 //Account Page
 "accountPage.devicesListHeader" = "Laitteet";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Suoran sijainnin jakaminen";
 
 //General Settings
-"generalSettings.title" = "Yleiset asetukset";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Kytke videon laitteistokiihdytys";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
index 226fa37841c84b45eb60c6bba93cebce4212c318..a4de0c9f0521098481fd1c4ca2b80b00a1710007 100644
--- a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Compte";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Résultat de la recherche";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "Pas de conversations";
 "smartlist.searchBarPlaceholder" = "Entrez un nom... ";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Paramètres généraux";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Activer l'accélération vidéo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
index 3380635271aa92ef925ff348049a5e3548cd6077..f893ecc727da0901501044c25f077ea64eb22682 100644
--- a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Compte";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Ensemble";
 "global.close" = "Fermer";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Hier";
-"smartlist.results" = "Résultat de la recherche";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "En cours de recherche ...";
 "smartlist.noResults" = "Pas de résultats";
 "smartlist.noConversation" = "Pas de conversations";
 "smartlist.searchBarPlaceholder" = "Entrez un nom... ";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Aucune connectivité réseau";
 "smartlist.cellularAccess" = "Valider que l'accès au réseau cellulaire est autorisé dans vos paramètres";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Paramètres généraux";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Activer l'accélération vidéo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
index 9a14a8f19385ce547a6657cb50b2b3fa393e44c6..39d83660f08d38b373212d8984ac44cccdc77b07 100644
--- a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Compte";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Résultat de la recherche";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "Pas de conversations";
 "smartlist.searchBarPlaceholder" = "Entrez un nom... ";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Paramètres généraux";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Activer l'accélération vidéo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
index 486af28a2c466550576e55c23ff20924e35c9800..5466d86a8afbeac2bca1a94eda10358c009aad67 100644
--- a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Compte";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "d'accord";
 "global.versionName" = "Ensemble";
 "global.close" = "Fermer";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Hier";
-"smartlist.results" = "Résultat de la recherche";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Recherche en cours…";
 "smartlist.noResults" = "Aucun résultat";
 "smartlist.noConversation" = "Pas de conversations";
 "smartlist.searchBarPlaceholder" = "Entrez un nom... ";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Aucune connexion au réseau n'est possible";
 "smartlist.cellularAccess" = "Assurez vous que l'accès mobile est activé dans vos paramètres";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Paramètres généraux";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Activer l'accélération vidéo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index 08e47a5d3db7c94ab3b27460db1e24ca7e54386a..111ba2aeacbad2829c251a8f396ca7d0a7b266c7 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Compte";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Ensemble";
 "global.close" = "Fermer";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Hier";
-"smartlist.results" = "Résultats de la recherche";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Recherche de disponibilité...";
 "smartlist.noResults" = "Aucun résultat";
 "smartlist.noConversation" = "Aucune conversation";
 "smartlist.searchBarPlaceholder" = "Entrer un nom...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Pas d'accès au réseau";
 "smartlist.cellularAccess" = "Soyez certain que l'accès au mobile est autorisé par vos paramètres";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajouter un compte";
 "smartlist.noNumber" = "Le contact sélectionné n'a pas de numéro";
 "smartlist.selectOneNumber" = "Choisir un des numéros";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Écrire un message à ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Partage de position en temps réel";
 
 //General Settings
-"generalSettings.title" = "Paramètres généraux";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Activer l'accélération vidéo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/gl.lproj/Localizable.strings b/Ring/Ring/Resources/gl.lproj/Localizable.strings
index e30a38d85d59ef64adab77a04c6bfaa3fffea3bd..ba67e4983559f40ad9521c43b8d832d292e5a96b 100644
--- a/Ring/Ring/Resources/gl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gl.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversas";
-"global.contactRequestsTabBarTitle" = "Convites";
-"global.meTabBarTitle" = "Conta";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Onte";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversas";
 "smartlist.searching" = "Buscando...";
 "smartlist.noResults" = "Sen resultados";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sen conexión a rede";
 "smartlist.cellularAccess" = "Asegúrate de que nos axustes tes permiso de acceso a rede";
 "smartlist.accountsTitle" = "Contas";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Axustes xerais";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index 42f2b41203c7a2ca63e2e794e46eecdebbecd52f..e3e2f20c45c9518926d1e4fb109df870c5577754 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "דיונים";
-"global.contactRequestsTabBarTitle" = "הזמנות";
-"global.meTabBarTitle" = "חשבון";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "אישור";
 "global.versionName" = "יחד";
 "global.close" = "סגירה";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "אתמול";
-"smartlist.results" = "תוצאת חיפוש";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "דיונים";
 "smartlist.searching" = "חפש...";
 "smartlist.noResults" = "אין תוצאות";
 "smartlist.noConversation" = "אין דיונים";
 "smartlist.searchBarPlaceholder" = "יש להזין שם...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "אין חיבור לרשת";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "חשבונות";
 "smartlist.addAccountButton" = "+ הוספת חשבון";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
index 30e50283d2b611da90d4ca79b33695c606efcbb2..abe6b881595220c73ea803ecf9dab3f953d9a71b 100644
--- a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "खाता";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "बंद करे";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "नेटवर्क संपर्क नही है";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "खाते";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/hi.lproj/Localizable.strings b/Ring/Ring/Resources/hi.lproj/Localizable.strings
index 213365e2492dd68af6a05750da2d9968f1989251..2dc5ec438ad483930c5a303b8b8f12c661ade215 100644
--- a/Ring/Ring/Resources/hi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "कोई नेटवर्क कनेक्टिविटी नहीं";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/hr.lproj/Localizable.strings b/Ring/Ring/Resources/hr.lproj/Localizable.strings
index d4264ec179ca976825b87492a78869e8e0d1d4e0..ded28df29384647d2b03d18996e7324a1547f606 100644
--- a/Ring/Ring/Resources/hr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Razgovori";
-"global.contactRequestsTabBarTitle" = "Pozivi";
-"global.meTabBarTitle" = "Račun";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "U redu";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Jučer";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Razgovori";
 "smartlist.searching" = "Tražim...";
 "smartlist.noResults" = "Nema rezultata";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Veza nedostupna";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Računi";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/hu.lproj/Localizable.strings b/Ring/Ring/Resources/hu.lproj/Localizable.strings
index 866a487a5bc2edcf301216816570728422d2bad7..b6e7deb280c0e2ed705f7b967796dffe53952240 100644
--- a/Ring/Ring/Resources/hu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hu.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Beszélgetések";
-"global.contactRequestsTabBarTitle" = "Meghívások";
-"global.meTabBarTitle" = "Fiók";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Rendben";
 "global.versionName" = "Együtt";
 "global.close" = "Bezárás";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Tegnap";
-"smartlist.results" = "Keresési eredmény";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Beszélgetések";
 "smartlist.searching" = "Keresés…";
 "smartlist.noResults" = "Nincs eredmény";
 "smartlist.noConversation" = "Beszélgetés nem található";
 "smartlist.searchBarPlaceholder" = "Név megadása…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Nincs hálózati csatlakozás";
 "smartlist.cellularAccess" = "Győződjön meg róla, hogy a mobilhálózati hozzáférést a beállításai biztosítják";
 "smartlist.accountsTitle" = "Fiókok";
 "smartlist.addAccountButton" = "+ Fiók hozzáadása";
 "smartlist.noNumber" = "A kiválasztott kapcsolatnak nincs SIP-száma";
 "smartlist.selectOneNumber" = "Válasszon egy számot";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Üzenet írása következőknek:";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Valós idejű hely megosztása";
 
 //General Settings
-"generalSettings.title" = "Általános beállítások";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Videó gyorsítás engedélyezése";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/id.lproj/Localizable.strings b/Ring/Ring/Resources/id.lproj/Localizable.strings
index b15365e8241e0796aa2bf478263b12298bbe02c7..2938ee31c94c0d316b06d121405a2ce016ac5ad9 100644
--- a/Ring/Ring/Resources/id.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/id.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Akun";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Kemarin";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Tidak ada jaringan internet";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "Tentang Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
index 539738e6a35078cb527aabc982646be7edfe1376..785ff54d053fa0b8b1d2f29a68043e485d42ca11 100644
--- a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversazioni";
-"global.contactRequestsTabBarTitle" = "Inviti";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Chiudi";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ieri";
-"smartlist.results" = "Risultati ricerca";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversazioni";
 "smartlist.searching" = "Ricerca in corso…";
 "smartlist.noResults" = "Nessun risultato";
 "smartlist.noConversation" = "Nessuna conversazione";
 "smartlist.searchBarPlaceholder" = "Inserisci nome…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Assenza di connessione di rete";
 "smartlist.cellularAccess" = "Assicurati che l'accesso cellulare sia garantito nelle tue impostazioni";
 "smartlist.accountsTitle" = "Account";
 "smartlist.addAccountButton" = "+ Aggiungi account";
 "smartlist.noNumber" = "Il contatto selezionato non ha nessun numero";
 "smartlist.selectOneNumber" = "Seleziona uno dei numeri";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Scrivi a";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Condivisione della posizione in tempo reale";
 
 //General Settings
-"generalSettings.title" = "Impostazioni generali";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Attiva l'accelerazione video";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index 4a7b71cf6b904634a7c175096a18b1e650548626..96f8ace5a8ec0a75b431998ef001cfd6c4a96571 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversazioni";
-"global.contactRequestsTabBarTitle" = "inviti";
-"global.meTabBarTitle" = "Profilo";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Chiudi";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ieri";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversazioni";
 "smartlist.searching" = "Ricerca...";
 "smartlist.noResults" = "Nessun risultato";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Connessione di rete assente";
 "smartlist.cellularAccess" = "Assicurati che l'accesso cellulare sia garantito nelle tue impostazioni";
 "smartlist.accountsTitle" = "Account";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Scrivi a";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Impostazioni generali";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index 775ee80de7e33594f96fa49182d196cab7136140..483c280d6f6e9c6eacf1d0a9efe404bbdb9d32ed 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "会話";
-"global.contactRequestsTabBarTitle" = "招待";
-"global.meTabBarTitle" = "アカウント";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "閉じる";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "昨日";
-"smartlist.results" = "検索結果";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "会話";
 "smartlist.searching" = "検索中...";
 "smartlist.noResults" = "検索結果はありません";
 "smartlist.noConversation" = "会話はありません";
 "smartlist.searchBarPlaceholder" = "名前を入力...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "ネットワーク接続がありません";
 "smartlist.cellularAccess" = "設定から写真へのアクセスが許可されていることを確認してください";
 "smartlist.accountsTitle" = "アカウント";
 "smartlist.addAccountButton" = "+ アカウントを追加";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "一般設定";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
index 5dbd95edeb995bd4a59daa7c0ea99c31b97944e7..805d575d7cdf40d351dbac00da0020f0f4707dd4 100644
--- a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "대화";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "계정";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "확인";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "대화";
 "smartlist.searching" = "검색 중...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/lt.lproj/Localizable.strings b/Ring/Ring/Resources/lt.lproj/Localizable.strings
index 04890f7e7af862ec8dc8c3f06f31243769ed601f..78e6de37f0bb4c6cc2e18f7aca356eff5de30386 100644
--- a/Ring/Ring/Resources/lt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/lt.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Pokalbiai";
-"global.contactRequestsTabBarTitle" = "Pakvietimai";
-"global.meTabBarTitle" = "Paskyra";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Gerai";
 "global.versionName" = "Together";
 "global.close" = "Užverti";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Vakar";
-"smartlist.results" = "Paieškos rezultatas";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Pokalbiai";
 "smartlist.searching" = "Ieškoma...";
 "smartlist.noResults" = "Jokių rezultatų";
 "smartlist.noConversation" = "Pokalbių nėra";
 "smartlist.searchBarPlaceholder" = "Įveskite vardą...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Nėra tinklo ryšio";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Paskyros";
 "smartlist.addAccountButton" = "+ Pridėti paskyrą";
 "smartlist.noNumber" = "Pasirinktas adresatas neturi numerio";
 "smartlist.selectOneNumber" = "Pasirinkite vieną iš numerių";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Bendri nustatymai";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Įjungti vaizdo spartinimą";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/ms.lproj/Localizable.strings b/Ring/Ring/Resources/ms.lproj/Localizable.strings
index 18cec647a1a3235987cd005857efbd4a5610a0c8..f6c1182f953fe549bc968e7327f9c7c4906bd3ea 100644
--- a/Ring/Ring/Resources/ms.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ms.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Akaun";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Semalam";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Tiada sambungan rangkaian";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Akaun";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index 73d8189cd7cd9231f39deeec0174b92d0673b4cf..31cc4e17bde0dad9b583e4658fd3c7adf523f48a 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Samtaler";
-"global.contactRequestsTabBarTitle" = "Invitasjoner";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Sammen";
 "global.close" = "Lukk";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Igår";
-"smartlist.results" = "Søkeresultat";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Samtaler";
 "smartlist.searching" = "Søker…";
 "smartlist.noResults" = "Ingen resultater";
 "smartlist.noConversation" = "Ingen samtaler";
 "smartlist.searchBarPlaceholder" = "Tast inn navn...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Mangler nettverksforbindelse";
 "smartlist.cellularAccess" = "Forsikre deg om at telefonnettverkstilgang er innvilget i dine innstillinger";
 "smartlist.accountsTitle" = "Kontoer";
 "smartlist.addAccountButton" = "+ Opprett konto";
 "smartlist.noNumber" = "Valgt kontakt har ikke et nummer";
 "smartlist.selectOneNumber" = "Velg et av nummerne";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live posisjonsdeling";
 
 //General Settings
-"generalSettings.title" = "Generelle innstillinger";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Aktiv videoaksellerering";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings b/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings
index 4f0de67640182b2db1233a5efacb27e541a9d663..d9d7c5fa51772c88482b759d2fb1e67a80a7568d 100644
--- a/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Geen netwerkverbinding";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Uitgebreide instellingen";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/nl.lproj/Localizable.strings b/Ring/Ring/Resources/nl.lproj/Localizable.strings
index f580db85f915bf3175a03cb7a05c6e4786616e3e..1e0de13096fae6bb835cf27b713318459f23d9f1 100644
--- a/Ring/Ring/Resources/nl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Gesprekken";
-"global.contactRequestsTabBarTitle" = "Uitnodigingen";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Oké";
 "global.versionName" = "Together";
 "global.close" = "Sluiten";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Gisteren";
-"smartlist.results" = "Zoekresultaat";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Gesprekken";
 "smartlist.searching" = "Zoeken…";
 "smartlist.noResults" = "Geen resultaten";
 "smartlist.noConversation" = "Geen gesprekken";
 "smartlist.searchBarPlaceholder" = "Voer naam in…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Geen netwerkverbinding";
 "smartlist.cellularAccess" = "Zorg dat u toegang tot het mobiele netwerk toegestaan heeft in uw instellingen";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Account toevoegen";
 "smartlist.noNumber" = "Het geselecteerde contact heeft geen nummer";
 "smartlist.selectOneNumber" = "Kies één van de nummers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Algemene instellingen";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Videoversnelling inschakelen";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings b/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
index b58a225b3ac4042392f1eea79f1bef8e2c01886d..b112705436f450e459a5d11b5395ed181476f672 100644
--- a/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Gesprekken";
-"global.contactRequestsTabBarTitle" = "Uitnodigingen";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Oké";
 "global.versionName" = "Together";
 "global.close" = "Sluiten";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Gisteren";
-"smartlist.results" = "Zoekresultaat";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Gesprekken";
 "smartlist.searching" = "Zoeken…";
 "smartlist.noResults" = "Geen resultaten";
 "smartlist.noConversation" = "Geen gesprekken";
 "smartlist.searchBarPlaceholder" = "Geef naam in…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Geen netwerkverbinding";
 "smartlist.cellularAccess" = "Zorg dat u toegang tot het mobiele netwerk toegestaan heeft in uw instellingen";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Account toevoegen";
 "smartlist.noNumber" = "Het geselecteerde contact heeft geen nummer";
 "smartlist.selectOneNumber" = "Kies één van de nummers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Algemene instellingen";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Videoversnelling inschakelen";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/oc.lproj/Localizable.strings b/Ring/Ring/Resources/oc.lproj/Localizable.strings
index 5fb87dbdcd4e5f30f1a4a13fb10b5b6dba96e4e4..0aed0e3ac5b68c63e15b17e2ba73641ca080f69e 100644
--- a/Ring/Ring/Resources/oc.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/oc.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Discutidas";
-"global.contactRequestsTabBarTitle" = "Invitacions";
-"global.meTabBarTitle" = "Compte";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "D’acòrdi";
 "global.versionName" = "Together";
 "global.close" = "Tampar";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ièr";
-"smartlist.results" = "Resultat de recèrca";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Discutidas";
 "smartlist.searching" = "Recèrca…";
 "smartlist.noResults" = "Pas cap de recèrca";
 "smartlist.noConversation" = "Cap de conversacion";
 "smartlist.searchBarPlaceholder" = "Picatz un nom…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Cap de connectivitat ret";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Comptes";
 "smartlist.addAccountButton" = "+ Ajustar compte";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitacions";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "A prepaus de Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Paramètres generals";
+"generalSettings.title" = "Paramètres avançats";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index 8462bf9cdc7a2796715230d5e93d899388cc4cb5..c5fc54347e9fe423751ae2b6349fdd9d2dbd3735 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "ਗੱਲਾਂਬਾਤਾਂ";
-"global.contactRequestsTabBarTitle" = "ਸੱਦੇ";
-"global.meTabBarTitle" = "ਖਾਤਾ";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "ਠੀਕ ਹੈ";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "ਕੱਲ੍ਹ";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "ਗੱਲਾਂਬਾਤਾਂ";
 "smartlist.searching" = "ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ...";
 "smartlist.noResults" = "ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "ਕੋਈ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ";
 "smartlist.cellularAccess" = "ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਆਪਣੀਆਂ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਸੈਲਿਊਲਰ ਪਹੁੰਚ ਦਿੱਤੀ ਹੋਵੇ";
 "smartlist.accountsTitle" = "ਖਾਤੇ";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/pl.lproj/Localizable.strings b/Ring/Ring/Resources/pl.lproj/Localizable.strings
index 74cb289be468f7ae901741a2a0a09b4fbbf2cf6d..f531f35af74a980936f422e6ca535cb89edf0efb 100644
--- a/Ring/Ring/Resources/pl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Rozmowy";
-"global.contactRequestsTabBarTitle" = "Zaproszenia";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Ustawienia Konta";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Zamknij";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Wczoraj";
-"smartlist.results" = "Wynik wyszukiwania";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Rozmowy";
 "smartlist.searching" = "Szukam...";
 "smartlist.noResults" = "Brak rezultatów";
 "smartlist.noConversation" = "Brak konwersacji";
 "smartlist.searchBarPlaceholder" = "Wprowadź nazwę...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "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" = "+ Dodaj Konto";
 "smartlist.noNumber" = "Zaznaczony kontakt nie ma żadnego numeru";
 "smartlist.selectOneNumber" = "Wybierz jeden z numerów";
+"smartlist.invitations" = "Zaproszenia";
+"smartlist.accountSettings" = "Ustawienia Konta";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "O Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Ogólne ustawienia";
+"generalSettings.title" = "Ustawienia zaawansowane";
 "generalSettings.videoAcceleration" = "Włącz przyspieszenie video";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
index 9ada1e5873445d36202288802af77ad6cafd3387..4c868173acdb7346c9b06c3b4398c71d9c9fe720 100644
--- a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Rozmowy";
-"global.contactRequestsTabBarTitle" = "Zaproszenia";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Zamknij";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Wczoraj";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Rozmowy";
 "smartlist.searching" = "Szukam...";
 "smartlist.noResults" = "Brak rezultatów";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "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.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Ogólne ustawienia";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index 1cfb952630b0e8af15727d018d262a806ffb4ca1..365f2e9f07a9f69359576dd8bc5b3effe76a026a 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -20,15 +20,14 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversas";
-"global.contactRequestsTabBarTitle" = "Convites";
-"global.meTabBarTitle" = "Conta";
+"global.meTabBarTitle" = "Configurações da Conta";
 "global.ok" = "Ok";
 "global.versionName" = "Juntos";
 "global.close" = "Fechar";
 "global.share" = "Compartilhar";
-"global.forward" = "Forward";
+"global.forward" = "Encaminhar";
 "global.save" = "Salvar";
-"global.resend" = "Resend";
+"global.resend" = "Reenviar";
 "global.preview" = "Pré-visualização";
 
 // Scan
@@ -37,24 +36,29 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ontem";
-"smartlist.results" = "Resultado da Busca";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversas";
 "smartlist.searching" = "Buscando...";
 "smartlist.noResults" = "Nenhum resultado";
 "smartlist.noConversation" = "Nenhuma conversa";
 "smartlist.searchBarPlaceholder" = "Insira o nome...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sem conectividade";
 "smartlist.cellularAccess" = "Verifique se o acesso via celular está autorizado em suas configurações";
 "smartlist.accountsTitle" = "Contas";
 "smartlist.addAccountButton" = "+ Adicionar uma conta";
 "smartlist.noNumber" = "O contato selecionado não tem nenhum número";
 "smartlist.selectOneNumber" = "Selecione um dos números";
+"smartlist.invitations" = "Convites";
+"smartlist.accountSettings" = "Configurações da Conta";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "Sobre Jami";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write message to ";
+"conversation.messagePlaceholder" = "Escrever mensagem para";
 "conversation.explanationSendingLocationTo" = "Atualmente você está compartilhando sua localização com";
 "conversation.explanationReceivingLocationFrom" = "Você está recebendo atualmente uma localização real de";
-"conversation.errorSavingImage" = "Failed to save image to galery";
+"conversation.errorSavingImage" = "Falha ao salvar a imagem na galeria";
 
 //Invitations
 "invitations.noInvitations" = "Sem convites";
@@ -88,7 +92,7 @@
 "createAccount.lookingForUsernameAvailability" = "buscando disponibilidade...";
 "createAccount.invalidUsername" = "nome de usuário inválido";
 "createAccount.usernameAlreadyTaken" = "nome de usuário já existente";
-"createAccount.usernameValid" = "username is available";
+"createAccount.usernameValid" = "Nome de usuário está disponível";
 "createAccount.loading" = "Carregando";
 "createAccount.waitCreateAccountTitle" = "Adicionando conta";
 "createAccount.RegisterAUsername" = "Registre um nome de usuário";
@@ -185,10 +189,10 @@
 "calls.haghUp" = "desligar";
 "calls.maximize" = "maximizar";
 "calls.minimize" = "minimizar";
-"calls.setModerator" = "set moderator";
-"calls.removeModerator" = "unset moderator";
-"calls.muteAudio" = "mute audio";
-"calls.unmuteAudio" = "unmute audio";
+"calls.setModerator" = "Definir moderador";
+"calls.removeModerator" = "Moderador não definido";
+"calls.muteAudio" = "Desligar áudio";
+"calls.unmuteAudio" = "Ligar áudio";
 
 //Account Page
 "accountPage.devicesListHeader" = "Dispositivos";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Compartilhamento de localização atual";
 
 //General Settings
-"generalSettings.title" = "Configurações gerais";
+"generalSettings.title" = "Configurações avançadas";
 "generalSettings.videoAcceleration" = "Ativar a aceleração de vídeo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/pt.lproj/Localizable.strings b/Ring/Ring/Resources/pt.lproj/Localizable.strings
index 3a8b65cf8f117115606f603e7b6a8087a3b3cea4..b5d42866e668dcffe7c3fd0ada346f22488c2af6 100644
--- a/Ring/Ring/Resources/pt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversas";
-"global.contactRequestsTabBarTitle" = "Convites";
-"global.meTabBarTitle" = "Conta";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "Fechar";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ontem";
-"smartlist.results" = "Resultado da Pesquisa";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversas";
 "smartlist.searching" = "A pesquisar...";
 "smartlist.noResults" = "Nenhum resultado";
 "smartlist.noConversation" = "Sem conversações";
 "smartlist.searchBarPlaceholder" = "Introduza o nome...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sem conectividade à rede";
 "smartlist.cellularAccess" = "Verifique se o acesso via telemóvel está autorizado nas suas configurações";
 "smartlist.accountsTitle" = "Contas";
 "smartlist.addAccountButton" = "+ Adicionar conta";
 "smartlist.noNumber" = "O contacto selecionado não tem um número";
 "smartlist.selectOneNumber" = "Selecione um dos números";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Configurações gerais";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Ativar aceleração de vídeo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
index 4616a1c1b2beaa8448f4e072fa0dce12ff7bb042..1a7d2fcfea905d985335b5c81d560d908224ec7c 100644
--- a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversas";
-"global.contactRequestsTabBarTitle" = "Convites";
-"global.meTabBarTitle" = "Conta";
+"global.meTabBarTitle" = "Configurações da Conta";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "Fechar";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ontem";
-"smartlist.results" = "Resultado da Pesquisa";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversas";
 "smartlist.searching" = "A pesquisar...";
 "smartlist.noResults" = "Nenhum resultado";
 "smartlist.noConversation" = "Sem conversações";
 "smartlist.searchBarPlaceholder" = "Introduza o nome...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Sem conectividade à rede";
 "smartlist.cellularAccess" = "Verifique se o acesso via telemóvel está autorizado nas suas configurações";
 "smartlist.accountsTitle" = "Contas";
 "smartlist.addAccountButton" = "+ Adicionar conta";
 "smartlist.noNumber" = "O contacto selecionado não tem um número";
 "smartlist.selectOneNumber" = "Selecione um dos números";
+"smartlist.invitations" = "Convites";
+"smartlist.accountSettings" = "Configurações da Conta";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "Sobre o Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Configurações gerais";
+"generalSettings.title" = "Configurações avançadas";
 "generalSettings.videoAcceleration" = "Ativar aceleração de vídeo";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index f18fbb61addec1b3b6957fa70ac95c2872d7a967..cfda46811b031ba5fcd65c636e0dc47962a486c7 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversații";
-"global.contactRequestsTabBarTitle" = "Invitații";
-"global.meTabBarTitle" = "Cont";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Împreună";
 "global.close" = "Închide";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Ieri";
-"smartlist.results" = "Rezultatele căutării";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversații";
 "smartlist.searching" = "Căutare...";
 "smartlist.noResults" = "Niciun rezultat";
 "smartlist.noConversation" = "Nicio conversație";
 "smartlist.searchBarPlaceholder" = "Introdu numele...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Nicio legătură la rețea";
 "smartlist.cellularAccess" = "Asigură-te că accesul la rețea este permis în reglările tale";
 "smartlist.accountsTitle" = "Conturi";
 "smartlist.addAccountButton" = "+ Adaugă un cont";
 "smartlist.noNumber" = "Contactul ales nu are niciun număr";
 "smartlist.selectOneNumber" = "Alege unul dintre numere";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Scrie pentru";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Distribuirea poziției în direct";
 
 //General Settings
-"generalSettings.title" = "Reglări generale";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Activează accelerarea video";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index f34eee08d4f5c59e07f5bc95225f25c18f6baa38..6c9f0f111c3c2fd3099250356549bad468ef4adf 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Разговоры";
-"global.contactRequestsTabBarTitle" = "Приглашения";
-"global.meTabBarTitle" = "Учётная запись";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Да";
 "global.versionName" = "Together";
 "global.close" = "Закрыть";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Вчера";
-"smartlist.results" = "Результаты поиска";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Разговоры";
 "smartlist.searching" = "Поиск...";
 "smartlist.noResults" = "Нет результатов";
 "smartlist.noConversation" = "Нет разговоров";
 "smartlist.searchBarPlaceholder" = "Введите имя...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Отсутствует сетевое подключение";
 "smartlist.cellularAccess" = "Убедитесь, что сотовый доступ предоставляется в настройках";
 "smartlist.accountsTitle" = "Учетные записи";
 "smartlist.addAccountButton" = "+ Добавить аккаунт";
 "smartlist.noNumber" = "Выбранный контакт не имеет номера";
 "smartlist.selectOneNumber" = "Выберите один из номеров";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Основные настройки";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index 21fe95e6e5bbe16dc341938f1812fcd32c04faa3..fe93ea214c215dfe8f6ac55d813f19da6c8b86f5 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Разговоры";
-"global.contactRequestsTabBarTitle" = "Приглашения";
-"global.meTabBarTitle" = "Аккаунт";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Вместе";
 "global.close" = "Закрыть";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Вчера";
-"smartlist.results" = "Результаты поиска";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Разговоры";
 "smartlist.searching" = "Поиск…";
 "smartlist.noResults" = "Нет результатов";
 "smartlist.noConversation" = "Нет разговоров";
 "smartlist.searchBarPlaceholder" = "Введите имя...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Нет подключения к сети";
 "smartlist.cellularAccess" = "Убедитесь, что доступ через сеть сотовой связи разрешен";
 "smartlist.accountsTitle" = "Аккаунты";
 "smartlist.addAccountButton" = "+ Добавить аккаунт";
 "smartlist.noNumber" = "Выбранный контакт не имеет никакого номера";
 "smartlist.selectOneNumber" = "Выберите один из номеров";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Совместное использование местоположения в реальном времени";
 
 //General Settings
-"generalSettings.title" = "Основные настройки";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Разрешить видео-ускорение";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index 0e89ed0ef86816caa47d85851e504620ea561822..e9eb206c9ed3b70798551f24299d15b8677248c3 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Konverzácie";
-"global.contactRequestsTabBarTitle" = "Pozvánky";
-"global.meTabBarTitle" = "Účet";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "Zavrieť";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Včera";
-"smartlist.results" = "Výsledky vyhľadávania";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Konverzácie";
 "smartlist.searching" = "Hľadanie...";
 "smartlist.noResults" = "Žiadne výsledky";
 "smartlist.noConversation" = "Žiadne konverzácie";
 "smartlist.searchBarPlaceholder" = "Zadajte meno...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Žiadne sieťové pripojenie";
 "smartlist.cellularAccess" = "Uistite, že v nastaveniach je povolený prístup k mobilnej sieti";
 "smartlist.accountsTitle" = "Účty";
 "smartlist.addAccountButton" = "+ Pridať účet";
 "smartlist.noNumber" = "Vybraný kontakt nemá žiadne číslo";
 "smartlist.selectOneNumber" = "Vyberte jedno z čísel";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Všeobecné nastavenia";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Povoliť akceleráciu videa";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/sl.lproj/Localizable.strings b/Ring/Ring/Resources/sl.lproj/Localizable.strings
index c23c4da308171f3d74a65cdb88a31948b4abf674..e4fd26771a867cd3aa49a2d5faefe161aac20ee8 100644
--- a/Ring/Ring/Resources/sl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sl.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Pogovori";
-"global.contactRequestsTabBarTitle" = "Povabila";
-"global.meTabBarTitle" = "Račun";
+"global.meTabBarTitle" = "Nastavitve računa";
 "global.ok" = "V redu";
 "global.versionName" = "Skupaj";
 "global.close" = "Zapri";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Včeraj";
-"smartlist.results" = "Rezultati iskanja";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Pogovori";
 "smartlist.searching" = "Iščem...";
 "smartlist.noResults" = "ni rezultata";
 "smartlist.noConversation" = "Ni pogovorov";
 "smartlist.searchBarPlaceholder" = "Vnesite ime...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Ni omrežne povezave";
 "smartlist.cellularAccess" = "Prepričajte se, da je v nastavitvah dovoljen dostop do mobilnega omrežja";
 "smartlist.accountsTitle" = "Računi";
 "smartlist.addAccountButton" = "+ Dodaj račun";
 "smartlist.noNumber" = "Izbrani stiki nimajo številke";
 "smartlist.selectOneNumber" = "Izberi eno od številk";
+"smartlist.invitations" = "Povabila";
+"smartlist.accountSettings" = "Nastavitve računa";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "O Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Deljenje lokacije v živo";
 
 //General Settings
-"generalSettings.title" = "Splošne nastavitve";
+"generalSettings.title" = "Napredne nastavitve";
 "generalSettings.videoAcceleration" = "Vklopi strojno pospeševanje videa";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index f05c01725fef98ff63776fe4f3417573eedbc5ed..f2f55c243caef59f0885195e8c0b1e424c14bb15 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Biseda";
-"global.contactRequestsTabBarTitle" = "Ftesa";
-"global.meTabBarTitle" = "Llogari";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Tok";
 "global.close" = "Mbylle";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Dje";
-"smartlist.results" = "Përfundime Kërkimi";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Biseda";
 "smartlist.searching" = "Po kërkohet…";
 "smartlist.noResults" = "S’ka përfundime";
 "smartlist.noConversation" = "S’ka biseda";
 "smartlist.searchBarPlaceholder" = "Jepni emrin…";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Pa lidhje në rrjet";
 "smartlist.cellularAccess" = "Sigurohuni qe te rregullimet tuaja i është dhënë hyrje te celulari";
 "smartlist.accountsTitle" = "Llogari";
 "smartlist.addAccountButton" = "+ Shtoni Llogari";
 "smartlist.noNumber" = "Kontakti i përzgjedhur s’ka ndonjë numër";
 "smartlist.selectOneNumber" = "Përzgjidhni një nga numrat";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Shkruani mesazh për";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Dhënie “live” e vendndodhjes";
 
 //General Settings
-"generalSettings.title" = "Rregullime të përgjithshme";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Aktivizo përshpejtim videosh";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/sr_RS.lproj/Localizable.strings b/Ring/Ring/Resources/sr_RS.lproj/Localizable.strings
index bd154763109fab781b895ae3efc564798abc4ad9..a2c672ac516f21c8c03a593ad8918845aa9727e2 100644
--- a/Ring/Ring/Resources/sr_RS.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr_RS.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Konverzacija";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Nalog";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Konverzacija";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Nema internet konekcije";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Nalozi";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/sv.lproj/Localizable.strings b/Ring/Ring/Resources/sv.lproj/Localizable.strings
index 74bda29726571f16b80d209f2ad71a15d0955fc0..17db3cbfa3f28877bdf4dcfd66c1208eac7ff0ce 100644
--- a/Ring/Ring/Resources/sv.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sv.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Konversationer";
-"global.contactRequestsTabBarTitle" = "Inbjudningar";
-"global.meTabBarTitle" = "Konto";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "OK";
 "global.versionName" = "Together";
 "global.close" = "Stäng";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "I går";
-"smartlist.results" = "Sökresultat";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Konversationer";
 "smartlist.searching" = "Söker...";
 "smartlist.noResults" = "Inget resultat";
 "smartlist.noConversation" = "Inga konversationer";
 "smartlist.searchBarPlaceholder" = "Ange namn...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Ingen nätverksanslutning";
 "smartlist.cellularAccess" = "Tillse att mobilnätsåtkomst tillåts i dina inställningar";
 "smartlist.accountsTitle" = "Konton";
 "smartlist.addAccountButton" = "+ Lägg till konto";
 "smartlist.noNumber" = "Den valda kontakten har inget nummer";
 "smartlist.selectOneNumber" = "Välj ett nummer";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "Allmänna inställningar";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Aktivera videoacceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/tr.lproj/Localizable.strings b/Ring/Ring/Resources/tr.lproj/Localizable.strings
index 2486054c703cb9c5c957ed510b9824752ee507a8..c31da44be0f5ff19879b2480632ba7212590d9a0 100644
--- a/Ring/Ring/Resources/tr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Konuşmalar";
-"global.contactRequestsTabBarTitle" = "Davetiyeler";
-"global.meTabBarTitle" = "Hesap";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Tamam";
 "global.versionName" = "Birlikte";
 "global.close" = "Kapat";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Dün";
-"smartlist.results" = "Arama Sonucu";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Konuşmalar";
 "smartlist.searching" = "Arama yapılıyor...";
 "smartlist.noResults" = "Sonuç yok";
 "smartlist.noConversation" = "Konuşma yok";
 "smartlist.searchBarPlaceholder" = "Ad girin...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Ağ bağlantısı yok";
 "smartlist.cellularAccess" = "Ayarlarınızda hücresel erişim izni olduğundan emin olun.";
 "smartlist.accountsTitle" = "Hesaplar";
 "smartlist.addAccountButton" = "+ Hesap Ekle";
 "smartlist.noNumber" = "Seçilen kişinin numarası yok";
 "smartlist.selectOneNumber" = "Numaralardan birini seçin";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Şuna ileti yaz:";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Canlı konum paylaşımı";
 
 //General Settings
-"generalSettings.title" = "Genel ayarlar";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Görüntü hızlandırmayı etkinleştir";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/uk.lproj/Localizable.strings b/Ring/Ring/Resources/uk.lproj/Localizable.strings
index 9445f6cf116912f0cbc81d73275a3aad54e250f3..3fa5bc14fcc6ffe73e7275f808cb3d4497ee2a47 100644
--- a/Ring/Ring/Resources/uk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/uk.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Групові чати";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Аккаунт";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ок";
 "global.versionName" = "Together";
 "global.close" = "Закрити";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Вчора";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Групові чати";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "Відсутнє з’єднання з мережею";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Облікові записи";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/vi.lproj/Localizable.strings b/Ring/Ring/Resources/vi.lproj/Localizable.strings
index 0da4ec19afe480c6e12848ac550deeb47b6e604a..a2d57731ea0a70cd50cdaab0e44c0bcb75bf4513 100644
--- a/Ring/Ring/Resources/vi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/vi.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "Conversations";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "Account";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "Ok";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "Conversations";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "Accounts";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index 04b21b8906123fe3dbadc1fa5f398f2bd5b98629..30bd186dc7f6144f4c669175d2b70d9a34472504 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "会话";
-"global.contactRequestsTabBarTitle" = "邀请";
-"global.meTabBarTitle" = "账户";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "确定";
 "global.versionName" = "一起";
 "global.close" = "关闭";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "昨天";
-"smartlist.results" = "搜索结果";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "会话";
 "smartlist.searching" = "正在搜索…";
 "smartlist.noResults" = "无结果";
 "smartlist.noConversation" = "没有会话";
 "smartlist.searchBarPlaceholder" = "输入名字";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "无网络连接";
 "smartlist.cellularAccess" = "请确保蜂窝移动网络权限已开启";
 "smartlist.accountsTitle" = "账户";
 "smartlist.addAccountButton" = "+ 添加账户";
 "smartlist.noNumber" = "选定的连接没有任何数字";
 "smartlist.selectOneNumber" = "选择这些数字中的一个";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "实时位置分享";
 
 //General Settings
-"generalSettings.title" = "常规设置";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "启用视频加速";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index c4a73a7e7658d7d07caa9c863fbff49f8f451caf..ab19e76b3a620437aeebb4defeb90928c97fb4f2 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "對話";
-"global.contactRequestsTabBarTitle" = "邀請";
-"global.meTabBarTitle" = "帳號";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "確定";
 "global.versionName" = "一起";
 "global.close" = "關閉";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "昨天";
-"smartlist.results" = "搜尋結果";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "對話";
 "smartlist.searching" = "正在搜尋...";
 "smartlist.noResults" = "沒有結果";
 "smartlist.noConversation" = "沒有對話";
 "smartlist.searchBarPlaceholder" = "輸入名字……";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "沒有網路連接";
 "smartlist.cellularAccess" = "確定在您的設定中已授權使用行動通訊";
 "smartlist.accountsTitle" = "帳號";
 "smartlist.addAccountButton" = "+ 新增帳號";
 "smartlist.noNumber" = "選定的連絡人沒有任何號碼";
 "smartlist.selectOneNumber" = "選取其中一個號碼";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "編寫訊息給";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "即時位置分享";
 
 //General Settings
-"generalSettings.title" = "一般設定";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "啟用視訊加速";
 
 //Migrate Account
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index 214df5bcfc2b4aecbf0578615d2e4d03decc4b8a..7c911afa1ea94df6627452234bedfe8434d7166c 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -20,8 +20,7 @@
 
 // Global
 "global.homeTabBarTitle" = "對話";
-"global.contactRequestsTabBarTitle" = "Invitations";
-"global.meTabBarTitle" = "帳號";
+"global.meTabBarTitle" = "Account Settings";
 "global.ok" = "確定";
 "global.versionName" = "Together";
 "global.close" = "Close";
@@ -37,18 +36,23 @@
 
 // Smartlist
 "smartlist.yesterday" = "Yesterday";
-"smartlist.results" = "Search Result";
+"smartlist.results" = "Public Directory";
 "smartlist.conversations" = "對話";
 "smartlist.searching" = "Searching...";
 "smartlist.noResults" = "No results";
 "smartlist.noConversation" = "No conversations";
 "smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.searchBar" = "Search for new or existing contact...";
 "smartlist.noNetworkConnectivity" = "No network connectivity";
 "smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
 "smartlist.accountsTitle" = "帳號";
 "smartlist.addAccountButton" = "+ Add Account";
 "smartlist.noNumber" = "Selected contact does not have any number";
 "smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.invitations" = "Invitations";
+"smartlist.accountSettings" = "Account Settings";
+"smartlist.advancedSettings" = "Advanced Settings";
+"smartlist.aboutJami" = "About Jami";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write message to ";
@@ -331,7 +335,7 @@
 "generatedMessage.liveLocationSharing" = "Live location sharing";
 
 //General Settings
-"generalSettings.title" = "General settings";
+"generalSettings.title" = "Advanced settings";
 "generalSettings.videoAcceleration" = "Enable video acceleration";
 
 //Migrate Account