diff --git a/syncplay/messages_de.py b/syncplay/messages_de.py
index 726b72c..372f7f2 100755
--- a/syncplay/messages_de.py
+++ b/syncplay/messages_de.py
@@ -16,7 +16,7 @@ de = {
     "connection-failed-notification": "Verbindung zum Server fehlgeschlagen",
     "connected-successful-notification": "Erfolgreich mit Server verbunden",
     "retrying-notification": "%s, versuche erneut in %d Sekunden...",  # Seconds
-    "handshake-successful-notification": "Connection established with {} ({})", # TODO: Translate
+    "reachout-successful-notification": "Successfully reached {} ({})", # TODO: Translate
 
     "rewind-notification": "Zurückgespult wegen Zeitdifferenz mit {}",  # User
     "fastforward-notification": "Vorgespult wegen Zeitdifferenz mit {}",  # User
@@ -484,12 +484,12 @@ de = {
     "editplaylist-menu-label": "Edit playlist",
 
     "open-containing-folder": "Open folder containing this file",
-    "addusersfiletoplaylist-menu-label": "Add {} file to playlist",  # item owner indicator
-    "addusersstreamstoplaylist-menu-label": "Add {} stream to playlist",  # item owner indicator
-    "openusersstream-menu-label": "Open {} stream",  # [username]'s
-    "openusersfile-menu-label": "Open {} file",  # [username]'s
-    "item-is-yours-indicator": "your",  # Goes with addusersfiletoplaylist/addusersstreamstoplaylist
-    "item-is-others-indicator": "{}'s",  # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist
+    "addyourfiletoplaylist-menu-label": "Add your file to playlist",
+    "addotherusersfiletoplaylist-menu-label": "Add {}'s file to playlist",  # [Username]
+    "addyourstreamstoplaylist-menu-label": "Add your stream to playlist",
+    "addotherusersstreamstoplaylist-menu-label": "Add {}' stream to playlist",  # [Username]
+    "openusersstream-menu-label": "Open {}'s stream",  # [username]'s
+    "openusersfile-menu-label": "Open {}'s file",  # [username]'s
 
     "playlist-instruction-item-message": "Drag file here to add it to the shared playlist.",
     "sharedplaylistenabled-tooltip": "Room operators can add files to a synced playlist to make it easy for everyone to watching the same thing. Configure media directories under 'Misc'.",
diff --git a/syncplay/messages_en.py b/syncplay/messages_en.py
index 58bf6d6..e426a9d 100755
--- a/syncplay/messages_en.py
+++ b/syncplay/messages_en.py
@@ -16,7 +16,7 @@ en = {
     "connection-failed-notification": "Connection with server failed",
     "connected-successful-notification": "Successfully connected to server",
     "retrying-notification": "%s, Retrying in %d seconds...",  # Seconds
-    "handshake-successful-notification": "Connection established with {} ({})",
+    "reachout-successful-notification": "Successfully reached {} ({})",
 
     "rewind-notification": "Rewinded due to time difference with {}",  # User
     "fastforward-notification": "Fast-forwarded due to time difference with {}",  # User
@@ -484,12 +484,12 @@ en = {
     "editplaylist-menu-label": "Edit playlist",
 
     "open-containing-folder": "Open folder containing this file",
-    "addusersfiletoplaylist-menu-label": "Add {} file to playlist",  # item owner indicator
-    "addusersstreamstoplaylist-menu-label": "Add {} stream to playlist",  # item owner indicator
-    "openusersstream-menu-label": "Open {} stream",  # [username]'s
-    "openusersfile-menu-label": "Open {} file",  # [username]'s
-    "item-is-yours-indicator": "your",  # Goes with addusersfiletoplaylist/addusersstreamstoplaylist
-    "item-is-others-indicator": "{}'s",  # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist
+    "addyourfiletoplaylist-menu-label": "Add your file to playlist",
+    "addotherusersfiletoplaylist-menu-label": "Add {}'s file to playlist",  # [Username]
+    "addyourstreamstoplaylist-menu-label": "Add your stream to playlist",
+    "addotherusersstreamstoplaylist-menu-label": "Add {}' stream to playlist",  # [Username]
+    "openusersstream-menu-label": "Open {}'s stream",  # [username]'s
+    "openusersfile-menu-label": "Open {}'s file",  # [username]'s
 
     "playlist-instruction-item-message": "Drag file here to add it to the shared playlist.",
     "sharedplaylistenabled-tooltip": "Room operators can add files to a synced playlist to make it easy for everyone to watching the same thing. Configure media directories under 'Misc'.",
diff --git a/syncplay/messages_es.py b/syncplay/messages_es.py
index 2bb16fd..e77fb67 100644
--- a/syncplay/messages_es.py
+++ b/syncplay/messages_es.py
@@ -16,7 +16,7 @@ es = {
     "connection-failed-notification": "La conexión con el servidor falló",
     "connected-successful-notification": "Conectado al servidor exitosamente",
     "retrying-notification": "%s, Reintentando en %d segundos...",  # Seconds
-    "handshake-successful-notification": "Conexión establecida con {} ({})",
+    "reachout-successful-notification": "Conexión establecida con {} ({})",
 
     "rewind-notification": "Rebobinado debido a diferencia de tiempo con {}",  # User
     "fastforward-notification": "Adelantado debido a diferencia de tiempo con {}",  # User
@@ -484,12 +484,12 @@ es = {
     "editplaylist-menu-label": "Editar lista de reproducción",
 
     "open-containing-folder": "Abrir directorio que contiene este archivo",
-    "addusersfiletoplaylist-menu-label": "Agregar archivo {} a la lista de reproducción",  # item owner indicator
-    "addusersstreamstoplaylist-menu-label": "Agregar flujo de datos {} a la lista de reproducción",  # item owner indicator
-    "openusersstream-menu-label": "Abrir flujo de datos {}",  # [username]'s
-    "openusersfile-menu-label": "Abrir archivo {}",  # [username]'s
-    "item-is-yours-indicator": "tu",  # Goes with addusersfiletoplaylist/addusersstreamstoplaylist
-    "item-is-others-indicator": "{}",  # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist
+    "addyourfiletoplaylist-menu-label": "Agregar tu archivo a la lista de reproducción",
+    "addotherusersfiletoplaylist-menu-label": "Agregar el archivo de {} a la lista de reproducción",  # [Username]
+    "addyourstreamstoplaylist-menu-label": "Agregar tu flujo a la lista de reproducción",
+    "addotherusersstreamstoplaylist-menu-label": "Agregar el flujo de {} a la lista de reproducción",  # [Username]
+    "openusersstream-menu-label": "Abrir el flujo de {}",  # [username]'s
+    "openusersfile-menu-label": "Abrir el archivo de {}",  # [username]'s
 
     "playlist-instruction-item-message": "Desplazar aquí el archivo para agregarlo a la lista de reproducción compartida.",
     "sharedplaylistenabled-tooltip": "Los operadores de la sala pueden agregar archivos a una lista de reproducción sincronizada, para que visualizar la misma cosa sea más sencillo para todos. Configurar directorios multimedia en 'Misc'.",
diff --git a/syncplay/messages_it.py b/syncplay/messages_it.py
index f0f5332..b0ba8cc 100755
--- a/syncplay/messages_it.py
+++ b/syncplay/messages_it.py
@@ -16,7 +16,7 @@ it = {
     "connection-failed-notification": "Connessione col server fallita",
     "connected-successful-notification": "Connessione al server effettuata con successo",
     "retrying-notification": "%s, Nuovo tentativo in %d secondi...",  # Seconds
-    "handshake-successful-notification": "Connessione stabilita con {} ({})",
+    "reachout-successful-notification": "Collegamento stabilito con {} ({})",
 
     "rewind-notification": "Riavvolgo a causa della differenza temporale con {}",  # User
     "fastforward-notification": "Avanzamento rapido a causa della differenza temporale con {}",  # User
@@ -484,12 +484,12 @@ it = {
     "editplaylist-menu-label": "Modifica la playlist",
 
     "open-containing-folder": "Apri la cartella contenente questo file",
-    "addusersfiletoplaylist-menu-label": "Aggiungi il file {} alla playlist",  # item owner indicator # TODO needs testing
-    "addusersstreamstoplaylist-menu-label": "Aggiungi l'indirizzo {} alla playlist",  # item owner indicator # TODO needs testing
-    "openusersstream-menu-label": "Apri l'indirizzo di {}",  # [username]'s
-    "openusersfile-menu-label": "Apri il file di {}",  # [username]'s
-    "item-is-yours-indicator": "tuo",  # Goes with addusersfiletoplaylist/addusersstreamstoplaylist # TODO needs testing
-    "item-is-others-indicator": "di {}",  # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist # TODO needs testing
+    "addyourfiletoplaylist-menu-label": "Aggiungi il file tuo alla playlist", # TODO needs testing
+    "addotherusersfiletoplaylist-menu-label": "Aggiungi il file di {} alla playlist", # Username # TODO needs testing
+    "addyourstreamstoplaylist-menu-label": "Aggiungi l'indirizzo tuo alla playlist", # TODO needs testing
+    "addotherusersstreamstoplaylist-menu-label": "Aggiungi l'indirizzo di {} alla playlist", # Username  # item owner indicator # TODO needs testing
+    "openusersstream-menu-label": "Apri l'indirizzo di {}",  # [username] # TODO needs testing
+    "openusersfile-menu-label": "Apri il file di {}",  # [username]'s # TODO needs testing
 
     "playlist-instruction-item-message": "Trascina qui i file per aggiungerli alla playlist condivisa.",
     "sharedplaylistenabled-tooltip": "Gli operatori della stanza possono aggiungere i file a una playlist sincronizzata per garantire che tutti i partecipanti stiano guardando la stessa cosa. Configura le cartelle multimediali alla voce 'Miscellanea'.",
diff --git a/syncplay/messages_ru.py b/syncplay/messages_ru.py
index a02e12d..38728f3 100755
--- a/syncplay/messages_ru.py
+++ b/syncplay/messages_ru.py
@@ -16,7 +16,7 @@ ru = {
     "connection-failed-notification": "Не удалось подключиться к серверу",
     "connected-successful-notification": "Соединение с сервером установлено",
     "retrying-notification": "%s, следующая попытка через %d секунд(ы)...",  # Seconds
-    "handshake-successful-notification": "Connection established with {} ({})", # TODO: Translate
+    "reachout-successful-notification": "Successfully reached {} ({})", # TODO: Translate
 
     "rewind-notification": "Перемотано из-за разницы во времени с {}",  # User
     "fastforward-notification": "Ускорено из-за разницы во времени с {}",  # User
@@ -484,12 +484,12 @@ ru = {
     "editplaylist-menu-label": "Редактировать список",
 
     "open-containing-folder": "Open folder containing this file",  # TODO: Traslate
-    "addusersfiletoplaylist-menu-label": "Добавить файл {} в список воспроизведения",  # item owner indicator
-    "addusersstreamstoplaylist-menu-label": "Добавить поток {} в список воспроизведения",  # item owner indicator
+    "addyourfiletoplaylist-menu-label": "Добавить файл от вас в список воспроизведения", # TODO: Check
+    "addotherusersfiletoplaylist-menu-label": "Добавить файл {} в список воспроизведения",  # Username # TODO: Check
+    "addyourstreamstoplaylist-menu-label": "Добавить поток от вас в список воспроизведения", # TODO: Check
+    "addotherusersstreamstoplaylist-menu-label": "Добавить поток {} в список воспроизведения",  # Username # TODO: Check
     "openusersstream-menu-label": "Открыть поток от {}",  # [username]'s
     "openusersfile-menu-label": "Открыть файл от {}",  # [username]'s
-    "item-is-yours-indicator": "от вас",  # Goes with addusersfiletoplaylist/addusersstreamstoplaylist
-    "item-is-others-indicator": "{}",  # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist
 
     "playlist-instruction-item-message": "Перетащите сюда файлы, чтобы добавить их в общий список.",
     "sharedplaylistenabled-tooltip": "Оператор комнаты может добавлять файлы в список общего воспроизведения для удобного совместного просмотра. Папки воспроизведения настраиваются во вкладке 'Файл'.",