Merge remote-tracking branch 'upstream/develop' into move-delivery

view/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2023.03-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-30 21:30+0000\n"
+"POT-Creation-Date: 2022-12-29 20:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2898,6 +2898,11 @@ msgid ""
 "credentials in your Settings -> Social Networks page."
 msgstr ""
 
+#: src/Model/Contact.php:2956
+#, php-format
+msgid "Expected network %s does not match actual network %s"
+msgstr ""
+
 #: src/Model/Contact.php:2973
 msgid "The profile address specified does not provide adequate information."
 msgstr ""

view/lang/ja/messages.po

@@ -3030,7 +3030,7 @@ msgstr "フォロワー"
 #: src/BaseModule.php:219 src/Content/Widget.php:239
 #: src/Module/Contact.php:861
 msgid "Following"
-msgstr "以下"
+msgstr "フォロー中"
 
 #: src/BaseModule.php:224 src/Content/Widget.php:240
 #: src/Module/Contact.php:862
@@ -3810,7 +3810,7 @@ msgstr ""
 
 #: src/Content/Widget/CalendarExport.php:54
 msgid "Export"
-msgstr "輸出する"
+msgstr "エクスポート"
 
 #: src/Content/Widget/CalendarExport.php:55
 msgid "Export calendar as ical"

view/lang/ja/strings.php

@@ -675,7 +675,7 @@ $a->strings['Page not found.'] = 'ページが見つかりません。';
 $a->strings['The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.'] = 'フォームセキュリティトークンが正しくありませんでした。これは、フォームを送信する前にフォームが長時間（3時間以上）開かれたために発生した可能性があります。';
 $a->strings['All contacts'] = 'すべてのコンタクト';
 $a->strings['Followers'] = 'フォロワー';
-$a->strings['Following'] = '以下';
+$a->strings['Following'] = 'フォロー中';
 $a->strings['Mutual friends'] = '共通の友人';
 $a->strings['Could not find any unarchived contact entry for this URL (%s)'] = 'このURL（ %s ）のアーカイブされていないコンタクトエントリが見つかりませんでした';
 $a->strings['The contact entries have been archived'] = 'コンタクトエントリがアーカイブされました';
@@ -837,7 +837,7 @@ $a->strings['%d contact in common'] = [
 ];
 $a->strings['Archives'] = 'アーカイブ';
 $a->strings['News'] = 'ニュース';
-$a->strings['Export'] = '輸出する';
+$a->strings['Export'] = 'エクスポート';
 $a->strings['Export calendar as ical'] = 'カレンダーをicalとしてエクスポート';
 $a->strings['Export calendar as csv'] = 'カレンダーをcsvとしてエクスポート';
 $a->strings['No contacts'] = 'コンタクトなし';

view/theme/frio/templates/mail_list.tpl

@@ -11,7 +11,15 @@
 			<div class="media-body">
 				<div class="text-muted time ago pull-right" title="{{$date}}">{{$ago}}</div>
 
-				<h4 class="media-heading">{{$from_name}}</h4>
+				<h4 class="media-heading">
+					{{if !$seen}}
+						<strong>
+					{{/if}}
+						<a href="message/{{$id}}">{{$from_name}}</a>
+					{{if !$seen}}
+						</strong>
+					{{/if}}
+				</h4>
 				<div class="mail-list-subject">
 					<a href="message/{{$id}}">
 					{{if !$seen}}
@@ -21,7 +29,8 @@
 					{{if !$seen}}
 						</strong>
 					{{/if}}
-					</a></div>
+					</a>
+				</div>
 				<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);">
 				<i class="faded-icon fa fa-trash"></i>
 				</a>