diff --git a/lib/l10n/intl_ar.arb b/lib/l10n/intl_ar.arb
index 397180b..e56d0fb 100644
--- a/lib/l10n/intl_ar.arb
+++ b/lib/l10n/intl_ar.arb
@@ -60,7 +60,7 @@
   "passwords_dont_match": "الكلمات السرية غير متطابقة.",
   "email_already_exists": "عنوان البريد الإلكتروني هذا موجود بالفعل.",
   "user_already_exists": "هذا المستخدِم موجود بالفعل.",
-  "unsubscribe": "إلغاء الإشتراك",
+  "unsubscribe": "الغ الإشتراك",
   "subscribe": "اتبع",
   "messages": "لرسائل",
   "banned_users": "المستخدمون المحظورون",
@@ -70,6 +70,52 @@
   "show_avatars": "إظهار الصور الرمزية",
   "search": "البحث",
   "send_message": "أرسل الرسالة",
+  "local": "محلي",
+  "from": "من",
+  "banner": "اللافتة",
+  "display_name": "الاسم",
+  "bio": "السيرة",
+  "not_a_mod_or_admin": "ليس مشرفًا ولا مديرًا.",
+  "couldnt_find_post": "تعذر العثور على المشاركة.",
+  "invalid_url": "الرابط غير صالح.",
+  "couldnt_like_comment": "تعذر الإعجاب بالتعليق.",
+  "couldnt_update_comment": "تعذر تحديث التعليق.",
+  "no_comment_edit_allowed": "لا يُسمح لك تعديل التعليق.",
+  "couldnt_save_comment": "تعذر حفظ التعليق.",
+  "couldnt_get_comments": "تعذر جلب التعليق.",
+  "report_reason_required": "سبب الإبلاغ مطلوب.",
+  "report_too_long": "تقرير الإبلاغ طويل.",
+  "couldnt_create_report": "تعذر إتشاء التقرير.",
+  "couldnt_resolve_report": "تعذر تحليل.",
+  "invalid_post_title": "عنوان المنشور غير",
+  "couldnt_create_post": "تعذر انشاء المشاركة.",
+  "couldnt_like_post": "تعذر الإعجاب بالمنشور.",
+  "couldnt_find_community": "تعذر العثور على المجتمع.",
+  "couldnt_get_posts": "تعذر جلب المشاركات",
+  "no_post_edit_allowed": "لا يسمح لك تعديل المشاركة.",
+  "couldnt_save_post": "تعذر حفظ المشاركة.",
+  "site_already_exists": "الموقع موجود.",
+  "couldnt_update_site": "تعذر تحديث الموقع.",
+  "invalid_community_name": "اسم غير صالح.",
+  "community_already_exists": "المجتمع موجود مسبقًا.",
+  "community_moderator_already_exists": "مشىرف المجتمع موجود مسبقًا.",
+  "community_follower_already_exists": "هذا العضو مشترك في المجمع مسبقا.",
+  "not_a_moderator": "ليس مشرفًا.",
+  "couldnt_update_community": "تعذر تحديث المجتمع.",
+  "no_community_edit_allowed": "لا يُسمح لك تعديل المجتمع.",
+  "system_err_login": "خطأ في النظام. جرب إعادة الولوج.",
+  "community_user_already_banned": "هذا العضو محضور مسبقا.",
+  "couldnt_find_that_username_or_email": "تعذر العثور على مستخدم يملك هذا البريد أو اسم المستخدم.",
+  "invalid_password": "كلمة المرور غير صالحة. يجب ألّا تزيد عن 60 محرفًا.",
+  "captcha_incorrect": "رمز التحقق خاطئ.",
+  "invalid_username": "اسم المستخدم غير صالح.",
+  "bio_length_overflow": "لا يمكن أن تزيد السيرة عن 300 محرف.",
+  "couldnt_update_private_message": "تعذر تحديث الرسالة الخاصة.",
+  "couldnt_update_post": "تعذر تحديث",
+  "couldnt_create_private_message": "تعذر انشاء الرسالة الخاصة.",
+  "no_private_message_edit_allowed": "لا يسمح لك تعديل الرسالة الخاصة.",
+  "post_title_too_long": "عنوان المشاركة طويل.",
+  "delete_account_confirm": "تحذير: ستحذف جميع بياناتك. أدخل كلمة المرور لتأكيد.",
   "top_day": "المتداول",
   "top_week": "المتداول هذا",
   "top_month": "المتداول هذا",
diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb
index 98f9a1b..62bdaac 100644
--- a/lib/l10n/intl_es.arb
+++ b/lib/l10n/intl_es.arb
@@ -128,5 +128,6 @@
   "top_all": "Lo mejor de todos los tiempos",
   "most_comments": "La mayoría de los comentarios",
   "new_comments": "Nuevos Comentarios",
-  "active": "Activo"
+  "active": "Activo",
+  "not_a_mod_or_admin": "No eres un moderador ni un administrador."
 }
diff --git a/lib/l10n/intl_fa.arb b/lib/l10n/intl_fa.arb
index 7164766..4eda878 100644
--- a/lib/l10n/intl_fa.arb
+++ b/lib/l10n/intl_fa.arb
@@ -68,10 +68,10 @@
   "couldnt_update_post": "ناتوای در به‌روزرسانی مطلب",
   "email_already_exists": "این رایانامه از قبل وجود دارد.",
   "user_already_exists": "این کاربر از قبل وجود دارد.",
-  "number_of_users_online": "{count,plural, =1{{count} کاربر برخط}}",
-  "number_of_comments": "{count,plural, =1{{count} نظر}}",
-  "number_of_posts": "{count,plural, =1{{count} مطلب}}",
-  "number_of_users": "{count,plural, =1{{count} کاربر}}",
+  "number_of_users_online": "{count,plural, other{{count} کاربر برخط}}",
+  "number_of_comments": "{count,plural, other{{count} نظر}}",
+  "number_of_posts": "{count,plural, other{{count} مطلب}}",
+  "number_of_users": "{count,plural, other{{count} کاربر}}",
   "delete_account_confirm": "هشدار: این کنش، تمام اطلاعات شما را برای همیشه پاک می‌کند. برای تایید، گذرواژه خود را وارد کنید.",
   "new_password": "گذرواژه جدید",
   "verify_password": "تایید گذرواژه",
diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
index dea7462..8277b2f 100644
--- a/lib/l10n/intl_fr.arb
+++ b/lib/l10n/intl_fr.arb
@@ -127,5 +127,6 @@
   "top_all": "Top",
   "most_comments": "Plus commentés",
   "new_comments": "Nouveaux commentaires",
-  "active": "Actif"
+  "active": "Actif",
+  "report_too_long": "Rapport trop long."
 }
diff --git a/lib/l10n/intl_ga.arb b/lib/l10n/intl_ga.arb
index aacb618..abf9557 100644
--- a/lib/l10n/intl_ga.arb
+++ b/lib/l10n/intl_ga.arb
@@ -113,11 +113,16 @@
   "search": "Cuardaigh",
   "send_message": "Seol Teachtaireacht",
   "top_day": "Lá Barr",
+  "active": "Gnóthach",
+  "not_a_mod_or_admin": "Ní modhnóir ná riarthóir é.",
+  "report_reason_required": "Cúis leis an Tuarascáil Riachtanach.",
+  "report_too_long": "Tuairiscigh ró-fhada.",
+  "couldnt_create_report": "Níorbh fhéidir tuairisc a chruthú.",
+  "couldnt_resolve_report": "Níorbh fhéidir an tuarascáil a réiteach.",
   "top_week": "Seachtain Barr",
   "top_month": "Barr Mí",
   "top_year": "Bar Bliain",
   "top_all": "Barr an Ama Uile",
   "most_comments": "Tuairimí an chuid is mó",
-  "new_comments": "Tráchtaireachtaí Nua",
-  "active": "Gnóthach"
+  "new_comments": "Tráchtaireachtaí Nua"
 }
diff --git a/lib/l10n/intl_ja.arb b/lib/l10n/intl_ja.arb
index 2e599ed..cc6c0bf 100644
--- a/lib/l10n/intl_ja.arb
+++ b/lib/l10n/intl_ja.arb
@@ -93,11 +93,11 @@
   "post_title_too_long": "投稿のタイトルが長すぎます。",
   "email_already_exists": "メールアドレスが既に使用されています。",
   "user_already_exists": "ユーザーは既に存在します。",
