Merge pull request #6856 from tobiasd/20190311-lng

EN GB, EN US and IT translation updates

view/lang/en-gb/strings.php

@@ -135,18 +135,22 @@ $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s sent you
 $a->strings["a private message"] = "a private message";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s sent you %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Please visit %s to view or reply to your private messages.";
+$a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "%1\$s tagged you on [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s commented on [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "%1\$s tagged you on [url=%2\$s] your %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s commented on [url=%2\$s]your %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "%1\$s tagged you on [url=%2\$s]their %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "%1\$s commented on [url=%2\$s]their %3\$s[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s tagged you";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s tagged you at %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notify] Comment to conversation #%1\$d by %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s commented on an item/conversation you have been following.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Please visit %s to view or reply to the conversation.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notify] %s posted to your profile wall";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s posted to your profile wall at %2\$s";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s posted to [url=%2\$s]your wall[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s tagged you";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s tagged you at %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]tagged you[/url].";
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notify] %s shared a new post";
 $a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s shared a new post at %2\$s";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]shared a post[/url].";
@@ -291,7 +295,7 @@ $a->strings["Created"] = "Created";
 $a->strings["Last Tried"] = "Last Tried";
 $a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently.";
 $a->strings["Inspect Deferred Worker Queue"] = "Inspect Deferred Worker Queue";
-$a->strings["This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."] = "This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time.";
+$a->strings["This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."] = "This page lists the deferred worker jobs. These are jobs that couldn't initially be executed.";
 $a->strings["Inspect Worker Queue"] = "Inspect Worker Queue";
 $a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install.";
 $a->strings["Job Parameters"] = "Job Parameters";
