clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10336 from annando/issue-9984 

Issue 9984: Fix the causer name on reshares
This commit is contained in:
Hypolite Petovan 2021-05-29 16:59:34 -04:00 committed by GitHub
parent dd63c243ab 7064b43cb8
commit 891fb42a23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 165 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/conversation.php
View File

@ -737,8 +737,6 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit
} }
} }
$name = $row['causer-contact-type'] == Contact::TYPE_RELAY ? $row['causer-link'] : $row['causer-name'];
switch ($row['post-reason']) { switch ($row['post-reason']) {
case Item::PR_TO: case Item::PR_TO:
$row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'to')]; $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'to')];
@ -769,9 +767,9 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit
if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) { if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) {
$causer = ['uid' => 0, 'id' => $row['causer-id'], $causer = ['uid' => 0, 'id' => $row['causer-id'],
'network' => $row['causer-network'], 'url' => $row['causer-link']]; 'network' => $row['causer-network'], 'url' => $row['causer-link']];
$row['reshared'] = DI::l10n()->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkByContact($causer)) .'">' . htmlentities($name) . '</a>'); $row['reshared'] = DI::l10n()->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkByContact($causer)) .'">' . htmlentities($row['causer-name']) . '</a>');
} }
$row['direction'] = ['direction' => 3, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Reshared') : DI::l10n()->t('Reshared by %s', $name))]; $row['direction'] = ['direction' => 3, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Reshared') : DI::l10n()->t('Reshared by %s <%s>', $row['causer-name'], $row['causer-link']))];
break; break;
case Item::PR_COMMENT: case Item::PR_COMMENT:
$row['direction'] = ['direction' => 5, 'title' => DI::l10n()->t('%s is participating in this thread.', $row['author-name'])]; $row['direction'] = ['direction' => 5, 'title' => DI::l10n()->t('%s is participating in this thread.', $row['author-name'])];
@ -783,10 +781,10 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit
$row['direction'] = ['direction' => 9, 'title' => DI::l10n()->t('Global')]; $row['direction'] = ['direction' => 9, 'title' => DI::l10n()->t('Global')];
break; break;
case Item::PR_RELAY: case Item::PR_RELAY:
$row['direction'] = ['direction' => 10, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Relayed') : DI::l10n()->t('Relayed by %s.', $name))]; $row['direction'] = ['direction' => 10, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Relayed') : DI::l10n()->t('Relayed by %s <%s>', $row['causer-name'], $row['causer-link']))];
break; break;
case Item::PR_FETCHED: case Item::PR_FETCHED:
$row['direction'] = ['direction' => 2, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Fetched') : DI::l10n()->t('Fetched because of %s', $name))]; $row['direction'] = ['direction' => 2, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Fetched') : DI::l10n()->t('Fetched because of %s <%s>', $row['causer-name'], $row['causer-link']))];
break; break;
} }

