diff --git a/android/src/fdroid/play/listings/bn/full-description.txt b/android/src/fdroid/play/listings/bn-BD/full-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/bn/full-description.txt
rename to android/src/fdroid/play/listings/bn-BD/full-description.txt
diff --git a/android/src/fdroid/play/listings/bn/short-description.txt b/android/src/fdroid/play/listings/bn-BD/short-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/bn/short-description.txt
rename to android/src/fdroid/play/listings/bn-BD/short-description.txt
diff --git a/android/src/fdroid/play/listings/bn/title.txt b/android/src/fdroid/play/listings/bn-BD/title.txt
similarity index 100%
rename from android/src/fdroid/play/listings/bn/title.txt
rename to android/src/fdroid/play/listings/bn-BD/title.txt
diff --git a/android/src/fdroid/play/listings/bn/video-url.txt b/android/src/fdroid/play/listings/bn-BD/video-url.txt
similarity index 100%
rename from android/src/fdroid/play/listings/bn/video-url.txt
rename to android/src/fdroid/play/listings/bn-BD/video-url.txt
diff --git a/android/src/fdroid/play/listings/cs/full-description.txt b/android/src/fdroid/play/listings/cs-CZ/full-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/cs/full-description.txt
rename to android/src/fdroid/play/listings/cs-CZ/full-description.txt
diff --git a/android/src/fdroid/play/listings/cs/short-description.txt b/android/src/fdroid/play/listings/cs-CZ/short-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/cs/short-description.txt
rename to android/src/fdroid/play/listings/cs-CZ/short-description.txt
diff --git a/android/src/fdroid/play/listings/cs/title.txt b/android/src/fdroid/play/listings/cs-CZ/title.txt
similarity index 100%
rename from android/src/fdroid/play/listings/cs/title.txt
rename to android/src/fdroid/play/listings/cs-CZ/title.txt
diff --git a/android/src/fdroid/play/listings/cs/video-url.txt b/android/src/fdroid/play/listings/cs-CZ/video-url.txt
similarity index 100%
rename from android/src/fdroid/play/listings/cs/video-url.txt
rename to android/src/fdroid/play/listings/cs-CZ/video-url.txt
diff --git a/android/src/fdroid/play/listings/eu/full-description.txt b/android/src/fdroid/play/listings/eu-ES/full-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/eu/full-description.txt
rename to android/src/fdroid/play/listings/eu-ES/full-description.txt
diff --git a/android/src/fdroid/play/listings/eu/short-description.txt b/android/src/fdroid/play/listings/eu-ES/short-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/eu/short-description.txt
rename to android/src/fdroid/play/listings/eu-ES/short-description.txt
diff --git a/android/src/fdroid/play/listings/eu-ES/title.txt b/android/src/fdroid/play/listings/eu-ES/title.txt
new file mode 100644
index 0000000000..3a5e810030
--- /dev/null
+++ b/android/src/fdroid/play/listings/eu-ES/title.txt
@@ -0,0 +1 @@
+Organic Maps Offline ibilbideak eta nabigazioa
diff --git a/android/src/fdroid/play/listings/eu/video-url.txt b/android/src/fdroid/play/listings/eu-ES/video-url.txt
similarity index 100%
rename from android/src/fdroid/play/listings/eu/video-url.txt
rename to android/src/fdroid/play/listings/eu-ES/video-url.txt
diff --git a/android/src/fdroid/play/listings/eu/title.txt b/android/src/fdroid/play/listings/eu/title.txt
deleted file mode 100644
index 794601740b..0000000000
--- a/android/src/fdroid/play/listings/eu/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Organic Maps Offline bizikleta/oinezko ibilbideak eta nabigazioa
diff --git a/android/src/fdroid/play/listings/in/full-description.txt b/android/src/fdroid/play/listings/id/full-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/in/full-description.txt
rename to android/src/fdroid/play/listings/id/full-description.txt
diff --git a/android/src/fdroid/play/listings/in/short-description.txt b/android/src/fdroid/play/listings/id/short-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/in/short-description.txt
rename to android/src/fdroid/play/listings/id/short-description.txt
diff --git a/android/src/fdroid/play/listings/in/title.txt b/android/src/fdroid/play/listings/id/title.txt
similarity index 100%
rename from android/src/fdroid/play/listings/in/title.txt
rename to android/src/fdroid/play/listings/id/title.txt
diff --git a/android/src/fdroid/play/listings/in/video-url.txt b/android/src/fdroid/play/listings/id/video-url.txt
similarity index 100%
rename from android/src/fdroid/play/listings/in/video-url.txt
rename to android/src/fdroid/play/listings/id/video-url.txt
diff --git a/android/src/fdroid/play/listings/it/full-description.txt b/android/src/fdroid/play/listings/it/full-description.txt
deleted file mode 100644
index 09336a2986..0000000000
--- a/android/src/fdroid/play/listings/it/full-description.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-‣ La nostra app gratuita non traccia gli utenti e non ha pubblicità, ed è spinta dalle donazioni.
-‣ Viene costantemente migliorata dal nostro piccolo team, nel nostro tempo libero, utilizzando i nostri soldi e le donazioni/contributi dei nostri utenti.
-‣ Se qualcosa non va o manca sulla mappa, correggilo in <b>OpenStreetMap</b> e osserva le modifiche nel successivo aggiornamento delle mappe.
-‣ Se la navigazione o la ricerca non funzionano, inviaci un'e-mail. Rispondiamo a <i>OGNI</i> email e risolveremo al più presto!
-
-<b>Il tuo feedback e le recensioni a 5 stelle sono di grande motivazione per noi!</b>
-
-Funzionalità principali:
-• Gratuita, open-source, senza pubblicità, non traccia l'utente
-• Mappe offline dettagliate con luoghi che non esistono su Google Maps, grazie alla community <b>OpenStreetMap</b>
-• Percorsi ciclabili, sentieri escursionistici e percorsi pedonali
-• Curve di livello, profili altimetrici, picchi e pendenze
-• Navigazione passo-passo a piedi, in bicicletta e SPERIMENTALE per auto con assistente vocale
-• Ricerca offline veloce
-• Esportazione e importazione di segnalibri nei formati KML/KMZ (GPX sarà presto disponibile)
-• Modalità notte per proteggere i tuoi occhi
-
-<i>Non ci sono ancora</i> Android Auto, trasporti pubblici, mappe satellitari e altre fantastiche funzioni in Organic Maps. Ma con <i>il tuo aiuto e supporto</i>, possiamo migliorare questo mondo passo dopo passo.
-
-Organic Maps è <b>puro e organico, fatto con amore</b>:
-
-• Esperienza offline incredibilmente veloce
-• Rispetta la tua privacy
-• Risparmia la batteria
-• Nessun addebito imprevisto per i dati mobili
-• Semplice da usare, con solo le funzioni più importanti incluse
-
-Libero da tracker e altre cose cattive:
-
-• Nessuna pubblicità
-• Nessun tracker
-• Nessuna raccolta dati
-• Non ti chiama a casa
-• Nessuna registrazione fastidiosa
-• Nessun tutorial obbligatorio
-• Nessuno spam e-mail rumoroso
-• Nessuna notifica push
-• Niente schifezze
-• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Puramente biologico
-
-Qui da Organic Maps crediamo che <b>la privacy sia un diritto umano fondamentale</b>:
-
-• Organic Maps è un progetto open source guidato da una community indipendente
-• Proteggiamo la privacy dagli occhi indiscreti di Big Tech
-• Stai al sicuro ovunque tu sia
-
-Zero tracker e solo autorizzazioni minime richieste, come richiesto dall' Exodus Privacy Report.
-
-Visita il sito Web <b><i>organicmaps.app</i></b> per ulteriori dettagli e domande frequenti e contattaci direttamente all'indirizzo @OrganicMapsApp su Telegram.
-
-Rifiuta la sorveglianza: abbraccia la tua libertà.
-<b>Prova le mappe organiche!</b>
diff --git a/android/src/fdroid/play/listings/it/short-description.txt b/android/src/fdroid/play/listings/it/short-description.txt
deleted file mode 100644
index d5c51235c1..0000000000
--- a/android/src/fdroid/play/listings/it/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mappe open-source gestite dalla comunità per viaggiatori, turisti, ciclisti ecc
diff --git a/android/src/fdroid/play/listings/it/title.txt b/android/src/fdroid/play/listings/it/title.txt
deleted file mode 100644
index 5b21bf094b..0000000000
--- a/android/src/fdroid/play/listings/it/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Organic Maps: Mappe Offline
diff --git a/android/src/fdroid/play/listings/it/video-url.txt b/android/src/fdroid/play/listings/it/video-url.txt
deleted file mode 100644
index a82458173a..0000000000
--- a/android/src/fdroid/play/listings/it/video-url.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://www.youtube.com/watch?v=dK-CUuy82Uc
diff --git a/android/src/fdroid/play/listings/pt-rBR/full-description.txt b/android/src/fdroid/play/listings/pt-rBR/full-description.txt
deleted file mode 100644
index 6a5a40ed3e..0000000000
--- a/android/src/fdroid/play/listings/pt-rBR/full-description.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-‣ Nosso app gratuito não rastreia você e nem tem anúncios.
-‣ Está sendo constantemente aperfeiçoado por nossa pequena equipe, em tempo livre, usando nosso próprio dinheiro e doações/contribuições de nossos usuários.
-‣ Se algo estiver errado ou faltando no mapa, por favor, conserte-o via <b>OpenStreetMap</b> e veja estas mudanças na próxima atualização dos mapas.
-‣ Se a navegação ou a busca não funcionar, por favor, envie-nos um e-mail. Respondemos a <i>CADA</i> email, e vamos consertar tudo o mais rápido possível!
-
-<b>Seu feedback e as avaliações de 5 estrelas são as melhores maneiras de motivar nossa equipe!</b>
-
-Características principais:
-• Grátis, de software livre, sem anúncios, sem rastreamento
-• Mapas offline detalhados com lugares que não existem no Google maps, crédito ao comunidade do <b>OpenStreetMap</b>
-• Rotas para ciclistas, trilhas e áreas para caminhadas
-• Linhas de contorno, perfis de elevação, picos e declives
-• Caminhadas e ciclismo com as direções detalhadas paso a paso e instruções de condução por voz (experimental)
-• Busca rápida offline
-• Exportação e importação de favoritos em formatos KML/KMZ (GPX está chegando em breve)
-• Modo escuro para proteger sua vista
-
-Organic Maps ainda não tem recursos do Android Auto, transporte público, mapas de satélite e outros recursos legais, <i>por enquanto</i>. Mas com a <i>sua ajuda e apoio</i>, podemos tornar este mundo melhor, passo a passo.
-
-Organic Maps é <b>puro e orgânico, feito com amor</b>:
-
-• Desempenho offline incrivelmente rápido
-• Respeita sua privacidade
-• Economiza sua bateria
-• Sem taxas imprevistas de dados móveis
-• Simples de usar, apenas com as características mais importantes incluídas
-
-Livre de rastreadores e outras coisas ruins:
-
-• Sem anúncios
-• Sem rastreamento
-• Sem coleta de dados
-• Sem conexões aos servidores externos
-• Sem registros desnecessários
-• Sem tutoriais obrigatórios
-• Sem spam por e-mail
-• Sem notificações push
-• Sem recursos maliciosos
-• Sem pesticidas, puramente orgânico
-
-Organic Maps, acredita que <b>a privacidade é um direito humano fundamental</b>:
-
-• Organic Maps é um projeto indie de iniciativa comunitária
-• Protegemos a sua privacidade contra os olhos curiosos da Big Tech
-• Fique protegido, não importa onde você esteja
-
-Zero rastreadores e apenas as permissões absolutamente necessárias são exigidas, testado por Exodus Privacy Report.
-
-Por favor, visite o site <b><i>organicmaps.app</i></b> para mais detalhes e FAQ, e entre em contato conosco diretamente @OrganicMapsApp no Telegram.
-
-Rejeite a vigilância - abrace sua liberdade.
-<b>Experimente o Organic Maps!</b>
diff --git a/android/src/fdroid/play/listings/pt-rBR/short-description.txt b/android/src/fdroid/play/listings/pt-rBR/short-description.txt
deleted file mode 100644
index ff2cae018c..0000000000
--- a/android/src/fdroid/play/listings/pt-rBR/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mapas de iniciativa comunitária para viajantes, turistas, ciclistas e mais
diff --git a/android/src/fdroid/play/listings/pt-rBR/title.txt b/android/src/fdroid/play/listings/pt-rBR/title.txt
deleted file mode 100644
index e76e4390ad..0000000000
--- a/android/src/fdroid/play/listings/pt-rBR/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Organic Maps, mapas offline
diff --git a/android/src/fdroid/play/listings/pt-rBR/video-url.txt b/android/src/fdroid/play/listings/pt-rBR/video-url.txt
deleted file mode 100644
index a82458173a..0000000000
--- a/android/src/fdroid/play/listings/pt-rBR/video-url.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://www.youtube.com/watch?v=dK-CUuy82Uc
diff --git a/android/src/fdroid/play/listings/ru/full-description.txt b/android/src/fdroid/play/listings/ru/full-description.txt
deleted file mode 100644
index 15a56b4fe2..0000000000
--- a/android/src/fdroid/play/listings/ru/full-description.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-‣ Наше бесплатное приложение не отслеживает вас и не имеет рекламы, и управляется вашими пожертвованиями.
-‣ Наша небольшая команда постоянно совершенствует его в свободное время, используя собственные деньги и пожертвования/взносы наших пользователей.
-‣ Если что-то не так, или отсутствует на карте, исправьте это в <b>OpenStreetMap</b> и просмотрите изменения в последующем обновлении карт.
-‣ Если навигация или поиск не работают, пожалуйста напишите нам электронное письмо. Мы отвечаем на <i>КАЖДОЕ</i> электронное письмо и исправляем всё так быстро, как только возможно!
-
-<b>Ваши отзывы и пятизвёздочные обзоры — лучшие мотиваторы для нас!</b>
-
-Ключевые особенности:
-• Бесплатно, с открытым исходным кодом, без рекламы и без отслеживания.
-• Подробные офлайн-карты с местами, которых нет на картах Google, благодаря сообществу <b>OpenStreetMap</b>
-• Велосипедные маршруты, пешеходные тропы и пешеходные дорожки
-• Контурные линии, профили высот, пики и склоны
-• Пошаговая ходьба, езда на велосипеде и ЭКСПЕРИМЕНТАЛЬНАЯ автомобильная навигация с голосовыми подсказками
-• Быстрый офлайн-поиск
-• Экспорт и импорт закладок в форматах KML/KMZ (скоро появится GPX)
-• Тёмный режим для защиты глаз
-
-В Organic Maps <i>пока</i> нет Android Auto, общественного транспорта, спутниковых карт и других полезных функций. Но с <i>вашей помощью и поддержкой</i> мы можем шаг за шагом сделать этот мир лучше.
-
-Organic Maps — <b>чистые и натуральные карты, созданные с любовью</b>:
-
-• Поразительная скорость работы в офлайн-режиме
-• Уважают вашу приватность
-• Экономят вашу батарею
-• Отсутствие непредвиденных расходов на мобильный интернет
-• Простота использования, при наличии только самых важных функций
-
-Без трекеров и других плохих вещей:
-
-• Без рекламы
-• Без отслеживания
-• Без сбора данных
-• Без подключений куда-либо при запуске
-• Без необходимости в надоедливой регистрации
-• Без обязательных руководств
-• Без отправки надоедливого спама на электронной почте
-• Без уведомлений
-• Не является обязательным предустановленным приложением
-• Б̶е̶з̶ ̶п̶е̶с̶т̶и̶ц̶и̶д̶о̶в̶ Полностью натурально
-
-В Organic Maps мы верим, что <b>приватность является фундаментальным правом человека</b>:
-
-• Organic Maps — это инди-проект с открытым исходным кодом, управляемый сообществом
-• Мы защищаем приватность от любопытных глаз Больших Корпораций
-• Оставайтесь в безопасности, где бы вы ни находились
-
-Согласно отчёту о приватности Exodus, не обнаружено никаких трекеров и только минимально необходимые разрешения.
-
-Посетите веб-сайт <b><i>organicmaps.app</i></b> для просмотра дополнительных сведений и часто задаваемых вопросов или свяжитесь с нами напрямую через @OrganicMapsApp в Telegram.
-
-Откажитесь от слежки — примите свою свободу.
-<b>Попробуйте Organic Maps!</b>
diff --git a/android/src/fdroid/play/listings/ru/short-description.txt b/android/src/fdroid/play/listings/ru/short-description.txt
deleted file mode 100644
index a140c26e8a..0000000000
--- a/android/src/fdroid/play/listings/ru/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Карты с открытым исходным кодом от сообщества для путешественников и туристов
diff --git a/android/src/fdroid/play/listings/ru/title.txt b/android/src/fdroid/play/listings/ru/title.txt
deleted file mode 100644
index 414f61a27b..0000000000
--- a/android/src/fdroid/play/listings/ru/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Organic Maps — Офлайн Карты
diff --git a/android/src/fdroid/play/listings/zh-rCN/full-description.txt b/android/src/fdroid/play/listings/zh-CN/full-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/zh-rCN/full-description.txt
rename to android/src/fdroid/play/listings/zh-CN/full-description.txt
diff --git a/android/src/fdroid/play/listings/zh-rCN/short-description.txt b/android/src/fdroid/play/listings/zh-CN/short-description.txt
similarity index 100%
rename from android/src/fdroid/play/listings/zh-rCN/short-description.txt
rename to android/src/fdroid/play/listings/zh-CN/short-description.txt
diff --git a/android/src/fdroid/play/listings/zh-rCN/title.txt b/android/src/fdroid/play/listings/zh-CN/title.txt
similarity index 100%
rename from android/src/fdroid/play/listings/zh-rCN/title.txt
rename to android/src/fdroid/play/listings/zh-CN/title.txt