diff --git a/lib/src/f_wallet_app.dart b/lib/src/f_wallet_app.dart
index 4d963aa..abc6159 100644
--- a/lib/src/f_wallet_app.dart
+++ b/lib/src/f_wallet_app.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 
 import 'package:dynamic_color/dynamic_color.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:provider/provider.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'package:f_wallet/src/utils/f_wallet_theme.dart';
 import 'package:f_wallet/src/utils/hive_boxes.dart';
 import 'package:f_wallet/src/utils/pass_manager.dart';
diff --git a/lib/src/pages/pass_details/components/transit_type_icon.dart b/lib/src/pages/pass_details/components/transit_type_icon.dart
index ef08df1..ebcf08f 100644
--- a/lib/src/pages/pass_details/components/transit_type_icon.dart
+++ b/lib/src/pages/pass_details/components/transit_type_icon.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:pkpass/pkpass.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
+
 class TransitTypeIcon extends StatelessWidget {
   final TransitType? transitType;
   final DateTime? relevantDate;
diff --git a/lib/src/pages/pass_details/pass_details.dart b/lib/src/pages/pass_details/pass_details.dart
index 3ddf0e7..c8d8149 100644
--- a/lib/src/pages/pass_details/pass_details.dart
+++ b/lib/src/pages/pass_details/pass_details.dart
@@ -5,12 +5,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'package:file_selector/file_selector.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pkpass/pkpass.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'package:f_wallet/src/pages/pass_details/pass_details_view.dart';
 import 'package:f_wallet/src/utils/hive_boxes.dart';
 import 'package:f_wallet/src/utils/locale_locle.dart';
diff --git a/lib/src/pages/pass_details/pass_details_view.dart b/lib/src/pages/pass_details/pass_details_view.dart
index f3cef4d..55d8759 100644
--- a/lib/src/pages/pass_details/pass_details_view.dart
+++ b/lib/src/pages/pass_details/pass_details_view.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:pkpass/pkpass.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'package:f_wallet/src/pages/pass_details/components/barcode.dart';
 import 'package:f_wallet/src/pages/pass_details/pass_details.dart';
 import 'package:f_wallet/src/utils/locale_locle.dart';
diff --git a/lib/src/pages/pass_list/components/pass_tab_destination.dart b/lib/src/pages/pass_list/components/pass_tab_destination.dart
index 01cc621..05ca088 100644
--- a/lib/src/pages/pass_list/components/pass_tab_destination.dart
+++ b/lib/src/pages/pass_list/components/pass_tab_destination.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'pass_tabs.dart';
 
 class PassTabDestination extends StatelessWidget {
diff --git a/lib/src/pages/pass_list/pass_list.dart b/lib/src/pages/pass_list/pass_list.dart
index 839a6ab..59e3c9e 100644
--- a/lib/src/pages/pass_list/pass_list.dart
+++ b/lib/src/pages/pass_list/pass_list.dart
@@ -7,13 +7,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'package:file_selector/file_selector.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_sharing_intent/flutter_sharing_intent.dart';
 import 'package:flutter_sharing_intent/model/sharing_file.dart';
 import 'package:go_router/go_router.dart';
 import 'package:pkpass/pkpass.dart';
 import 'package:url_launcher/link.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'package:f_wallet/src/utils/args_parser.dart';
 import 'package:f_wallet/src/utils/pass_manager.dart';
 import 'package:f_wallet/src/utils/version.dart';
diff --git a/lib/src/pages/pass_list/pass_list_view.dart b/lib/src/pages/pass_list/pass_list_view.dart
index 742cd59..c188799 100644
--- a/lib/src/pages/pass_list/pass_list_view.dart
+++ b/lib/src/pages/pass_list/pass_list_view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 
 import 'package:animations/animations.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'package:f_wallet/src/pages/pass_list/components/pass_preview.dart';
 import 'package:f_wallet/src/pages/pass_list/pass_list.dart';
 import 'package:f_wallet/src/utils/pass_manager.dart';
diff --git a/lib/src/widgets/language_button.dart b/lib/src/widgets/language_button.dart
index beb2435..c6a09e6 100644
--- a/lib/src/widgets/language_button.dart
+++ b/lib/src/widgets/language_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'package:f_wallet/src/utils/hive_boxes.dart';
 import 'language_dialog.dart';
 
diff --git a/lib/src/widgets/language_dialog.dart b/lib/src/widgets/language_dialog.dart
index b205dac..683c54e 100644
--- a/lib/src/widgets/language_dialog.dart
+++ b/lib/src/widgets/language_dialog.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:locale_names/locale_names.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
+
 class LanguageDialog extends StatelessWidget {
   const LanguageDialog({super.key});
 
diff --git a/lib/src/widgets/theme_button.dart b/lib/src/widgets/theme_button.dart
index 379ff27..261283a 100644
--- a/lib/src/widgets/theme_button.dart
+++ b/lib/src/widgets/theme_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
+import 'package:f_wallet/l10n/app_localizations.dart';
 import 'package:f_wallet/src/utils/hive_boxes.dart';
 
 class ThemeButton extends StatelessWidget {
--- ./pubspec.lock.orig
+++ ./pubspec.lock
@@ -61,10 +61,10 @@
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   charset:
     dependency: transitive
     description:
@@ -93,18 +93,18 @@
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   cross_file:
     dependency: transitive
     description:
@@ -149,10 +149,10 @@
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -409,10 +409,10 @@
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   js:
     dependency: transitive
     description:
@@ -433,26 +433,26 @@
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   linkify:
     dependency: transitive
     description:
@@ -489,26 +489,26 @@
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.17.0"
   mime:
     dependency: transitive
     description:
@@ -529,10 +529,10 @@
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_provider:
     dependency: "direct main"
     description:
@@ -649,7 +649,7 @@
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -670,18 +670,18 @@
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
@@ -702,10 +702,10 @@
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.7"
   tint:
     dependency: transitive
     description:
@@ -798,10 +798,10 @@
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -851,5 +851,5 @@
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.22.0"