-  "number_of_users_online": "{count,plural, =1{{count} 名のユーザーがオンライン}}",
-  "number_of_comments": "{count,plural, =1{{count} 件のコメント}}",
-  "number_of_posts": "{count,plural, =1{{count} 件の投稿}}",
-  "number_of_subscribers": "{count,plural, =1{{count} 名の登録者}}",
-  "number_of_users": "{count,plural, =1{{count} 名のユーザー}}",
+  "number_of_users_online": "{count,plural, other{{count} 名のユーザーがオンライン}}",
+  "number_of_comments": "{count,plural, other{{count} 件のコメント}}",
+  "number_of_posts": "{count,plural, other{{count} 件の投稿}}",
+  "number_of_subscribers": "{count,plural, other{{count} 名の登録者}}",
+  "number_of_users": "{count,plural, other{{count} 名のユーザー}}",
   "unsubscribe": "登録解除",
   "subscribe": "登録",
   "messages": "メッセージ",
diff --git a/lib/l10n/intl_ko.arb b/lib/l10n/intl_ko.arb
index 82cf9d5..47338b3 100644
--- a/lib/l10n/intl_ko.arb
+++ b/lib/l10n/intl_ko.arb
@@ -105,11 +105,11 @@
   "post_title_too_long": "게시물 제목이 너무 깁니다.",
   "email_already_exists": "이메일이 이미 존재합니다.",
   "user_already_exists": "사용자가 이미 존재합니다.",
-  "number_of_users_online": "{count,plural, =1{접속자수 {count}}}",
-  "number_of_comments": "{count,plural, =1{덧글수 {count}}}",
-  "number_of_posts": "{count,plural, =1{게시물 수 {count}}}",
-  "number_of_subscribers": "{count,plural, =1{구독자수{count}}}",
-  "number_of_users": "{count,plural, =1{가입자수 {count}}}",
+  "number_of_users_online": "{count,plural, other{접속자수 {count}}}",
+  "number_of_comments": "{count,plural, other{덧글수 {count}}}",
+  "number_of_posts": "{count,plural, other{게시물 수 {count}}}",
+  "number_of_subscribers": "{count,plural, other{구독자수{count}}}",
+  "number_of_users": "{count,plural, other{가입자수 {count}}}",
   "unsubscribe": "구독취소",
   "subscribe": "구독",
   "messages": "메세지",
@@ -128,5 +128,6 @@
   "top_all": "전체",
   "most_comments": "최근 댓글",
   "new_comments": "새 덧글",
-  "active": "활발한"
+  "active": "활발한",
+  "not_a_mod_or_admin": "중재자 또는 관리자가 아닙니다."
 }
diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb
index 3bfe675..f895a02 100644
--- a/lib/l10n/intl_pl.arb
+++ b/lib/l10n/intl_pl.arb
@@ -2,7 +2,7 @@
   "@@locale": "pl",
   "settings": "Ustawienia",
   "password": "Hasło",
-  "email_or_username": "Email lub Nazwa Użytkownika",
+  "email_or_username": "Email lub Login",
   "posts": "Posty",
   "comments": "Komentarze",
   "modlog": "Log moderatorski",
@@ -31,11 +31,11 @@
   "yes": "tak",
   "no": "nie",
   "avatar": "Awatar",
-  "banner": "Banner",
+  "banner": "Baner",
   "display_name": "Nazwa wyświetlana",
   "bio": "Opis",
   "email": "Email",
-  "matrix_user": "Użytkownik Matrixa",
+  "matrix_user": "Login na Matrixie",
   "sort_type": "Sortuj typ",
   "type": "Rodzaj",
   "show_nsfw": "Pokaż treści NSFW (+18)",
@@ -43,14 +43,14 @@
   "delete_account": "Usuń Konto",
   "saved": "Zapisane",
   "communities": "Społeczności",
-  "users": "Użytkownicy",
+  "users": "osoby zalogowane",
   "theme": "Motyw",
   "language": "Język",
   "hot": "Popularne",
   "new_": "Nowe",
   "old": "Stare",
   "top": "Najpopularniejsze",
-  "chat": "Czat",
+  "chat": "Dyskusja",
   "admin": "administrator",
   "by": "przez",
   "not_an_admin": "Nie jest administratorem.",
@@ -88,23 +88,23 @@
   "couldnt_update_community": "Nie udało się zaktualizować Społeczności.",
   "no_community_edit_allowed": "Nie masz uprawnień do edycji społeczności.",
   "system_err_login": "Błąd systemu. Spróbuj wylogować się i następnie zalogować ponownie.",
