From bb69b916a8f06aeb3b7b44c9337830972e5920d6 Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:03:52 +0200 Subject: [PATCH 01/12] Updated docs --- doc/Account-Basics.md | 6 +++--- doc/Settings.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index f03a488b5..975fd8fb7 100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -23,10 +23,10 @@ If you do not have an OpenID address or do not wish to use OpenID, leave this fi If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'. Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in. -### Your Full Name +### Your Display Name -Please provide your full name **as you would like it to be displayed on this system**. -Most people use their real name for this, but you're under no obligation to do so yourself. +Please provide your display name **as you would like it to be displayed on this system**. +Some people use their real name for this, but you're under no obligation to do so yourself. ### Email Address diff --git a/doc/Settings.md b/doc/Settings.md index 3ec2144e7..00c8be2c2 100644 --- a/doc/Settings.md +++ b/doc/Settings.md @@ -77,11 +77,11 @@ Additionally to the setting in the admin panel, you can decide if registrations To enable invitation based registration, you have to set the `invitation_only` setting to `true` in the `system` section of the [config/local.config.php](/help/Config) file. If you want to use this method, the registration policy has to be set to either *open* or *requires approval*. -#### Check Full Names +#### Check Display Names You may find a lot of spammers trying to register on your site. -During testing we discovered that since these registrations were automatic, the "Full Name" field was often set to just an account name with no space between first and last name. -If you would like to support people with only one name as their full name, you may change this setting to true. +During testing we discovered that since these registrations were automatic, the "Display Name" field was often set to just an account name with no space between first and last name. +If you would like to support people with only one name as their display name, you can leave this setting set to false. Default is false. #### OpenID From c664907dbf6cf24eacee27207ec7c09d8eccc771 Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:12:59 +0200 Subject: [PATCH 02/12] Updated User.php --- src/Model/User.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Model/User.php b/src/Model/User.php index 18fecf080..0d7c1189b 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -1131,7 +1131,7 @@ class User throw new Exception(DI::l10n()->tt('Username should be at most %s character.', 'Username should be at most %s characters.', $username_max_length)); } - // So now we are just looking for a space in the full name. + // So now we are just looking for a space in the display name. $loose_reg = DI::config()->get('system', 'no_regfullname'); if (!$loose_reg) { $username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8'); @@ -1501,10 +1501,9 @@ class User You may also wish to add some basic information to your default profile (on the "Profiles" page) so that other people can easily find you. - We recommend setting your full name, adding a profile photo, - adding some profile "keywords" (very useful in making new friends) - and - perhaps what country you live in; if you do not wish to be more specific - than that. + We recommend adding a profile photo, adding some profile "keywords" + (very useful in making new friends) - and perhaps what country you live in; + if you do not wish to be more specific than that. We fully respect your right to privacy, and none of these items are necessary. If you are new and do not know anybody here, they may help @@ -1605,10 +1604,9 @@ class User You may also wish to add some basic information to your default profile ' . "\x28" . 'on the "Profiles" page' . "\x29" . ' so that other people can easily find you. - We recommend setting your full name, adding a profile photo, - adding some profile "keywords" ' . "\x28" . 'very useful in making new friends' . "\x29" . ' - and - perhaps what country you live in; if you do not wish to be more specific - than that. + We recommend adding a profile photo, adding some profile "keywords" ' . "\x28" . 'very useful + in making new friends' . "\x29" . ' - and perhaps what country you live in; if you do not wish + to be more specific than that. We fully respect your right to privacy, and none of these items are necessary. If you are new and do not know anybody here, they may help From 4e5041af13c6d9c12adcbe2d4e0ad89dd058a560 Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:18:09 +0200 Subject: [PATCH 03/12] Updated source string in Site.php --- src/Module/Admin/Site.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index a99619c81..c0fb679da 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -462,7 +462,7 @@ class Site extends BaseAdmin '$allow_users_remote_self'=> ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('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.')], '$enable_multi_reg' => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')], '$enable_openid' => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')], - '$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable Fullname check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Enable check to only allow users to register with a space between the first name and the last name in their full name.')], + '$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable Fullname check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Check the box to only allow users to register which display name consists of at least two strings.')], '$register_notification' => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')], '$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices], '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')], From 5b8f307d4cfaa9ea3b1f323705f9007a8ebf3a6a Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:23:07 +0200 Subject: [PATCH 04/12] Removed Full name from Register.php --- src/Module/Register.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Register.php b/src/Module/Register.php index a62525a98..c85a04dfa 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -155,7 +155,7 @@ class Register extends BaseModule '$fillext' => $fillext, '$oidlabel' => $oidlabel, '$openid' => $openid_url, - '$namelabel' => DI::l10n()->t('Your Full Name (e.g. Joe Smith, real or real-looking): '), + '$namelabel' => DI::l10n()->t('Your Display Name (as you would like it to be displayed on this system), '$addrlabel' => DI::l10n()->t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'), '$addrlabel2' => DI::l10n()->t('Please repeat your e-mail address:'), '$ask_password' => $ask_password, From 4eea2325818e80ccc34f2056d95c5efa83069dd7 Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:26:54 +0200 Subject: [PATCH 05/12] Removed Full name from Notify.php --- src/Navigation/Notifications/Repository/Notify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php index 2f2b0df7d..94466abdb 100644 --- a/src/Navigation/Notifications/Repository/Notify.php +++ b/src/Navigation/Notifications/Repository/Notify.php @@ -476,7 +476,7 @@ class Notify extends BaseRepository '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = $l10n->t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)", + $body = $l10n->t("Display Name: %s\nSite Location: %s\nLogin Name: %s (%s)", $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick'] @@ -497,7 +497,7 @@ class Notify extends BaseRepository '[url='.$params['source_link'].']'.$params['source_name'].'[/url]' ); - $body = $l10n->t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)", + $body = $l10n->t("Display Name: %s\nSite Location: %s\nLogin Name: %s (%s)", $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick'] From 4d4f352ed968aa2141ce3858a36f4f767c5121d1 Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:35:02 +0200 Subject: [PATCH 06/12] Update settings.config.php --- static/settings.config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/settings.config.php b/static/settings.config.php index 335b70256..5006a417b 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -161,7 +161,7 @@ return [ 'min_memory' => 0, // no_regfullname (Boolean) - // Allow pseudonyms (true) or enforce a space between first name and last name in Full name, as an anti spam measure (false). + // Allow pseudonyms (true) or allow users to register which display name consists of at least two strings, as an anti spam measure (false). 'no_regfullname' => true, // no_oembed_rich_content (Boolean) From b4121cb6fd8916e10ec13f6cfaf476d3780949ed Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:39:14 +0200 Subject: [PATCH 07/12] Update messages.po --- view/lang/C/messages.po | 462 ++++++++++++++++++---------------------- 1 file changed, 213 insertions(+), 249 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 65bcb0c10..8de68a669 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-15 13:49+0000\n" +"POT-Creation-Date: 2023-10-27 11:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -602,7 +602,7 @@ msgid "Rotate CCW (left)" msgstr "" #: mod/photos.php:1139 mod/photos.php:1195 mod/photos.php:1275 -#: src/Module/Contact.php:619 src/Module/Item/Compose.php:188 +#: src/Module/Contact.php:618 src/Module/Item/Compose.php:188 #: src/Object/Post.php:1103 msgid "This is you" msgstr "" @@ -663,7 +663,7 @@ msgstr "" msgid "No system theme config value set." msgstr "" -#: src/App.php:580 +#: src/App.php:581 msgid "Apologies but the website is unavailable at the moment." msgstr "" @@ -785,33 +785,33 @@ msgstr "" msgid "You must be logged in to use addons. " msgstr "" -#: src/BaseModule.php:403 +#: src/BaseModule.php:407 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: src/BaseModule.php:430 +#: src/BaseModule.php:434 msgid "All contacts" msgstr "" -#: src/BaseModule.php:435 src/Content/Conversation/Factory/Channel.php:45 -#: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:415 +#: src/BaseModule.php:439 src/Content/Conversation/Factory/Channel.php:45 +#: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:414 #: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149 #: src/Module/Settings/Channels.php:120 msgid "Followers" msgstr "" -#: src/BaseModule.php:440 src/Content/Widget.php:240 src/Module/Contact.php:418 +#: src/BaseModule.php:444 src/Content/Widget.php:240 src/Module/Contact.php:417 #: src/Module/Settings/Channels.php:119 msgid "Following" msgstr "" -#: src/BaseModule.php:445 src/Content/Widget.php:241 src/Module/Contact.php:421 +#: src/BaseModule.php:449 src/Content/Widget.php:241 src/Module/Contact.php:420 msgid "Mutual friends" msgstr "" -#: src/BaseModule.php:453 +#: src/BaseModule.php:457 msgid "Common" msgstr "" @@ -1381,14 +1381,14 @@ msgstr "" msgid "Public post" msgstr "" -#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:132 +#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:131 #: src/Model/Profile.php:479 src/Module/Admin/Logs/View.php:92 #: src/Module/Post/Edit.php:181 msgid "Message" msgstr "" #: src/Content/Conversation.php:425 src/Module/Post/Edit.php:182 -#: src/Module/Settings/TwoFactor/Trusted.php:140 +#: src/Module/Settings/TwoFactor/Trusted.php:143 msgid "Browser" msgstr "" @@ -1820,7 +1820,7 @@ msgstr "" msgid "Send PM" msgstr "" -#: src/Content/Item.php:435 src/Module/Contact.php:468 +#: src/Content/Item.php:435 src/Module/Contact.php:467 #: src/Module/Contact/Profile.php:511 #: src/Module/Moderation/Blocklist/Contact.php:116 #: src/Module/Moderation/Users/Active.php:137 @@ -1828,7 +1828,7 @@ msgstr "" msgid "Block" msgstr "" -#: src/Content/Item.php:436 src/Module/Contact.php:469 +#: src/Content/Item.php:436 src/Module/Contact.php:468 #: src/Module/Contact/Profile.php:519 #: src/Module/Notifications/Introductions.php:134 #: src/Module/Notifications/Introductions.php:206 @@ -1836,7 +1836,7 @@ msgstr "" msgid "Ignore" msgstr "" -#: src/Content/Item.php:437 src/Module/Contact.php:470 +#: src/Content/Item.php:437 src/Module/Contact.php:469 #: src/Module/Contact/Profile.php:527 msgid "Collapse" msgstr "" @@ -1894,7 +1894,7 @@ msgid "Sign in" msgstr "" #: src/Content/Nav.php:229 src/Module/BaseProfile.php:57 -#: src/Module/Contact.php:512 +#: src/Module/Contact.php:511 msgid "Conversations" msgstr "" @@ -1903,7 +1903,7 @@ msgid "Conversations you started" msgstr "" #: src/Content/Nav.php:230 src/Module/BaseProfile.php:49 -#: src/Module/BaseSettings.php:98 src/Module/Contact.php:504 +#: src/Module/BaseSettings.php:98 src/Module/Contact.php:503 #: src/Module/Contact/Profile.php:419 src/Module/Profile/Profile.php:268 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:230 msgid "Profile" @@ -1923,7 +1923,7 @@ msgid "Your photos" msgstr "" #: src/Content/Nav.php:232 src/Module/BaseProfile.php:73 -#: src/Module/BaseProfile.php:76 src/Module/Contact.php:528 +#: src/Module/BaseProfile.php:76 src/Module/Contact.php:527 #: view/theme/frio/theme.php:235 msgid "Media" msgstr "" @@ -1960,8 +1960,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: src/Content/Nav.php:255 src/Module/Register.php:168 -#: src/Module/Security/Login.php:124 +#: src/Content/Nav.php:255 src/Module/Security/Login.php:124 msgid "Register" msgstr "" @@ -1970,10 +1969,10 @@ msgid "Create an account" msgstr "" #: src/Content/Nav.php:261 src/Module/Help.php:67 -#: src/Module/Settings/TwoFactor/AppSpecific.php:129 -#: src/Module/Settings/TwoFactor/Index.php:118 -#: src/Module/Settings/TwoFactor/Recovery.php:107 -#: src/Module/Settings/TwoFactor/Verify.php:146 view/theme/vier/theme.php:240 +#: src/Module/Settings/TwoFactor/AppSpecific.php:132 +#: src/Module/Settings/TwoFactor/Index.php:139 +#: src/Module/Settings/TwoFactor/Recovery.php:110 +#: src/Module/Settings/TwoFactor/Verify.php:149 view/theme/vier/theme.php:240 msgid "Help" msgstr "" @@ -2009,8 +2008,8 @@ msgstr "" #: src/Content/Nav.php:274 src/Content/Nav.php:329 #: src/Content/Text/HTML.php:876 src/Module/BaseProfile.php:127 -#: src/Module/BaseProfile.php:130 src/Module/Contact.php:427 -#: src/Module/Contact.php:536 view/theme/frio/theme.php:243 +#: src/Module/BaseProfile.php:130 src/Module/Contact.php:426 +#: src/Module/Contact.php:535 view/theme/frio/theme.php:243 msgid "Contacts" msgstr "" @@ -2040,8 +2039,7 @@ msgid "Information about this friendica instance" msgstr "" #: src/Content/Nav.php:301 src/Module/Admin/Tos.php:78 -#: src/Module/BaseAdmin.php:95 src/Module/Register.php:176 -#: src/Module/Tos.php:101 +#: src/Module/BaseAdmin.php:95 src/Module/Tos.php:101 msgid "Terms of Service" msgstr "" @@ -2222,7 +2220,7 @@ msgstr "" msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:128 +#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:127 #: src/Model/Profile.php:473 src/Module/Contact/Profile.php:471 msgid "Follow" msgstr "" @@ -2262,7 +2260,7 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: src/Content/Widget.php:82 src/Module/Contact.php:461 +#: src/Content/Widget.php:82 src/Module/Contact.php:460 #: src/Module/Directory.php:96 view/theme/vier/theme.php:197 msgid "Find" msgstr "" @@ -2294,7 +2292,7 @@ msgid "Local Directory" msgstr "" #: src/Content/Widget.php:215 src/Model/Circle.php:601 -#: src/Module/Contact.php:401 src/Module/Welcome.php:76 +#: src/Module/Contact.php:400 src/Module/Welcome.php:76 msgid "Circles" msgstr "" @@ -2302,7 +2300,7 @@ msgstr "" msgid "Everyone" msgstr "" -#: src/Content/Widget.php:242 src/Module/Contact.php:424 +#: src/Content/Widget.php:242 src/Module/Contact.php:423 msgid "No relationship" msgstr "" @@ -2311,7 +2309,7 @@ msgid "Relationships" msgstr "" #: src/Content/Widget.php:249 src/Module/Circle.php:292 -#: src/Module/Contact.php:345 +#: src/Module/Contact.php:344 msgid "All Contacts" msgstr "" @@ -2421,27 +2419,27 @@ msgstr[1] "" msgid "More Trending Tags" msgstr "" -#: src/Content/Widget/VCard.php:107 src/Model/Contact.php:1204 +#: src/Content/Widget/VCard.php:106 src/Model/Contact.php:1204 #: src/Model/Profile.php:457 msgid "Post to group" msgstr "" -#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1209 +#: src/Content/Widget/VCard.php:110 src/Model/Contact.php:1209 #: src/Model/Profile.php:462 src/Module/Moderation/Item/Source.php:85 msgid "Mention" msgstr "" -#: src/Content/Widget/VCard.php:121 src/Model/Profile.php:376 +#: src/Content/Widget/VCard.php:120 src/Model/Profile.php:376 #: src/Module/Contact/Profile.php:408 src/Module/Profile/Profile.php:199 msgid "XMPP:" msgstr "" -#: src/Content/Widget/VCard.php:122 src/Model/Profile.php:377 +#: src/Content/Widget/VCard.php:121 src/Model/Profile.php:377 #: src/Module/Contact/Profile.php:410 src/Module/Profile/Profile.php:203 msgid "Matrix:" msgstr "" -#: src/Content/Widget/VCard.php:123 src/Model/Event.php:82 +#: src/Content/Widget/VCard.php:122 src/Model/Event.php:82 #: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:963 #: src/Model/Profile.php:371 src/Module/Contact/Profile.php:406 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187 @@ -2449,18 +2447,18 @@ msgstr "" msgid "Location:" msgstr "" -#: src/Content/Widget/VCard.php:126 src/Model/Profile.php:486 +#: src/Content/Widget/VCard.php:125 src/Model/Profile.php:486 #: src/Module/Notifications/Introductions.php:201 msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:130 src/Model/Contact.php:1237 +#: src/Content/Widget/VCard.php:129 src/Model/Contact.php:1237 #: src/Model/Contact.php:1249 src/Model/Profile.php:475 #: src/Module/Contact/Profile.php:463 msgid "Unfollow" msgstr "" -#: src/Content/Widget/VCard.php:136 src/Model/Contact.php:1206 +#: src/Content/Widget/VCard.php:135 src/Model/Contact.php:1206 #: src/Model/Profile.php:459 msgid "View group" msgstr "" @@ -2733,8 +2731,8 @@ msgstr "" #: src/Core/Installer.php:516 msgid "" -"The web installer needs to be able to create a file called \"local.config.php" -"\" in the \"config\" folder of your web server and it is unable to do so." +"The web installer needs to be able to create a file called \"local.config." +"php\" in the \"config\" folder of your web server and it is unable to do so." msgstr "" #: src/Core/Installer.php:517 @@ -3799,12 +3797,10 @@ msgid "" "\t\tYou may also wish to add some basic information to your default profile\n" "\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" "\n" -"\t\tWe recommend setting your full name, adding a profile photo,\n" -"\t\tadding some profile \"keywords\" (very useful in making new friends) - " -"and\n" -"\t\tperhaps what country you live in; if you do not wish to be more " -"specific\n" -"\t\tthan that.\n" +"\t\tWe recommend adding a profile photo, adding some profile \"keywords\" \n" +"\t\t(very useful in making new friends) - and perhaps what country you live " +"in; \n" +"\t\tif you do not wish to be more specific than that.\n" "\n" "\t\tWe fully respect your right to privacy, and none of these items are " "necessary.\n" @@ -3817,12 +3813,12 @@ msgid "" "\t\tThank you and welcome to %4$s." msgstr "" -#: src/Model/User.php:1522 src/Model/User.php:1629 +#: src/Model/User.php:1521 src/Model/User.php:1627 #, php-format msgid "Registration details for %s" msgstr "" -#: src/Model/User.php:1542 +#: src/Model/User.php:1541 #, php-format msgid "" "\n" @@ -3838,12 +3834,12 @@ msgid "" "\t\t" msgstr "" -#: src/Model/User.php:1561 +#: src/Model/User.php:1560 #, php-format msgid "Registration at %s" msgstr "" -#: src/Model/User.php:1585 +#: src/Model/User.php:1584 #, php-format msgid "" "\n" @@ -3852,7 +3848,7 @@ msgid "" "\t\t\t" msgstr "" -#: src/Model/User.php:1593 +#: src/Model/User.php:1592 #, php-format msgid "" "\n" @@ -3873,12 +3869,11 @@ msgid "" "profile\n" "\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" "\n" -"\t\t\tWe recommend setting your full name, adding a profile photo,\n" -"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - " -"and\n" -"\t\t\tperhaps what country you live in; if you do not wish to be more " -"specific\n" -"\t\t\tthan that.\n" +"\t\t\tWe recommend adding a profile photo, adding some profile " +"\"keywords\" (very useful\n" +"\t\t\tin making new friends) - and perhaps what country you live in; if you " +"do not wish\n" +"\t\t\tto be more specific than that.\n" "\n" "\t\t\tWe fully respect your right to privacy, and none of these items are " "necessary.\n" @@ -3891,7 +3886,7 @@ msgid "" "\t\t\tThank you and welcome to %2$s." msgstr "" -#: src/Model/User.php:1656 +#: src/Model/User.php:1654 msgid "" "User with delegates can't be removed, please remove delegate users first" msgstr "" @@ -4421,7 +4416,7 @@ msgid "Policies" msgstr "" #: src/Module/Admin/Site.php:406 src/Module/Calendar/Event/Form.php:252 -#: src/Module/Contact.php:547 src/Module/Profile/Profile.php:276 +#: src/Module/Contact.php:546 src/Module/Profile/Profile.php:276 msgid "Advanced" msgstr "" @@ -4855,8 +4850,8 @@ msgstr "" #: src/Module/Admin/Site.php:465 msgid "" -"Enable check to only allow users to register with a space between the first " -"name and the last name in their full name." +"Check the box to only allow users to register which display name consists of " +"at least two strings." msgstr "" #: src/Module/Admin/Site.php:466 @@ -5220,7 +5215,7 @@ msgid "" msgstr "" #: src/Module/Admin/Site.php:513 src/Module/Contact/Profile.php:309 -#: src/Module/Settings/TwoFactor/Index.php:125 +#: src/Module/Settings/TwoFactor/Index.php:146 msgid "Disabled" msgstr "" @@ -5365,9 +5360,9 @@ msgstr "" #: src/Module/Admin/Summary.php:98 msgid "" -"The last update failed. Please run \"php bin/console.php dbstructure update" -"\" from the command line and have a look at the errors that might appear. " -"(Some of the errors are possibly inside the logfile.)" +"The last update failed. Please run \"php bin/console.php dbstructure " +"update\" from the command line and have a look at the errors that might " +"appear. (Some of the errors are possibly inside the logfile.)" msgstr "" #: src/Module/Admin/Summary.php:102 @@ -5518,8 +5513,8 @@ msgstr "" #, php-format msgid "" "Show some informations regarding the needed information to operate the node " -"according e.g. to EU-GDPR." +"according e.g. to EU-GDPR." msgstr "" #: src/Module/Admin/Tos.php:81 @@ -5736,7 +5731,7 @@ msgstr "" msgid "Item Source" msgstr "" -#: src/Module/BaseProfile.php:52 src/Module/Contact.php:507 +#: src/Module/BaseProfile.php:52 src/Module/Contact.php:506 msgid "Profile Details" msgstr "" @@ -5792,7 +5787,7 @@ msgid "Account" msgstr "" #: src/Module/BaseSettings.php:85 src/Module/Security/TwoFactor/Verify.php:96 -#: src/Module/Settings/TwoFactor/Index.php:117 +#: src/Module/Settings/TwoFactor/Index.php:138 msgid "Two-factor authentication" msgstr "" @@ -5880,8 +5875,8 @@ msgstr "" #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148 #: src/Module/Security/TwoFactor/Verify.php:101 #: src/Module/Settings/Channels.php:130 src/Module/Settings/Channels.php:146 -#: src/Module/Settings/TwoFactor/Index.php:140 -#: src/Module/Settings/TwoFactor/Verify.php:155 +#: src/Module/Settings/TwoFactor/Index.php:161 +#: src/Module/Settings/TwoFactor/Verify.php:158 msgid "Required" msgstr "" @@ -6047,149 +6042,149 @@ msgstr "" msgid "Add contact to circle" msgstr "" -#: src/Module/Contact.php:97 +#: src/Module/Contact.php:96 #, php-format msgid "%d contact edited." msgid_plural "%d contacts edited." msgstr[0] "" msgstr[1] "" -#: src/Module/Contact.php:348 +#: src/Module/Contact.php:347 msgid "Show all contacts" msgstr "" -#: src/Module/Contact.php:353 src/Module/Contact.php:432 +#: src/Module/Contact.php:352 src/Module/Contact.php:431 #: src/Module/Moderation/BaseUsers.php:85 msgid "Pending" msgstr "" -#: src/Module/Contact.php:356 +#: src/Module/Contact.php:355 msgid "Only show pending contacts" msgstr "" -#: src/Module/Contact.php:361 src/Module/Contact.php:435 +#: src/Module/Contact.php:360 src/Module/Contact.php:434 #: src/Module/Moderation/BaseUsers.php:93 msgid "Blocked" msgstr "" -#: src/Module/Contact.php:364 +#: src/Module/Contact.php:363 msgid "Only show blocked contacts" msgstr "" -#: src/Module/Contact.php:369 src/Module/Contact.php:441 +#: src/Module/Contact.php:368 src/Module/Contact.php:440 #: src/Module/Settings/Server/Index.php:107 src/Object/Post.php:369 msgid "Ignored" msgstr "" -#: src/Module/Contact.php:372 +#: src/Module/Contact.php:371 msgid "Only show ignored contacts" msgstr "" -#: src/Module/Contact.php:377 src/Module/Contact.php:444 +#: src/Module/Contact.php:376 src/Module/Contact.php:443 msgid "Collapsed" msgstr "" -#: src/Module/Contact.php:380 +#: src/Module/Contact.php:379 msgid "Only show collapsed contacts" msgstr "" -#: src/Module/Contact.php:385 src/Module/Contact.php:447 +#: src/Module/Contact.php:384 src/Module/Contact.php:446 msgid "Archived" msgstr "" -#: src/Module/Contact.php:388 +#: src/Module/Contact.php:387 msgid "Only show archived contacts" msgstr "" -#: src/Module/Contact.php:393 src/Module/Contact.php:438 +#: src/Module/Contact.php:392 src/Module/Contact.php:437 msgid "Hidden" msgstr "" -#: src/Module/Contact.php:396 +#: src/Module/Contact.php:395 msgid "Only show hidden contacts" msgstr "" -#: src/Module/Contact.php:404 +#: src/Module/Contact.php:403 msgid "Organize your contact circles" msgstr "" -#: src/Module/Contact.php:459 +#: src/Module/Contact.php:458 msgid "Search your contacts" msgstr "" -#: src/Module/Contact.php:460 src/Module/Search/Index.php:207 +#: src/Module/Contact.php:459 src/Module/Search/Index.php:207 #, php-format msgid "Results for: %s" msgstr "" -#: src/Module/Contact.php:467 +#: src/Module/Contact.php:466 msgid "Update" msgstr "" -#: src/Module/Contact.php:468 src/Module/Contact/Profile.php:511 +#: src/Module/Contact.php:467 src/Module/Contact/Profile.php:511 #: src/Module/Moderation/Blocklist/Contact.php:117 #: src/Module/Moderation/Users/Blocked.php:138 #: src/Module/Moderation/Users/Index.php:154 msgid "Unblock" msgstr "" -#: src/Module/Contact.php:469 src/Module/Contact/Profile.php:519 +#: src/Module/Contact.php:468 src/Module/Contact/Profile.php:519 msgid "Unignore" msgstr "" -#: src/Module/Contact.php:470 src/Module/Contact/Profile.php:527 +#: src/Module/Contact.php:469 src/Module/Contact/Profile.php:527 msgid "Uncollapse" msgstr "" -#: src/Module/Contact.php:472 +#: src/Module/Contact.php:471 msgid "Batch Actions" msgstr "" -#: src/Module/Contact.php:515 +#: src/Module/Contact.php:514 msgid "Conversations started by this contact" msgstr "" -#: src/Module/Contact.php:520 +#: src/Module/Contact.php:519 msgid "Posts and Comments" msgstr "" -#: src/Module/Contact.php:523 +#: src/Module/Contact.php:522 msgid "Individual Posts and Replies" msgstr "" -#: src/Module/Contact.php:531 +#: src/Module/Contact.php:530 msgid "Posts containing media objects" msgstr "" -#: src/Module/Contact.php:539 +#: src/Module/Contact.php:538 msgid "View all known contacts" msgstr "" -#: src/Module/Contact.php:550 +#: src/Module/Contact.php:549 msgid "Advanced Contact Settings" msgstr "" -#: src/Module/Contact.php:586 +#: src/Module/Contact.php:585 msgid "Mutual Friendship" msgstr "" -#: src/Module/Contact.php:590 +#: src/Module/Contact.php:589 msgid "is a fan of yours" msgstr "" -#: src/Module/Contact.php:594 +#: src/Module/Contact.php:593 msgid "you are a fan of" msgstr "" -#: src/Module/Contact.php:612 +#: src/Module/Contact.php:611 msgid "Pending outgoing contact request" msgstr "" -#: src/Module/Contact.php:614 +#: src/Module/Contact.php:613 msgid "Pending incoming contact request" msgstr "" -#: src/Module/Contact.php:627 src/Module/Contact/Profile.php:371 +#: src/Module/Contact.php:626 src/Module/Contact/Profile.php:371 #, php-format msgid "Visit %s's profile [%s]" msgstr "" @@ -6584,12 +6579,12 @@ msgid "" msgstr "" #: src/Module/Contact/Profile.php:415 -#: src/Module/Settings/TwoFactor/Index.php:139 +#: src/Module/Settings/TwoFactor/Index.php:160 msgid "Actions" msgstr "" #: src/Module/Contact/Profile.php:417 -#: src/Module/Settings/TwoFactor/Index.php:119 view/theme/frio/theme.php:229 +#: src/Module/Settings/TwoFactor/Index.php:140 view/theme/frio/theme.php:229 msgid "Status" msgstr "" @@ -6707,7 +6702,7 @@ msgstr "" #: src/Module/Contact/Revoke.php:108 #: src/Module/Notifications/Introductions.php:144 #: src/Module/OAuth/Acknowledge.php:54 src/Module/Register.php:130 -#: src/Module/Settings/TwoFactor/Trusted.php:126 +#: src/Module/Settings/TwoFactor/Trusted.php:129 msgid "Yes" msgstr "" @@ -8505,7 +8500,7 @@ msgstr "" #: src/Module/Notifications/Introductions.php:144 #: src/Module/OAuth/Acknowledge.php:55 src/Module/Register.php:131 -#: src/Module/Settings/TwoFactor/Trusted.php:126 +#: src/Module/Settings/TwoFactor/Trusted.php:129 msgid "No" msgstr "" @@ -8788,7 +8783,7 @@ msgid "Select a tag to remove: " msgstr "" #: src/Module/Post/Tag/Remove.php:108 -#: src/Module/Settings/TwoFactor/Trusted.php:144 +#: src/Module/Settings/TwoFactor/Trusted.php:147 msgid "Remove" msgstr "" @@ -8852,8 +8847,8 @@ msgstr "" #: src/Module/Profile/Profile.php:158 #, php-format msgid "" -"You're currently viewing your profile as %s Cancel" +"You're currently viewing your profile as %s Cancel" msgstr "" #: src/Module/Profile/Profile.php:167 @@ -9050,66 +9045,6 @@ msgstr "" msgid "Your invitation code: " msgstr "" -#: src/Module/Register.php:158 -msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " -msgstr "" - -#: src/Module/Register.php:159 -msgid "" -"Your Email Address: (Initial information will be send there, so this has to " -"be an existing address.)" -msgstr "" - -#: src/Module/Register.php:160 -msgid "Please repeat your e-mail address:" -msgstr "" - -#: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:100 -#: src/Module/Settings/Account.php:567 -msgid "New Password:" -msgstr "" - -#: src/Module/Register.php:162 -msgid "Leave empty for an auto generated password." -msgstr "" - -#: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:101 -#: src/Module/Settings/Account.php:568 -msgid "Confirm:" -msgstr "" - -#: src/Module/Register.php:164 -#, php-format -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be \"nickname@%s\"." -msgstr "" - -#: src/Module/Register.php:165 -msgid "Choose a nickname: " -msgstr "" - -#: src/Module/Register.php:173 src/Module/User/Import.php:117 -msgid "Import" -msgstr "" - -#: src/Module/Register.php:174 -msgid "Import your profile to this friendica instance" -msgstr "" - -#: src/Module/Register.php:181 -msgid "Note: This node explicitly contains adult content" -msgstr "" - -#: src/Module/Register.php:183 src/Module/Settings/Delegation.php:181 -msgid "Parent Password:" -msgstr "" - -#: src/Module/Register.php:183 src/Module/Settings/Delegation.php:181 -msgid "" -"Please enter the password of the parent account to legitimize your request." -msgstr "" - #: src/Module/Register.php:212 msgid "Password doesn't match." msgstr "" @@ -9163,6 +9098,12 @@ msgstr "" msgid "Your registration is pending approval by the site owner." msgstr "" +#: src/Module/Register.php:158 +msgid "" +"Your Display Name (as you would like it to be displayed on this system),\n" +"\t\t\t" +msgstr "" + #: src/Module/Search/Acl.php:73 msgid "You must be logged in to use this module." msgstr "" @@ -9301,6 +9242,11 @@ msgstr "" msgid "Your current password to confirm the changes" msgstr "" +#: src/Module/Security/PasswordTooLong.php:100 +#: src/Module/Settings/Account.php:567 +msgid "New Password:" +msgstr "" + #: src/Module/Security/PasswordTooLong.php:100 #: src/Module/Settings/Account.php:553 msgid "" @@ -9313,6 +9259,11 @@ msgstr "" msgid "Password length is limited to 72 characters." msgstr "" +#: src/Module/Security/PasswordTooLong.php:101 +#: src/Module/Settings/Account.php:568 +msgid "Confirm:" +msgstr "" + #: src/Module/Security/TwoFactor/Recovery.php:74 #, php-format msgid "Remaining recovery codes: %d" @@ -9320,7 +9271,7 @@ msgstr "" #: src/Module/Security/TwoFactor/Recovery.php:80 #: src/Module/Security/TwoFactor/Verify.php:77 -#: src/Module/Settings/TwoFactor/Verify.php:95 +#: src/Module/Settings/TwoFactor/Verify.php:98 msgid "Invalid code, please retry." msgstr "" @@ -9401,12 +9352,12 @@ msgstr "" #: src/Module/Security/TwoFactor/Verify.php:100 #, php-format msgid "" -"If you do not have access to your authentication code you can use a two-factor recovery code." +"If you do not have access to your authentication code you can use a two-factor recovery code." msgstr "" #: src/Module/Security/TwoFactor/Verify.php:101 -#: src/Module/Settings/TwoFactor/Verify.php:155 +#: src/Module/Settings/TwoFactor/Verify.php:158 msgid "Please enter a code from your authentication app" msgstr "" @@ -9926,7 +9877,7 @@ msgstr "" #: src/Module/Settings/Channels.php:131 src/Module/Settings/Channels.php:147 #: src/Module/Settings/Display.php:331 -#: src/Module/Settings/TwoFactor/AppSpecific.php:134 +#: src/Module/Settings/TwoFactor/AppSpecific.php:137 msgid "Description" msgstr "" @@ -10258,6 +10209,15 @@ msgstr "" msgid "Parent User" msgstr "" +#: src/Module/Settings/Delegation.php:181 +msgid "Parent Password:" +msgstr "" + +#: src/Module/Settings/Delegation.php:181 +msgid "" +"Please enter the password of the parent account to legitimize your request." +msgstr "" + #: src/Module/Settings/Delegation.php:188 msgid "Additional Accounts" msgstr "" @@ -10776,182 +10736,182 @@ msgstr "" msgid "Save changes" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:66 -#: src/Module/Settings/TwoFactor/Recovery.php:64 -#: src/Module/Settings/TwoFactor/Trusted.php:67 -#: src/Module/Settings/TwoFactor/Verify.php:69 +#: src/Module/Settings/TwoFactor/AppSpecific.php:69 +#: src/Module/Settings/TwoFactor/Recovery.php:67 +#: src/Module/Settings/TwoFactor/Trusted.php:70 +#: src/Module/Settings/TwoFactor/Verify.php:72 msgid "Please enter your password to access this page." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:84 +#: src/Module/Settings/TwoFactor/AppSpecific.php:87 msgid "App-specific password generation failed: The description is empty." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:87 +#: src/Module/Settings/TwoFactor/AppSpecific.php:90 msgid "" "App-specific password generation failed: This description already exists." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:91 +#: src/Module/Settings/TwoFactor/AppSpecific.php:94 msgid "New app-specific password generated." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:97 +#: src/Module/Settings/TwoFactor/AppSpecific.php:100 msgid "App-specific passwords successfully revoked." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:107 +#: src/Module/Settings/TwoFactor/AppSpecific.php:110 msgid "App-specific password successfully revoked." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:128 +#: src/Module/Settings/TwoFactor/AppSpecific.php:131 msgid "Two-factor app-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:130 +#: src/Module/Settings/TwoFactor/AppSpecific.php:133 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:131 +#: src/Module/Settings/TwoFactor/AppSpecific.php:134 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:135 +#: src/Module/Settings/TwoFactor/AppSpecific.php:138 msgid "Last Used" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:136 +#: src/Module/Settings/TwoFactor/AppSpecific.php:139 msgid "Revoke" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:137 +#: src/Module/Settings/TwoFactor/AppSpecific.php:140 msgid "Revoke All" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:140 +#: src/Module/Settings/TwoFactor/AppSpecific.php:143 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:141 +#: src/Module/Settings/TwoFactor/AppSpecific.php:144 msgid "Generate new app-specific password" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:142 +#: src/Module/Settings/TwoFactor/AppSpecific.php:145 msgid "Friendiqa on my Fairphone 2..." msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:143 +#: src/Module/Settings/TwoFactor/AppSpecific.php:146 msgid "Generate" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:68 +#: src/Module/Settings/TwoFactor/Index.php:88 msgid "Two-factor authentication successfully disabled." msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:120 +#: src/Module/Settings/TwoFactor/Index.php:141 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:124 +#: src/Module/Settings/TwoFactor/Index.php:145 msgid "Authenticator app" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:125 +#: src/Module/Settings/TwoFactor/Index.php:146 msgid "Configured" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:125 +#: src/Module/Settings/TwoFactor/Index.php:146 msgid "Not Configured" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:126 +#: src/Module/Settings/TwoFactor/Index.php:147 msgid "

