diff --git a/assets/translations/bs.json b/assets/translations/bs.json
index 726756e..846b3d3 100644
--- a/assets/translations/bs.json
+++ b/assets/translations/bs.json
@@ -327,7 +327,7 @@
     "smartname": "Name (Smart)",
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
-    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions, and other resources that will help you understand how to use the app.",
     "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "foregroundService": "Obtainium foreground service",
diff --git a/assets/translations/en-EO.json b/assets/translations/en-EO.json
index 3244535..a3ba189 100644
--- a/assets/translations/en-EO.json
+++ b/assets/translations/en-EO.json
@@ -327,7 +327,7 @@
     "smartname": "Name (Smart)",
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
-    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions, and other resources that will help you understand how to use the app.",
     "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "foregroundService": "Obtainium foreground service",
diff --git a/assets/translations/en.json b/assets/translations/en.json
index ba76647..bacf774 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -327,7 +327,7 @@
     "smartname": "Name (smart)",
     "sortMethod": "Sort method",
     "welcome": "Welcome",
-    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions, and other resources that will help you understand how to use the app.",
     "batteryOptimizationNote": "Note that background downloads may work more reliably if you switch to the \"foreground service\" in the Obtainium settings and/or disable battery optimization for Obtainium in your OS settings.",
     "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "foregroundService": "Obtainium foreground service",
diff --git a/assets/translations/fa.json b/assets/translations/fa.json
index c7670cb..10de606 100644
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@@ -327,7 +327,7 @@
     "smartname": "Name (Smart)",
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
-    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions, and other resources that will help you understand how to use the app.",
     "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
     "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "foregroundService": "Obtainium foreground service",
diff --git a/lib/custom_errors.dart b/lib/custom_errors.dart
index cbb811d..4f06df5 100644
--- a/lib/custom_errors.dart
+++ b/lib/custom_errors.dart
@@ -158,6 +158,7 @@ void showError(dynamic e, BuildContext context) {
 }
 
 String list2FriendlyString(List<String> list) {
+  var isEnglish = tr('and') == 'and'; // Quick hack, find better way;
   return list.length == 2
       ? '${list[0]} ${tr('and')} ${list[1]}'
       : list
@@ -169,7 +170,7 @@ String list2FriendlyString(List<String> list) {
                   (e.key == list.length - 1
                       ? ''
                       : e.key == list.length - 2
-                      ? ' and '
+                      ? '${isEnglish ? ',' : ''} and '
                       : ', '),
             )
             .join('');