-  "community_user_already_banned": "Użytkownik społeczności jest już zbanowany.",
-  "couldnt_find_that_username_or_email": "Nie udało się znaleźć takiej nazwy użytkownika lub adresu email.",
+  "community_user_already_banned": "Login już zablokowany w tej społeczności.",
+  "couldnt_find_that_username_or_email": "Nie udało się znaleźć takiego loginu lub adresu email.",
   "password_incorrect": "Hasło niepoprawne.",
   "registration_closed": "Rejestracja Zamknięta",
   "invalid_password": "Nieprawidłowe hasło. Hasło musi mieć mniej niż 60 znaków.",
   "passwords_dont_match": "Hasła nie pasują do siebie.",
   "captcha_incorrect": "Captcha niepoprawna.",
-  "invalid_username": "Nieprawidłowa nazwa użytkownika.",
+  "invalid_username": "Nieprawidłowy login.",
   "bio_length_overflow": "To pole nie może przekraczać 300 znaków.",
-  "couldnt_update_user": "Nie udało się zaktualizować użytkownika.",
+  "couldnt_update_user": "Nie udało się zaktualizować.",
   "couldnt_update_private_message": "Nie udało się zaktualizować prywatnej wiadomości.",
   "couldnt_update_post": "Nie udało się zaktualizować postów",
   "couldnt_create_private_message": "Nie udało się stworzyć prywatnej wiadomości.",
   "no_private_message_edit_allowed": "Brak uprawnień do edycji prywatnej wiadomości.",
   "post_title_too_long": "Tytuł posta zbyt długi.",
   "email_already_exists": "Email już istnieje.",
-  "user_already_exists": "Użytkownik już istnieje.",
+  "user_already_exists": "Login już istnieje.",
   "unsubscribe": "Odsubskrybuj",
   "subscribe": "Subskrybuj",
   "messages": "Wiadomości",
diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb
index 23daad9..55ae9f7 100644
--- a/lib/l10n/intl_zh.arb
+++ b/lib/l10n/intl_zh.arb
@@ -55,11 +55,11 @@
   "by": " ",
   "not_an_admin": "不是管理员。",
   "couldnt_find_post": "无法找到帖子。",
-  "not_logged_in": "未登录.",
+  "not_logged_in": "未登录。",
   "site_ban": "你已被本站拉黑",
   "community_ban": "你已被此社群拉黑。",
   "downvotes_disabled": "踩已禁用",
-  "invalid_url": "URL无效.",
+  "invalid_url": "URL无效。",
   "locked": "已锁定",
   "couldnt_create_comment": "无法创建评论。",
   "couldnt_like_comment": "无法点赞评论。",
@@ -67,10 +67,10 @@
   "no_comment_edit_allowed": "没有编辑评论的权限。",
   "couldnt_save_comment": "无法保存评论。",
   "couldnt_get_comments": "无法获取评论。",
-  "report_reason_required": "需要报告原因.",
-  "report_too_long": "报告时间过长.",
-  "couldnt_create_report": "无法创建报告.",
-  "couldnt_resolve_report": "无法解析报告.",
+  "report_reason_required": "需要报告原因。",
+  "report_too_long": "报告时间过长。",
+  "couldnt_create_report": "无法创建报告。",
+  "couldnt_resolve_report": "无法解析报告。",
   "invalid_post_title": "帖子标题无效",
   "couldnt_create_post": "无法创建帖子。",
   "couldnt_like_post": "无法点赞帖子。",
@@ -80,11 +80,11 @@
   "couldnt_save_post": "无法保存帖子。",
   "site_already_exists": "站点已存在。",
   "couldnt_update_site": "无法更新站点。",
-  "invalid_community_name": "无效名称.",
+  "invalid_community_name": "无效名称。",
   "community_already_exists": "社群已存在。",
   "community_moderator_already_exists": "社群监管人已存在。",
   "community_follower_already_exists": "社群关注者已存在。",
-  "not_a_moderator": "不是仲裁员.",
+  "not_a_moderator": "不是仲裁员。",
   "couldnt_update_community": "无法更新社群。",
   "no_community_edit_allowed": "没有编辑社群的权限。",
   "system_err_login": "系统错误。请尝试注销后重新登入。",
@@ -95,7 +95,7 @@
   "invalid_password": "密码无效。密码长度必须小于60个字符。",
   "passwords_dont_match": "密码不匹配。",
   "captcha_incorrect": "验证码不正确。",
