diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 4f08453..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-
-## 1.12
-- transmit to the particular station (press and hold the station in the list)
-- back button exits setting
-- French locale support (thanks to Poussinou)
-
-## 1.11
-- check WiFi status on start
-- use Volume Up/Down buttons to talk
-
-## 1.10
-- fixed NPE on app restart
-- fixed double activity instance on notification
-
-## 1.9
-- support background operation in receiver mode
diff --git a/README.md b/README.md
index 8891c05..e139cf4 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,18 @@
# WalkieTalkie
-This program transmits sound recorded from microphone
-to some other devices running the same program
-on the same network segment, so works like Walkie Talkie radio.
+This app transmits sound recorded from microphone to other devices
+running the same app on the same network, so works like Walkie Talkie radio.
-Devices find each other by Android NSD (aka Bonjour),
-no any configuration required. Unfortunately Android NSD
-implementation is not stable enough, so sometimes application
-can not establish connection properly. Application restart
-or device reboot usually helps. Audio data is being transmitted
-by the unicast channel (TCP/IP), so each device works as a server and
-as a client at the same time.
+Devices find each other by Android NSD (i.e. Bonjour), no any configuration required.
+Unfortunately Android NSD implementation is not stable enough,
+so sometimes application can not establish connection properly.
+Application restart or device reboot usually helps.
+
+Audio data is being transmitted by the unicast channel (TCP/IP).
+So each device works as a server and as a client at the same time.
Program was implemented as a demonstration of JS-Collider:
Java high performance scalable NIO framework, see
diff --git a/fastlane/metadata/android /en-US/changelogs/10.txt b/fastlane/metadata/android /en-US/changelogs/10.txt
new file mode 100644
index 0000000..bb57b1b
--- /dev/null
+++ b/fastlane/metadata/android /en-US/changelogs/10.txt
@@ -0,0 +1,2 @@
+## 1.9
+- support background operation in receiver mode
diff --git a/fastlane/metadata/android /en-US/changelogs/11.txt b/fastlane/metadata/android /en-US/changelogs/11.txt
new file mode 100644
index 0000000..e4c657b
--- /dev/null
+++ b/fastlane/metadata/android /en-US/changelogs/11.txt
@@ -0,0 +1,3 @@
+## 1.10
+- fixed NPE on app restart
+- fixed double activity instance on notification
diff --git a/fastlane/metadata/android /en-US/changelogs/14.txt b/fastlane/metadata/android /en-US/changelogs/14.txt
new file mode 100644
index 0000000..8a7224b
--- /dev/null
+++ b/fastlane/metadata/android /en-US/changelogs/14.txt
@@ -0,0 +1,3 @@
+## 1.11
+- check WiFi status on start
+- use Volume Up/Down buttons to talk
diff --git a/fastlane/metadata/android /en-US/changelogs/15.txt b/fastlane/metadata/android /en-US/changelogs/15.txt
new file mode 100644
index 0000000..aed6fbc
--- /dev/null
+++ b/fastlane/metadata/android /en-US/changelogs/15.txt
@@ -0,0 +1,3 @@
+## 1.12
+- transmit to the particular station (press and hold the station in the list)
+- back button exits setting
diff --git a/fastlane/metadata/android /en-US/changelogs/16.txt b/fastlane/metadata/android /en-US/changelogs/16.txt
new file mode 100644
index 0000000..2c64fcb
--- /dev/null
+++ b/fastlane/metadata/android /en-US/changelogs/16.txt
@@ -0,0 +1,2 @@
+## 1.13
+- Fix runtime exception on Android 11
diff --git a/fastlane/metadata/android /en-US/full_description.txt b/fastlane/metadata/android /en-US/full_description.txt
new file mode 100644
index 0000000..630e31b
--- /dev/null
+++ b/fastlane/metadata/android /en-US/full_description.txt
@@ -0,0 +1,6 @@
+This app transmits sound recorded from microphone to other devices
+running the same app on the same network, so works like Walkie Talkie radio.
+
+Devices find each other by Android NSD (i.e. Bonjour), no any configuration required.
+Audio data is being transmitted by the unicast channel (TCP/IP).
+So each device works as a server and as a client at the same time.
\ No newline at end of file
diff --git a/fastlane/metadata/android /en-US/images/icon.png b/fastlane/metadata/android /en-US/images/icon.png
new file mode 100644
index 0000000..6c0e5d0
Binary files /dev/null and b/fastlane/metadata/android /en-US/images/icon.png differ
diff --git a/fastlane/metadata/android /en-US/short_description.txt b/fastlane/metadata/android /en-US/short_description.txt
new file mode 100644
index 0000000..7890832
--- /dev/null
+++ b/fastlane/metadata/android /en-US/short_description.txt
@@ -0,0 +1 @@
+Walkie Talkie over LAN
\ No newline at end of file
diff --git a/fastlane/metadata/android /ru/full_description.txt b/fastlane/metadata/android /ru/full_description.txt
new file mode 100644
index 0000000..32bb593
--- /dev/null
+++ b/fastlane/metadata/android /ru/full_description.txt
@@ -0,0 +1,7 @@
+Это приложение передает звук записанный с микрофона на другие устройства
+с тем же приложением в одной сети, поэтому работает как рация.
+Устройства находят друг друга с помощью NSD (т.е. Bonjour), никакой настройки не требуется.
+
+Аудио передаются по одному каналу (TCP/IP).
+Таким образом каждое устройство работает как сервер и как клиент одновременно.
+
\ No newline at end of file
diff --git a/fastlane/metadata/android /ru/short_description.txt b/fastlane/metadata/android /ru/short_description.txt
new file mode 100644
index 0000000..9eb137c
--- /dev/null
+++ b/fastlane/metadata/android /ru/short_description.txt
@@ -0,0 +1 @@
+Рация по локальной сети
\ No newline at end of file
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..ce019dc
--- /dev/null
+++ b/src/main/res/values-ru/strings.xml
@@ -0,0 +1,33 @@
+
+
+ :
+ О приложении
+
+ Это приложение передает звук записанный с микрофона на другие устройства
+ с тем же приложением в одной сети, поэтому работает как рация.\n\n
+ Устройства находят друг друга с помощью NSD (т.е. Bonjour), никакой настройки не требуется.\n\n
+ Приложение выпущено под лицензией AGPL-3.0 и исходный код доступен по адресу
+ github.com/js-labs/WalkieTalkie\n\n
+
+ Wi-Fi рация
+ Выходить кнопкой Назад
+ Отмена
+ Проверять состояния Wi-Fi при запуске
+ Закрыть
+ Включить
+ Выход
+ Ошибка инициализации сети
+ Никогда не спрашивать снова
+ Служба NSD не найдена
+ \nНАЖМИТЕ ЧТОБЫ ГОВОРИТЬ\n
+ Запущено
+ Сохранить
+ Настройки
+ Название станции
+ Системная ошибка
+ Включить Wi-Fi
+ Использовать кнопки громкости чтобы говорить
+ Громкость
+ Приложение может видеть только устройства подключенные к одной сети Wi-Fi.
+ Wi-Fi отключен
+
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 93d0405..76d04e3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -3,16 +3,13 @@
:
About
- This program transmits sound recorded from microphone to some other devices
- running the same program, so works like Walkie Talkie radio.\n\n
- Devices find each other by NSD (aka Bonjour).\n\n
- Program released under GPL license, source code available at
- https://github.com/js-labs/WalkieTalkie\n\n
- Application use JS-Collider (scalable Java NIO framework), see
- https://github.com/js-labs/js-collider
- for further details.
+ This app transmits sound recorded from microphone to other devices
+ running the same app on the same network, so works like Walkie Talkie radio.\n\n
+ Devices find each other by NSD (i.e. Bonjour), no any configuration required.\n\n
+ The app is released under AGPL-3.0 license and source code available at
+ github.com/js-labs/WalkieTalkie\n\n
- WiFi Walkie Talkie
+ Wi-Fi Walkie Talkie
Back button exits
Cancel
Check WiFi status on start
@@ -24,13 +21,13 @@
NSD service not found
\nPUSH-TO-TALK\n
Running
- Set
+ Save
Settings
Station name
System error
- Turn WiFi on
+ Turn Wi-Fi on
Use volume buttons to talk
Volume
- Application can only see devices connected to the same WiFi network.
- WiFi is off
+ Application can only see devices connected to the same Wi-Fi network.
+ Wi-Fi is off