clean up after merge conflicts

lib/helpers/gif_helper.dart

@@ -30,7 +30,7 @@ class GifHelper {
     ).firstMatch(trimmed);
     return pageMatch?.group(1);
   }
-  
+
   /// Encode a GIF in a format that parseGif() can parse.
   static String encodeGif(String gifId) {
     return 'g:$gifId';

lib/helpers/reaction_helper.dart

@@ -109,7 +109,7 @@ class ReactionHelper {
 
     return ReactionInfo(targetHash: match.group(1)!, emoji: emoji);
   }
-  
+
   /// Encode a reaction message that parseReaction() can parse.
   static String encodeReaction(String hash, String emojiIndex) {
     return 'r:$hash:$emojiIndex';

lib/l10n/app_localizations_hu.dart

@@ -3677,7 +3677,7 @@ class AppLocalizationsHu extends AppLocalizations {
 
   @override
   String scanner_linuxPairingPinPrompt(String deviceName) {
-    return 'Adja meg a PIN kódot a $deviceName számára (hagyja üresen, ha nincs).';
+    return 'Adja meg a(z) $deviceName PIN-kódját (hagyja üresen, ha nincs).';
   }
 
   @override

lib/l10n/app_localizations_nl.dart

@@ -2419,7 +2419,7 @@ class AppLocalizationsNl extends AppLocalizations {
   String get repeater_cliQuickDiscovery => 'Ontdek Buren';
 
   @override
-  String get repeater_cliHelpAdvert => 'Verstuurt een advertentiepakket';
+  String get repeater_cliHelpAdvert => 'Advertentie uitzenden';
 
   @override
   String get repeater_cliHelpReboot =>

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -9,7 +9,6 @@ import flutter_blue_plus_darwin
 import flutter_local_notifications
 import mobile_scanner
 import package_info_plus
-import path_provider_foundation
 import share_plus
 import shared_preferences_foundation
 import sqflite_darwin
@@ -20,7 +19,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
-  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))