@@ -302,6 +306,7 @@ $a->strings["The database update failed. Please run \"php bin/console.php dbstru
 $a->strings["The worker was never executed. Please check your database structure!"] = "The worker process has never been executed. Please check your database structure!";
 $a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "The last worker process started at %s UTC. This is more than one hour ago. Please adjust your crontab settings.";
 $a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your  configuration from <code>.htconfig.php</code>. See <a href=\"%s\">the  configuration help page</a> for help with the transition.";
+$a->strings["Friendica's configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "Friendica's configuration is now stored in config/local.config.php; please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition.";
 $a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href=\"%s\">the installation page</a> for help."] = "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href=\"%s\">the installation page</a> for help.";
 $a->strings["Normal Account"] = "Standard account";
 $a->strings["Automatic Follower Account"] = "Automatic follower account";
@@ -341,6 +346,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["Don't check"] = "Don't check";
 $a->strings["check the stable version"] = "check for stable version updates";
 $a->strings["check the development version"] = "check for development version updates";
+$a->strings["Database (legacy)"] = "Database (legacy)";
 $a->strings["Republish users to directory"] = "Republish users to directory";
 $a->strings["Registration"] = "Join this Friendica Node Today";
 $a->strings["File upload"] = "File upload";
@@ -351,7 +357,7 @@ $a->strings["Performance"] = "Performance";
 $a->strings["Worker"] = "Worker";
 $a->strings["Message Relay"] = "Message relay";
 $a->strings["Relocate Instance"] = "Relocate Instance";
-$a->strings["Warning! Advanced function. Could make this server unreachable."] = "Warning! Advanced function. Could make this server unreachable.";
+$a->strings["Warning! Advanced function. Could make this server unreachable."] = "Warning! Advanced function that could make this server unreachable.";
 $a->strings["Site name"] = "Site name";
 $a->strings["Host name"] = "Host name";
 $a->strings["Sender Email"] = "Sender email";
@@ -376,6 +382,8 @@ $a->strings["Hide help entry from navigation menu"] = "Hide help entry from navi
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL.";
 $a->strings["Single user instance"] = "Single user instance";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Make this instance multi-user or single-user for the named user";
+$a->strings["File storage backend"] = "File storage backend";
+$a->strings["The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you do not do so, the files uploaded before the change will still be available at the old backend. Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> for more information about the choices and the moving procedure."] = "The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you don't do so, the files uploaded before the change will still be available at the old backend. Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> for more information about the choices and the moving procedure.";
 $a->strings["Maximum image size"] = "Maximum image size";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximum size in bytes of uploaded images. Default is 0, which means no limits.";
 $a->strings["Maximum image length"] = "Maximum image length";
@@ -433,9 +441,9 @@ $a->strings["Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility
 $a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "Only import OStatus/ActivityPub threads from our contacts";
 $a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.";
 $a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus support can only be enabled if threading is enabled.";
-$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Diaspora support can't be enabled because Friendica was installed into a sub directory.";
+$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "diaspora* support can't be enabled because Friendica was installed into a sub directory.";
-$a->strings["Enable Diaspora support"] = "Enable Diaspora support";
+$a->strings["Enable Diaspora support"] = "Enable diaspora* support";
-$a->strings["Provide built-in Diaspora network compatibility."] = "Provide built-in Diaspora network compatibility.";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Provide built-in diaspora* network compatibility.";
 $a->strings["Only allow Friendica contacts"] = "Only allow Friendica contacts";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "All contacts must use Friendica protocols. All other built-in communication protocols will be disabled.";
 $a->strings["Verify SSL"] = "Verify SSL";
@@ -459,7 +467,7 @@ $a->strings["If enabled, the global contacts are checked periodically for missin
 $a->strings["Days between requery"] = "Days between enquiry";
 $a->strings["Number of days after which a server is requeried for his contacts."] = "Number of days after which a server is required check contacts.";
 $a->strings["Discover contacts from other servers"] = "Discover contacts from other servers";
-$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "Periodically query other servers for contacts. You can choose between 'Users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older Friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommend setting is 'Users, Global Contacts'.";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'."] = "Periodically query other servers for contacts. You can choose between 'users': the users on the remote system and 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommended setting is 'Users, Global Contacts'.";
 $a->strings["Timeframe for fetching global contacts"] = "Time-frame for fetching global contacts";
 $a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers.";
 $a->strings["Search the local directory"] = "Search the local directory";
@@ -493,7 +501,7 @@ $a->strings["The picture proxy increases performance and privacy. It shouldn't b
 $a->strings["Only search in tags"] = "Only search in tags";
 $a->strings["On large systems the text search can slow down the system extremely."] = "On large systems the text search can slow down the system significantly.";
 $a->strings["New base url"] = "New base URL";
-$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.";
+$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Change base url for this server. Sends relocate message to all Friendica and diaspora* contacts of all users.";
 $a->strings["RINO Encryption"] = "RINO Encryption";
 $a->strings["Encryption layer between nodes."] = "Encryption layer between nodes.";
 $a->strings["Enabled"] = "Enabled";
@@ -557,6 +565,7 @@ $a->strings["Personal Page"] = "Personal Page";
 $a->strings["Organisation Page"] = "Organisation Page";
 $a->strings["News Page"] = "News Page";
 $a->strings["Community Forum"] = "Community Forum";
+$a->strings["Relay"] = "Relay";
 $a->strings["Email"] = "Email";
 $a->strings["Register date"] = "Registration date";
 $a->strings["Last login"] = "Last login";
@@ -623,8 +632,6 @@ $a->strings["No"] = "No";
 $a->strings["You must be logged in to use addons. "] = "You must be logged in to use addons. ";
 $a->strings["Applications"] = "Applications";
 $a->strings["No installed applications."] = "No installed applications.";
-$a->strings["Item not available."] = "Item not available.";
-$a->strings["Item was not found."] = "Item was not found.";
 $a->strings["Source input"] = "Source input";
 $a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
 $a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (raw HTML)";
@@ -634,7 +641,9 @@ $a->strings["BBCode::toMarkdown"] = "BBCode::toMarkdown";
 $a->strings["BBCode::toMarkdown => Markdown::convert"] = "BBCode::toMarkdown => Markdown::convert";
 $a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "BBCode::toMarkdown => Markdown::toBBCode";
 $a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode";
-$a->strings["Source input (Diaspora format)"] = "Source input (Diaspora format)";
+$a->strings["Item Body"] = "Item Body";
+$a->strings["Item Tags"] = "Item Tags";
+$a->strings["Source input (Diaspora format)"] = "Source input (diaspora* format)";
 $a->strings["Markdown::convert (raw HTML)"] = "Markdown::convert (raw HTML)";
 $a->strings["Markdown::convert"] = "Markdown::convert";
 $a->strings["Markdown::toBBCode"] = "Markdown::toBBCode";
@@ -698,6 +707,7 @@ $a->strings["Mark this contact as remote_self, this will cause friendica to repo
 $a->strings["Account Nickname"] = "Account nickname:";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tag name - overrides name/nickname:";
 $a->strings["Account URL"] = "Account URL:";
+$a->strings["Account URL Alias"] = "Account URL alias";
 $a->strings["Friend Request URL"] = "Friend request URL:";
 $a->strings["Friend Confirm URL"] = "Friend confirm URL:";
 $a->strings["Notification Endpoint URL"] = "Notification endpoint URL";
@@ -773,8 +783,8 @@ $a->strings["Does %s know you?"] = "Does %s know you?";
 $a->strings["Add a personal note:"] = "Add a personal note:";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["GNU Social (Pleroma, Mastodon)"] = "GNU Social (Pleroma, Mastodon)";
-$a->strings["Diaspora (Socialhome, Hubzilla)"] = "Diaspora (Socialhome, Hubzilla)";
+$a->strings["Diaspora (Socialhome, Hubzilla)"] = "diaspora* (Socialhome, Hubzilla)";
-$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - please do not use this form.  Instead, enter %s into your Diaspora search bar.";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - please do not use this form.  Instead, enter %s into your diaspora* search bar.";
 $a->strings["Your Identity Address:"] = "My identity address:";
 $a->strings["Submit Request"] = "Submit request";
 $a->strings["Location:"] = "Location:";
@@ -828,7 +838,7 @@ $a->strings["Source URL"] = "Source URL";
 $a->strings["- select -"] = "- select -";
 $a->strings["The contact could not be added."] = "Contact could not be added.";
 $a->strings["You already added this contact."] = "You already added this contact.";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora support isn't enabled. Contact can't be added.";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "diaspora* support isn't enabled. Contact can't be added.";
 $a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus support is disabled. Contact can't be added.";
 $a->strings["The network type couldn't be detected. Contact can't be added."] = "The network type couldn't be detected. Contact can't be added.";
 $a->strings["Tags:"] = "Tags:";
@@ -1017,7 +1027,7 @@ $a->strings["Finding New People"] = "Finding new people";
 $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.";
 $a->strings["Groups"] = "Groups";
 $a->strings["Group Your Contacts"] = "Group your contacts";
-$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Once you have made some friends, organize them into private conversation groups from the sidebar of your contacts page and then you can interact with each group privately on your network page.";
+$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Once you have made some friends, organise them into private conversation groups from the sidebar of your contacts page and then you can interact with each group privately on your network page.";
 $a->strings["Why Aren't My Posts Public?"] = "Why aren't my posts public?";
 $a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above.";
 $a->strings["Getting Help"] = "Getting help";
@@ -1126,9 +1136,6 @@ $a->strings["Recipient"] = "Recipient:";
 $a->strings["Choose what you wish to do to recipient"] = "Choose what you wish to do:";
 $a->strings["Make this post private"] = "Make this post private";
 $a->strings["Only logged in users are permitted to perform a probing."] = "Only logged in users are permitted to perform a probing.";
-$a->strings["%s's timeline"] = "%s's timeline";
-$a->strings["%s's posts"] = "%s's posts";
-$a->strings["%s's comments"] = "%s's comments";
 $a->strings["Profile deleted."] = "Profile deleted.";
 $a->strings["Profile-"] = "Profile-";
 $a->strings["New profile created."] = "New profile created.";
@@ -1226,31 +1233,6 @@ $a->strings["Invalid profile identifier."] = "Invalid profile identifier.";
 $a->strings["Profile Visibility Editor"] = "Profile Visibility Editor";
 $a->strings["Visible To"] = "Visible to";
 $a->strings["All Contacts (with secure profile access)"] = "All contacts with secure profile access";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Registration successful. Please check your email for further instructions.";
-$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Failed to send email message. Here your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login.";
-$a->strings["Registration successful."] = "Registration successful.";
-$a->strings["Your registration can not be processed."] = "Your registration cannot be processed.";
-$a->strings["Your registration is pending approval by the site owner."] = "Your registration is pending approval by the site administrator.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Sign up now'.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.";
-$a->strings["Your OpenID (optional): "] = "Your OpenID (optional): ";
-$a->strings["Include your profile in member directory?"] = "Include your profile in member directory?";
-$a->strings["Note for the admin"] = "Note for the admin";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin, why you want to join this node.";
-$a->strings["Membership on this site is by invitation only."] = "Membership on this site is by invitation only.";
-$a->strings["Your invitation code: "] = "Your invitation code: ";
-$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Your full name: ";
-$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Your Email Address: (Initial information will be send there; so this must be an existing address.)";
-$a->strings["New Password:"] = "New password:";
-$a->strings["Leave empty for an auto generated password."] = "Leave empty for an auto generated password.";
-$a->strings["Confirm:"] = "Confirm new password:";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'.";
-$a->strings["Choose a nickname: "] = "Choose a nickname: ";
-$a->strings["Register"] = "Sign up now >>";
-$a->strings["Import"] = "Import profile";
-$a->strings["Import your profile to this friendica instance"] = "Import an existing Friendica profile to this node.";
-$a->strings["Note: This node explicitly contains adult content"] = "Note: This node explicitly contains adult content";
 $a->strings["Account approved."] = "Account approved.";
 $a->strings["Registration revoked for %s"] = "Registration revoked for %s";
 $a->strings["Please login."] = "Please login.";
@@ -1308,7 +1290,7 @@ $a->strings["Remove authorization"] = "Remove authorization";
 $a->strings["No Addon settings configured"] = "No addon settings configured";
 $a->strings["Addon Settings"] = "Addon settings";
 $a->strings["Additional Features"] = "Additional Features";
-$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Diaspora"] = "diaspora*";
 $a->strings["enabled"] = "enabled";
 $a->strings["disabled"] = "disabled";
 $a->strings["Built-in support for %s connectivity is %s"] = "Built-in support for %s connectivity is %s";
@@ -1392,7 +1374,7 @@ $a->strings["Your profile will be published in the global friendica directories
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Hide my contact list from others?";
 $a->strings["Your contact list won't be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create"] = "Your contact list won't be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create";
 $a->strings["Hide your profile details from anonymous viewers?"] = "Hide profile details from anonymous viewers?";
-$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means."] = "Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.";
+$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means."] = "Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies may still be accessible by other means.";
 $a->strings["Allow friends to post to your profile page?"] = "Allow friends to post to my wall?";
 $a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Your contacts may write posts on your profile wall. These posts will be distributed to your contacts";
 $a->strings["Allow friends to tag your posts?"] = "Allow friends to tag my post?";
@@ -1414,7 +1396,9 @@ $a->strings["Expire photos:"] = "Expire photos:";
 $a->strings["Only expire posts by others:"] = "Only expire posts by others:";
 $a->strings["Account Settings"] = "Account Settings";
 $a->strings["Password Settings"] = "Password change";
+$a->strings["New Password:"] = "New password:";
 $a->strings["Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:)."] = "Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon.";
+$a->strings["Confirm:"] = "Confirm new password:";
 $a->strings["Leave password fields blank unless changing"] = "Leave password fields blank unless changing";
 $a->strings["Current Password:"] = "Current password:";
 $a->strings["Your current password to confirm the changes"] = "Current password to confirm change";
@@ -1468,12 +1452,14 @@ $a->strings["Select a tag to remove: "] = "Select a tag to remove: ";
 $a->strings["Export account"] = "Export account";
 $a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Export your account info and contacts. Use this to backup your account or to move it to another server.";
 $a->strings["Export all"] = "Export all";
-$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Export your account info, contacts and all your items as JSON. This could be a very big file, and could take a lot of time. Use this to make a full backup of your account. Photos are not exported.";
 $a->strings["User imports on closed servers can only be done by an administrator."] = "User imports on closed servers can only be done by an administrator.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.";
+$a->strings["Import"] = "Import profile";
 $a->strings["Move account"] = "Move Existing Friendica Account";
 $a->strings["You can import an account from another Friendica server."] = "You can import an existing Friendica profile to this node.";
 $a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from diaspora*.";
 $a->strings["Account file"] = "Account file:";
 $a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "To export your account, go to \"Settings->Export personal data\" and select \"Export account\"";
 $a->strings["You aren't following this contact."] = "You aren't following this contact.";
@@ -1501,7 +1487,6 @@ $a->strings["File exceeds size limit of %s"] = "File exceeds size limit of %s";
 $a->strings["File upload failed."] = "File upload failed.";
 $a->strings["Wall Photos"] = "Wall photos";
 $a->strings["Delete this item?"] = "Delete this item?";
-$a->strings["show fewer"] = "Show fewer.";
 $a->strings["toggle mobile"] = "Toggle mobile";
 $a->strings["No system theme config value set."] = "No system theme configuration value set.";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours.";
@@ -1521,7 +1506,7 @@ $a->strings["MySpace"] = "MySpace";
 $a->strings["Google+"] = "Google+";
 $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
-$a->strings["Diaspora Connector"] = "Diaspora Connector";
+$a->strings["Diaspora Connector"] = "diaspora* connector";
 $a->strings["GNU Social Connector"] = "GNU Social Connector";
 $a->strings["ActivityPub"] = "ActivityPub";
 $a->strings["pnut"] = "pnut";
@@ -1592,6 +1577,8 @@ $a->strings["Ability for visitors to download the public calendar"] = "Ability f
 $a->strings["Post Composition Features"] = "Post composition";
 $a->strings["Auto-mention Forums"] = "Auto-mention forums";
 $a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Add/Remove mention when a forum page is selected or deselected in the ACL window.";
+$a->strings["Explicit Mentions"] = "Explicit mentions";
+$a->strings["Add explicit mentions to comment box for manual control over who gets mentioned in replies."] = "Add explicit mentions to comment box for manual control over who gets mentioned in replies.";
 $a->strings["Network Sidebar"] = "Network sidebar";
 $a->strings["Ability to select posts by date ranges"] = "Ability to select posts by date ranges";
 $a->strings["Protocol Filter"] = "Protocol Filter";
@@ -1630,6 +1617,7 @@ $a->strings["Your personal notes"] = "My personal notes";
 $a->strings["Sign in"] = "Sign in";
 $a->strings["Home"] = "Home";
 $a->strings["Home Page"] = "Home page";
+$a->strings["Register"] = "Sign up now >>";
 $a->strings["Create an account"] = "Create account";
 $a->strings["Help and documentation"] = "Help and documentation";
 $a->strings["Apps"] = "Apps";
@@ -1677,17 +1665,17 @@ $a->strings["Invalid source protocol"] = "Invalid source protocol";
 $a->strings["Invalid link protocol"] = "Invalid link protocol";
 $a->strings["Loading more entries..."] = "Loading more entries...";
 $a->strings["The end"] = "The end";
+$a->strings["Follow"] = "Follow";
+$a->strings["Click to open/close"] = "Reveal/hide";
+$a->strings["Export"] = "Export";
+$a->strings["Export calendar as ical"] = "Export calendar as ical";
+$a->strings["Export calendar as csv"] = "Export calendar as csv";
 $a->strings["No contacts"] = "No contacts";
 $a->strings["%d Contact"] = [
 	0 => "%d contact",
 	1 => "%d contacts",
 ];
 $a->strings["View Contacts"] = "View contacts";
-$a->strings["Follow"] = "Follow";
-$a->strings["Click to open/close"] = "Reveal/hide";
-$a->strings["Export"] = "Export";
-$a->strings["Export calendar as ical"] = "Export calendar as ical";
-$a->strings["Export calendar as csv"] = "Export calendar as csv";
 $a->strings["Add New Contact"] = "Add new contact";
 $a->strings["Enter address or web location"] = "Enter address or web location";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Example: jo@example.com, http://example.com/jo";
@@ -1766,8 +1754,8 @@ $a->strings["Error: iconv PHP module required but not installed."] = "Error: ico
 $a->strings["POSIX PHP module"] = "POSIX PHP module";
 $a->strings["Error: POSIX PHP module required but not installed."] = "Error: POSIX PHP module required but not installed.";
 $a->strings["JSON PHP module"] = "JSON PHP module";
-$a->strings["Error: JSON PHP module required but not installed."] = "Error: JSON PHP module required but not installed.";
+$a->strings["Error: JSON PHP module required but not installed."] = "Error: JSON PHP module is required but not installed.";
-$a->strings["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.";
+$a->strings["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 but is unable to do so.";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting issue, as the web server may not be able to write files in your directory - even if you can.";
 $a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternatively, you may skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions.";
@@ -1844,7 +1832,7 @@ $a->strings["Friend Suggestion"] = "Friend suggestion";
 $a->strings["Friend/Connect Request"] = "Friend/Contact request";
 $a->strings["New Follower"] = "New follower";
 $a->strings["Error 400 - Bad Request"] = "Error 400 - Bad Request";
-$a->strings["Error 401 - Unauthorized"] = "Error 401 - Unauthorized";
+$a->strings["Error 401 - Unauthorized"] = "Error 401 - Unauthorised";
 $a->strings["Error 403 - Forbidden"] = "Error 403 - Forbidden";
 $a->strings["Error 404 - Not Found"] = "Error 404 - Not Found";
 $a->strings["Error 500 - Internal Server Error"] = "Error 500 - Internal Server Error";
@@ -1962,6 +1950,13 @@ $a->strings["Profile Details"] = "Profile Details";
 $a->strings["Only You Can See This"] = "Only you can see this.";
 $a->strings["Tips for New Members"] = "Tips for New Members";
 $a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s welcomes %2\$s";
+$a->strings["Database storage failed to update %s"] = "Database storage failed to update %s";
+$a->strings["Database storage failed to insert data"] = "Database storage failed to insert data";
+$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "Filesystem storage failed to create \"%s\". Check you write permissions.";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Filesystem storage failed to save data to \"%s\". Check your write permissions";
+$a->strings["Storage base path"] = "Storage base path";
+$a->strings["Folder where uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Folder where uploaded files are saved. For maximum security, this should be a path outside web server folder tree";
+$a->strings["Enter a valid existing folder"] = "Enter a valid existing folder";
 $a->strings["Login failed"] = "Login failed";
 $a->strings["Not enough information to authenticate"] = "Not enough information to authenticate";
 $a->strings["Password can't be empty"] = "Password can't be empty";
@@ -2001,6 +1996,7 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "Registration at %s";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default 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\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default 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\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s.";
+$a->strings["Item was not found."] = "Item was not found.";
 $a->strings["%d contact edited."] = [
 	0 => "%d contact edited.",
 	1 => "%d contacts edited.",
@@ -2122,7 +2118,30 @@ $a->strings["terms of service"] = "Terms of service";
 $a->strings["Website Privacy Policy"] = "Website Privacy Policy";
 $a->strings["privacy policy"] = "Privacy policy";
 $a->strings["Logged out."] = "Logged out.";
+$a->strings["%s's timeline"] = "%s's timeline";
+$a->strings["%s's posts"] = "%s's posts";
+$a->strings["%s's comments"] = "%s's comments";
 $a->strings["Bad Request."] = "Bad request.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking \"Register\"."] = "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking \"Register\".";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.";
+$a->strings["Your OpenID (optional): "] = "Your OpenID (optional): ";
+$a->strings["Include your profile in member directory?"] = "Include your profile in member directory?";
+$a->strings["Note for the admin"] = "Note for the admin";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin, why you want to join this node.";
+$a->strings["Membership on this site is by invitation only."] = "Membership on this site is by invitation only.";
+$a->strings["Your invitation code: "] = "Your invitation code: ";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Your full name: ";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Your Email Address: (Initial information will be send there; so this must be an existing address.)";
+$a->strings["Leave empty for an auto generated password."] = "Leave empty for an auto generated password.";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \"<strong>nickname@%s</strong>\"."] = "Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \"<strong>nickname@%s</strong>\".";
+$a->strings["Choose a nickname: "] = "Choose a nickname: ";
+$a->strings["Import your profile to this friendica instance"] = "Import an existing Friendica profile to this node.";
+$a->strings["Note: This node explicitly contains adult content"] = "Note: This node explicitly contains adult content";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registration successful. Please check your email for further instructions.";
+$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Failed to send email message. Here your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login.";
+$a->strings["Registration successful."] = "Registration successful.";
+$a->strings["Your registration can not be processed."] = "Your registration cannot be processed.";
+$a->strings["Your registration is pending approval by the site owner."] = "Your registration is pending approval by the site administrator.";
 $a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.";
 $a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "This information is required for communication and is passed on to the nodes of the communication partners and stored there. Users can enter additional personal information that may be transmitted to the communication partner's accounts.";
 $a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.";
@@ -2151,11 +2170,19 @@ $a->strings["to"] = "to";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Wall-to-wall";
 $a->strings["via Wall-To-Wall:"] = "via wall-to-wall:";
+$a->strings["Reply to %s"] = "Reply to %s";
+$a->strings["Notifier task is pending"] = "Notifier task is pending";
+$a->strings["Delivery to remote servers is pending"] = "Delivery to remote servers is pending";
+$a->strings["Delivery to remote servers is underway"] = "Delivery to remote servers is underway";
+$a->strings["Delivery to remote servers is mostly done"] = "Delivery to remote servers is mostly done";
+$a->strings["Delivery to remote servers is done"] = "Delivery to remote servers is done";
 $a->strings["%d comment"] = [
 	0 => "%d comment",
 	1 => "%d comments -",
 ];
-$a->strings["Sharing notification from Diaspora network"] = "Sharing notification from Diaspora network";
+$a->strings["Show more"] = "Show more";
+$a->strings["Show fewer"] = "Show fewer";
+$a->strings["Sharing notification from Diaspora network"] = "Sharing notification from diaspora* network";
 $a->strings["Attachments:"] = "Attachments:";
 $a->strings["%s is now following %s."] = "%s is now following %s.";
 $a->strings["following"] = "following";