diff --git a/mastodon/src/main/res/values-ar-rDZ/strings_sk.xml b/mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
deleted file mode 100644
index 3668745aa..000000000
--- a/mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="sk_confirm_delete_and_redraft">هل أنت متأكد أنك تريد حذف وإعادة صياغة هذا المنشور؟</string>
-    <string name="sk_visibility_unlisted">غير مدرج</string>
-    <string name="sk_list_timelines">القوائم</string>
-    <string name="sk_follow_requests">طلبات المتابعة</string>
-    <string name="sk_pinned_posts">مدبّس</string>
-    <string name="sk_delete_and_redraft">حذف وإعادة الصياغة</string>
-    <string name="sk_confirm_delete_and_redraft_title">حذف وإعادة صياغة الرسالة</string>
-    <string name="sk_pin_post">تدبيس على الصفحة الشخصية</string>
-    <string name="sk_confirm_pin_post_title">تدبيس الرسالة على الصفحة الشخصية</string>
-    <string name="sk_settings_show_federated_timeline">إظهار الخيط الفديرالي</string>
-    <string name="sk_settings_contribute">المساهمة في Megalodon</string>
-    <string name="sk_accept_follow_request">قبول طلب المتابعة</string>
-    <string name="sk_reject_follow_request">رفض طلب المتابعة</string>
-    <string name="sk_lists_with_user">قوائم بها %s</string>
-</resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-ar-rSA/strings_sk.xml b/mastodon/src/main/res/values-ar-rSA/strings_sk.xml
deleted file mode 100644
index 045e125f3..000000000
--- a/mastodon/src/main/res/values-ar-rSA/strings_sk.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
diff --git a/mastodon/src/main/res/values-ar/strings_sk.xml b/mastodon/src/main/res/values-ar/strings_sk.xml
index c8aea7a8d..f4183214f 100644
--- a/mastodon/src/main/res/values-ar/strings_sk.xml
+++ b/mastodon/src/main/res/values-ar/strings_sk.xml
@@ -2,7 +2,16 @@
 <resources>
     <string name="sk_confirm_delete_and_redraft">هل أنت متأكد أنك تريد حذف وإعادة صياغة هذا المنشور؟</string>
     <string name="sk_pin_post">تثبيت في الملف الشخصي</string>
-    <string name="sk_pinned_posts">مثبت</string>
+    <string name="sk_pinned_posts">المُثَبَّتَة</string>
     <string name="sk_delete_and_redraft">حذف وإعادة صياغة</string>
     <string name="sk_confirm_delete_and_redraft_title">حذف وإعادة صياغة المنشور</string>