-  "invalid_username": "用户名无效",
+  "invalid_username": "用户名无效。",
   "bio_length_overflow": "自我介绍不能超过300个字符。",
   "couldnt_update_user": "无法更新用户。",
   "couldnt_update_private_message": "无法更新私信。",
@@ -103,7 +103,7 @@
   "couldnt_create_private_message": "无法创建私信。",
   "no_private_message_edit_allowed": "没有编辑私信的权限。",
   "post_title_too_long": "帖子标题过长。",
-  "email_already_exists": "邮箱已占用.",
+  "email_already_exists": "邮箱已占用。",
   "user_already_exists": "用户已存在。",
   "number_of_users_online": "{count,plural, =1{{count} 在线用户} other{{count} 名在线用户}}",
   "number_of_comments": "{count,plural, =1{{count} 条评论} other{{count} 条评论}}",
@@ -128,5 +128,6 @@
   "top_all": "全部推荐",
   "most_comments": "最多评论",
   "new_comments": "新评论",
-  "active": "活跃"
+  "active": "活跃",
+  "not_a_mod_or_admin": "不是仲裁员或管理员。"
 }
diff --git a/lib/l10n/untranslated.json b/lib/l10n/untranslated.json
index 047df3d..389e1bd 100644
--- a/lib/l10n/untranslated.json
+++ b/lib/l10n/untranslated.json
@@ -1,57 +1,11 @@
 {
   "ar": [
-    "local",
-    "from",
-    "banner",
-    "display_name",
-    "bio",
-    "not_a_mod_or_admin",
-    "couldnt_find_post",
-    "invalid_url",
-    "couldnt_like_comment",
-    "couldnt_update_comment",
-    "no_comment_edit_allowed",
-    "couldnt_save_comment",
-    "couldnt_get_comments",
-    "report_reason_required",
-    "report_too_long",
-    "couldnt_create_report",
-    "couldnt_resolve_report",
-    "invalid_post_title",
-    "couldnt_create_post",
-    "couldnt_like_post",
-    "couldnt_find_community",
-    "couldnt_get_posts",
-    "no_post_edit_allowed",
-    "couldnt_save_post",
-    "site_already_exists",
-    "couldnt_update_site",
-    "invalid_community_name",
-    "community_already_exists",
-    "community_moderator_already_exists",
-    "community_follower_already_exists",
-    "not_a_moderator",
-    "couldnt_update_community",
-    "no_community_edit_allowed",
-    "system_err_login",
-    "community_user_already_banned",
-    "couldnt_find_that_username_or_email",
-    "invalid_password",
-    "captcha_incorrect",
-    "invalid_username",
-    "bio_length_overflow",
     "couldnt_update_user",
-    "couldnt_update_private_message",
-    "couldnt_update_post",
-    "couldnt_create_private_message",
-    "no_private_message_edit_allowed",
-    "post_title_too_long",
     "number_of_users_online",
     "number_of_comments",
     "number_of_posts",
     "number_of_subscribers",
-    "number_of_users",
-    "delete_account_confirm"
+    "number_of_users"
   ],
 
   "ca": [
@@ -90,10 +44,6 @@
     "not_a_mod_or_admin"
   ],
 
-  "es": [
-    "not_a_mod_or_admin"
-  ],
-
   "eu": [
     "not_a_mod_or_admin"
   ],
@@ -179,16 +129,10 @@
   ],
 
   "fr": [
-    "not_a_mod_or_admin",
-    "report_too_long"
+    "not_a_mod_or_admin"
   ],
 
   "ga": [
-    "not_a_mod_or_admin",
-    "report_reason_required",
-    "report_too_long",
-    "couldnt_create_report",
-    "couldnt_resolve_report",
     "number_of_users_online",
     "number_of_comments",
     "number_of_posts",
@@ -789,10 +733,6 @@
     "active"
   ],
 
-  "ko": [
-    "not_a_mod_or_admin"
-  ],
-
   "nl": [
     "local",
     "banner",
@@ -1579,9 +1519,5 @@
     "most_comments",
     "new_comments",
     "active"
-  ],
-
-  "zh": [
-    "not_a_mod_or_admin"
   ]
 }
diff --git a/pubspec.lock b/pubspec.lock
index 23cfed2..efe38a6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -35,14 +35,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   build:
     dependency: transitive
     description:
