Merge branch 'main' into main

Author: Aperture32GLaDOS

.gitattributes

@@ -1,8 +1,9 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
+# Prevent build errors on non lf systems (like Windows), we need files with lf as newlines.
+* text=auto eol=lf
 
 # Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
+# to lf line endings on checkout.
 *.c text
 *.cpp text
 *.h text

src/displayapp/screens/Notifications.cpp

@@ -246,8 +246,8 @@ namespace {
 
 Notifications::NotificationItem::NotificationItem(Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                                   Pinetime::Controllers::MotorController& motorController)
-  : NotificationItem("Notification",
-                     "No notification to display",
+  : NotificationItem("Notifications",
+                     "No notifications to display",
                      0,
                      Controllers::NotificationManager::Categories::Unknown,
                      0,