diff --git a/app/js/filters.js b/app/js/filters.js
index 3ea481d1..6213317e 100644
--- a/app/js/filters.js
+++ b/app/js/filters.js
@@ -169,15 +169,14 @@ angular.module('myApp.filters', ['myApp.i18n'])
     }
   }])
 
-  .filter('relativeTime', ['$filter', '_', function($filter, _) {
-    var langMinutes = {
-      one: 'relative_time_one_minute',
-      many: 'relative_time_many_minutes'
-    },
-      langHours = {
-        one: 'relative_time_one_hour',
-        many: 'relative_time_many_hours'
-      };
+  .filter('relativeTime', ['$rootScope', '$filter', '$locale', '_', function($rootScope, $filter, $locale, _) {
+    var langMinutes = $rootScope.$eval(
+          _('relative_time_pluralize_minutes_ago')
+        ),
+        langHours = $rootScope.$eval(
+          _('relative_time_pluralize_hours_ago')
+        );
+
     return function (timestamp) {
       var ticks = timestamp * 1000,
           diff = Math.abs(tsNow() - ticks);
@@ -187,11 +186,11 @@ angular.module('myApp.filters', ['myApp.i18n'])
       }
       if (diff < 3000000) {
         var minutes = Math.ceil(diff / 60000);
-        return _(langMinutes[minutes > 1 ? 'many' : 'one'], {minutes: minutes});
+        return (langMinutes[$locale.pluralCat(minutes)] || '').replace('{}', minutes);
       }
       if (diff < 10000000) {
         var hours = Math.ceil(diff / 3600000);
-        return _(langHours[hours > 1 ? 'many' : 'one'], {hours: hours});
+        return (langHours[$locale.pluralCat(hours)] || '').replace('{}', hours);
       }
       return $filter('dateOrTime')(timestamp);
     }
diff --git a/app/js/i18n.js b/app/js/i18n.js
index b557ddb2..d80aabf9 100644
--- a/app/js/i18n.js
+++ b/app/js/i18n.js
@@ -94,7 +94,7 @@ angular.module('myApp.i18n', ['izhukov.utils'])
       priority: 1, // execute before built-in ngPluralize
       compile: function(element) {
         var msgid = element.attr('when');
-        var msgstr = _(msgid);
+        var msgstr = _(msgid + '_raw');
         element.attr('when', msgstr);
       }
     }
diff --git a/app/js/lib/config.js b/app/js/lib/config.js
index 483d1815..8551d911 100644
--- a/app/js/lib/config.js
+++ b/app/js/lib/config.js
@@ -43,15 +43,26 @@ Config.Navigator = {
 
 Config.I18n = {
   locale: 'en-us',
-  supported: ["en-us", "es-es", "de-de"], // To be copied to package.json
+  supported: [
+    "en-us"
+    ,"es-es"
+    ,"de-de"
+    ,"it-it"
+    // ,"ru-ru"
+  ], // To be copied to package.json
   languages: {
     'en-us': 'English',
     'de-de': 'Deutsch',
-    'es-es': 'Español'
+    'es-es': 'Español',
+    'it-it': 'Italiano',
+    'ru-ru': 'Русский'
   },
   aliases: {
     'en': 'en-us',
-    'de': 'de-de'
+    'de': 'de-de',
+    'es': 'es-es',
+    'it': 'it-it',
+    'ru': 'ru-ru'
   },
   messages: {},
   fallback_messages: {}
diff --git a/app/js/locales/de-de.json b/app/js/locales/de-de.json
index eb1c8984..f8f4a3af 100644
--- a/app/js/locales/de-de.json
+++ b/app/js/locales/de-de.json
@@ -10,7 +10,7 @@
     "group_modal_return": "Zurück zur Gruppe",
     "group_modal_update_photo": "Bild aktualisieren",
     "group_modal_update_active": "Aktualisiere",
-    "group_modal_menu_more": "Mehr",
+    "group_modal_menu_more": "Weiteres",
     "group_modal_menu_delete_photo": "Bild löschen",
     "group_modal_menu_edit_group": "Gruppe bearbeiten",
     "group_modal_menu_leave_group": "Gruppe verlassen",
@@ -18,11 +18,11 @@
     "group_modal_settings": "Einstellungen",
     "group_modal_notifications": "Benachrichtigungen",
     "group_modal_members": "Mitglieder",
-    "group_modal_members_kick": "Kicken",
+    "group_modal_members_kick": "Entfernen",
     "group_modal_members_unavailable": "Liste der Gruppenmitglieder ist nicht verfügbar.",
     "country_select_modal_title": "Land",
     "settings_modal_title": "Einstellungen",
-    "settings_modal_menu_more": "Mehr",
+    "settings_modal_menu_more": "Weiteres",
     "settings_modal_delete_photo": "Profilbild löschen",
     "settings_modal_set_photo": "Profilbild setzen",
     "settings_modal_photo_updating": "Aktualisiere",
@@ -31,7 +31,7 @@
     "settings_modal_settings": "Einstellungen",
     "settings_modal_notification_alert": "Benachrichtigungen",
     "settings_modal_vibrate": "Vibrieren",
-    "settings_modal_sounds": "Ton",
+    "settings_modal_sounds": "Töne",
     "settings_modal_language": "Spache",
     "settings_modal_notifications": "Desktopbenachrichtigungen",
     "settings_modal_sound": "Ton",
@@ -39,19 +39,19 @@
     "settings_modal_ctrl_enter_send_description_md": "**Strg + Enter** - Nachricht senden, **Enter** - Zeilenumbruch",
     "settings_modal_send_on_enter": "Senden mit Enter",
     "settings_modal_phone": "Telefon",
-    "settings_modal_about": "Über",
-    "settings_modal_source_code_github": "Quellcode auf GitHub",
+    "settings_modal_about": "Info",
+    "settings_modal_source_code_github": "Quelltext bei GitHub",
     "settings_modal_follow_us_twitter": "Folge uns auf Twitter!",
-    "settings_modal_recent_updates": "neuste Updates (ver. {version})",
+    "settings_modal_recent_updates": "Aktuelle Version: {version}",
     "profile_edit_modal_title": "Profil bearbeiten",
     "profile_edit_first_name": "Vorname",
     "profile_edit_last_name": "Nachname",
     "profile_edit_submit": "Speichern",
     "profile_edit_submit_active": "Speichere...",
-    "user_modal_menu_more": "Mehr",
+    "user_modal_menu_more": "Weiteres",
     "user_modal_send_message": "Nachricht senden",
     "user_modal_edit_contact": "Kontakt bearbeiten",
-    "user_modal_delete_contact": "Kontakte Löschen",
+    "user_modal_delete_contact": "Kontakt entfernen",
     "user_modal_add_contact": "Zu Kontakten hinzufügen",
     "user_modal_share_contact": "Kontakt teilen",
     "user_modal_delete_chat": "Chat löschen",
@@ -60,18 +60,19 @@
     "user_modal_notifications": "Benachrichtigungen",
     "user_modal_contact_info": "Kontaktdetails",
     "media_modal_forward": "Weiterleiten",
-    "media_modal_download": "Download",
+    "media_modal_download": "Herunterladen",
     "media_modal_delete": "Löschen",
     "error_browser_no_local_file_system_image_md": "Dein Browser unterstützt nicht die {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem}-Funktion, welche zum Darstellen dieses Bildes benötigt wird.\nBitte installiere {chrome-link: http://google.com/chrome | Google Chrome} oder benutze stattdessen die {telegram-link: https://telegram.org/ | mobile App}.",
     "error_image_download_failed": "Download fehlgeschlagen",
     "error_browser_no_local_file_system_video_md": "Dein Browser unterstützt nicht die {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem}-Funktion, welche zum Abspielen dieses Videos benötigt wird.\nBitte installiere {chrome-link: http://google.com/chrome | Google Chrome} oder benutze stattdessen die {telegram-link: https://telegram.org/ | mobile App}.",
     "error_video_download_failed": "Videodownload fehlgeschlagen",
-    "user_name_deleted": "Gelöscht",
-    "user_first_name_deleted": "Gelöscht",
+    "unread_messages_split": "ungelesene Nachrichten",
+    "user_name_deleted": "GELÖSCHT",
+    "user_first_name_deleted": "GELÖSCHT",
     "user_status_offline": "offline",
     "user_status_online": "online",
     "user_status_last_seen": "zuletzt gesehen: {0}",
-    "chat_title_deleted": "Gelöscht",
+    "chat_title_deleted": "GELÖSCHT",
     "format_size_progress_mulitple": "{done} von {total} {parts}",
     "format_size_progress": "{done} von {total}",
     "relative_time_one_minute": "vor einer Minute",
@@ -79,7 +80,7 @@
     "relative_time_one_hour": "vor einer Stunde",
     "relative_time_many_hours": "vor {hours} Stunden",
     "relative_time_just_now": "gerade eben",
-    "changelog_modal_header_recent_updates_md": "neuste Updates in **Telegram Web**",
+    "changelog_modal_header_recent_updates_md": "Aktualisierungen bei **Telegram Web**",
     "changelog_modal_header_new_updates_md": "**Telegram Web** wurde aktualisiert!",
     "changelog_modal_title_current_version": "aktuelle Version",
     "group_create_contacts_modal_title": "Neue Gruppe",
@@ -92,19 +93,19 @@
     "group_edit_submit": "Speichern",
     "group_edit_submit_active": "Speichere...",
     "confirm_modal_logout": "Willst du dich wirklich abmelden?",
-    "confirm_modal_update_reload": "Eine neue Version von Webogram wurde heruntergeladen. Jetzt starten?",
-    "confirm_modal_history_flush": "Bist du sicher? Das kann nicht rückgängig gemacht werden!",
+    "confirm_modal_update_reload": "A new version of Telegram Web has been downloaded. Launch it?",
+    "confirm_modal_history_flush": "Sicher? Es kann nicht rückgängig gemacht werden!",
     "confirm_modal_terminate_sessions": "Bist du sicher, dass du alle Geräte bis auf dieses hier abmelden willst?",
-    "confirm_modal_mixed_content_fail_http_redirect_md": "Dein Browser {moz-link: unterstützt nicht http und https gleichzeitig für Apps}, was jedoch für MTProto-Unterstützung über https nötig ist. {issue-link: Erfahre mehr}\n\n Willst du stattdessen die http-Version verwenden?",
+    "confirm_modal_mixed_content_fail_http_redirect_md": "Dein Browser {moz-link: unterstützt nicht} http und https gleichzeitig, was jedoch für die MTProto-Unterstützung über https nötig ist. {issue-link: Erfahre mehr}\n\nWillst du stattdessen die http-Version verwenden?",
     "confirm_modal_clipboard_file_send": "Willst du wirklich die Datei(en) aus der Zwischenablage senden?",
     "confirm_modal_clipboard_X_files_send": "{'one': 'Willst du wirklich die Datei aus der Zwischenablage senden?', 'other': 'Willst du wirklich die {} Dateien aus der Zwischenablage senden?'}",
     "confirm_modal_message_delete": "Willst du diese Nachricht wirklich löschen?",
     "confirm_modal_contacts_import": "Telegram wird nun deine Kontakte synchronisieren, um deine Freundesliste zusammenzustellen.",
-    "confirm_modal_login_phone_correct": "Ist diese Nummer korrekt?",
+    "confirm_modal_login_phone_correct": "Stimmt die Nummer wirklich?",
     "confirm_modal_forward_to_peer": "An {peer} weiterleiten?",
     "confirm_modal_send_to_peer": "An {peer} senden?",
     "confirm_modal_share_file_peer": "Mit {peer} teilen?",
-    "confirm_modal_apply_lang_with_reload_md": "Language preference was saved.\nReload the App now?",
+    "confirm_modal_apply_lang_with_reload_md": "Spracheinstellungen wurden gespeichert.\nAnwendung jetzt neustarten?",
     "confirm_modal_are_u_sure": "Bist du sicher?",
     "confirm_modal_logout_submit": "Abmelden",
     "confirm_modal_history_flush_submit": "Chat löschen",
@@ -115,7 +116,7 @@
     "confirm_modal_share_photo_submit": "Bild weiterleiten",
     "confirm_modal_share_video_submit": "Video weiterleiten",
     "confirm_modal_share_contact_submit": "Kontakt senden",
-    "confirm_modal_share_file_submit": "Share file",
+    "confirm_modal_share_file_submit": "Datei teilen",
     "contacts_modal_edit_list": "Bearbeiten",
     "contacts_modal_edit_cancel": "Abbrechen",
     "contacts_modal_edit_delete": "Löschen",
@@ -137,7 +138,7 @@
     "conversation_you": "Du",
     "conversation_media_photo": "Bild",
     "conversation_media_video": "Video",
-    "conversation_media_document": "Dokument",
+    "conversation_media_document": "Datei",
     "conversation_media_audio": "Audio",
     "conversation_media_location": "Standort",
     "conversation_media_contact": "Kontakt",
@@ -151,11 +152,11 @@
     "conversation_left_group": "hat die Gruppe verlassen",
     "conversation_kicked_user": "hat {user} entfernt",
     "conversation_invited_user_message": "hat Benutzer eingeladen",
-    "conversation_kicked_user_message": "hat Benutzer gekickt",
+    "conversation_kicked_user_message": "hat Benutzer entfernt",
     "conversation_unknown_user": "Jemand",
     "conversation_unknown_chat": "Unbekannte Unterhaltung",
-    "message_service_created_group": "hat die Gruppe {group_name} erstellt",
-    "message_service_changed_group_name": "hat den Gruppennamen zu {group_name} geändert",
+    "message_service_created_group": "hat die Gruppe {group-name} erstellt",
+    "message_service_changed_group_name": "hat den Gruppennamen zu {group-name} geändert",
     "message_service_changed_group_photo": "hat das Gruppenbild geändert",
     "message_service_removed_group_photo": "hat das Gruppenbild entfernt",
     "message_service_invited_user": "hat {user} eingeladen",
@@ -179,8 +180,8 @@
     "error_modal_photo_dimensions_invalid_description": "Die Bildabmessungen sind ungültig, bitte wähle eine andere Datei aus.",
     "error_modal_video_file_invalid_description": "Das Videoformat ist ungültig oder wird nicht unterstützt, bitte wähle eine andere Datei aus.",
     "error_modal_photo_too_small_description": "Das Bild, das du ausgewählt hast, ist zu klein.",
-    "error_modal_no_phone_user_description_md": "Tut uns leid, aber es gibt keinen **Telegram** -Account mit der angegebenen Telefonnummer.",
-    "error_modal_no_phone_users_description_md": "Tut uns leid, aber es gibt keine **Telegram** -Accounts mit den angegebenen Telefonnummern.",
+    "error_modal_no_phone_user_description_md": "Es gibt leider kein **Telegram** Konto mit der angegebenen Nummer.",
+    "error_modal_no_phone_users_description_md": "Es gibt gibt leider keine **Telegram** Konten mit den angegebenen Nummern.",
     "error_modal_phonebook_required_description": "Telegram benötigt Zugriff auf das Telefonbuch, um Kontakte importieren zu können.",
     "error_modal_bad_request_description": "Eine Parameter fehlt oder ist ungültig.",
     "error_modal_unauthorized_description": "Diese Aktion benötigt autorisierten Zugriff. Bitte {login-link: melde dich an}.",
@@ -219,7 +220,7 @@
     "im_conversations": "Unterhaltungen",
     "im_messages": "Nachrichten",
     "im_no_contacts": "Noch keine Kontakte",
-    "im_get_started_long": "Beginne mit dem Hinzufügen von Kontakten:",
+    "im_get_started_long": "Beginne mit dem Hinzufügen von Kontakten",
     "im_add_contact": "Konktakt hinzufügen",
     "im_import_phonebook": "Telefonbuch importieren",
     "im_get_started": "Schnelleinstieg",
@@ -252,7 +253,7 @@
     "im_emoji_btn_title": "Emoticon einfügen",
     "im_submit_message": "Senden",
     "login_sign_in": "Anmelden",
-    "login_enter_number_description": "Bitte wähle dein Land aus und gib deine volle Telefonnumer ein.",
+    "login_enter_number_description": "Land auswählen und Nummer eintragen",
     "login_incorrect_number": "Falsche Telefonnummer",
     "login_tel_input_placeholder": "Telefonnumer eingeben",
     "login_generating_key": "Generiere Schlüssel",
@@ -260,7 +261,7 @@
     "login_edit_number": "Telefonnummer bearbeiten",
     "login_enter_code_label_md": "Bitte gebe den Code ein, den du gerade über deine andere **Telegram** App erhalten hast",
     "login_code_not_received": "Keinen Code erhalten?",
-    "login_enter_sms_code_label_md": "Wir haben dir einen Code per SMS zugesendet.\nBitte gib diesen unten ein.",
+    "login_enter_sms_code_label_md": "Code wurde dir soeben per SMS gesendet.\nBitte diesen unten eingeben.",
     "login_call_remaining": "Telegram wird dich in {remaining} anrufen",
     "login_calling": "Telegram ruft dich an",
     "login_number_dialed": "Telegram hat deine Nummer gewählt",
@@ -277,6 +278,7 @@
     "login_sign_up": "Registrieren",
     "login_controller_unknown_country": "Unbekannt",
     "message_forwarded_message": "Weitergeleitete Nachricht",
+    "message_forwarded_message_mobile": "Weitergeleitet von {from}, {date}",
     "message_attach_audio_message": "Sprachnachricht",
     "message_attach_audio_play": "Abspielen",
     "message_attach_document_open": "Öffnen",
@@ -293,15 +295,15 @@
     "phonebook_modal_submit_active": "Importiere",
     "phonebook_modal_submit": "Kontakte importieren",
     "welcome_header_md": "**Telegram** Web",
-    "welcome_text_1_md": "Dies ist der inoffizielle Web-Client des **Telegram Messenger**.",
-    "welcome_text_2_md": "Es ist noch immer eine **alpha-Version** und ist noch nicht 200% zuverlässig",
-    "welcome_start_messaging": "Los legen",
-    "welcome_fast_messaging_header": "Schneller Nachrichtenversand",
-    "welcome_fast_messaging_text": "Sende Nachrichten mit umfangreicher Emoji-Unterstützung direkt von deinem Desktop oder Laptop",
-    "welcome_easy_sharing_header": "Einfache Dateiweitergabe",
-    "welcome_easy_sharing_text": "Teile Dateien jeder Art per Drag&Drop oder über das Anhangsymbol",
-    "welcome_powerful_tools_header": "Leistungsstarke Werkzeuge",
-    "welcome_powerful_tools_text_md": "Durchsuche geteilte Medien nach Typ \n und setze individuelle Benachrichtigungen",
+    "welcome_text_1_md": "Das ist eine inoffizielle Webversion für den **Telegram Messenger**",
+    "welcome_text_2_md": "Es ist noch eine **Alpha-Version** und noch nicht 200% zuverlässig",
+    "welcome_start_messaging": "Los geht's",
+    "welcome_fast_messaging_header": "Schnelles Messaging",
+    "welcome_fast_messaging_text": "Nachrichten mit Emojis direkt vom PC-Desktop oder Laptop verschicken",
+    "welcome_easy_sharing_header": "Einfach Dateien teilen",
+    "welcome_easy_sharing_text": "Teile Dateien jeder Art per Drag & Drop oder über das Anhangsymbol",
+    "welcome_powerful_tools_header": "Nützliche Funktionen",
+    "welcome_powerful_tools_text_md": "Durchsuche geteilte Medien und \nsetze individuelle Benachrichtigungen",
     "country_select_modal_country_ab": "Abchasien",
     "country_select_modal_country_af": "Afghanistan",
     "country_select_modal_country_ax": "Åland-Inseln",
diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json
index b54d7a90..e8cd1497 100644
--- a/app/js/locales/en-us.json
+++ b/app/js/locales/en-us.json
@@ -82,10 +82,8 @@
 	"chat_title_deleted": "DELETED",
 	"format_size_progress_mulitple": "{done} of {total} {parts}",
 	"format_size_progress": "{done} of {total}",
-	"relative_time_one_minute": "{minutes} minute ago",
-	"relative_time_many_minutes": "{minutes} minutes ago",
-	"relative_time_one_hour": "{hours} hour ago",
-	"relative_time_many_hours": "{hours} hours ago",
+	"relative_time_pluralize_minutes_ago": "{'one': '1 minute ago', 'other': '{} minutes ago'}",
+	"relative_time_pluralize_hours_ago": "{'one': '1 hour ago', 'other': '{} hours ago'}",
 	"relative_time_just_now": "just now",
 
 	"changelog_modal_header_recent_updates_md": "Recent updates in **Telegram Web**",
diff --git a/app/js/locales/es-es.json b/app/js/locales/es-es.json
index ce72117a..c15471c5 100644
--- a/app/js/locales/es-es.json
+++ b/app/js/locales/es-es.json
@@ -66,6 +66,7 @@
     "error_image_download_failed": "Descarga fallida",
     "error_browser_no_local_file_system_video_md": "Tu navegador no soporta la función {moz-link: https://developer.mozilla.org/es-ES/docs/Web/API/LocalFileSystem | LocalFileSystem}, necesaria para reproducir este vídeo.\nPor favor, instala {chrome-link: http://google.com/chrome | Google Chrome}, o usa {telegram-link: https://telegram.org/ | la aplicación móvil} en su lugar.",
     "error_video_download_failed": "Descarga de vídeo fallida",
+    "unread_messages_split": "Mensajes no leídos",
     "user_name_deleted": "ELIMINADO",
     "user_first_name_deleted": "ELIMINADO",
     "user_status_offline": "desconectado(a)",
@@ -91,8 +92,8 @@
     "group_edit_name": "Nombre del grupo",
     "group_edit_submit": "Guardar",
     "group_edit_submit_active": "Guardando...",
-    "confirm_modal_logout": "¿Estás seguro que quieres cerrar sesión?",
-    "confirm_modal_update_reload": "Se ha descargado una nueva versión de Webogram. ¿Quieres iniciarla?",
+    "confirm_modal_logout": "¿Estás seguro que quieres salir?",
+    "confirm_modal_update_reload": "Telegram Web se ha actualizado a una nueva versión.\n¿Desea ejecutarlo?",
     "confirm_modal_history_flush": "¿Estás seguro(a)? ¡Esto no puede deshacerse!",
     "confirm_modal_terminate_sessions": "¿Estás seguro(a) que quieres cerrar sesión en todos tus dispositivos, excepto en este?",
     "confirm_modal_mixed_content_fail_http_redirect_md": "Tu navegador {moz-link: no soporta} el contenido mixto, necesario para el funcionamiento de MTProto en https. {issue-link: Saber más}\n\n ¿Quieres usar la versión http en su lugar?",
@@ -106,7 +107,7 @@
     "confirm_modal_share_file_peer": "¿Compartir con {peer}?",
     "confirm_modal_apply_lang_with_reload_md": "Se han guardado las preferencias de idioma.\n¿Quieres recargar la aplicación ahora?",
     "confirm_modal_are_u_sure": "¿Estás seguro?",
-    "confirm_modal_logout_submit": "Cerrar sesión",
+    "confirm_modal_logout_submit": "Salir",
     "confirm_modal_history_flush_submit": "Eliminar conversación",
     "confirm_modal_clipboard_files_send_submit": "Enviar",
     "confirm_modal_clipboard_file_send_submit": "Enviar",
@@ -154,8 +155,8 @@
     "conversation_kicked_user_message": "usuario expulsado",
     "conversation_unknown_user": "Alguien",
     "conversation_unknown_chat": "Chat desconocido",
-    "message_service_created_group": "ha creado el grupo {group_name}",
-    "message_service_changed_group_name": "ha cambiado el nombre del grupo a {group_name}",
+    "message_service_created_group": "creó el grupo {group-name}",
+    "message_service_changed_group_name": "cambié el nombre del grupo a {group-name}",
     "message_service_changed_group_photo": "ha cambiado la foto del grupo",
     "message_service_removed_group_photo": "ha eliminado la foto del grupo",
     "message_service_invited_user": "ha invitado a {user}",
@@ -194,7 +195,7 @@
     "head_contacts": "Contactos",
     "head_contacts_title": "Contactos",
     "head_settings": "Ajustes",
-    "head_log_out": "Cerrar sesión",
+    "head_log_out": "Salir",
     "head_edit_messages": "Editar mensajes",
     "head_media_photos": "Fotos",
     "head_media_video": "Vídeos",
@@ -277,13 +278,14 @@
     "login_sign_up": "Registrarse",
     "login_controller_unknown_country": "Desconocido",
     "message_forwarded_message": "Reenviar mensaje",
+    "message_forwarded_message_mobile": "Reenviado de {from}, {date}",
     "message_attach_audio_message": "Mensaje de voz",
     "message_attach_audio_play": "Reproducir",
     "message_attach_document_open": "Abrir",
     "message_attach_document_download": "Descargar",
     "message_attach_video_video": "Vídeo",
     "message_attach_video_download": "Descargar",
-    "message_attach_video_play": "Reproducir vídeo",
+    "message_attach_video_play": "Reproducir",
     "conversation_select_modal_title": "Seleccionar conversación",
     "conversation_select_modal_contacts": "Contactos",
     "phonebook_modal_title": "Agenda del dispositivo",
diff --git a/app/js/locales/it-it.json b/app/js/locales/it-it.json
new file mode 100644
index 00000000..f3a11441
--- /dev/null
+++ b/app/js/locales/it-it.json
@@ -0,0 +1,558 @@
+{
+    "modal_search": "Cerca",
+    "modal_cancel": "Annulla",
+    "modal_next": "Avanti",
+    "modal_ok": "OK",
+    "modal_done": "Fatto",
+    "group_modal_info": "Informazioni gruppo",
+    "group_modal_pluralize_participants": "{'0': 'Nessun membro', 'one': '1 membro', 'other': '{} membri'}",
+    "group_modal_add_member": "Aggiungi membro",
+    "group_modal_return": "Ritorna al gruppo",
+    "group_modal_update_photo": "Aggiorna foto",
+    "group_modal_update_active": "Aggiornamento",
+    "group_modal_menu_more": "Più",
+    "group_modal_menu_delete_photo": "Elimina foto",
+    "group_modal_menu_edit_group": "Modifica gruppo",
+    "group_modal_menu_leave_group": "Lascia gruppo",
+    "group_modal_menu_delete_chat": "Elimina chat",
+    "group_modal_settings": "Impostazioni",
+    "group_modal_notifications": "Notifiche",
+    "group_modal_members": "Membri",
+    "group_modal_members_kick": "Espelli",
+    "group_modal_members_unavailable": "Lista membri gruppo non disponibile",
+    "country_select_modal_title": "Nazione",
+    "settings_modal_title": "Impostazion",
+    "settings_modal_menu_more": "Più",
+    "settings_modal_delete_photo": "Elimina foto profilo",
+    "settings_modal_set_photo": "Imposta foto profilo",
+    "settings_modal_photo_updating": "Caricamento",
+    "settings_modal_edit_profile": "Modifica profilo",
+    "settings_modal_terminate_sessions": "Termina tutte le sessioni",
+    "settings_modal_settings": "Impostazioni",
+    "settings_modal_notification_alert": "Avvisi di notifica",
+    "settings_modal_vibrate": "Vibra",
+    "settings_modal_sounds": "Suon",
+    "settings_modal_language": "Lingua",
+    "settings_modal_notifications": "Notifiche desktop",
+    "settings_modal_sound": "Suono",
+    "settings_modal_enter_send_description_md": "**Invio** - invia messaggio, **Shift + Invio** - nuova riga",
+    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Invio** - invia messaggio, **Invio** - nuova riga",
+    "settings_modal_send_on_enter": "Spedisci con Invio",
+    "settings_modal_phone": "Telefono",
+    "settings_modal_about": "Info",
+    "settings_modal_source_code_github": "Codice sorgente su GitHub",
+    "settings_modal_follow_us_twitter": "Seguici su Twitter!",
+    "settings_modal_recent_updates": "Nuovi aggiornamenti (ver. {version})",
+    "profile_edit_modal_title": "Modifica profilo",
+    "profile_edit_first_name": "Nome",
+    "profile_edit_last_name": "Cognome",
+    "profile_edit_submit": "Salva",
+    "profile_edit_submit_active": "Salvataggio...",
+    "user_modal_menu_more": "Più",
+    "user_modal_send_message": "Invia messaggio",
+    "user_modal_edit_contact": "Modifica contatto",
+    "user_modal_delete_contact": "Elimina contatto",
+    "user_modal_add_contact": "Aggiungi ai contatti",
+    "user_modal_share_contact": "Condividi contatto",
+    "user_modal_delete_chat": "Elimina Chat",
+    "user_modal_phone": "Telefono",
+    "user_modal_settings": "Impostazioni",
+    "user_modal_notifications": "Notifiche",
+    "user_modal_contact_info": "Informazioni contatto",
+    "media_modal_forward": "Inoltra",
+    "media_modal_download": "Scarica",
+    "media_modal_delete": "Elimina",
+    "error_browser_no_local_file_system_image_md": "Il tuo browser non supporta la funzionalità {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} che è necessaria per visualizzare questa immagine.\nPer favore, installa {chrome-link: http://google.com/chrome | Google Chrome} o usa piuttosto {telegram-link: https://telegram.org/ | mobile app}.",
+    "error_image_download_failed": "Download fallito",
+    "error_browser_no_local_file_system_video_md": "Il tuo browser non supporta la funzionalità {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} che è necessaria per riprodurre il filmato.\nPer favore, installa {chrome-link: http://google.com/chrome | Google Chrome} o piuttosto usa {telegram-link: https://telegram.org/ | mobile app}.",
+    "error_video_download_failed": "Download video fallito",
+    "unread_messages_split": "Messaggi non letti",
+    "user_name_deleted": "ELIMINATO",
+    "user_first_name_deleted": "ELIMINATO",
+    "user_status_offline": "non in linea",
+    "user_status_online": "in linea",
+    "user_status_last_seen": "ultimo accesso {0}",
+    "chat_title_deleted": "ELIMINATO",
+    "format_size_progress_mulitple": "{done} su {total} {parts}",
+    "format_size_progress": "{done} su {total}",
+    "relative_time_one_minute": "{minutes} minuto fa",
+    "relative_time_many_minutes": "{minutes} minuti fa",
+    "relative_time_one_hour": "{hours} ora fa",
+    "relative_time_many_hours": "{hours} ore fa",
+    "relative_time_just_now": "proprio ora",
+    "changelog_modal_header_recent_updates_md": "Update recenti di **Telegram Web**",
+    "changelog_modal_header_new_updates_md": "**Telegram Web** è stato aggiornato",
+    "changelog_modal_title_current_version": "versione corrente",
+    "group_create_contacts_modal_title": "Nuovo Gruppo",
+    "group_create_modal_title": "Crea Gruppo",
+    "group_create_name": "Nome gruppo",
+    "group_create_submit": "Crea Grupp",
+    "group_create_submit_active": "Creazione...",
+    "group_edit_modal_title": "Modifica Gruppo",
+    "group_edit_name": "Nome gruppo",
+    "group_edit_submit": "Salva",
+    "group_edit_submit_active": "Salvataggio...",
+    "confirm_modal_logout": "Sei sicuro di voler uscire?",
+    "confirm_modal_update_reload": "Una nuova versione di Telegram Web è stata scaricata. Vuoi avviarla?",
+    "confirm_modal_history_flush": "Sei sicuro? L'operazione non può essere annullata!",
+    "confirm_modal_terminate_sessions": "Sei sicuro di voler disconnettere tutti i dispositivi tranne questo?",
+    "confirm_modal_mixed_content_fail_http_redirect_md": "Il tuo browser {moz-link: does not support} un contenuto misto che è necessario per il supporto MTProto su https. {issue-link: Learn more}\n\nPreferisci usare la versione http?",
+    "confirm_modal_clipboard_file_send": "Sei sicuro di inviare il(i) file presenti negli appunti?",
+    "confirm_modal_clipboard_X_files_send": "{'one': 'Sei sicuro di inviare il file dagli appunti?', 'other': 'Sei sicuro di inviare {} file dagli appunti?'}",
+    "confirm_modal_message_delete": "Sei sicuro di voler eliminare il messaggio?",
+    "confirm_modal_contacts_import": "Telegram procederà adesso a sincronizzare la tua rubrica alla ricerca dei tuoi amici.",
+    "confirm_modal_login_phone_correct": "Il tuo numero di telefono è giusto?",
+    "confirm_modal_forward_to_peer": "Inoltra a {peer}?",
+    "confirm_modal_send_to_peer": "Invia a {peer}?",
+    "confirm_modal_share_file_peer": "Condividi con {peer}?",
+    "confirm_modal_apply_lang_with_reload_md": "La scelta della lingua è stata salvata.\nRiavviare adesso l'App?",
+    "confirm_modal_are_u_sure": "Sei sicuro?",
+    "confirm_modal_logout_submit": "Disconnetti",
+    "confirm_modal_history_flush_submit": "Elimina Chat",
+    "confirm_modal_clipboard_files_send_submit": "Invia",
+    "confirm_modal_clipboard_file_send_submit": "Invia",
+    "confirm_modal_message_delete_submit": "Elimina",
+    "confirm_modal_forward_message_submit": "Inoltra messaggi",
+    "confirm_modal_share_photo_submit": "Inoltra foto",
+    "confirm_modal_share_video_submit": "Inoltra video",
+    "confirm_modal_share_contact_submit": "Invia contatto",
+    "confirm_modal_share_file_submit": "Condividi file",
+    "contacts_modal_edit_list": "Modifica",
+    "contacts_modal_edit_cancel": "Elimina",
+    "contacts_modal_edit_delete": "Elimina",
+    "contacts_modal_pluralize_new_group_members": "{'one': '1 partecipante', 'other': '{} partecipanti'}",
+    "contacts_modal_title": "Contatti",
+    "contacts_modal_new_contact": "Nuovo Contatt",
+    "contacts_modal_empty_list": "La tua rubrica è vuota. Puoi {import-link: add new contact} per numero telefonico.",
+    "contact_edit_modal_first_name": "Nome",
+    "contact_edit_modal_last_name": "Cognome",
+    "contact_edit_modal_title": "Modifica contatto",
+    "contact_edit_modal_submit": "Salva",
+    "contact_edit_modal_submit_active": "Salvataggio...",
+    "contact_import_modal_title": "Aggiungi Nuovo Contatto",
+    "contact_import_modal_phone": "Numero di telefono",
+    "contact_import_modal_phonebook": "Rubrica",
+    "contact_import_modal_submit": "Salva",
+    "contact_import_modal_submit_active": "Importando...",
+    "conversation_message_deleted": "messaggi eliminati",
+    "conversation_you": "Tu",
+    "conversation_media_photo": "Foto",
+    "conversation_media_video": "Video",
+    "conversation_media_document": "Documento",
+    "conversation_media_audio": "Audio",
+    "conversation_media_location": "Posizione",
+    "conversation_media_contact": "Contatto",
+    "conversation_media_attachment": "Allegato",
+    "conversation_group_created": "ha creato il gruppo",
+    "conversation_group_renamed": "ha cambiato il nome del gruppo",
+    "conversation_group_photo_updated": "ha cambiato la foto del grupp",
+    "conversation_group_photo_removed": "ha eliminato la foto del grupp",
+    "conversation_returned_to_group": "è ritornato nel gruppo",
+    "conversation_invited_user": "ha invitato {user}",
+    "conversation_left_group": "ha lasciato il grupp",
+    "conversation_kicked_user": "ha eliminato {user}",
+    "conversation_invited_user_message": "utente invitato",
+    "conversation_kicked_user_message": "utente allontanato",
+    "conversation_unknown_user": "Qualcuno",
+    "conversation_unknown_chat": "Chat sconosciuta",
+    "message_service_created_group": "ha creato il gruppo {group-name}",
+    "message_service_changed_group_name": "ha cambiato il nome del gruppo in {group-name}",
+    "message_service_changed_group_photo": "ha cambiato la foto del gruppo",
+    "message_service_removed_group_photo": "ha eliminato la foto del grupp",
+    "message_service_invited_user": "ha invitato {user}",
+    "message_service_returned_to_group": "è ritornato nel gruppo",
+    "message_service_kicked_user": "allontanato {user}",
+    "message_service_left_group": "gruppo abbandonato",
+    "message_service_unsupported_action": "Azione non supportata {action}",
+    "error_modal_bad_request_title": "Errore",
+    "error_modal_unauthorized_title": "Non autorizzato",
+    "error_modal_forbidden_title": "Accesso negato",
+    "error_modal_not_found_title": "Non trovato",
+    "error_modal_network_title": "Errore di rete",
+    "error_modal_flood_title": "Troppo veloce",
+    "error_modal_internal_title": "Errore server",
+    "error_modal_alert": "Attenzione",
+    "error_modal_network_description": "Per favore controlla la tua connessione a internet",
+    "error_modal_firstname_invali_description": "Il nome che hai inserito non è valido",
+    "error_modal_lastname_invalid_description": "Il cognome che hai inserito non è valido",
+    "error_modal_phone_invalid_description": "Il numero di telefono che hai inserito non è valido",
+    "error_modal_users_too_much_description": "Hai selezionato troppi utenti",
+    "error_modal_photo_dimensions_invalid_description": "Le  dimensioni della foto non sono valide, seleziona un altro file",
+    "error_modal_video_file_invalid_description": "L'estensione del file video non è valida o non è supportata, per favore selezione un altro file",
+    "error_modal_photo_too_small_description": "La foto che hai fornito è troppo piccola",
+    "error_modal_no_phone_user_description_md": "Siamo spiacenti, non c'è alcun account **Telegram** associato al numero che hai fornito.",
+    "error_modal_no_phone_users_description_md": "Siamo spiacenti, non c'è alcun account **Telegram** associato al numero che hai fornito.",
+    "error_modal_phonebook_required_description": "Telegram ha bisogno di accedere alla tua rubrica per importare i contatti.",
+    "error_modal_bad_request_description": "Un parametro è mancante o errato.",
+    "error_modal_unauthorized_description": "L'azione necessita dell'autorizzazione d'accesso. Per favore {login-link: log in}.",
+    "error_modal_forbidden_description": "Non sei autorizzato a questa operazione.",
+    "error_modal_not_found_description": "La pagina non è stata trovata.",
+    "error_modal_flood_description": "Stai effettuando troppe operazioni. Si prega di riprovare più tardi.",
+    "error_modal_internal_description": "Si è verificato un errore internamente al server. Si prega di riprovare più tardi.",
+    "error_modal_tech_details": "Dettagli tecnici qui",
+    "head_new_group": "Nuovo Gruppo",
+    "head_new_contact": "Nuovo Contatto",
+    "head_contacts": "Contatti",
+    "head_contacts_title": "Contatti",
+    "head_settings": "Impostazioni",
+    "head_log_out": "Disconnetti",
+    "head_edit_messages": "Modifica messaggi",
+    "head_media_photos": "Foto",
+    "head_media_video": "Video",
+    "head_media_documents": "Documenti",
+    "head_media_audio": "Messaggi vocali",
+    "head_about": "Informazioni su",
+    "head_clear_all": "Elimina tutto",
+    "head_edit": "Modifica",
+    "head_typing": "scrivendo",
+    "head_pluralize_participants": "{'0': 'Nessun membro', 'one': '1 membro', 'other': '{} membri'}",
+    "head_one_typing": "{name1} sta scrivendo{dots}",
+    "head_two_typing": "{name1}, {name2}{dots}",
+    "head_many_typing": "{name1}+{names}{dots}",
+    "head_waiting_for_network": "In attesa di connettività",
+    "head_retry": "Riprova",
+    "head_connecting": "Connessione in corso",
+    "im_new_group": "Nuovo Gruppo",
+    "im_new_contact": "Nuovo Contatto",
+    "im_contacts": "Contatti",
+    "im_contacts_title": "Contatti",
+    "im_settings": "Impostazioni",
+    "im_conversations": "Conversazioni",
+    "im_messages": "Messaggi",
+    "im_no_contacts": "Ancora nessun contatto",
+    "im_get_started_long": "Inizia aggiungendo contatti alla chat",
+    "im_add_contact": "Aggiungi contatto",
+    "im_import_phonebook": "Importa rubrica",
+    "im_get_started": "Inizia",
+    "im_welcome_text": "Benvenuto su Telegram Web. E' sempre possibile impostare una foto di profilo e cambiare il tuo nome sotto nel Impostazioni.",
+    "im_open_settings": "Apri Impostazioni",
+    "im_select_a_chat": "Selezionare una chat per iniziare a messaggiare",
+    "im_loading_history": "Caricamento messaggi precedenti",
+    "im_info": "Info",
+    "im_edit": "Modifica",
+    "im_media": "Media",
+    "im_media_photos": "Foto",
+    "im_media_video": "Video",
+    "im_media_documents": "Documenti",
+    "im_media_audio": "Messaggi vocali",
+    "im_pluralize_participants": "{'0': 'Nessun membro', 'one': '1 membro', 'other': '{} membri'}",
+    "im_show_recent_messages": "Mostra messaggi recenti",
+    "im_show_all_messages": "Mostra tutti i messaggi",
+    "im_no_messages": "Ancora nessun messaggio...",
+    "im_one_typing": "{name1} sta scrivendo{dots}",
+    "im_two_typing": "{name1} e {name2} stanno scrivendo{dots}",
+    "im_many_typing": "{name1}, {name2} e {count} altri stanno scrivendo{dots}",
+    "im_delete_chat": "Elimina chat",
+    "im_clear_history": "Elimina pregresso",
+    "im_delete": "Elimina {count}",
+    "im_forward": "Inoltra {count}",
+    "im_photos_drop_text": "Rilascia le foto qui per inviarle",
+    "im_message_field_placeholder": "Scrivi un messaggio..",
+    "im_media_attach_title": "Invia media",
+    "im_attach_file_title": "Invia file",
+    "im_emoji_btn_title": "Inserisci emoticon",
+    "im_submit_message": "Invia",
+    "login_sign_in": "Accedi",
+    "login_enter_number_description": "Inserisci il tuo numero telefonico completo.",
+    "login_incorrect_number": "Numero telefonico errato",
+    "login_tel_input_placeholder": "Inserisci il tuo numero",
+    "login_generating_key": "Generazione chiavi",
+    "login_generating_keys_info": "Le chiavi vengono generate una volta soltanto. Questa operazione potrebbe impiegare alcuni minuti su dispositivi lenti, si prega di attendere.",
+    "login_edit_number": "Modifica numero di telefono",
+    "login_enter_code_label_md": "Inserisci il codice ricevuto su **Telegram**",
+    "login_code_not_received": "Non hai ancora ricevuto il codice?",
+    "login_enter_sms_code_label_md": "Ti abbiamo inviato un codice via SMS.\nInseriscilo qui sotto.",
+    "login_call_remaining": "Telegram ti chiamerà tra {remaining}",
+    "login_calling": "Telegram ti sta chiamando",
+    "login_number_dialed": "Telegram ha chiamato il tuo numero",
+    "login_incorrect_sms_code": "Codice SMS errato",
+    "login_number_input_placeholder": "Immetti il tuo codice",
+    "login_checking_code": "Verifica codice",
+    "login_your_info": "Le tue info",
+    "login_fulll_name_label": "Inserisci il tuo nome completo per impostare l'account Telegram.",
+    "login_incorrect_first_name": "Nome proprio errato",
+    "login_first_name": "Nome",
+    "login_incorrect_last_name": "Cognome errato",
+    "login_last_name": "Cognome",
+    "login_signing_up": "Registrazione in corso",
+    "login_sign_up": "Registratati",
+    "login_controller_unknown_country": "Sconosciuto",
+    "message_forwarded_message": "Messaggio inoltrato",
+    "message_forwarded_message_mobile": "Inoltrato da {from},{date}",
+    "message_attach_audio_message": "Messaggio vocale",
+    "message_attach_audio_play": "Riproduci",
+    "message_attach_document_open": "Apri",
+    "message_attach_document_download": "Scarica",
+    "message_attach_video_video": "Video",
+    "message_attach_video_download": "Scarica",
+    "message_attach_video_play": "Riproduci video",
+    "conversation_select_modal_title": "Seleziona conversazione",
+    "conversation_select_modal_contacts": "Contatti",
+    "phonebook_modal_title": "Rubrica",
+    "phonebook_modal_deselect_all": "Deseleziona tutto",
+    "phonebook_modal_select_all": "Seleziona tutto",
+    "phonebook_modal_empty": "La tua rubrica è vuota.",
+    "phonebook_modal_submit_active": "Sto importando",
+    "phonebook_modal_submit": "Importa contatti",
+    "welcome_header_md": "**Telegram** Web",
+    "welcome_text_1_md": "Questo è il client web non ufficiale di **Telegram Messenger**.",
+    "welcome_text_2_md": "E' ancora in **versione-alfa** e può non essere affidabile al 200%",
+    "welcome_start_messaging": "Inizia a Messaggiare",
+    "welcome_fast_messaging_header": "Messaggi veloci",
+    "welcome_fast_messaging_text": "Manda messaggi con il supporto arricchito di emoji direttamente dal tuo computer desktop o portatile",
+    "welcome_easy_sharing_header": "Condivisione semplice di file",
+    "welcome_easy_sharing_text": "Condividi file di qualunque tipo usando il drag-and-drop o l'icona della graffetta",
+    "welcome_powerful_tools_header": "Strumenti potenti",
+    "welcome_powerful_tools_text_md": "Sfoglia materiale condiviso e file per tipologia\ne personalizza le notitiche",
+    "country_select_modal_country_ab": "Abkhazia",
+    "country_select_modal_country_af": "Afghanistan",
+    "country_select_modal_country_ax": "Isole Aland",
+    "country_select_modal_country_al": "Albania",
+    "country_select_modal_country_dz": "Algeria",
+    "country_select_modal_country_as": "Samoa Americane",
+    "country_select_modal_country_ad": "Andorra",
+    "country_select_modal_country_ao": "Angola",
+    "country_select_modal_country_ai": "Anguilla",
+    "country_select_modal_country_ag": "Antigua e Barbuda",
+    "country_select_modal_country_ar": "Argentina",
+    "country_select_modal_country_am": "Armenia",
+    "country_select_modal_country_aw": "Aruba",
+    "country_select_modal_country_sh_ac": "Ascension",
+    "country_select_modal_country_au": "Australia",
+    "country_select_modal_country_au_et": "Territori Australiani Esterni",
+    "country_select_modal_country_at": "Austria",
+    "country_select_modal_country_az": "Azerbaigian",
+    "country_select_modal_country_bs": "Bahamas",
+    "country_select_modal_country_bh": "Bahrein",
+    "country_select_modal_country_bd": "Bangladesh",
+    "country_select_modal_country_bb": "Barbados",
+    "country_select_modal_country_ag_bar": "Barbuda",
+    "country_select_modal_country_by": "Bielorussia",
+    "country_select_modal_country_be": "Belgio",
+    "country_select_modal_country_bz": "Belize",
+    "country_select_modal_country_bj": "Benin",
+    "country_select_modal_country_bm": "Bermuda",
+    "country_select_modal_country_bt": "Bhutan",
+    "country_select_modal_country_bo": "Bolivia",
+    "country_select_modal_country_bq": "Caraibi Olandesi",
+    "country_select_modal_country_ba": "Bosnia-Erzegovina",
+    "country_select_modal_country_bw": "Botswana",
+    "country_select_modal_country_br": "Brasile",
+    "country_select_modal_country_io": "Territorio Britannico dell’Oceano Indiano",
+    "country_select_modal_country_vg": "Isole Vergini Britanniche",
+    "country_select_modal_country_bn": "Brunei",
+    "country_select_modal_country_bg": "Bulgaria",
+    "country_select_modal_country_bf": "Burkina Faso",
+    "country_select_modal_country_mm": "Myanmar (Birmania)",
+    "country_select_modal_country_bi": "Burundi",
+    "country_select_modal_country_kh": "Cambogia",
+    "country_select_modal_country_cm": "Camerun",
+    "country_select_modal_country_ca": "Canada",
+    "country_select_modal_country_cv": "Capo Verde",
+    "country_select_modal_country_ky": "Isole Cayman",
+    "country_select_modal_country_cf": "Repubblica Centrafricana",
+    "country_select_modal_country_td": "Ciad",
+    "country_select_modal_country_cl": "Cile",
+    "country_select_modal_country_cn": "Cina",
+    "country_select_modal_country_cx": "Isola di Christmas",
+    "country_select_modal_country_cc": "Isole Cocos",
+    "country_select_modal_country_co": "Colombia",
+    "country_select_modal_country_km": "Comore",
+    "country_select_modal_country_cg": "Congo-Brazzaville",
+    "country_select_modal_country_cd": "Congo - Kinshasa",
+    "country_select_modal_country_ck": "Isole Cook",
+    "country_select_modal_country_cr": "Costa Rica",
+    "country_select_modal_country_ci": "Costa d’Avorio",
+    "country_select_modal_country_hr": "Croazia",
+    "country_select_modal_country_cu": "Cuba",
+    "country_select_modal_country_cw": "Curaçao",
+    "country_select_modal_country_cy": "Cipro",
+    "country_select_modal_country_cz": "Repubblica Ceca",
+    "country_select_modal_country_dk": "Danimarca",
+    "country_select_modal_country_dg": "Diego Garcia",
+    "country_select_modal_country_dj": "Gibuti",
+    "country_select_modal_country_dm": "Dominica",
+    "country_select_modal_country_do": "Repubblica Dominicana",
+    "country_select_modal_country_tl": "Timor Est",
+    "country_select_modal_country_ec": "Ecuador",
+    "country_select_modal_country_eg": "Egitto",
+    "country_select_modal_country_sv": "El Salvador",
+    "country_select_modal_country_gq": "Guinea Equatoriale",
+    "country_select_modal_country_er": "Eritrea",
+    "country_select_modal_country_ee": "Estonia",
+    "country_select_modal_country_et": "Etiopia",
+    "country_select_modal_country_fk": "Isole Falkland",
+    "country_select_modal_country_fo": "Isole Faroe",
+    "country_select_modal_country_fj": "Figi",
+    "country_select_modal_country_fi": "Finlandia",
+    "country_select_modal_country_fr": "Francia",
+    "country_select_modal_country_gf": "Guiana Francese",
+    "country_select_modal_country_pf": "Polinesia Francese",
+    "country_select_modal_country_ga": "Gabon",
+    "country_select_modal_country_gm": "Gambia",
+    "country_select_modal_country_ge": "Georgia",
+    "country_select_modal_country_de": "Germania",
+    "country_select_modal_country_gh": "Ghana",
+    "country_select_modal_country_gi": "Gibilterra",
+    "country_select_modal_country_gr": "Grecia",
+    "country_select_modal_country_gl": "Groenlandia",
+    "country_select_modal_country_gd": "Grenada",
+    "country_select_modal_country_gp": "Guadalupa",
+    "country_select_modal_country_gu": "Guam",
+    "country_select_modal_country_gt": "Guatemala",
+    "country_select_modal_country_gg": "Guernsey",
+    "country_select_modal_country_gn": "Guinea",
+    "country_select_modal_country_gw": "Guinea-Bissau",
+    "country_select_modal_country_gy": "Guyana",
+    "country_select_modal_country_ht": "Haiti",
+    "country_select_modal_country_hn": "Honduras",
+    "country_select_modal_country_hk": "RAS di Hong Kong",
+    "country_select_modal_country_hu": "Ungheria",
+    "country_select_modal_country_is": "Islanda",
+    "country_select_modal_country_in": "India",
+    "country_select_modal_country_id": "Indonesia",
+    "country_select_modal_country_ir": "Iran",
+    "country_select_modal_country_iq": "Iraq",
+    "country_select_modal_country_ie": "Irlanda",
+    "country_select_modal_country_il": "Israele",
+    "country_select_modal_country_it": "Italia",
+    "country_select_modal_country_jm": "Giamaica",
+    "country_select_modal_country_sj": "Svalbard e Jan Mayen",
+    "country_select_modal_country_jp": "Giappone",
+    "country_select_modal_country_je": "Jersey",
+    "country_select_modal_country_jo": "Giordania",
+    "country_select_modal_country_kz": "Kazakistan",
+    "country_select_modal_country_ke": "Kenya",
+    "country_select_modal_country_ki": "Kiribati",
+    "country_select_modal_country_kp": "Corea del Nord",
+    "country_select_modal_country_kr": "Corea del Sud",
+    "country_select_modal_country_kw": "Kuwait",
+    "country_select_modal_country_kg": "Kirghizistan",
+    "country_select_modal_country_la": "Laos",
+    "country_select_modal_country_lv": "Lettonia",
+    "country_select_modal_country_lb": "Libano",
+    "country_select_modal_country_ls": "Lesotho",
+    "country_select_modal_country_lr": "Liberia",
+    "country_select_modal_country_ly": "Libia",
+    "country_select_modal_country_li": "Liechtenstein",
+    "country_select_modal_country_lt": "Lituania",
+    "country_select_modal_country_lu": "Lussemburgo",
+    "country_select_modal_country_mo": "RAS di Macao",
+    "country_select_modal_country_mk": "Repubblica di Macedonia",
+    "country_select_modal_country_mg": "Madagascar",
+    "country_select_modal_country_mw": "Malawi",
+    "country_select_modal_country_my": "Malesia",
+    "country_select_modal_country_mv": "Maldive",
+    "country_select_modal_country_ml": "Mali",
+    "country_select_modal_country_mt": "Malta",
+    "country_select_modal_country_mh": "Isole Marshall",
+    "country_select_modal_country_mq": "Martinica",
+    "country_select_modal_country_mr": "Mauritania",
+    "country_select_modal_country_mu": "Mauritius",
+    "country_select_modal_country_yt": "Mayotte",
+    "country_select_modal_country_mx": "Messico",
+    "country_select_modal_country_fm": "Micronesia",
+    "country_select_modal_country_md": "Moldavia",
+    "country_select_modal_country_mc": "Monaco",
+    "country_select_modal_country_mn": "Mongolia",
+    "country_select_modal_country_me": "Montenegro",
+    "country_select_modal_country_ms": "Montserrat",
+    "country_select_modal_country_ma": "Marocco",
+    "country_select_modal_country_mz": "Mozambico",
+    "country_select_modal_country_na": "Namibia",
+    "country_select_modal_country_nr": "Nauru",
+    "country_select_modal_country_np": "Nepal",
+    "country_select_modal_country_nl": "Paesi Bassi",
+    "country_select_modal_country_nc": "Nuova Caledonia",
+    "country_select_modal_country_nz": "Nuova Zelanda",
+    "country_select_modal_country_ni": "Nicaragua",
+    "country_select_modal_country_ne": "Niger",
+    "country_select_modal_country_ng": "Nigeria",
+    "country_select_modal_country_nu": "Niue",
+    "country_select_modal_country_nf": "Isola Norfolk",
+    "country_select_modal_country_mp": "Isole Marianne Settentrionali",
+    "country_select_modal_country_no": "Norvegia",
+    "country_select_modal_country_om": "Oman",
+    "country_select_modal_country_pk": "Pakistan",
+    "country_select_modal_country_pw": "Palau",
+    "country_select_modal_country_ps": "Territori palestinesi",
+    "country_select_modal_country_pa": "Panamá",
+    "country_select_modal_country_pg": "Papua Nuova Guinea",
+    "country_select_modal_country_py": "Paraguay",
+    "country_select_modal_country_pe": "Perù",
+    "country_select_modal_country_ph": "Filippine",
+    "country_select_modal_country_pn": "Isole Pitcairn",
+    "country_select_modal_country_pl": "Polonia",
+    "country_select_modal_country_pt": "Portogallo",
+    "country_select_modal_country_pr": "Portorico",
+    "country_select_modal_country_qa": "Qatar",
+    "country_select_modal_country_re": "Réunion",
+    "country_select_modal_country_ro": "Romania",
+    "country_select_modal_country_ru": "Federazione Russa",
+    "country_select_modal_country_rw": "Ruanda",
+    "country_select_modal_country_bl": "Saint-Barthélemy",
+    "country_select_modal_country_sh": "Sant’Elena",
+    "country_select_modal_country_kn": "Saint Kitts e Nevis",
+    "country_select_modal_country_lc": "Saint Lucia",
+    "country_select_modal_country_mf": "Saint Martin",
+    "country_select_modal_country_pm": "Saint Pierre e Miquelon",
+    "country_select_modal_country_vc": "Saint Vincent e Grenadines",
+    "country_select_modal_country_ws": "Samoa",
+    "country_select_modal_country_sm": "San Marino",
+    "country_select_modal_country_st": "São Tomé e Príncipe",
+    "country_select_modal_country_sa": "Arabia Saudita",
+    "country_select_modal_country_sn": "Senegal",
+    "country_select_modal_country_rs": "Serbia",
+    "country_select_modal_country_sc": "Seychelles",
+    "country_select_modal_country_sl": "Sierra Leone",
+    "country_select_modal_country_sg": "Singapore",
+    "country_select_modal_country_nl_bq3": "Sint Eustatius",
+    "country_select_modal_country_sx": "Sint Maarten",
+    "country_select_modal_country_sk": "Slovacchia",
+    "country_select_modal_country_si": "Slovenia",
+    "country_select_modal_country_sb": "Isole Solomon",
+    "country_select_modal_country_so": "Somalia",
+    "country_select_modal_country_za": "Sudafrica",
+    "country_select_modal_country_gs": "Georgia del Sud e isole Sandwich meridionali",
+    "country_select_modal_country_ge_so": "Ossetia del Sud",
+    "country_select_modal_country_ss": "Sudan del Sud",
+    "country_select_modal_country_es": "Spagna",
+    "country_select_modal_country_lk": "Sri Lanka",
+    "country_select_modal_country_sd": "Sudan",
+    "country_select_modal_country_sr": "Suriname",
+    "country_select_modal_country_sj_no": "Svalbard",
+    "country_select_modal_country_sz": "Swaziland",
+    "country_select_modal_country_se": "Svezia",
+    "country_select_modal_country_ch": "Svizzera",
+    "country_select_modal_country_sy": "Siria",
+    "country_select_modal_country_tw": "Taiwan",
+    "country_select_modal_country_tj": "Tagikistan",
+    "country_select_modal_country_tz": "Tanzania",
+    "country_select_modal_country_th": "Tailandia",
+    "country_select_modal_country_tg": "Togo",
+    "country_select_modal_country_tk": "Tokelau",
+    "country_select_modal_country_to": "Tonga",
+    "country_select_modal_country_tt": "Trinidad e Tobago",
+    "country_select_modal_country_tn": "Tunisia",
+    "country_select_modal_country_tr": "Turchia",
+    "country_select_modal_country_tm": "Turkmenistan",
+    "country_select_modal_country_tc": "Isole Turks e Caicos",
+    "country_select_modal_country_tv": "Tuvalu",
+    "country_select_modal_country_ug": "Uganda",
+    "country_select_modal_country_ua": "Ucraina",
+    "country_select_modal_country_ae": "Emirati Arabi Uniti",
+    "country_select_modal_country_uk": "Inghilterra",
+    "country_select_modal_country_us": "Stati Uniti",
+    "country_select_modal_country_uy": "Uruguay",
+    "country_select_modal_country_vi": "Isole Vergini Americane",
+    "country_select_modal_country_uz": "Uzbekistan",
+    "country_select_modal_country_vu": "Vanuatu",
+    "country_select_modal_country_ve": "Venezuela",
+    "country_select_modal_country_va": "Città del Vaticano",
+    "country_select_modal_country_vn": "Vietnam",
+    "country_select_modal_country_wf": "Wallis e Futuna",
+    "country_select_modal_country_ye": "Yemen",
+    "country_select_modal_country_zm": "Zambia",
+    "country_select_modal_country_tz_uk": "Zanzibar",
+    "country_select_modal_country_zw": "Zimbabwe"
+}
\ No newline at end of file
diff --git a/app/js/locales/ru-ru.json b/app/js/locales/ru-ru.json
index 1412fd08..b3faa771 100644
--- a/app/js/locales/ru-ru.json
+++ b/app/js/locales/ru-ru.json
@@ -1,5 +1,5 @@
 {
-    "modal_search": "Найти",
+    "modal_search": "Поиск",
     "modal_cancel": "Отменить",
     "modal_next": "Далее",
     "modal_ok": "OK",
@@ -23,8 +23,8 @@
     "country_select_modal_title": "Страна",
     "settings_modal_title": "Настройки",
     "settings_modal_menu_more": "Ещё",
-    "settings_modal_delete_photo": "Удалить фото профиля",
-    "settings_modal_set_photo": "Установить фото профиля",
+    "settings_modal_delete_photo": "Удалить фотографию",
+    "settings_modal_set_photo": "Изменить фотографию",
     "settings_modal_photo_updating": "Обновление",
     "settings_modal_edit_profile": "Редактировать профиль",
     "settings_modal_terminate_sessions": "Завершить все другие сеансы",
@@ -33,10 +33,10 @@
     "settings_modal_vibrate": "Вибросигнал",
     "settings_modal_sounds": "Звук",
     "settings_modal_language": "Язык",
-    "settings_modal_notifications": "Уведомления на рабочем столе",
-    "settings_modal_sound": "Звуковые уведомления",
-    "settings_modal_enter_send_description_md": "**Enter** — отправить, **Shift + Enter** — перенос строки",
-    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Enter** — отправить, **Enter** — перенос строки",
+    "settings_modal_notifications": "Всплывающие уведомления",
+    "settings_modal_sound": "Звуковые оповещения",
+    "settings_modal_enter_send_description_md": "**Enter** — отправка, **Shift + Enter** — перенос строки",
+    "settings_modal_ctrl_enter_send_description_md": "**Ctrl + Enter** — отправка, **Enter** — перенос строки",
     "settings_modal_send_on_enter": "Отправлять по нажатию Enter",
     "settings_modal_phone": "Телефон",
     "settings_modal_about": "О программе",
@@ -66,10 +66,11 @@
     "error_image_download_failed": "Сбой загрузки",
     "error_browser_no_local_file_system_video_md": "Ваш браузер не поддерживает технологию {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | File System API}, которая необходима для воспроизведения этого видео.\nПожалуйста, установите {chrome-link: http://google.com/chrome | Google Chrome} или воспользуйтесь {telegram-link: https://telegram.org/ | мобильным приложением}.",
     "error_video_download_failed": "Сбой загрузки видео",
+    "unread_messages_split": "Непрочитанные сообщения",
     "user_name_deleted": "УДАЛЕНО",
     "user_first_name_deleted": "УДАЛЕНО",
     "user_status_offline": "не в сети",
-    "user_status_online": "в сети",
+    "user_status_online": "online",
     "user_status_last_seen": "был(а) в сети {0}",
     "chat_title_deleted": "УДАЛЕНО",
     "format_size_progress_mulitple": "{done} из {total} {parts}",
@@ -92,15 +93,14 @@
     "group_edit_submit": "Сохранить",
     "group_edit_submit_active": "Сохранение...",
     "confirm_modal_logout": "Вы действительно хотите выйти?",
-    "confirm_modal_update_reload": "Загружена новая версия Webogram. Запустить?",
+    "confirm_modal_update_reload": "Новая версия Telegram Web загружена. Запустить?",
     "confirm_modal_history_flush": "Вы уверены? Это действие не может быть отменено!",
     "confirm_modal_terminate_sessions": "Вы уверены, что хотите завершить все сеансы, кроме этого?",
     "confirm_modal_mixed_content_fail_http_redirect_md": "Ваш браузер {moz-link: не поддерживает} смешанный контент, поэтому MTProto не сможет работать через https. {issue-link: Подробнее}\n\nИспользовать http-версию?",
     "confirm_modal_clipboard_file_send": "Отправить файл(ы) из буфера обмена?",
-    "confirm_modal_clipboard_X_files_send": 
-    "{'one': 'Отправить {} файл из буфера обмена?', 'few': 'Отправить {} файла из буфера обмена?', 'many': 'Отправить {} файлов из буфера обмена?', 'other': 'Отправить {} файлов из буфера обмена?'}",
+    "confirm_modal_clipboard_X_files_send": "{'one': 'Отправить {} файл из буфера обмена?', 'few': 'Отправить {} файла из буфера обмена?', 'many': 'Отправить {} файлов из буфера обмена?', 'other': 'Отправить {} файлов из буфера обмена?'}",
     "confirm_modal_message_delete": "Удалить это сообщение?",
-    "confirm_modal_contacts_import": "Теперь Telegram синхронизирует ваши контакты, чтобы найти ваших друзей.",
+    "confirm_modal_contacts_import": "Telegram выполнит синхронизацию ваших контактов, чтобы найти ваших друзей.",
     "confirm_modal_login_phone_correct": "Проверьте ещё раз ваш номер:",
     "confirm_modal_forward_to_peer": "Переслать пользователю {peer}?",
     "confirm_modal_send_to_peer": "Отправить пользователю {peer}?",
@@ -155,8 +155,8 @@
     "conversation_kicked_user_message": "исключённый пользователь",
     "conversation_unknown_user": "Кто-то",
     "conversation_unknown_chat": "Неизвестный чат",
-    "message_service_created_group": "создал(а) группу {group_name}",
-    "message_service_changed_group_name": "изменил(а) название группы на {group_name}",
+    "message_service_created_group": "создал(а) группу {group-name}",
+    "message_service_changed_group_name": "изменил(а) название группы на {group-name}",
     "message_service_changed_group_photo": "изменил(а) фото группы",
     "message_service_removed_group_photo": "удалил(а) фото группы",
     "message_service_invited_user": "пригласил(а) {user}",
@@ -197,7 +197,7 @@
     "head_settings": "Настройки",
     "head_log_out": "Выйти",
     "head_edit_messages": "Редактировать сообщения",
-    "head_media_photos": "Фото",
+    "head_media_photos": "Фотографии",
     "head_media_video": "Видео",
     "head_media_documents": "Документы",
     "head_media_audio": "Голосовые сообщения",
@@ -231,7 +231,7 @@
     "im_info": "Информация",
     "im_edit": "Редактировать",
     "im_media": "Медиа",
-    "im_media_photos": "Фото",
+    "im_media_photos": "Фотографии",
     "im_media_video": "Видео",
     "im_media_documents": "Документы",
     "im_media_audio": "Голосовые сообщения",
@@ -246,7 +246,7 @@
     "im_clear_history": "Очистить историю",
     "im_delete": "Удалить {count}",
     "im_forward": "Переслать {count}",
-    "im_photos_drop_text": "Перетащите фото сюда для отправки",
+    "im_photos_drop_text": "Перетащите сюда фотографии, чтобы отправить их",
     "im_message_field_placeholder": "Напишите сообщение...",
     "im_media_attach_title": "Отправить медиа",
     "im_attach_file_title": "Отправить файл",
@@ -278,6 +278,7 @@
     "login_sign_up": "Зарегистрироваться",
     "login_controller_unknown_country": "Неизвестно",
     "message_forwarded_message": "Пересланное сообщение",
+    "message_forwarded_message_mobile": "Переслано от {from}, {date}",
     "message_attach_audio_message": "Голосовое сообщение",
     "message_attach_audio_play": "Воспроизвести",
     "message_attach_document_open": "Открыть",
@@ -294,15 +295,15 @@
     "phonebook_modal_submit_active": "Импорт",
     "phonebook_modal_submit": "Импортировать контакты",
     "welcome_header_md": "**Telegram** Web",
-    "welcome_text_1_md": "Это — неофициальный веб-клиент **Telegram**.",
+    "welcome_text_1_md": "Web-клиент **Telegram**.",
     "welcome_text_2_md": "Он всё еще в разработке, поэтому не на 200 % надёжен",
     "welcome_start_messaging": "Начать общение",
-    "welcome_fast_messaging_header": "Быстрый",
+    "welcome_fast_messaging_header": "Скорость",
     "welcome_fast_messaging_text": "Отправляйте сообщения с поддержкой смайлов прямо с вашего компьютера или ноутбука",
     "welcome_easy_sharing_header": "Делитесь файлами",
     "welcome_easy_sharing_text": "Отправляйте любые файлы без ограничений",
     "welcome_powerful_tools_header": "Мощные инструменты",
-    "welcome_powerful_tools_text_md": "Превью фотографий и анимаций в окне чата, \nподдержка YouTube и многое другое",
+    "welcome_powerful_tools_text_md": "Находите медиа-сообщения по типу прикрепления\nи управляйте получаемыми оповещениями",
     "country_select_modal_country_ab": "Абхазия",
     "country_select_modal_country_af": "Афганистан",
     "country_select_modal_country_ax": "Аландские о-ва",
diff --git a/app/js/services.js b/app/js/services.js
index 5d749e83..28a227af 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -1935,25 +1935,25 @@ angular.module('myApp.services', ['myApp.i18n'])
       notificationMessage = RichTextProcessor.wrapPlainText(message.message);
     } else if (message.media && message.media._ != 'messageMediaEmpty') {
       switch (message.media._) {
-        case 'messageMediaPhoto': notificationMessage = _('conversation_media_photo'); break;
-        case 'messageMediaVideo': notificationMessage = _('conversation_media_video'); break;
-        case 'messageMediaDocument': notificationMessage = message.media.document.file_name || _('conversation_media_document'); break;
-        case 'messageMediaAudio': notificationMessage = _('conversation_media_audio'); break;
-        case 'messageMediaGeo': notificationMessage = _('conversation_media_location'); break;
-        case 'messageMediaContact': notificationMessage = _('conversation_media_contact'); break;
-        default: notificationMessage = _('conversation_media_attachment'); break;
+        case 'messageMediaPhoto': notificationMessage = _('conversation_media_photo_raw'); break;
+        case 'messageMediaVideo': notificationMessage = _('conversation_media_video_raw'); break;
+        case 'messageMediaDocument': notificationMessage = message.media.document.file_name || _('conversation_media_document_raw'); break;
+        case 'messageMediaAudio': notificationMessage = _('conversation_media_audio_raw'); break;
+        case 'messageMediaGeo': notificationMessage = _('conversation_media_location_raw'); break;
+        case 'messageMediaContact': notificationMessage = _('conversation_media_contact_raw'); break;
+        default: notificationMessage = _('conversation_media_attachment_raw'); break;
       }
     } else if (message._ == 'messageService') {
       switch (message.action._) {
-        case 'messageActionChatCreate': notificationMessage = _('conversation_group_created'); break;
-        case 'messageActionChatEditTitle': notificationMessage = _('conversation_group_renamed'); break;
-        case 'messageActionChatEditPhoto': notificationMessage = _('conversation_group_photo_updated'); break;
-        case 'messageActionChatDeletePhoto': notificationMessage = _('conversation_group_photo_removed'); break;
+        case 'messageActionChatCreate': notificationMessage = _('conversation_group_created_raw'); break;
+        case 'messageActionChatEditTitle': notificationMessage = _('conversation_group_renamed_raw'); break;
+        case 'messageActionChatEditPhoto': notificationMessage = _('conversation_group_photo_updated_raw'); break;
+        case 'messageActionChatDeletePhoto': notificationMessage = _('conversation_group_photo_removed_raw'); break;
         case 'messageActionChatAddUser':
-          notificationMessage = message.action.user_id == message.from_id ? _('conversation_returned_to_group') : _('conversation_invited_user_message');
+          notificationMessage = message.action.user_id == message.from_id ? _('conversation_returned_to_group') : _('conversation_invited_user_message_raw');
           break;
         case 'messageActionChatDeleteUser':
-          notificationMessage = message.action.user_id == message.from_id ? _('conversation_left_group') : _('conversation_kicked_user_message');
+          notificationMessage = message.action.user_id == message.from_id ? _('conversation_left_group') : _('conversation_kicked_user_message_raw');
           break;
       }
     }
@@ -1968,9 +1968,9 @@ angular.module('myApp.services', ['myApp.i18n'])
       peerString = AppUsersManager.getUserString(peerID);
 
     } else {
-      notification.title = (fromUser.first_name || fromUser.last_name || _('conversation_unknown_user')) +
+      notification.title = (fromUser.first_name || fromUser.last_name || _('conversation_unknown_user_raw')) +
                            ' @ ' +
-                           (AppChatsManager.getChat(-peerID).title || _('conversation_unknown_chat'));
+                           (AppChatsManager.getChat(-peerID).title || _('conversation_unknown_chat_raw'));
 
       notificationPhoto = AppChatsManager.getChatPhoto(-peerID, 'Group');