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_localizations_ja.dart

@@ -44,6 +44,9 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get common_close => '閉じる';
 
+  @override
+  String get common_done => 'Done';
+
   @override
   String get common_edit => '編集';
 
@@ -414,9 +417,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get settings_advertLocationSubtitle => '広告に場所を記載してください。';
 
   @override
-  String settings_multiAck(String value) {
-    return '複数のACK：$value';
-  }
+  String get settings_multiAck => '複数のACK（応答）';
 
   @override
   String get settings_telemetryModeUpdated => 'テレメトリモードが更新されました';
@@ -424,6 +425,13 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get settings_actions => '行動';
 
+  @override
+  String get settings_deleteAllPaths => 'Delete All Paths';
+
+  @override
+  String get settings_deleteAllPathsSubtitle =>
+      'Clear all path data from contacts.';
+
   @override
   String get settings_sendAdvertisement => '広告を送信する';
 
@@ -1041,6 +1049,11 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get channels_public => '一般の人々';
 
+  @override
+  String channels_via(String path) {
+    return 'via $path';
+  }
+
   @override
   String get channels_private => '個人の';
 
@@ -1394,6 +1407,9 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get chat_successes => '成功事例';
 
+  @override
+  String get chat_score => 'Score';
+
   @override
   String get chat_removePath => 'パスを削除する';
 
@@ -1489,6 +1505,12 @@ class AppLocalizationsJa extends AppLocalizations {
     return '未読: $count';
   }
 
+  @override
+  String get chat_markAsUnread => 'Mark as Unread';
+
+  @override
+  String get chat_newMessages => 'New messages';
+
   @override
   String get chat_openLink => 'リンクを開く？';
 
@@ -1567,6 +1589,24 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get map_flags => '旗';
 
+  @override
+  String get map_type => 'Type';
+
+  @override
+  String get map_path => 'Path';
+
+  @override
+  String get map_location => 'Location';
+
+  @override
+  String get map_estLocation => 'Est. Location';
+
+  @override
+  String get map_publicKey => 'Public Key';
+
+  @override
+  String get map_publicKeyPrefixHint => 'e.g. ab12';
+
   @override
   String get map_shareMarkerHere => 'この場所でシェア';
 
@@ -1650,6 +1690,9 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get map_sharedPin => '共有パスワード';
 
+  @override
+  String get map_sharedAt => '共有済み';
+
   @override
   String get map_joinRoom => '部屋に参加する';
 
@@ -3471,6 +3514,36 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get losLegendTerrain => '地形';
 
+  @override
+  String get losBlockedSpotsTitle => '利用できない場所';
+
+  @override
+  String get losBlockedSpotsHint => '地図上で、特定された場所を強調するために、該当する場所をタップしてください。';
+
+  @override
+  String losBlockedSpotChip(
+    String distance,
+    String distanceUnit,
+    String obstruction,
+    String heightUnit,
+  ) {
+    return '$distance $distanceUnit • $obstruction $heightUnit';
+  }
+
+  @override
+  String get losSelectedObstructionTitle => '選択された障害';
+
+  @override
+  String losSelectedObstructionDetails(
+    String obstruction,
+    String heightUnit,
+    String distanceFromA,
+    String distanceUnit,
+    String distanceFromB,
+  ) {
+    return '$obstruction によって $heightUnit の高さで、A地点から $distanceFromA、B地点から $distanceFromB ($distanceUnit) の距離で塞がれています。';
+  }
+
   @override
   String get losFrequencyLabel => '周波数';
 
@@ -3907,4 +3980,40 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get translation_systemLanguage => 'システム言語';
+
+  @override
+  String get background_serviceTitle => 'MeshCore running';
+
+  @override
+  String get background_serviceText => 'Keeping BLE connected';
+
+  @override
+  String appSettings_translationModelDeleted(String name) {
+    return 'Deleted $name';
+  }
+
+  @override
+  String appSettings_translationModelDeleteFailed(String error) {
+    return 'Failed to delete: $error';
+  }
+
+  @override
+  String channels_channelUpdateFailed(String error) {
+    return 'Failed to update channel: $error';
+  }
+
+  @override
+  String get contact_typeChat => 'Chat';
+
+  @override
+  String get contact_typeRepeater => 'Repeater';
+
+  @override
+  String get contact_typeRoom => 'Room';
+
+  @override
+  String get contact_typeSensor => 'Sensor';
+
+  @override
+  String get contact_typeUnknown => 'Unknown';
 }