You haven't finished configuring your authenticator app.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:127 +#: src/Module/Settings/TwoFactor/Index.php:148 msgid "

Your authenticator app is correctly configured.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:129 +#: src/Module/Settings/TwoFactor/Index.php:150 msgid "Recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:130 +#: src/Module/Settings/TwoFactor/Index.php:151 msgid "Remaining valid codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:132 +#: src/Module/Settings/TwoFactor/Index.php:153 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:134 +#: src/Module/Settings/TwoFactor/Index.php:155 msgid "App-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:135 +#: src/Module/Settings/TwoFactor/Index.php:156 msgid "Generated app-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:137 +#: src/Module/Settings/TwoFactor/Index.php:158 msgid "" "

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

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:140 +#: src/Module/Settings/TwoFactor/Index.php:161 msgid "Current password:" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:140 +#: src/Module/Settings/TwoFactor/Index.php:161 msgid "" "You need to provide your current password to change two-factor " "authentication settings." msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:141 +#: src/Module/Settings/TwoFactor/Index.php:162 msgid "Enable two-factor authentication" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:142 +#: src/Module/Settings/TwoFactor/Index.php:163 msgid "Disable two-factor authentication" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:143 +#: src/Module/Settings/TwoFactor/Index.php:164 msgid "Show recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:144 +#: src/Module/Settings/TwoFactor/Index.php:165 msgid "Manage app-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:145 +#: src/Module/Settings/TwoFactor/Index.php:166 msgid "Manage trusted browsers" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:146 +#: src/Module/Settings/TwoFactor/Index.php:167 msgid "Finish app configuration" msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:80 +#: src/Module/Settings/TwoFactor/Recovery.php:83 msgid "New recovery codes successfully generated." msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:106 +#: src/Module/Settings/TwoFactor/Recovery.php:109 msgid "Two-factor recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:108 +#: src/Module/Settings/TwoFactor/Recovery.php:111 msgid "" "