+    <string name="sk_visibility_unlisted">غير مدرج</string>
+    <string name="sk_list_timelines">القوائم</string>
+    <string name="sk_follow_requests">طلبات المتابعة</string>
+    <string name="sk_confirm_pin_post_title">تدبيس الرسالة على الصفحة الشخصية</string>
+    <string name="sk_settings_show_federated_timeline">إظهار الخيط الفديرالي</string>
+    <string name="sk_settings_contribute">المساهمة في Megalodon</string>
+    <string name="sk_accept_follow_request">قبول طلب المتابعة</string>
+    <string name="sk_reject_follow_request">رفض طلب المتابعة</string>
+    <string name="sk_lists_with_user">قوائم بها %s</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-pt/strings_sk.xml b/mastodon/src/main/res/values-pt/strings_sk.xml
deleted file mode 100644
index a93f10998..000000000
--- a/mastodon/src/main/res/values-pt/strings_sk.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="sk_app_name">Megalodon</string>
-    <string name="sk_pinned_posts">Fixado</string>
-    <string name="sk_delete_and_redraft">Apagar e reescrever</string>
-    <string name="sk_confirm_delete_and_redraft">Tem a certeza que pretende apagar e reescrever esta publicação\?</string>
-    <string name="sk_confirm_unpin_post">Tem a certeza que deseja desafixar esta publicação\?</string>
-    <string name="sk_settings_reply_visibility_all">Todas as respostas</string>
-    <string name="sk_settings_load_new_posts">Carregar novas publicações automaticamente</string>
-    <string name="sk_user_post_notifications_off">Desligar as notificações de publicação para %s</string>
-    <string name="sk_federated_timeline_info_banner">Estas são as publicações mais recentes das pessoas na tua federação.</string>
-    <string name="sk_confirm_delete_and_redraft_title">Apagar e reescrever publicação</string>
-    <string name="sk_pin_post">Fixar no perfil</string>
-    <string name="sk_confirm_pin_post_title">Fixar publicação no perfil</string>
-    <string name="sk_confirm_pin_post">Deseja fixar esta publicação ao seu perfil\?</string>
-    <string name="sk_pinning">A fixar a publicação…</string>
-    <string name="sk_unpin_post">Desafixar do perfil</string>
-    <string name="sk_confirm_unpin_post_title">Desafixar publicação do perfil</string>
-    <string name="sk_unpinning">A desafixar publicação…</string>
-    <string name="sk_image_description">Descrição da imagem</string>
-    <string name="sk_visibility_unlisted">Não listado</string>
-    <string name="sk_settings_show_replies">Mostrar respostas</string>
-    <string name="sk_quoting_user">Citação %s</string>
-    <string name="sk_settings_reply_visibility">Visibilidade da resposta</string>
-    <string name="sk_clear_recent_languages">Apagar idiomas usados recentemente</string>
-    <string name="sk_settings_reply_visibility_following">Respostas aos meus comentários</string>
-    <string name="sk_settings_reply_visibility_self">Respostas a mim</string>
-    <string name="sk_settings_show_boosts">Mostrar impulsionamentos</string>
-    <string name="sk_settings_show_interaction_counts">Mostrar contagem de interações</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
-    <string name="sk_mark_media_as_sensitive">Marcar conteúdo como sensível</string>
-    <string name="sk_user_post_notifications_on">Ligar as notificações de publicação para %s</string>
-    <string name="sk_federated_timeline">Federação</string>
-    <string name="sk_update_available">Megalodon %s pronto a descarregar.</string>
-    <string name="sk_update_ready">Megalodon %s descarregado e pronto a instalar.</string>
-    <string name="sk_check_for_update">A verificar atualizações</string>
-    <string name="sk_no_update_available">Sem atualizações disponíveis</string>
-    <string name="sk_list_timelines">Listas</string>
-    <string name="sk_follow_requests">Pedidos para seguir</string>
-    <string name="sk_accept_follow_request">Aceitar pedido para seguir</string>
-    <string name="sk_reject_follow_request">Rejeitar pedido para seguir</string>
-    <string name="sk_lists_with_user">Listas com %s</string>
-    <string name="sk_settings_always_reveal_content_warnings">Mostrar sempre avisos de conteúdo</string>
-</resources>
\ No newline at end of file
diff --git a/metadata/ar_DZ/full_description.txt b/metadata/ar/full_description.txt
similarity index 100%
rename from metadata/ar_DZ/full_description.txt
rename to metadata/ar/full_description.txt
diff --git a/metadata/ar_DZ/short_description.txt b/metadata/ar/short_description.txt
similarity index 100%
rename from metadata/ar_DZ/short_description.txt
rename to metadata/ar/short_description.txt
diff --git a/metadata/my-MM/short_description.txt b/metadata/my/short_description.txt
similarity index 100%
rename from metadata/my-MM/short_description.txt
rename to metadata/my/short_description.txt
diff --git a/metadata/my-MM/title.txt b/metadata/my/title.txt
similarity index 100%
rename from metadata/my-MM/title.txt
rename to metadata/my/title.txt
diff --git a/metadata/pt/changelogs/50.txt b/metadata/pt-PT/changelogs/50.txt
similarity index 100%
rename from metadata/pt/changelogs/50.txt
rename to metadata/pt-PT/changelogs/50.txt
diff --git a/metadata/pt/changelogs/51.txt b/metadata/pt-PT/changelogs/51.txt
similarity index 100%
rename from metadata/pt/changelogs/51.txt
rename to metadata/pt-PT/changelogs/51.txt
diff --git a/metadata/pt/changelogs/55.txt b/metadata/pt-PT/changelogs/55.txt
similarity index 100%
rename from metadata/pt/changelogs/55.txt
rename to metadata/pt-PT/changelogs/55.txt
diff --git a/metadata/pt/changelogs/56.txt b/metadata/pt-PT/changelogs/56.txt
similarity index 100%
rename from metadata/pt/changelogs/56.txt
rename to metadata/pt-PT/changelogs/56.txt
diff --git a/metadata/pt/changelogs/59.txt b/metadata/pt-PT/changelogs/59.txt
similarity index 100%
rename from metadata/pt/changelogs/59.txt
rename to metadata/pt-PT/changelogs/59.txt
diff --git a/metadata/pt/changelogs/61.txt b/metadata/pt-PT/changelogs/61.txt
similarity index 100%
rename from metadata/pt/changelogs/61.txt
rename to metadata/pt-PT/changelogs/61.txt
diff --git a/metadata/pt/full_description.txt b/metadata/pt-PT/full_description.txt
similarity index 100%
rename from metadata/pt/full_description.txt
rename to metadata/pt-PT/full_description.txt
diff --git a/metadata/pt/short_description.txt b/metadata/pt-PT/short_description.txt
similarity index 100%
rename from metadata/pt/short_description.txt
rename to metadata/pt-PT/short_description.txt
diff --git a/metadata/pt/title.txt b/metadata/pt-PT/title.txt
similarity index 100%
rename from metadata/pt/title.txt
rename to metadata/pt-PT/title.txt