From dd0333a6bb295538f190e6cd68f9013e7b879db4 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 17 Jan 2023 12:48:15 -0600
Subject: [PATCH 01/10] docs: add vmst.io to community instances (#1269)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 00965d63..7fb26c97 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ These are known deployments using Elk as an alternative Web client for Mastodon
 
 - [elk.h4.io](https://elk.h4.io) - Use Elk for the `h4.io` Server
 - [elk.universeodon.com](https://elk.universeodon.com) - Use Elk for the Universeodon Server
+- [elk.vmst.io](https://elk.vmst.io) - Use Elk for the `vmst.io` Server
 
 > **Note**: Community deployments are **NOT** maintained by the Elk team. It may not be synced with Elk's source code. Please do your own research about the host servers before using them.
 

From 2975a38650be2f658904702879650efce94e62b3 Mon Sep 17 00:00:00 2001
From: Piotrek Tomczewski <piotr.tomczewski@noaignite.com>
Date: Tue, 17 Jan 2023 22:05:41 +0100
Subject: [PATCH 02/10] fix(native): Enable window draging by the title bar
 (#1268)

---
 components/main/MainContent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/main/MainContent.vue b/components/main/MainContent.vue
index 8362e592..23e68724 100644
--- a/components/main/MainContent.vue
+++ b/components/main/MainContent.vue
@@ -14,7 +14,7 @@ defineProps<{
       pt="[env(safe-area-inset-top,0)]"
       border="b base" bg="[rgba(var(--rbg-bg-base),0.7)]"
     >
-      <div flex justify-between px5 py2 :class="{ 'xl:hidden': $route.name !== 'tag' }">
+      <div flex justify-between px5 py2 :class="{ 'xl:hidden': $route.name !== 'tag' }" data-tauri-drag-region>
         <div flex gap-3 items-center overflow-hidden py2>
           <NuxtLink
             v-if="backOnSmallScreen || back" flex="~ gap1" items-center btn-text p-0 xl:hidden

From db69a54090594168bd0d31f80974f5a8d827b097 Mon Sep 17 00:00:00 2001
From: Piotrek Tomczewski <piotr.tomczewski@noaignite.com>
Date: Tue, 17 Jan 2023 22:16:47 +0100
Subject: [PATCH 03/10] fix(native): Fixed bug causing inability to enter text
 in search field (#1273)

---
 components/search/SearchWidget.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 15495574..12d27f19 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -66,7 +66,6 @@ const activate = () => {
         bg-transparent
         outline="focus:none"
         pe-4
-        select-none
         :placeholder="isHydrated ? t('nav.search') : ''"
         pb="1px"
         placeholder-text-secondary

From 448b303106beca5c953e2d90c082109937f9f3f1 Mon Sep 17 00:00:00 2001
From: Emanuel Pina <contacto@emanuelpina.pt>
Date: Tue, 17 Jan 2023 21:18:29 +0000
Subject: [PATCH 04/10] fix(i18n): update pt-PT language (#1234)

---
 locales/pt-PT.json | 80 +++++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 25 deletions(-)

diff --git a/locales/pt-PT.json b/locales/pt-PT.json
index 162cb51f..bd0056c7 100644
--- a/locales/pt-PT.json
+++ b/locales/pt-PT.json
@@ -28,7 +28,8 @@
     "muted_users": "Utilizadores silenciados",
     "muting": "Silenciados",
     "mutuals": "Mútuos",
-    "notify_on_post": "Notifique-me quando {username} publicar",
+    "notifications_on_post_disable": "Deixe de me nofiticar quando {username} publicar",
+    "notifications_on_post_enable": "Notifique-me quando {username} publicar",
     "pinned": "Fixado",
     "posts": "Publicações",
     "posts_count": "{0} Publicações|{0} Publicação|{0} Publicações",
@@ -47,7 +48,8 @@
     "boost": "Partilhar",
     "boost_count": "{0}",
     "boosted": "Partilhado",
-    "clear_upload_failed": "Limpar erro de carregamento de ficheiro",
+    "clear_publish_failed": "Limpar erros de publicação",
+    "clear_upload_failed": "Limpar erros de carregamento de ficheiro",
     "close": "Fechar",
     "compose": "Compor",
     "confirm": "Confirmar",
@@ -100,20 +102,51 @@
     "drafts": "Rascunhos ({v})"
   },
   "confirm": {
+    "block_account": {
+      "cancel": "Cancelar",
+      "confirm": "Bloquear",
+      "title": "Tem a certeza que pretende bloquear {0}？"
+    },
+    "block_domain": {
+      "cancel": "Cancelar",
+      "confirm": "Bloquear",
+      "title": "Tem a certeza que pretende bloquear {0}？"
+    },
     "common": {
       "cancel": "Não",
-      "confirm": "Sim",
-      "title": "Tem a certeza?"
+      "confirm": "Sim"
     },
     "delete_posts": {
       "cancel": "Cancelar",
       "confirm": "Eliminar",
       "title": "Tem a certeza que pretende eliminar esta publicação?"
+    },
+    "mute_account": {
+      "cancel": "Cancelar",
+      "confirm": "Silenciar",
+      "title": "Tem a certeza que pretende silenciar {0}？"
+    },
+    "show_reblogs": {
+      "cancel": "Cancelar",
+      "confirm": "Mostrar",
+      "title": "Tem a certeza que prentende mostrar partilhas de {0}？"
+    },
+    "unfollow": {
+      "cancel": "Cancelar",
+      "confirm": "Deixar de seguir",
+      "title": "Tem a certeza que pretende deixar de seguir?"
     }
   },
   "conversation": {
     "with": "com"
   },
+  "custom_cards": {
+    "stackblitz": {
+      "lines": "Linhas {0}",
+      "open": "Abrir",
+      "snippet_from": "Trecho de {0}"
+    }
+  },
   "error": {
     "account_not_found": "Conta {0} não encontrada",
     "explore-list-empty": "Nada está em tendência agora. Confirme mais tarde!",
@@ -253,12 +286,6 @@
       "description": "Editar as configurações da sua conta na aplicação web do Mastodon",
       "label": "Configurações da conta"
     },
-    "feature_flags": {
-      "github_cards": "Cartões do GitHub",
-      "title": "Funcionalidades Experimentais",
-      "user_picker": "Selecionador de Utilizador",
-      "virtual_scroll": "Deslocamento Virtual"
-    },
     "interface": {
       "color_mode": "Modo de cores",
       "dark_mode": "Modo Escuro",
@@ -273,7 +300,8 @@
         "xl": "Extra grande",
         "xs": "Extra pequeno"
       },
-      "system_mode": "Sistema"
+      "system_mode": "Sistema",
+      "theme_color": "Cor to Tema"
     },
     "language": {
       "display_language": "Idioma de Apresentação",
@@ -330,7 +358,15 @@
     },
     "notifications_settings": "Notificações",
     "preferences": {
-      "label": "Preferências"
+      "github_cards": "Cartões do GitHub",
+      "grayscale_mode": "Modo tons de cinza",
+      "hide_boost_count": "Esconder contagem de partilhas",
+      "hide_favorite_count": "Esconder contagem de favoritos",
+      "hide_follower_count": "Esconder contagem de seguidores",
+      "label": "Preferências",
+      "title": "Funcionalidades Experimentais",
+      "user_picker": "Selecionador de Utilizador",
+      "virtual_scroll": "Deslocamento Virtual"
     },
     "profile": {
       "appearance": {
@@ -353,14 +389,6 @@
       "export": "Exportar Tokens de Acesso",
       "import": "Importar Tokens de Acesso",
       "label": "Utilizadores conectados"
-    },
-    "wellness": {
-      "feature": {
-        "hide_boost_count": "Esconder contagem de partilhas",
-        "hide_favorite_count": "Esconder contagem de favoritos",
-        "hide_follower_count": "Esconder contagem de seguidores"
-      },
-      "label": "Bem-estar"
     }
   },
   "share-target": {
@@ -374,8 +402,9 @@
     "edited": "(Editado)",
     "editing": "Editando",
     "loading": "Carregando...",
+    "publish_failed": "Publicação falhou",
     "publishing": "Publicando",
-    "upload_failed": "Falhou carregamento",
+    "upload_failed": "Carregamento falhou",
     "uploading": "A carregar..."
   },
   "status": {
@@ -395,7 +424,7 @@
       "finished": "terminou {0}"
     },
     "reblogged": "{0} partilhou",
-    "replying_to": "Respondendo a {0}",
+    "replying_to": "Em resposta a {0}",
     "show_full_thread": "Mostrar toda a conversa",
     "someone": "alguém",
     "spoiler_show_less": "Mostrar menos",
@@ -445,9 +474,9 @@
     "short_month_past": "{n}M",
     "short_second_future": "em {n}s",
     "short_second_past": "{n}s",
-    "short_week_future": "in {n}S",
+    "short_week_future": "em{n}S",
     "short_week_past": "{n}S",
-    "short_year_future": "in {n}A",
+    "short_year_future": "em {n}A",
     "short_year_past": "{n}A",
     "week_future": "em 0 semanas|próxima semana|em {n} semanas",
     "week_past": "0 semanas atrás|semana passada|{n} semanas atrás",
@@ -473,6 +502,7 @@
     "explore_links_intro": "Estas notícias estão, neste momento, a ser faladas por pessoas neste e noutros servidores da rede descentralizada.",
     "explore_posts_intro": "Estas publicações deste e de outros servidores na rede descentralizada estão, neste momento, a ganhar popularidade neste servidor.",
     "explore_tags_intro": "Estes hashtags estão, neste momento, a ganhar popularidade entre as pessoas neste e noutros servidores da rede descentralizada.",
+    "publish_failed": "Fechar mensagens de falha no topo do editor para republicar publicações",
     "toggle_code_block": "Alternar bloco de código"
   },
   "user": {
@@ -492,6 +522,6 @@
     "public": "Publico",
     "public_desc": "Visível por todos",
     "unlisted": "Não listada",
-    "unlisted_desc": "Visível por todos, mas não incluida nas funcionalidades de divulgação"
+    "unlisted_desc": "Visível por todos, mas não incluída nas funcionalidades de divulgação"
   }
 }

From 5b849baec785ad701882e46c022b690ae06b4b73 Mon Sep 17 00:00:00 2001
From: MiniNaim <mininaim@gmail.com>
Date: Tue, 17 Jan 2023 22:26:44 +0100
Subject: [PATCH 05/10] fix(i18n): update Arabic (#1224)

---
 locales/ar-EG.json | 124 +++++++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 54 deletions(-)

diff --git a/locales/ar-EG.json b/locales/ar-EG.json
index 40d246c8..3d04ccfa 100644
--- a/locales/ar-EG.json
+++ b/locales/ar-EG.json
@@ -10,7 +10,7 @@
     "avatar_description": "صورة حساب {0}",
     "blocked_by": "تم حظرك من قبل هذا المستخدم",
     "blocked_domains": "النطاقات المحظورة",
-    "blocked_users": "المستخدمين المحظورين",
+    "blocked_users": "المستخدمون المحظورون",
     "blocking": "محظور",
     "bot": "حساب آلي",
     "favourites": "المفضلة",
@@ -25,9 +25,9 @@
     "go_to_profile": "اعرض الصفحة التعريفية",
     "joined": "انضم",
     "moved_title": "أشار إلى أن حسابهم الجديد أصبح على",
-    "muted_users": "المستخدمين المكتومين",
-    "muting": "قُمتَ(ي) بكتم",
-    "mutuals": "المتبادلين",
+    "muted_users": "المستخدمون المكتومون",
+    "muting": "قُمت بكتم",
+    "mutuals": "المتبادلون",
     "pinned": "المثبتة",
     "posts": "المنشورات",
     "posts_count": "{0} منشورات|{0} منشور|{0} منشورين|{0} منشورات|{0} منشور|{0} منشور",
@@ -47,12 +47,12 @@
     "clear_upload_failed": "مسح أخطاء تحميل الملف",
     "close": "أغلق",
     "compose": "منشور جديد",
-    "confirm": "أكد",
+    "confirm": "تأكد",
     "edit": "تعديل",
     "enter_app": "أدخل التطبيق",
-    "favourite": "إضافة إلى المفضلين",
+    "favourite": "إضافة إلى المفضلة",
     "favourite_count": "{0}",
-    "favourited": "مضاف إلى المفضلين",
+    "favourited": "مضاف إلى المفضلة",
     "more": "المزيد",
     "next": "التالي",
     "prev": "السابق",
@@ -64,9 +64,9 @@
     "save_changes": "حفظ التغييرات",
     "sign_in": "تسجيل الدخول",
     "switch_account": "تغيير الحساب",
-    "vote": "قم بالتصويت"
+    "vote": "تصويت"
   },
-  "app_desc_short": "موقع الكتروني ماستدون رشيق",
+  "app_desc_short": "منصة تواصل Mastodon رشيقة",
   "app_logo": "Elk شعار",
   "app_name": "Elk",
   "attachment": {
@@ -74,39 +74,33 @@
     "remove_label": "قم بإزالة المرفق"
   },
   "command": {
-    "activate": "تفعيل",
+    "activate": "فعل",
     "complete": "أكمل",
-    "compose_desc": "اكتب منشور جديد",
+    "compose_desc": "اكتب منشورا جديدا",
     "n-people-in-the-past-n-days": "{0} أشخاص في الأيام ال {1} الماضية",
-    "select_lang": "اختار اللغة",
+    "select_lang": "اختر اللغة",
     "sign_in_desc": "إضافة حساب قائم",
     "switch_account": "التبديل إلى {0}",
     "switch_account_desc": "قم بالتبديل إلى حساب آخر",
-    "toggle_dark_mode": "تبديل المظهر الداكن",
-    "toggle_zen_mode": "تبديل وضع الهدوء"
+    "toggle_dark_mode": "تبديل الوضع الليلي",
+    "toggle_zen_mode": "تبديل الوضع الهادئ"
   },
   "common": {
+    "confirm_dialog": {
+      "cancel": "لا",
+      "confirm": "نعم",
+      "title": "هل أنت متأكد؟"
+    },
     "end_of_list": "نهاية القائمة",
     "error": "حدث خطأ",
     "in": "في",
-    "not_found": "404 غير معثور عليه",
+    "not_found": "404 غير موجود",
     "offline_desc": "يبدو أنك غير متصل بالإنترنت. يرجى التحقق من اتصالك."
   },
   "compose": {
     "draft_title": "مسودة {0}",
     "drafts": "المسودات ({v})"
   },
-  "confirm": {
-    "common": {
-      "cancel": "كلا",
-      "confirm": "نعم"
-    },
-    "delete_posts": {
-      "cancel": "إلغاء",
-      "confirm": "حذف",
-      "title": "هل أنت متأكد أنك تريد حذف هذا المنشور؟"
-    }
-  },
   "conversation": {
     "with": "مع"
   },
@@ -137,6 +131,11 @@
     "copy_link_to_post": "انسخ الرابط إلى هذا المنشور",
     "delete": "حذف",
     "delete_and_redraft": "حذف وإعادة صياغة",
+    "delete_confirm": {
+      "cancel": "إلغاء",
+      "confirm": "حذف",
+      "title": "هل أنت متأكد أنك تريد حذف هذا المنشور؟"
+    },
     "direct_message_account": "إرسال رسالة مباشرة إلى {0}",
     "edit": "تعديل",
     "hide_reblogs": "إخفاء المشاركات من {0}",
@@ -150,8 +149,8 @@
     "show_reblogs": "عرض المشاركات من {0}",
     "show_untranslated": "عرض بدون ترجمة",
     "toggle_theme": {
-      "dark": "تبديل المظهر الداكن",
-      "light": "تبديل المظهر الفاتح"
+      "dark": "التغيير إلى الوضع الداكن",
+      "light": "التغيير إلى الوضع الفاتح"
     },
     "translate_post": "ترجم المنشور",
     "unblock_account": "رفع الحظر عن {0}",
@@ -181,7 +180,7 @@
     "select_language": "اختار اللغة",
     "settings": "الإعدادات",
     "show_intro": "عرض المقدمة",
-    "toggle_theme": "تبديل المظهر",
+    "toggle_theme": "تغيير الوضع",
     "zen_mode": "الوضع الهادئ"
   },
   "notification": {
@@ -208,22 +207,22 @@
     "update_available_short": "تحديث Elk",
     "webmanifest": {
       "canary": {
-        "description": "A nimble Mastodon web client (canary)",
-        "name": "Elk (canary)",
-        "short_name": "Elk (canary)"
+        "description": "نسخة ويب رشيقة ل Mastodon (النسخة الإنشائية)",
+        "name": "Elk (النسخة الإنشائية)",
+        "short_name": "Elk (النسخة الإنشائية)"
       },
       "dev": {
-        "description": "A nimble Mastodon web client (dev)",
-        "name": "Elk (dev)",
-        "short_name": "Elk (dev)"
+        "description": "نسخة ويب رشيقة ل Mastodon (النسخة التطويرية)",
+        "name": "Elk (النسخة التطويرية)",
+        "short_name": "Elk (النسخة التطويرية)"
       },
       "preview": {
-        "description": "A nimble Mastodon web client (preview)",
-        "name": "Elk (preview)",
-        "short_name": "Elk (preview)"
+        "description": "نسخة ويب رشيقة ل Mastodon (معاينة)",
+        "name": "Elk (معاينة)",
+        "short_name": "Elk (معاينة)"
       },
       "release": {
-        "description": "A nimble Mastodon web client",
+        "description": "نسخة ويب رشيقة ل Mastodon",
         "name": "Elk",
         "short_name": "Elk"
       }
@@ -231,20 +230,33 @@
   },
   "search": {
     "search_desc": "ابحث عن الأشخاص والهاشتاج",
-    "search_empty": "لا يمكن العثور على أي شيء لشروط البحث هذه"
+    "search_empty": "لم يتم العثور على أي نتائج لشروط البحث الخاصة بك"
   },
   "settings": {
     "about": {
-      "label": "بشأن Elk"
+      "label": "حول Elk",
+      "meet_the_team": "تعرف على فريقنا",
+      "sponsor_action": "تمويل Elk",
+      "sponsor_action_desc": "لتمويل تطوير Elk والمساعدة في تحسينه",
+      "sponsors": "الرعاة",
+      "sponsors_body_1": "تم تمويل Elk من قبل الشركات والأفراد التاليين:",
+      "sponsors_body_2": "وكذا من قبل الشركات التالية:",
+      "sponsors_body_3": "إذا كنت تستمتع بإستخدام Elk، فنحن نشجعك على التبرع لدعم المشروع."
     },
     "account_settings": {
       "description": "قم بتحرير إعدادات حسابك في موقع Mastodon الأصلي",
       "label": "إعدادت الحساب"
     },
+    "feature_flags": {
+      "github_cards": "بطاقات GitHub",
+      "title": "الميزات التجريبية",
+      "user_picker": "الشريط الجانبي لمبدل المستخدم",
+      "virtual_scroll": "التمرير الافتراضي"
+    },
     "interface": {
       "color_mode": "وضع اللون",
       "dark_mode": "الوضع الداكن",
-      "default": "(إفتراضي)",
+      "default": " (إفتراضي)",
       "font_size": "حجم الخط",
       "label": "واجهه المستخدم",
       "light_mode": "وضع الضوء",
@@ -254,7 +266,8 @@
         "sm": "صغير",
         "xl": "ضخم",
         "xs": "صغير جدا"
-      }
+      },
+      "system_mode": "النظام"
     },
     "language": {
       "display_language": "اللغة المعروضة",
@@ -289,7 +302,8 @@
           "clear_error": "خطأ في المسح",
           "permission_denied": "تم رفض الإذن: قم بتمكين التنبيهات في متصفحك.",
           "request_error": "حدث خطأ أثناء طلب الاشتراك ، حاول مرة أخرى وإذا استمر الخطأ ، يرجى إبلاغ Elk بالمشكلة.",
-          "title": "الاشتراك في التنبيهات غير ناجح"
+          "title": "الاشتراك في التنبيهات غير ناجح",
+          "too_many_registrations": "بسبب القيود في المتصفح ، لا يمكن لـ Elk استخدام خدمة التنبيهات الفورية لعدة حسابات على خوادم مختلفة. يجب عليك إلغاء الاشتراك في التنبيهات الفورية على حسابات أخرى والمحاولة مرة أخرى."
         },
         "title": "إعدادات التنبيهات",
         "undo_settings": "تراجع عن تغييرات الإعدادات",
@@ -310,14 +324,7 @@
     },
     "notifications_settings": "التنبيهات",
     "preferences": {
-      "github_cards": "GitHub بطاقات",
-      "hide_boost_count": "إخفاء عدد المشاركات",
-      "hide_favorite_count": "إخفاء عدد المفضلة",
-      "hide_follower_count": "إخفاء عدد المتابعين",
-      "label": "التفضيلات",
-      "title": "الميزات التجريبية",
-      "user_picker": "الشريط الجانبي لمبدل المستخدم",
-      "virtual_scroll": "التمرير الافتراضي"
+      "label": "التفضيلات"
     },
     "profile": {
       "appearance": {
@@ -337,9 +344,17 @@
     },
     "select_a_settings": "اختر الإعداد",
     "users": {
-      "export": "Export User Tokens",
-      "import": "Import User Tokens",
+      "export": "تصدير معلومات المستخدم",
+      "import": "استيراد معلومات المستخدم",
       "label": "المستخدمون المسجلون"
+    },
+    "wellness": {
+      "feature": {
+        "hide_boost_count": "إخفاء عدد المشاركات",
+        "hide_favorite_count": "إخفاء عدد المفضلة",
+        "hide_follower_count": "إخفاء عدد المتابعين"
+      },
+      "label": "الصحة العامة"
     }
   },
   "state": {
@@ -438,6 +453,7 @@
   },
   "tooltip": {
     "add_content_warning": "إضافة تحذير المحتوى",
+    "add_emojis": "إضافة رمز تعبيري",
     "add_media": "أضف صورًا أو مقطع فيديو أو ملفًا صوتيًا",
     "add_publishable_content": "أضف محتوى للنشر",
     "change_content_visibility": "تغيير خصوصية المحتوى",

From a7e1dad3d20773f8e643a2a418c5b545f575dc18 Mon Sep 17 00:00:00 2001
From: Joran Quinten <joran@joranquinten.nl>
Date: Tue, 17 Jan 2023 22:28:37 +0100
Subject: [PATCH 06/10] fix(i18n): improve several translations nl-NL (#1214)

---
 locales/nl-NL.json | 104 ++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/locales/nl-NL.json b/locales/nl-NL.json
index 373ef1e7..cda26e49 100644
--- a/locales/nl-NL.json
+++ b/locales/nl-NL.json
@@ -18,13 +18,13 @@
     "follow_back": "Volg terug",
     "follow_requested": "Aangevraagd",
     "followers": "Volgers",
-    "followers_count": "{0} Followers|{0} Follower|{0} Followers",
+    "followers_count": "{0} Volgers|{0} Volger|{0} Volgers",
     "following": "Volgend",
     "following_count": "{0} Volgend",
     "follows_you": "Volgt jou",
     "go_to_profile": "Ga naar profiel",
     "joined": "Lid geworden",
-    "moved_title": "heeft aangegeven hun nieuwe account is nu:",
+    "moved_title": "heeft het account verplaatst naar:",
     "muted_users": "Gedempte gebruikers",
     "muting": "Gedempt",
     "mutuals": "Gedeeld",
@@ -46,8 +46,8 @@
     "boosted": "Geboost",
     "clear_upload_failed": "Wis bestand upload fouten",
     "close": "Sluit",
-    "compose": "Composeer",
-    "confirm": "Confirmeer",
+    "compose": "Schrijven",
+    "confirm": "Bevestigen",
     "edit": "Aanpassen",
     "enter_app": "Ga naar App",
     "favourite": "Favoriet",
@@ -59,10 +59,10 @@
     "publish": "Publiceer",
     "reply": "Beantwoord",
     "reply_count": "{0}",
-    "reset": "Resetten",
+    "reset": "Herstellen",
     "save": "Opslaan",
     "save_changes": "Aanpassingen opslaan",
-    "sign_in": "Sign in",
+    "sign_in": "Inloggen",
     "switch_account": "Wissel van account",
     "vote": "Stem"
   },
@@ -70,7 +70,7 @@
   "app_logo": "Elk Logo",
   "app_name": "Elk",
   "attachment": {
-    "edit_title": "Descriptie",
+    "edit_title": "Omschrijving",
     "remove_label": "Verwijder bijlage"
   },
   "command": {
@@ -79,18 +79,18 @@
     "compose_desc": "Schrijf een nieuwe post",
     "n-people-in-the-past-n-days": "{0} mensen in de laatste {1} dagen",
     "select_lang": "Selecteer een taal",
-    "sign_in_desc": "Add an existing account",
+    "sign_in_desc": "Voeg bestaande account toe",
     "switch_account": "Wissel naar {0}",
     "switch_account_desc": "Wissel naar ander account",
-    "toggle_dark_mode": "Dark modus wisselen",
-    "toggle_zen_mode": "Zen modus schakelen"
+    "toggle_dark_mode": "Donkere modus wisselen",
+    "toggle_zen_mode": "Zen modus wisselen"
   },
   "common": {
     "end_of_list": "Einde van de lijst",
     "error": "FOUT",
     "in": "in",
     "not_found": "404 Niet Gevonden",
-    "offline_desc": "Zo te zien ben je offline. Check je internet verbinding."
+    "offline_desc": "Zo te zien ben je offline. Controleer je internet verbinding."
   },
   "conversation": {
     "with": "met"
@@ -98,19 +98,19 @@
   "error": {
     "account_not_found": "Account {0} niet gevonden",
     "explore-list-empty": "Er is nu niets trending. Kom later terug!",
-    "file_size_cannot_exceed_n_mb": "Bestand grote mag niet groter zijn dan {0}MB",
+    "file_size_cannot_exceed_n_mb": "Bestandsgrootte mag niet groter zijn dan {0}MB",
     "sign_in_error": "Kan geen connectie maken met de server.",
     "status_not_found": "Post niet gevonden",
     "unsupported_file_format": "Bestandstype niet ondersteund"
   },
   "help": {
-    "desc_highlight": "Expect some bugs and missing features here and there.",
-    "desc_para1": "Thanks for your interest in trying out Elk, our work-in-progress Mastodon web client!",
-    "desc_para2": "we are working hard on the development and improving it over time.",
-    "desc_para3": "To boost development, you can sponsor the Team through GitHub Sponsors. We hope you enjoy Elk!",
-    "desc_para4": "Elk is Open Source. If you'd like to help with testing, giving feedback, or contributing,",
-    "desc_para5": "reach out to us on GitHub",
-    "desc_para6": "and get involved.",
+    "desc_highlight": "Je kunt hier en daar wat bugs of ontbrekende features verwachten.",
+    "desc_para1": "Bedankt voor je interesse in het uitproberen van Elk, onze Mastodon web client in-wording!",
+    "desc_para2": "we werken hard aan nieuwe ontwikkelingen en verbeteringen in de loop van de tijd.",
+    "desc_para3": "Om de ontwikkelingen te versnellen, kun je het Team sponsoren via GitHub Sponsors. We hopen dat Elk je bevalt!",
+    "desc_para4": "Elk is Open Source. Wil je meehelpen met testen, feedback of bijdragen,",
+    "desc_para5": "zoek ons op via GitHub",
+    "desc_para6": "en doe met ons mee.",
     "title": "Elk is in Preview!"
   },
   "language": {
@@ -132,8 +132,8 @@
     "share_post": "Deel deze post",
     "show_untranslated": "Laat onvertaalde zien",
     "toggle_theme": {
-      "dark": "Dark modus wisselen",
-      "light": "Light modus wisselen"
+      "dark": "Donkere modus wisselen",
+      "light": "Lichte modus wisselen"
     },
     "translate_post": "Vertaal post",
     "unblock_account": "Deblokkeer {0}",
@@ -154,12 +154,12 @@
     "notifications": "Notificaties",
     "profile": "Profiel",
     "search": "Zoeken",
-    "select_feature_flags": "Schakel Feature Vlaggen",
+    "select_feature_flags": "Selecteer Feature Vlaggen",
     "select_font_size": "Font Grootte",
     "select_language": "Display Taal",
     "settings": "Instellingen",
     "show_intro": "Laat intro zien",
-    "toggle_theme": "Schakel Thema",
+    "toggle_theme": "Wissel Thema",
     "zen_mode": "Zen Modus"
   },
   "notification": {
@@ -167,13 +167,13 @@
     "followed_you": "volgt jou",
     "followed_you_count": "{0} mensen hebben je gevolgd|{0} persoon heeft je gevold|{0} mensen hebben je gevolgd",
     "missing_type": "MISSEND notificatie.type:",
-    "reblogged_post": "herblogd je post",
+    "reblogged_post": "herblogt je post",
     "request_to_follow": "vraagt om jou te volgen",
     "signed_up": "signed up",
     "update_status": "heeft hun post aangepast"
   },
   "placeholder": {
-    "content_warning": "Schrijf je warning hier",
+    "content_warning": "Schrijf je waarschuwing hier",
     "default_1": "Waar denk je aan?",
     "reply_to_account": "Reageer op {0}",
     "replying": "Reageren",
@@ -195,26 +195,26 @@
     },
     "feature_flags": {
       "github_cards": "GitHub Cards",
-      "title": "Experimentelen Functies",
+      "title": "Experimentele Functies",
       "user_picker": "Gebruiker Picker",
       "virtual_scroll": "Virtueel Scrollen"
     },
     "interface": {
       "color_mode": "Kleur Modus",
-      "dark_mode": "Dark Modus",
+      "dark_mode": "Donkere Modus",
       "default": " (standaard)",
       "font_size": "Font Grootte",
       "label": "Interface",
-      "light_mode": "Light Modus"
+      "light_mode": "Lichte Modus"
     },
     "language": {
-      "display_language": "Display Taal",
+      "display_language": "Weergave taal",
       "label": "Taal"
     },
     "notifications": {
-      "label": "Notifications",
+      "label": "Notificaties",
       "notifications": {
-        "label": "Notifications settings"
+        "label": "Notificaties instellingen"
       },
       "push_notifications": {
         "alerts": {
@@ -222,12 +222,12 @@
           "follow": "Nieuwe volgers",
           "mention": " Vermeldingen",
           "poll": "Peilingen",
-          "reblog": "Herblogd jou post",
+          "reblog": "Herblogt jou post",
           "title": "Welke notificaties wil je krijgen?"
         },
-        "description": "Receive notifications even when you are not using Elk.",
-        "instructions": "Don't forget to save your changes using @:settings.notifications.push_notifications.save_settings button!",
-        "label": "Push notifications settings",
+        "description": "Ontvang notificaties zelfs wanneer je elk niet gebruikt.",
+        "instructions": "Vergeet niet om je wijzigingen op te slaatn met de @:settings.notifications.push_notifications.save_settings knop!",
+        "label": "Push notificaties instellingen",
         "policy": {
           "all": "Van iedereen",
           "followed": "Van mensen die ik volg",
@@ -238,32 +238,32 @@
         "save_settings": "Instellingen aanpassingen opslaan",
         "subscription_error": {
           "clear_error": "Wis error",
-          "permission_denied": "Geen toestemming: zet notificaties aan in je browser.",
+          "permission_denied": "Geen toestemming: schakel notificaties in in je browser.",
           "request_error": "Er is een error tijdens het ophalen van de subscriptie, probeer opnieuw en als de error blijft, raporteer het probleem naar de Elk repository.",
           "title": "Kon niet subscriben aan push notificaties"
         },
-        "undo_settings": "Undo veranderden instellingen",
+        "undo_settings": "Veranderde instellingen ongedaan maken",
         "unsubscribe": "Zet push notificaties uit",
         "unsupported": "Je browser ondersteunt geen push notificaties.",
         "warning": {
           "enable_close": "Sluit",
-          "enable_description": "Om notificaties te krijgen terwijl Elk niet open is, zet push notificaties aan. Je kan precies instellen wat voor typen interacties push notificaties genereren via de \"@:notification.settings.show_btn{'\"'} knop hierboven wanneer ze aan staan.",
-          "enable_description_settings": "To receive notifications when Elk is not open, enable push notifications. You will be able to control precisely what types of interactions generate push notifications on this same screen once you enable them.",
+          "enable_description": "Om notificaties te krijgen terwijl Elk niet actief is, zet push notificaties aan. Je kan precies instellen wat voor typen interacties push notificaties genereren via de \"@:notification.settings.show_btn{'\"'} knop hierboven wanneer ze aan staan.",
+          "enable_description_settings": "Om notificaties te ontvangen wanneer Elk niet actief is, schakel push notificaties in. Je kunt precies instellen welke typen interacties een push notificatie activeren in dit venster, wanneer je ze hebt ingeschakeld.",
           "enable_desktop": "Zet push notificaties aan",
           "enable_title": "Mis niets",
-          "re_auth": "It seems that your server does not support push notifications. Try sign out and sign in again, if this message still appears contact your server administrator."
+          "re_auth": "Het lijkt er op dat je server geen push notificaties ondersteunt. Probeer uitloggen en opnieuw inloggen. Als deze boodschap nog steeds verschijnt, neem dan contact op met je server administrator."
         }
       },
-      "show_btn": "Go to notifications settings"
+      "show_btn": "Ga naar notificaties instellingen"
     },
-    "notifications_settings": "Notifications",
+    "notifications_settings": "Notificaties",
     "preferences": {
       "label": "Voorkeuren"
     },
     "profile": {
       "appearance": {
         "bio": "Bio",
-        "description": "Aanpassen van avatar, username, profile, etc.",
+        "description": "Aanpassen van avatar, gebruikersnaam, profiel, etc.",
         "display_name": "Zichtbare naam",
         "label": "Uiterlijk",
         "profile_metadata": "Profiel metadata",
@@ -284,12 +284,12 @@
     }
   },
   "state": {
-    "attachments_exceed_server_limit": "De hoeveelheid bijlage is meer als het limiet per post.",
+    "attachments_exceed_server_limit": "De hoeveelheid bijlagen is meer dan het limiet per post.",
     "attachments_limit_error": "Limiet per post overschreden",
     "edited": "(Aangepast)",
     "editing": "Aanpassen",
     "loading": "Laden...",
-    "upload_failed": "Upload gefaald",
+    "upload_failed": "Upload mislukt",
     "uploading": "Uploading..."
   },
   "status": {
@@ -298,7 +298,7 @@
     "filter_removed_phrase": "Verwijderd door filter",
     "filter_show_anyway": "Laat toch zien",
     "img_alt": {
-      "desc": "Descriptie",
+      "desc": "Omschrijving",
       "dismiss": "Afwijzen"
     },
     "poll": {
@@ -376,23 +376,23 @@
     "change_content_visibility": "Verander inhoud zichtbaarheid",
     "change_language": "Verander taal",
     "emoji": "Emoji",
-    "explore_links_intro": "Deze nieuws artikelen worden veel over gepraat op deze en anderen servers op het decentralized network op dit moment.",
+    "explore_links_intro": "Over deze nieuws artikelen wordt veel gepraat op deze en anderen servers op het decentralized network op dit moment.",
     "explore_posts_intro": "Deze posts van deze en andere servers op het decentralized network krijgen veel aandacht op deze server op dit moment.",
-    "explore_tags_intro": "Deze hashtags krijgen veel aandacht op dit moment op deze en anderen servers op het decentralized network.",
+    "explore_tags_intro": "Deze hashtags krijgen veel aandacht op dit moment op deze en andere servers op het decentralized network.",
     "toggle_code_block": "Zet code blok aan/uit"
   },
   "user": {
     "add_existing": "Voeg een bestaand account toe",
     "server_address_label": "Mastodon Server Address",
-    "sign_in_desc": "Sign in om profielen te volgen of hashtags, markeer posts als favoriet, deel en reageer op posts, of interact vanaf je account op een anderen server.",
+    "sign_in_desc": "Inloggen om profielen of hashtags te volgen, markeer posts als favoriet, deel en reageer op posts, of communiceer vanaf je account op een andere server.",
     "sign_in_notice_title": "Je bekijkt {0} publieke data",
-    "sign_out_account": "Sign out {0}",
+    "sign_out_account": "Uitloggen {0}",
     "tip_no_account": "Als je nog geen Mastodon account hebt, {0}.",
-    "tip_register_account": "kies jou server en registreer een account"
+    "tip_register_account": "kies jouw server en registreer een account"
   },
   "visibility": {
     "direct": "Direct",
-    "direct_desc": "Zichtbaar voor alleen vermelden gebruikers",
+    "direct_desc": "Alleen zichtbaar voor vermeldde gebruikers",
     "private": "Alleen volgers",
     "private_desc": "Alleen zichtbaar voor volgers",
     "public": "Publiek",

From 0b77ad3f439935115fd0177b27abc4d025614b42 Mon Sep 17 00:00:00 2001
From: Alex <49969959+alexzhang1030@users.noreply.github.com>
Date: Wed, 18 Jan 2023 05:41:26 +0800
Subject: [PATCH 07/10] fix: translate posts target language is not current
 selected language (#1263)

---
 components/status/StatusActionsMore.vue | 12 ----------
 components/status/StatusBody.vue        |  2 +-
 components/status/StatusTranslation.vue |  4 ++--
 composables/masto/translate.ts          | 31 ++++++++++++++++++++-----
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index 5a95fdff..e116073c 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -27,18 +27,6 @@ const userSettings = useUserSettings()
 
 const isAuthor = $computed(() => status.account.id === currentUser.value?.account.id)
 
-const {
-  toggle: _toggleTranslation,
-  translation,
-  enabled: isTranslationEnabled,
-} = useTranslation(props.status)
-
-const toggleTranslation = async () => {
-  isLoading.translation = true
-  await _toggleTranslation()
-  isLoading.translation = false
-}
-
 const { client } = $(useMasto())
 
 const getPermalinkUrl = (status: mastodon.v1.Status) => {
diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue
index 19db607f..ef51dead 100644
--- a/components/status/StatusBody.vue
+++ b/components/status/StatusBody.vue
@@ -9,7 +9,7 @@ const {
   withAction?: boolean
 }>()
 
-const { translation } = useTranslation(status)
+const { translation } = useTranslation(status, getLanguageCode())
 
 const emojisObject = useEmojisFallback(() => status.emojis)
 const vnode = $computed(() => {
diff --git a/components/status/StatusTranslation.vue b/components/status/StatusTranslation.vue
index 55c367fc..eb090018 100644
--- a/components/status/StatusTranslation.vue
+++ b/components/status/StatusTranslation.vue
@@ -9,7 +9,7 @@ const {
   toggle: _toggleTranslation,
   translation,
   enabled: isTranslationEnabled,
-} = useTranslation(status)
+} = useTranslation(status, getLanguageCode())
 
 let translating = $ref(false)
 const toggleTranslation = async () => {
@@ -26,7 +26,7 @@ const toggleTranslation = async () => {
 <template>
   <div>
     <button
-      v-if="isTranslationEnabled && status.language !== languageCode" p-0 flex="~ center" gap-2 text-sm
+      v-if="isTranslationEnabled && status.language !== getLanguageCode()" p-0 flex="~ center" gap-2 text-sm
       :disabled="translating" disabled-bg-transparent btn-text class="disabled-text-$c-text-btn-disabled-deeper" @click="toggleTranslation"
     >
       <span v-if="translating" block animate-spin preserve-3d>
diff --git a/composables/masto/translate.ts b/composables/masto/translate.ts
index d3567570..f87ee314 100644
--- a/composables/masto/translate.ts
+++ b/composables/masto/translate.ts
@@ -8,8 +8,23 @@ export interface TranslationResponse {
   }
 }
 
-export const languageCode = process.server ? 'en' : navigator.language.replace(/-.*$/, '')
-export async function translateText(text: string, from?: string | null, to?: string) {
+export const getLanguageCode = () => {
+  let code = 'en'
+  const getCode = (code: string) => code.replace(/-.*$/, '')
+  if (!process.server) {
+    const { locale } = useI18n()
+    code = getCode(locale.value ? locale.value : navigator.language)
+  }
+  return code
+}
+
+interface TranslationErr {
+  data?: {
+    error?: string
+  }
+}
+
+export async function translateText(text: string, from: string | null | undefined, to: string) {
   const config = useRuntimeConfig()
   const status = $ref({
     success: false,
@@ -22,7 +37,7 @@ export async function translateText(text: string, from?: string | null, to?: str
       body: {
         q: text,
         source: from ?? 'auto',
-        target: to ?? languageCode,
+        target: to,
         format: 'html',
         api_key: '',
       },
@@ -32,14 +47,18 @@ export async function translateText(text: string, from?: string | null, to?: str
   }
   catch (err) {
     // TODO: improve type
-    status.error = (err as { data: { error: string } }).data.error
+    if ((err as TranslationErr).data?.error)
+      status.error = (err as TranslationErr).data!.error!
+    else
+      status.error = 'Unknown Error, Please check your console in browser devtool.'
+    console.error('Translate Post Error: ', err)
   }
   return status
 }
 
 const translations = new WeakMap<mastodon.v1.Status | mastodon.v1.StatusEdit, { visible: boolean; text: string; success: boolean; error: string }>()
 
-export function useTranslation(status: mastodon.v1.Status | mastodon.v1.StatusEdit) {
+export function useTranslation(status: mastodon.v1.Status | mastodon.v1.StatusEdit, to: string) {
   if (!translations.has(status))
     translations.set(status, reactive({ visible: false, text: '', success: false, error: '' }))
 
@@ -50,7 +69,7 @@ export function useTranslation(status: mastodon.v1.Status | mastodon.v1.StatusEd
       return
 
     if (!translation.text) {
-      const { success, text, error } = await translateText(status.content, status.language)
+      const { success, text, error } = await translateText(status.content, status.language, to)
       translation.error = error
       translation.text = text
       translation.success = success

From 6c1d0e71211d27903267d9170fbf34dd43f57ac0 Mon Sep 17 00:00:00 2001
From: baptiste0928 <22115890+baptiste0928@users.noreply.github.com>
Date: Tue, 17 Jan 2023 22:54:03 +0100
Subject: [PATCH 08/10] feat(ui): move alt text under the media preview (#863)

---
 components/modal/ModalMediaPreview.vue | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/components/modal/ModalMediaPreview.vue b/components/modal/ModalMediaPreview.vue
index 2faaa135..35c2ac5f 100644
--- a/components/modal/ModalMediaPreview.vue
+++ b/components/modal/ModalMediaPreview.vue
@@ -54,7 +54,21 @@ onUnmounted(() => locked.value = false)
     </button>
 
     <div flex flex-row items-center mxa>
-      <ModalMediaPreviewCarousel v-model="index" :media="mediaPreviewList" @close="emit('close')" />
+      <div flex="~ col center" max-h-full max-w-full>
+        <ModalMediaPreviewCarousel v-model="index" :media="mediaPreviewList" @close="emit('close')" />
+
+        <div bg="black/30" dark:bg="white/10" ms-4 mb-6 mt-4 text-white rounded-full flex="~ center shrink-0" overflow-hidden>
+          <div v-if="mediaPreviewList.length > 1" p="y-1 x-3" rounded-r-0 shrink-0>
+            {{ index + 1 }} / {{ mediaPreviewList.length }}
+          </div>
+          <p
+            v-if="current.description" bg="dark/30" dark:bg="white/10" p="y-1 x-3" rounded-ie-full line-clamp-1
+            ws-pre-wrap break-all :title="current.description" w-full
+          >
+            {{ current.description }}
+          </p>
+        </div>
+      </div>
     </div>
 
     <div absolute top-0 w-full flex justify-between>
@@ -64,17 +78,6 @@ onUnmounted(() => locked.value = false)
       >
         <div i-ri:close-line text-white />
       </button>
-      <div bg="black/30" dark:bg="white/10" ms-4 my-auto text-white rounded-full flex="~ center" overflow-hidden>
-        <div v-if="mediaPreviewList.length > 1" p="y-1 x-2" rounded-r-0 shrink-0>
-          {{ index + 1 }} / {{ mediaPreviewList.length }}
-        </div>
-        <p
-          v-if="current.description" bg="dark/30" dark:bg="white/10" p="y-1 x-2" rounded-ie-full line-clamp-1
-          ws-pre-wrap break-all :title="current.description" w-full
-        >
-          {{ current.description }}
-        </p>
-      </div>
     </div>
   </div>
 </template>

From dded8d929ecdd9a6fc7732728c2347a9c8d6b573 Mon Sep 17 00:00:00 2001
From: MiniNaim <mininaim@gmail.com>
Date: Tue, 17 Jan 2023 22:55:12 +0100
Subject: [PATCH 09/10] fix(i18n): fixing commas #1217 (#1217)


From bc08ef07d35b7818ceec148f428824f8bf213746 Mon Sep 17 00:00:00 2001
From: Jon McLaren <TheWebTech@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:56:17 -0600
Subject: [PATCH 10/10] fix: change Alt Text description pop up to wrap while
 preserving whitespace pre (#1130)