Recovery codes can be used to access your account in the event you lose " "access to your device and cannot receive two-factor authentication codes." msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:110 +#: src/Module/Settings/TwoFactor/Recovery.php:113 msgid "" "When you generate new recovery codes, you must copy the new codes. Your old " "codes won’t work anymore." msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:111 +#: src/Module/Settings/TwoFactor/Recovery.php:114 msgid "Generate new recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Recovery.php:113 +#: src/Module/Settings/TwoFactor/Recovery.php:116 msgid "Next: Verification" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:84 +#: src/Module/Settings/TwoFactor/Trusted.php:87 msgid "Trusted browsers successfully removed." msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:94 +#: src/Module/Settings/TwoFactor/Trusted.php:97 msgid "Trusted browser successfully removed." msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:136 +#: src/Module/Settings/TwoFactor/Trusted.php:139 msgid "Two-factor Trusted Browsers" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:137 +#: src/Module/Settings/TwoFactor/Trusted.php:140 msgid "" "Trusted browsers are individual browsers you chose to skip two-factor " "authentication to access Friendica. Please use this feature sparingly, as it " "can negate the benefit of two-factor authentication." msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:138 +#: src/Module/Settings/TwoFactor/Trusted.php:141 msgid "Device" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:139 +#: src/Module/Settings/TwoFactor/Trusted.php:142 msgid "OS" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:141 +#: src/Module/Settings/TwoFactor/Trusted.php:144 msgid "Trusted" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:142 +#: src/Module/Settings/TwoFactor/Trusted.php:145 msgid "Created At" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:143 +#: src/Module/Settings/TwoFactor/Trusted.php:146 msgid "Last Use" msgstr "" -#: src/Module/Settings/TwoFactor/Trusted.php:145 +#: src/Module/Settings/TwoFactor/Trusted.php:148 msgid "Remove All" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:91 +#: src/Module/Settings/TwoFactor/Verify.php:94 msgid "Two-factor authentication successfully activated." msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:125 +#: src/Module/Settings/TwoFactor/Verify.php:128 #, php-format msgid "" "

