strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10579 from annando/http-errors

Browse source 
Avoid some HTTP errors
This commit is contained in:
Tobias Diekershoff 2021-08-06 08:11:35 +02:00 committed by GitHub
parent 0e54d35f65 4db86a108e
commit 266ee26240
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 158 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Storage/ExternalResource.php
View file

@ -58,7 +58,7 @@ class ExternalResource implements IStorage
return ""; return "";
} }
$fetchResult = HTTPSignature::fetchRaw($data->url, $data->uid); $fetchResult = HTTPSignature::fetchRaw($data->url, $data->uid, ['accept_content' => '']);
if ($fetchResult->isSuccess()) { if ($fetchResult->isSuccess()) {
return $fetchResult->getBody(); return $fetchResult->getBody();
} else { } else {

10
src/Module/Photo.php
View file

@ -118,8 +118,14 @@ class Photo extends BaseModule
$data = microtime(true) - $stamp; $data = microtime(true) - $stamp;
if (empty($imgdata)) { if (empty($imgdata)) {
Logger::warning("Invalid photo with id {$photo["id"]}."); Logger::warning('Invalid photo', ['id' => $photo['id']]);
throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"])); if (in_array($photo['backend-class'], [ExternalResource::NAME])) {
$reference = json_decode($photo['backend-ref'], true);
$error = DI::l10n()->t('Invalid external resource with url %s.', $reference['url']);
} else {
$error = DI::l10n()->t('Invalid photo with id %s.', $photo['id']);
}
throw new \Friendica\Network\HTTPException\InternalServerErrorException($error);
} }
// if customsize is set and image is not a gif, resize it // if customsize is set and image is not a gif, resize it

2
src/Module/Proxy.php
View file

@ -75,7 +75,7 @@ class Proxy extends BaseModule
$request['url'] = str_replace(' ', '+', $request['url']); $request['url'] = str_replace(' ', '+', $request['url']);
// Fetch the content with the local user // Fetch the content with the local user
$fetchResult = HTTPSignature::fetchRaw($request['url'], local_user(), ['timeout' => 10]); $fetchResult = HTTPSignature::fetchRaw($request['url'], local_user(), ['accept_content' => '', 'timeout' => 10]);
$img_str = $fetchResult->getBody(); $img_str = $fetchResult->getBody();
if (!$fetchResult->isSuccess() || empty($img_str)) { if (!$fetchResult->isSuccess() || empty($img_str)) {

9
static/routes.config.php
View file

@ -436,7 +436,14 @@ return [
'/tos' => [Module\Tos::class, [R::GET]], '/tos' => [Module\Tos::class, [R::GET]],
'/update_community[/{content}]' => [Module\Update\Community::class, [R::GET]], '/update_community[/{content}]' => [Module\Update\Community::class, [R::GET]],
'/update_network' => [Module\Update\Network::class, [R::GET]],
'/update_network' => [
'[/]' => [Module\Update\Network::class, [R::GET]],
'/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Update\Network::class, [R::GET]],
'/forum/{contact_id:\d+}' => [Module\Update\Network::class, [R::GET]],
'/group/{group_id:\d+}' => [Module\Update\Network::class, [R::GET]],
],
'/update_profile' => [Module\Update\Profile::class, [R::GET]], '/update_profile' => [Module\Update\Profile::class, [R::GET]],
'/view/theme/{theme}/style.pcss' => [Module\Theme::class, [R::GET]], '/view/theme/{theme}/style.pcss' => [Module\Theme::class, [R::GET]],

274
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.09-dev\n" "Project-Id-Version: 2021.09-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-08-02 17:00+0000\n" "POT-Creation-Date: 2021-08-06 05:58+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"
@ -39,7 +39,7 @@ msgstr ""
#: include/api.php:4437 mod/photos.php:85 mod/photos.php:194 mod/photos.php:622 #: include/api.php:4437 mod/photos.php:85 mod/photos.php:194 mod/photos.php:622
#: mod/photos.php:1033 mod/photos.php:1050 mod/photos.php:1596 #: mod/photos.php:1033 mod/photos.php:1050 mod/photos.php:1596
#: src/Model/User.php:1105 src/Model/User.php:1113 src/Model/User.php:1121 #: src/Model/User.php:1110 src/Model/User.php:1118 src/Model/User.php:1126
#: src/Module/Settings/Profile/Photo/Crop.php:98 #: src/Module/Settings/Profile/Photo/Crop.php:98
#: src/Module/Settings/Profile/Photo/Crop.php:114 #: src/Module/Settings/Profile/Photo/Crop.php:114
#: src/Module/Settings/Profile/Photo/Crop.php:130 #: src/Module/Settings/Profile/Photo/Crop.php:130
@ -104,7 +104,7 @@ msgstr ""
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
#: include/conversation.php:539 include/conversation.php:1124 #: include/conversation.php:539 include/conversation.php:1129
#: mod/editpost.php:104 mod/message.php:203 mod/message.php:368 #: mod/editpost.php:104 mod/message.php:203 mod/message.php:368
#: mod/photos.php:1523 mod/wallmessage.php:155 src/Module/Item/Compose.php:165 #: mod/photos.php:1523 mod/wallmessage.php:155 src/Module/Item/Compose.php:165
#: src/Object/Post.php:501 #: src/Object/Post.php:501
@ -134,8 +134,8 @@ msgstr ""
msgid "Tagged" msgid "Tagged"
msgstr "" msgstr ""
#: include/conversation.php:673 include/conversation.php:1007 #: include/conversation.php:673 include/conversation.php:1012
#: include/conversation.php:1045 #: include/conversation.php:1050
#, php-format #, php-format
msgid "%s reshared this." msgid "%s reshared this."
msgstr "" msgstr ""
@ -180,47 +180,47 @@ msgstr ""
msgid "Fetched because of %s <%s>" msgid "Fetched because of %s <%s>"
msgstr "" msgstr ""
#: include/conversation.php:838 view/theme/frio/theme.php:323 #: include/conversation.php:843 view/theme/frio/theme.php:323
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: include/conversation.php:839 src/Model/Contact.php:1047 #: include/conversation.php:844 src/Model/Contact.php:1047
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: include/conversation.php:840 include/conversation.php:862 #: include/conversation.php:845 include/conversation.php:867
#: src/Model/Contact.php:973 src/Model/Contact.php:1039 #: src/Model/Contact.php:973 src/Model/Contact.php:1039
#: src/Model/Contact.php:1048 src/Module/Directory.php:160 #: src/Model/Contact.php:1048 src/Module/Directory.php:160
#: src/Module/Settings/Profile/Index.php:224 #: src/Module/Settings/Profile/Index.php:224
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: include/conversation.php:841 src/Model/Contact.php:1049 #: include/conversation.php:846 src/Model/Contact.php:1049
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: include/conversation.php:842 src/Model/Contact.php:1040 #: include/conversation.php:847 src/Model/Contact.php:1040
#: src/Model/Contact.php:1050 #: src/Model/Contact.php:1050
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: include/conversation.php:843 src/Model/Contact.php:1041 #: include/conversation.php:848 src/Model/Contact.php:1041
#: src/Model/Contact.php:1051 #: src/Model/Contact.php:1051
msgid "View Contact" msgid "View Contact"
msgstr "" msgstr ""
#: include/conversation.php:844 src/Model/Contact.php:1053 #: include/conversation.php:849 src/Model/Contact.php:1053
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
#: include/conversation.php:845 src/Module/Admin/Blocklist/Contact.php:84 #: include/conversation.php:850 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:588 src/Module/Contact.php:846 #: src/Module/Contact.php:588 src/Module/Contact.php:846
#: src/Module/Contact.php:1126 #: src/Module/Contact.php:1126
msgid "Block" msgid "Block"
msgstr "" msgstr ""
#: include/conversation.php:846 src/Module/Contact.php:589 #: include/conversation.php:851 src/Module/Contact.php:589
#: src/Module/Contact.php:847 src/Module/Contact.php:1134 #: src/Module/Contact.php:847 src/Module/Contact.php:1134
#: src/Module/Notifications/Introductions.php:113 #: src/Module/Notifications/Introductions.php:113
#: src/Module/Notifications/Introductions.php:185 #: src/Module/Notifications/Introductions.php:185
@ -228,276 +228,276 @@ msgstr ""
msgid "Ignore" msgid "Ignore"
msgstr "" msgstr ""
#: include/conversation.php:850 src/Object/Post.php:428 #: include/conversation.php:855 src/Object/Post.php:428
msgid "Languages" msgid "Languages"
msgstr "" msgstr ""
#: include/conversation.php:854 src/Model/Contact.php:1054 #: include/conversation.php:859 src/Model/Contact.php:1054
msgid "Poke" msgid "Poke"
msgstr "" msgstr ""
#: include/conversation.php:859 mod/follow.php:139 src/Content/Widget.php:76 #: include/conversation.php:864 mod/follow.php:139 src/Content/Widget.php:76
#: src/Model/Contact.php:1042 src/Model/Contact.php:1055 #: src/Model/Contact.php:1042 src/Model/Contact.php:1055
#: view/theme/vier/theme.php:172 #: view/theme/vier/theme.php:172
msgid "Connect/Follow" msgid "Connect/Follow"
msgstr "" msgstr ""
#: include/conversation.php:992 #: include/conversation.php:997
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "" msgstr ""
#: include/conversation.php:995 #: include/conversation.php:1000
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "" msgstr ""
#: include/conversation.php:998 #: include/conversation.php:1003
#, php-format #, php-format
msgid "%s attends." msgid "%s attends."
msgstr "" msgstr ""
#: include/conversation.php:1001 #: include/conversation.php:1006
#, php-format #, php-format
msgid "%s doesn't attend." msgid "%s doesn't attend."
msgstr "" msgstr ""
#: include/conversation.php:1004 #: include/conversation.php:1009
#, php-format #, php-format
msgid "%s attends maybe." msgid "%s attends maybe."
msgstr "" msgstr ""
#: include/conversation.php:1013 #: include/conversation.php:1018
msgid "and" msgid "and"
msgstr "" msgstr ""
#: include/conversation.php:1016 #: include/conversation.php:1021
#, php-format #, php-format
msgid "and %d other people" msgid "and %d other people"
msgstr "" msgstr ""
#: include/conversation.php:1024 #: include/conversation.php:1029
#, 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:1025 #: include/conversation.php:1030
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "" msgstr ""
#: include/conversation.php:1028 #: include/conversation.php:1033
#, 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:1029 #: include/conversation.php:1034
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: include/conversation.php:1032 #: include/conversation.php:1037
#, 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:1033 #: include/conversation.php:1038
#, php-format #, php-format
msgid "%s attend." msgid "%s attend."
msgstr "" msgstr ""
#: include/conversation.php:1036 #: include/conversation.php:1041
#, 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:1037 #: include/conversation.php:1042
#, php-format #, php-format
msgid "%s don't attend." msgid "%s don't attend."
msgstr "" msgstr ""
#: include/conversation.php:1040 #: include/conversation.php:1045
#, 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:1041 #: include/conversation.php:1046
#, php-format #, php-format
msgid "%s attend maybe." msgid "%s attend maybe."
msgstr "" msgstr ""
#: include/conversation.php:1044 #: include/conversation.php:1049
#, 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:1076 #: include/conversation.php:1081
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: include/conversation.php:1077 src/Module/Item/Compose.php:159 #: include/conversation.php:1082 src/Module/Item/Compose.php:159
#: src/Object/Post.php:972 #: src/Object/Post.php:972
msgid "Please enter a image/video/audio/webpage URL:" msgid "Please enter a image/video/audio/webpage URL:"
msgstr "" msgstr ""
#: include/conversation.php:1078 #: include/conversation.php:1083
msgid "Tag term:" msgid "Tag term:"
msgstr "" msgstr ""
#: include/conversation.php:1079 src/Module/Filer/SaveTag.php:68 #: include/conversation.php:1084 src/Module/Filer/SaveTag.php:68
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "" msgstr ""
#: include/conversation.php:1080 #: include/conversation.php:1085
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "" msgstr ""
#: include/conversation.php:1081 #: include/conversation.php:1086
msgid "Delete item(s)?" msgid "Delete item(s)?"
msgstr "" msgstr ""
#: include/conversation.php:1091 #: include/conversation.php:1096
msgid "New Post" msgid "New Post"
msgstr "" msgstr ""
#: include/conversation.php:1094 #: include/conversation.php:1099
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: include/conversation.php:1095 mod/editpost.php:89 mod/photos.php:1372 #: include/conversation.php:1100 mod/editpost.php:89 mod/photos.php:1372
#: src/Module/Contact/Poke.php:156 src/Object/Post.php:963 #: src/Module/Contact/Poke.php:156 src/Object/Post.php:963
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
#: include/conversation.php:1096 mod/editpost.php:90 mod/message.php:201 #: include/conversation.php:1101 mod/editpost.php:90 mod/message.php:201
#: mod/message.php:365 mod/wallmessage.php:153 #: mod/message.php:365 mod/wallmessage.php:153
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: include/conversation.php:1097 mod/editpost.php:91 #: include/conversation.php:1102 mod/editpost.php:91
msgid "upload photo" msgid "upload photo"
msgstr "" msgstr ""
#: include/conversation.php:1098 mod/editpost.php:92 #: include/conversation.php:1103 mod/editpost.php:92
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
#: include/conversation.php:1099 mod/editpost.php:93 #: include/conversation.php:1104 mod/editpost.php:93
msgid "attach file" msgid "attach file"
msgstr "" msgstr ""
#: include/conversation.php:1100 src/Module/Item/Compose.php:151 #: include/conversation.php:1105 src/Module/Item/Compose.php:151
#: src/Object/Post.php:964 #: src/Object/Post.php:964
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: include/conversation.php:1101 src/Module/Item/Compose.php:152 #: include/conversation.php:1106 src/Module/Item/Compose.php:152
#: src/Object/Post.php:965 #: src/Object/Post.php:965
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: include/conversation.php:1102 src/Module/Item/Compose.php:153 #: include/conversation.php:1107 src/Module/Item/Compose.php:153
#: src/Object/Post.php:966 #: src/Object/Post.php:966
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: include/conversation.php:1103 src/Module/Item/Compose.php:154 #: include/conversation.php:1108 src/Module/Item/Compose.php:154
#: src/Object/Post.php:967 #: src/Object/Post.php:967
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: include/conversation.php:1104 src/Module/Item/Compose.php:155 #: include/conversation.php:1109 src/Module/Item/Compose.php:155
#: src/Object/Post.php:968 #: src/Object/Post.php:968
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: include/conversation.php:1105 src/Module/Item/Compose.php:156 #: include/conversation.php:1110 src/Module/Item/Compose.php:156
#: src/Object/Post.php:969 #: src/Object/Post.php:969
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#: include/conversation.php:1106 src/Module/Item/Compose.php:157 #: include/conversation.php:1111 src/Module/Item/Compose.php:157
#: src/Object/Post.php:970 #: src/Object/Post.php:970
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: include/conversation.php:1107 src/Module/Item/Compose.php:158 #: include/conversation.php:1112 src/Module/Item/Compose.php:158
#: src/Object/Post.php:971 #: src/Object/Post.php:971
msgid "Link or Media" msgid "Link or Media"
msgstr "" msgstr ""
#: include/conversation.php:1108 #: include/conversation.php:1113
msgid "Video" msgid "Video"
msgstr "" msgstr ""
#: include/conversation.php:1109 mod/editpost.php:100 #: include/conversation.php:1114 mod/editpost.php:100
#: src/Module/Item/Compose.php:161 #: src/Module/Item/Compose.php:161
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: include/conversation.php:1110 mod/editpost.php:101 #: include/conversation.php:1115 mod/editpost.php:101
msgid "set location" msgid "set location"
msgstr "" msgstr ""
#: include/conversation.php:1111 mod/editpost.php:102 #: include/conversation.php:1116 mod/editpost.php:102
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: include/conversation.php:1112 mod/editpost.php:103 #: include/conversation.php:1117 mod/editpost.php:103
msgid "clear location" msgid "clear location"
msgstr "" msgstr ""
#: include/conversation.php:1114 mod/editpost.php:117 #: include/conversation.php:1119 mod/editpost.php:117
#: src/Module/Item/Compose.php:166 #: src/Module/Item/Compose.php:166
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
#: include/conversation.php:1116 mod/editpost.php:119 #: include/conversation.php:1121 mod/editpost.php:119
#: src/Module/Item/Compose.php:167 #: src/Module/Item/Compose.php:167
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "" msgstr ""
#: include/conversation.php:1121 src/Module/Item/Compose.php:172 #: include/conversation.php:1126 src/Module/Item/Compose.php:172
msgid "Scheduled at" msgid "Scheduled at"
msgstr "" msgstr ""
#: include/conversation.php:1125 mod/editpost.php:105 #: include/conversation.php:1130 mod/editpost.php:105
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: include/conversation.php:1126 mod/editpost.php:133 mod/events.php:583 #: include/conversation.php:1131 mod/editpost.php:133 mod/events.php:583
#: mod/photos.php:959 mod/photos.php:1325 #: mod/photos.php:959 mod/photos.php:1325
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: include/conversation.php:1135 mod/editpost.php:114 #: include/conversation.php:1140 mod/editpost.php:114
msgid "Public post" msgid "Public post"
msgstr "" msgstr ""
#: include/conversation.php:1139 mod/editpost.php:125 mod/events.php:578 #: include/conversation.php:1144 mod/editpost.php:125 mod/events.php:578
#: mod/photos.php:1371 mod/photos.php:1427 mod/photos.php:1501 #: mod/photos.php:1371 mod/photos.php:1427 mod/photos.php:1501
#: src/Module/Item/Compose.php:160 src/Object/Post.php:973 #: src/Module/Item/Compose.php:160 src/Object/Post.php:973
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: include/conversation.php:1142 mod/editpost.php:127 mod/fbrowser.php:105 #: include/conversation.php:1147 mod/editpost.php:127 mod/fbrowser.php:105
#: mod/fbrowser.php:134 mod/follow.php:145 mod/photos.php:1027 #: mod/fbrowser.php:134 mod/follow.php:145 mod/photos.php:1027
#: mod/photos.php:1133 mod/tagrm.php:37 mod/tagrm.php:129 mod/unfollow.php:97 #: mod/photos.php:1133 mod/tagrm.php:37 mod/tagrm.php:129 mod/unfollow.php:97
#: src/Module/Contact.php:424 src/Module/RemoteFollow.php:112 #: src/Module/Contact.php:424 src/Module/RemoteFollow.php:112
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: include/conversation.php:1149 mod/editpost.php:131 #: include/conversation.php:1154 mod/editpost.php:131
#: src/Content/Widget/VCard.php:106 src/Model/Profile.php:448 #: src/Content/Widget/VCard.php:106 src/Model/Profile.php:448
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: include/conversation.php:1150 mod/editpost.php:132 #: include/conversation.php:1155 mod/editpost.php:132
#: src/Module/Settings/TwoFactor/Trusted.php:101 #: src/Module/Settings/TwoFactor/Trusted.php:101
msgid "Browser" msgid "Browser"
msgstr "" msgstr ""
#: include/conversation.php:1152 mod/editpost.php:135 #: include/conversation.php:1157 mod/editpost.php:135
msgid "Open Compose page" msgid "Open Compose page"
msgstr "" msgstr ""
@ -828,7 +828,7 @@ msgstr ""
#: mod/api.php:30 mod/api.php:35 mod/editpost.php:37 mod/events.php:236 #: mod/api.php:30 mod/api.php:35 mod/editpost.php:37 mod/events.php:236
#: mod/follow.php:56 mod/follow.php:131 mod/item.php:185 mod/item.php:190 #: mod/follow.php:56 mod/follow.php:131 mod/item.php:185 mod/item.php:190
#: mod/item.php:933 mod/message.php:69 mod/message.php:111 mod/notes.php:44 #: mod/item.php:935 mod/message.php:69 mod/message.php:111 mod/notes.php:44
#: mod/ostatus_subscribe.php:32 mod/photos.php:159 mod/photos.php:911 #: mod/ostatus_subscribe.php:32 mod/photos.php:159 mod/photos.php:911
#: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:65 #: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:65
#: mod/settings.php:417 mod/suggest.php:34 mod/uimport.php:32 #: mod/settings.php:417 mod/suggest.php:34 mod/uimport.php:32
@ -839,17 +839,18 @@ msgstr ""
#: src/Module/BaseApi.php:81 src/Module/BaseApi.php:92 #: src/Module/BaseApi.php:81 src/Module/BaseApi.php:92
#: src/Module/BaseApi.php:103 src/Module/BaseApi.php:114 #: src/Module/BaseApi.php:103 src/Module/BaseApi.php:114
#: src/Module/BaseNotifications.php:88 src/Module/Contact.php:342 #: src/Module/BaseNotifications.php:88 src/Module/Contact.php:342
#: src/Module/Contact/Advanced.php:44 src/Module/Delegation.php:118 #: src/Module/Contact/Advanced.php:44 src/Module/Delegation.php:119
#: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44 #: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44
#: src/Module/Group.php:45 src/Module/Group.php:90 src/Module/Invite.php:40 #: src/Module/Group.php:45 src/Module/Group.php:90 src/Module/Invite.php:40
#: src/Module/Invite.php:127 src/Module/Notifications/Notification.php:47 #: src/Module/Invite.php:127 src/Module/Notifications/Notification.php:47
#: src/Module/Notifications/Notification.php:76 #: src/Module/Notifications/Notification.php:76
#: src/Module/Profile/Common.php:56 src/Module/Profile/Contacts.php:57 #: src/Module/Profile/Common.php:56 src/Module/Profile/Contacts.php:57
#: src/Module/Profile/Schedule.php:38 src/Module/Register.php:62 #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56
#: src/Module/Register.php:75 src/Module/Register.php:193 #: src/Module/Register.php:62 src/Module/Register.php:75
#: src/Module/Register.php:232 src/Module/Search/Directory.php:38 #: src/Module/Register.php:193 src/Module/Register.php:232
#: src/Module/Settings/Delegation.php:42 src/Module/Settings/Delegation.php:70 #: src/Module/Search/Directory.php:38 src/Module/Settings/Delegation.php:42
#: src/Module/Settings/Display.php:42 src/Module/Settings/Display.php:118 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42
#: src/Module/Settings/Display.php:118
#: src/Module/Settings/Profile/Photo/Crop.php:155 #: src/Module/Settings/Profile/Photo/Crop.php:155
#: src/Module/Settings/Profile/Photo/Index.php:113 #: src/Module/Settings/Profile/Photo/Index.php:113
#: src/Module/Settings/UserExport.php:59 src/Module/Settings/UserExport.php:94 #: src/Module/Settings/UserExport.php:59 src/Module/Settings/UserExport.php:94
@ -925,7 +926,7 @@ msgstr ""
msgid "list" msgid "list"
msgstr "" msgstr ""
#: mod/cal.php:274 src/Console/User.php:182 src/Model/User.php:667 #: mod/cal.php:274 src/Console/User.php:182 src/Model/User.php:672
#: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74 #: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74
#: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71 #: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71
#: src/Module/Api/Twitter/ContactEndpoint.php:71 #: src/Module/Api/Twitter/ContactEndpoint.php:71
@ -1088,7 +1089,7 @@ msgstr ""
#: src/Module/Debug/ActivityPubConversion.php:141 #: src/Module/Debug/ActivityPubConversion.php:141
#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64 #: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
#: src/Module/Debug/Probe.php:55 src/Module/Debug/WebFinger.php:53 #: src/Module/Debug/Probe.php:55 src/Module/Debug/WebFinger.php:53
#: src/Module/Delegation.php:152 src/Module/FriendSuggest.php:129 #: src/Module/Delegation.php:153 src/Module/FriendSuggest.php:129
#: 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:150 src/Module/Profile/Profile.php:244 #: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:244
@ -1192,19 +1193,19 @@ msgstr ""
msgid "Empty post discarded." msgid "Empty post discarded."
msgstr "" msgstr ""
#: mod/item.php:740 #: mod/item.php:742
msgid "Post updated." msgid "Post updated."
msgstr "" msgstr ""
#: mod/item.php:750 mod/item.php:755 #: mod/item.php:752 mod/item.php:757
msgid "Item wasn't stored." msgid "Item wasn't stored."
msgstr "" msgstr ""
#: mod/item.php:766 #: mod/item.php:768
msgid "Item couldn't be fetched." msgid "Item couldn't be fetched."
msgstr "" msgstr ""
#: mod/item.php:912 src/Module/Admin/Themes/Details.php:39 #: mod/item.php:914 src/Module/Admin/Themes/Details.php:39
#: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:41 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:41
#: src/Module/Debug/ItemBody.php:56 #: src/Module/Debug/ItemBody.php:56
msgid "Item not found." msgid "Item not found."
@ -4719,138 +4720,138 @@ msgstr ""
msgid "Enter a valid existing folder" msgid "Enter a valid existing folder"
msgstr "" msgstr ""
#: src/Model/User.php:195 src/Model/User.php:991 #: src/Model/User.php:200 src/Model/User.php:996
msgid "SERIOUS ERROR: Generation of security keys failed." msgid "SERIOUS ERROR: Generation of security keys failed."
msgstr "" msgstr ""
#: src/Model/User.php:576 src/Model/User.php:609 #: src/Model/User.php:581 src/Model/User.php:614
msgid "Login failed" msgid "Login failed"
msgstr "" msgstr ""
#: src/Model/User.php:641 #: src/Model/User.php:646
msgid "Not enough information to authenticate" msgid "Not enough information to authenticate"
msgstr "" msgstr ""
#: src/Model/User.php:736 #: src/Model/User.php:741
msgid "Password can't be empty" msgid "Password can't be empty"
msgstr "" msgstr ""
#: src/Model/User.php:755 #: src/Model/User.php:760
msgid "Empty passwords are not allowed." msgid "Empty passwords are not allowed."
msgstr "" msgstr ""
#: src/Model/User.php:759 #: src/Model/User.php:764
msgid "" msgid ""
"The new password has been exposed in a public data dump, please choose " "The new password has been exposed in a public data dump, please choose "
"another." "another."
msgstr "" msgstr ""
#: src/Model/User.php:765 #: src/Model/User.php:770
msgid "" msgid ""
"The password can't contain accentuated letters, white spaces or colons (:)" "The password can't contain accentuated letters, white spaces or colons (:)"
msgstr "" msgstr ""
#: src/Model/User.php:871 #: src/Model/User.php:876
msgid "Passwords do not match. Password unchanged." msgid "Passwords do not match. Password unchanged."
msgstr "" msgstr ""
#: src/Model/User.php:878 #: src/Model/User.php:883
msgid "An invitation is required." msgid "An invitation is required."
msgstr "" msgstr ""
#: src/Model/User.php:882 #: src/Model/User.php:887
msgid "Invitation could not be verified." msgid "Invitation could not be verified."
msgstr "" msgstr ""
#: src/Model/User.php:890 #: src/Model/User.php:895
msgid "Invalid OpenID url" msgid "Invalid OpenID url"
msgstr "" msgstr ""
#: src/Model/User.php:903 src/Security/Authentication.php:224 #: src/Model/User.php:908 src/Security/Authentication.php:224
msgid "" msgid ""
"We encountered a problem while logging in with the OpenID you provided. " "We encountered a problem while logging in with the OpenID you provided. "
"Please check the correct spelling of the ID." "Please check the correct spelling of the ID."
msgstr "" msgstr ""
#: src/Model/User.php:903 src/Security/Authentication.php:224 #: src/Model/User.php:908 src/Security/Authentication.php:224
msgid "The error message was:" msgid "The error message was:"
msgstr "" msgstr ""
#: src/Model/User.php:909 #: src/Model/User.php:914
msgid "Please enter the required information." msgid "Please enter the required information."
msgstr "" msgstr ""
#: src/Model/User.php:923 #: src/Model/User.php:928
#, php-format #, php-format
msgid "" msgid ""
"system.username_min_length (%s) and system.username_max_length (%s) are " "system.username_min_length (%s) and system.username_max_length (%s) are "
"excluding each other, swapping values." "excluding each other, swapping values."
msgstr "" msgstr ""
#: src/Model/User.php:930 #: src/Model/User.php:935
#, php-format #, php-format
msgid "Username should be at least %s character." msgid "Username should be at least %s character."
msgid_plural "Username should be at least %s characters." msgid_plural "Username should be at least %s characters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/User.php:934 #: src/Model/User.php:939
#, php-format #, php-format
msgid "Username should be at most %s character." msgid "Username should be at most %s character."
msgid_plural "Username should be at most %s characters." msgid_plural "Username should be at most %s characters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/User.php:942 #: src/Model/User.php:947
msgid "That doesn't appear to be your full (First Last) name." msgid "That doesn't appear to be your full (First Last) name."
msgstr "" msgstr ""
#: src/Model/User.php:947 #: src/Model/User.php:952
msgid "Your email domain is not among those allowed on this site." msgid "Your email domain is not among those allowed on this site."
msgstr "" msgstr ""
#: src/Model/User.php:951 #: src/Model/User.php:956
msgid "Not a valid email address." msgid "Not a valid email address."
msgstr "" msgstr ""
#: src/Model/User.php:954 #: src/Model/User.php:959
msgid "The nickname was blocked from registration by the nodes admin." msgid "The nickname was blocked from registration by the nodes admin."
msgstr "" msgstr ""
#: src/Model/User.php:958 src/Model/User.php:966 #: src/Model/User.php:963 src/Model/User.php:971
msgid "Cannot use that email." msgid "Cannot use that email."
msgstr "" msgstr ""
#: src/Model/User.php:973 #: src/Model/User.php:978
msgid "Your nickname can only contain a-z, 0-9 and _." msgid "Your nickname can only contain a-z, 0-9 and _."
msgstr "" msgstr ""
#: src/Model/User.php:981 src/Model/User.php:1038 #: src/Model/User.php:986 src/Model/User.php:1043
msgid "Nickname is already registered. Please choose another." msgid "Nickname is already registered. Please choose another."
msgstr "" msgstr ""
#: src/Model/User.php:1025 src/Model/User.php:1029 #: src/Model/User.php:1030 src/Model/User.php:1034
msgid "An error occurred during registration. Please try again." msgid "An error occurred during registration. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1052 #: src/Model/User.php:1057
msgid "An error occurred creating your default profile. Please try again." msgid "An error occurred creating your default profile. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1059 #: src/Model/User.php:1064
msgid "An error occurred creating your self contact. Please try again." msgid "An error occurred creating your self contact. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1064 #: src/Model/User.php:1069
msgid "Friends" msgid "Friends"
msgstr "" msgstr ""
#: src/Model/User.php:1068 #: src/Model/User.php:1073
msgid "" msgid ""
"An error occurred creating your default contact group. Please try again." "An error occurred creating your default contact group. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1297 #: src/Model/User.php:1302
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4858,7 +4859,7 @@ msgid ""
"\t\t\tthe administrator of %2$s has set up an account for you." "\t\t\tthe administrator of %2$s has set up an account for you."
msgstr "" msgstr ""
#: src/Model/User.php:1300 #: src/Model/User.php:1305
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4895,12 +4896,12 @@ msgid ""
"\t\tThank you and welcome to %4$s." "\t\tThank you and welcome to %4$s."
msgstr "" msgstr ""
#: src/Model/User.php:1333 src/Model/User.php:1440 #: src/Model/User.php:1338 src/Model/User.php:1445
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: src/Model/User.php:1353 #: src/Model/User.php:1358
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4916,12 +4917,12 @@ msgid ""
"\t\t" "\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1372 #: src/Model/User.php:1377
#, php-format #, php-format
msgid "Registration at %s" msgid "Registration at %s"
msgstr "" msgstr ""
#: src/Model/User.php:1396 #: src/Model/User.php:1401
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4930,7 +4931,7 @@ msgid ""
"\t\t\t" "\t\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1404 #: src/Model/User.php:1409
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -7096,7 +7097,7 @@ msgstr ""
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""
#: src/Module/BaseProfile.php:117 src/Module/Profile/Schedule.php:68 #: src/Module/BaseProfile.php:117 src/Module/Profile/Schedule.php:82
msgid "Scheduled Posts" msgid "Scheduled Posts"
msgstr "" msgstr ""
@ -8034,21 +8035,21 @@ msgstr ""
msgid "Lookup address:" msgid "Lookup address:"
msgstr "" msgstr ""
#: src/Module/Delegation.php:147 #: src/Module/Delegation.php:148
msgid "Switch between your accounts" msgid "Switch between your accounts"
msgstr "" msgstr ""
#: src/Module/Delegation.php:148 #: src/Module/Delegation.php:149
msgid "Manage your accounts" msgid "Manage your accounts"
msgstr "" msgstr ""
#: src/Module/Delegation.php:149 #: src/Module/Delegation.php:150
msgid "" msgid ""
"Toggle between different identities or community/group pages which share " "Toggle between different identities or community/group pages which share "
"your account details or which you have been granted \"manage\" permissions" "your account details or which you have been granted \"manage\" permissions"
msgstr "" msgstr ""
#: src/Module/Delegation.php:150 #: src/Module/Delegation.php:151
msgid "Select an identity to manage: " msgid "Select an identity to manage: "
msgstr "" msgstr ""
@ -8699,7 +8700,12 @@ msgstr ""
msgid "The Photo with id %s is not available." msgid "The Photo with id %s is not available."
msgstr "" msgstr ""
#: src/Module/Photo.php:122 #: src/Module/Photo.php:124
#, php-format
msgid "Invalid external resource with url %s."
msgstr ""
#: src/Module/Photo.php:126
#, php-format #, php-format
msgid "Invalid photo with id %s." msgid "Invalid photo with id %s."
msgstr "" msgstr ""
@ -8762,32 +8768,32 @@ msgstr ""
#: src/Module/Profile/Profile.php:323 src/Module/Profile/Profile.php:326 #: src/Module/Profile/Profile.php:323 src/Module/Profile/Profile.php:326
#: src/Module/Profile/Status.php:65 src/Module/Profile/Status.php:68 #: src/Module/Profile/Status.php:65 src/Module/Profile/Status.php:68
#: src/Protocol/Feed.php:944 src/Protocol/OStatus.php:1256 #: src/Protocol/Feed.php:946 src/Protocol/OStatus.php:1256
#, php-format #, php-format
msgid "%s's timeline" msgid "%s's timeline"
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:324 src/Module/Profile/Status.php:66 #: src/Module/Profile/Profile.php:324 src/Module/Profile/Status.php:66
#: src/Protocol/Feed.php:948 src/Protocol/OStatus.php:1260 #: src/Protocol/Feed.php:950 src/Protocol/OStatus.php:1260
#, php-format #, php-format
msgid "%s's posts" msgid "%s's posts"
msgstr "" msgstr ""
#: src/Module/Profile/Profile.php:325 src/Module/Profile/Status.php:67 #: src/Module/Profile/Profile.php:325 src/Module/Profile/Status.php:67
#: src/Protocol/Feed.php:951 src/Protocol/OStatus.php:1263 #: src/Protocol/Feed.php:953 src/Protocol/OStatus.php:1263
#, php-format #, php-format
msgid "%s's comments" msgid "%s's comments"
msgstr "" msgstr ""
#: src/Module/Profile/Schedule.php:70 #: src/Module/Profile/Schedule.php:84
msgid "Scheduled" msgid "Scheduled"
msgstr "" msgstr ""
#: src/Module/Profile/Schedule.php:71 #: src/Module/Profile/Schedule.php:85
msgid "Content" msgid "Content"
msgstr "" msgstr ""
#: src/Module/Profile/Schedule.php:72 #: src/Module/Profile/Schedule.php:86
msgid "Remove post" msgid "Remove post"
msgstr "" msgstr ""
@ -10311,7 +10317,7 @@ msgstr ""
msgid "Show fewer" msgid "Show fewer"
msgstr "" msgstr ""
#: src/Protocol/Diaspora.php:3434 #: src/Protocol/Diaspora.php:3443
msgid "Attachments:" msgid "Attachments:"
msgstr "" msgstr ""