@@ -63,7 +63,7 @@ packages:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.9"
   build_resolvers:
     dependency: transitive
     description:
@@ -91,14 +91,14 @@ packages:
       name: built_collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2"
+    version: "5.0.0"
   built_value:
     dependency: transitive
     description:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.1.0"
+    version: "8.0.2"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -112,14 +112,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -133,14 +133,14 @@ packages:
       name: cli_util
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
@@ -154,7 +154,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
@@ -203,7 +203,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   ffi:
     dependency: transitive
     description:
@@ -217,14 +217,14 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.1"
+    version: "6.1.0"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.11"
+    version: "1.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -363,21 +363,21 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.7+22"
+    version: "0.6.7+21"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.1"
   intl:
     dependency: "direct main"
     description:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.17.0"
   io:
     dependency: transitive
     description:
@@ -391,7 +391,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.2"
+    version: "0.6.3"
   json_annotation:
     dependency: "direct main"
     description:
@@ -426,7 +426,7 @@ packages:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.4"
+    version: "1.0.0"
   markdown:
     dependency: "direct main"
     description:
@@ -440,7 +440,7 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   matrix4_transform:
     dependency: "direct main"
     description:
@@ -454,14 +454,14 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   mime:
     dependency: transitive
     description:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7"
+    version: "1.0.0"
   modal_bottom_sheet:
     dependency: "direct main"
     description:
@@ -489,7 +489,7 @@ packages:
       name: node_io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.1.1"
   octo_image:
     dependency: transitive
     description:
@@ -510,14 +510,14 @@ packages:
       name: package_info
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3+4"
+    version: "0.4.3+2"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
@@ -580,7 +580,7 @@ packages:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.0"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -594,14 +594,14 @@ packages:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   process:
     dependency: transitive
     description:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.13"
+    version: "4.1.0"
   provider:
     dependency: "direct main"
     description:
@@ -615,7 +615,7 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.4"
+    version: "2.0.0"
   pubspec_parse:
     dependency: transitive
     description:
@@ -623,13 +623,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.8"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.5"
   rxdart:
     dependency: transitive
     description:
@@ -678,7 +671,7 @@ packages:
       name: shared_preferences_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.2+3"
+    version: "0.0.2+2"
   shelf:
     dependency: transitive
     description:
@@ -711,14 +704,14 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.0"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.2+3"
+    version: "1.3.2+2"
   sqflite_common:
     dependency: transitive
     description:
@@ -732,28 +725,28 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   synchronized:
     dependency: transitive
     description:
@@ -767,14 +760,14 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.2.19"
   timeago:
     dependency: "direct main"
     description:
@@ -795,7 +788,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -830,7 +823,7 @@ packages:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5+3"
+    version: "0.1.5+1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -851,7 +844,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   watcher:
     dependency: transitive
     description:
@@ -872,7 +865,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.4+1"
+    version: "1.7.4"
   xdg_directories:
     dependency: transitive
     description:
@@ -895,5 +888,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.2 <2.11.0"
-  flutter: ">=1.22.2 <2.0.0"
+  dart: ">=2.12.0-0.0 <3.0.0"
+  flutter: ">=1.22.2"
diff --git a/pubspec.yaml b/pubspec.yaml
index ad45742..8c4aa5b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,7 +45,7 @@ dependencies:
   timeago: ^2.0.27
   fuzzy: <1.0.0
   lemmy_api_client: ^0.12.0
-  intl: ^0.16.1
+  intl: ^0.17.0
   matrix4_transform: ^1.1.7
   json_annotation: ^3.1.1
 
diff --git a/scripts/migrate_lemmy_l10n.dart b/scripts/migrate_lemmy_l10n.dart
index 5489d7d..fbc3ca4 100644
--- a/scripts/migrate_lemmy_l10n.dart
+++ b/scripts/migrate_lemmy_l10n.dart
@@ -325,7 +325,11 @@ void portStrings(
           return null;
         }();
 
-        return '{$variableName,plural, =1{$fixedVariables}${pluralForm != null ? ' other{$pluralForm}' : ''}}';
+        if (pluralForm == null) {
+          return '{$variableName,plural, other{$fixedVariables}}';
+        }
+
+        return '{$variableName,plural, =1{$fixedVariables} other{$pluralForm}}';
       };
     }