Or you can submit the authentication settings manually:

\n" @@ -11040,24 +11000,24 @@ msgid "" "" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:145 +#: src/Module/Settings/TwoFactor/Verify.php:148 msgid "Two-factor code verification" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:147 +#: src/Module/Settings/TwoFactor/Verify.php:150 msgid "" "

Please scan this QR Code with your authenticator app and submit the " "provided code.

" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:149 +#: src/Module/Settings/TwoFactor/Verify.php:152 #, php-format msgid "" -"

Or you can open the following URL in your mobile device:

%s

" +"

Or you can open the following URL in your mobile device:

%s

" msgstr "" -#: src/Module/Settings/TwoFactor/Verify.php:156 +#: src/Module/Settings/TwoFactor/Verify.php:159 msgid "Verify code and enable two-factor authentication" msgstr "" @@ -11163,9 +11123,9 @@ msgstr "" msgid "" "At any point in time a logged in user can export their account data from the " "account settings. If the user wants " -"to delete their account they can do so at " -"%1$s/settings/removeme. The deletion of the account will be permanent. " -"Deletion of the data will also be requested from the nodes of the " +"to delete their account they can do so at %1$s/settings/removeme. The deletion of the account will be " +"permanent. Deletion of the data will also be requested from the nodes of the " "communication partners." msgstr "" @@ -11212,6 +11172,10 @@ msgstr "" msgid "User imports on closed servers can only be done by an administrator." msgstr "" +#: src/Module/User/Import.php:117 +msgid "Import" +msgstr "" + #: src/Module/User/Import.php:119 msgid "Move account" msgstr "" @@ -11847,7 +11811,7 @@ msgstr "" #: src/Navigation/Notifications/Repository/Notify.php:500 #, php-format msgid "" -"Full Name:\t%s\n" +"Display Name:\t%s\n" "Site Location:\t%s\n" "Login Name:\t%s (%s)" msgstr "" @@ -12187,7 +12151,7 @@ msgstr "" msgid "Reacted with %s by: %s" msgstr "" -#: src/Protocol/ActivityPub/Receiver.php:522 +#: src/Protocol/ActivityPub/Receiver.php:523 msgid "Chat" msgstr "" From 30d2d934944e7653bf5aabe7a24126c49613eb83 Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:54:11 +0200 Subject: [PATCH 08/12] added missing apostrophe --- src/Module/Register.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Register.php b/src/Module/Register.php index c85a04dfa..393d0099c 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -155,7 +155,7 @@ class Register extends BaseModule '$fillext' => $fillext, '$oidlabel' => $oidlabel, '$openid' => $openid_url, - '$namelabel' => DI::l10n()->t('Your Display Name (as you would like it to be displayed on this system), + '$namelabel' => DI::l10n()->t('Your Display Name (as you would like it to be displayed on this system'), '$addrlabel' => DI::l10n()->t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'), '$addrlabel2' => DI::l10n()->t('Please repeat your e-mail address:'), '$ask_password' => $ask_password, From 40eb9578e75cb493c0754a4818546db0fe2da6af Mon Sep 17 00:00:00 2001 From: Raroun Date: Fri, 27 Oct 2023 11:59:28 +0200 Subject: [PATCH 09/12] readded messages.po --- view/lang/C/messages.po | 97 +++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 32 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 8de68a669..471880f34 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-27 11:39+0200\n" +"POT-Creation-Date: 2023-10-27 11:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1960,7 +1960,8 @@ msgstr "" msgid "Home Page" msgstr "" -#: src/Content/Nav.php:255 src/Module/Security/Login.php:124 +#: src/Content/Nav.php:255 src/Module/Register.php:168 +#: src/Module/Security/Login.php:124 msgid "Register" msgstr "" @@ -2039,7 +2040,8 @@ msgid "Information about this friendica instance" msgstr "" #: src/Content/Nav.php:301 src/Module/Admin/Tos.php:78 -#: src/Module/BaseAdmin.php:95 src/Module/Tos.php:101 +#: src/Module/BaseAdmin.php:95 src/Module/Register.php:176 +#: src/Module/Tos.php:101 msgid "Terms of Service" msgstr "" @@ -9045,6 +9047,66 @@ msgstr "" msgid "Your invitation code: " msgstr "" +#: src/Module/Register.php:158 +msgid "Your Display Name (as you would like it to be displayed on this system" +msgstr "" + +#: src/Module/Register.php:159 +msgid "" +"Your Email Address: (Initial information will be send there, so this has to " +"be an existing address.)" +msgstr "" + +#: src/Module/Register.php:160 +msgid "Please repeat your e-mail address:" +msgstr "" + +#: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:100 +#: src/Module/Settings/Account.php:567 +msgid "New Password:" +msgstr "" + +#: src/Module/Register.php:162 +msgid "Leave empty for an auto generated password." +msgstr "" + +#: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:101 +#: src/Module/Settings/Account.php:568 +msgid "Confirm:" +msgstr "" + +#: src/Module/Register.php:164 +#, php-format +msgid "" +"Choose a profile nickname. This must begin with a text character. Your " +"profile address on this site will then be \"nickname@%s\"." +msgstr "" + +#: src/Module/Register.php:165 +msgid "Choose a nickname: " +msgstr "" + +#: src/Module/Register.php:173 src/Module/User/Import.php:117 +msgid "Import" +msgstr "" + +#: src/Module/Register.php:174 +msgid "Import your profile to this friendica instance" +msgstr "" + +#: src/Module/Register.php:181 +msgid "Note: This node explicitly contains adult content" +msgstr "" + +#: src/Module/Register.php:183 src/Module/Settings/Delegation.php:181 +msgid "Parent Password:" +msgstr "" + +#: src/Module/Register.php:183 src/Module/Settings/Delegation.php:181 +msgid "" +"Please enter the password of the parent account to legitimize your request." +msgstr "" + #: src/Module/Register.php:212 msgid "Password doesn't match." msgstr "" @@ -9098,12 +9160,6 @@ msgstr "" msgid "Your registration is pending approval by the site owner." msgstr "" -#: src/Module/Register.php:158 -msgid "" -"Your Display Name (as you would like it to be displayed on this system),\n" -"\t\t\t" -msgstr "" - #: src/Module/Search/Acl.php:73 msgid "You must be logged in to use this module." msgstr "" @@ -9242,11 +9298,6 @@ msgstr "" msgid "Your current password to confirm the changes" msgstr "" -#: src/Module/Security/PasswordTooLong.php:100 -#: src/Module/Settings/Account.php:567 -msgid "New Password:" -msgstr "" - #: src/Module/Security/PasswordTooLong.php:100 #: src/Module/Settings/Account.php:553 msgid "" @@ -9259,11 +9310,6 @@ msgstr "" msgid "Password length is limited to 72 characters." msgstr "" -#: src/Module/Security/PasswordTooLong.php:101 -#: src/Module/Settings/Account.php:568 -msgid "Confirm:" -msgstr "" - #: src/Module/Security/TwoFactor/Recovery.php:74 #, php-format msgid "Remaining recovery codes: %d" @@ -10209,15 +10255,6 @@ msgstr "" msgid "Parent User" msgstr "" -#: src/Module/Settings/Delegation.php:181 -msgid "Parent Password:" -msgstr "" - -#: src/Module/Settings/Delegation.php:181 -msgid "" -"Please enter the password of the parent account to legitimize your request." -msgstr "" - #: src/Module/Settings/Delegation.php:188 msgid "Additional Accounts" msgstr "" @@ -11172,10 +11209,6 @@ msgstr "" msgid "User imports on closed servers can only be done by an administrator." msgstr "" -#: src/Module/User/Import.php:117 -msgid "Import" -msgstr "" - #: src/Module/User/Import.php:119 msgid "Move account" msgstr "" From 67a6bc3ea91286d6ddc03a23ace491dd995b6b0e Mon Sep 17 00:00:00 2001 From: Raroun Date: Wed, 1 Nov 2023 07:30:34 +0100 Subject: [PATCH 10/12] Update Site.php Co-authored-by: Hypolite Petovan --- src/Module/Admin/Site.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index c0fb679da..941caa068 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -462,7 +462,7 @@ class Site extends BaseAdmin '$allow_users_remote_self'=> ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('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.')], '$enable_multi_reg' => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')], '$enable_openid' => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')], - '$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable Fullname check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Check the box to only allow users to register which display name consists of at least two strings.')], + '$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable full name check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Prevents users from registering with a display name with fewer than two parts separated by spaces.')], '$register_notification' => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')], '$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices], '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')], From cb7643a74e532f895d3259f4f04e56a3b6862c6d Mon Sep 17 00:00:00 2001 From: Raroun Date: Wed, 1 Nov 2023 07:30:44 +0100 Subject: [PATCH 11/12] Update settings.config.php Co-authored-by: Hypolite Petovan --- static/settings.config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/settings.config.php b/static/settings.config.php index 5006a417b..40e479938 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -161,7 +161,7 @@ return [ 'min_memory' => 0, // no_regfullname (Boolean) - // Allow pseudonyms (true) or allow users to register which display name consists of at least two strings, as an anti spam measure (false). + // Allow users to register with a display name comporting fewer than two parts separated by spaces. 'no_regfullname' => true, // no_oembed_rich_content (Boolean) From cb99227569c1ce78c48accbb75fcd0070fdcf29b Mon Sep 17 00:00:00 2001 From: Raroun Date: Wed, 1 Nov 2023 14:57:23 +0100 Subject: [PATCH 12/12] refreshed messages.po --- view/lang/C/messages.po | 438 ++++++++++++++++++++-------------------- 1 file changed, 219 insertions(+), 219 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 471880f34..b16265fc1 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-27 11:59+0200\n" +"POT-Creation-Date: 2023-11-01 14:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,17 +34,17 @@ msgstr "" msgid "Item couldn't be fetched." msgstr "" -#: mod/item.php:255 mod/item.php:259 +#: mod/item.php:259 mod/item.php:263 msgid "Empty post discarded." msgstr "" -#: mod/item.php:428 src/Module/Admin/Themes/Details.php:39 +#: mod/item.php:432 src/Module/Admin/Themes/Details.php:39 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:42 #: src/Module/Debug/ItemBody.php:57 src/Module/Item/Feed.php:80 msgid "Item not found." msgstr "" -#: mod/item.php:452 mod/message.php:67 mod/message.php:113 mod/notes.php:45 +#: mod/item.php:456 mod/message.php:67 mod/message.php:113 mod/notes.php:45 #: mod/photos.php:152 mod/photos.php:670 src/Model/Event.php:520 #: src/Module/Attach.php:55 src/Module/BaseApi.php:103 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:50 @@ -67,7 +67,7 @@ msgstr "" #: src/Module/Profile/UnkMail.php:132 src/Module/Register.php:77 #: src/Module/Register.php:90 src/Module/Register.php:206 #: src/Module/Register.php:245 src/Module/Search/Directory.php:37 -#: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408 +#: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:388 #: src/Module/Settings/Channels.php:56 src/Module/Settings/Channels.php:114 #: src/Module/Settings/Delegation.php:90 src/Module/Settings/Display.php:90 #: src/Module/Settings/Display.php:193 @@ -797,7 +797,7 @@ msgstr "" #: src/BaseModule.php:439 src/Content/Conversation/Factory/Channel.php:45 #: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:414 -#: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149 +#: src/Module/PermissionTooltip.php:141 src/Module/PermissionTooltip.php:163 #: src/Module/Settings/Channels.php:120 msgid "Followers" msgstr "" @@ -961,7 +961,7 @@ msgstr "" msgid "Enter user nickname: " msgstr "" -#: src/Console/User.php:182 src/Model/User.php:710 +#: src/Console/User.php:182 src/Model/User.php:739 #: src/Module/Api/Twitter/ContactEndpoint.php:74 #: src/Module/Moderation/Users/Active.php:71 #: src/Module/Moderation/Users/Blocked.php:71 @@ -1749,7 +1749,7 @@ msgstr "" #: src/Content/GroupManager.php:152 src/Content/Nav.php:278 #: src/Content/Text/HTML.php:880 src/Content/Widget.php:537 -#: src/Model/User.php:1272 +#: src/Model/User.php:1301 msgid "Groups" msgstr "" @@ -1770,57 +1770,57 @@ msgstr "" msgid "Create new group" msgstr "" -#: src/Content/Item.php:331 src/Model/Item.php:3080 +#: src/Content/Item.php:332 src/Model/Item.php:3089 msgid "event" msgstr "" -#: src/Content/Item.php:334 src/Content/Item.php:344 +#: src/Content/Item.php:335 src/Content/Item.php:345 msgid "status" msgstr "" -#: src/Content/Item.php:340 src/Model/Item.php:3082 +#: src/Content/Item.php:341 src/Model/Item.php:3091 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" -#: src/Content/Item.php:354 src/Module/Post/Tag/Add.php:141 +#: src/Content/Item.php:355 src/Module/Post/Tag/Add.php:141 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: src/Content/Item.php:428 view/theme/frio/theme.php:262 +#: src/Content/Item.php:429 view/theme/frio/theme.php:262 msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:429 src/Model/Contact.php:1242 +#: src/Content/Item.php:430 src/Model/Contact.php:1242 msgid "View Status" msgstr "" -#: src/Content/Item.php:430 src/Content/Item.php:451 src/Model/Contact.php:1176 +#: src/Content/Item.php:431 src/Content/Item.php:452 src/Model/Contact.php:1176 #: src/Model/Contact.php:1233 src/Model/Contact.php:1243 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:259 msgid "View Profile" msgstr "" -#: src/Content/Item.php:431 src/Model/Contact.php:1244 +#: src/Content/Item.php:432 src/Model/Contact.php:1244 msgid "View Photos" msgstr "" -#: src/Content/Item.php:432 src/Model/Contact.php:1211 +#: src/Content/Item.php:433 src/Model/Contact.php:1211 #: src/Model/Profile.php:464 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:433 src/Model/Contact.php:1235 +#: src/Content/Item.php:434 src/Model/Contact.php:1235 #: src/Model/Contact.php:1246 msgid "View Contact" msgstr "" -#: src/Content/Item.php:434 src/Model/Contact.php:1247 +#: src/Content/Item.php:435 src/Model/Contact.php:1247 msgid "Send PM" msgstr "" -#: src/Content/Item.php:435 src/Module/Contact.php:467 +#: src/Content/Item.php:436 src/Module/Contact.php:467 #: src/Module/Contact/Profile.php:511 #: src/Module/Moderation/Blocklist/Contact.php:116 #: src/Module/Moderation/Users/Active.php:137 @@ -1828,7 +1828,7 @@ msgstr "" msgid "Block" msgstr "" -#: src/Content/Item.php:436 src/Module/Contact.php:468 +#: src/Content/Item.php:437 src/Module/Contact.php:468 #: src/Module/Contact/Profile.php:519 #: src/Module/Notifications/Introductions.php:134 #: src/Module/Notifications/Introductions.php:206 @@ -1836,27 +1836,27 @@ msgstr "" msgid "Ignore" msgstr "" -#: src/Content/Item.php:437 src/Module/Contact.php:469 +#: src/Content/Item.php:438 src/Module/Contact.php:469 #: src/Module/Contact/Profile.php:527 msgid "Collapse" msgstr "" -#: src/Content/Item.php:438 src/Object/Post.php:289 +#: src/Content/Item.php:439 src/Object/Post.php:289 #, php-format msgid "Ignore %s server" msgstr "" -#: src/Content/Item.php:442 src/Object/Post.php:491 +#: src/Content/Item.php:443 src/Object/Post.php:491 msgid "Languages" msgstr "" -#: src/Content/Item.php:448 src/Content/Widget.php:80 +#: src/Content/Item.php:449 src/Content/Widget.php:80 #: src/Model/Contact.php:1236 src/Model/Contact.php:1248 #: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195 msgid "Connect/Follow" msgstr "" -#: src/Content/Item.php:882 +#: src/Content/Item.php:883 msgid "Unable to fetch user." msgstr "" @@ -2189,8 +2189,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:994 src/Model/Item.php:3813 -#: src/Model/Item.php:3819 src/Model/Item.php:3820 +#: src/Content/Text/BBCode.php:994 src/Model/Item.php:3822 +#: src/Model/Item.php:3828 src/Model/Item.php:3829 msgid "Link to source" msgstr "" @@ -2362,7 +2362,7 @@ msgstr "" msgid "News" msgstr "" -#: src/Content/Widget.php:542 src/Module/Settings/Account.php:454 +#: src/Content/Widget.php:542 src/Module/Settings/Account.php:434 msgid "Account Types" msgstr "" @@ -2469,8 +2469,8 @@ msgstr "" msgid "Yourself" msgstr "" -#: src/Core/ACL.php:202 src/Module/PermissionTooltip.php:133 -#: src/Module/PermissionTooltip.php:155 +#: src/Core/ACL.php:202 src/Module/PermissionTooltip.php:147 +#: src/Module/PermissionTooltip.php:169 msgid "Mutuals" msgstr "" @@ -2479,7 +2479,7 @@ msgid "Post to Email" msgstr "" #: src/Core/ACL.php:321 src/Module/PermissionTooltip.php:90 -#: src/Module/PermissionTooltip.php:201 +#: src/Module/PermissionTooltip.php:211 msgid "Public" msgstr "" @@ -3401,81 +3401,81 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: src/Model/Item.php:2139 +#: src/Model/Item.php:2148 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:3084 +#: src/Model/Item.php:3093 msgid "activity" msgstr "" -#: src/Model/Item.php:3086 +#: src/Model/Item.php:3095 msgid "comment" msgstr "" -#: src/Model/Item.php:3089 src/Module/Post/Tag/Add.php:123 +#: src/Model/Item.php:3098 src/Module/Post/Tag/Add.php:123 msgid "post" msgstr "" -#: src/Model/Item.php:3259 +#: src/Model/Item.php:3268 #, php-format msgid "%s is blocked" msgstr "" -#: src/Model/Item.php:3261 +#: src/Model/Item.php:3270 #, php-format msgid "%s is ignored" msgstr "" -#: src/Model/Item.php:3263 +#: src/Model/Item.php:3272 #, php-format msgid "Content from %s is collapsed" msgstr "" -#: src/Model/Item.php:3267 +#: src/Model/Item.php:3276 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3720 +#: src/Model/Item.php:3729 msgid "bytes" msgstr "" -#: src/Model/Item.php:3751 +#: src/Model/Item.php:3760 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3753 +#: src/Model/Item.php:3762 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3758 +#: src/Model/Item.php:3767 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3760 +#: src/Model/Item.php:3769 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3762 +#: src/Model/Item.php:3771 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3796 src/Model/Item.php:3797 +#: src/Model/Item.php:3805 src/Model/Item.php:3806 msgid "View on separate page" msgstr "" @@ -3633,145 +3633,145 @@ msgstr "" msgid "Contact information and Social Networks" msgstr "" -#: src/Model/User.php:226 src/Model/User.php:1185 +#: src/Model/User.php:226 src/Model/User.php:1214 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: src/Model/User.php:619 src/Model/User.php:652 +#: src/Model/User.php:648 src/Model/User.php:681 msgid "Login failed" msgstr "" -#: src/Model/User.php:684 +#: src/Model/User.php:713 msgid "Not enough information to authenticate" msgstr "" -#: src/Model/User.php:805 +#: src/Model/User.php:834 msgid "Password can't be empty" msgstr "" -#: src/Model/User.php:847 +#: src/Model/User.php:876 msgid "Empty passwords are not allowed." msgstr "" -#: src/Model/User.php:851 +#: src/Model/User.php:880 msgid "" "The new password has been exposed in a public data dump, please choose " "another." msgstr "" -#: src/Model/User.php:855 +#: src/Model/User.php:884 msgid "The password length is limited to 72 characters." msgstr "" -#: src/Model/User.php:859 +#: src/Model/User.php:888 msgid "The password can't contain white spaces nor accentuated letters" msgstr "" -#: src/Model/User.php:1068 +#: src/Model/User.php:1097 msgid "Passwords do not match. Password unchanged." msgstr "" -#: src/Model/User.php:1075 +#: src/Model/User.php:1104 msgid "An invitation is required." msgstr "" -#: src/Model/User.php:1079 +#: src/Model/User.php:1108 msgid "Invitation could not be verified." msgstr "" -#: src/Model/User.php:1087 +#: src/Model/User.php:1116 msgid "Invalid OpenID url" msgstr "" -#: src/Model/User.php:1100 src/Security/Authentication.php:241 +#: src/Model/User.php:1129 src/Security/Authentication.php:241 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:1100 src/Security/Authentication.php:241 +#: src/Model/User.php:1129 src/Security/Authentication.php:241 msgid "The error message was:" msgstr "" -#: src/Model/User.php:1106 +#: src/Model/User.php:1135 msgid "Please enter the required information." msgstr "" -#: src/Model/User.php:1120 +#: src/Model/User.php:1149 #, 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:1127 +#: src/Model/User.php:1156 #, 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:1131 +#: src/Model/User.php:1160 #, 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:1139 +#: src/Model/User.php:1168 msgid "That doesn't appear to be your full (First Last) name." msgstr "" -#: src/Model/User.php:1144 +#: src/Model/User.php:1173 msgid "Your email domain is not among those allowed on this site." msgstr "" -#: src/Model/User.php:1148 +#: src/Model/User.php:1177 msgid "Not a valid email address." msgstr "" -#: src/Model/User.php:1151 +#: src/Model/User.php:1180 msgid "The nickname was blocked from registration by the nodes admin." msgstr "" -#: src/Model/User.php:1155 src/Model/User.php:1161 +#: src/Model/User.php:1184 src/Model/User.php:1190 msgid "Cannot use that email." msgstr "" -#: src/Model/User.php:1167 +#: src/Model/User.php:1196 msgid "Your nickname can only contain a-z, 0-9 and _." msgstr "" -#: src/Model/User.php:1175 src/Model/User.php:1232 +#: src/Model/User.php:1204 src/Model/User.php:1261 msgid "Nickname is already registered. Please choose another." msgstr "" -#: src/Model/User.php:1219 src/Model/User.php:1223 +#: src/Model/User.php:1248 src/Model/User.php:1252 msgid "An error occurred during registration. Please try again." msgstr "" -#: src/Model/User.php:1246 +#: src/Model/User.php:1275 msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: src/Model/User.php:1253 +#: src/Model/User.php:1282 msgid "An error occurred creating your self contact. Please try again." msgstr "" -#: src/Model/User.php:1258 +#: src/Model/User.php:1287 msgid "Friends" msgstr "" -#: src/Model/User.php:1262 +#: src/Model/User.php:1291 msgid "" "An error occurred creating your default contact circle. Please try again." msgstr "" -#: src/Model/User.php:1306 +#: src/Model/User.php:1335 msgid "Profile Photos" msgstr "" -#: src/Model/User.php:1486 +#: src/Model/User.php:1515 #, php-format msgid "" "\n" @@ -3779,7 +3779,7 @@ msgid "" "\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: src/Model/User.php:1489 +#: src/Model/User.php:1518 #, php-format msgid "" "\n" @@ -3815,12 +3815,12 @@ msgid "" "\t\tThank you and welcome to %4$s." msgstr "" -#: src/Model/User.php:1521 src/Model/User.php:1627 +#: src/Model/User.php:1550 src/Model/User.php:1656 #, php-format msgid "Registration details for %s" msgstr "" -#: src/Model/User.php:1541 +#: src/Model/User.php:1570 #, php-format msgid "" "\n" @@ -3836,12 +3836,12 @@ msgid "" "\t\t" msgstr "" -#: src/Model/User.php:1560 +#: src/Model/User.php:1589 #, php-format msgid "Registration at %s" msgstr "" -#: src/Model/User.php:1584 +#: src/Model/User.php:1613 #, php-format msgid "" "\n" @@ -3850,7 +3850,7 @@ msgid "" "\t\t\t" msgstr "" -#: src/Model/User.php:1592 +#: src/Model/User.php:1621 #, php-format msgid "" "\n" @@ -3888,7 +3888,7 @@ msgid "" "\t\t\tThank you and welcome to %2$s." msgstr "" -#: src/Model/User.php:1654 +#: src/Model/User.php:1683 msgid "" "User with delegates can't be removed, please remove delegate users first" msgstr "" @@ -3960,7 +3960,7 @@ msgstr "" #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:86 #: src/Module/Admin/Logs/Settings.php:87 src/Module/Admin/Site.php:401 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:86 -#: src/Module/Settings/Account.php:561 src/Module/Settings/Addons.php:78 +#: src/Module/Settings/Account.php:541 src/Module/Settings/Addons.php:78 #: src/Module/Settings/Connectors.php:160 #: src/Module/Settings/Connectors.php:246 #: src/Module/Settings/Delegation.php:193 src/Module/Settings/Display.php:303 @@ -4847,13 +4847,13 @@ msgid "Enable OpenID support for registration and logins." msgstr "" #: src/Module/Admin/Site.php:465 -msgid "Enable Fullname check" +msgid "Enable full name check" msgstr "" #: src/Module/Admin/Site.php:465 msgid "" -"Check the box to only allow users to register which display name consists of " -"at least two strings." +"Prevents users from registering with a display name with fewer than two " +"parts separated by spaces." msgstr "" #: src/Module/Admin/Site.php:466 @@ -7568,19 +7568,19 @@ msgstr "" msgid "List of pending user deletions" msgstr "" -#: src/Module/Moderation/BaseUsers.php:119 src/Module/Settings/Account.php:492 +#: src/Module/Moderation/BaseUsers.php:119 src/Module/Settings/Account.php:472 msgid "Normal Account Page" msgstr "" -#: src/Module/Moderation/BaseUsers.php:120 src/Module/Settings/Account.php:499 +#: src/Module/Moderation/BaseUsers.php:120 src/Module/Settings/Account.php:479 msgid "Soapbox Page" msgstr "" -#: src/Module/Moderation/BaseUsers.php:121 src/Module/Settings/Account.php:506 +#: src/Module/Moderation/BaseUsers.php:121 src/Module/Settings/Account.php:486 msgid "Public Group" msgstr "" -#: src/Module/Moderation/BaseUsers.php:122 src/Module/Settings/Account.php:513 +#: src/Module/Moderation/BaseUsers.php:122 src/Module/Settings/Account.php:493 msgid "Automatic Friend Page" msgstr "" @@ -7588,19 +7588,19 @@ msgstr "" msgid "Private Group" msgstr "" -#: src/Module/Moderation/BaseUsers.php:126 src/Module/Settings/Account.php:464 +#: src/Module/Moderation/BaseUsers.php:126 src/Module/Settings/Account.php:444 msgid "Personal Page" msgstr "" -#: src/Module/Moderation/BaseUsers.php:127 src/Module/Settings/Account.php:471 +#: src/Module/Moderation/BaseUsers.php:127 src/Module/Settings/Account.php:451 msgid "Organisation Page" msgstr "" -#: src/Module/Moderation/BaseUsers.php:128 src/Module/Settings/Account.php:478 +#: src/Module/Moderation/BaseUsers.php:128 src/Module/Settings/Account.php:458 msgid "News Page" msgstr "" -#: src/Module/Moderation/BaseUsers.php:129 src/Module/Settings/Account.php:485 +#: src/Module/Moderation/BaseUsers.php:129 src/Module/Settings/Account.php:465 msgid "Community Group" msgstr "" @@ -8685,46 +8685,46 @@ msgstr "" msgid "Remote privacy information not available." msgstr "" -#: src/Module/PermissionTooltip.php:121 +#: src/Module/PermissionTooltip.php:120 msgid "Visible to:" msgstr "" -#: src/Module/PermissionTooltip.php:204 +#: src/Module/PermissionTooltip.php:214 #, php-format msgid "Collection (%s)" msgstr "" -#: src/Module/PermissionTooltip.php:208 +#: src/Module/PermissionTooltip.php:218 #, php-format msgid "Followers (%s)" msgstr "" -#: src/Module/PermissionTooltip.php:227 +#: src/Module/PermissionTooltip.php:237 #, php-format msgid "%d more" msgstr "" -#: src/Module/PermissionTooltip.php:231 +#: src/Module/PermissionTooltip.php:241 #, php-format msgid "To: %s
" msgstr "" -#: src/Module/PermissionTooltip.php:234 +#: src/Module/PermissionTooltip.php:244 #, php-format msgid "CC: %s
" msgstr "" -#: src/Module/PermissionTooltip.php:237 +#: src/Module/PermissionTooltip.php:247 #, php-format msgid "BCC: %s
" msgstr "" -#: src/Module/PermissionTooltip.php:240 +#: src/Module/PermissionTooltip.php:250 #, php-format msgid "Audience: %s
" msgstr "" -#: src/Module/PermissionTooltip.php:243 +#: src/Module/PermissionTooltip.php:253 #, php-format msgid "Attributed To: %s
" msgstr "" @@ -9062,7 +9062,7 @@ msgid "Please repeat your e-mail address:" msgstr "" #: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:100 -#: src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:547 msgid "New Password:" msgstr "" @@ -9071,7 +9071,7 @@ msgid "Leave empty for an auto generated password." msgstr "" #: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:101 -#: src/Module/Settings/Account.php:568 +#: src/Module/Settings/Account.php:548 msgid "Confirm:" msgstr "" @@ -9289,24 +9289,24 @@ msgid "Update Password" msgstr "" #: src/Module/Security/PasswordTooLong.php:99 -#: src/Module/Settings/Account.php:569 +#: src/Module/Settings/Account.php:549 msgid "Current Password:" msgstr "" #: src/Module/Security/PasswordTooLong.php:99 -#: src/Module/Settings/Account.php:569 +#: src/Module/Settings/Account.php:549 msgid "Your current password to confirm the changes" msgstr "" #: src/Module/Security/PasswordTooLong.php:100 -#: src/Module/Settings/Account.php:553 +#: src/Module/Settings/Account.php:533 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces and accentuated letters." msgstr "" #: src/Module/Security/PasswordTooLong.php:100 -#: src/Module/Settings/Account.php:554 +#: src/Module/Settings/Account.php:534 msgid "Password length is limited to 72 characters." msgstr "" @@ -9432,98 +9432,98 @@ msgid "Cannot change to that email." msgstr "" #: src/Module/Settings/Account.php:146 src/Module/Settings/Account.php:199 -#: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:303 -#: src/Module/Settings/Account.php:352 +#: src/Module/Settings/Account.php:220 src/Module/Settings/Account.php:304 +#: src/Module/Settings/Account.php:331 msgid "Settings were not updated." msgstr "" -#: src/Module/Settings/Account.php:364 +#: src/Module/Settings/Account.php:344 msgid "Contact CSV file upload error" msgstr "" -#: src/Module/Settings/Account.php:383 +#: src/Module/Settings/Account.php:363 msgid "Importing Contacts done" msgstr "" -#: src/Module/Settings/Account.php:396 +#: src/Module/Settings/Account.php:376 msgid "Relocate message has been send to your contacts" msgstr "" -#: src/Module/Settings/Account.php:413 +#: src/Module/Settings/Account.php:393 msgid "Unable to find your profile. Please contact your admin." msgstr "" -#: src/Module/Settings/Account.php:455 +#: src/Module/Settings/Account.php:435 msgid "Personal Page Subtypes" msgstr "" -#: src/Module/Settings/Account.php:456 +#: src/Module/Settings/Account.php:436 msgid "Community Group Subtypes" msgstr "" -#: src/Module/Settings/Account.php:466 +#: src/Module/Settings/Account.php:446 msgid "Account for a personal profile." msgstr "" -#: src/Module/Settings/Account.php:473 +#: src/Module/Settings/Account.php:453 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:480 +#: src/Module/Settings/Account.php:460 msgid "" "Account for a news reflector that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:487 +#: src/Module/Settings/Account.php:467 msgid "Account for community discussions." msgstr "" -#: src/Module/Settings/Account.php:494 +#: src/Module/Settings/Account.php:474 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:501 +#: src/Module/Settings/Account.php:481 msgid "" "Account for a public profile that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: src/Module/Settings/Account.php:508 +#: src/Module/Settings/Account.php:488 msgid "Automatically approves all contact requests." msgstr "" -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:495 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "" -#: src/Module/Settings/Account.php:520 +#: src/Module/Settings/Account.php:500 msgid "Private Group [Experimental]" msgstr "" -#: src/Module/Settings/Account.php:522 +#: src/Module/Settings/Account.php:502 msgid "Requires manual approval of contact requests." msgstr "" -#: src/Module/Settings/Account.php:531 +#: src/Module/Settings/Account.php:511 msgid "OpenID:" msgstr "" -#: src/Module/Settings/Account.php:531 +#: src/Module/Settings/Account.php:511 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: src/Module/Settings/Account.php:539 +#: src/Module/Settings/Account.php:519 msgid "Publish your profile in your local site directory?" msgstr "" -#: src/Module/Settings/Account.php:539 +#: src/Module/Settings/Account.php:519 #, php-format msgid "" "Your profile will be published in this node's local " @@ -9531,94 +9531,94 @@ msgid "" "system settings." msgstr "" -#: src/Module/Settings/Account.php:545 +#: src/Module/Settings/Account.php:525 #, php-format msgid "" "Your profile will also be published in the global friendica directories (e." "g. %s)." msgstr "" -#: src/Module/Settings/Account.php:558 +#: src/Module/Settings/Account.php:538 msgid "Account Settings" msgstr "" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:539 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "" -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:546 msgid "Password Settings" msgstr "" -#: src/Module/Settings/Account.php:568 +#: src/Module/Settings/Account.php:548 msgid "Leave password fields blank unless changing" msgstr "" -#: src/Module/Settings/Account.php:570 +#: src/Module/Settings/Account.php:550 msgid "Password:" msgstr "" -#: src/Module/Settings/Account.php:570 +#: src/Module/Settings/Account.php:550 msgid "Your current password to confirm the changes of the email address" msgstr "" -#: src/Module/Settings/Account.php:573 +#: src/Module/Settings/Account.php:553 msgid "Delete OpenID URL" msgstr "" -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:555 msgid "Basic Settings" msgstr "" -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:556 #: src/Module/Settings/Profile/Index.php:283 msgid "Display name:" msgstr "" -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:557 msgid "Email Address:" msgstr "" -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:558 msgid "Your Timezone:" msgstr "" -#: src/Module/Settings/Account.php:579 +#: src/Module/Settings/Account.php:559 msgid "Your Language:" msgstr "" -#: src/Module/Settings/Account.php:579 +#: src/Module/Settings/Account.php:559 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "" -#: src/Module/Settings/Account.php:580 +#: src/Module/Settings/Account.php:560 msgid "Default Post Location:" msgstr "" -#: src/Module/Settings/Account.php:581 +#: src/Module/Settings/Account.php:561 msgid "Use Browser Location:" msgstr "" -#: src/Module/Settings/Account.php:583 +#: src/Module/Settings/Account.php:563 msgid "Security and Privacy Settings" msgstr "" -#: src/Module/Settings/Account.php:585 +#: src/Module/Settings/Account.php:565 msgid "Maximum Friend Requests/Day:" msgstr "" -#: src/Module/Settings/Account.php:585 src/Module/Settings/Account.php:595 +#: src/Module/Settings/Account.php:565 src/Module/Settings/Account.php:575 msgid "(to prevent spam abuse)" msgstr "" -#: src/Module/Settings/Account.php:587 +#: src/Module/Settings/Account.php:567 msgid "Allow your profile to be searchable globally?" msgstr "" -#: src/Module/Settings/Account.php:587 +#: src/Module/Settings/Account.php:567 msgid "" "Activate this setting if you want others to easily find and follow you. Your " "profile will be searchable on remote systems. This setting also determines " @@ -9626,43 +9626,43 @@ msgid "" "indexed or not." msgstr "" -#: src/Module/Settings/Account.php:588 +#: src/Module/Settings/Account.php:568 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "" -#: src/Module/Settings/Account.php:588 +#: src/Module/Settings/Account.php:568 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "" -#: src/Module/Settings/Account.php:589 +#: src/Module/Settings/Account.php:569 msgid "Hide your public content from anonymous viewers" msgstr "" -#: src/Module/Settings/Account.php:589 +#: src/Module/Settings/Account.php:569 msgid "" "Anonymous visitors will only see your basic profile details. Your public " "posts and replies will still be freely accessible on the remote servers of " "your followers and through relays." msgstr "" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:570 msgid "Make public posts unlisted" msgstr "" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:570 msgid "" "Your public posts will not appear on the community pages or in search " "results, nor be sent to relay servers. However they can still appear on " "public feeds on remote servers." msgstr "" -#: src/Module/Settings/Account.php:591 +#: src/Module/Settings/Account.php:571 msgid "Make all posted pictures accessible" msgstr "" -#: src/Module/Settings/Account.php:591 +#: src/Module/Settings/Account.php:571 msgid "" "This option makes every posted picture accessible via the direct link. This " "is a workaround for the problem that most other networks can't handle " @@ -9670,241 +9670,241 @@ msgid "" "public on your photo albums though." msgstr "" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:572 msgid "Allow friends to post to your profile page?" msgstr "" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:572 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:573 msgid "Allow friends to tag your posts?" msgstr "" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:573 msgid "Your contacts can add additional tags to your posts." msgstr "" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:574 msgid "Permit unknown people to send you private mail?" msgstr "" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:574 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "" -#: src/Module/Settings/Account.php:595 +#: src/Module/Settings/Account.php:575 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:576 msgid "Default privacy circle for new contacts" msgstr "" -#: src/Module/Settings/Account.php:597 +#: src/Module/Settings/Account.php:577 msgid "Default privacy circle for new group contacts" msgstr "" -#: src/Module/Settings/Account.php:598 +#: src/Module/Settings/Account.php:578 msgid "Default Post Permissions" msgstr "" -#: src/Module/Settings/Account.php:602 +#: src/Module/Settings/Account.php:582 msgid "Expiration settings" msgstr "" -#: src/Module/Settings/Account.php:603 +#: src/Module/Settings/Account.php:583 msgid "Automatically expire posts after this many days:" msgstr "" -#: src/Module/Settings/Account.php:603 +#: src/Module/Settings/Account.php:583 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: src/Module/Settings/Account.php:604 +#: src/Module/Settings/Account.php:584 msgid "Expire posts" msgstr "" -#: src/Module/Settings/Account.php:604 +#: src/Module/Settings/Account.php:584 msgid "When activated, posts and comments will be expired." msgstr "" -#: src/Module/Settings/Account.php:605 +#: src/Module/Settings/Account.php:585 msgid "Expire personal notes" msgstr "" -#: src/Module/Settings/Account.php:605 +#: src/Module/Settings/Account.php:585 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "" -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:586 msgid "Expire starred posts" msgstr "" -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:586 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "" -#: src/Module/Settings/Account.php:607 +#: src/Module/Settings/Account.php:587 msgid "Only expire posts by others" msgstr "" -#: src/Module/Settings/Account.php:607 +#: src/Module/Settings/Account.php:587 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "" -#: src/Module/Settings/Account.php:610 +#: src/Module/Settings/Account.php:590 msgid "Notification Settings" msgstr "" -#: src/Module/Settings/Account.php:611 +#: src/Module/Settings/Account.php:591 msgid "Send a notification email when:" msgstr "" -#: src/Module/Settings/Account.php:612 +#: src/Module/Settings/Account.php:592 msgid "You receive an introduction" msgstr "" -#: src/Module/Settings/Account.php:613 +#: src/Module/Settings/Account.php:593 msgid "Your introductions are confirmed" msgstr "" -#: src/Module/Settings/Account.php:614 +#: src/Module/Settings/Account.php:594 msgid "Someone writes on your profile wall" msgstr "" -#: src/Module/Settings/Account.php:615 +#: src/Module/Settings/Account.php:595 msgid "Someone writes a followup comment" msgstr "" -#: src/Module/Settings/Account.php:616 +#: src/Module/Settings/Account.php:596 msgid "You receive a private message" msgstr "" -#: src/Module/Settings/Account.php:617 +#: src/Module/Settings/Account.php:597 msgid "You receive a friend suggestion" msgstr "" -#: src/Module/Settings/Account.php:618 +#: src/Module/Settings/Account.php:598 msgid "You are tagged in a post" msgstr "" -#: src/Module/Settings/Account.php:620 +#: src/Module/Settings/Account.php:600 msgid "Create a desktop notification when:" msgstr "" -#: src/Module/Settings/Account.php:621 +#: src/Module/Settings/Account.php:601 msgid "Someone tagged you" msgstr "" -#: src/Module/Settings/Account.php:622 +#: src/Module/Settings/Account.php:602 msgid "Someone directly commented on your post" msgstr "" -#: src/Module/Settings/Account.php:623 +#: src/Module/Settings/Account.php:603 msgid "Someone liked your content" msgstr "" -#: src/Module/Settings/Account.php:623 src/Module/Settings/Account.php:624 +#: src/Module/Settings/Account.php:603 src/Module/Settings/Account.php:604 msgid "Can only be enabled, when the direct comment notification is enabled." msgstr "" -#: src/Module/Settings/Account.php:624 +#: src/Module/Settings/Account.php:604 msgid "Someone shared your content" msgstr "" -#: src/Module/Settings/Account.php:625 +#: src/Module/Settings/Account.php:605 msgid "Someone commented in your thread" msgstr "" -#: src/Module/Settings/Account.php:626 +#: src/Module/Settings/Account.php:606 msgid "Someone commented in a thread where you commented" msgstr "" -#: src/Module/Settings/Account.php:627 +#: src/Module/Settings/Account.php:607 msgid "Someone commented in a thread where you interacted" msgstr "" -#: src/Module/Settings/Account.php:629 +#: src/Module/Settings/Account.php:609 msgid "Activate desktop notifications" msgstr "" -#: src/Module/Settings/Account.php:629 +#: src/Module/Settings/Account.php:609 msgid "Show desktop popup on new notifications" msgstr "" -#: src/Module/Settings/Account.php:633 +#: src/Module/Settings/Account.php:613 msgid "Text-only notification emails" msgstr "" -#: src/Module/Settings/Account.php:635 +#: src/Module/Settings/Account.php:615 msgid "Send text only notification emails, without the html part" msgstr "" -#: src/Module/Settings/Account.php:639 +#: src/Module/Settings/Account.php:619 msgid "Show detailled notifications" msgstr "" -#: src/Module/Settings/Account.php:641 +#: src/Module/Settings/Account.php:621 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "" -#: src/Module/Settings/Account.php:645 +#: src/Module/Settings/Account.php:625 msgid "Show notifications of ignored contacts" msgstr "" -#: src/Module/Settings/Account.php:647 +#: src/Module/Settings/Account.php:627 msgid "" "You don't see posts from ignored contacts. But you still see their comments. " "This setting controls if you want to still receive regular notifications " "that are caused by ignored contacts or not." msgstr "" -#: src/Module/Settings/Account.php:650 +#: src/Module/Settings/Account.php:630 msgid "Advanced Account/Page Type Settings" msgstr "" -#: src/Module/Settings/Account.php:651 +#: src/Module/Settings/Account.php:631 msgid "Change the behaviour of this account for special situations" msgstr "" -#: src/Module/Settings/Account.php:654 +#: src/Module/Settings/Account.php:634 msgid "Import Contacts" msgstr "" -#: src/Module/Settings/Account.php:655 +#: src/Module/Settings/Account.php:635 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "" -#: src/Module/Settings/Account.php:656 +#: src/Module/Settings/Account.php:636 msgid "Upload File" msgstr "" -#: src/Module/Settings/Account.php:659 +#: src/Module/Settings/Account.php:639 msgid "Relocate" msgstr "" -#: src/Module/Settings/Account.php:660 +#: src/Module/Settings/Account.php:640 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 "" -#: src/Module/Settings/Account.php:661 +#: src/Module/Settings/Account.php:641 msgid "Resend relocate message to contacts" msgstr ""