322
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.06-rc\n" "Project-Id-Version: 2021.06-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-23 07:49+0200\n" "POT-Creation-Date: 2021-05-29 20:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -54,7 +54,7 @@ msgstr ""
msgid "%1$s poked %2$s" msgid "%1$s poked %2$s"
msgstr "" msgstr ""
#: include/conversation.php:227 src/Model/Item.php:2534 #: include/conversation.php:227 src/Model/Item.php:2587
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -62,7 +62,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: include/conversation.php:235 mod/tagger.php:90 src/Model/Item.php:2536 #: include/conversation.php:235 mod/tagger.php:90 src/Model/Item.php:2589
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -82,20 +82,20 @@ msgstr ""
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: include/conversation.php:600 src/Object/Post.php:449 src/Object/Post.php:450 #: include/conversation.php:600 src/Object/Post.php:453 src/Object/Post.php:454
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: include/conversation.php:613 src/Object/Post.php:437 #: include/conversation.php:613 src/Object/Post.php:441
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: include/conversation.php:614 src/Object/Post.php:438 #: include/conversation.php:614 src/Object/Post.php:442
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: include/conversation.php:621 src/Object/Post.php:463 #: include/conversation.php:621 src/Object/Post.php:467
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
@ -104,10 +104,10 @@ msgstr ""
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
#: include/conversation.php:638 include/conversation.php:1224 #: include/conversation.php:638 include/conversation.php:1222
#: mod/editpost.php:104 mod/message.php:204 mod/message.php:374 #: mod/editpost.php:104 mod/message.php:204 mod/message.php:374
#: mod/photos.php:1536 mod/wallmessage.php:155 src/Module/Item/Compose.php:159 #: mod/photos.php:1536 mod/wallmessage.php:155 src/Module/Item/Compose.php:159
#: src/Object/Post.php:497 #: src/Object/Post.php:501
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -119,108 +119,108 @@ msgstr ""
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "" msgstr ""
#: include/conversation.php:744 include/conversation.php:747 #: include/conversation.php:742 include/conversation.php:745
#: include/conversation.php:750 include/conversation.php:753 #: include/conversation.php:748 include/conversation.php:751
#, php-format #, php-format
msgid "You had been addressed (%s)." msgid "You had been addressed (%s)."
msgstr "" msgstr ""
#: include/conversation.php:756 #: include/conversation.php:754
#, php-format #, php-format
msgid "You are following %s." msgid "You are following %s."
msgstr "" msgstr ""
#: include/conversation.php:759 #: include/conversation.php:757
msgid "Tagged" msgid "Tagged"
msgstr "" msgstr ""
#: include/conversation.php:772 include/conversation.php:1116 #: include/conversation.php:770 include/conversation.php:1114
#: include/conversation.php:1154 #: include/conversation.php:1152
#, php-format #, php-format
msgid "%s reshared this." msgid "%s reshared this."
msgstr "" msgstr ""
#: include/conversation.php:774 #: include/conversation.php:772
msgid "Reshared" msgid "Reshared"
msgstr "" msgstr ""
#: include/conversation.php:774 #: include/conversation.php:772
#, php-format #, php-format
msgid "Reshared by %s" msgid "Reshared by %s <%s>"
msgstr "" msgstr ""
#: include/conversation.php:777 #: include/conversation.php:775
#, php-format #, php-format
msgid "%s is participating in this thread." msgid "%s is participating in this thread."
msgstr "" msgstr ""
#: include/conversation.php:780 #: include/conversation.php:778
msgid "Stored" msgid "Stored"
msgstr "" msgstr ""
#: include/conversation.php:783 #: include/conversation.php:781
msgid "Global" msgid "Global"
msgstr "" msgstr ""
#: include/conversation.php:786 #: include/conversation.php:784
msgid "Relayed" msgid "Relayed"
msgstr "" msgstr ""
#: include/conversation.php:786 #: include/conversation.php:784
#, php-format #, php-format
msgid "Relayed by %s." msgid "Relayed by %s <%s>"
msgstr "" msgstr ""
#: include/conversation.php:789 #: include/conversation.php:787
msgid "Fetched" msgid "Fetched"
msgstr "" msgstr ""
#: include/conversation.php:789 #: include/conversation.php:787
#, php-format #, php-format
msgid "Fetched because of %s" msgid "Fetched because of %s <%s>"
msgstr "" msgstr ""
#: include/conversation.php:949 view/theme/frio/theme.php:323 #: include/conversation.php:947 view/theme/frio/theme.php:323
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: include/conversation.php:950 src/Model/Contact.php:986 #: include/conversation.php:948 src/Model/Contact.php:986
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: include/conversation.php:951 include/conversation.php:973 #: include/conversation.php:949 include/conversation.php:971
#: src/Model/Contact.php:912 src/Model/Contact.php:978 #: src/Model/Contact.php:912 src/Model/Contact.php:978
#: src/Model/Contact.php:987 src/Module/Directory.php:166 #: src/Model/Contact.php:987 src/Module/Directory.php:166
#: src/Module/Settings/Profile/Index.php:240 #: src/Module/Settings/Profile/Index.php:240
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: include/conversation.php:952 src/Model/Contact.php:988 #: include/conversation.php:950 src/Model/Contact.php:988
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: include/conversation.php:953 src/Model/Contact.php:979 #: include/conversation.php:951 src/Model/Contact.php:979
#: src/Model/Contact.php:989 #: src/Model/Contact.php:989
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: include/conversation.php:954 src/Model/Contact.php:980 #: include/conversation.php:952 src/Model/Contact.php:980
#: src/Model/Contact.php:990 #: src/Model/Contact.php:990
msgid "View Contact" msgid "View Contact"
msgstr "" msgstr ""
#: include/conversation.php:955 src/Model/Contact.php:992 #: include/conversation.php:953 src/Model/Contact.php:992
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
#: include/conversation.php:956 src/Module/Admin/Blocklist/Contact.php:84 #: include/conversation.php:954 src/Module/Admin/Blocklist/Contact.php:84
#: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154 #: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154
#: src/Module/Contact.php:633 src/Module/Contact.php:891 #: src/Module/Contact.php:633 src/Module/Contact.php:891
#: src/Module/Contact.php:1173 #: src/Module/Contact.php:1173
msgid "Block" msgid "Block"
msgstr "" msgstr ""
#: include/conversation.php:957 src/Module/Contact.php:634 #: include/conversation.php:955 src/Module/Contact.php:634
#: src/Module/Contact.php:892 src/Module/Contact.php:1181 #: src/Module/Contact.php:892 src/Module/Contact.php:1181
#: src/Module/Notifications/Introductions.php:113 #: src/Module/Notifications/Introductions.php:113
#: src/Module/Notifications/Introductions.php:191 #: src/Module/Notifications/Introductions.php:191
@ -228,255 +228,255 @@ msgstr ""
msgid "Ignore" msgid "Ignore"
msgstr "" msgstr ""
#: include/conversation.php:961 src/Object/Post.php:424 #: include/conversation.php:959 src/Object/Post.php:428
msgid "Languages" msgid "Languages"
msgstr "" msgstr ""
#: include/conversation.php:965 src/Model/Contact.php:993 #: include/conversation.php:963 src/Model/Contact.php:993
msgid "Poke" msgid "Poke"
msgstr "" msgstr ""
#: include/conversation.php:970 mod/follow.php:146 src/Content/Widget.php:76 #: include/conversation.php:968 mod/follow.php:146 src/Content/Widget.php:76
#: src/Model/Contact.php:981 src/Model/Contact.php:994 #: src/Model/Contact.php:981 src/Model/Contact.php:994
#: view/theme/vier/theme.php:172 #: view/theme/vier/theme.php:172
msgid "Connect/Follow" msgid "Connect/Follow"
msgstr "" msgstr ""
#: include/conversation.php:1101 #: include/conversation.php:1099
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "" msgstr ""
#: include/conversation.php:1104 #: include/conversation.php:1102
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "" msgstr ""
#: include/conversation.php:1107 #: include/conversation.php:1105
#, php-format #, php-format
msgid "%s attends." msgid "%s attends."
msgstr "" msgstr ""
#: include/conversation.php:1110 #: include/conversation.php:1108
#, php-format #, php-format
msgid "%s doesn't attend." msgid "%s doesn't attend."
msgstr "" msgstr ""
#: include/conversation.php:1113 #: include/conversation.php:1111
#, php-format #, php-format
msgid "%s attends maybe." msgid "%s attends maybe."
msgstr "" msgstr ""
#: include/conversation.php:1122 #: include/conversation.php:1120
msgid "and" msgid "and"
msgstr "" msgstr ""
#: include/conversation.php:1125 #: include/conversation.php:1123
#, php-format #, php-format
msgid "and %d other people" msgid "and %d other people"
msgstr "" msgstr ""
#: include/conversation.php:1133 #: include/conversation.php:1131
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this" msgid "<span %1$s>%2$d people</span> like this"
msgstr "" msgstr ""
#: include/conversation.php:1134 #: include/conversation.php:1132
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "" msgstr ""
#: include/conversation.php:1137 #: include/conversation.php:1135
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this" msgid "<span %1$s>%2$d people</span> don't like this"
msgstr "" msgstr ""
#: include/conversation.php:1138 #: include/conversation.php:1136
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: include/conversation.php:1141 #: include/conversation.php:1139
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> attend" msgid "<span %1$s>%2$d people</span> attend"
msgstr "" msgstr ""
#: include/conversation.php:1142 #: include/conversation.php:1140
#, php-format #, php-format
msgid "%s attend." msgid "%s attend."
msgstr "" msgstr ""
#: include/conversation.php:1145 #: include/conversation.php:1143
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't attend" msgid "<span %1$s>%2$d people</span> don't attend"
msgstr "" msgstr ""
#: include/conversation.php:1146 #: include/conversation.php:1144
#, php-format #, php-format
msgid "%s don't attend." msgid "%s don't attend."
msgstr "" msgstr ""
#: include/conversation.php:1149 #: include/conversation.php:1147
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> attend maybe" msgid "<span %1$s>%2$d people</span> attend maybe"
msgstr "" msgstr ""
#: include/conversation.php:1150 #: include/conversation.php:1148
#, php-format #, php-format
msgid "%s attend maybe." msgid "%s attend maybe."
msgstr "" msgstr ""
#: include/conversation.php:1153 #: include/conversation.php:1151
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> reshared this" msgid "<span %1$s>%2$d people</span> reshared this"
msgstr "" msgstr ""
#: include/conversation.php:1183 #: include/conversation.php:1181
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: include/conversation.php:1184 src/Module/Item/Compose.php:153 #: include/conversation.php:1182 src/Module/Item/Compose.php:153
#: src/Object/Post.php:966 #: src/Object/Post.php:970
msgid "Please enter a image/video/audio/webpage URL:" msgid "Please enter a image/video/audio/webpage URL:"
msgstr "" msgstr ""
#: include/conversation.php:1185 #: include/conversation.php:1183
msgid "Tag term:" msgid "Tag term:"
msgstr "" msgstr ""
#: include/conversation.php:1186 src/Module/Filer/SaveTag.php:69 #: include/conversation.php:1184 src/Module/Filer/SaveTag.php:69
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "" msgstr ""
#: include/conversation.php:1187 #: include/conversation.php:1185
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "" msgstr ""
#: include/conversation.php:1188 #: include/conversation.php:1186
msgid "Delete item(s)?" msgid "Delete item(s)?"
msgstr "" msgstr ""
#: include/conversation.php:1198 #: include/conversation.php:1196
msgid "New Post" msgid "New Post"
msgstr "" msgstr ""
#: include/conversation.php:1201 #: include/conversation.php:1199
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: include/conversation.php:1202 mod/editpost.php:89 mod/photos.php:1382 #: include/conversation.php:1200 mod/editpost.php:89 mod/photos.php:1382
#: src/Module/Contact/Poke.php:154 src/Object/Post.php:957 #: src/Module/Contact/Poke.php:154 src/Object/Post.php:961
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
#: include/conversation.php:1203 mod/editpost.php:90 mod/message.php:202 #: include/conversation.php:1201 mod/editpost.php:90 mod/message.php:202
#: mod/message.php:371 mod/wallmessage.php:153 #: mod/message.php:371 mod/wallmessage.php:153
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: include/conversation.php:1204 mod/editpost.php:91 #: include/conversation.php:1202 mod/editpost.php:91
msgid "upload photo" msgid "upload photo"
msgstr "" msgstr ""
#: include/conversation.php:1205 mod/editpost.php:92 #: include/conversation.php:1203 mod/editpost.php:92
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
#: include/conversation.php:1206 mod/editpost.php:93 #: include/conversation.php:1204 mod/editpost.php:93
msgid "attach file" msgid "attach file"
msgstr "" msgstr ""
#: include/conversation.php:1207 src/Module/Item/Compose.php:145 #: include/conversation.php:1205 src/Module/Item/Compose.php:145
#: src/Object/Post.php:958 #: src/Object/Post.php:962
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: include/conversation.php:1208 src/Module/Item/Compose.php:146 #: include/conversation.php:1206 src/Module/Item/Compose.php:146
#: src/Object/Post.php:959 #: src/Object/Post.php:963
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: include/conversation.php:1209 src/Module/Item/Compose.php:147 #: include/conversation.php:1207 src/Module/Item/Compose.php:147
#: src/Object/Post.php:960 #: src/Object/Post.php:964
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: include/conversation.php:1210 src/Module/Item/Compose.php:148 #: include/conversation.php:1208 src/Module/Item/Compose.php:148
#: src/Object/Post.php:961 #: src/Object/Post.php:965
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: include/conversation.php:1211 src/Module/Item/Compose.php:149 #: include/conversation.php:1209 src/Module/Item/Compose.php:149
#: src/Object/Post.php:962 #: src/Object/Post.php:966
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: include/conversation.php:1212 src/Module/Item/Compose.php:150 #: include/conversation.php:1210 src/Module/Item/Compose.php:150
#: src/Object/Post.php:963 #: src/Object/Post.php:967
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#: include/conversation.php:1213 src/Module/Item/Compose.php:151 #: include/conversation.php:1211 src/Module/Item/Compose.php:151
#: src/Object/Post.php:964 #: src/Object/Post.php:968
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: include/conversation.php:1214 src/Module/Item/Compose.php:152 #: include/conversation.php:1212 src/Module/Item/Compose.php:152
#: src/Object/Post.php:965 #: src/Object/Post.php:969
msgid "Link or Media" msgid "Link or Media"
msgstr "" msgstr ""
#: include/conversation.php:1215 #: include/conversation.php:1213
msgid "Video" msgid "Video"
msgstr "" msgstr ""
#: include/conversation.php:1216 mod/editpost.php:100 #: include/conversation.php:1214 mod/editpost.php:100
#: src/Module/Item/Compose.php:155 #: src/Module/Item/Compose.php:155
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: include/conversation.php:1217 mod/editpost.php:101 #: include/conversation.php:1215 mod/editpost.php:101
msgid "set location" msgid "set location"
msgstr "" msgstr ""
#: include/conversation.php:1218 mod/editpost.php:102 #: include/conversation.php:1216 mod/editpost.php:102
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: include/conversation.php:1219 mod/editpost.php:103 #: include/conversation.php:1217 mod/editpost.php:103
msgid "clear location" msgid "clear location"
msgstr "" msgstr ""
#: include/conversation.php:1221 mod/editpost.php:117 #: include/conversation.php:1219 mod/editpost.php:117
#: src/Module/Item/Compose.php:160 #: src/Module/Item/Compose.php:160
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
#: include/conversation.php:1223 mod/editpost.php:119 #: include/conversation.php:1221 mod/editpost.php:119
#: src/Module/Item/Compose.php:161 #: src/Module/Item/Compose.php:161
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "" msgstr ""
#: include/conversation.php:1225 mod/editpost.php:105 #: include/conversation.php:1223 mod/editpost.php:105
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: include/conversation.php:1226 mod/editpost.php:134 mod/events.php:578 #: include/conversation.php:1224 mod/editpost.php:134 mod/events.php:578
#: mod/photos.php:969 mod/photos.php:1335 #: mod/photos.php:969 mod/photos.php:1335
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: include/conversation.php:1235 mod/editpost.php:114 #: include/conversation.php:1233 mod/editpost.php:114
msgid "Public post" msgid "Public post"
msgstr "" msgstr ""
#: include/conversation.php:1239 mod/editpost.php:125 mod/events.php:573 #: include/conversation.php:1237 mod/editpost.php:125 mod/events.php:573
#: mod/photos.php:1381 mod/photos.php:1438 mod/photos.php:1513 #: mod/photos.php:1381 mod/photos.php:1438 mod/photos.php:1513
#: src/Module/Item/Compose.php:154 src/Object/Post.php:967 #: src/Module/Item/Compose.php:154 src/Object/Post.php:971
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: include/conversation.php:1243 mod/dfrn_request.php:642 mod/editpost.php:128 #: include/conversation.php:1241 mod/dfrn_request.php:642 mod/editpost.php:128
#: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/follow.php:152 #: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/follow.php:152
#: mod/photos.php:1037 mod/photos.php:1143 mod/tagrm.php:37 mod/tagrm.php:127 #: mod/photos.php:1037 mod/photos.php:1143 mod/tagrm.php:37 mod/tagrm.php:127
#: mod/unfollow.php:100 src/Module/Contact.php:467 #: mod/unfollow.php:100 src/Module/Contact.php:467
@ -484,17 +484,17 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: include/conversation.php:1250 mod/editpost.php:132 src/Model/Profile.php:450 #: include/conversation.php:1248 mod/editpost.php:132 src/Model/Profile.php:460
#: src/Module/Contact.php:344 #: src/Module/Contact.php:344
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: include/conversation.php:1251 mod/editpost.php:133 #: include/conversation.php:1249 mod/editpost.php:133
#: src/Module/Settings/TwoFactor/Trusted.php:101 #: src/Module/Settings/TwoFactor/Trusted.php:101
msgid "Browser" msgid "Browser"
msgstr "" msgstr ""
#: include/conversation.php:1253 mod/editpost.php:136 #: include/conversation.php:1251 mod/editpost.php:136
msgid "Open Compose page" msgid "Open Compose page"
msgstr "" msgstr ""
@ -1047,7 +1047,7 @@ msgstr ""
msgid "Unable to update your contact profile details on our system" msgid "Unable to update your contact profile details on our system"
msgstr "" msgstr ""
#: mod/dfrn_poll.php:135 mod/dfrn_poll.php:506 #: mod/dfrn_poll.php:136 mod/dfrn_poll.php:509
#, php-format #, php-format
msgid "%1$s welcomes %2$s" msgid "%1$s welcomes %2$s"
msgstr "" msgstr ""
@ -1331,7 +1331,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: mod/events.php:563 src/Model/Event.php:84 src/Model/Event.php:111 #: mod/events.php:563 src/Model/Event.php:84 src/Model/Event.php:111
#: src/Model/Event.php:472 src/Model/Event.php:959 src/Model/Profile.php:358 #: src/Model/Event.php:472 src/Model/Event.php:959 src/Model/Profile.php:368
#: src/Module/Contact.php:654 src/Module/Directory.php:156 #: src/Module/Contact.php:654 src/Module/Directory.php:156
#: src/Module/Notifications/Introductions.php:172 #: src/Module/Notifications/Introductions.php:172
#: src/Module/Profile/Profile.php:190 #: src/Module/Profile/Profile.php:190
@ -1358,7 +1358,7 @@ msgstr ""
#: src/Module/Install.php:245 src/Module/Install.php:287 #: src/Module/Install.php:245 src/Module/Install.php:287
#: src/Module/Install.php:324 src/Module/Invite.php:174 #: src/Module/Install.php:324 src/Module/Invite.php:174
#: src/Module/Item/Compose.php:144 src/Module/Profile/Profile.php:243 #: src/Module/Item/Compose.php:144 src/Module/Profile/Profile.php:243
#: src/Module/Settings/Profile/Index.php:237 src/Object/Post.php:956 #: src/Module/Settings/Profile/Index.php:237 src/Object/Post.php:960
#: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160
#: view/theme/quattro/config.php:71 view/theme/vier/config.php:119 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119
msgid "Submit" msgid "Submit"
@ -1985,12 +1985,12 @@ msgstr ""
#: mod/photos.php:1377 mod/photos.php:1434 mod/photos.php:1509 #: mod/photos.php:1377 mod/photos.php:1434 mod/photos.php:1509
#: src/Module/Contact.php:1104 src/Module/Item/Compose.php:142 #: src/Module/Contact.php:1104 src/Module/Item/Compose.php:142
#: src/Object/Post.php:953 #: src/Object/Post.php:957
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: mod/photos.php:1379 mod/photos.php:1436 mod/photos.php:1511 #: mod/photos.php:1379 mod/photos.php:1436 mod/photos.php:1511
#: src/Object/Post.php:491 src/Object/Post.php:955 #: src/Object/Post.php:495 src/Object/Post.php:959
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -2990,7 +2990,7 @@ msgid ""
"your site allow private mail from unknown senders." "your site allow private mail from unknown senders."
msgstr "" msgstr ""
#: src/App.php:311 #: src/App.php:312
msgid "No system theme config value set." msgid "No system theme config value set."
msgstr "" msgstr ""
@ -3647,8 +3647,8 @@ msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1091 src/Model/Item.php:3035 #: src/Content/Text/BBCode.php:1091 src/Model/Item.php:3095
#: src/Model/Item.php:3041 src/Model/Item.php:3042 #: src/Model/Item.php:3101 src/Model/Item.php:3102
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -3680,7 +3680,7 @@ msgstr ""
msgid "The end" msgid "The end"
msgstr "" msgstr ""
#: src/Content/Text/HTML.php:893 src/Model/Profile.php:444 #: src/Content/Text/HTML.php:893 src/Model/Profile.php:454
#: src/Module/Contact.php:340 #: src/Module/Contact.php:340
msgid "Follow" msgid "Follow"
msgstr "" msgstr ""
@ -3811,15 +3811,15 @@ msgstr ""
msgid "All" msgid "All"
msgstr "" msgstr ""
#: src/Content/Widget/CalendarExport.php:63 #: src/Content/Widget/CalendarExport.php:54
msgid "Export" msgid "Export"
msgstr "" msgstr ""
#: src/Content/Widget/CalendarExport.php:64 #: src/Content/Widget/CalendarExport.php:55
msgid "Export calendar as ical" msgid "Export calendar as ical"
msgstr "" msgstr ""
#: src/Content/Widget/CalendarExport.php:65 #: src/Content/Widget/CalendarExport.php:56
msgid "Export calendar as csv" msgid "Export calendar as csv"
msgstr "" msgstr ""
@ -4529,16 +4529,16 @@ msgstr ""
msgid "Errors encountered performing database changes: " msgid "Errors encountered performing database changes: "
msgstr "" msgstr ""
#: src/Database/DBStructure.php:439 #: src/Database/DBStructure.php:445
msgid "Another database update is currently running." msgid "Another database update is currently running."
msgstr "" msgstr ""
#: src/Database/DBStructure.php:443 #: src/Database/DBStructure.php:449
#, php-format #, php-format
msgid "%s: Database update" msgid "%s: Database update"
msgstr "" msgstr ""
#: src/Database/DBStructure.php:743 #: src/Database/DBStructure.php:749
#, php-format #, php-format
msgid "%s: updating %s table." msgid "%s: updating %s table."
msgstr "" msgstr ""
@ -4816,110 +4816,110 @@ msgstr ""
msgid "Edit groups" msgid "Edit groups"
msgstr "" msgstr ""
#: src/Model/Item.php:1600 #: src/Model/Item.php:1653
#, php-format #, php-format
msgid "Detected languages in this post:\\n%s" msgid "Detected languages in this post:\\n%s"
msgstr "" msgstr ""
#: src/Model/Item.php:2538 #: src/Model/Item.php:2591
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2540 #: src/Model/Item.php:2593
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:2543 #: src/Model/Item.php:2596
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:2657 #: src/Model/Item.php:2710
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3000 #: src/Model/Item.php:3060
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3029 src/Model/Item.php:3030 #: src/Model/Item.php:3089 src/Model/Item.php:3090
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
#: src/Model/Mail.php:134 src/Model/Mail.php:272 #: src/Model/Mail.php:136 src/Model/Mail.php:268
msgid "[no subject]" msgid "[no subject]"
msgstr "" msgstr ""
#: src/Model/Profile.php:346 src/Module/Profile/Profile.php:252 #: src/Model/Profile.php:356 src/Module/Profile/Profile.php:252
#: src/Module/Profile/Profile.php:254 #: src/Module/Profile/Profile.php:254
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: src/Model/Profile.php:348 #: src/Model/Profile.php:358
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: src/Model/Profile.php:361 src/Module/Directory.php:161 #: src/Model/Profile.php:371 src/Module/Directory.php:161
#: src/Module/Profile/Profile.php:180 #: src/Module/Profile/Profile.php:180
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: src/Model/Profile.php:362 src/Module/Contact.php:658 #: src/Model/Profile.php:372 src/Module/Contact.php:658
#: src/Module/Notifications/Introductions.php:174 #: src/Module/Notifications/Introductions.php:174
msgid "About:" msgid "About:"
msgstr "" msgstr ""
#: src/Model/Profile.php:363 src/Module/Contact.php:656 #: src/Model/Profile.php:373 src/Module/Contact.php:656
#: src/Module/Profile/Profile.php:176 #: src/Module/Profile/Profile.php:176
msgid "XMPP:" msgid "XMPP:"
msgstr "" msgstr ""
#: src/Model/Profile.php:446 src/Module/Contact.php:342 #: src/Model/Profile.php:456 src/Module/Contact.php:342
msgid "Unfollow" msgid "Unfollow"
msgstr "" msgstr ""
#: src/Model/Profile.php:448 #: src/Model/Profile.php:458
msgid "Atom feed" msgid "Atom feed"
msgstr "" msgstr ""
#: src/Model/Profile.php:456 src/Module/Contact.php:338 #: src/Model/Profile.php:466 src/Module/Contact.php:338
#: src/Module/Notifications/Introductions.php:186 #: src/Module/Notifications/Introductions.php:186
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
#: src/Model/Profile.php:486 src/Model/Profile.php:583 #: src/Model/Profile.php:496 src/Model/Profile.php:593
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: src/Model/Profile.php:487 #: src/Model/Profile.php:497
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: src/Model/Profile.php:549 src/Model/Profile.php:634 #: src/Model/Profile.php:559 src/Model/Profile.php:644
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: src/Model/Profile.php:559 #: src/Model/Profile.php:569
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: src/Model/Profile.php:560 #: src/Model/Profile.php:570
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: src/Model/Profile.php:621 #: src/Model/Profile.php:631
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: src/Model/Profile.php:647 #: src/Model/Profile.php:657
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: src/Model/Profile.php:648 #: src/Model/Profile.php:658
msgid "Upcoming events the next 7 days:" msgid "Upcoming events the next 7 days:"
msgstr "" msgstr ""
#: src/Model/Profile.php:823 #: src/Model/Profile.php:833
#, php-format #, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s" msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr "" msgstr ""
@ -10416,71 +10416,71 @@ msgstr ""
msgid "Remote comment" msgid "Remote comment"
msgstr "" msgstr ""
#: src/Object/Post.php:417 #: src/Object/Post.php:421
msgid "Pushed" msgid "Pushed"
msgstr "" msgstr ""
#: src/Object/Post.php:417 #: src/Object/Post.php:421
msgid "Pulled" msgid "Pulled"
msgstr "" msgstr ""
#: src/Object/Post.php:451 #: src/Object/Post.php:455
msgid "to" msgid "to"
msgstr "" msgstr ""
#: src/Object/Post.php:452 #: src/Object/Post.php:456
msgid "via" msgid "via"
msgstr "" msgstr ""
#: src/Object/Post.php:453 #: src/Object/Post.php:457
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: src/Object/Post.php:454 #: src/Object/Post.php:458
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
#: src/Object/Post.php:492 #: src/Object/Post.php:496
#, php-format #, php-format
msgid "Reply to %s" msgid "Reply to %s"
msgstr "" msgstr ""
#: src/Object/Post.php:495 #: src/Object/Post.php:499
msgid "More" msgid "More"
msgstr "" msgstr ""
#: src/Object/Post.php:513 #: src/Object/Post.php:517
msgid "Notifier task is pending" msgid "Notifier task is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:514 #: src/Object/Post.php:518
msgid "Delivery to remote servers is pending" msgid "Delivery to remote servers is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:515 #: src/Object/Post.php:519
msgid "Delivery to remote servers is underway" msgid "Delivery to remote servers is underway"
msgstr "" msgstr ""
#: src/Object/Post.php:516 #: src/Object/Post.php:520
msgid "Delivery to remote servers is mostly done" msgid "Delivery to remote servers is mostly done"
msgstr "" msgstr ""
#: src/Object/Post.php:517 #: src/Object/Post.php:521
msgid "Delivery to remote servers is done" msgid "Delivery to remote servers is done"
msgstr "" msgstr ""
#: src/Object/Post.php:537 #: src/Object/Post.php:541
#, php-format #, php-format
msgid "%d comment" msgid "%d comment"
msgid_plural "%d comments" msgid_plural "%d comments"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Object/Post.php:538 #: src/Object/Post.php:542
msgid "Show more" msgid "Show more"
msgstr "" msgstr ""
#: src/Object/Post.php:539 #: src/Object/Post.php:543
msgid "Show fewer" msgid "Show fewer"
msgstr "" msgstr ""
@ -10692,7 +10692,7 @@ msgstr ""
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""
#: src/Worker/Delivery.php:570 #: src/Worker/Delivery.php:529
msgid "(no subject)" msgid "(no subject)"
msgstr "" msgstr ""