From 46f7b79c7dd9d96d39867a6942ed201012f5d6e0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Jul 2019 22:36:25 -0400 Subject: [PATCH 1/6] Switch server blocklist check to case-insensitive shell wildcard --- src/Util/Network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/Network.php b/src/Util/Network.php index 92265e30e6..75b928bea2 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -472,7 +472,7 @@ class Network } foreach ($domain_blocklist as $domain_block) { - if (strcasecmp($domain_block['domain'], $host) === 0) { + if (fnmatch(strtolower($domain_block['domain']), strtolower($host))) { return true; } } From 1dbdb9dd15718aa0044cbb1473b5ba9f94ae40af Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Jul 2019 22:36:50 -0400 Subject: [PATCH 2/6] Update server block console help text to reflect the addition of shell wildcard syntax --- src/Console/ServerBlock.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Console/ServerBlock.php b/src/Console/ServerBlock.php index 7e45f108bb..202f7bb75e 100644 --- a/src/Console/ServerBlock.php +++ b/src/Console/ServerBlock.php @@ -23,15 +23,20 @@ class ServerBlock extends Console protected function getHelp() { $help = << [-h|--help|-?] [-v] - bin/console serverblock remove [-h|--help|-?] [-v] + bin/console serverblock add [-h|--help|-?] [-v] + bin/console serverblock remove [-h|--help|-?] [-v] Description - With this tool, you can list the current blocked servers - or you can add / remove a blocked server from the list + With this tool, you can list the current blocked server domain patterns + or you can add / remove a blocked server domain pattern from the list. + + Patterns are case-insensitive shell wildcard comprising the following special characters: + - * : Any number of characters + - ? : Any single character + - [...] : char1 or char2 or... Options -h|--help|-? Show help information From eaf217ef7d57e098f640c59c28bbc702a030a0aa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Jul 2019 22:37:30 -0400 Subject: [PATCH 3/6] Update server block admin page to reflect the addition of shell wildcard syntax --- src/Module/Admin/Blocklist/Server.php | 26 ++++++++++++++--------- view/templates/admin/blocklist/server.tpl | 18 ++++++++++------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php index 754d1aad51..384e346b0d 100644 --- a/src/Module/Admin/Blocklist/Server.php +++ b/src/Module/Admin/Blocklist/Server.php @@ -28,7 +28,7 @@ class Server extends BaseAdminModule 'reason' => Strings::escapeTags(trim($_POST['newentry_reason'])) ]; Config::set('system', 'blocklist', $blocklist); - info(L10n::t('Server added to blocklist.') . EOL); + info(L10n::t('Server domain pattern added to blocklist.') . EOL); } else { // Edit the entries from blocklist $blocklist = []; @@ -61,9 +61,9 @@ class Server extends BaseAdminModule if (is_array($blocklist)) { foreach ($blocklist as $id => $b) { $blocklistform[] = [ - 'domain' => ["domain[$id]", L10n::t('Blocked domain'), $b['domain'], '', L10n::t('The blocked domain'), 'required', '', ''], - 'reason' => ["reason[$id]", L10n::t("Reason for the block"), $b['reason'], L10n::t('The reason why you blocked this domain.') . '(' . $b['domain'] . ')', 'required', '', ''], - 'delete' => ["delete[$id]", L10n::t("Delete domain") . ' (' . $b['domain'] . ')', false, L10n::t("Check to delete this entry from the blocklist")] + 'domain' => ["domain[$id]", L10n::t('Blocked server domain pattern'), $b['domain'], '', 'required', '', ''], + 'reason' => ["reason[$id]", L10n::t("Reason for the block"), $b['reason'], '', 'required', '', ''], + 'delete' => ["delete[$id]", L10n::t("Delete server domain pattern") . ' (' . $b['domain'] . ')', false, L10n::t("Check to delete this entry from the blocklist")] ]; } } @@ -71,16 +71,22 @@ class Server extends BaseAdminModule $t = Renderer::getMarkupTemplate('admin/blocklist/server.tpl'); return Renderer::replaceMacros($t, [ '$title' => L10n::t('Administration'), - '$page' => L10n::t('Server Blocklist'), - '$intro' => L10n::t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server.'), - '$public' => L10n::t('The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily.'), + '$page' => L10n::t('Server Domain Pattern Blocklist'), + '$intro' => L10n::t('This page can be used to define a blacklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'), + '$public' => L10n::t('The list of blocked server domain patterns will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily.'), + '$syntax' => L10n::t('

The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:

+
    +
  • *: Any number of characters
    • +
  • ?: Any single character
    • +
  • [<char1><char2>...]: char1 or char2
    • +
'), '$addtitle' => L10n::t('Add new entry to block list'), - '$newdomain' => ['newentry_domain', L10n::t('Server Domain'), '', L10n::t('The domain of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''], - '$newreason' => ['newentry_reason', L10n::t('Block reason'), '', L10n::t('The reason why you blocked this domain.'), 'required', '', ''], + '$newdomain' => ['newentry_domain', L10n::t('Server Domain Pattern'), '', L10n::t('The domain pattern of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''], + '$newreason' => ['newentry_reason', L10n::t('Block reason'), '', L10n::t('The reason why you blocked this server domain pattern.'), 'required', '', ''], '$submit' => L10n::t('Add Entry'), '$savechanges' => L10n::t('Save changes to the blocklist'), '$currenttitle' => L10n::t('Current Entries in the Blocklist'), - '$thurl' => L10n::t('Blocked domain'), + '$thurl' => L10n::t('Blocked server domain pattern'), '$threason' => L10n::t('Reason for the block'), '$delentry' => L10n::t('Delete entry from blocklist'), '$entries' => $blocklistform, diff --git a/view/templates/admin/blocklist/server.tpl b/view/templates/admin/blocklist/server.tpl index beea96fc51..d3cf5c4250 100644 --- a/view/templates/admin/blocklist/server.tpl +++ b/view/templates/admin/blocklist/server.tpl @@ -4,20 +4,23 @@ }
-

{{$title}} - {{$page}}

+

{{$title}} - {{$page}}

{{$intro}}

-

{{$public}}

+

{{$public nofilter}}

+ {{$syntax nofilter}} -

{{$addtitle}}

+

{{$addtitle}}

{{include file="field_input.tpl" field=$newdomain}} {{include file="field_input.tpl" field=$newreason}} -
+
+ +
{{if $entries}} -

{{$currenttitle}}

+

{{$currenttitle}}

{{$currentintro}}

@@ -26,8 +29,9 @@ {{include file="field_input.tpl" field=$e.reason}} {{include file="field_checkbox.tpl" field=$e.delete}} {{/foreach}} -
+
+ +
{{/if}}
-
From 8e52a38721c9b7780093c790465f5ddae1b4b517 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Jul 2019 22:54:23 -0400 Subject: [PATCH 4/6] Updated master messages.po --- view/lang/C/messages.po | 2817 ++++++++++++++++++++------------------- 1 file changed, 1466 insertions(+), 1351 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 5f07444c86..9fa0424357 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-31 00:33-0400\n" +"POT-Creation-Date: 2019-07-25 22:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,478 +38,479 @@ msgid "Monthly posting limit of %d post reached. The post was rejected." msgstr "" #: include/api.php:4511 mod/photos.php:91 mod/photos.php:196 mod/photos.php:640 -#: mod/photos.php:1090 mod/photos.php:1107 mod/photos.php:1609 +#: mod/photos.php:1090 mod/photos.php:1107 mod/photos.php:1610 #: mod/profile_photo.php:85 mod/profile_photo.php:94 mod/profile_photo.php:103 #: mod/profile_photo.php:217 mod/profile_photo.php:305 -#: mod/profile_photo.php:315 src/Model/User.php:763 src/Model/User.php:771 -#: src/Model/User.php:779 +#: mod/profile_photo.php:315 src/Model/User.php:796 src/Model/User.php:804 +#: src/Model/User.php:812 msgid "Profile Photos" msgstr "" -#: include/conversation.php:160 include/conversation.php:297 -#: src/Model/Item.php:3254 +#: include/conversation.php:161 include/conversation.php:298 +#: src/Model/Item.php:3268 msgid "event" msgstr "" -#: include/conversation.php:163 include/conversation.php:173 -#: include/conversation.php:300 include/conversation.php:309 -#: mod/subthread.php:88 mod/tagger.php:68 +#: include/conversation.php:164 include/conversation.php:174 +#: include/conversation.php:301 include/conversation.php:310 +#: mod/subthread.php:88 mod/tagger.php:69 msgid "status" msgstr "" -#: include/conversation.php:168 include/conversation.php:305 -#: mod/subthread.php:88 mod/tagger.php:68 src/Model/Item.php:3256 +#: include/conversation.php:169 include/conversation.php:306 +#: mod/subthread.php:88 mod/tagger.php:69 src/Model/Item.php:3270 msgid "photo" msgstr "" -#: include/conversation.php:181 +#: include/conversation.php:182 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: include/conversation.php:183 +#: include/conversation.php:184 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: include/conversation.php:185 +#: include/conversation.php:186 #, php-format msgid "%1$s attends %2$s's %3$s" msgstr "" -#: include/conversation.php:187 +#: include/conversation.php:188 #, php-format msgid "%1$s doesn't attend %2$s's %3$s" msgstr "" -#: include/conversation.php:189 +#: include/conversation.php:190 #, php-format msgid "%1$s attends maybe %2$s's %3$s" msgstr "" -#: include/conversation.php:224 +#: include/conversation.php:225 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" -#: include/conversation.php:265 +#: include/conversation.php:266 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: include/conversation.php:319 mod/tagger.php:101 +#: include/conversation.php:320 mod/tagger.php:102 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: include/conversation.php:341 +#: include/conversation.php:342 msgid "post/item" msgstr "" -#: include/conversation.php:342 +#: include/conversation.php:343 #, php-format msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: include/conversation.php:568 mod/photos.php:1441 mod/profiles.php:352 +#: include/conversation.php:569 mod/photos.php:1442 mod/profiles.php:352 msgid "Likes" msgstr "" -#: include/conversation.php:569 mod/photos.php:1441 mod/profiles.php:355 +#: include/conversation.php:570 mod/photos.php:1442 mod/profiles.php:355 msgid "Dislikes" msgstr "" -#: include/conversation.php:570 include/conversation.php:1564 -#: mod/photos.php:1442 +#: include/conversation.php:571 include/conversation.php:1565 +#: mod/photos.php:1443 msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:571 mod/photos.php:1442 +#: include/conversation.php:572 mod/photos.php:1443 msgid "Not attending" msgstr "" -#: include/conversation.php:572 mod/photos.php:1442 +#: include/conversation.php:573 mod/photos.php:1443 msgid "Might attend" msgstr "" -#: include/conversation.php:573 +#: include/conversation.php:574 msgid "Reshares" msgstr "" -#: include/conversation.php:653 mod/photos.php:1498 src/Object/Post.php:208 +#: include/conversation.php:654 mod/photos.php:1499 src/Object/Post.php:209 msgid "Select" msgstr "" -#: include/conversation.php:654 mod/photos.php:1499 mod/settings.php:735 -#: src/Module/Admin/Users.php:288 src/Module/Contact.php:824 -#: src/Module/Contact.php:1099 +#: include/conversation.php:655 mod/photos.php:1500 mod/settings.php:738 +#: src/Module/Admin/Users.php:288 src/Module/Contact.php:830 +#: src/Module/Contact.php:1101 msgid "Delete" msgstr "" -#: include/conversation.php:679 src/Object/Post.php:382 src/Object/Post.php:383 +#: include/conversation.php:680 src/Object/Post.php:383 src/Object/Post.php:384 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: include/conversation.php:692 src/Object/Post.php:370 +#: include/conversation.php:693 src/Object/Post.php:371 msgid "Categories:" msgstr "" -#: include/conversation.php:693 src/Object/Post.php:371 +#: include/conversation.php:694 src/Object/Post.php:372 msgid "Filed under:" msgstr "" -#: include/conversation.php:700 src/Object/Post.php:396 +#: include/conversation.php:701 src/Object/Post.php:397 #, php-format msgid "%s from %s" msgstr "" -#: include/conversation.php:715 +#: include/conversation.php:716 msgid "View in context" msgstr "" -#: include/conversation.php:717 include/conversation.php:1230 +#: include/conversation.php:718 include/conversation.php:1231 #: mod/editpost.php:86 mod/message.php:260 mod/message.php:442 -#: mod/photos.php:1414 mod/wallmessage.php:141 src/Object/Post.php:423 +#: mod/photos.php:1415 mod/wallmessage.php:141 src/Object/Post.php:424 msgid "Please wait" msgstr "" -#: include/conversation.php:781 +#: include/conversation.php:782 msgid "remove" msgstr "" -#: include/conversation.php:785 +#: include/conversation.php:786 msgid "Delete Selected Items" msgstr "" -#: include/conversation.php:940 view/theme/frio/theme.php:358 +#: include/conversation.php:941 view/theme/frio/theme.php:355 msgid "Follow Thread" msgstr "" -#: include/conversation.php:941 src/Model/Contact.php:1111 +#: include/conversation.php:942 src/Model/Contact.php:1200 msgid "View Status" msgstr "" -#: include/conversation.php:942 include/conversation.php:960 mod/match.php:87 -#: mod/suggest.php:87 src/Model/Contact.php:1051 src/Model/Contact.php:1104 -#: src/Model/Contact.php:1112 src/Module/AllFriends.php:74 -#: src/Module/BaseSearchModule.php:130 src/Module/Directory.php:155 +#: include/conversation.php:943 include/conversation.php:961 mod/match.php:87 +#: mod/suggest.php:87 src/Model/Contact.php:1140 src/Model/Contact.php:1193 +#: src/Model/Contact.php:1201 src/Module/AllFriends.php:74 +#: src/Module/BaseSearchModule.php:133 src/Module/Directory.php:150 msgid "View Profile" msgstr "" -#: include/conversation.php:943 src/Model/Contact.php:1113 +#: include/conversation.php:944 src/Model/Contact.php:1202 msgid "View Photos" msgstr "" -#: include/conversation.php:944 src/Model/Contact.php:1105 -#: src/Model/Contact.php:1114 +#: include/conversation.php:945 src/Model/Contact.php:1194 +#: src/Model/Contact.php:1203 msgid "Network Posts" msgstr "" -#: include/conversation.php:945 src/Model/Contact.php:1106 -#: src/Model/Contact.php:1115 +#: include/conversation.php:946 src/Model/Contact.php:1195 +#: src/Model/Contact.php:1204 msgid "View Contact" msgstr "" -#: include/conversation.php:946 src/Model/Contact.php:1117 +#: include/conversation.php:947 src/Model/Contact.php:1206 msgid "Send PM" msgstr "" -#: include/conversation.php:947 src/Module/Admin/Blocklist/Contact.php:67 -#: src/Module/Admin/Users.php:289 src/Module/Contact.php:617 -#: src/Module/Contact.php:821 src/Module/Contact.php:1074 +#: include/conversation.php:948 src/Module/Admin/Blocklist/Contact.php:67 +#: src/Module/Admin/Users.php:289 src/Module/Contact.php:623 +#: src/Module/Contact.php:827 src/Module/Contact.php:1076 msgid "Block" msgstr "" -#: include/conversation.php:948 mod/notifications.php:60 +#: include/conversation.php:949 mod/notifications.php:60 #: mod/notifications.php:189 mod/notifications.php:282 -#: src/Module/Contact.php:618 src/Module/Contact.php:822 -#: src/Module/Contact.php:1082 +#: src/Module/Contact.php:624 src/Module/Contact.php:828 +#: src/Module/Contact.php:1084 msgid "Ignore" msgstr "" -#: include/conversation.php:952 src/Model/Contact.php:1118 +#: include/conversation.php:953 src/Model/Contact.php:1207 msgid "Poke" msgstr "" -#: include/conversation.php:957 mod/follow.php:158 mod/match.php:88 -#: mod/suggest.php:88 src/Content/Widget.php:66 src/Model/Contact.php:1107 -#: src/Module/AllFriends.php:75 src/Module/BaseSearchModule.php:131 -#: src/Module/Contact.php:570 view/theme/vier/theme.php:201 +#: include/conversation.php:958 mod/follow.php:160 mod/match.php:88 +#: mod/suggest.php:88 src/Content/Widget.php:66 src/Model/Contact.php:1196 +#: src/Module/AllFriends.php:75 src/Module/BaseSearchModule.php:134 +#: view/theme/vier/theme.php:201 msgid "Connect/Follow" msgstr "" -#: include/conversation.php:1082 +#: include/conversation.php:1083 #, php-format msgid "%s likes this." msgstr "" -#: include/conversation.php:1085 +#: include/conversation.php:1086 #, php-format msgid "%s doesn't like this." msgstr "" -#: include/conversation.php:1088 +#: include/conversation.php:1089 #, php-format msgid "%s attends." msgstr "" -#: include/conversation.php:1091 +#: include/conversation.php:1092 #, php-format msgid "%s doesn't attend." msgstr "" -#: include/conversation.php:1094 +#: include/conversation.php:1095 #, php-format msgid "%s attends maybe." msgstr "" -#: include/conversation.php:1097 include/conversation.php:1140 +#: include/conversation.php:1098 include/conversation.php:1141 #, php-format msgid "%s reshared this." msgstr "" -#: include/conversation.php:1105 +#: include/conversation.php:1106 msgid "and" msgstr "" -#: include/conversation.php:1111 +#: include/conversation.php:1112 #, php-format msgid "and %d other people" msgstr "" -#: include/conversation.php:1119 +#: include/conversation.php:1120 #, php-format msgid "%2$d people like this" msgstr "" -#: include/conversation.php:1120 +#: include/conversation.php:1121 #, php-format msgid "%s like this." msgstr "" -#: include/conversation.php:1123 +#: include/conversation.php:1124 #, php-format msgid "%2$d people don't like this" msgstr "" -#: include/conversation.php:1124 +#: include/conversation.php:1125 #, php-format msgid "%s don't like this." msgstr "" -#: include/conversation.php:1127 +#: include/conversation.php:1128 #, php-format msgid "%2$d people attend" msgstr "" -#: include/conversation.php:1128 +#: include/conversation.php:1129 #, php-format msgid "%s attend." msgstr "" -#: include/conversation.php:1131 +#: include/conversation.php:1132 #, php-format msgid "%2$d people don't attend" msgstr "" -#: include/conversation.php:1132 +#: include/conversation.php:1133 #, php-format msgid "%s don't attend." msgstr "" -#: include/conversation.php:1135 +#: include/conversation.php:1136 #, php-format msgid "%2$d people attend maybe" msgstr "" -#: include/conversation.php:1136 +#: include/conversation.php:1137 #, php-format msgid "%s attend maybe." msgstr "" -#: include/conversation.php:1139 +#: include/conversation.php:1140 #, php-format msgid "%2$d people reshared this" msgstr "" -#: include/conversation.php:1169 +#: include/conversation.php:1170 msgid "Visible to everybody" msgstr "" -#: include/conversation.php:1170 src/Object/Post.php:886 +#: include/conversation.php:1171 src/Object/Post.php:887 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" -#: include/conversation.php:1171 +#: include/conversation.php:1172 msgid "Tag term:" msgstr "" -#: include/conversation.php:1172 src/Module/Filer/SaveTag.php:48 +#: include/conversation.php:1173 src/Module/Filer/SaveTag.php:48 msgid "Save to Folder:" msgstr "" -#: include/conversation.php:1173 +#: include/conversation.php:1174 msgid "Where are you right now?" msgstr "" -#: include/conversation.php:1174 +#: include/conversation.php:1175 msgid "Delete item(s)?" msgstr "" -#: include/conversation.php:1206 +#: include/conversation.php:1207 msgid "New Post" msgstr "" -#: include/conversation.php:1209 +#: include/conversation.php:1210 msgid "Share" msgstr "" -#: include/conversation.php:1210 mod/editpost.php:72 mod/message.php:258 +#: include/conversation.php:1211 mod/editpost.php:72 mod/message.php:258 #: mod/message.php:439 mod/wallmessage.php:139 msgid "Upload photo" msgstr "" -#: include/conversation.php:1211 mod/editpost.php:73 +#: include/conversation.php:1212 mod/editpost.php:73 msgid "upload photo" msgstr "" -#: include/conversation.php:1212 mod/editpost.php:74 +#: include/conversation.php:1213 mod/editpost.php:74 msgid "Attach file" msgstr "" -#: include/conversation.php:1213 mod/editpost.php:75 +#: include/conversation.php:1214 mod/editpost.php:75 msgid "attach file" msgstr "" -#: include/conversation.php:1214 src/Object/Post.php:878 +#: include/conversation.php:1215 src/Object/Post.php:879 msgid "Bold" msgstr "" -#: include/conversation.php:1215 src/Object/Post.php:879 +#: include/conversation.php:1216 src/Object/Post.php:880 msgid "Italic" msgstr "" -#: include/conversation.php:1216 src/Object/Post.php:880 +#: include/conversation.php:1217 src/Object/Post.php:881 msgid "Underline" msgstr "" -#: include/conversation.php:1217 src/Object/Post.php:881 +#: include/conversation.php:1218 src/Object/Post.php:882 msgid "Quote" msgstr "" -#: include/conversation.php:1218 src/Object/Post.php:882 +#: include/conversation.php:1219 src/Object/Post.php:883 msgid "Code" msgstr "" -#: include/conversation.php:1219 src/Object/Post.php:883 +#: include/conversation.php:1220 src/Object/Post.php:884 msgid "Image" msgstr "" -#: include/conversation.php:1220 src/Object/Post.php:884 +#: include/conversation.php:1221 src/Object/Post.php:885 msgid "Link" msgstr "" -#: include/conversation.php:1221 src/Object/Post.php:885 +#: include/conversation.php:1222 src/Object/Post.php:886 msgid "Link or Media" msgstr "" -#: include/conversation.php:1222 mod/editpost.php:82 +#: include/conversation.php:1223 mod/editpost.php:82 msgid "Set your location" msgstr "" -#: include/conversation.php:1223 mod/editpost.php:83 +#: include/conversation.php:1224 mod/editpost.php:83 msgid "set location" msgstr "" -#: include/conversation.php:1224 mod/editpost.php:84 +#: include/conversation.php:1225 mod/editpost.php:84 msgid "Clear browser location" msgstr "" -#: include/conversation.php:1225 mod/editpost.php:85 +#: include/conversation.php:1226 mod/editpost.php:85 msgid "clear location" msgstr "" -#: include/conversation.php:1227 mod/editpost.php:99 +#: include/conversation.php:1228 mod/editpost.php:99 msgid "Set title" msgstr "" -#: include/conversation.php:1229 mod/editpost.php:101 +#: include/conversation.php:1230 mod/editpost.php:101 msgid "Categories (comma-separated list)" msgstr "" -#: include/conversation.php:1231 mod/editpost.php:87 +#: include/conversation.php:1232 mod/editpost.php:87 msgid "Permission settings" msgstr "" -#: include/conversation.php:1232 mod/editpost.php:116 +#: include/conversation.php:1233 mod/editpost.php:116 msgid "permissions" msgstr "" -#: include/conversation.php:1241 mod/editpost.php:96 +#: include/conversation.php:1242 mod/editpost.php:96 msgid "Public post" msgstr "" -#: include/conversation.php:1245 mod/editpost.php:107 mod/events.php:549 -#: mod/photos.php:1432 mod/photos.php:1471 mod/photos.php:1531 -#: src/Object/Post.php:887 +#: include/conversation.php:1246 mod/editpost.php:107 mod/events.php:550 +#: mod/photos.php:1433 mod/photos.php:1472 mod/photos.php:1532 +#: src/Object/Post.php:888 msgid "Preview" msgstr "" -#: include/conversation.php:1249 include/items.php:397 mod/dfrn_request.php:650 +#: include/conversation.php:1250 include/items.php:397 mod/dfrn_request.php:650 #: mod/editpost.php:110 mod/fbrowser.php:110 mod/fbrowser.php:139 -#: mod/follow.php:172 mod/message.php:153 mod/photos.php:1084 -#: mod/photos.php:1191 mod/settings.php:675 mod/settings.php:701 +#: mod/follow.php:174 mod/message.php:153 mod/photos.php:1084 +#: mod/photos.php:1191 mod/settings.php:678 mod/settings.php:704 #: mod/suggest.php:76 mod/tagrm.php:20 mod/tagrm.php:115 mod/unfollow.php:132 -#: src/Module/Contact.php:443 +#: src/Module/Contact.php:464 msgid "Cancel" msgstr "" -#: include/conversation.php:1254 +#: include/conversation.php:1255 msgid "Post to Groups" msgstr "" -#: include/conversation.php:1255 +#: include/conversation.php:1256 msgid "Post to Contacts" msgstr "" -#: include/conversation.php:1256 +#: include/conversation.php:1257 msgid "Private post" msgstr "" -#: include/conversation.php:1261 mod/editpost.php:114 src/Model/Profile.php:366 +#: include/conversation.php:1262 mod/editpost.php:114 src/Model/Profile.php:513 +#: src/Module/Contact.php:339 msgid "Message" msgstr "" -#: include/conversation.php:1262 mod/editpost.php:115 +#: include/conversation.php:1263 mod/editpost.php:115 msgid "Browser" msgstr "" -#: include/conversation.php:1534 +#: include/conversation.php:1535 msgid "View all" msgstr "" -#: include/conversation.php:1558 +#: include/conversation.php:1559 msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1561 +#: include/conversation.php:1562 msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1567 +#: include/conversation.php:1568 msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1570 src/Content/ContactSelector.php:167 +#: include/conversation.php:1571 src/Content/ContactSelector.php:167 msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" @@ -840,32 +841,32 @@ msgid "Do you really want to delete this item?" msgstr "" #: include/items.php:394 mod/api.php:109 mod/dfrn_request.php:640 -#: mod/follow.php:161 mod/message.php:150 mod/profiles.php:526 -#: mod/profiles.php:529 mod/profiles.php:551 mod/settings.php:1084 -#: mod/settings.php:1090 mod/settings.php:1097 mod/settings.php:1101 -#: mod/settings.php:1105 mod/settings.php:1109 mod/settings.php:1113 -#: mod/settings.php:1117 mod/settings.php:1137 mod/settings.php:1138 -#: mod/settings.php:1139 mod/settings.php:1140 mod/settings.php:1141 -#: mod/suggest.php:73 src/Module/Contact.php:440 src/Module/Register.php:97 +#: mod/follow.php:163 mod/message.php:150 mod/profiles.php:526 +#: mod/profiles.php:529 mod/profiles.php:551 mod/settings.php:1089 +#: mod/settings.php:1095 mod/settings.php:1102 mod/settings.php:1106 +#: mod/settings.php:1110 mod/settings.php:1114 mod/settings.php:1118 +#: mod/settings.php:1122 mod/settings.php:1142 mod/settings.php:1143 +#: mod/settings.php:1144 mod/settings.php:1145 mod/settings.php:1146 +#: mod/suggest.php:73 src/Module/Contact.php:461 src/Module/Register.php:97 msgid "Yes" msgstr "" #: include/items.php:444 mod/api.php:34 mod/api.php:39 mod/cal.php:301 #: mod/common.php:27 mod/crepair.php:90 mod/delegate.php:30 mod/delegate.php:48 #: mod/delegate.php:59 mod/dfrn_confirm.php:64 mod/editpost.php:21 -#: mod/events.php:207 mod/follow.php:57 mod/follow.php:132 mod/fsuggest.php:62 -#: mod/item.php:169 mod/manage.php:130 mod/message.php:56 mod/message.php:101 -#: mod/network.php:36 mod/notes.php:27 mod/notifications.php:70 +#: mod/events.php:208 mod/follow.php:57 mod/follow.php:134 mod/fsuggest.php:63 +#: mod/item.php:170 mod/manage.php:130 mod/message.php:56 mod/message.php:101 +#: mod/network.php:37 mod/notes.php:27 mod/notifications.php:70 #: mod/ostatus_subscribe.php:18 mod/photos.php:178 mod/photos.php:962 #: mod/poke.php:141 mod/profiles.php:182 mod/profiles.php:499 #: mod/profile_photo.php:32 mod/profile_photo.php:177 mod/profile_photo.php:204 -#: mod/regmod.php:89 mod/repair_ostatus.php:16 mod/settings.php:50 -#: mod/settings.php:163 mod/settings.php:664 mod/suggest.php:39 +#: mod/regmod.php:89 mod/repair_ostatus.php:16 mod/settings.php:52 +#: mod/settings.php:165 mod/settings.php:667 mod/suggest.php:39 #: mod/uimport.php:17 mod/unfollow.php:22 mod/unfollow.php:77 #: mod/unfollow.php:109 mod/wallmessage.php:19 mod/wallmessage.php:43 #: mod/wallmessage.php:82 mod/wallmessage.php:106 mod/wall_attach.php:76 #: mod/wall_attach.php:79 mod/wall_upload.php:107 mod/wall_upload.php:110 -#: src/Module/Attach.php:42 src/Module/Contact.php:357 +#: src/Module/Attach.php:42 src/Module/Contact.php:378 #: src/Module/FollowConfirm.php:27 src/Module/Group.php:31 #: src/Module/Group.php:77 src/Module/Invite.php:22 src/Module/Invite.php:110 #: src/Module/Notifications/Notify.php:19 src/Module/Profile/Contacts.php:50 @@ -891,13 +892,13 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: mod/api.php:110 mod/dfrn_request.php:640 mod/follow.php:161 +#: mod/api.php:110 mod/dfrn_request.php:640 mod/follow.php:163 #: mod/profiles.php:526 mod/profiles.php:530 mod/profiles.php:551 -#: mod/settings.php:1084 mod/settings.php:1090 mod/settings.php:1097 -#: mod/settings.php:1101 mod/settings.php:1105 mod/settings.php:1109 -#: mod/settings.php:1113 mod/settings.php:1117 mod/settings.php:1137 -#: mod/settings.php:1138 mod/settings.php:1139 mod/settings.php:1140 -#: mod/settings.php:1141 src/Module/Register.php:98 +#: mod/settings.php:1089 mod/settings.php:1095 mod/settings.php:1102 +#: mod/settings.php:1106 mod/settings.php:1110 mod/settings.php:1114 +#: mod/settings.php:1118 mod/settings.php:1122 mod/settings.php:1142 +#: mod/settings.php:1143 mod/settings.php:1144 mod/settings.php:1145 +#: mod/settings.php:1146 src/Module/Register.php:98 msgid "No" msgstr "" @@ -906,52 +907,52 @@ msgstr "" msgid "Access denied." msgstr "" -#: mod/cal.php:140 mod/display.php:306 src/Module/Profile.php:176 +#: mod/cal.php:140 mod/display.php:301 src/Module/Profile.php:177 msgid "Access to this profile has been restricted." msgstr "" -#: mod/cal.php:271 mod/events.php:382 src/Content/Nav.php:159 -#: src/Content/Nav.php:225 src/Model/Profile.php:934 src/Model/Profile.php:945 -#: view/theme/frio/theme.php:266 view/theme/frio/theme.php:270 +#: mod/cal.php:271 mod/events.php:383 src/Content/Nav.php:164 +#: src/Content/Nav.php:228 src/Model/Profile.php:916 src/Model/Profile.php:927 +#: view/theme/frio/theme.php:263 view/theme/frio/theme.php:267 msgid "Events" msgstr "" -#: mod/cal.php:272 mod/events.php:383 +#: mod/cal.php:272 mod/events.php:384 msgid "View" msgstr "" -#: mod/cal.php:273 mod/events.php:385 +#: mod/cal.php:273 mod/events.php:386 msgid "Previous" msgstr "" -#: mod/cal.php:274 mod/events.php:386 src/Module/Install.php:173 +#: mod/cal.php:274 mod/events.php:387 src/Module/Install.php:175 msgid "Next" msgstr "" -#: mod/cal.php:277 mod/events.php:391 src/Model/Event.php:428 +#: mod/cal.php:277 mod/events.php:392 src/Model/Event.php:428 msgid "today" msgstr "" -#: mod/cal.php:278 mod/events.php:392 src/Model/Event.php:429 +#: mod/cal.php:278 mod/events.php:393 src/Model/Event.php:429 #: src/Util/Temporal.php:314 msgid "month" msgstr "" -#: mod/cal.php:279 mod/events.php:393 src/Model/Event.php:430 +#: mod/cal.php:279 mod/events.php:394 src/Model/Event.php:430 #: src/Util/Temporal.php:315 msgid "week" msgstr "" -#: mod/cal.php:280 mod/events.php:394 src/Model/Event.php:431 +#: mod/cal.php:280 mod/events.php:395 src/Model/Event.php:431 #: src/Util/Temporal.php:316 msgid "day" msgstr "" -#: mod/cal.php:281 mod/events.php:395 +#: mod/cal.php:281 mod/events.php:396 msgid "list" msgstr "" -#: mod/cal.php:294 src/Console/NewPassword.php:67 src/Model/User.php:351 +#: mod/cal.php:294 src/Console/NewPassword.php:67 src/Model/User.php:384 msgid "User not found" msgstr "" @@ -971,14 +972,14 @@ msgstr "" msgid "No contacts in common." msgstr "" -#: mod/common.php:141 src/Module/Contact.php:889 +#: mod/common.php:141 src/Module/Contact.php:895 msgid "Common Friends" msgstr "" -#: mod/community.php:32 mod/dfrn_request.php:597 mod/display.php:204 -#: mod/photos.php:850 mod/search.php:94 mod/search.php:100 mod/videos.php:118 +#: mod/community.php:32 mod/dfrn_request.php:597 mod/display.php:199 +#: mod/photos.php:850 mod/search.php:87 mod/search.php:93 mod/videos.php:118 #: src/Module/Debug/Probe.php:20 src/Module/Debug/WebFinger.php:19 -#: src/Module/Directory.php:43 +#: src/Module/Directory.php:30 msgid "Public access denied." msgstr "" @@ -1006,7 +1007,7 @@ msgstr "" msgid "Posts from users of the whole federated network" msgstr "" -#: mod/community.php:162 mod/search.php:219 +#: mod/community.php:162 mod/search.php:222 msgid "No results." msgstr "" @@ -1024,8 +1025,8 @@ msgstr "" msgid "Contact update failed." msgstr "" -#: mod/crepair.php:102 mod/dfrn_confirm.php:125 mod/fsuggest.php:31 -#: mod/fsuggest.php:74 mod/redir.php:32 mod/redir.php:140 +#: mod/crepair.php:102 mod/dfrn_confirm.php:125 mod/fsuggest.php:32 +#: mod/fsuggest.php:75 mod/redir.php:32 mod/redir.php:140 #: src/Module/FollowConfirm.php:46 src/Module/Group.php:92 msgid "Contact not found." msgstr "" @@ -1062,15 +1063,15 @@ msgstr "" msgid "Refetch contact data" msgstr "" -#: mod/crepair.php:149 mod/events.php:551 mod/fsuggest.php:91 +#: mod/crepair.php:149 mod/events.php:552 mod/fsuggest.php:92 #: mod/manage.php:183 mod/message.php:261 mod/message.php:441 -#: mod/photos.php:991 mod/photos.php:1101 mod/photos.php:1386 -#: mod/photos.php:1431 mod/photos.php:1470 mod/photos.php:1530 mod/poke.php:184 -#: mod/profiles.php:562 src/Module/Contact.php:590 -#: src/Module/Debug/Localtime.php:45 src/Module/Install.php:211 -#: src/Module/Install.php:251 src/Module/Install.php:287 -#: src/Module/Invite.php:157 src/Object/Post.php:877 -#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:121 +#: mod/photos.php:991 mod/photos.php:1101 mod/photos.php:1387 +#: mod/photos.php:1432 mod/photos.php:1471 mod/photos.php:1531 mod/poke.php:184 +#: mod/profiles.php:562 src/Module/Contact.php:598 +#: src/Module/Debug/Localtime.php:45 src/Module/Install.php:213 +#: src/Module/Install.php:253 src/Module/Install.php:289 +#: src/Module/Invite.php:157 src/Object/Post.php:878 +#: view/theme/duepuntozero/config.php:72 view/theme/frio/config.php:123 #: view/theme/quattro/config.php:74 view/theme/vier/config.php:120 msgid "Submit" msgstr "" @@ -1089,7 +1090,7 @@ msgid "" "entries from this contact." msgstr "" -#: mod/crepair.php:159 mod/settings.php:676 mod/settings.php:702 +#: mod/crepair.php:159 mod/settings.php:679 mod/settings.php:705 #: src/Module/Admin/Blocklist/Contact.php:73 src/Module/Admin/Users.php:272 #: src/Module/Admin/Users.php:283 src/Module/Admin/Users.php:297 #: src/Module/Admin/Users.php:313 @@ -1159,15 +1160,15 @@ msgid "" "settings. Please double check whom you give this access." msgstr "" -#: mod/delegate.php:175 mod/settings.php:674 mod/settings.php:781 -#: mod/settings.php:869 mod/settings.php:948 mod/settings.php:1173 +#: mod/delegate.php:175 mod/settings.php:677 mod/settings.php:784 +#: mod/settings.php:874 mod/settings.php:953 mod/settings.php:1178 #: src/Module/Admin/Addons/Index.php:52 src/Module/Admin/Features.php:69 -#: src/Module/Admin/Logs/Settings.php:65 src/Module/Admin/Site.php:570 +#: src/Module/Admin/Logs/Settings.php:65 src/Module/Admin/Site.php:569 #: src/Module/Admin/Themes/Index.php:95 src/Module/Admin/Tos.php:50 msgid "Save Settings" msgstr "" -#: mod/delegate.php:176 src/Content/Nav.php:260 +#: mod/delegate.php:176 src/Content/Nav.php:263 msgid "Delegate Page Management" msgstr "" @@ -1273,7 +1274,7 @@ msgstr "" msgid "Unable to update your contact profile details on our system" msgstr "" -#: mod/dfrn_confirm.php:538 mod/dfrn_request.php:560 src/Model/Contact.php:2234 +#: mod/dfrn_confirm.php:538 mod/dfrn_request.php:560 src/Model/Contact.php:2459 msgid "[Name Withheld]" msgstr "" @@ -1347,13 +1348,12 @@ msgstr "" msgid "Invalid profile URL." msgstr "" -#: mod/dfrn_request.php:340 src/Model/Contact.php:1878 +#: mod/dfrn_request.php:340 src/Model/Contact.php:2101 msgid "Disallowed profile URL." msgstr "" -#: mod/dfrn_request.php:346 src/Model/Contact.php:1883 -#: src/Module/Admin/Blocklist/Server.php:64 -#: src/Module/Admin/Blocklist/Server.php:83 src/Module/Friendica.php:59 +#: mod/dfrn_request.php:346 src/Model/Contact.php:2106 +#: src/Module/Friendica.php:59 msgid "Blocked domain" msgstr "" @@ -1422,16 +1422,16 @@ msgid "" "testuser@gnusocial.de" msgstr "" -#: mod/dfrn_request.php:639 mod/follow.php:160 +#: mod/dfrn_request.php:639 mod/follow.php:162 msgid "Please answer the following:" msgstr "" -#: mod/dfrn_request.php:640 mod/follow.php:161 +#: mod/dfrn_request.php:640 mod/follow.php:163 #, php-format msgid "Does %s know you?" msgstr "" -#: mod/dfrn_request.php:641 mod/follow.php:162 +#: mod/dfrn_request.php:641 mod/follow.php:164 msgid "Add a personal note:" msgstr "" @@ -1454,19 +1454,19 @@ msgid "" "bar." msgstr "" -#: mod/dfrn_request.php:647 mod/follow.php:168 mod/unfollow.php:128 +#: mod/dfrn_request.php:647 mod/follow.php:170 mod/unfollow.php:128 msgid "Your Identity Address:" msgstr "" -#: mod/dfrn_request.php:649 mod/follow.php:74 mod/unfollow.php:131 +#: mod/dfrn_request.php:649 mod/follow.php:76 mod/unfollow.php:131 msgid "Submit Request" msgstr "" -#: mod/display.php:257 mod/display.php:342 +#: mod/display.php:252 mod/display.php:337 msgid "The requested item doesn't exist or has been deleted." msgstr "" -#: mod/display.php:417 +#: mod/display.php:412 msgid "The feed for this item is unavailable." msgstr "" @@ -1478,7 +1478,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: mod/editpost.php:71 mod/notes.php:46 src/Content/Text/HTML.php:894 +#: mod/editpost.php:71 mod/notes.php:46 src/Content/Text/HTML.php:874 #: src/Module/Filer/SaveTag.php:49 msgid "Save" msgstr "" @@ -1516,96 +1516,96 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: mod/events.php:117 mod/events.php:119 +#: mod/events.php:118 mod/events.php:120 msgid "Event can not end before it has started." msgstr "" -#: mod/events.php:126 mod/events.php:128 +#: mod/events.php:127 mod/events.php:129 msgid "Event title and start time are required." msgstr "" -#: mod/events.php:384 +#: mod/events.php:385 msgid "Create New Event" msgstr "" -#: mod/events.php:507 +#: mod/events.php:508 msgid "Event details" msgstr "" -#: mod/events.php:508 +#: mod/events.php:509 msgid "Starting date and Title are required." msgstr "" -#: mod/events.php:509 mod/events.php:514 +#: mod/events.php:510 mod/events.php:515 msgid "Event Starts:" msgstr "" -#: mod/events.php:509 mod/events.php:541 mod/profiles.php:592 +#: mod/events.php:510 mod/events.php:542 mod/profiles.php:592 msgid "Required" msgstr "" -#: mod/events.php:522 mod/events.php:547 +#: mod/events.php:523 mod/events.php:548 msgid "Finish date/time is not known or not relevant" msgstr "" -#: mod/events.php:524 mod/events.php:529 +#: mod/events.php:525 mod/events.php:530 msgid "Event Finishes:" msgstr "" -#: mod/events.php:535 mod/events.php:548 +#: mod/events.php:536 mod/events.php:549 msgid "Adjust for viewer timezone" msgstr "" -#: mod/events.php:537 +#: mod/events.php:538 msgid "Description:" msgstr "" -#: mod/events.php:539 mod/notifications.php:264 src/Model/Event.php:68 +#: mod/events.php:540 mod/notifications.php:264 src/Model/Event.php:68 #: src/Model/Event.php:95 src/Model/Event.php:437 src/Model/Event.php:933 -#: src/Model/Profile.php:439 src/Module/Contact.php:639 -#: src/Module/Directory.php:142 +#: src/Model/Profile.php:418 src/Module/Contact.php:645 +#: src/Module/Directory.php:137 msgid "Location:" msgstr "" -#: mod/events.php:541 mod/events.php:543 +#: mod/events.php:542 mod/events.php:544 msgid "Title:" msgstr "" -#: mod/events.php:544 mod/events.php:545 +#: mod/events.php:545 mod/events.php:546 msgid "Share this event" msgstr "" -#: mod/events.php:552 src/Model/Profile.php:871 +#: mod/events.php:553 src/Model/Profile.php:853 msgid "Basic" msgstr "" -#: mod/events.php:553 src/Model/Profile.php:872 src/Module/Admin/Site.php:575 -#: src/Module/Contact.php:899 +#: mod/events.php:554 src/Model/Profile.php:854 src/Module/Admin/Site.php:574 +#: src/Module/Contact.php:905 msgid "Advanced" msgstr "" -#: mod/events.php:554 mod/photos.php:1009 mod/photos.php:1382 +#: mod/events.php:555 mod/photos.php:1009 mod/photos.php:1383 #: src/Core/ACL.php:314 msgid "Permissions" msgstr "" -#: mod/events.php:570 +#: mod/events.php:571 msgid "Failed to remove event" msgstr "" -#: mod/events.php:572 +#: mod/events.php:573 msgid "Event removed" msgstr "" -#: mod/fbrowser.php:43 src/Content/Nav.php:157 src/Model/Profile.php:914 -#: view/theme/frio/theme.php:264 +#: mod/fbrowser.php:43 src/Content/Nav.php:162 src/Model/Profile.php:896 +#: view/theme/frio/theme.php:261 msgid "Photos" msgstr "" #: mod/fbrowser.php:52 mod/fbrowser.php:76 mod/photos.php:196 #: mod/photos.php:973 mod/photos.php:1090 mod/photos.php:1107 -#: mod/photos.php:1583 mod/photos.php:1598 src/Model/Photo.php:552 -#: src/Model/Photo.php:561 +#: mod/photos.php:1584 mod/photos.php:1599 src/Model/Photo.php:573 +#: src/Model/Photo.php:582 msgid "Contact Photos" msgstr "" @@ -1621,51 +1621,51 @@ msgstr "" msgid "The contact could not be added." msgstr "" -#: mod/follow.php:85 +#: mod/follow.php:87 msgid "You already added this contact." msgstr "" -#: mod/follow.php:97 +#: mod/follow.php:99 msgid "Diaspora support isn't enabled. Contact can't be added." msgstr "" -#: mod/follow.php:104 +#: mod/follow.php:106 msgid "OStatus support is disabled. Contact can't be added." msgstr "" -#: mod/follow.php:111 +#: mod/follow.php:113 msgid "The network type couldn't be detected. Contact can't be added." msgstr "" -#: mod/follow.php:177 mod/notifications.php:182 mod/notifications.php:274 +#: mod/follow.php:179 mod/notifications.php:182 mod/notifications.php:274 #: mod/unfollow.php:137 src/Module/Admin/Blocklist/Contact.php:83 -#: src/Module/Contact.php:635 +#: src/Module/Contact.php:641 msgid "Profile URL" msgstr "" -#: mod/follow.php:181 mod/notifications.php:268 src/Model/Profile.php:801 -#: src/Module/Contact.php:645 +#: mod/follow.php:183 mod/notifications.php:268 src/Model/Profile.php:783 +#: src/Module/Contact.php:651 msgid "Tags:" msgstr "" -#: mod/follow.php:193 mod/unfollow.php:147 src/Model/Profile.php:901 -#: src/Module/Contact.php:861 +#: mod/follow.php:195 mod/unfollow.php:147 src/Model/Profile.php:883 +#: src/Module/Contact.php:867 msgid "Status Messages and Posts" msgstr "" -#: mod/fsuggest.php:43 +#: mod/fsuggest.php:44 msgid "Suggested contact not found." msgstr "" -#: mod/fsuggest.php:56 +#: mod/fsuggest.php:57 msgid "Friend suggestion sent." msgstr "" -#: mod/fsuggest.php:78 +#: mod/fsuggest.php:79 msgid "Suggest Friends" msgstr "" -#: mod/fsuggest.php:80 +#: mod/fsuggest.php:81 #, php-format msgid "Suggest a friend for %s" msgstr "" @@ -1674,32 +1674,32 @@ msgstr "" msgid "No profile" msgstr "" -#: mod/item.php:122 +#: mod/item.php:123 msgid "Unable to locate original post." msgstr "" -#: mod/item.php:322 +#: mod/item.php:323 msgid "Empty post discarded." msgstr "" -#: mod/item.php:837 +#: mod/item.php:836 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: mod/item.php:839 +#: mod/item.php:838 #, php-format msgid "You may visit them online at %s" msgstr "" -#: mod/item.php:840 +#: mod/item.php:839 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: mod/item.php:844 +#: mod/item.php:843 #, php-format msgid "%s posted an update." msgstr "" @@ -1781,7 +1781,7 @@ msgid "" "your email for further instructions." msgstr "" -#: mod/lostpass.php:119 src/Module/Login.php:327 +#: mod/lostpass.php:119 src/Module/Login.php:318 msgid "Nickname or Email: " msgstr "" @@ -1789,7 +1789,7 @@ msgstr "" msgid "Reset" msgstr "" -#: mod/lostpass.php:135 src/Module/Login.php:339 +#: mod/lostpass.php:135 src/Module/Login.php:330 msgid "Password Reset" msgstr "" @@ -1865,8 +1865,7 @@ msgid "No keywords to match. Please add keywords to your default profile." msgstr "" #: mod/match.php:102 mod/suggest.php:106 src/Content/Widget.php:42 -#: src/Model/Profile.php:309 src/Module/AllFriends.php:91 -#: src/Module/BaseSearchModule.php:128 +#: src/Module/AllFriends.php:91 src/Module/BaseSearchModule.php:131 msgid "Connect" msgstr "" @@ -1878,7 +1877,7 @@ msgstr "" msgid "next" msgstr "" -#: mod/match.php:130 src/Module/BaseSearchModule.php:89 +#: mod/match.php:130 src/Module/BaseSearchModule.php:92 msgid "No matches" msgstr "" @@ -1886,7 +1885,7 @@ msgstr "" msgid "Profile Match" msgstr "" -#: mod/message.php:33 mod/message.php:116 src/Content/Nav.php:254 +#: mod/message.php:33 mod/message.php:116 src/Content/Nav.php:257 msgid "New Message" msgstr "" @@ -1915,7 +1914,7 @@ msgstr "" msgid "Discard" msgstr "" -#: mod/message.php:123 src/Content/Nav.php:251 view/theme/frio/theme.php:271 +#: mod/message.php:123 src/Content/Nav.php:254 view/theme/frio/theme.php:268 msgid "Messages" msgstr "" @@ -2008,19 +2007,19 @@ msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: mod/network.php:182 mod/search.php:36 +#: mod/network.php:183 mod/search.php:35 msgid "Remove term" msgstr "" -#: mod/network.php:189 mod/search.php:45 +#: mod/network.php:190 mod/search.php:44 msgid "Saved Searches" msgstr "" -#: mod/network.php:190 src/Model/Group.php:434 +#: mod/network.php:191 src/Model/Group.php:434 msgid "add" msgstr "" -#: mod/network.php:570 +#: mod/network.php:571 #, php-format msgid "" "Warning: This group contains %s member from a network that doesn't allow non " @@ -2031,82 +2030,82 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: mod/network.php:573 +#: mod/network.php:574 msgid "Messages in this group won't be send to these receivers." msgstr "" -#: mod/network.php:640 +#: mod/network.php:641 msgid "No such group" msgstr "" -#: mod/network.php:661 src/Module/Group.php:288 +#: mod/network.php:662 src/Module/Group.php:288 msgid "Group is empty" msgstr "" -#: mod/network.php:665 +#: mod/network.php:666 #, php-format msgid "Group: %s" msgstr "" -#: mod/network.php:691 +#: mod/network.php:692 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: mod/network.php:694 src/Module/AllFriends.php:35 +#: mod/network.php:695 src/Module/AllFriends.php:35 #: src/Module/AllFriends.php:43 msgid "Invalid contact." msgstr "" -#: mod/network.php:973 +#: mod/network.php:974 msgid "Commented Order" msgstr "" -#: mod/network.php:976 +#: mod/network.php:977 msgid "Sort by Comment Date" msgstr "" -#: mod/network.php:981 +#: mod/network.php:982 msgid "Posted Order" msgstr "" -#: mod/network.php:984 +#: mod/network.php:985 msgid "Sort by Post Date" msgstr "" -#: mod/network.php:991 mod/profiles.php:579 +#: mod/network.php:992 mod/profiles.php:579 #: src/Core/NotificationsManager.php:158 msgid "Personal" msgstr "" -#: mod/network.php:994 +#: mod/network.php:995 msgid "Posts that mention or involve you" msgstr "" -#: mod/network.php:1001 +#: mod/network.php:1002 msgid "New" msgstr "" -#: mod/network.php:1004 +#: mod/network.php:1005 msgid "Activity Stream - by date" msgstr "" -#: mod/network.php:1012 +#: mod/network.php:1013 msgid "Shared Links" msgstr "" -#: mod/network.php:1015 +#: mod/network.php:1016 msgid "Interesting Links" msgstr "" -#: mod/network.php:1022 +#: mod/network.php:1023 msgid "Starred" msgstr "" -#: mod/network.php:1025 +#: mod/network.php:1026 msgid "Favourite Posts" msgstr "" -#: mod/notes.php:34 src/Model/Profile.php:956 +#: mod/notes.php:34 src/Model/Profile.php:938 msgid "Personal Notes" msgstr "" @@ -2114,7 +2113,7 @@ msgstr "" msgid "Invalid request identifier." msgstr "" -#: mod/notifications.php:93 src/Content/Nav.php:246 +#: mod/notifications.php:93 src/Content/Nav.php:249 msgid "Notifications" msgstr "" @@ -2159,7 +2158,7 @@ msgid "Suggested by:" msgstr "" #: mod/notifications.php:184 mod/notifications.php:271 -#: src/Module/Contact.php:626 +#: src/Module/Contact.php:632 msgid "Hide this contact from others" msgstr "" @@ -2217,19 +2216,19 @@ msgstr "" msgid "Subscriber" msgstr "" -#: mod/notifications.php:266 src/Model/Profile.php:445 -#: src/Model/Profile.php:813 src/Module/Contact.php:643 -#: src/Module/Directory.php:150 +#: mod/notifications.php:266 src/Model/Profile.php:424 +#: src/Model/Profile.php:795 src/Module/Contact.php:649 +#: src/Module/Directory.php:145 msgid "About:" msgstr "" -#: mod/notifications.php:270 src/Model/Profile.php:442 -#: src/Model/Profile.php:752 src/Module/Directory.php:147 +#: mod/notifications.php:270 src/Model/Profile.php:421 +#: src/Model/Profile.php:734 src/Module/Directory.php:142 msgid "Gender:" msgstr "" -#: mod/notifications.php:277 src/Model/Profile.php:539 -#: src/Module/Contact.php:318 +#: mod/notifications.php:277 src/Model/Profile.php:521 +#: src/Module/Contact.php:333 msgid "Network:" msgstr "" @@ -2255,7 +2254,7 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "" -#: mod/openid.php:117 src/Module/Login.php:93 src/Module/Login.php:144 +#: mod/openid.php:117 src/Module/Login.php:88 src/Module/Login.php:139 msgid "Login failed." msgstr "" @@ -2287,7 +2286,7 @@ msgstr "" msgid "failed" msgstr "" -#: mod/ostatus_subscribe.php:89 src/Object/Post.php:284 +#: mod/ostatus_subscribe.php:89 src/Object/Post.php:285 msgid "ignored" msgstr "" @@ -2295,19 +2294,19 @@ msgstr "" msgid "Keep this window open until done." msgstr "" -#: mod/photos.php:113 src/Model/Profile.php:917 +#: mod/photos.php:113 src/Model/Profile.php:899 msgid "Photo Albums" msgstr "" -#: mod/photos.php:114 mod/photos.php:1638 +#: mod/photos.php:114 mod/photos.php:1639 msgid "Recent Photos" msgstr "" -#: mod/photos.php:116 mod/photos.php:1152 mod/photos.php:1640 +#: mod/photos.php:116 mod/photos.php:1152 mod/photos.php:1641 msgid "Upload New Photos" msgstr "" -#: mod/photos.php:134 mod/settings.php:58 src/Module/BaseSettingsModule.php:18 +#: mod/photos.php:134 mod/settings.php:60 src/Module/BaseSettingsModule.php:18 msgid "everybody" msgstr "" @@ -2392,11 +2391,11 @@ msgstr "" msgid "Do not show a status post for this upload" msgstr "" -#: mod/photos.php:1023 mod/photos.php:1390 mod/settings.php:1208 +#: mod/photos.php:1023 mod/photos.php:1391 mod/settings.php:1213 msgid "Show to Groups" msgstr "" -#: mod/photos.php:1024 mod/photos.php:1391 mod/settings.php:1209 +#: mod/photos.php:1024 mod/photos.php:1392 mod/settings.php:1214 msgid "Show to Contacts" msgstr "" @@ -2424,7 +2423,7 @@ msgstr "" msgid "Show Oldest First" msgstr "" -#: mod/photos.php:1137 mod/photos.php:1623 +#: mod/photos.php:1137 mod/photos.php:1624 msgid "View Photo" msgstr "" @@ -2440,7 +2439,7 @@ msgstr "" msgid "Do you really want to delete this photo?" msgstr "" -#: mod/photos.php:1188 mod/photos.php:1387 +#: mod/photos.php:1188 mod/photos.php:1388 msgid "Delete Photo" msgstr "" @@ -2468,65 +2467,65 @@ msgstr "" msgid "View Full Size" msgstr "" -#: mod/photos.php:1355 +#: mod/photos.php:1356 msgid "Tags: " msgstr "" -#: mod/photos.php:1358 +#: mod/photos.php:1359 msgid "[Select tags to remove]" msgstr "" -#: mod/photos.php:1373 +#: mod/photos.php:1374 msgid "New album name" msgstr "" -#: mod/photos.php:1374 +#: mod/photos.php:1375 msgid "Caption" msgstr "" -#: mod/photos.php:1375 +#: mod/photos.php:1376 msgid "Add a Tag" msgstr "" -#: mod/photos.php:1375 +#: mod/photos.php:1376 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: mod/photos.php:1376 +#: mod/photos.php:1377 msgid "Do not rotate" msgstr "" -#: mod/photos.php:1377 +#: mod/photos.php:1378 msgid "Rotate CW (right)" msgstr "" -#: mod/photos.php:1378 +#: mod/photos.php:1379 msgid "Rotate CCW (left)" msgstr "" -#: mod/photos.php:1412 src/Object/Post.php:312 +#: mod/photos.php:1413 src/Object/Post.php:313 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1413 src/Object/Post.php:313 +#: mod/photos.php:1414 src/Object/Post.php:314 msgid "I don't like this (toggle)" msgstr "" -#: mod/photos.php:1428 mod/photos.php:1467 mod/photos.php:1527 -#: src/Module/Contact.php:1015 src/Object/Post.php:874 +#: mod/photos.php:1429 mod/photos.php:1468 mod/photos.php:1528 +#: src/Module/Contact.php:1017 src/Object/Post.php:875 msgid "This is you" msgstr "" -#: mod/photos.php:1430 mod/photos.php:1469 mod/photos.php:1529 -#: src/Object/Post.php:419 src/Object/Post.php:876 +#: mod/photos.php:1431 mod/photos.php:1470 mod/photos.php:1530 +#: src/Object/Post.php:420 src/Object/Post.php:877 msgid "Comment" msgstr "" -#: mod/photos.php:1558 +#: mod/photos.php:1559 msgid "Map" msgstr "" -#: mod/photos.php:1629 mod/videos.php:287 +#: mod/photos.php:1630 mod/videos.php:287 msgid "View Album" msgstr "" @@ -2662,7 +2661,7 @@ msgstr "" msgid "View all profiles" msgstr "" -#: mod/profiles.php:567 mod/profiles.php:662 src/Model/Profile.php:415 +#: mod/profiles.php:567 mod/profiles.php:662 src/Model/Profile.php:394 msgid "Edit visibility" msgstr "" @@ -2718,7 +2717,7 @@ msgstr "" msgid "♥ Marital Status:" msgstr "" -#: mod/profiles.php:586 src/Model/Profile.php:789 +#: mod/profiles.php:586 src/Model/Profile.php:771 msgid "Sexual Preference:" msgstr "" @@ -2798,11 +2797,11 @@ msgstr "" msgid "Homepage URL:" msgstr "" -#: mod/profiles.php:613 src/Model/Profile.php:797 +#: mod/profiles.php:613 src/Model/Profile.php:779 msgid "Hometown:" msgstr "" -#: mod/profiles.php:614 src/Model/Profile.php:805 +#: mod/profiles.php:614 src/Model/Profile.php:787 msgid "Political Views:" msgstr "" @@ -2826,11 +2825,11 @@ msgstr "" msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: mod/profiles.php:618 src/Model/Profile.php:821 +#: mod/profiles.php:618 src/Model/Profile.php:803 msgid "Likes:" msgstr "" -#: mod/profiles.php:619 src/Model/Profile.php:825 +#: mod/profiles.php:619 src/Model/Profile.php:807 msgid "Dislikes:" msgstr "" @@ -2870,11 +2869,11 @@ msgstr "" msgid "Contact information and Social Networks" msgstr "" -#: mod/profiles.php:659 src/Model/Profile.php:411 +#: mod/profiles.php:659 src/Model/Profile.php:390 msgid "Profile Image" msgstr "" -#: mod/profiles.php:661 src/Model/Profile.php:414 +#: mod/profiles.php:661 src/Model/Profile.php:393 msgid "visible to everybody" msgstr "" @@ -2882,11 +2881,11 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: mod/profiles.php:669 src/Model/Profile.php:401 src/Model/Profile.php:423 +#: mod/profiles.php:669 src/Model/Profile.php:380 src/Model/Profile.php:401 msgid "Change profile photo" msgstr "" -#: mod/profiles.php:670 src/Model/Profile.php:402 +#: mod/profiles.php:670 src/Model/Profile.php:381 msgid "Create New Profile" msgstr "" @@ -2958,10 +2957,10 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: mod/profperm.php:117 src/Content/Nav.php:156 src/Model/Profile.php:870 -#: src/Model/Profile.php:906 src/Module/Contact.php:650 -#: src/Module/Contact.php:866 src/Module/Welcome.php:38 -#: view/theme/frio/theme.php:263 +#: mod/profperm.php:117 src/Content/Nav.php:161 src/Model/Profile.php:852 +#: src/Model/Profile.php:888 src/Module/Contact.php:656 +#: src/Module/Contact.php:872 src/Module/Welcome.php:38 +#: view/theme/frio/theme.php:260 msgid "Profile" msgstr "" @@ -3023,264 +3022,283 @@ msgstr "" msgid "Resubscribing to OStatus contacts" msgstr "" -#: mod/repair_ostatus.php:37 +#: mod/repair_ostatus.php:37 src/Module/TwoFactor/Verify.php:64 msgid "Error" -msgstr "" +msgid_plural "Errors" +msgstr[0] "" +msgstr[1] "" -#: mod/search.php:99 +#: mod/search.php:92 msgid "Only logged in users are permitted to perform a search." msgstr "" -#: mod/search.php:121 +#: mod/search.php:114 msgid "Only one search per minute is permitted for not logged in users." msgstr "" -#: mod/search.php:141 src/Content/Nav.php:197 src/Content/Text/HTML.php:900 +#: mod/search.php:134 src/Content/Nav.php:200 src/Content/Text/HTML.php:880 msgid "Search" msgstr "" -#: mod/search.php:225 +#: mod/search.php:228 #, php-format msgid "Items tagged with: %s" msgstr "" -#: mod/search.php:227 src/Module/Contact.php:813 +#: mod/search.php:230 src/Module/Contact.php:819 #, php-format msgid "Results for: %s" msgstr "" -#: mod/settings.php:63 src/Module/BaseSettingsModule.php:24 +#: mod/settings.php:65 src/Module/BaseSettingsModule.php:24 msgid "Account" msgstr "" -#: mod/settings.php:71 src/Module/BaseSettingsModule.php:31 -#: src/Module/Settings/TwoFactor/Index.php:83 -#: src/Module/TwoFactor/Verify.php:60 +#: mod/settings.php:73 src/Module/BaseSettingsModule.php:31 +#: src/Module/Settings/TwoFactor/Index.php:89 +#: src/Module/TwoFactor/Verify.php:62 msgid "Two-factor authentication" msgstr "" -#: mod/settings.php:78 src/Content/Nav.php:265 src/Model/Profile.php:394 +#: mod/settings.php:80 src/Content/Nav.php:268 src/Model/Profile.php:373 #: src/Module/BaseSettingsModule.php:38 msgid "Profiles" msgstr "" -#: mod/settings.php:86 src/Module/BaseAdminModule.php:84 +#: mod/settings.php:88 src/Module/BaseAdminModule.php:84 #: src/Module/BaseSettingsModule.php:46 msgid "Additional features" msgstr "" -#: mod/settings.php:94 src/Module/BaseSettingsModule.php:54 +#: mod/settings.php:96 src/Module/BaseSettingsModule.php:54 msgid "Display" msgstr "" -#: mod/settings.php:101 mod/settings.php:839 +#: mod/settings.php:103 mod/settings.php:843 #: src/Module/BaseSettingsModule.php:61 msgid "Social Networks" msgstr "" -#: mod/settings.php:108 src/Module/Admin/Addons/Details.php:100 +#: mod/settings.php:110 src/Module/Admin/Addons/Details.php:100 #: src/Module/Admin/Addons/Index.php:51 src/Module/BaseAdminModule.php:82 #: src/Module/BaseSettingsModule.php:68 msgid "Addons" msgstr "" -#: mod/settings.php:115 src/Content/Nav.php:260 +#: mod/settings.php:117 src/Content/Nav.php:263 #: src/Module/BaseSettingsModule.php:75 msgid "Delegations" msgstr "" -#: mod/settings.php:122 src/Module/BaseSettingsModule.php:82 +#: mod/settings.php:124 src/Module/BaseSettingsModule.php:82 msgid "Connected apps" msgstr "" -#: mod/settings.php:129 mod/uexport.php:59 src/Module/BaseSettingsModule.php:89 +#: mod/settings.php:131 mod/uexport.php:59 src/Module/BaseSettingsModule.php:89 msgid "Export personal data" msgstr "" -#: mod/settings.php:136 src/Module/BaseSettingsModule.php:96 +#: mod/settings.php:138 src/Module/BaseSettingsModule.php:96 msgid "Remove account" msgstr "" -#: mod/settings.php:145 src/Content/Nav.php:262 +#: mod/settings.php:147 src/Content/Nav.php:265 #: src/Module/Admin/Addons/Details.php:102 #: src/Module/Admin/Themes/Details.php:107 #: src/Module/BaseSettingsModule.php:105 src/Module/Welcome.php:33 -#: view/theme/frio/theme.php:272 +#: view/theme/frio/theme.php:269 msgid "Settings" msgstr "" -#: mod/settings.php:188 +#: mod/settings.php:190 msgid "Missing some important data!" msgstr "" -#: mod/settings.php:190 mod/settings.php:700 src/Module/Contact.php:820 +#: mod/settings.php:192 mod/settings.php:703 src/Module/Contact.php:826 msgid "Update" msgstr "" -#: mod/settings.php:299 +#: mod/settings.php:302 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: mod/settings.php:304 +#: mod/settings.php:307 msgid "Email settings updated." msgstr "" -#: mod/settings.php:320 +#: mod/settings.php:323 msgid "Features updated" msgstr "" -#: mod/settings.php:393 +#: mod/settings.php:384 +msgid "The theme you chose isn't available." +msgstr "" + +#: mod/settings.php:396 msgid "Relocate message has been send to your contacts" msgstr "" -#: mod/settings.php:405 +#: mod/settings.php:408 msgid "Passwords do not match." msgstr "" -#: mod/settings.php:413 src/Console/NewPassword.php:80 +#: mod/settings.php:416 src/Console/NewPassword.php:80 msgid "Password update failed. Please try again." msgstr "" -#: mod/settings.php:416 src/Console/NewPassword.php:83 +#: mod/settings.php:419 src/Console/NewPassword.php:83 msgid "Password changed." msgstr "" -#: mod/settings.php:419 +#: mod/settings.php:422 msgid "Password unchanged." msgstr "" -#: mod/settings.php:500 +#: mod/settings.php:503 msgid " Please use a shorter name." msgstr "" -#: mod/settings.php:503 +#: mod/settings.php:506 msgid " Name too short." msgstr "" -#: mod/settings.php:510 src/Module/Settings/TwoFactor/Index.php:66 +#: mod/settings.php:513 src/Module/Settings/TwoFactor/Index.php:72 msgid "Wrong Password" msgstr "" -#: mod/settings.php:515 +#: mod/settings.php:518 msgid "Invalid email." msgstr "" -#: mod/settings.php:521 +#: mod/settings.php:524 msgid "Cannot change to that email." msgstr "" -#: mod/settings.php:571 +#: mod/settings.php:574 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: mod/settings.php:574 +#: mod/settings.php:577 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: mod/settings.php:614 +#: mod/settings.php:617 msgid "Settings updated." msgstr "" -#: mod/settings.php:673 mod/settings.php:699 mod/settings.php:733 +#: mod/settings.php:676 mod/settings.php:702 mod/settings.php:736 msgid "Add application" msgstr "" -#: mod/settings.php:677 mod/settings.php:703 +#: mod/settings.php:680 mod/settings.php:706 msgid "Consumer Key" msgstr "" -#: mod/settings.php:678 mod/settings.php:704 +#: mod/settings.php:681 mod/settings.php:707 msgid "Consumer Secret" msgstr "" -#: mod/settings.php:679 mod/settings.php:705 +#: mod/settings.php:682 mod/settings.php:708 msgid "Redirect" msgstr "" -#: mod/settings.php:680 mod/settings.php:706 +#: mod/settings.php:683 mod/settings.php:709 msgid "Icon url" msgstr "" -#: mod/settings.php:691 +#: mod/settings.php:694 msgid "You can't edit this application." msgstr "" -#: mod/settings.php:732 +#: mod/settings.php:735 msgid "Connected Apps" msgstr "" -#: mod/settings.php:734 src/Object/Post.php:167 src/Object/Post.php:169 +#: mod/settings.php:737 src/Object/Post.php:168 src/Object/Post.php:170 msgid "Edit" msgstr "" -#: mod/settings.php:736 +#: mod/settings.php:739 msgid "Client key starts with" msgstr "" -#: mod/settings.php:737 +#: mod/settings.php:740 msgid "No name" msgstr "" -#: mod/settings.php:738 +#: mod/settings.php:741 msgid "Remove authorization" msgstr "" -#: mod/settings.php:749 +#: mod/settings.php:752 msgid "No Addon settings configured" msgstr "" -#: mod/settings.php:758 +#: mod/settings.php:761 msgid "Addon Settings" msgstr "" -#: mod/settings.php:772 src/Module/Admin/Features.php:58 +#: mod/settings.php:775 src/Module/Admin/Features.php:58 #: src/Module/Admin/Features.php:59 msgid "Off" msgstr "" -#: mod/settings.php:772 src/Module/Admin/Features.php:58 +#: mod/settings.php:775 src/Module/Admin/Features.php:58 #: src/Module/Admin/Features.php:59 msgid "On" msgstr "" -#: mod/settings.php:779 +#: mod/settings.php:782 msgid "Additional Features" msgstr "" -#: mod/settings.php:802 src/Content/ContactSelector.php:87 +#: mod/settings.php:806 src/Content/ContactSelector.php:87 msgid "Diaspora" msgstr "" -#: mod/settings.php:802 mod/settings.php:803 +#: mod/settings.php:806 mod/settings.php:807 msgid "enabled" msgstr "" -#: mod/settings.php:802 mod/settings.php:803 +#: mod/settings.php:806 mod/settings.php:807 msgid "disabled" msgstr "" -#: mod/settings.php:802 mod/settings.php:803 +#: mod/settings.php:806 mod/settings.php:807 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:803 +#: mod/settings.php:807 msgid "GNU Social (OStatus)" msgstr "" -#: mod/settings.php:834 +#: mod/settings.php:838 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:844 +#: mod/settings.php:848 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:845 +#: mod/settings.php:849 +msgid "Accept only top level posts by contacts you follow" +msgstr "" + +#: mod/settings.php:849 +msgid "" +"The system does an auto completion of threads when a comment arrives. This " +"has got the side effect that can you receive posts that had been started by " +"a non-follower but had been commented by someone you follow. This setting " +"deactivates this behaviour. When activated, you strictly only will receive " +"posts from people you really do follow." +msgstr "" + +#: mod/settings.php:850 msgid "Disable Content Warning" msgstr "" -#: mod/settings.php:845 +#: mod/settings.php:850 msgid "" "Users on networks like Mastodon or Pleroma are able to set a content warning " "field which collapse their post by default. This disables the automatic " @@ -3288,352 +3306,352 @@ msgid "" "any other content filtering you eventually set up." msgstr "" -#: mod/settings.php:846 +#: mod/settings.php:851 msgid "Disable intelligent shortening" msgstr "" -#: mod/settings.php:846 +#: mod/settings.php:851 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If this option is enabled then every shortened post will always point to the " "original friendica post." msgstr "" -#: mod/settings.php:847 +#: mod/settings.php:852 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" msgstr "" -#: mod/settings.php:847 +#: mod/settings.php:852 msgid "" "If you receive a message from an unknown OStatus user, this option decides " "what to do. If it is checked, a new contact will be created for every " "unknown user." msgstr "" -#: mod/settings.php:848 +#: mod/settings.php:853 msgid "Default group for OStatus contacts" msgstr "" -#: mod/settings.php:849 +#: mod/settings.php:854 msgid "Your legacy GNU Social account" msgstr "" -#: mod/settings.php:849 +#: mod/settings.php:854 msgid "" "If you enter your old GNU Social/Statusnet account name here (in the format " "user@domain.tld), your contacts will be added automatically. The field will " "be emptied when done." msgstr "" -#: mod/settings.php:852 +#: mod/settings.php:857 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:856 +#: mod/settings.php:861 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:857 +#: mod/settings.php:862 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:858 +#: mod/settings.php:863 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:860 +#: mod/settings.php:865 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:861 +#: mod/settings.php:866 msgid "IMAP port:" msgstr "" -#: mod/settings.php:862 +#: mod/settings.php:867 msgid "Security:" msgstr "" -#: mod/settings.php:862 mod/settings.php:867 +#: mod/settings.php:867 mod/settings.php:872 msgid "None" msgstr "" -#: mod/settings.php:863 +#: mod/settings.php:868 msgid "Email login name:" msgstr "" -#: mod/settings.php:864 +#: mod/settings.php:869 msgid "Email password:" msgstr "" -#: mod/settings.php:865 +#: mod/settings.php:870 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:866 +#: mod/settings.php:871 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:867 +#: mod/settings.php:872 msgid "Action after import:" msgstr "" -#: mod/settings.php:867 src/Content/Nav.php:248 +#: mod/settings.php:872 src/Content/Nav.php:251 msgid "Mark as seen" msgstr "" -#: mod/settings.php:867 +#: mod/settings.php:872 msgid "Move to folder" msgstr "" -#: mod/settings.php:868 +#: mod/settings.php:873 msgid "Move to folder:" msgstr "" -#: mod/settings.php:892 src/Module/Admin/Site.php:435 +#: mod/settings.php:897 src/Module/Admin/Site.php:434 msgid "No special theme for mobile devices" msgstr "" -#: mod/settings.php:900 +#: mod/settings.php:905 #, php-format msgid "%s - (Unsupported)" msgstr "" -#: mod/settings.php:902 src/Module/Admin/Site.php:452 +#: mod/settings.php:907 src/Module/Admin/Site.php:451 #, php-format msgid "%s - (Experimental)" msgstr "" -#: mod/settings.php:930 src/Core/L10n.php:371 src/Model/Event.php:395 +#: mod/settings.php:935 src/Core/L10n/L10n.php:372 src/Model/Event.php:395 msgid "Sunday" msgstr "" -#: mod/settings.php:930 src/Core/L10n.php:371 src/Model/Event.php:396 +#: mod/settings.php:935 src/Core/L10n/L10n.php:372 src/Model/Event.php:396 msgid "Monday" msgstr "" -#: mod/settings.php:946 +#: mod/settings.php:951 msgid "Display Settings" msgstr "" -#: mod/settings.php:952 +#: mod/settings.php:957 msgid "Display Theme:" msgstr "" -#: mod/settings.php:953 +#: mod/settings.php:958 msgid "Mobile Theme:" msgstr "" -#: mod/settings.php:954 +#: mod/settings.php:959 msgid "Suppress warning of insecure networks" msgstr "" -#: mod/settings.php:954 +#: mod/settings.php:959 msgid "" "Should the system suppress the warning that the current group contains " "members of networks that can't receive non public postings." msgstr "" -#: mod/settings.php:955 +#: mod/settings.php:960 msgid "Update browser every xx seconds" msgstr "" -#: mod/settings.php:955 +#: mod/settings.php:960 msgid "Minimum of 10 seconds. Enter -1 to disable it." msgstr "" -#: mod/settings.php:956 +#: mod/settings.php:961 msgid "Number of items to display per page:" msgstr "" -#: mod/settings.php:956 mod/settings.php:957 +#: mod/settings.php:961 mod/settings.php:962 msgid "Maximum of 100 items" msgstr "" -#: mod/settings.php:957 +#: mod/settings.php:962 msgid "Number of items to display per page when viewed from mobile device:" msgstr "" -#: mod/settings.php:958 +#: mod/settings.php:963 msgid "Don't show emoticons" msgstr "" -#: mod/settings.php:959 +#: mod/settings.php:964 msgid "Calendar" msgstr "" -#: mod/settings.php:960 +#: mod/settings.php:965 msgid "Beginning of week:" msgstr "" -#: mod/settings.php:961 +#: mod/settings.php:966 msgid "Don't show notices" msgstr "" -#: mod/settings.php:962 +#: mod/settings.php:967 msgid "Infinite scroll" msgstr "" -#: mod/settings.php:963 +#: mod/settings.php:968 msgid "Automatic updates only at the top of the network page" msgstr "" -#: mod/settings.php:963 +#: mod/settings.php:968 msgid "" "When disabled, the network page is updated all the time, which could be " "confusing while reading." msgstr "" -#: mod/settings.php:964 +#: mod/settings.php:969 msgid "Bandwidth Saver Mode" msgstr "" -#: mod/settings.php:964 +#: mod/settings.php:969 msgid "" "When enabled, embedded content is not displayed on automatic updates, they " "only show on page reload." msgstr "" -#: mod/settings.php:965 +#: mod/settings.php:970 msgid "Smart Threading" msgstr "" -#: mod/settings.php:965 +#: mod/settings.php:970 msgid "" "When enabled, suppress extraneous thread indentation while keeping it where " "it matters. Only works if threading is available and enabled." msgstr "" -#: mod/settings.php:967 +#: mod/settings.php:972 msgid "General Theme Settings" msgstr "" -#: mod/settings.php:968 +#: mod/settings.php:973 msgid "Custom Theme Settings" msgstr "" -#: mod/settings.php:969 +#: mod/settings.php:974 msgid "Content Settings" msgstr "" -#: mod/settings.php:970 view/theme/duepuntozero/config.php:73 -#: view/theme/frio/config.php:122 view/theme/quattro/config.php:75 +#: mod/settings.php:975 view/theme/duepuntozero/config.php:73 +#: view/theme/frio/config.php:124 view/theme/quattro/config.php:75 #: view/theme/vier/config.php:121 msgid "Theme settings" msgstr "" -#: mod/settings.php:984 +#: mod/settings.php:989 msgid "Unable to find your profile. Please contact your admin." msgstr "" -#: mod/settings.php:1023 +#: mod/settings.php:1028 msgid "Account Types" msgstr "" -#: mod/settings.php:1024 +#: mod/settings.php:1029 msgid "Personal Page Subtypes" msgstr "" -#: mod/settings.php:1025 +#: mod/settings.php:1030 msgid "Community Forum Subtypes" msgstr "" -#: mod/settings.php:1032 src/Module/Admin/Users.php:229 +#: mod/settings.php:1037 src/Module/Admin/Users.php:229 msgid "Personal Page" msgstr "" -#: mod/settings.php:1033 +#: mod/settings.php:1038 msgid "Account for a personal profile." msgstr "" -#: mod/settings.php:1036 src/Module/Admin/Users.php:230 +#: mod/settings.php:1041 src/Module/Admin/Users.php:230 msgid "Organisation Page" msgstr "" -#: mod/settings.php:1037 +#: mod/settings.php:1042 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:1040 src/Module/Admin/Users.php:231 +#: mod/settings.php:1045 src/Module/Admin/Users.php:231 msgid "News Page" msgstr "" -#: mod/settings.php:1041 +#: mod/settings.php:1046 msgid "" "Account for a news reflector that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:1044 src/Module/Admin/Users.php:232 +#: mod/settings.php:1049 src/Module/Admin/Users.php:232 msgid "Community Forum" msgstr "" -#: mod/settings.php:1045 +#: mod/settings.php:1050 msgid "Account for community discussions." msgstr "" -#: mod/settings.php:1048 src/Module/Admin/Users.php:222 +#: mod/settings.php:1053 src/Module/Admin/Users.php:222 msgid "Normal Account Page" msgstr "" -#: mod/settings.php:1049 +#: mod/settings.php:1054 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "" -#: mod/settings.php:1052 src/Module/Admin/Users.php:223 +#: mod/settings.php:1057 src/Module/Admin/Users.php:223 msgid "Soapbox Page" msgstr "" -#: mod/settings.php:1053 +#: mod/settings.php:1058 msgid "" "Account for a public profile that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:1056 src/Module/Admin/Users.php:224 +#: mod/settings.php:1061 src/Module/Admin/Users.php:224 msgid "Public Forum" msgstr "" -#: mod/settings.php:1057 +#: mod/settings.php:1062 msgid "Automatically approves all contact requests." msgstr "" -#: mod/settings.php:1060 src/Module/Admin/Users.php:225 +#: mod/settings.php:1065 src/Module/Admin/Users.php:225 msgid "Automatic Friend Page" msgstr "" -#: mod/settings.php:1061 +#: mod/settings.php:1066 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "" -#: mod/settings.php:1064 +#: mod/settings.php:1069 msgid "Private Forum [Experimental]" msgstr "" -#: mod/settings.php:1065 +#: mod/settings.php:1070 msgid "Requires manual approval of contact requests." msgstr "" -#: mod/settings.php:1076 +#: mod/settings.php:1081 msgid "OpenID:" msgstr "" -#: mod/settings.php:1076 +#: mod/settings.php:1081 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: mod/settings.php:1084 +#: mod/settings.php:1089 msgid "Publish your default profile in your local site directory?" msgstr "" -#: mod/settings.php:1084 +#: mod/settings.php:1089 #, php-format msgid "" "Your profile will be published in this node's local " @@ -3641,313 +3659,313 @@ msgid "" "system settings." msgstr "" -#: mod/settings.php:1090 +#: mod/settings.php:1095 msgid "Publish your default profile in the global social directory?" msgstr "" -#: mod/settings.php:1090 +#: mod/settings.php:1095 #, php-format msgid "" "Your profile will be published in the global friendica directories (e.g. %s). Your profile will be visible in public." msgstr "" -#: mod/settings.php:1097 +#: mod/settings.php:1102 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: mod/settings.php:1097 +#: mod/settings.php:1102 msgid "" "Your contact list won't be shown in your default profile page. You can " "decide to show your contact list separately for each additional profile you " "create" msgstr "" -#: mod/settings.php:1101 +#: mod/settings.php:1106 msgid "Hide your profile details from anonymous viewers?" msgstr "" -#: mod/settings.php:1101 +#: mod/settings.php:1106 msgid "" "Anonymous visitors will only see your profile picture, your display name and " "the nickname you are using on your profile page. Your public posts and " "replies will still be accessible by other means." msgstr "" -#: mod/settings.php:1105 +#: mod/settings.php:1110 msgid "Allow friends to post to your profile page?" msgstr "" -#: mod/settings.php:1105 +#: mod/settings.php:1110 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "" -#: mod/settings.php:1109 +#: mod/settings.php:1114 msgid "Allow friends to tag your posts?" msgstr "" -#: mod/settings.php:1109 +#: mod/settings.php:1114 msgid "Your contacts can add additional tags to your posts." msgstr "" -#: mod/settings.php:1113 +#: mod/settings.php:1118 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: mod/settings.php:1113 +#: mod/settings.php:1118 msgid "If you like, Friendica may suggest new members to add you as a contact." msgstr "" -#: mod/settings.php:1117 +#: mod/settings.php:1122 msgid "Permit unknown people to send you private mail?" msgstr "" -#: mod/settings.php:1117 +#: mod/settings.php:1122 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "" -#: mod/settings.php:1121 +#: mod/settings.php:1126 msgid "Profile is not published." msgstr "" -#: mod/settings.php:1127 +#: mod/settings.php:1132 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "" -#: mod/settings.php:1134 +#: mod/settings.php:1139 msgid "Automatically expire posts after this many days:" msgstr "" -#: mod/settings.php:1134 +#: mod/settings.php:1139 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: mod/settings.php:1135 +#: mod/settings.php:1140 msgid "Advanced expiration settings" msgstr "" -#: mod/settings.php:1136 +#: mod/settings.php:1141 msgid "Advanced Expiration" msgstr "" -#: mod/settings.php:1137 +#: mod/settings.php:1142 msgid "Expire posts:" msgstr "" -#: mod/settings.php:1138 +#: mod/settings.php:1143 msgid "Expire personal notes:" msgstr "" -#: mod/settings.php:1139 +#: mod/settings.php:1144 msgid "Expire starred posts:" msgstr "" -#: mod/settings.php:1140 +#: mod/settings.php:1145 msgid "Expire photos:" msgstr "" -#: mod/settings.php:1141 +#: mod/settings.php:1146 msgid "Only expire posts by others:" msgstr "" -#: mod/settings.php:1171 +#: mod/settings.php:1176 msgid "Account Settings" msgstr "" -#: mod/settings.php:1179 +#: mod/settings.php:1184 msgid "Password Settings" msgstr "" -#: mod/settings.php:1180 src/Module/Register.php:130 +#: mod/settings.php:1185 src/Module/Register.php:130 msgid "New Password:" msgstr "" -#: mod/settings.php:1180 +#: mod/settings.php:1185 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "" -#: mod/settings.php:1181 src/Module/Register.php:131 +#: mod/settings.php:1186 src/Module/Register.php:131 msgid "Confirm:" msgstr "" -#: mod/settings.php:1181 +#: mod/settings.php:1186 msgid "Leave password fields blank unless changing" msgstr "" -#: mod/settings.php:1182 +#: mod/settings.php:1187 msgid "Current Password:" msgstr "" -#: mod/settings.php:1182 mod/settings.php:1183 +#: mod/settings.php:1187 mod/settings.php:1188 msgid "Your current password to confirm the changes" msgstr "" -#: mod/settings.php:1183 +#: mod/settings.php:1188 msgid "Password:" msgstr "" -#: mod/settings.php:1187 +#: mod/settings.php:1192 msgid "Basic Settings" msgstr "" -#: mod/settings.php:1188 src/Model/Profile.php:745 +#: mod/settings.php:1193 src/Model/Profile.php:727 msgid "Full Name:" msgstr "" -#: mod/settings.php:1189 +#: mod/settings.php:1194 msgid "Email Address:" msgstr "" -#: mod/settings.php:1190 +#: mod/settings.php:1195 msgid "Your Timezone:" msgstr "" -#: mod/settings.php:1191 +#: mod/settings.php:1196 msgid "Your Language:" msgstr "" -#: mod/settings.php:1191 +#: mod/settings.php:1196 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "" -#: mod/settings.php:1192 +#: mod/settings.php:1197 msgid "Default Post Location:" msgstr "" -#: mod/settings.php:1193 +#: mod/settings.php:1198 msgid "Use Browser Location:" msgstr "" -#: mod/settings.php:1196 +#: mod/settings.php:1201 msgid "Security and Privacy Settings" msgstr "" -#: mod/settings.php:1198 +#: mod/settings.php:1203 msgid "Maximum Friend Requests/Day:" msgstr "" -#: mod/settings.php:1198 mod/settings.php:1227 +#: mod/settings.php:1203 mod/settings.php:1232 msgid "(to prevent spam abuse)" msgstr "" -#: mod/settings.php:1199 +#: mod/settings.php:1204 msgid "Default Post Permissions" msgstr "" -#: mod/settings.php:1200 +#: mod/settings.php:1205 msgid "(click to open/close)" msgstr "" -#: mod/settings.php:1210 +#: mod/settings.php:1215 msgid "Default Private Post" msgstr "" -#: mod/settings.php:1211 +#: mod/settings.php:1216 msgid "Default Public Post" msgstr "" -#: mod/settings.php:1215 +#: mod/settings.php:1220 msgid "Default Permissions for New Posts" msgstr "" -#: mod/settings.php:1227 +#: mod/settings.php:1232 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: mod/settings.php:1230 +#: mod/settings.php:1235 msgid "Notification Settings" msgstr "" -#: mod/settings.php:1231 +#: mod/settings.php:1236 msgid "Send a notification email when:" msgstr "" -#: mod/settings.php:1232 +#: mod/settings.php:1237 msgid "You receive an introduction" msgstr "" -#: mod/settings.php:1233 +#: mod/settings.php:1238 msgid "Your introductions are confirmed" msgstr "" -#: mod/settings.php:1234 +#: mod/settings.php:1239 msgid "Someone writes on your profile wall" msgstr "" -#: mod/settings.php:1235 +#: mod/settings.php:1240 msgid "Someone writes a followup comment" msgstr "" -#: mod/settings.php:1236 +#: mod/settings.php:1241 msgid "You receive a private message" msgstr "" -#: mod/settings.php:1237 +#: mod/settings.php:1242 msgid "You receive a friend suggestion" msgstr "" -#: mod/settings.php:1238 +#: mod/settings.php:1243 msgid "You are tagged in a post" msgstr "" -#: mod/settings.php:1239 +#: mod/settings.php:1244 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: mod/settings.php:1241 +#: mod/settings.php:1246 msgid "Activate desktop notifications" msgstr "" -#: mod/settings.php:1241 +#: mod/settings.php:1246 msgid "Show desktop popup on new notifications" msgstr "" -#: mod/settings.php:1243 +#: mod/settings.php:1248 msgid "Text-only notification emails" msgstr "" -#: mod/settings.php:1245 +#: mod/settings.php:1250 msgid "Send text only notification emails, without the html part" msgstr "" -#: mod/settings.php:1247 +#: mod/settings.php:1252 msgid "Show detailled notifications" msgstr "" -#: mod/settings.php:1249 +#: mod/settings.php:1254 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "" -#: mod/settings.php:1251 +#: mod/settings.php:1256 msgid "Advanced Account/Page Type Settings" msgstr "" -#: mod/settings.php:1252 +#: mod/settings.php:1257 msgid "Change the behaviour of this account for special situations" msgstr "" -#: mod/settings.php:1255 +#: mod/settings.php:1260 msgid "Relocate" msgstr "" -#: mod/settings.php:1256 +#: mod/settings.php:1261 msgid "" "If you have moved this profile from another server, and some of your " "contacts don't receive your updates, try pushing this button." msgstr "" -#: mod/settings.php:1257 +#: mod/settings.php:1262 msgid "Resend relocate message to contacts" msgstr "" @@ -4068,7 +4086,7 @@ msgstr "" msgid "Contact unfollowed" msgstr "" -#: mod/unfollow.php:118 src/Module/Contact.php:566 +#: mod/unfollow.php:118 msgid "Disconnect/Unfollow" msgstr "" @@ -4082,7 +4100,7 @@ msgstr "" msgid "No videos selected" msgstr "" -#: mod/videos.php:280 src/Model/Item.php:3422 +#: mod/videos.php:280 src/Model/Item.php:3436 msgid "View Video" msgstr "" @@ -4141,19 +4159,19 @@ msgstr "" msgid "Wall Photos" msgstr "" -#: src/App.php:505 +#: src/App.php:532 msgid "Delete this item?" msgstr "" -#: src/App.php:547 +#: src/App.php:574 msgid "toggle mobile" msgstr "" -#: src/App.php:863 +#: src/App.php:890 msgid "No system theme config value set." msgstr "" -#: src/App.php:1163 +#: src/App.php:1178 msgid "You must be logged in to use addons. " msgstr "" @@ -4412,118 +4430,114 @@ msgid "Lonely" msgstr "" #: src/Content/ContactSelector.php:234 -msgid "Available" +msgid "In a relation" msgstr "" #: src/Content/ContactSelector.php:235 -msgid "Unavailable" -msgstr "" - -#: src/Content/ContactSelector.php:236 msgid "Has crush" msgstr "" -#: src/Content/ContactSelector.php:237 +#: src/Content/ContactSelector.php:236 msgid "Infatuated" msgstr "" -#: src/Content/ContactSelector.php:238 +#: src/Content/ContactSelector.php:237 msgid "Dating" msgstr "" -#: src/Content/ContactSelector.php:239 +#: src/Content/ContactSelector.php:238 msgid "Unfaithful" msgstr "" -#: src/Content/ContactSelector.php:240 +#: src/Content/ContactSelector.php:239 msgid "Sex Addict" msgstr "" -#: src/Content/ContactSelector.php:241 src/Model/User.php:729 +#: src/Content/ContactSelector.php:240 src/Model/User.php:762 msgid "Friends" msgstr "" -#: src/Content/ContactSelector.php:242 +#: src/Content/ContactSelector.php:241 msgid "Friends/Benefits" msgstr "" -#: src/Content/ContactSelector.php:243 +#: src/Content/ContactSelector.php:242 msgid "Casual" msgstr "" -#: src/Content/ContactSelector.php:244 +#: src/Content/ContactSelector.php:243 msgid "Engaged" msgstr "" -#: src/Content/ContactSelector.php:245 +#: src/Content/ContactSelector.php:244 msgid "Married" msgstr "" -#: src/Content/ContactSelector.php:246 +#: src/Content/ContactSelector.php:245 msgid "Imaginarily married" msgstr "" -#: src/Content/ContactSelector.php:247 +#: src/Content/ContactSelector.php:246 msgid "Partners" msgstr "" -#: src/Content/ContactSelector.php:248 +#: src/Content/ContactSelector.php:247 msgid "Cohabiting" msgstr "" -#: src/Content/ContactSelector.php:249 +#: src/Content/ContactSelector.php:248 msgid "Common law" msgstr "" -#: src/Content/ContactSelector.php:250 +#: src/Content/ContactSelector.php:249 msgid "Happy" msgstr "" -#: src/Content/ContactSelector.php:251 +#: src/Content/ContactSelector.php:250 msgid "Not looking" msgstr "" -#: src/Content/ContactSelector.php:252 +#: src/Content/ContactSelector.php:251 msgid "Swinger" msgstr "" -#: src/Content/ContactSelector.php:253 +#: src/Content/ContactSelector.php:252 msgid "Betrayed" msgstr "" -#: src/Content/ContactSelector.php:254 +#: src/Content/ContactSelector.php:253 msgid "Separated" msgstr "" -#: src/Content/ContactSelector.php:255 +#: src/Content/ContactSelector.php:254 msgid "Unstable" msgstr "" -#: src/Content/ContactSelector.php:256 +#: src/Content/ContactSelector.php:255 msgid "Divorced" msgstr "" -#: src/Content/ContactSelector.php:257 +#: src/Content/ContactSelector.php:256 msgid "Imaginarily divorced" msgstr "" -#: src/Content/ContactSelector.php:258 +#: src/Content/ContactSelector.php:257 msgid "Widowed" msgstr "" -#: src/Content/ContactSelector.php:259 +#: src/Content/ContactSelector.php:258 msgid "Uncertain" msgstr "" -#: src/Content/ContactSelector.php:260 +#: src/Content/ContactSelector.php:259 msgid "It's complicated" msgstr "" -#: src/Content/ContactSelector.php:261 +#: src/Content/ContactSelector.php:260 msgid "Don't care" msgstr "" -#: src/Content/ContactSelector.php:262 +#: src/Content/ContactSelector.php:261 msgid "Ask me" msgstr "" @@ -4584,7 +4598,7 @@ msgstr "" msgid "Network Sidebar" msgstr "" -#: src/Content/Feature.php:99 src/Content/Widget.php:497 +#: src/Content/Feature.php:99 src/Content/Widget.php:501 msgid "Archives" msgstr "" @@ -4660,8 +4674,8 @@ msgstr "" msgid "Display membership date in profile" msgstr "" -#: src/Content/ForumManager.php:130 src/Content/Nav.php:206 -#: src/Content/Text/HTML.php:914 view/theme/vier/theme.php:250 +#: src/Content/ForumManager.php:130 src/Content/Nav.php:209 +#: src/Content/Text/HTML.php:894 view/theme/vier/theme.php:250 msgid "Forums" msgstr "" @@ -4669,262 +4683,262 @@ msgstr "" msgid "External link to forum" msgstr "" -#: src/Content/ForumManager.php:135 src/Content/Widget.php:405 -#: src/Content/Widget.php:503 view/theme/vier/theme.php:255 +#: src/Content/ForumManager.php:135 src/Content/Widget.php:407 +#: src/Content/Widget.php:507 view/theme/vier/theme.php:255 msgid "show more" msgstr "" -#: src/Content/Nav.php:73 +#: src/Content/Nav.php:74 msgid "Nothing new here" msgstr "" -#: src/Content/Nav.php:77 +#: src/Content/Nav.php:78 msgid "Clear notifications" msgstr "" -#: src/Content/Nav.php:78 src/Content/Text/HTML.php:903 +#: src/Content/Nav.php:79 src/Content/Text/HTML.php:883 msgid "@name, !forum, #tags, content" msgstr "" -#: src/Content/Nav.php:152 src/Module/Login.php:324 -#: view/theme/frio/theme.php:259 +#: src/Content/Nav.php:153 src/Module/Login.php:315 msgid "Logout" msgstr "" -#: src/Content/Nav.php:152 view/theme/frio/theme.php:259 +#: src/Content/Nav.php:153 msgid "End this session" msgstr "" -#: src/Content/Nav.php:155 src/Model/Profile.php:898 src/Module/Contact.php:648 -#: src/Module/Contact.php:850 src/Module/Settings/TwoFactor/Index.php:85 -#: view/theme/frio/theme.php:262 -msgid "Status" -msgstr "" - -#: src/Content/Nav.php:155 src/Content/Nav.php:241 -#: view/theme/frio/theme.php:262 -msgid "Your posts and conversations" -msgstr "" - -#: src/Content/Nav.php:156 view/theme/frio/theme.php:263 -msgid "Your profile page" -msgstr "" - -#: src/Content/Nav.php:157 view/theme/frio/theme.php:264 -msgid "Your photos" -msgstr "" - -#: src/Content/Nav.php:158 src/Model/Profile.php:922 src/Model/Profile.php:925 -#: view/theme/frio/theme.php:265 -msgid "Videos" -msgstr "" - -#: src/Content/Nav.php:158 view/theme/frio/theme.php:265 -msgid "Your videos" -msgstr "" - -#: src/Content/Nav.php:159 view/theme/frio/theme.php:266 -msgid "Your events" -msgstr "" - -#: src/Content/Nav.php:160 -msgid "Personal notes" -msgstr "" - -#: src/Content/Nav.php:160 -msgid "Your personal notes" -msgstr "" - -#: src/Content/Nav.php:169 src/Module/Bookmarklet.php:25 -#: src/Module/Login.php:325 +#: src/Content/Nav.php:155 src/Module/Bookmarklet.php:25 +#: src/Module/Login.php:316 msgid "Login" msgstr "" -#: src/Content/Nav.php:169 +#: src/Content/Nav.php:155 msgid "Sign in" msgstr "" -#: src/Content/Nav.php:179 src/Content/Nav.php:241 +#: src/Content/Nav.php:160 src/Model/Profile.php:880 src/Module/Contact.php:654 +#: src/Module/Contact.php:856 src/Module/Settings/TwoFactor/Index.php:91 +#: view/theme/frio/theme.php:259 +msgid "Status" +msgstr "" + +#: src/Content/Nav.php:160 src/Content/Nav.php:244 +#: view/theme/frio/theme.php:259 +msgid "Your posts and conversations" +msgstr "" + +#: src/Content/Nav.php:161 view/theme/frio/theme.php:260 +msgid "Your profile page" +msgstr "" + +#: src/Content/Nav.php:162 view/theme/frio/theme.php:261 +msgid "Your photos" +msgstr "" + +#: src/Content/Nav.php:163 src/Model/Profile.php:904 src/Model/Profile.php:907 +#: view/theme/frio/theme.php:262 +msgid "Videos" +msgstr "" + +#: src/Content/Nav.php:163 view/theme/frio/theme.php:262 +msgid "Your videos" +msgstr "" + +#: src/Content/Nav.php:164 view/theme/frio/theme.php:263 +msgid "Your events" +msgstr "" + +#: src/Content/Nav.php:165 +msgid "Personal notes" +msgstr "" + +#: src/Content/Nav.php:165 +msgid "Your personal notes" +msgstr "" + +#: src/Content/Nav.php:182 src/Content/Nav.php:244 #: src/Core/NotificationsManager.php:165 msgid "Home" msgstr "" -#: src/Content/Nav.php:179 +#: src/Content/Nav.php:182 msgid "Home Page" msgstr "" -#: src/Content/Nav.php:183 src/Module/Login.php:296 src/Module/Register.php:136 +#: src/Content/Nav.php:186 src/Module/Login.php:287 src/Module/Register.php:136 msgid "Register" msgstr "" -#: src/Content/Nav.php:183 +#: src/Content/Nav.php:186 msgid "Create an account" msgstr "" -#: src/Content/Nav.php:189 src/Module/Help.php:50 -#: src/Module/Settings/TwoFactor/Index.php:84 +#: src/Content/Nav.php:192 src/Module/Help.php:50 +#: src/Module/Settings/TwoFactor/AppSpecific.php:99 +#: src/Module/Settings/TwoFactor/Index.php:90 #: src/Module/Settings/TwoFactor/Recovery.php:77 #: src/Module/Settings/TwoFactor/Verify.php:117 view/theme/vier/theme.php:294 msgid "Help" msgstr "" -#: src/Content/Nav.php:189 +#: src/Content/Nav.php:192 msgid "Help and documentation" msgstr "" -#: src/Content/Nav.php:193 +#: src/Content/Nav.php:196 msgid "Apps" msgstr "" -#: src/Content/Nav.php:193 +#: src/Content/Nav.php:196 msgid "Addon applications, utilities, games" msgstr "" -#: src/Content/Nav.php:197 +#: src/Content/Nav.php:200 msgid "Search site content" msgstr "" -#: src/Content/Nav.php:200 src/Content/Text/HTML.php:909 +#: src/Content/Nav.php:203 src/Content/Text/HTML.php:889 msgid "Full Text" msgstr "" -#: src/Content/Nav.php:201 src/Content/Text/HTML.php:910 +#: src/Content/Nav.php:204 src/Content/Text/HTML.php:890 #: src/Content/Widget/TagCloud.php:54 msgid "Tags" msgstr "" -#: src/Content/Nav.php:202 src/Content/Nav.php:268 -#: src/Content/Text/HTML.php:911 src/Model/Profile.php:977 -#: src/Model/Profile.php:980 src/Module/Contact.php:794 -#: src/Module/Contact.php:878 view/theme/frio/theme.php:273 +#: src/Content/Nav.php:205 src/Content/Nav.php:271 +#: src/Content/Text/HTML.php:891 src/Model/Profile.php:959 +#: src/Model/Profile.php:962 src/Module/Contact.php:800 +#: src/Module/Contact.php:884 view/theme/frio/theme.php:270 msgid "Contacts" msgstr "" -#: src/Content/Nav.php:221 +#: src/Content/Nav.php:224 msgid "Community" msgstr "" -#: src/Content/Nav.php:221 +#: src/Content/Nav.php:224 msgid "Conversations on this and other servers" msgstr "" -#: src/Content/Nav.php:225 src/Model/Profile.php:937 src/Model/Profile.php:948 -#: view/theme/frio/theme.php:270 +#: src/Content/Nav.php:228 src/Model/Profile.php:919 src/Model/Profile.php:930 +#: view/theme/frio/theme.php:267 msgid "Events and Calendar" msgstr "" -#: src/Content/Nav.php:228 +#: src/Content/Nav.php:231 msgid "Directory" msgstr "" -#: src/Content/Nav.php:228 +#: src/Content/Nav.php:231 msgid "People directory" msgstr "" -#: src/Content/Nav.php:230 src/Module/BaseAdminModule.php:75 +#: src/Content/Nav.php:233 src/Module/BaseAdminModule.php:75 msgid "Information" msgstr "" -#: src/Content/Nav.php:230 +#: src/Content/Nav.php:233 msgid "Information about this friendica instance" msgstr "" -#: src/Content/Nav.php:233 src/Module/Admin/Tos.php:43 +#: src/Content/Nav.php:236 src/Module/Admin/Tos.php:43 #: src/Module/BaseAdminModule.php:85 src/Module/Register.php:144 #: src/Module/Tos.php:73 msgid "Terms of Service" msgstr "" -#: src/Content/Nav.php:233 +#: src/Content/Nav.php:236 msgid "Terms of Service of this Friendica instance" msgstr "" -#: src/Content/Nav.php:238 src/Core/NotificationsManager.php:151 -#: view/theme/frio/theme.php:269 +#: src/Content/Nav.php:241 src/Core/NotificationsManager.php:151 +#: view/theme/frio/theme.php:266 msgid "Network" msgstr "" -#: src/Content/Nav.php:238 view/theme/frio/theme.php:269 +#: src/Content/Nav.php:241 view/theme/frio/theme.php:266 msgid "Conversations from your friends" msgstr "" -#: src/Content/Nav.php:239 +#: src/Content/Nav.php:242 msgid "Network Reset" msgstr "" -#: src/Content/Nav.php:239 +#: src/Content/Nav.php:242 msgid "Load Network page with no filters" msgstr "" -#: src/Content/Nav.php:245 src/Core/NotificationsManager.php:172 +#: src/Content/Nav.php:248 src/Core/NotificationsManager.php:172 msgid "Introductions" msgstr "" -#: src/Content/Nav.php:245 +#: src/Content/Nav.php:248 msgid "Friend Requests" msgstr "" -#: src/Content/Nav.php:247 +#: src/Content/Nav.php:250 msgid "See all notifications" msgstr "" -#: src/Content/Nav.php:248 +#: src/Content/Nav.php:251 msgid "Mark all system notifications seen" msgstr "" -#: src/Content/Nav.php:251 view/theme/frio/theme.php:271 +#: src/Content/Nav.php:254 view/theme/frio/theme.php:268 msgid "Private mail" msgstr "" -#: src/Content/Nav.php:252 +#: src/Content/Nav.php:255 msgid "Inbox" msgstr "" -#: src/Content/Nav.php:253 +#: src/Content/Nav.php:256 msgid "Outbox" msgstr "" -#: src/Content/Nav.php:257 +#: src/Content/Nav.php:260 msgid "Manage" msgstr "" -#: src/Content/Nav.php:257 +#: src/Content/Nav.php:260 msgid "Manage other pages" msgstr "" -#: src/Content/Nav.php:262 view/theme/frio/theme.php:272 +#: src/Content/Nav.php:265 view/theme/frio/theme.php:269 msgid "Account settings" msgstr "" -#: src/Content/Nav.php:265 +#: src/Content/Nav.php:268 msgid "Manage/Edit Profiles" msgstr "" -#: src/Content/Nav.php:268 view/theme/frio/theme.php:273 +#: src/Content/Nav.php:271 view/theme/frio/theme.php:270 msgid "Manage/edit friends and contacts" msgstr "" -#: src/Content/Nav.php:273 src/Module/BaseAdminModule.php:114 +#: src/Content/Nav.php:276 src/Module/BaseAdminModule.php:114 msgid "Admin" msgstr "" -#: src/Content/Nav.php:273 +#: src/Content/Nav.php:276 msgid "Site setup and configuration" msgstr "" -#: src/Content/Nav.php:276 +#: src/Content/Nav.php:279 msgid "Navigation" msgstr "" -#: src/Content/Nav.php:276 +#: src/Content/Nav.php:279 msgid "Site map" msgstr "" -#: src/Content/OEmbed.php:255 +#: src/Content/OEmbed.php:254 msgid "Embedding disabled" msgstr "" -#: src/Content/OEmbed.php:378 +#: src/Content/OEmbed.php:377 msgid "Embedded content" msgstr "" @@ -4944,50 +4958,51 @@ msgstr "" msgid "last" msgstr "" -#: src/Content/Text/BBCode.php:430 +#: src/Content/Text/BBCode.php:432 msgid "view full size" msgstr "" -#: src/Content/Text/BBCode.php:864 src/Content/Text/BBCode.php:1591 -#: src/Content/Text/BBCode.php:1592 +#: src/Content/Text/BBCode.php:866 src/Content/Text/BBCode.php:1499 +#: src/Content/Text/BBCode.php:1500 msgid "Image/photo" msgstr "" -#: src/Content/Text/BBCode.php:972 +#: src/Content/Text/BBCode.php:984 #, php-format msgid "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:1518 src/Content/Text/BBCode.php:1540 +#: src/Content/Text/BBCode.php:1426 src/Content/Text/BBCode.php:1448 msgid "$1 wrote:" msgstr "" -#: src/Content/Text/BBCode.php:1602 src/Content/Text/BBCode.php:1603 +#: src/Content/Text/BBCode.php:1502 src/Content/Text/BBCode.php:1503 msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:1710 +#: src/Content/Text/BBCode.php:1724 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:1721 +#: src/Content/Text/BBCode.php:1735 msgid "Invalid link protocol" msgstr "" -#: src/Content/Text/HTML.php:800 +#: src/Content/Text/HTML.php:780 msgid "Loading more entries..." msgstr "" -#: src/Content/Text/HTML.php:801 +#: src/Content/Text/HTML.php:781 msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:894 +#: src/Content/Text/HTML.php:874 src/Model/Profile.php:507 +#: src/Module/Contact.php:335 msgid "Follow" msgstr "" -#: src/Content/Text/HTML.php:951 src/Model/Item.php:3472 -#: src/Model/Item.php:3483 +#: src/Content/Text/HTML.php:931 src/Model/Item.php:3486 +#: src/Model/Item.php:3497 msgid "Click to open/close" msgstr "" @@ -5049,8 +5064,8 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: src/Content/Widget.php:68 src/Module/Contact.php:814 -#: src/Module/Directory.php:91 view/theme/vier/theme.php:203 +#: src/Content/Widget.php:68 src/Module/Contact.php:820 +#: src/Module/Directory.php:86 view/theme/vier/theme.php:203 msgid "Find" msgstr "" @@ -5066,7 +5081,7 @@ msgstr "" msgid "Invite Friends" msgstr "" -#: src/Content/Widget.php:73 src/Module/Directory.php:83 +#: src/Content/Widget.php:73 src/Module/Directory.php:78 #: view/theme/vier/theme.php:208 msgid "Global Directory" msgstr "" @@ -5075,17 +5090,17 @@ msgstr "" msgid "Local Directory" msgstr "" -#: src/Content/Widget.php:192 src/Module/Contact.php:791 +#: src/Content/Widget.php:192 src/Module/Contact.php:797 #: src/Module/Profile/Contacts.php:126 msgid "Followers" msgstr "" -#: src/Content/Widget.php:193 src/Module/Contact.php:792 +#: src/Content/Widget.php:193 src/Module/Contact.php:798 #: src/Module/Profile/Contacts.php:127 msgid "Following" msgstr "" -#: src/Content/Widget.php:194 src/Module/Contact.php:793 +#: src/Content/Widget.php:194 src/Module/Contact.php:799 #: src/Module/Profile/Contacts.php:128 msgid "Mutual friends" msgstr "" @@ -5094,7 +5109,7 @@ msgstr "" msgid "Relationships" msgstr "" -#: src/Content/Widget.php:201 src/Module/Contact.php:688 +#: src/Content/Widget.php:201 src/Module/Contact.php:694 #: src/Module/Group.php:287 msgid "All Contacts" msgstr "" @@ -5111,15 +5126,15 @@ msgstr "" msgid "Saved Folders" msgstr "" -#: src/Content/Widget.php:281 src/Content/Widget.php:318 +#: src/Content/Widget.php:281 src/Content/Widget.php:320 msgid "Everything" msgstr "" -#: src/Content/Widget.php:316 +#: src/Content/Widget.php:318 msgid "Categories" msgstr "" -#: src/Content/Widget.php:400 +#: src/Content/Widget.php:402 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" @@ -5172,8 +5187,8 @@ msgid "" "or mysql." msgstr "" -#: src/Core/Installer.php:184 src/Module/Install.php:172 -#: src/Module/Install.php:328 +#: src/Core/Installer.php:184 src/Module/Install.php:174 +#: src/Module/Install.php:330 msgid "Please see the file \"INSTALL.txt\"." msgstr "" @@ -5418,200 +5433,205 @@ msgstr "" msgid "ImageMagick PHP extension is installed" msgstr "" -#: src/Core/Installer.php:584 tests/src/Core/InstallerTest.php:347 -#: tests/src/Core/InstallerTest.php:373 +#: src/Core/Installer.php:584 tests/src/Core/InstallerTest.php:361 +#: tests/src/Core/InstallerTest.php:389 msgid "ImageMagick supports GIF" msgstr "" -#: src/Core/Installer.php:609 -msgid "Could not connect to database." -msgstr "" - -#: src/Core/Installer.php:616 +#: src/Core/Installer.php:607 msgid "Database already in use." msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:397 +#: src/Core/Installer.php:612 +msgid "Could not connect to database." +msgstr "" + +#: src/Core/L10n/L10n.php:372 src/Model/Event.php:397 msgid "Tuesday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:398 +#: src/Core/L10n/L10n.php:372 src/Model/Event.php:398 msgid "Wednesday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:399 +#: src/Core/L10n/L10n.php:372 src/Model/Event.php:399 msgid "Thursday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:400 +#: src/Core/L10n/L10n.php:372 src/Model/Event.php:400 msgid "Friday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:401 +#: src/Core/L10n/L10n.php:372 src/Model/Event.php:401 msgid "Saturday" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:416 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:416 msgid "January" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:417 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:417 msgid "February" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:418 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:418 msgid "March" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:419 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:419 msgid "April" msgstr "" -#: src/Core/L10n.php:375 src/Core/L10n.php:394 src/Model/Event.php:407 +#: src/Core/L10n/L10n.php:376 src/Core/L10n/L10n.php:396 +#: src/Model/Event.php:407 msgid "May" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:420 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:420 msgid "June" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:421 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:421 msgid "July" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:422 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:422 msgid "August" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:423 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:423 msgid "September" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:424 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:424 msgid "October" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:425 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:425 msgid "November" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:426 +#: src/Core/L10n/L10n.php:376 src/Model/Event.php:426 msgid "December" msgstr "" -#: src/Core/L10n.php:390 src/Model/Event.php:388 +#: src/Core/L10n/L10n.php:392 src/Model/Event.php:388 msgid "Mon" msgstr "" -#: src/Core/L10n.php:390 src/Model/Event.php:389 +#: src/Core/L10n/L10n.php:392 src/Model/Event.php:389 msgid "Tue" msgstr "" -#: src/Core/L10n.php:390 src/Model/Event.php:390 +#: src/Core/L10n/L10n.php:392 src/Model/Event.php:390 msgid "Wed" msgstr "" -#: src/Core/L10n.php:390 src/Model/Event.php:391 +#: src/Core/L10n/L10n.php:392 src/Model/Event.php:391 msgid "Thu" msgstr "" -#: src/Core/L10n.php:390 src/Model/Event.php:392 +#: src/Core/L10n/L10n.php:392 src/Model/Event.php:392 msgid "Fri" msgstr "" -#: src/Core/L10n.php:390 src/Model/Event.php:393 +#: src/Core/L10n/L10n.php:392 src/Model/Event.php:393 msgid "Sat" msgstr "" -#: src/Core/L10n.php:390 src/Model/Event.php:387 +#: src/Core/L10n/L10n.php:392 src/Model/Event.php:387 msgid "Sun" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:403 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:403 msgid "Jan" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:404 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:404 msgid "Feb" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:405 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:405 msgid "Mar" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:406 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:406 msgid "Apr" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:409 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:408 +msgid "Jun" +msgstr "" + +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:409 msgid "Jul" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:410 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:410 msgid "Aug" msgstr "" -#: src/Core/L10n.php:394 +#: src/Core/L10n/L10n.php:396 msgid "Sep" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:412 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:412 msgid "Oct" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:413 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:413 msgid "Nov" msgstr "" -#: src/Core/L10n.php:394 src/Model/Event.php:414 +#: src/Core/L10n/L10n.php:396 src/Model/Event.php:414 msgid "Dec" msgstr "" -#: src/Core/L10n.php:413 +#: src/Core/L10n/L10n.php:415 msgid "poke" msgstr "" -#: src/Core/L10n.php:413 +#: src/Core/L10n/L10n.php:415 msgid "poked" msgstr "" -#: src/Core/L10n.php:414 +#: src/Core/L10n/L10n.php:416 msgid "ping" msgstr "" -#: src/Core/L10n.php:414 +#: src/Core/L10n/L10n.php:416 msgid "pinged" msgstr "" -#: src/Core/L10n.php:415 +#: src/Core/L10n/L10n.php:417 msgid "prod" msgstr "" -#: src/Core/L10n.php:415 +#: src/Core/L10n/L10n.php:417 msgid "prodded" msgstr "" -#: src/Core/L10n.php:416 +#: src/Core/L10n/L10n.php:418 msgid "slap" msgstr "" -#: src/Core/L10n.php:416 +#: src/Core/L10n/L10n.php:418 msgid "slapped" msgstr "" -#: src/Core/L10n.php:417 +#: src/Core/L10n/L10n.php:419 msgid "finger" msgstr "" -#: src/Core/L10n.php:417 +#: src/Core/L10n/L10n.php:419 msgid "fingered" msgstr "" -#: src/Core/L10n.php:418 +#: src/Core/L10n/L10n.php:420 msgid "rebuff" msgstr "" -#: src/Core/L10n.php:418 +#: src/Core/L10n/L10n.php:420 msgid "rebuffed" msgstr "" @@ -5671,16 +5691,16 @@ msgstr "" msgid "New Follower" msgstr "" -#: src/Core/Session.php:194 +#: src/Core/Session.php:188 #, php-format msgid "Welcome %s" msgstr "" -#: src/Core/Session.php:195 +#: src/Core/Session.php:189 msgid "Please upload a profile photo." msgstr "" -#: src/Core/Session.php:198 +#: src/Core/Session.php:192 #, php-format msgid "Welcome back %s" msgstr "" @@ -5720,35 +5740,35 @@ msgid "" "\t\t\t\t\tThe friendica database was successfully updated from %s to %s." msgstr "" -#: src/Core/UserImport.php:106 +#: src/Core/UserImport.php:107 msgid "Error decoding account file" msgstr "" -#: src/Core/UserImport.php:112 +#: src/Core/UserImport.php:113 msgid "Error! No version data in file! This is not a Friendica account file?" msgstr "" -#: src/Core/UserImport.php:120 +#: src/Core/UserImport.php:121 #, php-format msgid "User '%s' already exists on this server!" msgstr "" -#: src/Core/UserImport.php:156 +#: src/Core/UserImport.php:157 msgid "User creation error" msgstr "" -#: src/Core/UserImport.php:174 +#: src/Core/UserImport.php:175 msgid "User profile creation error" msgstr "" -#: src/Core/UserImport.php:218 +#: src/Core/UserImport.php:219 #, php-format msgid "%d contact not imported" msgid_plural "%d contacts not imported" msgstr[0] "" msgstr[1] "" -#: src/Core/UserImport.php:283 +#: src/Core/UserImport.php:284 msgid "Done. You can now login with your username and password" msgstr "" @@ -5783,76 +5803,76 @@ msgstr "" msgid "Legacy module file not found: %s" msgstr "" -#: src/Model/Contact.php:1116 +#: src/Model/Contact.php:1205 msgid "Drop Contact" msgstr "" -#: src/Model/Contact.php:1651 +#: src/Model/Contact.php:1707 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1655 +#: src/Model/Contact.php:1711 msgid "News" msgstr "" -#: src/Model/Contact.php:1659 +#: src/Model/Contact.php:1715 msgid "Forum" msgstr "" -#: src/Model/Contact.php:1888 +#: src/Model/Contact.php:2111 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:1897 +#: src/Model/Contact.php:2120 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:1938 +#: src/Model/Contact.php:2161 msgid "" "This site is not configured to allow communications with other networks." msgstr "" -#: src/Model/Contact.php:1939 src/Model/Contact.php:1952 +#: src/Model/Contact.php:2162 src/Model/Contact.php:2175 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:1950 +#: src/Model/Contact.php:2173 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:1955 +#: src/Model/Contact.php:2178 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:1958 +#: src/Model/Contact.php:2181 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:1961 +#: src/Model/Contact.php:2184 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:1962 +#: src/Model/Contact.php:2185 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:1968 +#: src/Model/Contact.php:2191 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:1973 +#: src/Model/Contact.php:2196 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:2027 +#: src/Model/Contact.php:2251 msgid "Unable to retrieve contact information." msgstr "" @@ -5875,10 +5895,6 @@ msgstr "" msgid "all-day" msgstr "" -#: src/Model/Event.php:408 -msgid "Jun" -msgstr "" - #: src/Model/Event.php:411 msgid "Sept" msgstr "" @@ -5903,7 +5919,7 @@ msgstr "" msgid "Delete event" msgstr "" -#: src/Model/Event.php:626 src/Model/Item.php:3523 src/Model/Item.php:3530 +#: src/Model/Event.php:626 src/Model/Item.php:3537 src/Model/Item.php:3544 msgid "link to source" msgstr "" @@ -5956,7 +5972,7 @@ msgstr "" msgid "edit" msgstr "" -#: src/Model/Group.php:435 src/Module/Contact.php:728 src/Module/Welcome.php:57 +#: src/Model/Group.php:435 src/Module/Contact.php:734 src/Module/Welcome.php:57 msgid "Groups" msgstr "" @@ -5981,182 +5997,186 @@ msgstr "" msgid "Edit groups" msgstr "" -#: src/Model/Item.php:3258 +#: src/Model/Item.php:3272 msgid "activity" msgstr "" -#: src/Model/Item.php:3260 src/Object/Post.php:472 +#: src/Model/Item.php:3274 src/Object/Post.php:473 msgid "comment" msgid_plural "comments" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3263 +#: src/Model/Item.php:3277 msgid "post" msgstr "" -#: src/Model/Item.php:3362 +#: src/Model/Item.php:3376 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3439 +#: src/Model/Item.php:3453 msgid "bytes" msgstr "" -#: src/Model/Item.php:3517 +#: src/Model/Item.php:3531 msgid "View on separate page" msgstr "" -#: src/Model/Item.php:3518 +#: src/Model/Item.php:3532 msgid "view on separate page" msgstr "" -#: src/Model/Mail.php:109 src/Model/Mail.php:244 +#: src/Model/Mail.php:112 src/Model/Mail.php:247 msgid "[no subject]" msgstr "" -#: src/Model/Profile.php:177 src/Model/Profile.php:421 -#: src/Model/Profile.php:866 +#: src/Model/Profile.php:183 src/Model/Profile.php:399 +#: src/Model/Profile.php:848 msgid "Edit profile" msgstr "" -#: src/Model/Profile.php:355 -msgid "Atom feed" -msgstr "" - -#: src/Model/Profile.php:394 +#: src/Model/Profile.php:373 msgid "Manage/edit profiles" msgstr "" -#: src/Model/Profile.php:443 src/Model/Profile.php:776 -#: src/Module/Directory.php:148 +#: src/Model/Profile.php:422 src/Model/Profile.php:758 +#: src/Module/Directory.php:143 msgid "Status:" msgstr "" -#: src/Model/Profile.php:444 src/Model/Profile.php:793 -#: src/Module/Directory.php:149 +#: src/Model/Profile.php:423 src/Model/Profile.php:775 +#: src/Module/Directory.php:144 msgid "Homepage:" msgstr "" -#: src/Model/Profile.php:446 src/Module/Contact.php:641 +#: src/Model/Profile.php:425 src/Module/Contact.php:647 msgid "XMPP:" msgstr "" -#: src/Model/Profile.php:569 src/Model/Profile.php:666 +#: src/Model/Profile.php:509 src/Module/Contact.php:337 +msgid "Unfollow" +msgstr "" + +#: src/Model/Profile.php:511 +msgid "Atom feed" +msgstr "" + +#: src/Model/Profile.php:551 src/Model/Profile.php:648 msgid "g A l F d" msgstr "" -#: src/Model/Profile.php:570 +#: src/Model/Profile.php:552 msgid "F d" msgstr "" -#: src/Model/Profile.php:632 src/Model/Profile.php:717 +#: src/Model/Profile.php:614 src/Model/Profile.php:699 msgid "[today]" msgstr "" -#: src/Model/Profile.php:642 +#: src/Model/Profile.php:624 msgid "Birthday Reminders" msgstr "" -#: src/Model/Profile.php:643 +#: src/Model/Profile.php:625 msgid "Birthdays this week:" msgstr "" -#: src/Model/Profile.php:704 +#: src/Model/Profile.php:686 msgid "[No description]" msgstr "" -#: src/Model/Profile.php:730 +#: src/Model/Profile.php:712 msgid "Event Reminders" msgstr "" -#: src/Model/Profile.php:731 +#: src/Model/Profile.php:713 msgid "Upcoming events the next 7 days:" msgstr "" -#: src/Model/Profile.php:748 +#: src/Model/Profile.php:730 msgid "Member since:" msgstr "" -#: src/Model/Profile.php:756 +#: src/Model/Profile.php:738 msgid "j F, Y" msgstr "" -#: src/Model/Profile.php:757 +#: src/Model/Profile.php:739 msgid "j F" msgstr "" -#: src/Model/Profile.php:765 src/Util/Temporal.php:147 +#: src/Model/Profile.php:747 src/Util/Temporal.php:147 msgid "Birthday:" msgstr "" -#: src/Model/Profile.php:772 +#: src/Model/Profile.php:754 msgid "Age:" msgstr "" -#: src/Model/Profile.php:785 +#: src/Model/Profile.php:767 #, php-format msgid "for %1$d %2$s" msgstr "" -#: src/Model/Profile.php:809 +#: src/Model/Profile.php:791 msgid "Religion:" msgstr "" -#: src/Model/Profile.php:817 +#: src/Model/Profile.php:799 msgid "Hobbies/Interests:" msgstr "" -#: src/Model/Profile.php:829 +#: src/Model/Profile.php:811 msgid "Contact information and Social Networks:" msgstr "" -#: src/Model/Profile.php:833 +#: src/Model/Profile.php:815 msgid "Musical interests:" msgstr "" -#: src/Model/Profile.php:837 +#: src/Model/Profile.php:819 msgid "Books, literature:" msgstr "" -#: src/Model/Profile.php:841 +#: src/Model/Profile.php:823 msgid "Television:" msgstr "" -#: src/Model/Profile.php:845 +#: src/Model/Profile.php:827 msgid "Film/dance/culture/entertainment:" msgstr "" -#: src/Model/Profile.php:849 +#: src/Model/Profile.php:831 msgid "Love/Romance:" msgstr "" -#: src/Model/Profile.php:853 +#: src/Model/Profile.php:835 msgid "Work/employment:" msgstr "" -#: src/Model/Profile.php:857 +#: src/Model/Profile.php:839 msgid "School/education:" msgstr "" -#: src/Model/Profile.php:862 +#: src/Model/Profile.php:844 msgid "Forums:" msgstr "" -#: src/Model/Profile.php:909 src/Module/Contact.php:869 +#: src/Model/Profile.php:891 src/Module/Contact.php:875 msgid "Profile Details" msgstr "" -#: src/Model/Profile.php:959 +#: src/Model/Profile.php:941 msgid "Only You Can See This" msgstr "" -#: src/Model/Profile.php:967 src/Model/Profile.php:970 +#: src/Model/Profile.php:949 src/Model/Profile.php:952 msgid "Tips for New Members" msgstr "" -#: src/Model/Profile.php:1170 +#: src/Model/Profile.php:1149 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" @@ -6197,138 +6217,138 @@ msgstr "" msgid "Enter a valid existing folder" msgstr "" -#: src/Model/User.php:298 +#: src/Model/User.php:331 msgid "Login failed" msgstr "" -#: src/Model/User.php:329 +#: src/Model/User.php:362 msgid "Not enough information to authenticate" msgstr "" -#: src/Model/User.php:407 +#: src/Model/User.php:440 msgid "Password can't be empty" msgstr "" -#: src/Model/User.php:426 +#: src/Model/User.php:459 msgid "Empty passwords are not allowed." msgstr "" -#: src/Model/User.php:430 +#: src/Model/User.php:463 msgid "" "The new password has been exposed in a public data dump, please choose " "another." msgstr "" -#: src/Model/User.php:436 +#: src/Model/User.php:469 msgid "" "The password can't contain accentuated letters, white spaces or colons (:)" msgstr "" -#: src/Model/User.php:536 +#: src/Model/User.php:569 msgid "Passwords do not match. Password unchanged." msgstr "" -#: src/Model/User.php:543 +#: src/Model/User.php:576 msgid "An invitation is required." msgstr "" -#: src/Model/User.php:547 +#: src/Model/User.php:580 msgid "Invitation could not be verified." msgstr "" -#: src/Model/User.php:554 +#: src/Model/User.php:587 msgid "Invalid OpenID url" msgstr "" -#: src/Model/User.php:567 src/Module/Login.php:107 +#: src/Model/User.php:600 src/Module/Login.php:102 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: src/Model/User.php:567 src/Module/Login.php:107 +#: src/Model/User.php:600 src/Module/Login.php:102 msgid "The error message was:" msgstr "" -#: src/Model/User.php:573 +#: src/Model/User.php:606 msgid "Please enter the required information." msgstr "" -#: src/Model/User.php:587 +#: src/Model/User.php:620 #, php-format msgid "" "system.username_min_length (%s) and system.username_max_length (%s) are " "excluding each other, swapping values." msgstr "" -#: src/Model/User.php:594 +#: src/Model/User.php:627 #, php-format msgid "Username should be at least %s character." msgid_plural "Username should be at least %s characters." msgstr[0] "" msgstr[1] "" -#: src/Model/User.php:598 +#: src/Model/User.php:631 #, php-format msgid "Username should be at most %s character." msgid_plural "Username should be at most %s characters." msgstr[0] "" msgstr[1] "" -#: src/Model/User.php:606 +#: src/Model/User.php:639 msgid "That doesn't appear to be your full (First Last) name." msgstr "" -#: src/Model/User.php:611 +#: src/Model/User.php:644 msgid "Your email domain is not among those allowed on this site." msgstr "" -#: src/Model/User.php:615 +#: src/Model/User.php:648 msgid "Not a valid email address." msgstr "" -#: src/Model/User.php:618 +#: src/Model/User.php:651 msgid "The nickname was blocked from registration by the nodes admin." msgstr "" -#: src/Model/User.php:622 src/Model/User.php:630 +#: src/Model/User.php:655 src/Model/User.php:663 msgid "Cannot use that email." msgstr "" -#: src/Model/User.php:637 +#: src/Model/User.php:670 msgid "Your nickname can only contain a-z, 0-9 and _." msgstr "" -#: src/Model/User.php:644 src/Model/User.php:701 +#: src/Model/User.php:677 src/Model/User.php:734 msgid "Nickname is already registered. Please choose another." msgstr "" -#: src/Model/User.php:654 +#: src/Model/User.php:687 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: src/Model/User.php:688 src/Model/User.php:692 +#: src/Model/User.php:721 src/Model/User.php:725 msgid "An error occurred during registration. Please try again." msgstr "" -#: src/Model/User.php:712 view/theme/duepuntozero/config.php:55 +#: src/Model/User.php:745 view/theme/duepuntozero/config.php:55 msgid "default" msgstr "" -#: src/Model/User.php:717 +#: src/Model/User.php:750 msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: src/Model/User.php:724 +#: src/Model/User.php:757 msgid "An error occurred creating your self contact. Please try again." msgstr "" -#: src/Model/User.php:733 +#: src/Model/User.php:766 msgid "" "An error occurred creating your default contact group. Please try again." msgstr "" -#: src/Model/User.php:809 +#: src/Model/User.php:842 #, php-format msgid "" "\n" @@ -6344,12 +6364,12 @@ msgid "" "\t\t" msgstr "" -#: src/Model/User.php:826 +#: src/Model/User.php:859 #, php-format msgid "Registration at %s" msgstr "" -#: src/Model/User.php:845 +#: src/Model/User.php:878 #, php-format msgid "" "\n" @@ -6358,7 +6378,7 @@ msgid "" "\t\t" msgstr "" -#: src/Model/User.php:851 +#: src/Model/User.php:884 #, php-format msgid "" "\n" @@ -6397,7 +6417,7 @@ msgid "" "\t\t\tThank you and welcome to %2$s." msgstr "" -#: src/Model/User.php:886 src/Module/Admin/Users.php:88 +#: src/Model/User.php:919 src/Module/Admin/Users.php:88 #, php-format msgid "Registration details for %s" msgstr "" @@ -6431,7 +6451,7 @@ msgstr "" #: src/Module/Admin/Blocklist/Server.php:73 src/Module/Admin/Federation.php:187 #: src/Module/Admin/Item/Delete.php:46 src/Module/Admin/Logs/Settings.php:63 #: src/Module/Admin/Logs/View.php:46 src/Module/Admin/Queue.php:56 -#: src/Module/Admin/Site.php:568 src/Module/Admin/Summary.php:177 +#: src/Module/Admin/Site.php:567 src/Module/Admin/Summary.php:175 #: src/Module/Admin/Themes/Details.php:104 src/Module/Admin/Themes/Index.php:93 #: src/Module/Admin/Tos.php:42 src/Module/Admin/Users.php:277 msgid "Administration" @@ -6499,8 +6519,8 @@ msgid "select none" msgstr "" #: src/Module/Admin/Blocklist/Contact.php:68 src/Module/Admin/Users.php:291 -#: src/Module/Contact.php:617 src/Module/Contact.php:821 -#: src/Module/Contact.php:1074 +#: src/Module/Contact.php:623 src/Module/Contact.php:827 +#: src/Module/Contact.php:1076 msgid "Unblock" msgstr "" @@ -6540,7 +6560,7 @@ msgid "Block Reason" msgstr "" #: src/Module/Admin/Blocklist/Server.php:31 -msgid "Server added to blocklist." +msgid "Server domain pattern added to blocklist." msgstr "" #: src/Module/Admin/Blocklist/Server.php:47 @@ -6548,80 +6568,91 @@ msgid "Site blocklist updated." msgstr "" #: src/Module/Admin/Blocklist/Server.php:64 -msgid "The blocked domain" +#: src/Module/Admin/Blocklist/Server.php:89 +msgid "Blocked server domain pattern" msgstr "" #: src/Module/Admin/Blocklist/Server.php:65 -#: src/Module/Admin/Blocklist/Server.php:84 src/Module/Friendica.php:60 +#: src/Module/Admin/Blocklist/Server.php:90 src/Module/Friendica.php:60 msgid "Reason for the block" msgstr "" -#: src/Module/Admin/Blocklist/Server.php:65 -#: src/Module/Admin/Blocklist/Server.php:79 -msgid "The reason why you blocked this domain." -msgstr "" - #: src/Module/Admin/Blocklist/Server.php:66 -msgid "Delete domain" +msgid "Delete server domain pattern" msgstr "" #: src/Module/Admin/Blocklist/Server.php:66 msgid "Check to delete this entry from the blocklist" msgstr "" -#: src/Module/Admin/Blocklist/Server.php:74 src/Module/BaseAdminModule.php:94 -msgid "Server Blocklist" +#: src/Module/Admin/Blocklist/Server.php:74 +msgid "Server Domain Pattern Blocklist" msgstr "" #: src/Module/Admin/Blocklist/Server.php:75 msgid "" -"This page can be used to define a black list of servers from the federated " -"network that are not allowed to interact with your node. For all entered " -"domains you should also give a reason why you have blocked the remote server." +"This page can be used to define a blacklist of server domain patterns from " +"the federated network that are not allowed to interact with your node. For " +"each domain pattern you should also provide the reason why you block it." msgstr "" #: src/Module/Admin/Blocklist/Server.php:76 msgid "" -"The list of blocked servers will be made publically available on the /" -"friendica page so that your users and people investigating communication " -"problems can find the reason easily." +"The list of blocked server domain patterns will be made publically available " +"on the /friendica page so that your users and " +"people investigating communication problems can find the reason easily." msgstr "" #: src/Module/Admin/Blocklist/Server.php:77 +msgid "" +"

The server domain pattern syntax is case-insensitive shell wildcard, " +"comprising the following special characters:

\n" +"
    \n" +"\t
  • *: Any number of characters
    • \n" +"\t
  • ?: Any single character
    • \n" +"\t
  • [<char1><char2>...]: char1 or char2
    • \n" +"
" +msgstr "" + +#: src/Module/Admin/Blocklist/Server.php:83 msgid "Add new entry to block list" msgstr "" -#: src/Module/Admin/Blocklist/Server.php:78 -msgid "Server Domain" +#: src/Module/Admin/Blocklist/Server.php:84 +msgid "Server Domain Pattern" msgstr "" -#: src/Module/Admin/Blocklist/Server.php:78 +#: src/Module/Admin/Blocklist/Server.php:84 msgid "" -"The domain of the new server to add to the block list. Do not include the " -"protocol." -msgstr "" - -#: src/Module/Admin/Blocklist/Server.php:79 -msgid "Block reason" -msgstr "" - -#: src/Module/Admin/Blocklist/Server.php:80 -msgid "Add Entry" -msgstr "" - -#: src/Module/Admin/Blocklist/Server.php:81 -msgid "Save changes to the blocklist" -msgstr "" - -#: src/Module/Admin/Blocklist/Server.php:82 -msgid "Current Entries in the Blocklist" +"The domain pattern of the new server to add to the block list. Do not " +"include the protocol." msgstr "" #: src/Module/Admin/Blocklist/Server.php:85 -msgid "Delete entry from blocklist" +msgid "Block reason" +msgstr "" + +#: src/Module/Admin/Blocklist/Server.php:85 +msgid "The reason why you blocked this server domain pattern." +msgstr "" + +#: src/Module/Admin/Blocklist/Server.php:86 +msgid "Add Entry" +msgstr "" + +#: src/Module/Admin/Blocklist/Server.php:87 +msgid "Save changes to the blocklist" msgstr "" #: src/Module/Admin/Blocklist/Server.php:88 +msgid "Current Entries in the Blocklist" +msgstr "" + +#: src/Module/Admin/Blocklist/Server.php:91 +msgid "Delete entry from blocklist" +msgstr "" + +#: src/Module/Admin/Blocklist/Server.php:94 msgid "Delete entry from blocklist?" msgstr "" @@ -6870,7 +6901,7 @@ msgstr "" msgid "Priority" msgstr "" -#: src/Module/Admin/Site.php:49 +#: src/Module/Admin/Site.php:50 msgid "Can not parse base url. Must have at least ://" msgstr "" @@ -6878,260 +6909,260 @@ msgstr "" msgid "Invalid storage backend setting value." msgstr "" -#: src/Module/Admin/Site.php:412 +#: src/Module/Admin/Site.php:411 msgid "Site settings updated." msgstr "" -#: src/Module/Admin/Site.php:464 +#: src/Module/Admin/Site.php:463 msgid "No community page for local users" msgstr "" -#: src/Module/Admin/Site.php:465 +#: src/Module/Admin/Site.php:464 msgid "No community page" msgstr "" -#: src/Module/Admin/Site.php:466 +#: src/Module/Admin/Site.php:465 msgid "Public postings from users of this site" msgstr "" -#: src/Module/Admin/Site.php:467 +#: src/Module/Admin/Site.php:466 msgid "Public postings from the federated network" msgstr "" -#: src/Module/Admin/Site.php:468 +#: src/Module/Admin/Site.php:467 msgid "Public postings from local users and the federated network" msgstr "" -#: src/Module/Admin/Site.php:472 src/Module/Admin/Site.php:668 -#: src/Module/Admin/Site.php:678 src/Module/Contact.php:542 -#: src/Module/Settings/TwoFactor/Index.php:91 +#: src/Module/Admin/Site.php:471 src/Module/Admin/Site.php:666 +#: src/Module/Admin/Site.php:676 src/Module/Contact.php:563 +#: src/Module/Settings/TwoFactor/Index.php:97 msgid "Disabled" msgstr "" -#: src/Module/Admin/Site.php:473 src/Module/Admin/Users.php:278 +#: src/Module/Admin/Site.php:472 src/Module/Admin/Users.php:278 #: src/Module/Admin/Users.php:295 src/Module/BaseAdminModule.php:81 msgid "Users" msgstr "" -#: src/Module/Admin/Site.php:474 +#: src/Module/Admin/Site.php:473 msgid "Users, Global Contacts" msgstr "" -#: src/Module/Admin/Site.php:475 +#: src/Module/Admin/Site.php:474 msgid "Users, Global Contacts/fallback" msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:478 msgid "One month" msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:479 msgid "Three months" msgstr "" -#: src/Module/Admin/Site.php:481 +#: src/Module/Admin/Site.php:480 msgid "Half a year" msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:481 msgid "One year" msgstr "" -#: src/Module/Admin/Site.php:488 +#: src/Module/Admin/Site.php:487 msgid "Multi user instance" msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:509 msgid "Closed" msgstr "" -#: src/Module/Admin/Site.php:511 +#: src/Module/Admin/Site.php:510 msgid "Requires approval" msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:511 msgid "Open" msgstr "" -#: src/Module/Admin/Site.php:516 src/Module/Install.php:181 +#: src/Module/Admin/Site.php:515 src/Module/Install.php:183 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: src/Module/Admin/Site.php:517 src/Module/Install.php:182 +#: src/Module/Admin/Site.php:516 src/Module/Install.php:184 msgid "Force all links to use SSL" msgstr "" -#: src/Module/Admin/Site.php:518 src/Module/Install.php:183 +#: src/Module/Admin/Site.php:517 src/Module/Install.php:185 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:521 msgid "Don't check" msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:522 msgid "check the stable version" msgstr "" -#: src/Module/Admin/Site.php:524 +#: src/Module/Admin/Site.php:523 msgid "check the development version" msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:543 msgid "Database (legacy)" msgstr "" -#: src/Module/Admin/Site.php:569 src/Module/BaseAdminModule.php:80 +#: src/Module/Admin/Site.php:568 src/Module/BaseAdminModule.php:80 msgid "Site" msgstr "" -#: src/Module/Admin/Site.php:571 +#: src/Module/Admin/Site.php:570 msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:572 src/Module/Register.php:121 +#: src/Module/Admin/Site.php:571 src/Module/Register.php:121 msgid "Registration" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:572 msgid "File upload" msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:573 msgid "Policies" msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:575 msgid "Auto Discovered Contact Directory" msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:576 msgid "Performance" msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:577 msgid "Worker" msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:578 msgid "Message Relay" msgstr "" -#: src/Module/Admin/Site.php:580 +#: src/Module/Admin/Site.php:579 msgid "Relocate Instance" msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:580 msgid "Warning! Advanced function. Could make this server unreachable." msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:584 msgid "Site name" msgstr "" -#: src/Module/Admin/Site.php:586 +#: src/Module/Admin/Site.php:585 msgid "Sender Email" msgstr "" -#: src/Module/Admin/Site.php:586 +#: src/Module/Admin/Site.php:585 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: src/Module/Admin/Site.php:587 +#: src/Module/Admin/Site.php:586 msgid "Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:587 msgid "Shortcut icon" msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:587 msgid "Link to an icon that will be used for browsers." msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:588 msgid "Touch icon" msgstr "" -#: src/Module/Admin/Site.php:589 +#: src/Module/Admin/Site.php:588 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: src/Module/Admin/Site.php:590 +#: src/Module/Admin/Site.php:589 msgid "Additional Info" msgstr "" -#: src/Module/Admin/Site.php:590 +#: src/Module/Admin/Site.php:589 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/servers." msgstr "" -#: src/Module/Admin/Site.php:591 +#: src/Module/Admin/Site.php:590 msgid "System language" msgstr "" -#: src/Module/Admin/Site.php:592 +#: src/Module/Admin/Site.php:591 msgid "System theme" msgstr "" -#: src/Module/Admin/Site.php:592 +#: src/Module/Admin/Site.php:591 msgid "" "Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:592 msgid "Mobile system theme" msgstr "" -#: src/Module/Admin/Site.php:593 +#: src/Module/Admin/Site.php:592 msgid "Theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:594 src/Module/Install.php:191 +#: src/Module/Admin/Site.php:593 src/Module/Install.php:193 msgid "SSL link policy" msgstr "" -#: src/Module/Admin/Site.php:594 src/Module/Install.php:193 +#: src/Module/Admin/Site.php:593 src/Module/Install.php:195 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:594 msgid "Force SSL" msgstr "" -#: src/Module/Admin/Site.php:595 +#: src/Module/Admin/Site.php:594 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:595 msgid "Hide help entry from navigation menu" msgstr "" -#: src/Module/Admin/Site.php:596 +#: src/Module/Admin/Site.php:595 msgid "" "Hides the menu entry for the Help pages from the navigation menu. You can " "still access it calling /help directly." msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:596 msgid "Single user instance" msgstr "" -#: src/Module/Admin/Site.php:597 +#: src/Module/Admin/Site.php:596 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: src/Module/Admin/Site.php:599 +#: src/Module/Admin/Site.php:598 msgid "File storage backend" msgstr "" -#: src/Module/Admin/Site.php:599 +#: src/Module/Admin/Site.php:598 msgid "" "The backend used to store uploaded data. If you change the storage backend, " "you can manually move the existing files. If you do not do so, the files " @@ -7140,201 +7171,201 @@ msgid "" "for more information about the choices and the moving procedure." msgstr "" -#: src/Module/Admin/Site.php:601 +#: src/Module/Admin/Site.php:600 msgid "Maximum image size" msgstr "" -#: src/Module/Admin/Site.php:601 +#: src/Module/Admin/Site.php:600 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: src/Module/Admin/Site.php:602 +#: src/Module/Admin/Site.php:601 msgid "Maximum image length" msgstr "" -#: src/Module/Admin/Site.php:602 +#: src/Module/Admin/Site.php:601 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: src/Module/Admin/Site.php:603 +#: src/Module/Admin/Site.php:602 msgid "JPEG image quality" msgstr "" -#: src/Module/Admin/Site.php:603 +#: src/Module/Admin/Site.php:602 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: src/Module/Admin/Site.php:605 +#: src/Module/Admin/Site.php:604 msgid "Register policy" msgstr "" -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:605 msgid "Maximum Daily Registrations" msgstr "" -#: src/Module/Admin/Site.php:606 +#: src/Module/Admin/Site.php:605 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:606 msgid "Register text" msgstr "" -#: src/Module/Admin/Site.php:607 +#: src/Module/Admin/Site.php:606 msgid "" "Will be displayed prominently on the registration page. You can use BBCode " "here." msgstr "" -#: src/Module/Admin/Site.php:608 +#: src/Module/Admin/Site.php:607 msgid "Forbidden Nicknames" msgstr "" -#: src/Module/Admin/Site.php:608 +#: src/Module/Admin/Site.php:607 msgid "" "Comma separated list of nicknames that are forbidden from registration. " "Preset is a list of role names according RFC 2142." msgstr "" -#: src/Module/Admin/Site.php:609 +#: src/Module/Admin/Site.php:608 msgid "Accounts abandoned after x days" msgstr "" -#: src/Module/Admin/Site.php:609 +#: src/Module/Admin/Site.php:608 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: src/Module/Admin/Site.php:610 +#: src/Module/Admin/Site.php:609 msgid "Allowed friend domains" msgstr "" -#: src/Module/Admin/Site.php:610 +#: src/Module/Admin/Site.php:609 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: src/Module/Admin/Site.php:611 +#: src/Module/Admin/Site.php:610 msgid "Allowed email domains" msgstr "" -#: src/Module/Admin/Site.php:611 +#: src/Module/Admin/Site.php:610 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: src/Module/Admin/Site.php:612 +#: src/Module/Admin/Site.php:611 msgid "No OEmbed rich content" msgstr "" -#: src/Module/Admin/Site.php:612 +#: src/Module/Admin/Site.php:611 msgid "" "Don't show the rich content (e.g. embedded PDF), except from the domains " "listed below." msgstr "" -#: src/Module/Admin/Site.php:613 +#: src/Module/Admin/Site.php:612 msgid "Allowed OEmbed domains" msgstr "" -#: src/Module/Admin/Site.php:613 +#: src/Module/Admin/Site.php:612 msgid "" "Comma separated list of domains which oembed content is allowed to be " "displayed. Wildcards are accepted." msgstr "" -#: src/Module/Admin/Site.php:614 +#: src/Module/Admin/Site.php:613 msgid "Block public" msgstr "" -#: src/Module/Admin/Site.php:614 +#: src/Module/Admin/Site.php:613 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: src/Module/Admin/Site.php:615 +#: src/Module/Admin/Site.php:614 msgid "Force publish" msgstr "" -#: src/Module/Admin/Site.php:615 +#: src/Module/Admin/Site.php:614 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: src/Module/Admin/Site.php:615 +#: src/Module/Admin/Site.php:614 msgid "Enabling this may violate privacy laws like the GDPR" msgstr "" -#: src/Module/Admin/Site.php:616 +#: src/Module/Admin/Site.php:615 msgid "Global directory URL" msgstr "" -#: src/Module/Admin/Site.php:616 +#: src/Module/Admin/Site.php:615 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: src/Module/Admin/Site.php:617 +#: src/Module/Admin/Site.php:616 msgid "Private posts by default for new users" msgstr "" -#: src/Module/Admin/Site.php:617 +#: src/Module/Admin/Site.php:616 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: src/Module/Admin/Site.php:618 +#: src/Module/Admin/Site.php:617 msgid "Don't include post content in email notifications" msgstr "" -#: src/Module/Admin/Site.php:618 +#: src/Module/Admin/Site.php:617 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: src/Module/Admin/Site.php:619 +#: src/Module/Admin/Site.php:618 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: src/Module/Admin/Site.php:619 +#: src/Module/Admin/Site.php:618 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: src/Module/Admin/Site.php:620 +#: src/Module/Admin/Site.php:619 msgid "Don't embed private images in posts" msgstr "" -#: src/Module/Admin/Site.php:620 +#: src/Module/Admin/Site.php:619 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: src/Module/Admin/Site.php:621 +#: src/Module/Admin/Site.php:620 msgid "Explicit Content" msgstr "" -#: src/Module/Admin/Site.php:621 +#: src/Module/Admin/Site.php:620 msgid "" "Set this to announce that your node is used mostly for explicit content that " "might not be suited for minors. This information will be published in the " @@ -7343,211 +7374,200 @@ msgid "" "will be shown at the user registration page." msgstr "" -#: src/Module/Admin/Site.php:622 +#: src/Module/Admin/Site.php:621 msgid "Allow Users to set remote_self" msgstr "" -#: src/Module/Admin/Site.php:622 +#: src/Module/Admin/Site.php:621 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: src/Module/Admin/Site.php:623 +#: src/Module/Admin/Site.php:622 msgid "Block multiple registrations" msgstr "" -#: src/Module/Admin/Site.php:623 +#: src/Module/Admin/Site.php:622 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: src/Module/Admin/Site.php:624 +#: src/Module/Admin/Site.php:623 msgid "Disable OpenID" msgstr "" -#: src/Module/Admin/Site.php:624 +#: src/Module/Admin/Site.php:623 msgid "Disable OpenID support for registration and logins." msgstr "" -#: src/Module/Admin/Site.php:625 +#: src/Module/Admin/Site.php:624 msgid "No Fullname check" msgstr "" -#: src/Module/Admin/Site.php:625 +#: src/Module/Admin/Site.php:624 msgid "" "Allow users to register without a space between the first name and the last " "name in their full name." msgstr "" -#: src/Module/Admin/Site.php:626 +#: src/Module/Admin/Site.php:625 msgid "Community pages for visitors" msgstr "" -#: src/Module/Admin/Site.php:626 +#: src/Module/Admin/Site.php:625 msgid "" "Which community pages should be available for visitors. Local users always " "see both pages." msgstr "" -#: src/Module/Admin/Site.php:627 +#: src/Module/Admin/Site.php:626 msgid "Posts per user on community page" msgstr "" -#: src/Module/Admin/Site.php:627 +#: src/Module/Admin/Site.php:626 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "\"Global Community\")" msgstr "" -#: src/Module/Admin/Site.php:628 +#: src/Module/Admin/Site.php:627 msgid "Disable OStatus support" msgstr "" -#: src/Module/Admin/Site.php:628 +#: src/Module/Admin/Site.php:627 msgid "" "Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: src/Module/Admin/Site.php:629 -msgid "Only import OStatus/ActivityPub threads from our contacts" -msgstr "" - -#: src/Module/Admin/Site.php:629 -msgid "" -"Normally we import every content from our OStatus and ActivityPub contacts. " -"With this option we only store threads that are started by a contact that is " -"known on our system." -msgstr "" - -#: src/Module/Admin/Site.php:630 +#: src/Module/Admin/Site.php:628 msgid "OStatus support can only be enabled if threading is enabled." msgstr "" -#: src/Module/Admin/Site.php:632 +#: src/Module/Admin/Site.php:630 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: src/Module/Admin/Site.php:633 +#: src/Module/Admin/Site.php:631 msgid "Enable Diaspora support" msgstr "" -#: src/Module/Admin/Site.php:633 +#: src/Module/Admin/Site.php:631 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: src/Module/Admin/Site.php:634 +#: src/Module/Admin/Site.php:632 msgid "Only allow Friendica contacts" msgstr "" -#: src/Module/Admin/Site.php:634 +#: src/Module/Admin/Site.php:632 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: src/Module/Admin/Site.php:635 +#: src/Module/Admin/Site.php:633 msgid "Verify SSL" msgstr "" -#: src/Module/Admin/Site.php:635 +#: src/Module/Admin/Site.php:633 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: src/Module/Admin/Site.php:636 +#: src/Module/Admin/Site.php:634 msgid "Proxy user" msgstr "" -#: src/Module/Admin/Site.php:637 +#: src/Module/Admin/Site.php:635 msgid "Proxy URL" msgstr "" -#: src/Module/Admin/Site.php:638 +#: src/Module/Admin/Site.php:636 msgid "Network timeout" msgstr "" -#: src/Module/Admin/Site.php:638 +#: src/Module/Admin/Site.php:636 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: src/Module/Admin/Site.php:639 +#: src/Module/Admin/Site.php:637 msgid "Maximum Load Average" msgstr "" -#: src/Module/Admin/Site.php:639 +#: src/Module/Admin/Site.php:637 #, php-format msgid "" "Maximum system load before delivery and poll processes are deferred - " "default %d." msgstr "" -#: src/Module/Admin/Site.php:640 +#: src/Module/Admin/Site.php:638 msgid "Maximum Load Average (Frontend)" msgstr "" -#: src/Module/Admin/Site.php:640 +#: src/Module/Admin/Site.php:638 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: src/Module/Admin/Site.php:641 +#: src/Module/Admin/Site.php:639 msgid "Minimal Memory" msgstr "" -#: src/Module/Admin/Site.php:641 +#: src/Module/Admin/Site.php:639 msgid "" "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "" -#: src/Module/Admin/Site.php:642 +#: src/Module/Admin/Site.php:640 msgid "Maximum table size for optimization" msgstr "" -#: src/Module/Admin/Site.php:642 +#: src/Module/Admin/Site.php:640 msgid "" "Maximum table size (in MB) for the automatic optimization. Enter -1 to " "disable it." msgstr "" -#: src/Module/Admin/Site.php:643 +#: src/Module/Admin/Site.php:641 msgid "Minimum level of fragmentation" msgstr "" -#: src/Module/Admin/Site.php:643 +#: src/Module/Admin/Site.php:641 msgid "" "Minimum fragmenation level to start the automatic optimization - default " "value is 30%." msgstr "" -#: src/Module/Admin/Site.php:645 +#: src/Module/Admin/Site.php:643 msgid "Periodical check of global contacts" msgstr "" -#: src/Module/Admin/Site.php:645 +#: src/Module/Admin/Site.php:643 msgid "" "If enabled, the global contacts are checked periodically for missing or " "outdated data and the vitality of the contacts and servers." msgstr "" -#: src/Module/Admin/Site.php:646 +#: src/Module/Admin/Site.php:644 msgid "Days between requery" msgstr "" -#: src/Module/Admin/Site.php:646 +#: src/Module/Admin/Site.php:644 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: src/Module/Admin/Site.php:647 +#: src/Module/Admin/Site.php:645 msgid "Discover contacts from other servers" msgstr "" -#: src/Module/Admin/Site.php:647 +#: src/Module/Admin/Site.php:645 msgid "" "Periodically query other servers for contacts. You can choose between \"Users" "\": the users on the remote system, \"Global Contacts\": active contacts " @@ -7557,32 +7577,32 @@ msgid "" "Global Contacts\"." msgstr "" -#: src/Module/Admin/Site.php:648 +#: src/Module/Admin/Site.php:646 msgid "Timeframe for fetching global contacts" msgstr "" -#: src/Module/Admin/Site.php:648 +#: src/Module/Admin/Site.php:646 msgid "" "When the discovery is activated, this value defines the timeframe for the " "activity of the global contacts that are fetched from other servers." msgstr "" -#: src/Module/Admin/Site.php:649 +#: src/Module/Admin/Site.php:647 msgid "Search the local directory" msgstr "" -#: src/Module/Admin/Site.php:649 +#: src/Module/Admin/Site.php:647 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: src/Module/Admin/Site.php:651 +#: src/Module/Admin/Site.php:649 msgid "Publish server information" msgstr "" -#: src/Module/Admin/Site.php:651 +#: src/Module/Admin/Site.php:649 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -7590,50 +7610,50 @@ msgid "" "href=\"http://the-federation.info/\">the-federation.info for details." msgstr "" -#: src/Module/Admin/Site.php:653 +#: src/Module/Admin/Site.php:651 msgid "Check upstream version" msgstr "" -#: src/Module/Admin/Site.php:653 +#: src/Module/Admin/Site.php:651 msgid "" "Enables checking for new Friendica versions at github. If there is a new " "version, you will be informed in the admin panel overview." msgstr "" -#: src/Module/Admin/Site.php:654 +#: src/Module/Admin/Site.php:652 msgid "Suppress Tags" msgstr "" -#: src/Module/Admin/Site.php:654 +#: src/Module/Admin/Site.php:652 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: src/Module/Admin/Site.php:655 +#: src/Module/Admin/Site.php:653 msgid "Clean database" msgstr "" -#: src/Module/Admin/Site.php:655 +#: src/Module/Admin/Site.php:653 msgid "" "Remove old remote items, orphaned database records and old content from some " "other helper tables." msgstr "" -#: src/Module/Admin/Site.php:656 +#: src/Module/Admin/Site.php:654 msgid "Lifespan of remote items" msgstr "" -#: src/Module/Admin/Site.php:656 +#: src/Module/Admin/Site.php:654 msgid "" "When the database cleanup is enabled, this defines the days after which " "remote items will be deleted. Own items, and marked or filed items are " "always kept. 0 disables this behaviour." msgstr "" -#: src/Module/Admin/Site.php:657 +#: src/Module/Admin/Site.php:655 msgid "Lifespan of unclaimed items" msgstr "" -#: src/Module/Admin/Site.php:657 +#: src/Module/Admin/Site.php:655 msgid "" "When the database cleanup is enabled, this defines the days after which " "unclaimed remote items (mostly content from the relay) will be deleted. " @@ -7641,130 +7661,130 @@ msgid "" "items if set to 0." msgstr "" -#: src/Module/Admin/Site.php:658 +#: src/Module/Admin/Site.php:656 msgid "Lifespan of raw conversation data" msgstr "" -#: src/Module/Admin/Site.php:658 +#: src/Module/Admin/Site.php:656 msgid "" "The conversation data is used for ActivityPub and OStatus, as well as for " "debug purposes. It should be safe to remove it after 14 days, default is 90 " "days." msgstr "" -#: src/Module/Admin/Site.php:659 +#: src/Module/Admin/Site.php:657 msgid "Path to item cache" msgstr "" -#: src/Module/Admin/Site.php:659 +#: src/Module/Admin/Site.php:657 msgid "The item caches buffers generated bbcode and external images." msgstr "" -#: src/Module/Admin/Site.php:660 +#: src/Module/Admin/Site.php:658 msgid "Cache duration in seconds" msgstr "" -#: src/Module/Admin/Site.php:660 +#: src/Module/Admin/Site.php:658 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One " "day). To disable the item cache, set the value to -1." msgstr "" -#: src/Module/Admin/Site.php:661 +#: src/Module/Admin/Site.php:659 msgid "Maximum numbers of comments per post" msgstr "" -#: src/Module/Admin/Site.php:661 +#: src/Module/Admin/Site.php:659 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: src/Module/Admin/Site.php:662 +#: src/Module/Admin/Site.php:660 msgid "Temp path" msgstr "" -#: src/Module/Admin/Site.php:662 +#: src/Module/Admin/Site.php:660 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "" -#: src/Module/Admin/Site.php:663 +#: src/Module/Admin/Site.php:661 msgid "Disable picture proxy" msgstr "" -#: src/Module/Admin/Site.php:663 +#: src/Module/Admin/Site.php:661 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on " "systems with very low bandwidth." msgstr "" -#: src/Module/Admin/Site.php:664 +#: src/Module/Admin/Site.php:662 msgid "Only search in tags" msgstr "" -#: src/Module/Admin/Site.php:664 +#: src/Module/Admin/Site.php:662 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: src/Module/Admin/Site.php:666 +#: src/Module/Admin/Site.php:664 msgid "New base url" msgstr "" -#: src/Module/Admin/Site.php:666 +#: src/Module/Admin/Site.php:664 msgid "" "Change base url for this server. Sends relocate message to all Friendica and " "Diaspora* contacts of all users." msgstr "" -#: src/Module/Admin/Site.php:668 +#: src/Module/Admin/Site.php:666 msgid "RINO Encryption" msgstr "" -#: src/Module/Admin/Site.php:668 +#: src/Module/Admin/Site.php:666 msgid "Encryption layer between nodes." msgstr "" -#: src/Module/Admin/Site.php:668 +#: src/Module/Admin/Site.php:666 msgid "Enabled" msgstr "" -#: src/Module/Admin/Site.php:670 +#: src/Module/Admin/Site.php:668 msgid "Maximum number of parallel workers" msgstr "" -#: src/Module/Admin/Site.php:670 +#: src/Module/Admin/Site.php:668 #, php-format msgid "" "On shared hosters set this to %d. On larger systems, values of %d are great. " "Default value is %d." msgstr "" -#: src/Module/Admin/Site.php:671 +#: src/Module/Admin/Site.php:669 msgid "Don't use \"proc_open\" with the worker" msgstr "" -#: src/Module/Admin/Site.php:671 +#: src/Module/Admin/Site.php:669 msgid "" "Enable this if your system doesn't allow the use of \"proc_open\". This can " "happen on shared hosters. If this is enabled you should increase the " "frequency of worker calls in your crontab." msgstr "" -#: src/Module/Admin/Site.php:672 +#: src/Module/Admin/Site.php:670 msgid "Enable fastlane" msgstr "" -#: src/Module/Admin/Site.php:672 +#: src/Module/Admin/Site.php:670 msgid "" "When enabed, the fastlane mechanism starts an additional worker if processes " "with higher priority are blocked by processes of lower priority." msgstr "" -#: src/Module/Admin/Site.php:673 +#: src/Module/Admin/Site.php:671 msgid "Enable frontend worker" msgstr "" -#: src/Module/Admin/Site.php:673 +#: src/Module/Admin/Site.php:671 #, php-format msgid "" "When enabled the Worker process is triggered when backend access is " @@ -7774,73 +7794,73 @@ msgid "" "server." msgstr "" -#: src/Module/Admin/Site.php:675 +#: src/Module/Admin/Site.php:673 msgid "Subscribe to relay" msgstr "" -#: src/Module/Admin/Site.php:675 +#: src/Module/Admin/Site.php:673 msgid "" "Enables the receiving of public posts from the relay. They will be included " "in the search, subscribed tags and on the global community page." msgstr "" -#: src/Module/Admin/Site.php:676 +#: src/Module/Admin/Site.php:674 msgid "Relay server" msgstr "" -#: src/Module/Admin/Site.php:676 +#: src/Module/Admin/Site.php:674 msgid "" "Address of the relay server where public posts should be send to. For " "example https://relay.diasp.org" msgstr "" -#: src/Module/Admin/Site.php:677 +#: src/Module/Admin/Site.php:675 msgid "Direct relay transfer" msgstr "" -#: src/Module/Admin/Site.php:677 +#: src/Module/Admin/Site.php:675 msgid "" "Enables the direct transfer to other servers without using the relay servers" msgstr "" -#: src/Module/Admin/Site.php:678 +#: src/Module/Admin/Site.php:676 msgid "Relay scope" msgstr "" -#: src/Module/Admin/Site.php:678 +#: src/Module/Admin/Site.php:676 msgid "" "Can be \"all\" or \"tags\". \"all\" means that every public post should be " "received. \"tags\" means that only posts with selected tags should be " "received." msgstr "" -#: src/Module/Admin/Site.php:678 +#: src/Module/Admin/Site.php:676 msgid "all" msgstr "" -#: src/Module/Admin/Site.php:678 +#: src/Module/Admin/Site.php:676 msgid "tags" msgstr "" -#: src/Module/Admin/Site.php:679 +#: src/Module/Admin/Site.php:677 msgid "Server tags" msgstr "" -#: src/Module/Admin/Site.php:679 +#: src/Module/Admin/Site.php:677 msgid "Comma separated list of tags for the \"tags\" subscription." msgstr "" -#: src/Module/Admin/Site.php:680 +#: src/Module/Admin/Site.php:678 msgid "Allow user tags" msgstr "" -#: src/Module/Admin/Site.php:680 +#: src/Module/Admin/Site.php:678 msgid "" "If enabled, the tags from the saved searches will used for the \"tags\" " "subscription in addition to the \"relay_server_tags\"." msgstr "" -#: src/Module/Admin/Site.php:683 +#: src/Module/Admin/Site.php:681 msgid "Start Relocation" msgstr "" @@ -7958,31 +7978,31 @@ msgstr "" msgid "Private Forum Account" msgstr "" -#: src/Module/Admin/Summary.php:158 +#: src/Module/Admin/Summary.php:156 msgid "Message queues" msgstr "" -#: src/Module/Admin/Summary.php:164 +#: src/Module/Admin/Summary.php:162 msgid "Server Settings" msgstr "" -#: src/Module/Admin/Summary.php:178 +#: src/Module/Admin/Summary.php:176 msgid "Summary" msgstr "" -#: src/Module/Admin/Summary.php:180 +#: src/Module/Admin/Summary.php:178 msgid "Registered users" msgstr "" -#: src/Module/Admin/Summary.php:182 +#: src/Module/Admin/Summary.php:180 msgid "Pending registrations" msgstr "" -#: src/Module/Admin/Summary.php:183 +#: src/Module/Admin/Summary.php:181 msgid "Version" msgstr "" -#: src/Module/Admin/Summary.php:187 +#: src/Module/Admin/Summary.php:185 msgid "Active addons" msgstr "" @@ -8315,6 +8335,10 @@ msgstr "" msgid "Contact Blocklist" msgstr "" +#: src/Module/BaseAdminModule.php:94 +msgid "Server Blocklist" +msgstr "" + #: src/Module/BaseAdminModule.php:101 msgid "Diagnostics" msgstr "" @@ -8352,7 +8376,7 @@ msgstr "" msgid "People Search - %s" msgstr "" -#: src/Module/BaseSearchModule.php:59 +#: src/Module/BaseSearchModule.php:62 #, php-format msgid "Forum Search - %s" msgstr "" @@ -8384,331 +8408,331 @@ msgstr "" msgid "Contact updated." msgstr "" -#: src/Module/Contact.php:372 +#: src/Module/Contact.php:393 msgid "Contact not found" msgstr "" -#: src/Module/Contact.php:391 +#: src/Module/Contact.php:412 msgid "Contact has been blocked" msgstr "" -#: src/Module/Contact.php:391 +#: src/Module/Contact.php:412 msgid "Contact has been unblocked" msgstr "" -#: src/Module/Contact.php:401 +#: src/Module/Contact.php:422 msgid "Contact has been ignored" msgstr "" -#: src/Module/Contact.php:401 +#: src/Module/Contact.php:422 msgid "Contact has been unignored" msgstr "" -#: src/Module/Contact.php:411 +#: src/Module/Contact.php:432 msgid "Contact has been archived" msgstr "" -#: src/Module/Contact.php:411 +#: src/Module/Contact.php:432 msgid "Contact has been unarchived" msgstr "" -#: src/Module/Contact.php:435 +#: src/Module/Contact.php:456 msgid "Drop contact" msgstr "" -#: src/Module/Contact.php:438 src/Module/Contact.php:817 +#: src/Module/Contact.php:459 src/Module/Contact.php:823 msgid "Do you really want to delete this contact?" msgstr "" -#: src/Module/Contact.php:452 +#: src/Module/Contact.php:473 msgid "Contact has been removed." msgstr "" -#: src/Module/Contact.php:482 +#: src/Module/Contact.php:503 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: src/Module/Contact.php:487 +#: src/Module/Contact.php:508 #, php-format msgid "You are sharing with %s" msgstr "" -#: src/Module/Contact.php:492 +#: src/Module/Contact.php:513 #, php-format msgid "%s is sharing with you" msgstr "" -#: src/Module/Contact.php:516 +#: src/Module/Contact.php:537 msgid "Private communications are not available for this contact." msgstr "" -#: src/Module/Contact.php:518 +#: src/Module/Contact.php:539 msgid "Never" msgstr "" -#: src/Module/Contact.php:521 +#: src/Module/Contact.php:542 msgid "(Update was successful)" msgstr "" -#: src/Module/Contact.php:521 +#: src/Module/Contact.php:542 msgid "(Update was not successful)" msgstr "" -#: src/Module/Contact.php:523 src/Module/Contact.php:1055 +#: src/Module/Contact.php:544 src/Module/Contact.php:1057 msgid "Suggest friends" msgstr "" -#: src/Module/Contact.php:527 +#: src/Module/Contact.php:548 #, php-format msgid "Network type: %s" msgstr "" -#: src/Module/Contact.php:532 +#: src/Module/Contact.php:553 msgid "Communications lost with this contact!" msgstr "" -#: src/Module/Contact.php:538 +#: src/Module/Contact.php:559 msgid "Fetch further information for feeds" msgstr "" -#: src/Module/Contact.php:540 +#: src/Module/Contact.php:561 msgid "" "Fetch information like preview pictures, title and teaser from the feed " "item. You can activate this if the feed doesn't contain much text. Keywords " "are taken from the meta header in the feed item and are posted as hash tags." msgstr "" -#: src/Module/Contact.php:543 +#: src/Module/Contact.php:564 msgid "Fetch information" msgstr "" -#: src/Module/Contact.php:544 +#: src/Module/Contact.php:565 msgid "Fetch keywords" msgstr "" -#: src/Module/Contact.php:545 +#: src/Module/Contact.php:566 msgid "Fetch information and keywords" msgstr "" -#: src/Module/Contact.php:577 +#: src/Module/Contact.php:585 msgid "Profile Visibility" msgstr "" -#: src/Module/Contact.php:578 +#: src/Module/Contact.php:586 msgid "Contact Information / Notes" msgstr "" -#: src/Module/Contact.php:579 +#: src/Module/Contact.php:587 msgid "Contact Settings" msgstr "" -#: src/Module/Contact.php:588 +#: src/Module/Contact.php:596 msgid "Contact" msgstr "" -#: src/Module/Contact.php:592 +#: src/Module/Contact.php:600 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: src/Module/Contact.php:594 +#: src/Module/Contact.php:602 msgid "Their personal note" msgstr "" -#: src/Module/Contact.php:596 +#: src/Module/Contact.php:604 msgid "Edit contact notes" msgstr "" -#: src/Module/Contact.php:599 src/Module/Contact.php:1021 +#: src/Module/Contact.php:607 src/Module/Contact.php:1023 #: src/Module/Profile/Contacts.php:93 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: src/Module/Contact.php:600 +#: src/Module/Contact.php:608 msgid "Block/Unblock contact" msgstr "" -#: src/Module/Contact.php:601 +#: src/Module/Contact.php:609 msgid "Ignore contact" msgstr "" -#: src/Module/Contact.php:602 +#: src/Module/Contact.php:610 msgid "Repair URL settings" msgstr "" -#: src/Module/Contact.php:603 +#: src/Module/Contact.php:611 msgid "View conversations" msgstr "" -#: src/Module/Contact.php:608 +#: src/Module/Contact.php:616 msgid "Last update:" msgstr "" -#: src/Module/Contact.php:610 +#: src/Module/Contact.php:618 msgid "Update public posts" msgstr "" -#: src/Module/Contact.php:612 src/Module/Contact.php:1065 +#: src/Module/Contact.php:620 src/Module/Contact.php:1067 msgid "Update now" msgstr "" -#: src/Module/Contact.php:618 src/Module/Contact.php:822 -#: src/Module/Contact.php:1082 +#: src/Module/Contact.php:624 src/Module/Contact.php:828 +#: src/Module/Contact.php:1084 msgid "Unignore" msgstr "" -#: src/Module/Contact.php:622 +#: src/Module/Contact.php:628 msgid "Currently blocked" msgstr "" -#: src/Module/Contact.php:623 +#: src/Module/Contact.php:629 msgid "Currently ignored" msgstr "" -#: src/Module/Contact.php:624 +#: src/Module/Contact.php:630 msgid "Currently archived" msgstr "" -#: src/Module/Contact.php:625 +#: src/Module/Contact.php:631 msgid "Awaiting connection acknowledge" msgstr "" -#: src/Module/Contact.php:626 +#: src/Module/Contact.php:632 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: src/Module/Contact.php:627 +#: src/Module/Contact.php:633 msgid "Notification for new posts" msgstr "" -#: src/Module/Contact.php:627 +#: src/Module/Contact.php:633 msgid "Send a notification of every new post of this contact" msgstr "" -#: src/Module/Contact.php:629 +#: src/Module/Contact.php:635 msgid "Blacklisted keywords" msgstr "" -#: src/Module/Contact.php:629 +#: src/Module/Contact.php:635 msgid "" "Comma separated list of keywords that should not be converted to hashtags, " "when \"Fetch information and keywords\" is selected" msgstr "" -#: src/Module/Contact.php:646 src/Module/Settings/TwoFactor/Index.php:100 +#: src/Module/Contact.php:652 src/Module/Settings/TwoFactor/Index.php:111 msgid "Actions" msgstr "" -#: src/Module/Contact.php:691 +#: src/Module/Contact.php:697 msgid "Show all contacts" msgstr "" -#: src/Module/Contact.php:696 src/Module/Contact.php:798 +#: src/Module/Contact.php:702 src/Module/Contact.php:804 msgid "Blocked" msgstr "" -#: src/Module/Contact.php:699 +#: src/Module/Contact.php:705 msgid "Only show blocked contacts" msgstr "" -#: src/Module/Contact.php:704 src/Module/Contact.php:800 +#: src/Module/Contact.php:710 src/Module/Contact.php:806 msgid "Ignored" msgstr "" -#: src/Module/Contact.php:707 +#: src/Module/Contact.php:713 msgid "Only show ignored contacts" msgstr "" -#: src/Module/Contact.php:712 src/Module/Contact.php:801 +#: src/Module/Contact.php:718 src/Module/Contact.php:807 msgid "Archived" msgstr "" -#: src/Module/Contact.php:715 +#: src/Module/Contact.php:721 msgid "Only show archived contacts" msgstr "" -#: src/Module/Contact.php:720 src/Module/Contact.php:799 +#: src/Module/Contact.php:726 src/Module/Contact.php:805 msgid "Hidden" msgstr "" -#: src/Module/Contact.php:723 +#: src/Module/Contact.php:729 msgid "Only show hidden contacts" msgstr "" -#: src/Module/Contact.php:731 +#: src/Module/Contact.php:737 msgid "Organize your contact groups" msgstr "" -#: src/Module/Contact.php:812 +#: src/Module/Contact.php:818 msgid "Search your contacts" msgstr "" -#: src/Module/Contact.php:823 src/Module/Contact.php:1091 +#: src/Module/Contact.php:829 src/Module/Contact.php:1093 msgid "Archive" msgstr "" -#: src/Module/Contact.php:823 src/Module/Contact.php:1091 +#: src/Module/Contact.php:829 src/Module/Contact.php:1093 msgid "Unarchive" msgstr "" -#: src/Module/Contact.php:826 +#: src/Module/Contact.php:832 msgid "Batch Actions" msgstr "" -#: src/Module/Contact.php:853 +#: src/Module/Contact.php:859 msgid "Conversations started by this contact" msgstr "" -#: src/Module/Contact.php:858 +#: src/Module/Contact.php:864 msgid "Posts and Comments" msgstr "" -#: src/Module/Contact.php:881 +#: src/Module/Contact.php:887 msgid "View all contacts" msgstr "" -#: src/Module/Contact.php:892 +#: src/Module/Contact.php:898 msgid "View all common friends" msgstr "" -#: src/Module/Contact.php:902 +#: src/Module/Contact.php:908 msgid "Advanced Contact Settings" msgstr "" -#: src/Module/Contact.php:988 +#: src/Module/Contact.php:990 msgid "Mutual Friendship" msgstr "" -#: src/Module/Contact.php:993 +#: src/Module/Contact.php:995 msgid "is a fan of yours" msgstr "" -#: src/Module/Contact.php:998 +#: src/Module/Contact.php:1000 msgid "you are a fan of" msgstr "" -#: src/Module/Contact.php:1022 +#: src/Module/Contact.php:1024 msgid "Edit contact" msgstr "" -#: src/Module/Contact.php:1076 +#: src/Module/Contact.php:1078 msgid "Toggle Blocked status" msgstr "" -#: src/Module/Contact.php:1084 +#: src/Module/Contact.php:1086 msgid "Toggle Ignored status" msgstr "" -#: src/Module/Contact.php:1093 +#: src/Module/Contact.php:1095 msgid "Toggle Archive status" msgstr "" -#: src/Module/Contact.php:1101 +#: src/Module/Contact.php:1103 msgid "Delete contact" msgstr "" @@ -8807,23 +8831,23 @@ msgstr "" msgid "HTML::toMarkdown" msgstr "" -#: src/Module/Debug/Babel.php:159 +#: src/Module/Debug/Babel.php:159 src/Module/Debug/Babel.php:165 msgid "HTML::toPlaintext" msgstr "" -#: src/Module/Debug/Babel.php:167 +#: src/Module/Debug/Babel.php:173 msgid "Source text" msgstr "" -#: src/Module/Debug/Babel.php:168 +#: src/Module/Debug/Babel.php:174 msgid "BBCode" msgstr "" -#: src/Module/Debug/Babel.php:169 +#: src/Module/Debug/Babel.php:175 msgid "Markdown" msgstr "" -#: src/Module/Debug/Babel.php:170 +#: src/Module/Debug/Babel.php:176 msgid "HTML" msgstr "" @@ -8872,19 +8896,19 @@ msgstr "" msgid "Lookup address" msgstr "" -#: src/Module/Directory.php:66 +#: src/Module/Directory.php:61 msgid "No entries (some entries may be hidden)." msgstr "" -#: src/Module/Directory.php:85 +#: src/Module/Directory.php:80 msgid "Find on this site" msgstr "" -#: src/Module/Directory.php:87 +#: src/Module/Directory.php:82 msgid "Results for:" msgstr "" -#: src/Module/Directory.php:89 +#: src/Module/Directory.php:84 msgid "Site Directory" msgstr "" @@ -9049,142 +9073,142 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: src/Module/Install.php:158 +#: src/Module/Install.php:160 msgid "Friendica Communications Server - Setup" msgstr "" -#: src/Module/Install.php:169 +#: src/Module/Install.php:171 msgid "System check" msgstr "" -#: src/Module/Install.php:174 +#: src/Module/Install.php:176 msgid "Check again" msgstr "" -#: src/Module/Install.php:189 +#: src/Module/Install.php:191 msgid "Base settings" msgstr "" -#: src/Module/Install.php:196 +#: src/Module/Install.php:198 msgid "Host name" msgstr "" -#: src/Module/Install.php:198 +#: src/Module/Install.php:200 msgid "" "Overwrite this field in case the determinated hostname isn't right, " "otherweise leave it as is." msgstr "" -#: src/Module/Install.php:201 +#: src/Module/Install.php:203 msgid "Base path to installation" msgstr "" -#: src/Module/Install.php:203 +#: src/Module/Install.php:205 msgid "" "If the system cannot detect the correct path to your installation, enter the " "correct path here. This setting should only be set if you are using a " "restricted system and symbolic links to your webroot." msgstr "" -#: src/Module/Install.php:206 +#: src/Module/Install.php:208 msgid "Sub path of the URL" msgstr "" -#: src/Module/Install.php:208 +#: src/Module/Install.php:210 msgid "" "Overwrite this field in case the sub path determination isn't right, " "otherwise leave it as is. Leaving this field blank means the installation is " "at the base URL without sub path." msgstr "" -#: src/Module/Install.php:219 +#: src/Module/Install.php:221 msgid "Database connection" msgstr "" -#: src/Module/Install.php:220 +#: src/Module/Install.php:222 msgid "" "In order to install Friendica we need to know how to connect to your " "database." msgstr "" -#: src/Module/Install.php:221 +#: src/Module/Install.php:223 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: src/Module/Install.php:222 +#: src/Module/Install.php:224 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: src/Module/Install.php:229 +#: src/Module/Install.php:231 msgid "Database Server Name" msgstr "" -#: src/Module/Install.php:234 +#: src/Module/Install.php:236 msgid "Database Login Name" msgstr "" -#: src/Module/Install.php:240 +#: src/Module/Install.php:242 msgid "Database Login Password" msgstr "" -#: src/Module/Install.php:242 +#: src/Module/Install.php:244 msgid "For security reasons the password must not be empty" msgstr "" -#: src/Module/Install.php:245 +#: src/Module/Install.php:247 msgid "Database Name" msgstr "" -#: src/Module/Install.php:249 src/Module/Install.php:278 +#: src/Module/Install.php:251 src/Module/Install.php:280 msgid "Please select a default timezone for your website" msgstr "" -#: src/Module/Install.php:263 +#: src/Module/Install.php:265 msgid "Site settings" msgstr "" -#: src/Module/Install.php:273 +#: src/Module/Install.php:275 msgid "Site administrator email address" msgstr "" -#: src/Module/Install.php:275 +#: src/Module/Install.php:277 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: src/Module/Install.php:282 +#: src/Module/Install.php:284 msgid "System Language:" msgstr "" -#: src/Module/Install.php:284 +#: src/Module/Install.php:286 msgid "" "Set the default language for your Friendica installation interface and to " "send emails." msgstr "" -#: src/Module/Install.php:296 +#: src/Module/Install.php:298 msgid "Your Friendica site database has been installed." msgstr "" -#: src/Module/Install.php:304 +#: src/Module/Install.php:306 msgid "Installation finished" msgstr "" -#: src/Module/Install.php:326 +#: src/Module/Install.php:328 msgid "

What next

" msgstr "" -#: src/Module/Install.php:327 +#: src/Module/Install.php:329 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the worker." msgstr "" -#: src/Module/Install.php:330 +#: src/Module/Install.php:332 #, php-format msgid "" "Go to your new Friendica node registration page " @@ -9296,43 +9320,43 @@ msgid "" "important, please visit http://friendi.ca" msgstr "" -#: src/Module/Login.php:295 +#: src/Module/Login.php:286 msgid "Create a New Account" msgstr "" -#: src/Module/Login.php:328 +#: src/Module/Login.php:319 msgid "Password: " msgstr "" -#: src/Module/Login.php:329 +#: src/Module/Login.php:320 msgid "Remember me" msgstr "" -#: src/Module/Login.php:332 +#: src/Module/Login.php:323 msgid "Or login using OpenID: " msgstr "" -#: src/Module/Login.php:338 +#: src/Module/Login.php:329 msgid "Forgot your password?" msgstr "" -#: src/Module/Login.php:341 +#: src/Module/Login.php:332 msgid "Website Terms of Service" msgstr "" -#: src/Module/Login.php:342 +#: src/Module/Login.php:333 msgid "terms of service" msgstr "" -#: src/Module/Login.php:344 +#: src/Module/Login.php:335 msgid "Website Privacy Policy" msgstr "" -#: src/Module/Login.php:345 +#: src/Module/Login.php:336 msgid "privacy policy" msgstr "" -#: src/Module/Logout.php:27 +#: src/Module/Logout.php:38 msgid "Logged out." msgstr "" @@ -9389,18 +9413,18 @@ msgstr[1] "" msgid "All contacts" msgstr "" -#: src/Module/Profile.php:110 src/Module/Profile.php:113 -#: src/Protocol/OStatus.php:1295 +#: src/Module/Profile.php:111 src/Module/Profile.php:114 +#: src/Protocol/OStatus.php:1300 #, php-format msgid "%s's timeline" msgstr "" -#: src/Module/Profile.php:111 src/Protocol/OStatus.php:1299 +#: src/Module/Profile.php:112 src/Protocol/OStatus.php:1304 #, php-format msgid "%s's posts" msgstr "" -#: src/Module/Profile.php:112 src/Protocol/OStatus.php:1302 +#: src/Module/Profile.php:113 src/Protocol/OStatus.php:1307 #, php-format msgid "%s's comments" msgstr "" @@ -9498,79 +9522,170 @@ msgstr "" msgid "Your registration is pending approval by the site owner." msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:50 +#: src/Module/Settings/TwoFactor/AppSpecific.php:36 +#: src/Module/Settings/TwoFactor/Recovery.php:34 +#: src/Module/Settings/TwoFactor/Verify.php:41 +msgid "Please enter your password to access this page." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:54 +msgid "App-specific password generation failed: The description is empty." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:57 +msgid "" +"App-specific password generation failed: This description already exists." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:61 +msgid "New app-specific password generated." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:67 +msgid "App-specific passwords successfully revoked." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:77 +msgid "App-specific password successfully revoked." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:98 +msgid "Two-factor app-specific passwords" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:100 +msgid "" +"

App-specific passwords are randomly generated passwords used instead your " +"regular password to authenticate your account on third-party applications " +"that don't support two-factor authentication.

" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:101 +msgid "" +"Make sure to copy your new app-specific password now. You won’t be able to " +"see it again!" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:104 +msgid "Description" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:105 +msgid "Last Used" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:106 +msgid "Revoke" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:107 +msgid "Revoke All" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:110 +msgid "" +"When you generate a new app-specific password, you must use it right away, " +"it will be shown to you once after you generate it." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:111 +msgid "Generate new app-specific password" +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:112 +msgid "Friendiqa on my Fairphone 2..." +msgstr "" + +#: src/Module/Settings/TwoFactor/AppSpecific.php:113 +msgid "Generate" +msgstr "" + +#: src/Module/Settings/TwoFactor/Index.php:51 msgid "Two-factor authentication successfully disabled." msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:86 +#: src/Module/Settings/TwoFactor/Index.php:92 msgid "" "

Use an application on a mobile device to get two-factor authentication " "codes when prompted on login.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:90 +#: src/Module/Settings/TwoFactor/Index.php:96 msgid "Authenticator app" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:91 +#: src/Module/Settings/TwoFactor/Index.php:97 msgid "Configured" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:91 +#: src/Module/Settings/TwoFactor/Index.php:97 msgid "Not Configured" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:92 +#: src/Module/Settings/TwoFactor/Index.php:98 msgid "

You haven't finished configuring your authenticator app.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:93 +#: src/Module/Settings/TwoFactor/Index.php:99 msgid "

Your authenticator app is correctly configured.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:95 +#: src/Module/Settings/TwoFactor/Index.php:101 msgid "Recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:96 +#: src/Module/Settings/TwoFactor/Index.php:102 msgid "Remaining valid codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:98 +#: src/Module/Settings/TwoFactor/Index.php:104 msgid "" "

These one-use codes can replace an authenticator app code in case you " "have lost access to it.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:101 +#: src/Module/Settings/TwoFactor/Index.php:106 +msgid "App-specific passwords" +msgstr "" + +#: src/Module/Settings/TwoFactor/Index.php:107 +msgid "Generated app-specific passwords" +msgstr "" + +#: src/Module/Settings/TwoFactor/Index.php:109 +msgid "" +"

These randomly generated passwords allow you to authenticate on apps not " +"supporting two-factor authentication.

" +msgstr "" + +#: src/Module/Settings/TwoFactor/Index.php:112 msgid "Current password:" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:101 +#: src/Module/Settings/TwoFactor/Index.php:112 msgid "" "You need to provide your current password to change two-factor " "authentication settings." msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:102 +#: src/Module/Settings/TwoFactor/Index.php:113 msgid "Enable two-factor authentication" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:103 +#: src/Module/Settings/TwoFactor/Index.php:114 msgid "Disable two-factor authentication" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:104 +#: src/Module/Settings/TwoFactor/Index.php:115 msgid "Show recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:105 -msgid "Finish app configuration" +#: src/Module/Settings/TwoFactor/Index.php:116 +msgid "Manage app-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:34 -#: src/Module/Settings/TwoFactor/Verify.php:41 -msgid "Please enter your password to access this page." +#: src/Module/Settings/TwoFactor/Index.php:117 +msgid "Finish app configuration" msgstr "" #: src/Module/Settings/TwoFactor/Recovery.php:50 @@ -9608,7 +9723,7 @@ msgid "Two-factor authentication successfully activated." msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:67 -#: src/Module/TwoFactor/Recovery.php:46 src/Module/TwoFactor/Verify.php:41 +#: src/Module/TwoFactor/Recovery.php:46 src/Module/TwoFactor/Verify.php:43 msgid "Invalid code, please retry." msgstr "" @@ -9650,7 +9765,7 @@ msgid "" msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:126 -#: src/Module/TwoFactor/Verify.php:63 +#: src/Module/TwoFactor/Verify.php:67 msgid "Please enter a code from your authentication app" msgstr "" @@ -9768,7 +9883,7 @@ msgid "" "to your mobile device.

" msgstr "" -#: src/Module/TwoFactor/Recovery.php:67 src/Module/TwoFactor/Verify.php:62 +#: src/Module/TwoFactor/Recovery.php:67 src/Module/TwoFactor/Verify.php:66 #, php-format msgid "" "Don’t have your phone? Enter a two-factor recovery code" @@ -9782,13 +9897,13 @@ msgstr "" msgid "Submit recovery code and complete login" msgstr "" -#: src/Module/TwoFactor/Verify.php:61 +#: src/Module/TwoFactor/Verify.php:63 msgid "" "

Open the two-factor authentication app on your device to get an " "authentication code and verify your identity.

" msgstr "" -#: src/Module/TwoFactor/Verify.php:64 +#: src/Module/TwoFactor/Verify.php:68 msgid "Verify code and complete login" msgstr "" @@ -9957,169 +10072,169 @@ msgid "" "features and resources." msgstr "" -#: src/Object/Post.php:137 +#: src/Object/Post.php:138 msgid "This entry was edited" msgstr "" -#: src/Object/Post.php:157 +#: src/Object/Post.php:158 msgid "Private Message" msgstr "" -#: src/Object/Post.php:199 +#: src/Object/Post.php:200 msgid "Delete locally" msgstr "" -#: src/Object/Post.php:202 +#: src/Object/Post.php:203 msgid "Delete globally" msgstr "" -#: src/Object/Post.php:202 +#: src/Object/Post.php:203 msgid "Remove locally" msgstr "" -#: src/Object/Post.php:216 +#: src/Object/Post.php:217 msgid "save to folder" msgstr "" -#: src/Object/Post.php:251 +#: src/Object/Post.php:252 msgid "I will attend" msgstr "" -#: src/Object/Post.php:251 +#: src/Object/Post.php:252 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:251 +#: src/Object/Post.php:252 msgid "I might attend" msgstr "" -#: src/Object/Post.php:279 +#: src/Object/Post.php:280 msgid "ignore thread" msgstr "" -#: src/Object/Post.php:280 +#: src/Object/Post.php:281 msgid "unignore thread" msgstr "" -#: src/Object/Post.php:281 +#: src/Object/Post.php:282 msgid "toggle ignore status" msgstr "" -#: src/Object/Post.php:292 +#: src/Object/Post.php:293 msgid "add star" msgstr "" -#: src/Object/Post.php:293 +#: src/Object/Post.php:294 msgid "remove star" msgstr "" -#: src/Object/Post.php:294 +#: src/Object/Post.php:295 msgid "toggle star status" msgstr "" -#: src/Object/Post.php:297 +#: src/Object/Post.php:298 msgid "starred" msgstr "" -#: src/Object/Post.php:301 +#: src/Object/Post.php:302 msgid "add tag" msgstr "" -#: src/Object/Post.php:312 +#: src/Object/Post.php:313 msgid "like" msgstr "" -#: src/Object/Post.php:313 +#: src/Object/Post.php:314 msgid "dislike" msgstr "" -#: src/Object/Post.php:316 +#: src/Object/Post.php:317 msgid "Share this" msgstr "" -#: src/Object/Post.php:316 +#: src/Object/Post.php:317 msgid "share" msgstr "" -#: src/Object/Post.php:384 +#: src/Object/Post.php:385 msgid "to" msgstr "" -#: src/Object/Post.php:385 +#: src/Object/Post.php:386 msgid "via" msgstr "" -#: src/Object/Post.php:386 +#: src/Object/Post.php:387 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:387 +#: src/Object/Post.php:388 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:420 +#: src/Object/Post.php:421 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:435 +#: src/Object/Post.php:436 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:436 +#: src/Object/Post.php:437 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:437 +#: src/Object/Post.php:438 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:438 +#: src/Object/Post.php:439 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:439 +#: src/Object/Post.php:440 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:459 +#: src/Object/Post.php:460 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:460 +#: src/Object/Post.php:461 msgid "Show more" msgstr "" -#: src/Object/Post.php:461 +#: src/Object/Post.php:462 msgid "Show fewer" msgstr "" -#: src/Protocol/Diaspora.php:2438 +#: src/Protocol/Diaspora.php:2476 msgid "Sharing notification from Diaspora network" msgstr "" -#: src/Protocol/Diaspora.php:3599 +#: src/Protocol/Diaspora.php:3621 msgid "Attachments:" msgstr "" -#: src/Protocol/OStatus.php:1856 +#: src/Protocol/OStatus.php:1861 #, php-format msgid "%s is now following %s." msgstr "" -#: src/Protocol/OStatus.php:1857 +#: src/Protocol/OStatus.php:1862 msgid "following" msgstr "" -#: src/Protocol/OStatus.php:1860 +#: src/Protocol/OStatus.php:1865 #, php-format msgid "%s stopped following %s." msgstr "" -#: src/Protocol/OStatus.php:1861 +#: src/Protocol/OStatus.php:1866 msgid "stopped following" msgstr "" @@ -10189,7 +10304,7 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: src/Worker/Delivery.php:450 +#: src/Worker/Delivery.php:472 msgid "(no subject)" msgstr "" @@ -10231,69 +10346,69 @@ msgstr "" msgid "Variations" msgstr "" -#: view/theme/frio/config.php:105 +#: view/theme/frio/config.php:107 msgid "Custom" msgstr "" -#: view/theme/frio/config.php:117 +#: view/theme/frio/config.php:119 msgid "Note" msgstr "" -#: view/theme/frio/config.php:117 +#: view/theme/frio/config.php:119 msgid "Check image permissions if all users are allowed to see the image" msgstr "" -#: view/theme/frio/config.php:123 +#: view/theme/frio/config.php:125 msgid "Select color scheme" msgstr "" -#: view/theme/frio/config.php:124 +#: view/theme/frio/config.php:126 msgid "Copy or paste schemestring" msgstr "" -#: view/theme/frio/config.php:124 +#: view/theme/frio/config.php:126 msgid "" "You can copy this string to share your theme with others. Pasting here " "applies the schemestring" msgstr "" -#: view/theme/frio/config.php:125 +#: view/theme/frio/config.php:127 msgid "Navigation bar background color" msgstr "" -#: view/theme/frio/config.php:126 +#: view/theme/frio/config.php:128 msgid "Navigation bar icon color " msgstr "" -#: view/theme/frio/config.php:127 +#: view/theme/frio/config.php:129 msgid "Link color" msgstr "" -#: view/theme/frio/config.php:128 +#: view/theme/frio/config.php:130 msgid "Set the background color" msgstr "" -#: view/theme/frio/config.php:129 +#: view/theme/frio/config.php:131 msgid "Content background opacity" msgstr "" -#: view/theme/frio/config.php:130 +#: view/theme/frio/config.php:132 msgid "Set the background image" msgstr "" -#: view/theme/frio/config.php:131 +#: view/theme/frio/config.php:133 msgid "Background image style" msgstr "" -#: view/theme/frio/config.php:136 +#: view/theme/frio/config.php:138 msgid "Login page background image" msgstr "" -#: view/theme/frio/config.php:140 +#: view/theme/frio/config.php:142 msgid "Login page background color" msgstr "" -#: view/theme/frio/config.php:140 +#: view/theme/frio/config.php:142 msgid "Leave background image and color empty for theme defaults" msgstr "" @@ -10333,11 +10448,11 @@ msgstr "" msgid "Repeat image to fill the screen." msgstr "" -#: view/theme/frio/theme.php:239 +#: view/theme/frio/theme.php:238 msgid "Guest" msgstr "" -#: view/theme/frio/theme.php:244 +#: view/theme/frio/theme.php:243 msgid "Visitor" msgstr "" From c32d6353263dcb5473981906576b95e07dc4495e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 26 Jul 2019 21:16:15 -0400 Subject: [PATCH 5/6] Revert heading changes in admin/blocklist/server.tpl --- view/templates/admin/blocklist/server.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/templates/admin/blocklist/server.tpl b/view/templates/admin/blocklist/server.tpl index d3cf5c4250..43d006e090 100644 --- a/view/templates/admin/blocklist/server.tpl +++ b/view/templates/admin/blocklist/server.tpl @@ -4,12 +4,12 @@ }
-

{{$title}} - {{$page}}

+

{{$title}} - {{$page}}

{{$intro}}

{{$public nofilter}}

{{$syntax nofilter}} -

{{$addtitle}}

+

{{$addtitle}}

{{include file="field_input.tpl" field=$newdomain}} @@ -20,7 +20,7 @@
{{if $entries}} -

{{$currenttitle}}

+

{{$currenttitle}}

{{$currentintro}}

From b03d1fece50068f22d8615835bab4dc1a712d895 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 26 Jul 2019 21:16:28 -0400 Subject: [PATCH 6/6] Update ServerBlock console test --- tests/src/Console/ServerBlockConsoleTest.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/src/Console/ServerBlockConsoleTest.php b/tests/src/Console/ServerBlockConsoleTest.php index 11856eac16..7002ca0fab 100644 --- a/tests/src/Console/ServerBlockConsoleTest.php +++ b/tests/src/Console/ServerBlockConsoleTest.php @@ -316,15 +316,20 @@ CONS; $txt = $this->dumpExecute($console); $help = << [-h|--help|-?] [-v] - bin/console serverblock remove [-h|--help|-?] [-v] + bin/console serverblock add [-h|--help|-?] [-v] + bin/console serverblock remove [-h|--help|-?] [-v] Description - With this tool, you can list the current blocked servers - or you can add / remove a blocked server from the list + With this tool, you can list the current blocked server domain patterns + or you can add / remove a blocked server domain pattern from the list. + + Patterns are case-insensitive shell wildcard comprising the following special characters: + - * : Any number of characters + - ? : Any single character + - [...] : char1 or char2 or... Options -h|--help|-? Show help information