Merge remote-tracking branch 'origin/dev' into gps-toggle-in-settings

# Conflicts:
#	lib/l10n/app_bg.arb
#	lib/l10n/app_de.arb
#	lib/l10n/app_es.arb
#	lib/l10n/app_fr.arb
#	lib/l10n/app_hu.arb
#	lib/l10n/app_it.arb
#	lib/l10n/app_ja.arb
#	lib/l10n/app_ko.arb
#	lib/l10n/app_localizations_es.dart
#	lib/l10n/app_localizations_it.dart
#	lib/l10n/app_localizations_nl.dart
#	lib/l10n/app_localizations_pt.dart
#	lib/l10n/app_localizations_sv.dart
#	lib/l10n/app_localizations_uk.dart
#	lib/l10n/app_nl.arb
#	lib/l10n/app_pl.arb
#	lib/l10n/app_pt.arb
#	lib/l10n/app_ru.arb
#	lib/l10n/app_sk.arb
#	lib/l10n/app_sl.arb
#	lib/l10n/app_sv.arb
#	lib/l10n/app_uk.arb
#	lib/l10n/app_zh.arb

lib/l10n/app_ja.arb

@@ -167,6 +167,8 @@
   "settings_privacyModeEnabled": "プライバシーモードが有効になっています",
   "settings_privacyModeDisabled": "プライバシーモードは無効化されています",
   "settings_actions": "行動",
+  "settings_deleteAllPaths": "Delete All Paths",
+  "settings_deleteAllPathsSubtitle": "Clear all path data from contacts.",
   "settings_sendAdvertisement": "広告を送信する",
   "settings_sendAdvertisementSubtitle": "現在、放送での活動",
   "settings_advertisementSent": "広告が送信されました",
@@ -2085,13 +2087,6 @@
   "radioStats_stripWaiting": "ラジオの統計情報を取得中…",
   "radioStats_settingsTile": "ラジオの統計",
   "radioStats_settingsSubtitle": "ノイズレベル、RSSI、SNR、および通信時間",
-  "@settings_multiAck": {
-    "placeholders": {
-      "value": {
-        "type": "String"
-      }
-    }
-  },
   "settings_privacy": "プライバシー設定",
   "settings_privacySubtitle": "共有する情報の内容を管理する。",
   "settings_denyAll": "すべてを否定",
@@ -2103,7 +2098,6 @@
   "settings_telemetryEnvironmentMode": "テレメトリ環境モード",
   "settings_advertLocation": "広告掲載場所",
   "settings_advertLocationSubtitle": "広告に場所を記載してください。",
-  "settings_multiAck": "複数のACK：{value}",
   "settings_telemetryModeUpdated": "テレメトリモードが更新されました",
   "contact_info": "連絡先",
   "contact_settings": "連絡設定",
@@ -2255,5 +2249,87 @@
   "repeater_cliHelpRegionListDenied": "洪水による交通を遮断している地域の一覧",
   "repeater_cliHelpStatsPackets": "（シリアルのみ）パケットレベルの統計情報を表示します。",
   "repeater_cliHelpStatsRadio": "（シリーズのみ）ラジオの統計情報を表示します。",
-  "repeater_cliHelpStatsCore": "（シリアルのみ）主要なファームウェアの統計情報を表示します。"
+  "repeater_cliHelpStatsCore": "（シリアルのみ）主要なファームウェアの統計情報を表示します。",
+  "common_done": "Done",
+  "background_serviceTitle": "MeshCore running",
+  "background_serviceText": "Keeping BLE connected",
+  "appSettings_translationModelDeleted": "Deleted {name}",
+  "@appSettings_translationModelDeleted": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "appSettings_translationModelDeleteFailed": "Failed to delete: {error}",
+  "@appSettings_translationModelDeleteFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "channels_channelUpdateFailed": "Failed to update channel: {error}",
+  "@channels_channelUpdateFailed": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "map_type": "Type",
+  "map_path": "Path",
+  "map_location": "Location",
+  "map_estLocation": "Est. Location",
+  "map_publicKey": "Public Key",
+  "map_publicKeyPrefixHint": "e.g. ab12",
+  "contact_typeChat": "Chat",
+  "contact_typeRepeater": "Repeater",
+  "contact_typeRoom": "Room",
+  "contact_typeSensor": "Sensor",
+  "contact_typeUnknown": "Unknown",
+  "channels_via": "via {path}",
+  "chat_score": "Score",
+  "settings_multiAck": "複数のACK（応答）",
+  "map_sharedAt": "共有済み",
+  "@losBlockedSpotChip": {
+    "placeholders": {
+      "distance": {
+        "type": "String"
+      },
+      "distanceUnit": {
+        "type": "String"
+      },
+      "obstruction": {
+        "type": "String"
+      },
+      "heightUnit": {
+        "type": "String"
+      }
+    }
+  },
+  "@losSelectedObstructionDetails": {
+    "placeholders": {
+      "obstruction": {
+        "type": "String"
+      },
+      "heightUnit": {
+        "type": "String"
+      },
+      "distanceFromA": {
+        "type": "String"
+      },
+      "distanceUnit": {
+        "type": "String"
+      },
+      "distanceFromB": {
+        "type": "String"
+      }
+    }
+  },
+  "losBlockedSpotsHint": "地図上で、特定された場所を強調するために、該当する場所をタップしてください。",
+  "losSelectedObstructionTitle": "選択された障害",
+  "losBlockedSpotsTitle": "利用できない場所",
+  "losSelectedObstructionDetails": "{obstruction} によって {heightUnit} の高さで、A地点から {distanceFromA}、B地点から {distanceFromB} ({distanceUnit}) の距離で塞がれています。",
+  "losBlockedSpotChip": "{distance} {distanceUnit} • {obstruction} {heightUnit}"
 }