zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-08-03 22:43:00 +10:00
Code Issues Packages Projects Releases 2 Wiki Activity

clean up after merge conflicts

Browse Source
This commit is contained in:
Enot (ded) Skelly
2026-04-09 09:57:46 -07:00
parent fae416fb34
commit 5354acb1d3
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/l10n/app_localizations_hu.dart
+1 -1
View File
@@ -3677,7 +3677,7 @@ class AppLocalizationsHu extends AppLocalizations {
@override @override
String scanner_linuxPairingPinPrompt(String deviceName) { 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 @override
lib/l10n/app_localizations_nl.dart
+1 -1
View File
@@ -2419,7 +2419,7 @@ class AppLocalizationsNl extends AppLocalizations {
String get repeater_cliQuickDiscovery => 'Ontdek Buren'; String get repeater_cliQuickDiscovery => 'Ontdek Buren';
@override @override
String get repeater_cliHelpAdvert => 'Verstuurt een advertentiepakket'; String get repeater_cliHelpAdvert => 'Advertentie uitzenden';
@override @override
String get repeater_cliHelpReboot => String get repeater_cliHelpReboot =>
macos/Flutter/GeneratedPluginRegistrant.swift
-2
View File
@@ -9,7 +9,6 @@ import flutter_blue_plus_darwin
import flutter_local_notifications import flutter_local_notifications
import mobile_scanner import mobile_scanner
import package_info_plus import package_info_plus
import path_provider_foundation
import share_plus import share_plus
import shared_preferences_foundation import shared_preferences_foundation
import sqflite_darwin import sqflite_darwin
@@ -20,7 +19,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin")) MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))