From 16a07e6d83dc4eff600bf1c12c0d638977ab44d6 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 15:52:53 +0200 Subject: [PATCH 01/14] cleanup multipart email sending code remove 'EmailNotification' class and rename 'enotify' class as 'Emailer' --- .../{EmailNotification.php => Emailer.php} | 28 ++-- include/email.php | 6 + include/enotify.php | 138 ++++++------------ 3 files changed, 62 insertions(+), 110 deletions(-) rename include/{EmailNotification.php => Emailer.php} (65%) diff --git a/include/EmailNotification.php b/include/Emailer.php similarity index 65% rename from include/EmailNotification.php rename to include/Emailer.php index 8861e8f5d..a5b600e36 100644 --- a/include/EmailNotification.php +++ b/include/Emailer.php @@ -2,7 +2,7 @@ require_once('include/email.php'); -class EmailNotification { +class Emailer { /** * Send a multipart/alternative message with Text and HTML versions * @@ -13,13 +13,13 @@ class EmailNotification { * @param messageSubject subject of the message * @param htmlVersion html version of the message * @param textVersion text only version of the message + * @param additionalMailHeader additions to the smtp mail header */ - static public function sendTextHtmlEmail($fromName,$fromEmail,$replyTo,$toEmail,$messageSubject,$htmlVersion,$textVersion) { + static public function send($params) { + + $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); + $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8'); - $fromName = email_header_encode($fromName,'UTF-8'); - $messageSubject = email_header_encode($messageSubject,'UTF-8'); - - // generate a mime boundary $mimeBoundary =rand(0,9)."-" .rand(10000000000,9999999999)."-" @@ -28,14 +28,15 @@ class EmailNotification { // generate a multipart/alternative message header $messageHeader = - "From: {$fromName} <{$fromEmail}>\n" . - "Reply-To: {$replyTo}\n" . + $params['additionalMailHeader'] . + "From: $fromName <{$params['fromEmail']}>\n" . + "Reply-To: $fromName <{$params['replyTo']}>\n" . "MIME-Version: 1.0\n" . "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; // assemble the final multipart message body with the text and html types included - $textBody = chunk_split(base64_encode($textVersion)); - $htmlBody = chunk_split(base64_encode($htmlVersion)); + $textBody = chunk_split(base64_encode($params['textVersion'])); + $htmlBody = chunk_split(base64_encode($params['htmlVersion'])); $multipartMessageBody = "--" . $mimeBoundary . "\n" . // plain text section "Content-Type: text/plain; charset=UTF-8\n" . @@ -49,12 +50,13 @@ class EmailNotification { // send the message $res = mail( - $toEmail, // send to address + $params['toEmail'], // send to address $messageSubject, // subject $multipartMessageBody, // message body $messageHeader // message headers ); - logger("sendTextHtmlEmail: END"); + logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); + logger("return value " . $res, LOGGER_DEBUG); } } -?> \ No newline at end of file +?> diff --git a/include/email.php b/include/email.php index dec8c93db..0f24a4249 100644 --- a/include/email.php +++ b/include/email.php @@ -249,6 +249,12 @@ function email_header_encode($in_str, $charset) { return $out_str; } +/** + * email_send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code + * (not to notify the user, but to send items to email contacts + * + * TODO: this could be changed to use the Emailer class + */ function email_send($addr, $subject, $headers, $item) { //$headers .= 'MIME-Version: 1.0' . "\n"; //$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n"; diff --git a/include/enotify.php b/include/enotify.php index 970ece82e..2dca5a609 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -1,10 +1,12 @@ get_baseurl(true); - $thanks = t('Thank You,'); - $sitename = $a->config['sitename']; - $site_admin = sprintf( t('%s Administrator'), $sitename); - - $sender_name = $product; - $hostname = $a->get_hostname(); - if(strpos($hostname,':')) - $hostname = substr($hostname,0,strpos($hostname,':')); - - $sender_email = t('noreply') . '@' . $hostname; - $additional_mail_header = ""; - - $additional_mail_header .= "Precedence: list\n"; - $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; - $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; - $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; - $additional_mail_header .= "List-ID: \n"; - $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; if(array_key_exists('item',$params)) { $title = $params['item']['title']; @@ -250,6 +231,35 @@ function notification($params) { } + + /*$email = prepare_notificaion_mail($params, $subject, $preamble, $body, $sitelink, $tsitelink, $hsitelink, $itemlink); + if ($email) Emailer::send($email); + pop_lang();*/ + + + $banner = t('Friendica Notification'); + $product = FRIENDICA_PLATFORM; + $siteurl = $a->get_baseurl(true); + $thanks = t('Thank You,'); + $sitename = $a->config['sitename']; + $site_admin = sprintf( t('%s Administrator'), $sitename); + + $sender_name = $product; + $hostname = $a->get_hostname(); + if(strpos($hostname,':')) + $hostname = substr($hostname,0,strpos($hostname,':')); + + $sender_email = t('noreply') . '@' . $hostname; + + + $additional_mail_header = ""; + $additional_mail_header .= "Precedence: list\n"; + $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; + $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; + $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; + $additional_mail_header .= "List-ID: \n"; + $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; + $h = array( 'params' => $params, 'subject' => $subject, @@ -274,7 +284,6 @@ function notification($params) { $itemlink = $h['itemlink']; - require_once('include/html2bbcode.php'); do { $dups = false; @@ -304,7 +313,7 @@ function notification($params) { if($datarray['abort']) { pop_lang(); - return; + return False; } // create notification entry in DB @@ -332,7 +341,7 @@ function notification($params) { $notify_id = $r[0]['id']; else { pop_lang(); - return; + return False; } // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums @@ -356,17 +365,11 @@ function notification($params) { if($notify_id != $p[0]['id']) { pop_lang(); - return; + return False; } } - - - - - - $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); $r = q("update notify set msg = '%s' where id = %d and uid = %d", @@ -378,7 +381,6 @@ function notification($params) { // send email notification if notification preferences permit - require_once('include/bbcode.php'); if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { logger('notification: sending notification email'); @@ -410,7 +412,7 @@ function notification($params) { } else { // If not, just "follow" the thread. $additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n"; - logger("include/enotify: There's already a notification for this parent:\n" . print_r($r, true), LOGGER_DEBUG); + logger("There's already a notification for this parent:\n" . print_r($r, true), LOGGER_DEBUG); } } @@ -494,9 +496,9 @@ function notification($params) { // logger('text: ' . $email_text_body); - // use the EmailNotification library to send the message + // use the Emailer class to send the message - enotify::send(array( + Emailer::send(array( 'fromName' => $sender_name, 'fromEmail' => $sender_email, 'replyTo' => $sender_email, @@ -506,69 +508,11 @@ function notification($params) { 'textVersion' => $email_text_body, 'additionalMailHeader' => $datarray['headers'], )); + return True; } - pop_lang(); + return False; } -require_once('include/email.php'); - -class enotify { - /** - * Send a multipart/alternative message with Text and HTML versions - * - * @param fromName name of the sender - * @param fromEmail email fo the sender - * @param replyTo replyTo address to direct responses - * @param toEmail destination email address - * @param messageSubject subject of the message - * @param htmlVersion html version of the message - * @param textVersion text only version of the message - * @param additionalMailHeader additions to the smtp mail header - */ - static public function send($params) { - - $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); - $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8'); - - // generate a mime boundary - $mimeBoundary =rand(0,9)."-" - .rand(10000000000,9999999999)."-" - .rand(10000000000,9999999999)."=:" - .rand(10000,99999); - - // generate a multipart/alternative message header - $messageHeader = - $params['additionalMailHeader'] . - "From: $fromName <{$params['fromEmail']}>\n" . - "Reply-To: $fromName <{$params['replyTo']}>\n" . - "MIME-Version: 1.0\n" . - "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; - - // assemble the final multipart message body with the text and html types included - $textBody = chunk_split(base64_encode($params['textVersion'])); - $htmlBody = chunk_split(base64_encode($params['htmlVersion'])); - $multipartMessageBody = - "--" . $mimeBoundary . "\n" . // plain text section - "Content-Type: text/plain; charset=UTF-8\n" . - "Content-Transfer-Encoding: base64\n\n" . - $textBody . "\n" . - "--" . $mimeBoundary . "\n" . // text/html section - "Content-Type: text/html; charset=UTF-8\n" . - "Content-Transfer-Encoding: base64\n\n" . - $htmlBody . "\n" . - "--" . $mimeBoundary . "--\n"; // message ending - - // send the message - $res = mail( - $params['toEmail'], // send to address - $messageSubject, // subject - $multipartMessageBody, // message body - $messageHeader // message headers - ); - logger("notification: enotify::send header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); - logger("notification: enotify::send returns " . $res, LOGGER_DEBUG); - } -} ?> From 83df1f45831e1ab85af2eebe6eaee699b953a9e0 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 16:12:05 +0200 Subject: [PATCH 02/14] fix italian smarty3 email templates --- view/it/smarty3/follow_notify_eml.tpl | 10 +++--- view/it/smarty3/friend_complete_eml.tpl | 14 ++++----- view/it/smarty3/htconfig.tpl | 38 +++++++++++------------ view/it/smarty3/intro_complete_eml.tpl | 16 +++++----- view/it/smarty3/lostpass_eml.tpl | 12 +++---- view/it/smarty3/passchanged_eml.tpl | 10 +++--- view/it/smarty3/register_adminadd_eml.tpl | 14 ++++----- view/it/smarty3/register_open_eml.tpl | 14 ++++----- view/it/smarty3/register_verify_eml.tpl | 12 +++---- view/it/smarty3/request_notify_eml.tpl | 12 +++---- view/it/smarty3/update_fail_eml.tpl | 8 ++--- 11 files changed, 80 insertions(+), 80 deletions(-) diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl index c85a0cdc9..0bfc37552 100644 --- a/view/it/smarty3/follow_notify_eml.tpl +++ b/view/it/smarty3/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Ciao $[myname], +Ciao {{$myname}}, -Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'. +Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'. -Puoi vedere il suo profilo su $[url]. +Puoi vedere il suo profilo su {{$url}}. Accedi sul tuo sito per approvare o ignorare la richiesta. -$[siteurl] +{{$siteurl}} Saluti, - L'amministratore di $[sitename] \ No newline at end of file + L'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl index 890b0148c..daeaae901 100644 --- a/view/it/smarty3/friend_complete_eml.tpl +++ b/view/it/smarty3/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Ciao {{$username}}, - Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione su '$[sitename]'. + Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato +la tua richiesta di connessione su '{{$sitename}}'. Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email senza restrizioni. -Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare +Vai nella pagina 'Contatti' di {{$sitename}} se vuoi effettuare qualche modifica riguardo questa relazione -$[siteurl] +{{$siteurl}} [Ad esempio, potresti creare un profilo separato con le informazioni che non -sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]']. +sono disponibili pubblicamente - ed permettere di vederlo a '{{$fn}}']. Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl index 30998b86c..eb85de821 100644 --- a/view/it/smarty3/htconfig.tpl +++ b/view/it/smarty3/htconfig.tpl @@ -4,26 +4,26 @@ // Set the following for your MySQL installation // Copy or rename this file to .htconfig.php -$db_host = '{{$dbhost}}'; -$db_user = '{{$dbuser}}'; -$db_pass = '{{$dbpass}}'; -$db_data = '{{$dbdata}}'; +{{$db}}_host = '{{{{$dbhost}}}}'; +{{$db}}_user = '{{{{$dbuser}}}}'; +{{$db}}_pass = '{{{{$dbpass}}}}'; +{{$db}}_data = '{{{{$dbdata}}}}'; // If you are using a subdirectory of your domain you will need to put the // relative path (from the root of your domain) here. // For instance if your URL is 'http://example.com/directory/subdirectory', -// set $a->path to 'directory/subdirectory'. +// set {{$a}}->path to 'directory/subdirectory'. -$a->path = '{{$urlpath}}'; +{{$a}}->path = '{{{{$urlpath}}}}'; // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". // It can be changed later and only applies to timestamps for anonymous viewers. -$default_timezone = '{{$timezone}}'; +{{$default}}_timezone = '{{{{$timezone}}}}'; // What is your site name? -$a->config['sitename'] = "La Mia Rete di Amici"; +{{$a}}->config['sitename'] = "La Mia Rete di Amici"; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting @@ -32,38 +32,38 @@ $a->config['sitename'] = "La Mia Rete di Amici"; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -$a->config['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '{{$adminmail}}'; +{{$a}}->config['register_policy'] = REGISTER_OPEN; +{{$a}}->config['register_text'] = ''; +{{$a}}->config['admin_email'] = '{{{{$adminmail}}}}'; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 200000; +{{$a}}->config['max_import_size'] = 200000; // maximum size of uploaded photos -$a->config['system']['maximagesize'] = 800000; +{{$a}}->config['system']['maximagesize'] = 800000; // Location of PHP command line processor -$a->config['php_path'] = '{{$phpath}}'; +{{$a}}->config['php_path'] = '{{{{$phpath}}}}'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; +{{$a}}->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +{{$a}}->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +{{$a}}->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the // PHP mcrypt extension is installed on both systems -$a->config['system']['rino_encrypt'] = true; +{{$a}}->config['system']['rino_encrypt'] = true; // default system theme -$a->config['system']['theme'] = 'duepuntozero'; +{{$a}}->config['system']['theme'] = 'duepuntozero'; diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl index 46fe7018b..69fce8141 100644 --- a/view/it/smarty3/intro_complete_eml.tpl +++ b/view/it/smarty3/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Ciao {{$username}}, - '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione a '$[sitename]'. + '{{$fn}}' di '{{$dfrn_url}}' ha accettato +la tua richiesta di connessione a '{{$sitename}}'. - '$[fn]' ha deciso di accettarti come "fan", il che restringe + '{{$fn}}' ha deciso di accettarti come "fan", il che restringe alcune forme di comunicazione - come i messaggi privati e alcune interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno applicate automaticamente. - '$[fn]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva + '{{$fn}}' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva . - Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]', + Inizierai a ricevere gli aggiornamenti di stato pubblici da '{{$fn}}', che apparirà nella tua pagina 'Rete' -$[siteurl] +{{$siteurl}} Saluti, - l'amministratore di $[sitename] \ No newline at end of file + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl index b1fe75f94..3601f18a7 100644 --- a/view/it/smarty3/lostpass_eml.tpl +++ b/view/it/smarty3/lostpass_eml.tpl @@ -1,6 +1,6 @@ -Ciao $[username], - Su $[sitename] è stata ricevuta una richiesta di azzeramento della password del tuo account. +Ciao {{$username}}, + Su {{$sitename}} è stata ricevuta una richiesta di azzeramento della password del tuo account. Per confermare la richiesta, clicca sul link di verifica qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. @@ -12,7 +12,7 @@ hai fatto questa richiesta. Per verificare la tua identità clicca su: -$[reset_link] +{{$reset_link}} Dopo la verifica riceverai un messaggio di risposta con la nuova password. @@ -20,13 +20,13 @@ Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato I dati di accesso sono i seguenti: -Sito:»$[siteurl] -Nome utente:»$[email] +Sito:»{{$siteurl}} +Nome utente:»{{$email}} Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl index 15e05df1c..fccc0928f 100644 --- a/view/it/smarty3/passchanged_eml.tpl +++ b/view/it/smarty3/passchanged_eml.tpl @@ -1,5 +1,5 @@ -Ciao $[username], +Ciao {{$username}}, La tua password è stata cambiata, come hai richiesto. Conserva queste informazioni (oppure cambia immediatamente la password con qualcosa che ti è più facile ricordare). @@ -7,14 +7,14 @@ qualcosa che ti è più facile ricordare). I tuoi dati di accesso sono i seguenti: -Sito:»$[siteurl] -Soprannome:»$[email] -Password:»$[new_password] +Sito:»{{$siteurl}} +Soprannome:»{{$email}} +Password:»{{$new_password}} Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso. Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_adminadd_eml.tpl b/view/it/smarty3/register_adminadd_eml.tpl index 4cb17d294..20a9cb176 100644 --- a/view/it/smarty3/register_adminadd_eml.tpl +++ b/view/it/smarty3/register_adminadd_eml.tpl @@ -1,12 +1,12 @@ -Ciao $[username], - l'amministratore di {{$sitename}} ha creato un account per te. +Ciao {{$username}}, + l'amministratore di {{{{$sitename}}}} ha creato un account per te. I dettagli di accesso sono i seguenti -Sito:»$[siteurl] -Soprannome:»$[email] -Password:»$[password] +Sito:»{{$siteurl}} +Soprannome:»{{$email}} +Password:»{{$password}} Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso @@ -26,7 +26,7 @@ Se non ancora non conosci nessuno qui, posso essere d'aiuto per farti nuovi e interessanti amici. -Grazie. Siamo contenti di darti il benvenuto su $[sitename] +Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} Saluti, - l'amministratore di $[sitename] \ No newline at end of file + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl index 11a7752bc..23dcaf2c8 100644 --- a/view/it/smarty3/register_open_eml.tpl +++ b/view/it/smarty3/register_open_eml.tpl @@ -1,12 +1,12 @@ -Ciao $[username], - Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato. +Ciao {{$username}}, + Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. I dettagli di accesso sono i seguenti -Sito:»$[siteurl] -Nome utente:»$[email] -Password:»$[password] +Sito:»{{$siteurl}} +Nome utente:»{{$email}} +Password:»{{$password}} Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso . @@ -26,9 +26,9 @@ Se ancora non conosci nessuno qui, potrebbe esserti di aiuto per farti nuovi e interessanti amici. -Grazie. Siamo contenti di darti il benvenuto su $[sitename] +Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl index fa039badd..931d9d4b0 100644 --- a/view/it/smarty3/register_verify_eml.tpl +++ b/view/it/smarty3/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede +Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede la tua approvazione. I dati di accesso sono i seguenti: -Nome completo:»$[username] -Sito:»$[siteurl] -Nome utente:»$[email] +Nome completo:»{{$username}} +Sito:»{{$siteurl}} +Nome utente:»{{$email}} Per approvare questa richiesta clicca su: -$[siteurl]/regmod/allow/$[hash] +{{$siteurl}}/regmod/allow/{{$hash}} Per negare la richiesta e rimuovere il profilo, clicca su: -$[siteurl]/regmod/deny/$[hash] +{{$siteurl}}/regmod/deny/{{$hash}} Grazie. diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl index 2700e49fd..b0efcb40b 100644 --- a/view/it/smarty3/request_notify_eml.tpl +++ b/view/it/smarty3/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Ciao $[myname], +Ciao {{$myname}}, -Hai appena ricevuto una richiesta di connessione su $[sitename] +Hai appena ricevuto una richiesta di connessione su {{$sitename}} -da '$[requestor]'. +da '{{$requestor}}'. -Puoi visitare il suo profilo su $[url]. +Puoi visitare il suo profilo su {{$url}}. Accedi al tuo sito per vedere la richiesta completa e approva o ignora/annulla la richiesta. -$[siteurl] +{{$siteurl}} Saluti, - l'amministratore di $[sitename] \ No newline at end of file + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/update_fail_eml.tpl b/view/it/smarty3/update_fail_eml.tpl index 96813a7bc..d647e26d8 100644 --- a/view/it/smarty3/update_fail_eml.tpl +++ b/view/it/smarty3/update_fail_eml.tpl @@ -1,11 +1,11 @@ Ehi, -Sono $sitename; -Gli sviluppatori di Friendica hanno appena rilasciato la nuova versione $update, +Sono {{$sitename}}; +Gli sviluppatori di Friendica hanno appena rilasciato la nuova versione {{$update}}, ma appena ho provato ad installarla qualcosa è andato tremendamente storto. Le cose vanno messe a posto al più presto e non riesco a farlo da solo. Contatta uno sviluppatore di friendica se non riesci ad aiutarmi da solo. Il mio database potrebbe non essere più a posto. -Il messaggio di errore è: '$error'. +Il messaggio di errore è: '{{$error}}'. Mi dispiace, -il tuo server friendica su $siteurl \ No newline at end of file +il tuo server friendica su {{$siteurl}} \ No newline at end of file From 1bdddebd44d493f65ea2eba04af6ea0de19f48eb Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 17:28:46 +0200 Subject: [PATCH 03/14] connection confirm notification mail via notification() remove unused email templates add a check for unexpected reponse from server --- mod/dfrn_confirm.php | 119 ++++++++++----------- mod/dfrn_request.php | 74 ++++++------- view/ca/friend_complete_eml.tpl | 19 ---- view/ca/intro_complete_eml.tpl | 21 ---- view/ca/smarty3/friend_complete_eml.tpl | 20 ---- view/ca/smarty3/intro_complete_eml.tpl | 22 ---- view/cs/friend_complete_eml.tpl | 22 ---- view/cs/intro_complete_eml.tpl | 22 ---- view/cs/smarty3/friend_complete_eml.tpl | 18 ---- view/cs/smarty3/intro_complete_eml.tpl | 18 ---- view/de/friend_complete_eml.tpl | 22 ---- view/de/intro_complete_eml.tpl | 22 ---- view/de/smarty3/friend_complete_eml.tpl | 23 ---- view/de/smarty3/intro_complete_eml.tpl | 23 ---- view/en/friend_complete_eml.tpl | 22 ---- view/en/intro_complete_eml.tpl | 22 ---- view/en/smarty3/friend_complete_eml.tpl | 23 ---- view/en/smarty3/intro_complete_eml.tpl | 23 ---- view/eo/friend_complete_eml.tpl | 22 ---- view/eo/intro_complete_eml.tpl | 22 ---- view/eo/smarty3/friend_complete_eml.tpl | 23 ---- view/eo/smarty3/intro_complete_eml.tpl | 23 ---- view/es/friend_complete_eml.tpl | 19 ---- view/es/intro_complete_eml.tpl | 21 ---- view/es/smarty3/friend_complete_eml.tpl | 20 ---- view/es/smarty3/intro_complete_eml.tpl | 22 ---- view/fr/friend_complete_eml.tpl | 23 ---- view/fr/intro_complete_eml.tpl | 22 ---- view/fr/smarty3/friend_complete_eml.tpl | 24 ----- view/fr/smarty3/intro_complete_eml.tpl | 23 ---- view/is/friend_complete_eml.tpl | 22 ---- view/is/intro_complete_eml.tpl | 22 ---- view/is/smarty3/friend_complete_eml.tpl | 23 ---- view/is/smarty3/intro_complete_eml.tpl | 23 ---- view/it/smarty3/friend_complete_eml.tpl | 22 ---- view/it/smarty3/intro_complete_eml.tpl | 22 ---- view/nb-no/friend_complete_eml.tpl | 22 ---- view/nb-no/intro_complete_eml.tpl | 22 ---- view/nb-no/smarty3/friend_complete_eml.tpl | 23 ---- view/nb-no/smarty3/intro_complete_eml.tpl | 23 ---- view/nl/friend_complete_eml.tpl | 22 ---- view/nl/intro_complete_eml.tpl | 22 ---- view/pl/friend_complete_eml.tpl | 22 ---- view/pl/intro_complete_eml.tpl | 22 ---- view/pl/smarty3/friend_complete_eml.tpl | 23 ---- view/pl/smarty3/intro_complete_eml.tpl | 23 ---- view/pt-br/intro_complete_eml.tpl | 22 ---- view/pt-br/smarty3/intro_complete_eml.tpl | 23 ---- view/ro/smarty3/friend_complete_eml.tpl | 22 ---- view/ro/smarty3/intro_complete_eml.tpl | 22 ---- view/sv/friend_complete_eml.tpl | 17 --- view/sv/intro_complete_eml.tpl | 19 ---- view/sv/smarty3/friend_complete_eml.tpl | 18 ---- view/sv/smarty3/intro_complete_eml.tpl | 20 ---- view/zh-cn/friend_complete_eml.tpl | 22 ---- view/zh-cn/intro_complete_eml.tpl | 22 ---- view/zh-cn/smarty3/friend_complete_eml.tpl | 23 ---- view/zh-cn/smarty3/intro_complete_eml.tpl | 23 ---- 58 files changed, 96 insertions(+), 1314 deletions(-) delete mode 100644 view/ca/friend_complete_eml.tpl delete mode 100644 view/ca/intro_complete_eml.tpl delete mode 100644 view/ca/smarty3/friend_complete_eml.tpl delete mode 100644 view/ca/smarty3/intro_complete_eml.tpl delete mode 100644 view/cs/friend_complete_eml.tpl delete mode 100644 view/cs/intro_complete_eml.tpl delete mode 100644 view/cs/smarty3/friend_complete_eml.tpl delete mode 100644 view/cs/smarty3/intro_complete_eml.tpl delete mode 100644 view/de/friend_complete_eml.tpl delete mode 100644 view/de/intro_complete_eml.tpl delete mode 100644 view/de/smarty3/friend_complete_eml.tpl delete mode 100644 view/de/smarty3/intro_complete_eml.tpl delete mode 100644 view/en/friend_complete_eml.tpl delete mode 100644 view/en/intro_complete_eml.tpl delete mode 100644 view/en/smarty3/friend_complete_eml.tpl delete mode 100644 view/en/smarty3/intro_complete_eml.tpl delete mode 100644 view/eo/friend_complete_eml.tpl delete mode 100644 view/eo/intro_complete_eml.tpl delete mode 100644 view/eo/smarty3/friend_complete_eml.tpl delete mode 100644 view/eo/smarty3/intro_complete_eml.tpl delete mode 100644 view/es/friend_complete_eml.tpl delete mode 100644 view/es/intro_complete_eml.tpl delete mode 100644 view/es/smarty3/friend_complete_eml.tpl delete mode 100644 view/es/smarty3/intro_complete_eml.tpl delete mode 100644 view/fr/friend_complete_eml.tpl delete mode 100644 view/fr/intro_complete_eml.tpl delete mode 100644 view/fr/smarty3/friend_complete_eml.tpl delete mode 100644 view/fr/smarty3/intro_complete_eml.tpl delete mode 100644 view/is/friend_complete_eml.tpl delete mode 100644 view/is/intro_complete_eml.tpl delete mode 100644 view/is/smarty3/friend_complete_eml.tpl delete mode 100644 view/is/smarty3/intro_complete_eml.tpl delete mode 100644 view/it/smarty3/friend_complete_eml.tpl delete mode 100644 view/it/smarty3/intro_complete_eml.tpl delete mode 100644 view/nb-no/friend_complete_eml.tpl delete mode 100644 view/nb-no/intro_complete_eml.tpl delete mode 100644 view/nb-no/smarty3/friend_complete_eml.tpl delete mode 100644 view/nb-no/smarty3/intro_complete_eml.tpl delete mode 100644 view/nl/friend_complete_eml.tpl delete mode 100644 view/nl/intro_complete_eml.tpl delete mode 100644 view/pl/friend_complete_eml.tpl delete mode 100644 view/pl/intro_complete_eml.tpl delete mode 100644 view/pl/smarty3/friend_complete_eml.tpl delete mode 100644 view/pl/smarty3/intro_complete_eml.tpl delete mode 100644 view/pt-br/intro_complete_eml.tpl delete mode 100644 view/pt-br/smarty3/intro_complete_eml.tpl delete mode 100644 view/ro/smarty3/friend_complete_eml.tpl delete mode 100644 view/ro/smarty3/intro_complete_eml.tpl delete mode 100644 view/sv/friend_complete_eml.tpl delete mode 100644 view/sv/intro_complete_eml.tpl delete mode 100644 view/sv/smarty3/friend_complete_eml.tpl delete mode 100644 view/sv/smarty3/intro_complete_eml.tpl delete mode 100644 view/zh-cn/friend_complete_eml.tpl delete mode 100644 view/zh-cn/intro_complete_eml.tpl delete mode 100644 view/zh-cn/smarty3/friend_complete_eml.tpl delete mode 100644 view/zh-cn/smarty3/intro_complete_eml.tpl diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 8e1fc76e9..f1ce296d9 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -9,11 +9,13 @@ * 1. A form was submitted by our user approving a friendship that originated elsewhere. * This may also be called from dfrn_request to automatically approve a friendship. * - * 2. We may be the target or other side of the conversation to scenario 1, and will + * 2. We may be the target or other side of the conversation to scenario 1, and will * interact with that process on our own user's behalf. - * + * */ +require_once('include/enotify.php'); + function dfrn_confirm_post(&$a,$handsfree = null) { if(is_array($handsfree)) { @@ -35,11 +37,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { /** * - * Main entry point. Scenario 1. Our user received a friend request notification (perhaps - * from another site) and clicked 'Approve'. + * Main entry point. Scenario 1. Our user received a friend request notification (perhaps + * from another site) and clicked 'Approve'. * $POST['source_url'] is not set. If it is, it indicates Scenario 2. * - * We may also have been called directly from dfrn_request ($handsfree != null) due to + * We may also have been called directly from dfrn_request ($handsfree != null) due to * this being a page type which supports automatic friend acceptance. That is also Scenario 1 * since we are operating on behalf of our registered user to approve a friendship. * @@ -67,7 +69,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { // These data elements may come from either the friend request notification form or $handsfree array. if(is_array($handsfree)) { - logger('dfrn_confirm: Confirm in handsfree mode'); + logger('Confirm in handsfree mode'); $dfrn_id = $handsfree['dfrn_id']; $intro_id = $handsfree['intro_id']; $duplex = $handsfree['duplex']; @@ -86,7 +88,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { /** * * Ensure that dfrn_id has precedence when we go to find the contact record. - * We only want to search based on contact id if there is no dfrn_id, + * We only want to search based on contact id if there is no dfrn_id, * e.g. for OStatus network followers. * */ @@ -94,15 +96,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(strlen($dfrn_id)) $cid = 0; - logger('dfrn_confirm: Confirming request for dfrn_id (issued) ' . $dfrn_id); + logger('Confirming request for dfrn_id (issued) ' . $dfrn_id); if($cid) - logger('dfrn_confirm: Confirming follower with contact_id: ' . $cid); + logger('Confirming follower with contact_id: ' . $cid); /** * * The other person will have been issued an ID when they first requested friendship. - * Locate their record. At this time, their record will have both pending and blocked set to 1. + * Locate their record. At this time, their record will have both pending and blocked set to 1. * There won't be any dfrn_id if this is a network follower, so use the contact_id instead. * */ @@ -114,7 +116,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { ); if(! count($r)) { - logger('dfrn_confirm: Contact not found in DB.'); + logger('Contact not found in DB.'); notice( t('Contact not found.') . EOL ); notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL ); return; @@ -127,7 +129,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $site_pubkey = $contact['site-pubkey']; $dfrn_confirm = $contact['confirm']; $aes_allow = $contact['aes_allow']; - + $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS); if($contact['network']) @@ -139,15 +141,16 @@ function dfrn_confirm_post(&$a,$handsfree = null) { * * Generate a key pair for all further communications with this person. * We have a keypair for every contact, and a site key for unknown people. - * This provides a means to carry on relationships with other people if - * any single key is compromised. It is a robust key. We're much more - * worried about key leakage than anybody cracking it. + * This provides a means to carry on relationships with other people if + * any single key is compromised. It is a robust key. We're much more + * worried about key leakage than anybody cracking it. * */ require_once('include/crypto.php'); $res = new_keypair(4096); + $private_key = $res['prvkey']; $public_key = $res['pubkey']; @@ -156,23 +159,23 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($private_key), intval($contact_id), - intval($uid) + intval($uid) ); $params = array(); /** * - * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our + * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our * site private key (person on the other end can decrypt it with our site public key). * Then encrypt our profile URL with the other person's site public key. They can decrypt * it with their site private key. If the decryption on the other end fails for either - * item, it indicates tampering or key failure on at least one site and we will not be + * item, it indicates tampering or key failure on at least one site and we will not be * able to provide a secure communication pathway. * - * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 - * or later) then we encrypt the personal public key we send them using AES-256-CBC and a - * random key which is encrypted with their site public key. + * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 + * or later) then we encrypt the personal public key we send them using AES-256-CBC and a + * random key which is encrypted with their site public key. * */ @@ -205,7 +208,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if($user[0]['page-flags'] == PAGE_PRVGROUP) $params['page'] = 2; - logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); + logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); /** * @@ -219,10 +222,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $res = post_url($dfrn_confirm,$params); - logger('dfrn_confirm: Confirm: received data: ' . $res, LOGGER_DATA); + logger(' Confirm: received data: ' . $res, LOGGER_DATA); - // Now figure out what they responded. Try to be robust if the remote site is - // having difficulty and throwing up errors of some kind. + // Now figure out what they responded. Try to be robust if the remote site is + // having difficulty and throwing up errors of some kind. $leading_junk = substr($res,0,strpos($res,'status; $message = unxmlify($xml->message); // human readable text of what may have gone wrong. @@ -261,7 +270,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($new_dfrn_id), intval($contact_id), - intval($uid) + intval($uid) ); case 2: @@ -307,7 +316,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { require_once('include/Photo.php'); $photos = import_profile_photo($contact['photo'],$uid,$contact_id); - + logger('dfrn_confirm: confirm - imported photos'); if($network === NETWORK_DFRN) { @@ -455,7 +464,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(count($self)) { $arr = array(); - $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); $arr['uid'] = $uid; $arr['contact-id'] = $self[0]['id']; $arr['wall'] = 1; @@ -522,7 +531,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { * * Begin Scenario 2. This is the remote response to the above scenario. * This will take place on the site that originally initiated the friend request. - * In the section above where the confirming party makes a POST and + * In the section above where the confirming party makes a POST and * retrieves xml status information, they are communicating with the following code. * */ @@ -603,7 +612,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { // this is either a bogus confirmation (?) or we deleted the original introduction. $message = t('Contact record was not found for you on our site.'); xml_status(3,$message); - return; // NOTREACHED + return; // NOTREACHED } } @@ -731,33 +740,21 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $combined = $r[0]; if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { - - push_lang($r[0]['language']); - $tpl = (($new_relation == CONTACT_IS_FRIEND) - ? get_intltext_template('friend_complete_eml.tpl') - : get_intltext_template('intro_complete_eml.tpl')); - - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $r[0]['username'], - '$email' => $r[0]['email'], - '$fn' => $r[0]['name'], - '$dfrn_url' => $r[0]['url'], - '$uid' => $newuid ) - ); - require_once('include/email.php'); - - $res = mail($r[0]['email'], email_header_encode( sprintf( t("Connection accepted at %s") , $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - - if(!$res) { - // pointless throwing an error here and confusing the person at the other end of the wire. - } - pop_lang(); + $mutual = ($new_relation == CONTACT_IS_FRIEND); + notification(array( + 'type' => NOTIFY_CONFIRM, + 'notify_flags' => $r[0]['notify-flags'], + 'language' => $r[0]['language'], + 'to_name' => $r[0]['username'], + 'to_email' => $r[0]['email'], + 'uid' => $r[0]['uid'], + 'link' => $a->get_baseurl() . '/contacts/' . $dfrn_record, + 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')), + 'source_link' => $r[0]['url'], + 'source_photo' => $r[0]['photo'], + 'verb' => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW), + 'otype' => 'intro' + )); } // Send a new friend post if we are allowed to... @@ -778,7 +775,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(count($self)) { $arr = array(); - $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid); $arr['uid'] = $local_uid; $arr['contact-id'] = $self[0]['id']; $arr['wall'] = 1; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 7440c8ab4..5e19a1ffc 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -9,6 +9,8 @@ * */ +require_once('include/enotify.php'); + if(! function_exists('dfrn_request_init')) { function dfrn_request_init(&$a) { @@ -45,13 +47,13 @@ function dfrn_request_post(&$a) { if(x($_POST, 'cancel')) { goaway(z_root()); - } + } /** * * Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell - * to confirm the request, and then we've clicked submit (perhaps after logging in). + * to confirm the request, and then we've clicked submit (perhaps after logging in). * That brings us here: * */ @@ -145,7 +147,7 @@ function dfrn_request_post(&$a) { */ $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`, - `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`) + `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`) VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)", intval(local_user()), datetime_convert(), @@ -216,17 +218,17 @@ function dfrn_request_post(&$a) { /** * Otherwise: - * + * * Scenario 1: - * We are the requestee. A person from a remote cell has made an introduction - * on our profile web page and clicked submit. We will use their DFRN-URL to - * figure out how to contact their cell. + * We are the requestee. A person from a remote cell has made an introduction + * on our profile web page and clicked submit. We will use their DFRN-URL to + * figure out how to contact their cell. * * Scrape the originating DFRN-URL for everything we need. Create a contact record * and an introduction to show our user next time he/she logs in. * Finally redirect back to the requestor so that their site can record the request. - * If our user (the requestee) later confirms this request, a record of it will need - * to exist on the requestor's cell in order for the confirmation process to complete.. + * If our user (the requestee) later confirms this request, a record of it will need + * to exist on the requestor's cell in order for the confirmation process to complete.. * * It's possible that neither the requestor or the requestee are logged in at the moment, * and the requestor does not yet have any credentials to the requestee profile. @@ -266,19 +268,19 @@ function dfrn_request_post(&$a) { notice( t('Spam protection measures have been invoked.') . EOL); notice( t('Friends are advised to please try again in 24 hours.') . EOL); return; - } + } } /** * - * Cleanup old introductions that remain blocked. + * Cleanup old introductions that remain blocked. * Also remove the contact record, but only if there is no existing relationship * Do not remove email contacts as these may be awaiting email verification */ - $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` + $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id` - WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 + WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 AND `contact`.`network` != '%s' AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ", dbesc(NETWORK_MAIL2) @@ -401,13 +403,13 @@ function dfrn_request_post(&$a) { $photo = avatar_img($addr); - $r = q("UPDATE `contact` SET - `photo` = '%s', + $r = q("UPDATE `contact` SET + `photo` = '%s', `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', `hidden` = 0, WHERE `id` = %d ", @@ -464,7 +466,7 @@ function dfrn_request_post(&$a) { if($network === NETWORK_DFRN) { - $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", + $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", intval($uid), dbesc($url) ); @@ -506,7 +508,7 @@ function dfrn_request_post(&$a) { goaway($a->get_baseurl() . '/' . $a->cmd); return; // NOTREACHED } - + require_once('include/Scrape.php'); @@ -521,12 +523,12 @@ function dfrn_request_post(&$a) { notice( t('Warning: profile location has no identifiable owner name.') . EOL ); if(! x($parms,'photo')) notice( t('Warning: profile location has no profile photo.') . EOL ); - $invalid = validate_dfrn($parms); + $invalid = validate_dfrn($parms); if($invalid) { notice( sprintf( tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL ); - + return; } } @@ -591,7 +593,7 @@ function dfrn_request_post(&$a) { // This notice will only be seen by the requestor if the requestor and requestee are on the same server. - if(! $failed) + if(! $failed) info( t('Your introduction has been sent.') . EOL ); // "Homecoming" - send the requestor back to their site to record the introduction. @@ -599,21 +601,21 @@ function dfrn_request_post(&$a) { $dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname); $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0); - goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION - . '&confirm_key=' . $hash + goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION + . '&confirm_key=' . $hash . (($aes_allow) ? "&aes_allow=1" : "") ); // NOTREACHED // END $network === NETWORK_DFRN } elseif($network === NETWORK_OSTATUS) { - + /** * * OStatus network * Check contact existence - * Try and scrape together enough information to create a contact record, + * Try and scrape together enough information to create a contact record, * with us as CONTACT_IS_FOLLOWER * Substitute our user's feed URL into $url template * Send the subscriber home to subscribe @@ -655,7 +657,7 @@ function dfrn_request_content(&$a) { return login(); } - // Edge case, but can easily happen in the wild. This person is authenticated, + // Edge case, but can easily happen in the wild. This person is authenticated, // but not as the person who needs to deal with this request. if ($a->user['nickname'] != $a->argv[1]) { @@ -683,11 +685,11 @@ function dfrn_request_content(&$a) { return $o; } - elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) { + elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) { // we are the requestee and it is now safe to send our user their introduction, - // We could just unblock it, but first we have to jump through a few hoops to - // send an email, or even to find out if we need to send an email. + // We could just unblock it, but first we have to jump through a few hoops to + // send an email, or even to find out if we need to send an email. $intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1", dbesc($_GET['confirm_key']) @@ -707,7 +709,7 @@ function dfrn_request_content(&$a) { $auto_confirm = true; if(! $auto_confirm) { - require_once('include/enotify.php'); + notification(array( 'type' => NOTIFY_INTRO, 'notify_flags' => $r[0]['notify-flags'], @@ -758,7 +760,7 @@ function dfrn_request_content(&$a) { /** * Normal web request. Display our user's introduction form. */ - + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if(! get_config('system','local_block')) { notice( t('Public access denied.') . EOL); @@ -793,7 +795,7 @@ function dfrn_request_content(&$a) { /** * * The auto_request form only has the profile address - * because nobody is going to read the comments and + * because nobody is going to read the comments and * it doesn't matter if they know you or not. * */ diff --git a/view/ca/friend_complete_eml.tpl b/view/ca/friend_complete_eml.tpl deleted file mode 100644 index 539d9ff3d..000000000 --- a/view/ca/friend_complete_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Apreciat/da $username, - - Grans noticies... '$fn' a '$dfrn_url' ha acceptat la teva sol·licitud de connexió en '$sitename'. - -Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic -sense cap restricció. - -Visita la teva pàgina de 'Contactes' en $sitename si desitja realizar qualsevol canvi en aquesta relació. - -$siteurl - -[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general -- i assignar drets de visualització a '$fn']. - - - $sitename - - diff --git a/view/ca/intro_complete_eml.tpl b/view/ca/intro_complete_eml.tpl deleted file mode 100644 index 70507d71d..000000000 --- a/view/ca/intro_complete_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -Apreciat/da $username, - - '$fn' en '$dfrn_url' ha acceptat la teva petició -connexió a '$sitename'. - - '$fn' ha optat per acceptar-te com a "fan", que restringeix certes -formes de comunicació, com missatges privats i algunes interaccions -amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, -aquests ajustos s'aplican automàticament - - '$fn' pot optar per extendre aixó en una relació més permisiva -en el futur. - - Començaràs a rebre les actualizacions públiques de estatus de '$fn', -que apareixeran a la teva pàgina "Xarxa" en - -$siteurl - - - $sitename diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 660ac8c1a..000000000 --- a/view/ca/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Apreciat/da {{$username}}, - - Grans noticies... '{{$fn}}' a '{{$dfrn_url}}' ha acceptat la teva sol·licitud de connexió en '{{$sitename}}'. - -Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic -sense cap restricció. - -Visita la teva pàgina de 'Contactes' en {{$sitename}} si desitja realizar qualsevol canvi en aquesta relació. - -{{$siteurl}} - -[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general -- i assignar drets de visualització a '{{$fn}}']. - - - {{$sitename}} - - diff --git a/view/ca/smarty3/intro_complete_eml.tpl b/view/ca/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 6a0e33713..000000000 --- a/view/ca/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - - -Apreciat/da {{$username}}, - - '{{$fn}}' en '{{$dfrn_url}}' ha acceptat la teva petició -connexió a '{{$sitename}}'. - - '{{$fn}}' ha optat per acceptar-te com a "fan", que restringeix certes -formes de comunicació, com missatges privats i algunes interaccions -amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, -aquests ajustos s'aplican automàticament - - '{{$fn}}' pot optar per extendre aixó en una relació més permisiva -en el futur. - - Començaràs a rebre les actualizacions públiques de estatus de '{{$fn}}', -que apareixeran a la teva pàgina "Xarxa" en - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl deleted file mode 100644 index e0ce676a8..000000000 --- a/view/cs/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drahý/Drahá $[username], - - Skvělé zprávy... '$[fn]' na '$[dfrn_url]' akceptoval -Vaši žádost o spojení na '$[sitename]'. - -Jste nyní vzájemnými přáteli a můžete si vyměňovat aktualizace statusu, fotografií a emailů -bez omezení. - -Navštivte prosím stránku "Kontakty" na $[sitename] pokud si přejete provést -jakékoliv změny v tomto vztahu. - -$[siteurl] - -[Například můžete vytvořit separátní profil s informacemi, které nebudou -dostupné pro veřejnost - a přidělit práva k němu pro čtení pro '$[fn]']. - -S pozdravem, - - $[sitename] administrátor - - \ No newline at end of file diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl deleted file mode 100644 index b174b2c61..000000000 --- a/view/cs/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drahý/Drahá $[username], - - '$[fn]' na '$[dfrn_url]' akceptoval -Vaši žádost o připojení na '$[sitename]'. - - '$[fn]' se rozhodl Vás akceptovat jako "fanouška", což omezuje -určité druhy komunikace, jako jsou soukromé zprávy a určité profilové -interakce. Pokud se jedná o účet celebrity nebo o kumunitní stránky, tato nastavení byla -použita automaticky. - - '$[fn]' se může rozhodnout rozšířit tento vztah na oboustraný nebo méně restriktivní -vztah v budoucnosti. - - Nyní začnete získávat veřejné aktualizace statusu od '$[fn]', -které se objeví na Vaší stránce "Síť" na - -$[siteurl] - -S pozdravem, - - $[sitename] administrátor \ No newline at end of file diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 462022a05..000000000 --- a/view/cs/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Milý/Milá {{$username}}, - - Skvělé zprávy... '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'. - -Jste nyní přátelé a můžete si vyměňovat aktualizace statusu, fotek a e-mailů bez omezení. - -Pokud budete chtít tento vztah jakkoliv upravit, navštivte Vaši stránku "Kontakty" na {{$sitename}}. - -{{$siteurl}} - -(Nyní můžete například vytvořit separátní profil s informacemi, které nebudou viditelné veřejně, a nastavit právo pro zobrazení tohoto profilu pro '{{$fn}}'). - -S pozdravem, - - {{$sitename}} administrátor - diff --git a/view/cs/smarty3/intro_complete_eml.tpl b/view/cs/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 0137995c7..000000000 --- a/view/cs/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Milý/Milá {{$username}}, - - - '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'. - - '{{$fn}}' Vás označil za svého "fanouška", což jistým způsobem omezuje komunikaci (například v oblasti soukromých zpráv a některých profilových interakcí. Pokud je toto celebritní nebo komunitní stránka, bylo toto nastavení byla přijato automaticky. - - '{{$fn}}' může v budoucnu rozšířit toto spojení na oboustranné nebo jinak méně restriktivní. - - Nyní začnete dostávat veřejné aktualizace statusu od '{{$fn}}', které se objeví ve Vaší stránce "Síť" na webu - -{{$siteurl}} - -S pozdravem, - - {{$sitename}} administrátor diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl deleted file mode 100644 index 2135f9975..000000000 --- a/view/de/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Hallo $[username], - - Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat -deine Kontaktanfrage auf '$[sitename]' bestätigt. - -Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und E-Mails -ohne Einschränkungen austauschen. - -Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du -Änderungen an diesem Kontakt vornehmen willst. - -$[siteurl] - -[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält, -die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben]. - -Beste Grüße, - - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl deleted file mode 100644 index 9039a7fca..000000000 --- a/view/de/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Hallo $[username], - - '$[fn]' auf '$[dfrn_url]' akzeptierte -deine Verbindungsanfrage auf '$[sitename]'. - - '$[fn]' hat entschieden dich als "Fan" zu akzeptieren, was zu einigen -Einschränkungen bei der Kommunikation führt - wie z.B. das Schreiben von privaten Nachrichten und einige Profil -Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen -automatisch angewandt. - - '$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende -Beziehung in der Zukunft erweitert wird. - - Du empfängst ab sofort die öffentlichen Beiträge von '$[fn]', -auf deiner "Netzwerk" Seite. - -$[siteurl] - -Beste Grüße, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 27dd1bc94..000000000 --- a/view/de/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Hallo {{$username}}, - - Großartige Neuigkeiten... '{{$fn}}' auf '{{$dfrn_url}}' hat -deine Kontaktanfrage auf '{{$sitename}}' bestätigt. - -Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails -ohne Einschränkungen austauschen. - -Rufe deine 'Kontakte' Seite auf {{$sitename}} auf, wenn du -Änderungen an diesem Kontakt vornehmen willst. - -{{$siteurl}} - -[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält, -die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '{{$fn}}' zum Betrachten freigeben]. - -Beste Grüße, - - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/intro_complete_eml.tpl b/view/de/smarty3/intro_complete_eml.tpl deleted file mode 100644 index b14f6f992..000000000 --- a/view/de/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Hallo {{$username}}, - - '{{$fn}}' auf '{{$dfrn_url}}' hat deine Verbindungsanfrage -auf '{{$sitename}}' akzeptiert. - - '{{$fn}}' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen -Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil -Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen -automatisch angewandt. - - '{{$fn}}' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende -Beziehung in der Zukunft erweitert wird. - - Du empfängst ab sofort die öffentlichen Beiträge von '{{$fn}}', -auf deiner "Netzwerk" Seite. - -{{$siteurl}} - -Beste Grüße, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl deleted file mode 100644 index 89f578388..000000000 --- a/view/en/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dear $[username], - - Great news... '$[fn]' at '$[dfrn_url]' has accepted -your connection request at '$[sitename]'. - -You are now mutual friends and may exchange status updates, photos, and email -without restriction. - -Please visit your 'Contacts' page at $[sitename] if you wish to make -any changes to this relationship. - -$[siteurl] - -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$[fn]']. - -Sincerely, - - $[sitename] Administrator - - diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl deleted file mode 100644 index cd78b2a15..000000000 --- a/view/en/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dear $[username], - - '$[fn]' at '$[dfrn_url]' has accepted -your connection request at '$[sitename]'. - - '$[fn]' has chosen to accept you a "fan", which restricts -some forms of communication - such as private messaging and some profile -interactions. If this is a celebrity or community page, these settings were -applied automatically. - - '$[fn]' may choose to extend this into a two-way or more permissive -relationship in the future. - - You will start receiving public status updates from '$[fn]', -which will appear on your 'Network' page at - -$[siteurl] - -Sincerely, - - $[sitename] Administrator diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 32311e837..000000000 --- a/view/en/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Dear {{$username}}, - - Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted -your connection request at '{{$sitename}}'. - -You are now mutual friends and may exchange status updates, photos, and email -without restriction. - -Please visit your 'Contacts' page at {{$sitename}} if you wish to make -any changes to this relationship. - -{{$siteurl}} - -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '{{$fn}}']. - -Sincerely, - - {{$sitename}} Administrator - - diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 46d4402a2..000000000 --- a/view/en/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Dear {{$username}}, - - '{{$fn}}' at '{{$dfrn_url}}' has accepted -your connection request at '{{$sitename}}'. - - '{{$fn}}' has chosen to accept you a "fan", which restricts -some forms of communication - such as private messaging and some profile -interactions. If this is a celebrity or community page, these settings were -applied automatically. - - '{{$fn}}' may choose to extend this into a two-way or more permissive -relationship in the future. - - You will start receiving public status updates from '{{$fn}}', -which will appear on your 'Network' page at - -{{$siteurl}} - -Sincerely, - - {{$sitename}} Administrator diff --git a/view/eo/friend_complete_eml.tpl b/view/eo/friend_complete_eml.tpl deleted file mode 100644 index f429ca450..000000000 --- a/view/eo/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kara $[username], - - Boegaj novaĵoj.... '$[fn]' ĉe '$[dfrn_url]' aprobis -vian kontaktpeton ĉe '$[sitename]'. - -Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn -senkatene. - -Bonvolu viziti vian 'Kontaktoj' paĝon ĉe $[sitename] se vi volas -ŝangi la rilaton. - -$[siteurl] - -[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne -haveblas al la komuna publiko - kaj rajtigi '$[fn]' al ĝi]' - -Salutoj, - - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/intro_complete_eml.tpl b/view/eo/intro_complete_eml.tpl deleted file mode 100644 index 56a4fd880..000000000 --- a/view/eo/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kara $[username], - - '$[fn]' ĉe '$[dfrn_url]' akceptis -vian kontaktpeton ĉe '$[sitename]'. - - '$[fn]' elektis vin kiel "admiranto", kio malpermesas -kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj -agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj -aŭtomate aktiviĝis. - - '$[fn]' eblas konverti la rilaton al ambaŭdirekta rilato -aŭ apliki pli da permesoj. - - Vi ekricevos publikajn afiŝojn de '$[fn]', -kiuj aperos sur via 'Reto' paĝo ĉe - -$[siteurl] - -Salutoj, - - $[sitename] administranto \ No newline at end of file diff --git a/view/eo/smarty3/friend_complete_eml.tpl b/view/eo/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 7d50b8bc5..000000000 --- a/view/eo/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kara {{$username}}, - - Boegaj novaĵoj.... '{{$fn}}' ĉe '{{$dfrn_url}}' aprobis -vian kontaktpeton ĉe '{{$sitename}}'. - -Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn -senkatene. - -Bonvolu viziti vian 'Kontaktoj' paĝon ĉe {{$sitename}} se vi volas -ŝangi la rilaton. - -{{$siteurl}} - -[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne -haveblas al la komuna publiko - kaj rajtigi '{{$fn}}' al ĝi]' - -Salutoj, - - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/intro_complete_eml.tpl b/view/eo/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 66903de96..000000000 --- a/view/eo/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kara {{$username}}, - - '{{$fn}}' ĉe '{{$dfrn_url}}' akceptis -vian kontaktpeton ĉe '{{$sitename}}'. - - '{{$fn}}' elektis vin kiel "admiranto", kio malpermesas -kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj -agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj -aŭtomate aktiviĝis. - - '{{$fn}}' eblas konverti la rilaton al ambaŭdirekta rilato -aŭ apliki pli da permesoj. - - Vi ekricevos publikajn afiŝojn de '{{$fn}}', -kiuj aperos sur via 'Reto' paĝo ĉe - -{{$siteurl}} - -Salutoj, - - {{$sitename}} administranto \ No newline at end of file diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl deleted file mode 100644 index 0dc867efd..000000000 --- a/view/es/friend_complete_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Estimado/a $username, - - Grandes noticias... '$fn' a '$dfrn_url' ha aceptado tu solicitud de conexión en '$sitename'. - -Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico -sin restricción alguna. - -Visita tu página de 'Contactos' en $sitename si desear realizar cualquier cambio en esta relación. - -$siteurl - -[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general -- y asignar derechos de visualización a '$fn']. - - - $sitename - - diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl deleted file mode 100644 index a2964808c..000000000 --- a/view/es/intro_complete_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -Estimado/a $username, - - '$fn' en '$dfrn_url' ha aceptado tu petición -conexión a '$sitename'. - - '$fn' ha optado por aceptarte come "fan", que restringe ciertas -formas de comunicación, como mensajes privados y algunas interacciones -con el perfil. Si eres una "celebridad" o una página de comunidad, -estos ajustes se aplican automáticamente - - '$fn' puede optar por extender esto en una relación más permisiva -en el futuro. - - Empezarás a recibir las actualizaciones públicas de estado de '$fn', -que aparecerán en tu página "Red" en - -$siteurl - - - $sitename diff --git a/view/es/smarty3/friend_complete_eml.tpl b/view/es/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 493446b04..000000000 --- a/view/es/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Estimado/a {{$username}}, - - Grandes noticias... '{{$fn}}' a '{{$dfrn_url}}' ha aceptado tu solicitud de conexión en '{{$sitename}}'. - -Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico -sin restricción alguna. - -Visita tu página de 'Contactos' en {{$sitename}} si desear realizar cualquier cambio en esta relación. - -{{$siteurl}} - -[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general -- y asignar derechos de visualización a '{{$fn}}']. - - - {{$sitename}} - - diff --git a/view/es/smarty3/intro_complete_eml.tpl b/view/es/smarty3/intro_complete_eml.tpl deleted file mode 100644 index c9dd3fed6..000000000 --- a/view/es/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - - -Estimado/a {{$username}}, - - '{{$fn}}' en '{{$dfrn_url}}' ha aceptado tu petición -conexión a '{{$sitename}}'. - - '{{$fn}}' ha optado por aceptarte come "fan", que restringe ciertas -formas de comunicación, como mensajes privados y algunas interacciones -con el perfil. Si eres una "celebridad" o una página de comunidad, -estos ajustes se aplican automáticamente - - '{{$fn}}' puede optar por extender esto en una relación más permisiva -en el futuro. - - Empezarás a recibir las actualizaciones públicas de estado de '{{$fn}}', -que aparecerán en tu página "Red" en - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl deleted file mode 100644 index 1f2553b5e..000000000 --- a/view/fr/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -Cher(e) $username, - - Grande nouvelle… « $fn » (de « $dfrn_url ») a accepté votre -demande de connexion à « $sitename ». - -Vous êtes désormais dans une relation réciproque et pouvez échanger des -photos, des humeurs et des messages sans restriction. - -Merci de visiter votre page « Contacts » sur $sitename pour toute -modification que vous souhaiteriez apporter à cette relation. - -$siteurl - -[Par exemple, vous pouvez créer un profil spécifique avec des informations -cachées au grand public - et ainsi assigner des droits privilégiés à -« $fn »]/ - -Sincèremment, - - l'administrateur de $sitename - - diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl deleted file mode 100644 index f698cfeb7..000000000 --- a/view/fr/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Cher(e) $username, - - « $fn » du site « $dfrn_url » a accepté votre -demande de mise en relation sur « $sitename ». - - « $fn » a décidé de vous accepter comme « fan », ce qui restreint -certains de vos moyens de communication - tels que les messages privés et -certaines interactions avec son profil. S'il s'agit de la page d'une -célébrité et/ou communauté, ces réglages ont été définis automatiquement. - - « $fn » pourra choisir d'étendre votre relation à quelque chose de -plus permissif dans l'avenir. - - Vous allez commencer à recevoir les mises à jour publiques du -statut de « $fn », lesquelles apparaîtront sur votre page « Réseau » sur - -$siteurl - -Sincèrement votre, - - l'administrateur de $sitename diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 9f329c950..000000000 --- a/view/fr/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - -Cher(e) {{$username}}, - - Grande nouvelle… « {{$fn}} » (de « {{$dfrn_url}} ») a accepté votre -demande de connexion à « {{$sitename}} ». - -Vous êtes désormais dans une relation réciproque et pouvez échanger des -photos, des humeurs et des messages sans restriction. - -Merci de visiter votre page « Contacts » sur {{$sitename}} pour toute -modification que vous souhaiteriez apporter à cette relation. - -{{$siteurl}} - -[Par exemple, vous pouvez créer un profil spécifique avec des informations -cachées au grand public - et ainsi assigner des droits privilégiés à -« {{$fn}} »]/ - -Sincèremment, - - l'administrateur de {{$sitename}} - - diff --git a/view/fr/smarty3/intro_complete_eml.tpl b/view/fr/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 88cd00fc4..000000000 --- a/view/fr/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Cher(e) {{$username}}, - - « {{$fn}} » du site « {{$dfrn_url}} » a accepté votre -demande de mise en relation sur « {{$sitename}} ». - - « {{$fn}} » a décidé de vous accepter comme « fan », ce qui restreint -certains de vos moyens de communication - tels que les messages privés et -certaines interactions avec son profil. S'il s'agit de la page d'une -célébrité et/ou communauté, ces réglages ont été définis automatiquement. - - « {{$fn}} » pourra choisir d'étendre votre relation à quelque chose de -plus permissif dans l'avenir. - - Vous allez commencer à recevoir les mises à jour publiques du -statut de « {{$fn}} », lesquelles apparaîtront sur votre page « Réseau » sur - -{{$siteurl}} - -Sincèrement votre, - - l'administrateur de {{$sitename}} diff --git a/view/is/friend_complete_eml.tpl b/view/is/friend_complete_eml.tpl deleted file mode 100644 index 945ff4922..000000000 --- a/view/is/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Góðan daginn $[username], - - Frábærar fréttir... '$[fn]' hjá '$[dfrn_url]' hefur samþykkt -tengibeiðni þína hjá '$[sitename]'. - -Þið eruð nú sameiginlegir vinir og getið skipst á stöðu uppfærslum, myndum og tölvupósti -án hafta. - -Endilega fara á síðunna 'Tengiliðir' á þjóninum $[sitename] ef þú villt gera -einhverjar breytingar á þessu sambandi. - -$[siteurl] - -[Til dæmis þá getur þú búið til nýjar notenda upplýsingar um þig, með ítarlegri lýsingu, sem eiga ekki -að vera aðgengileg almenningi - og veitt aðgang til að sjá '$[fn]']. - -Bestu kveðjur, - - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/intro_complete_eml.tpl b/view/is/intro_complete_eml.tpl deleted file mode 100644 index dba296d4e..000000000 --- a/view/is/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Góðan daginn $[username], - - '$[fn]' hjá '$[dfrn_url]' hefur samþykkt -tengibeiðni þína á '$[sitename]'. - - '$[fn]' hefur ákveðið að hafa þig sem "aðdáanda", sem takmarkar -ákveðnar gerðir af samskipturm - til dæmis einkapóst og ákveðnar notenda -aðgerðir. Ef þetta er stjörnu- eða hópasíða, þá voru þessar stillingar -settar á sjálfkrafa. - - '$[fn]' getur ákveðið seinna að breyta þessu í gagnkvæma eða enn hafta minni -tengingu í framtíðinni. - - Þú munt byrja að fá opinberar stöðubreytingar frá '$[fn]', -þær munu birtast á 'Tengslanet' síðunni þinni á - -$[siteurl] - -Bestu kveðjur, - - Kerfisstjóri $[sitename] \ No newline at end of file diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl deleted file mode 100644 index f25787eff..000000000 --- a/view/is/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Góðan daginn {{$username}}, - - Frábærar fréttir... '{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt -tengibeiðni þína hjá '{{$sitename}}'. - -Þið eruð nú sameiginlegir vinir og getið skipst á stöðu uppfærslum, myndum og tölvupósti -án hafta. - -Endilega fara á síðunna 'Tengiliðir' á þjóninum {{$sitename}} ef þú villt gera -einhverjar breytingar á þessu sambandi. - -{{$siteurl}} - -[Til dæmis þá getur þú búið til nýjar notenda upplýsingar um þig, með ítarlegri lýsingu, sem eiga ekki -að vera aðgengileg almenningi - og veitt aðgang til að sjá '{{$fn}}']. - -Bestu kveðjur, - - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl deleted file mode 100644 index feab4d6f6..000000000 --- a/view/is/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Góðan daginn {{$username}}, - - '{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt -tengibeiðni þína á '{{$sitename}}'. - - '{{$fn}}' hefur ákveðið að hafa þig sem "aðdáanda", sem takmarkar -ákveðnar gerðir af samskipturm - til dæmis einkapóst og ákveðnar notenda -aðgerðir. Ef þetta er stjörnu- eða hópasíða, þá voru þessar stillingar -settar á sjálfkrafa. - - '{{$fn}}' getur ákveðið seinna að breyta þessu í gagnkvæma eða enn hafta minni -tengingu í framtíðinni. - - Þú munt byrja að fá opinberar stöðubreytingar frá '{{$fn}}', -þær munu birtast á 'Tengslanet' síðunni þinni á - -{{$siteurl}} - -Bestu kveðjur, - - Kerfisstjóri {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl deleted file mode 100644 index daeaae901..000000000 --- a/view/it/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Ciao {{$username}}, - - Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato -la tua richiesta di connessione su '{{$sitename}}'. - -Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email -senza restrizioni. - -Vai nella pagina 'Contatti' di {{$sitename}} se vuoi effettuare -qualche modifica riguardo questa relazione - -{{$siteurl}} - -[Ad esempio, potresti creare un profilo separato con le informazioni che non -sono disponibili pubblicamente - ed permettere di vederlo a '{{$fn}}']. - -Saluti, - - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 69fce8141..000000000 --- a/view/it/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Ciao {{$username}}, - - '{{$fn}}' di '{{$dfrn_url}}' ha accettato -la tua richiesta di connessione a '{{$sitename}}'. - - '{{$fn}}' ha deciso di accettarti come "fan", il che restringe -alcune forme di comunicazione - come i messaggi privati e alcune -interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno -applicate automaticamente. - - '{{$fn}}' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva -. - - Inizierai a ricevere gli aggiornamenti di stato pubblici da '{{$fn}}', -che apparirà nella tua pagina 'Rete' - -{{$siteurl}} - -Saluti, - - l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/nb-no/friend_complete_eml.tpl b/view/nb-no/friend_complete_eml.tpl deleted file mode 100644 index 4526c94d0..000000000 --- a/view/nb-no/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kjære $[username], - - Gode nyheter... '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling hos '$[sitename]'. - -Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post -uten hindringer. - -Vennligst besøk din side "Kontakter" ved $[sitename] hvis du ønsker å gjøre -noen endringer på denne forbindelsen. - -$[siteurl] - -[For eksempel, så kan du lage en egen profil med informasjon som ikke er -tilgjengelig for alle - og angi visningsrettigheter til '$[fn]']. - -Med vennlig hilsen, - - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/intro_complete_eml.tpl b/view/nb-no/intro_complete_eml.tpl deleted file mode 100644 index 17b0be5a8..000000000 --- a/view/nb-no/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kjære $[username], - - '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling ved $[sitename]'. - - '$[fn]' har valgt å godta deg som "fan", som begrenser -noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger. -Hvis dette er en kjendis- eller forumside, så ble disse innstillingene -angitt automatisk. - - '$[fn]' kan velge å utvide dette til en to-veis eller mer åpen -forbindelse i fremtiden. - - Du vil nå motta offentlige statusoppdateringer fra '$[fn]', -som vil vises på din "Nettverk"-side ved - -$[siteurl] - -Med vennlig hilsen, - - $[sitename] administrator \ No newline at end of file diff --git a/view/nb-no/smarty3/friend_complete_eml.tpl b/view/nb-no/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 7ffe7c9ae..000000000 --- a/view/nb-no/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kjære {{$username}}, - - Gode nyheter... '{{$fn}}' ved '{{$dfrn_url}}' har godtatt -din forespørsel om kobling hos '{{$sitename}}'. - -Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post -uten hindringer. - -Vennligst besøk din side "Kontakter" ved {{$sitename}} hvis du ønsker å gjøre -noen endringer på denne forbindelsen. - -{{$siteurl}} - -[For eksempel, så kan du lage en egen profil med informasjon som ikke er -tilgjengelig for alle - og angi visningsrettigheter til '{{$fn}}']. - -Med vennlig hilsen, - - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/intro_complete_eml.tpl b/view/nb-no/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 98d4917c8..000000000 --- a/view/nb-no/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kjære {{$username}}, - - '{{$fn}}' ved '{{$dfrn_url}}' har godtatt -din forespørsel om kobling ved {{$sitename}}'. - - '{{$fn}}' har valgt å godta deg som "fan", som begrenser -noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger. -Hvis dette er en kjendis- eller forumside, så ble disse innstillingene -angitt automatisk. - - '{{$fn}}' kan velge å utvide dette til en to-veis eller mer åpen -forbindelse i fremtiden. - - Du vil nå motta offentlige statusoppdateringer fra '{{$fn}}', -som vil vises på din "Nettverk"-side ved - -{{$siteurl}} - -Med vennlig hilsen, - - {{$sitename}} administrator \ No newline at end of file diff --git a/view/nl/friend_complete_eml.tpl b/view/nl/friend_complete_eml.tpl deleted file mode 100644 index 7d00138c9..000000000 --- a/view/nl/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Beste $[username], - - Goed nieuws... '$[fn]' op '$[dfrn_url]' heeft uw -contactaanvraag goedgekeurd op '$[sitename]'. - -U bent nu in contact met elkaar en kan statusberichten, foto's en e-mail uitwisselen, -zonder beperkingen. - -Bezoek uw 'Contacten'-pagina op $[sitename] wanneer u de instellingen -van dit contact wilt veranderen. - -$[siteurl] - -[U kunt bijvoorbeeld een apart profiel aanmaken met informatie dat niet door -iedereen valt in te zien, maar wel door '$[fn]']. - -Vriendelijke groet, - - Beheerder $[sitename] - - \ No newline at end of file diff --git a/view/nl/intro_complete_eml.tpl b/view/nl/intro_complete_eml.tpl deleted file mode 100644 index eb9e57948..000000000 --- a/view/nl/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Beste $[username], - - '$[fn]' op '$[dfrn_url]' heeft uw -contactaanvraag goedgekeurd op '$[sitename]'. - - '$[fn]' heeft besloten om u de status van "fan" te geven. -Hierdoor kunt u bijvoorbeeld geen privéberichten uitwisselen en gelden er enkele profielrestricties. -Wanneer dit een pagina voor een beroemdheid of een gemeenschap is, zijn deze -instellingen automatisch toegepast. - - '$[fn]' kan er voor kiezen om in de toekomst deze contactrestricties uit te breiden of -om ze te verminderen. - - U ontvangt vanaf nu openbare statusupdates van '$[fn]'. -Deze kunt u zien op uw 'Netwerk'-pagina op - -$[siteurl] - -Vriendelijke groet, - - Beheerder $[sitename] \ No newline at end of file diff --git a/view/pl/friend_complete_eml.tpl b/view/pl/friend_complete_eml.tpl deleted file mode 100644 index 16cbeeaa1..000000000 --- a/view/pl/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drogi $[username], - - Świetne wieści! '$[fn]' na '$[dfrn_url]' przyjął / przyjęła -Twoją prośbę o znajomość na '$[sitename]'. - -Jesteście teraz znajomymi i możecie wymieniać się zmianami statusów, zdjęciami i wiadomościami -bez ograniczeń. - -Zajrzyj na stronę 'Kontakty' na $[sitename] jeśli chcesz dokonać -zmian w tej relacji. - -$[siteurl] - -[Możesz np.: utworzyć oddzielny profil z informacjami, który nie będzie -dostępny dla wszystkich - i przypisać sprawdzanie uprawnień do '$[fn]']. - -Z poważaniem, - - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/intro_complete_eml.tpl b/view/pl/intro_complete_eml.tpl deleted file mode 100644 index a50d0e2d1..000000000 --- a/view/pl/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drogi $[username], - - '$[fn]' w '$[dfrn_url]' zaakceptował -twoje połączenie na '$[sitename]'. - - '$[fn]' zaakceptował Cię jako "fana", uniemożliwiając -pewne sposoby komunikacji - takie jak prywatne wiadomości czy niektóre formy -interakcji pomiędzy profilami. Jeśli jest to strona gwiazdy lub społeczności, ustawienia zostały -zastosowane automatycznie. - - '$[fn]' może rozszeżyć to w dwustronną komunikację lub więcej (doprecyzować) -relacje w przyszłości. - - Będziesz teraz otrzymywać aktualizacje statusu od '$[fn]', -który będzie pojawiać się na Twojej stronie "Sieć" - -$[siteurl] - -Z poważaniem, - - Administrator $[sitename] \ No newline at end of file diff --git a/view/pl/smarty3/friend_complete_eml.tpl b/view/pl/smarty3/friend_complete_eml.tpl deleted file mode 100644 index b6cf0a3b6..000000000 --- a/view/pl/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Drogi {{$username}}, - - Świetne wieści! '{{$fn}}' na '{{$dfrn_url}}' przyjął / przyjęła -Twoją prośbę o znajomość na '{{$sitename}}'. - -Jesteście teraz znajomymi i możecie wymieniać się zmianami statusów, zdjęciami i wiadomościami -bez ograniczeń. - -Zajrzyj na stronę 'Kontakty' na {{$sitename}} jeśli chcesz dokonać -zmian w tej relacji. - -{{$siteurl}} - -[Możesz np.: utworzyć oddzielny profil z informacjami, który nie będzie -dostępny dla wszystkich - i przypisać sprawdzanie uprawnień do '{{$fn}}']. - -Z poważaniem, - - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/intro_complete_eml.tpl b/view/pl/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 8137f83e2..000000000 --- a/view/pl/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Drogi {{$username}}, - - '{{$fn}}' w '{{$dfrn_url}}' zaakceptował -twoje połączenie na '{{$sitename}}'. - - '{{$fn}}' zaakceptował Cię jako "fana", uniemożliwiając -pewne sposoby komunikacji - takie jak prywatne wiadomości czy niektóre formy -interakcji pomiędzy profilami. Jeśli jest to strona gwiazdy lub społeczności, ustawienia zostały -zastosowane automatycznie. - - '{{$fn}}' może rozszeżyć to w dwustronną komunikację lub więcej (doprecyzować) -relacje w przyszłości. - - Będziesz teraz otrzymywać aktualizacje statusu od '{{$fn}}', -który będzie pojawiać się na Twojej stronie "Sieć" - -{{$siteurl}} - -Z poważaniem, - - Administrator {{$sitename}} \ No newline at end of file diff --git a/view/pt-br/intro_complete_eml.tpl b/view/pt-br/intro_complete_eml.tpl deleted file mode 100644 index 13ccbc9d7..000000000 --- a/view/pt-br/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Prezado/a $[username], - - '$[fn]' em '$[dfrn_url]' aceitou -seu pedido de coneção em '$[sitename]'. - - '$[fn]' optou por aceitá-lo com "fan", que restringe -algumas formas de comunicação, tais como mensagens privadas e algumas interações -com o perfil. Se essa é uma página de celebridade ou de comunidade essas configurações foram -aplicadas automaticamente. - - '$[fn]' pode escolher estender isso para uma comunicação bidirecional ourelacionamento mais permissivo -no futuro. - - Você começará a receber atualizações públicas de '$[fn]' -que aparecerão na sua página 'Rede' - -$[siteurl] - -Cordialmente, - - Administrador do $[sitemname] \ No newline at end of file diff --git a/view/pt-br/smarty3/intro_complete_eml.tpl b/view/pt-br/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 30c5699b8..000000000 --- a/view/pt-br/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Prezado/a {{$username}}, - - '{{$fn}}' em '{{$dfrn_url}}' aceitou -seu pedido de coneção em '{{$sitename}}'. - - '{{$fn}}' optou por aceitá-lo com "fan", que restringe -algumas formas de comunicação, tais como mensagens privadas e algumas interações -com o perfil. Se essa é uma página de celebridade ou de comunidade essas configurações foram -aplicadas automaticamente. - - '{{$fn}}' pode escolher estender isso para uma comunicação bidirecional ourelacionamento mais permissivo -no futuro. - - Você começará a receber atualizações públicas de '{{$fn}}' -que aparecerão na sua página 'Rede' - -{{$siteurl}} - -Cordialmente, - - Administrador do {{$sitemname}} \ No newline at end of file diff --git a/view/ro/smarty3/friend_complete_eml.tpl b/view/ro/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 9c68c8d09..000000000 --- a/view/ro/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dragă $[username], - - Veşti bune... '$[fn]' at '$[dfrn_url]' a acceptat -cererea dvs. de conectare la '$[sitename]'. - -Sunteți acum prieteni comuni și puteţi schimba actualizări de status, fotografii, și e-mail -fără restricţii. - -Vizitaţi pagina dvs. 'Contacte' la $[sitename] dacă doriţi să faceţi -orice schimbare către această relaţie. - -$[siteurl] - -[De exemplu, puteți crea un profil separat, cu informații care nu sunt -la dispoziția publicului larg - și atribuiți drepturi de vizualizare la "$ [Fn] ']​​. - -Cu stimă, - - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/intro_complete_eml.tpl b/view/ro/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 16569d274..000000000 --- a/view/ro/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dragă $[username], - - '$[fn]' de la '$[dfrn_url]' a acceptat -cererea dvs. de conectare la '$[sitename]'. - - '$[fn]' a decis să accepte un "fan", care restricționează -câteva forme de comunicare - cum ar fi mesageria privată şi unele profile -interacțiuni. În cazul în care aceasta este o pagină celebritate sau comunitate, aceste setări au fost -aplicat automat. - - '$[fn]' poate alege să se extindă aceasta în două sau mai căi permisive -relaţie in viitor. - - Veți începe să primiți actualizări publice de status de la '$[fn]', -care va apare pe pagina dvs. 'Network' la - -$[siteurl] - -Cu stimă, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl deleted file mode 100644 index 2b8b0238e..000000000 --- a/view/sv/friend_complete_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ -$username, - -Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. - -Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden -utan begränsningar. - -Gå in på din sida 'Kontakter' på $sitename om du vill göra några -ändringar när det gäller denna kontakt. - -$siteurl - -[Du kan exempelvis skapa en separat profil med information som inte -är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn']. - -Hälsningar, -$sitename admin diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl deleted file mode 100644 index 1f24af25f..000000000 --- a/view/sv/intro_complete_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ -$username, - -'$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. - -'$fn' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar -i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion -mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts -per automatik. - -'$fn' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer -tillåtande kommunikationsform i framtiden. - -Du kommer hädanefter att få statusuppdateringar från '$fn', -vilka kommer att synas på din Nätverk-sida på - -$siteurl - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/friend_complete_eml.tpl b/view/sv/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 7cabdf22d..000000000 --- a/view/sv/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -{{$username}}, - -Goda nyheter... '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'. - -Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden -utan begränsningar. - -Gå in på din sida 'Kontakter' på {{$sitename}} om du vill göra några -ändringar när det gäller denna kontakt. - -{{$siteurl}} - -[Du kan exempelvis skapa en separat profil med information som inte -är tillgänglig för vem som helst, och ge visningsrättigheter till '{{$fn}}']. - -Hälsningar, -{{$sitename}} admin diff --git a/view/sv/smarty3/intro_complete_eml.tpl b/view/sv/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 48d565a03..000000000 --- a/view/sv/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -{{$username}}, - -'{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'. - -'{{$fn}}' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar -i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion -mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts -per automatik. - -'{{$fn}}' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer -tillåtande kommunikationsform i framtiden. - -Du kommer hädanefter att få statusuppdateringar från '{{$fn}}', -vilka kommer att synas på din Nätverk-sida på - -{{$siteurl}} - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/friend_complete_eml.tpl b/view/zh-cn/friend_complete_eml.tpl deleted file mode 100644 index a25896f09..000000000 --- a/view/zh-cn/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -尊敬的$[username], - - 精彩新闻... 「$[fn]」在「$[dfrn_url]」接受了 -您的连通要求在「$[sitename]」。 - -您们现在是共同的朋友们，会兑换现状更新，照片和邮件 -无限 - -请看您的联络页在$[sitename]如果您想做 -什么变化关于这个关系。 - -$[siteurl] - -[例如，您会想造成区分的简介括无 -公开－和分配看权利给「$[fn]」 - -谨上, - - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/intro_complete_eml.tpl b/view/zh-cn/intro_complete_eml.tpl deleted file mode 100644 index 8d8d4f603..000000000 --- a/view/zh-cn/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -尊敬的$[username], - - 「$[fn]」在「$[dfrn_url]」接受了 -您的联络要求在「$[sitename]」 - - 「$[fn]」接受您为迷。这限制 -有的种类沟通，例如私人信息和简介 -操作。如果这是名人或社会页，这些设置是 -自动地应用。 - - 「$[fn]」会将来选择延长关系成双向的或更允许的 -关系。 - - 您会开始受到公开的现状更新从「$[fn]」， -它们出现在您的「网络」页在 - -$[siteurl] - -谨上， - - $[sitename]行政人员 \ No newline at end of file diff --git a/view/zh-cn/smarty3/friend_complete_eml.tpl b/view/zh-cn/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 5e6e99bc9..000000000 --- a/view/zh-cn/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -尊敬的{{$username}}, - - 精彩新闻... 「{{$fn}}」在「{{$dfrn_url}}」接受了 -您的连通要求在「{{$sitename}}」。 - -您们现在是共同的朋友们，会兑换现状更新，照片和邮件 -无限 - -请看您的联络页在{{$sitename}}如果您想做 -什么变化关于这个关系。 - -{{$siteurl}} - -[例如，您会想造成区分的简介括无 -公开－和分配看权利给「{{$fn}}」 - -谨上, - - {{$sitename}}行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/intro_complete_eml.tpl b/view/zh-cn/smarty3/intro_complete_eml.tpl deleted file mode 100644 index db68d7d71..000000000 --- a/view/zh-cn/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -尊敬的{{$username}}, - - 「{{$fn}}」在「{{$dfrn_url}}」接受了 -您的联络要求在「{{$sitename}}」 - - 「{{$fn}}」接受您为迷。这限制 -有的种类沟通，例如私人信息和简介 -操作。如果这是名人或社会页，这些设置是 -自动地应用。 - - 「{{$fn}}」会将来选择延长关系成双向的或更允许的 -关系。 - - 您会开始受到公开的现状更新从「{{$fn}}」， -它们出现在您的「网络」页在 - -{{$siteurl}} - -谨上， - - {{$sitename}}行政人员 \ No newline at end of file From 0e628f840f0d4c7a902919328358aed873c4f11a Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 18:15:18 +0200 Subject: [PATCH 04/14] send ostatus follow/share notifications via notification() remove unused templates --- include/enotify.php | 288 ++++++++++++++--------- include/items.php | 31 ++- view/ca/follow_notify_eml.tpl | 13 - view/ca/smarty3/follow_notify_eml.tpl | 14 -- view/cs/follow_notify_eml.tpl | 14 -- view/cs/smarty3/follow_notify_eml.tpl | 15 -- view/de/follow_notify_eml.tpl | 14 -- view/de/smarty3/follow_notify_eml.tpl | 15 -- view/en/follow_notify_eml.tpl | 14 -- view/en/smarty3/follow_notify_eml.tpl | 15 -- view/eo/follow_notify_eml.tpl | 14 -- view/eo/smarty3/follow_notify_eml.tpl | 15 -- view/es/follow_notify_eml.tpl | 13 - view/es/smarty3/follow_notify_eml.tpl | 14 -- view/fr/follow_notify_eml.tpl | 14 -- view/fr/smarty3/follow_notify_eml.tpl | 15 -- view/is/follow_notify_eml.tpl | 14 -- view/is/smarty3/follow_notify_eml.tpl | 15 -- view/it/smarty3/follow_notify_eml.tpl | 14 -- view/nb-no/follow_notify_eml.tpl | 14 -- view/nb-no/smarty3/follow_notify_eml.tpl | 15 -- view/nl/follow_notify_eml.tpl | 14 -- view/pl/follow_notify_eml.tpl | 14 -- view/pl/smarty3/follow_notify_eml.tpl | 15 -- view/ro/smarty3/follow_notify_eml.tpl | 14 -- view/sv/follow_notify_eml.tpl | 12 - view/sv/smarty3/follow_notify_eml.tpl | 13 - view/zh-cn/follow_notify_eml.tpl | 14 -- view/zh-cn/smarty3/follow_notify_eml.tpl | 15 -- 29 files changed, 192 insertions(+), 509 deletions(-) delete mode 100644 view/ca/follow_notify_eml.tpl delete mode 100644 view/ca/smarty3/follow_notify_eml.tpl delete mode 100644 view/cs/follow_notify_eml.tpl delete mode 100644 view/cs/smarty3/follow_notify_eml.tpl delete mode 100644 view/de/follow_notify_eml.tpl delete mode 100644 view/de/smarty3/follow_notify_eml.tpl delete mode 100644 view/en/follow_notify_eml.tpl delete mode 100644 view/en/smarty3/follow_notify_eml.tpl delete mode 100644 view/eo/follow_notify_eml.tpl delete mode 100644 view/eo/smarty3/follow_notify_eml.tpl delete mode 100644 view/es/follow_notify_eml.tpl delete mode 100644 view/es/smarty3/follow_notify_eml.tpl delete mode 100644 view/fr/follow_notify_eml.tpl delete mode 100644 view/fr/smarty3/follow_notify_eml.tpl delete mode 100644 view/is/follow_notify_eml.tpl delete mode 100644 view/is/smarty3/follow_notify_eml.tpl delete mode 100644 view/it/smarty3/follow_notify_eml.tpl delete mode 100644 view/nb-no/follow_notify_eml.tpl delete mode 100644 view/nb-no/smarty3/follow_notify_eml.tpl delete mode 100644 view/nl/follow_notify_eml.tpl delete mode 100644 view/pl/follow_notify_eml.tpl delete mode 100644 view/pl/smarty3/follow_notify_eml.tpl delete mode 100644 view/ro/smarty3/follow_notify_eml.tpl delete mode 100644 view/sv/follow_notify_eml.tpl delete mode 100644 view/sv/smarty3/follow_notify_eml.tpl delete mode 100644 view/zh-cn/follow_notify_eml.tpl delete mode 100644 view/zh-cn/smarty3/follow_notify_eml.tpl diff --git a/include/enotify.php b/include/enotify.php index 2dca5a609..742134449 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -15,6 +15,33 @@ function notification($params) { push_lang($params['language']); + $banner = t('Friendica Notification'); + $product = FRIENDICA_PLATFORM; + $siteurl = $a->get_baseurl(true); + $thanks = t('Thank You,'); + $sitename = $a->config['sitename']; + $site_admin = sprintf( t('%s Administrator'), $sitename); + + $sender_name = $product; + $hostname = $a->get_hostname(); + if(strpos($hostname,':')) + $hostname = substr($hostname,0,strpos($hostname,':')); + + $sender_email = t('noreply') . '@' . $hostname; + + // with $params['show_in_notification_page'] == false, the notification isn't inserted into + // the database, and an email is sent if applicable. + // default, if not specified: true + $show_in_notification_page = ((x($params,'show_in_notification_page')) ? $params['show_in_notification_page']:True); + + $additional_mail_header = ""; + $additional_mail_header .= "Precedence: list\n"; + $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; + $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; + $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; + $additional_mail_header .= "List-ID: \n"; + $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; + if(array_key_exists('item',$params)) { $title = $params['item']['title']; @@ -204,6 +231,29 @@ function notification($params) { $tsitelink = sprintf( $sitelink, $siteurl ); $hsitelink = sprintf( $sitelink, '' . $sitename . ''); $itemlink = $params['link']; + + switch ($params['verb']) { + case ACTIVITY_FRIEND: + // someone started to share with user (mostly OStatus) + $subject = sprintf( t('[Friendica:Notify] A new person is sharing with you')); + $preamble = sprintf( t('%1$s is sharing with you at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%1$s is sharing with you at %2$s'), + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + $sitename); + break; + case ACTIVITY_FOLLOW: + // someone started to follow the user (mostly OStatus) + $subject = sprintf( t('[Friendica:Notify] You have a new follower')); + $preamble = sprintf( t('You have a new follower at %2$s : %1$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('You have a new follower at %2$s : %1$s'), + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + $sitename); + break; + default: + break; + } + + } if($params['type'] == NOTIFY_SUGGEST) { @@ -225,40 +275,49 @@ function notification($params) { } if($params['type'] == NOTIFY_CONFIRM) { + if ($params['verb'] == ACTIVITY_FRIEND ){ // mutual connection + $subject = sprintf( t('[Friendica:Notify] Connection accepted')); + $preamble = sprintf( t('\'%1$s\' has acepted your connection request at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = t('You are now mutual friends and may exchange status updates, photos, and email + without restriction.'); + + $sitelink = t('Please visit %s if you wish to make any changes to this relationship.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } else { // ACTIVITY_FOLLOW + $subject = sprintf( t('[Friendica:Notify] Connection accepted')); + $preamble = sprintf( t('\'%1$s\' has acepted your connection request at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = sprintf(t('\'%1$s\' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.'), $params['source_name']); + $body .= "\n\n"; + $body .= sprintf(t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future. '), $params['source_name']); + + $sitelink = t('Please visit %s if you wish to make any changes to this relationship.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + } if($params['type'] == NOTIFY_SYSTEM) { - + $subject = $params['subject']; + $preamble = $params['preamble']; + $epreamble = $params['epreamble']; + $body = $params['body']; + $sitelink = ""; + $tsitelink = ""; + $hsitelink = ""; + $itemlink = ""; } - /*$email = prepare_notificaion_mail($params, $subject, $preamble, $body, $sitelink, $tsitelink, $hsitelink, $itemlink); - if ($email) Emailer::send($email); - pop_lang();*/ - - - $banner = t('Friendica Notification'); - $product = FRIENDICA_PLATFORM; - $siteurl = $a->get_baseurl(true); - $thanks = t('Thank You,'); - $sitename = $a->config['sitename']; - $site_admin = sprintf( t('%s Administrator'), $sitename); - - $sender_name = $product; - $hostname = $a->get_hostname(); - if(strpos($hostname,':')) - $hostname = substr($hostname,0,strpos($hostname,':')); - - $sender_email = t('noreply') . '@' . $hostname; - - - $additional_mail_header = ""; - $additional_mail_header .= "Precedence: list\n"; - $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; - $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; - $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; - $additional_mail_header .= "List-ID: \n"; - $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; $h = array( 'params' => $params, @@ -284,103 +343,104 @@ function notification($params) { $itemlink = $h['itemlink']; + if ($show_in_notification_page) { - do { - $dups = false; - $hash = random_string(); - $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", - dbesc($hash)); - if(count($r)) - $dups = true; - } while($dups == true); + do { + $dups = false; + $hash = random_string(); + $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", + dbesc($hash)); + if(count($r)) + $dups = true; + } while($dups == true); - $datarray = array(); - $datarray['hash'] = $hash; - $datarray['name'] = $params['source_name']; - $datarray['url'] = $params['source_link']; - $datarray['photo'] = $params['source_photo']; - $datarray['date'] = datetime_convert(); - $datarray['uid'] = $params['uid']; - $datarray['link'] = $itemlink; - $datarray['parent'] = $parent_id; - $datarray['type'] = $params['type']; - $datarray['verb'] = $params['verb']; - $datarray['otype'] = $params['otype']; - $datarray['abort'] = false; + $datarray = array(); + $datarray['hash'] = $hash; + $datarray['name'] = $params['source_name']; + $datarray['url'] = $params['source_link']; + $datarray['photo'] = $params['source_photo']; + $datarray['date'] = datetime_convert(); + $datarray['uid'] = $params['uid']; + $datarray['link'] = $itemlink; + $datarray['parent'] = $parent_id; + $datarray['type'] = $params['type']; + $datarray['verb'] = $params['verb']; + $datarray['otype'] = $params['otype']; + $datarray['abort'] = false; - call_hooks('enotify_store', $datarray); + call_hooks('enotify_store', $datarray); - if($datarray['abort']) { - pop_lang(); - return False; - } - - // create notification entry in DB - - $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype) - values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')", - dbesc($datarray['hash']), - dbesc($datarray['name']), - dbesc($datarray['url']), - dbesc($datarray['photo']), - dbesc($datarray['date']), - intval($datarray['uid']), - dbesc($datarray['link']), - intval($datarray['parent']), - intval($datarray['type']), - dbesc($datarray['verb']), - dbesc($datarray['otype']) - ); - - $r = q("select id from notify where hash = '%s' and uid = %d limit 1", - dbesc($hash), - intval($params['uid']) - ); - if($r) - $notify_id = $r[0]['id']; - else { - pop_lang(); - return False; - } - - // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums - // After we've stored everything, look again to see if there are any duplicates and if so remove them - - $p = null; - $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d order by id", - intval(NOTIFY_TAGSELF), - intval(NOTIFY_COMMENT), - dbesc($params['link']), - intval($params['uid']) - ); - if($p && (count($p) > 1)) { - for ($d = 1; $d < count($p); $d ++) { - q("delete from notify where id = %d", - intval($p[$d]['id']) - ); - } - - // only continue on if we stored the first one - - if($notify_id != $p[0]['id']) { + if($datarray['abort']) { pop_lang(); return False; } + + // create notification entry in DB + + $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype) + values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')", + dbesc($datarray['hash']), + dbesc($datarray['name']), + dbesc($datarray['url']), + dbesc($datarray['photo']), + dbesc($datarray['date']), + intval($datarray['uid']), + dbesc($datarray['link']), + intval($datarray['parent']), + intval($datarray['type']), + dbesc($datarray['verb']), + dbesc($datarray['otype']) + ); + + $r = q("select id from notify where hash = '%s' and uid = %d limit 1", + dbesc($hash), + intval($params['uid']) + ); + if($r) + $notify_id = $r[0]['id']; + else { + pop_lang(); + return False; + } + + // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums + // After we've stored everything, look again to see if there are any duplicates and if so remove them + + $p = null; + $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d order by id", + intval(NOTIFY_TAGSELF), + intval(NOTIFY_COMMENT), + dbesc($params['link']), + intval($params['uid']) + ); + if($p && (count($p) > 1)) { + for ($d = 1; $d < count($p); $d ++) { + q("delete from notify where id = %d", + intval($p[$d]['id']) + ); + } + + // only continue on if we stored the first one + + if($notify_id != $p[0]['id']) { + pop_lang(); + return False; + } + } + + + $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; + $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); + $r = q("update notify set msg = '%s' where id = %d and uid = %d", + dbesc($msg), + intval($notify_id), + intval($params['uid']) + ); + } - - $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; - $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); - $r = q("update notify set msg = '%s' where id = %d and uid = %d", - dbesc($msg), - intval($notify_id), - intval($params['uid']) - ); - - // send email notification if notification preferences permit - if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { logger('notification: sending notification email'); diff --git a/include/items.php b/include/items.php index 0e156beb2..b1ee854ae 100644 --- a/include/items.php +++ b/include/items.php @@ -3828,6 +3828,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { dbesc(datetime_convert()) ); } + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); @@ -3841,20 +3842,24 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (($r[0]['page-flags'] == PAGE_NORMAL) OR ($r[0]['page-flags'] == PAGE_SOAPBOX))) { - $email_tpl = get_intltext_template('follow_notify_eml.tpl'); - $email = replace_macros($email_tpl, array( - '$requestor' => ((strlen($name)) ? $name : t('[Name Withheld]')), - '$url' => $url, - '$myname' => $r[0]['username'], - '$siteurl' => $a->get_baseurl(), - '$sitename' => $a->config['sitename'] + + + + notification(array( + 'type' => NOTIFY_INTRO, + 'notify_flags' => $r[0]['notify-flags'], + 'language' => $r[0]['language'], + 'to_name' => $r[0]['username'], + 'to_email' => $r[0]['email'], + 'uid' => $r[0]['uid'], + 'link' => $a->get_baseurl() . '/notifications/intro', + 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : t('[Name Withheld]')), + 'source_link' => $contact_record['url'], + 'source_photo' => $contact_record['photo'], + 'verb' => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW), + 'otype' => 'intro' )); - $res = mail($r[0]['email'], - email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'), - $email, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + } } diff --git a/view/ca/follow_notify_eml.tpl b/view/ca/follow_notify_eml.tpl deleted file mode 100644 index ab5a4b371..000000000 --- a/view/ca/follow_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Apreciat/da $myname, - -Tens un nou seguidor en $sitename - '$requestor'. - -Pots visitar el seu perfil en $url. - -Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud. - -$siteurl - - - $sitename diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 153f19562..000000000 --- a/view/ca/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Apreciat/da {{$myname}}, - -Tens un nou seguidor en {{$sitename}} - '{{$requestor}}'. - -Pots visitar el seu perfil en {{$url}}. - -Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl deleted file mode 100644 index 5581d2d6c..000000000 --- a/view/cs/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Drahý/Drahá $[myname], - -Máte nového následovatele na $[sitename] - '$[requestor]'. - -Můžete si zobrazit jeho profil na $[url]. - -Prosím, přihlaste se na Vašem webu pro odsouhlasení nebo ignorování/zrušení této žádosti - -$[siteurl] - -S pozdravem - - $[sitename] administrátor \ No newline at end of file diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 1b4d6a94d..000000000 --- a/view/cs/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Milý/Milá {{$username}}, - -Máte nového následovatele na {{$sitename}} - '{{$requestor}}'. - -Můžete si prohlédnout jeho/její profil na {{$url}}. - -Přihlaste se na váš server k odsouhlasení nebo ignorování/zrušení žádosti. - -{{$siteurl}} - -S pozdravem, - - {{$sitename}} administrátor diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl deleted file mode 100644 index a866a08a2..000000000 --- a/view/de/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Hallo $[myname], - -Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'. - -Du kannst das Profil unter $[url] besuchen. - -Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen. - -$[siteurl] - -beste Grüße, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 4da71eb19..000000000 --- a/view/de/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Hallo {{$myname}}, - -Du hast einen neuen Anhänger auf {{$sitename}} - '{{$requestor}}'. - -Du kannst das Profil unter {{$url}} besuchen. - -Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen. - -{{$siteurl}} - -beste Grüße, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl deleted file mode 100644 index 917024b84..000000000 --- a/view/en/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Dear $[myname], - -You have a new follower at $[sitename] - '$[requestor]'. - -You may visit their profile at $[url]. - -Please login to your site to approve or ignore/cancel the request. - -$[siteurl] - -Regards, - - $[sitename] administrator diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 00a2406e8..000000000 --- a/view/en/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Dear {{$myname}}, - -You have a new follower at {{$sitename}} - '{{$requestor}}'. - -You may visit their profile at {{$url}}. - -Please login to your site to approve or ignore/cancel the request. - -{{$siteurl}} - -Regards, - - {{$sitename}} administrator diff --git a/view/eo/follow_notify_eml.tpl b/view/eo/follow_notify_eml.tpl deleted file mode 100644 index e76453ac1..000000000 --- a/view/eo/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Kara $[myname], - -Vi havas novan abonanton ĉe $[sitename] - '$[requestor]'. - -Vi povas viziti ilian profilon ĉe $[url]. - -Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton. - -$[siteurl] - -Salutoj, - - [$sitename] administranto \ No newline at end of file diff --git a/view/eo/smarty3/follow_notify_eml.tpl b/view/eo/smarty3/follow_notify_eml.tpl deleted file mode 100644 index a4e0976d5..000000000 --- a/view/eo/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Kara {{$myname}}, - -Vi havas novan abonanton ĉe {{$sitename}} - '{{$requestor}}'. - -Vi povas viziti ilian profilon ĉe {{$url}}. - -Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton. - -{{$siteurl}} - -Salutoj, - - [{{$sitename}}] administranto \ No newline at end of file diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl deleted file mode 100644 index 17bd2c01c..000000000 --- a/view/es/follow_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Estimado/a $myname, - -Tienes un nuevo seguidor en $sitename - '$requestor'. - -Puedes visitar su perfil en $url. - -Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud. - -$siteurl - - - $sitename diff --git a/view/es/smarty3/follow_notify_eml.tpl b/view/es/smarty3/follow_notify_eml.tpl deleted file mode 100644 index f0090a8b5..000000000 --- a/view/es/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Estimado/a {{$myname}}, - -Tienes un nuevo seguidor en {{$sitename}} - '{{$requestor}}'. - -Puedes visitar su perfil en {{$url}}. - -Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl deleted file mode 100644 index 10d0b343b..000000000 --- a/view/fr/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Cher(e) $myname, - -Une nouvelle personne - $requestor - vous suit désormais sur $sitename. - -Vous pouvez consulter son profil sur $url. - -Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande. - -$siteurl - -Cordialement, - - l'administrateur de $sitename diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl deleted file mode 100644 index b96ef04fe..000000000 --- a/view/fr/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Cher(e) {{$myname}}, - -Une nouvelle personne - {{$requestor}} - vous suit désormais sur {{$sitename}}. - -Vous pouvez consulter son profil sur {{$url}}. - -Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande. - -{{$siteurl}} - -Cordialement, - - l'administrateur de {{$sitename}} diff --git a/view/is/follow_notify_eml.tpl b/view/is/follow_notify_eml.tpl deleted file mode 100644 index d31e37bca..000000000 --- a/view/is/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Góðan daginn $[myname], - -Þú hefur nýjan aðdáanda frá $[sitename] - '$[requestor]'. - -Þú getur heimsótt þeirra heimasvæði á $[url]. - -Vinsamlegast innskráðu þig til að samþykkja eða hunsa/hætta við beiðni. - -$[siteurl] - -Bestu kveðjur, - - Kerfisstjóri $[sitename] \ No newline at end of file diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl deleted file mode 100644 index fcc0cf875..000000000 --- a/view/is/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Góðan daginn {{$myname}}, - -Þú hefur nýjan aðdáanda frá {{$sitename}} - '{{$requestor}}'. - -Þú getur heimsótt þeirra heimasvæði á {{$url}}. - -Vinsamlegast innskráðu þig til að samþykkja eða hunsa/hætta við beiðni. - -{{$siteurl}} - -Bestu kveðjur, - - Kerfisstjóri {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 0bfc37552..000000000 --- a/view/it/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Ciao {{$myname}}, - -Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'. - -Puoi vedere il suo profilo su {{$url}}. - -Accedi sul tuo sito per approvare o ignorare la richiesta. - -{{$siteurl}} - -Saluti, - - L'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/nb-no/follow_notify_eml.tpl b/view/nb-no/follow_notify_eml.tpl deleted file mode 100644 index 73a347027..000000000 --- a/view/nb-no/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Kjære $[myname], - -Du har en ny følgesvenn på $[sitename] - '$[requestor]'. - -Du kan besøke profilen deres på $[url]. - -Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen. - -$[siteurl] - -Med vennlig hilsen, - - $[sitename] administrator \ No newline at end of file diff --git a/view/nb-no/smarty3/follow_notify_eml.tpl b/view/nb-no/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 4811e053b..000000000 --- a/view/nb-no/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Kjære {{$myname}}, - -Du har en ny følgesvenn på {{$sitename}} - '{{$requestor}}'. - -Du kan besøke profilen deres på {{$url}}. - -Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen. - -{{$siteurl}} - -Med vennlig hilsen, - - {{$sitename}} administrator \ No newline at end of file diff --git a/view/nl/follow_notify_eml.tpl b/view/nl/follow_notify_eml.tpl deleted file mode 100644 index 6e796521d..000000000 --- a/view/nl/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Beste $[myname] - -U heeft een nieuw contact op $[sitename] - '$[requestor]'. - -U kunt het profiel bezoeken op $[url] - -U moet op uw Friendica-site inloggen om het verzoek goed te keuren, te negeren of the annuleren. - -$[siteurl] - -Vriendelijke groet, - - Beheerder $[sitename] \ No newline at end of file diff --git a/view/pl/follow_notify_eml.tpl b/view/pl/follow_notify_eml.tpl deleted file mode 100644 index de3675419..000000000 --- a/view/pl/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Drogi $[myname], - -Masz nowego obserwującego na $[sitename] - '$[requestor]'. - -Możesz odwiedzić jego profil na $[url]. - -Zaloguj się na swoją stronę by potwierdzić lub zignorować/anulować prośbę. - -$[siteurl] - -Pozdrawiam, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/pl/smarty3/follow_notify_eml.tpl b/view/pl/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 934255fd3..000000000 --- a/view/pl/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Drogi {{$myname}}, - -Masz nowego obserwującego na {{$sitename}} - '{{$requestor}}'. - -Możesz odwiedzić jego profil na {{$url}}. - -Zaloguj się na swoją stronę by potwierdzić lub zignorować/anulować prośbę. - -{{$siteurl}} - -Pozdrawiam, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/ro/smarty3/follow_notify_eml.tpl b/view/ro/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 9755732b6..000000000 --- a/view/ro/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Dragă $[myname], - -Aveţi un nou urmăritoe la $[sitename] - '$[requestor]'. - -Puteţi vizita profilul lor la $[url]. - -Vă rugăm să vă logaţi pe site-ul dvs. pentru a aproba sau ignora / anula cererea. - -$[siteurl] - -Cu respect, - - $[sitename] administrator \ No newline at end of file diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl deleted file mode 100644 index 41cd34831..000000000 --- a/view/sv/follow_notify_eml.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$myname, - -'$requestor' på $sitename vill följa dina uppdateringar här på Friendica. - -Besök dennes profil på $url. - -Logga in för att godkänna eller avslå förfrågan. - -$siteurl - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/follow_notify_eml.tpl b/view/sv/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 356e0a8e1..000000000 --- a/view/sv/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -{{$myname}}, - -'{{$requestor}}' på {{$sitename}} vill följa dina uppdateringar här på Friendica. - -Besök dennes profil på {{$url}}. - -Logga in för att godkänna eller avslå förfrågan. - -{{$siteurl}} - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/follow_notify_eml.tpl b/view/zh-cn/follow_notify_eml.tpl deleted file mode 100644 index 48f75f3db..000000000 --- a/view/zh-cn/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -尊敬的$[myname], - -您有新关注的在$[sitename]－「$[requestor]」。 - -您能看他的简介在$[url]。 - -请再您的网页登记为确认或取消要求。 - -$[siteurl] - -谨上, - - $[sitename]行政人员 \ No newline at end of file diff --git a/view/zh-cn/smarty3/follow_notify_eml.tpl b/view/zh-cn/smarty3/follow_notify_eml.tpl deleted file mode 100644 index b0ee01833..000000000 --- a/view/zh-cn/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -尊敬的{{$myname}}, - -您有新关注的在{{$sitename}}－「{{$requestor}}」。 - -您能看他的简介在{{$url}}。 - -请再您的网页登记为确认或取消要求。 - -{{$siteurl}} - -谨上, - - {{$sitename}}行政人员 \ No newline at end of file From d85bdd8fb0253e7ee6c99901246eb934aed101c6 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 10:27:39 +0200 Subject: [PATCH 05/14] lost password verification mail via notification() --- include/enotify.php | 31 ++++++++++++---- mod/lostpass.php | 55 +++++++++++++++++++++-------- view/ca/lostpass_eml.tpl | 35 ------------------ view/ca/smarty3/lostpass_eml.tpl | 36 ------------------- view/cs/lostpass_eml.tpl | 23 ------------ view/cs/smarty3/lostpass_eml.tpl | 24 ------------- view/de/lostpass_eml.tpl | 32 ----------------- view/de/smarty3/lostpass_eml.tpl | 33 ----------------- view/en/lostpass_eml.tpl | 32 ----------------- view/en/smarty3/lostpass_eml.tpl | 33 ----------------- view/eo/lostpass_eml.tpl | 32 ----------------- view/eo/smarty3/lostpass_eml.tpl | 33 ----------------- view/es/lostpass_eml.tpl | 34 ------------------ view/es/smarty3/lostpass_eml.tpl | 35 ------------------ view/fr/lostpass_eml.tpl | 34 ------------------ view/fr/smarty3/lostpass_eml.tpl | 35 ------------------ view/is/lostpass_eml.tpl | 32 ----------------- view/is/smarty3/lostpass_eml.tpl | 33 ----------------- view/it/smarty3/lostpass_eml.tpl | 32 ----------------- view/nb-no/lostpass_eml.tpl | 32 ----------------- view/nb-no/smarty3/lostpass_eml.tpl | 33 ----------------- view/nl/lostpass_eml.tpl | 32 ----------------- view/pl/lostpass_eml.tpl | 32 ----------------- view/pl/smarty3/lostpass_eml.tpl | 33 ----------------- view/ro/smarty3/lostpass_eml.tpl | 32 ----------------- view/sv/lostpass_eml.tpl | 29 --------------- view/sv/smarty3/lostpass_eml.tpl | 30 ---------------- view/zh-cn/lostpass_eml.tpl | 32 ----------------- view/zh-cn/smarty3/lostpass_eml.tpl | 33 ----------------- 29 files changed, 65 insertions(+), 887 deletions(-) delete mode 100644 view/ca/lostpass_eml.tpl delete mode 100644 view/ca/smarty3/lostpass_eml.tpl delete mode 100644 view/cs/lostpass_eml.tpl delete mode 100644 view/cs/smarty3/lostpass_eml.tpl delete mode 100644 view/de/lostpass_eml.tpl delete mode 100644 view/de/smarty3/lostpass_eml.tpl delete mode 100644 view/en/lostpass_eml.tpl delete mode 100644 view/en/smarty3/lostpass_eml.tpl delete mode 100644 view/eo/lostpass_eml.tpl delete mode 100644 view/eo/smarty3/lostpass_eml.tpl delete mode 100644 view/es/lostpass_eml.tpl delete mode 100644 view/es/smarty3/lostpass_eml.tpl delete mode 100644 view/fr/lostpass_eml.tpl delete mode 100644 view/fr/smarty3/lostpass_eml.tpl delete mode 100644 view/is/lostpass_eml.tpl delete mode 100644 view/is/smarty3/lostpass_eml.tpl delete mode 100644 view/it/smarty3/lostpass_eml.tpl delete mode 100644 view/nb-no/lostpass_eml.tpl delete mode 100644 view/nb-no/smarty3/lostpass_eml.tpl delete mode 100644 view/nl/lostpass_eml.tpl delete mode 100644 view/pl/lostpass_eml.tpl delete mode 100644 view/pl/smarty3/lostpass_eml.tpl delete mode 100644 view/ro/smarty3/lostpass_eml.tpl delete mode 100644 view/sv/lostpass_eml.tpl delete mode 100644 view/sv/smarty3/lostpass_eml.tpl delete mode 100644 view/zh-cn/lostpass_eml.tpl delete mode 100644 view/zh-cn/smarty3/lostpass_eml.tpl diff --git a/include/enotify.php b/include/enotify.php index 742134449..631cb8aed 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -250,6 +250,7 @@ function notification($params) { $sitename); break; default: + // ACTIVITY_REQ_FRIEND is default activity for notifications break; } @@ -307,14 +308,28 @@ function notification($params) { } if($params['type'] == NOTIFY_SYSTEM) { + //I have yet to find what system notificatons are... + } + + if ($params['type'] == "SYSTEM_EMAIL"){ + // not part of the notifications. + // it just send a mail to the user. + // It will be used by the system to send emails to users (like + // password reset, invitations and so) using one look (but without + // add a notification to the user, with could be inexistent) $subject = $params['subject']; $preamble = $params['preamble']; - $epreamble = $params['epreamble']; + if (x($params,'epreamble')){ + $epreamble = $params['epreamble']; + } else { + $epreamble = str_replace("\n","
\n",$preamble); + } $body = $params['body']; $sitelink = ""; $tsitelink = ""; $hsitelink = ""; $itemlink = ""; + $show_in_notification_page = false; } @@ -343,8 +358,8 @@ function notification($params) { $itemlink = $h['itemlink']; - if ($show_in_notification_page) { + if ($show_in_notification_page) { do { $dups = false; $hash = random_string(); @@ -441,9 +456,11 @@ function notification($params) { } // send email notification if notification preferences permit - if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { + if((intval($params['notify_flags']) & intval($params['type'])) + || $params['type'] == NOTIFY_SYSTEM + || $params['type'] == "SYSTEM_EMAIL") { - logger('notification: sending notification email'); + logger('sending notification email'); if (isset($params['parent']) AND (intval($params['parent']) != 0)) { $id_for_parent = $params['parent']."@".$hostname; @@ -477,11 +494,13 @@ function notification($params) { } - $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", - $body))),ENT_QUOTES,'UTF-8')); + // textversion keeps linebreaks + $textversion = strip_tags(str_replace("
","\n",html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", + $body))),ENT_QUOTES,'UTF-8'))); $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "
\n",$body))),ENT_QUOTES,'UTF-8'); + $datarray = array(); $datarray['banner'] = $banner; $datarray['product'] = $product; diff --git a/mod/lostpass.php b/mod/lostpass.php index 1751c2a7e..290ebb1b4 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -1,6 +1,7 @@ $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $username, - '$email' => $email, - '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password - )); - $res = mail($email, email_header_encode(sprintf( t('Password reset requested at %s'),$a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + $sitename = $a->config['sitename']; + $siteurl = $a->get_baseurl(); + $resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password; + + $preamble = t('Dear %1$s, + A request was recently received at "%2$s" to reset your account +password. In order to confirm this request, please select the verification link +below or paste it into your web browser address bar. + +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. + +Your password will not be changed unless we can verify that you +issued this request.'); + $body = t('Follow this link to verify your identity: + +%1$s + +You will then receive a follow-up message containing the new password. + +You may change that password from your account settings page after logging in. + +The login details are as follows: + +Site Location: %2$s +Login Name: %3$s'); + + $preamble = sprintf($preamble, $username, $sitename); + $body = sprintf($body, $resetlink, $siteurl, $email); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Password reset requested at %s'),$sitename), + 'preamble'=> $preamble, + 'body' => $body)); goaway(z_root()); + } @@ -113,7 +138,7 @@ function lostpass_content(&$a) { return $o; } - + } else { $tpl = get_markup_template('lostpass.tpl'); @@ -122,7 +147,7 @@ function lostpass_content(&$a) { '$title' => t('Forgot your Password?'), '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'), '$name' => t('Nickname or Email: '), - '$submit' => t('Reset') + '$submit' => t('Reset') )); return $o; diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl deleted file mode 100644 index eccf2050a..000000000 --- a/view/ca/lostpass_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - -Apreciat/da $username, - - S'ha rebut una sol·licitud en $sitename recentment per restablir -la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de -verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador. - -Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora -i/o elimina aquest missatge. - -La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui -va emetre aquesta sol·licitud. - -Segueix aquest enllaç per verificar la teva identitat: - -$reset_link - -A continuació rebràs un missatge amb la nova contrasenya. - -Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de -configuració. - -Les dades d'accés són els següents: - - -Lloc: $siteurl -Nom: $email - - - - -Salutacions, - L'administració de $sitename - - diff --git a/view/ca/smarty3/lostpass_eml.tpl b/view/ca/smarty3/lostpass_eml.tpl deleted file mode 100644 index da0aff10e..000000000 --- a/view/ca/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,36 +0,0 @@ - - -Apreciat/da {{$username}}, - - S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir -la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de -verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador. - -Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora -i/o elimina aquest missatge. - -La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui -va emetre aquesta sol·licitud. - -Segueix aquest enllaç per verificar la teva identitat: - -{{$reset_link}} - -A continuació rebràs un missatge amb la nova contrasenya. - -Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de -configuració. - -Les dades d'accés són els següents: - - -Lloc: {{$siteurl}} -Nom: {{$email}} - - - - -Salutacions, - L'administració de {{$sitename}} - - diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl deleted file mode 100644 index 05042ddce..000000000 --- a/view/cs/lostpass_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -Milý/Milá $username, - Na webu $sitename byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče. -Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte. - -Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy. - -Klikněte na tento odkaz pro prověření Vaší identity: - -$reset_link - -Poté obdržíte další zprávu obsahující nové heslo. - -Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení. - -Přihlašovací údaje jsou tato: - -Adresa webu: $siteurl -Přihlašovací jméno: $email - -S pozdravem, - - $sitename administrátor diff --git a/view/cs/smarty3/lostpass_eml.tpl b/view/cs/smarty3/lostpass_eml.tpl deleted file mode 100644 index 96ce6cc72..000000000 --- a/view/cs/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - -Milý/Milá {{$username}}, - Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče. -Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte. - -Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy. - -Klikněte na tento odkaz pro prověření Vaší identity: - -{{$reset_link}} - -Poté obdržíte další zprávu obsahující nové heslo. - -Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení. - -Přihlašovací údaje jsou tato: - -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} - -S pozdravem, - - {{$sitename}} administrátor diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl deleted file mode 100644 index af91a0d46..000000000 --- a/view/de/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Hallo $[username], - Auf $[sitename] wurde eine Anfrage zum Zurücksetzen deines -Passworts empfangen. Um diese zu bestätigen folge bitte dem Link -weiter unten oder kopiere ihn in die Adressleiste deines Browsers. - -Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE -bitte diese E-Mail und den Link. - -Dein Passwort wird nicht geändert solange wir nicht überprüfen -konnten, dass du die Anfrage gestellt hast. - -Folge diesem Link um deine Identität zu verifizieren: - -$[reset_link] - -Du wirst eine weitere E-Mail erhalten mit dem neuen Passwort. - -Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern. - -Die Login-Details sind die folgenden: - -Adresse der Seite:»$[siteurl] -Login Name:»$[email] - - - - -Grüße, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/lostpass_eml.tpl b/view/de/smarty3/lostpass_eml.tpl deleted file mode 100644 index 709f8f772..000000000 --- a/view/de/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Hallo {{$username}}, - Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines -Passworts empfangen. Um diese zu bestätigen folge bitte dem Link -weiter unten oder kopiere ihn in die Adressleiste deines Browsers. - -Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE -bitte diese Mail und den Link. - -Dein Passwort wird nicht geändert werden solange wir nicht überprüfen -konnten, dass du die Anfrage gestellt hast. - -Folge diesem Link um deine Identität zu verifizieren: - -{{$reset_link}} - -Du wirst eine weitere Email erhalten mit dem neuen Passwort. - -Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern. - -Die Login-Details sind die folgenden: - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} - - - - -Grüße, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl deleted file mode 100644 index 1330caa12..000000000 --- a/view/en/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Dear $[username], - A request was recently received at $[sitename] to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. - -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. - -Your password will not be changed unless we can verify that you -issued this request. - -Follow this link to verify your identity: - -$[reset_link] - -You will then receive a follow-up message containing the new password. - -You may change that password from your account settings page after logging in. - -The login details are as follows: - -Site Location: $[siteurl] -Login Name: $[email] - - - - -Sincerely, - $[sitename] Administrator - - diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl deleted file mode 100644 index 775583ac8..000000000 --- a/view/en/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Dear {{$username}}, - A request was recently received at {{$sitename}} to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. - -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. - -Your password will not be changed unless we can verify that you -issued this request. - -Follow this link to verify your identity: - -{{$reset_link}} - -You will then receive a follow-up message containing the new password. - -You may change that password from your account settings page after logging in. - -The login details are as follows: - -Site Location: {{$siteurl}} -Login Name: {{$email}} - - - - -Sincerely, - {{$sitename}} Administrator - - diff --git a/view/eo/lostpass_eml.tpl b/view/eo/lostpass_eml.tpl deleted file mode 100644 index 26d1a3c23..000000000 --- a/view/eo/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Kara $[username], - $[sitename] ricevis peton por rekomencigi vian pasvorton. -Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon -aŭ alglui ĝin en la adreskampo de via retumilo. - -Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la -sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. - -Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi -kiu petis la ŝanĝon. - -Sekvu ĉi tion ligilon por konfirmi vian identecon: - -$[reset_link] - -Poste, vi ricevos mesaĝon enhavonte la novan pasvorton. - -Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti. - -La akreditaĵoj estas: - -Retejo:»$[siteurl] -Salutnomo:»$[email] - - - - -Salutoj, - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/lostpass_eml.tpl b/view/eo/smarty3/lostpass_eml.tpl deleted file mode 100644 index fe36cad03..000000000 --- a/view/eo/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Kara {{$username}}, - {{$sitename}} ricevis peton por rekomencigi vian pasvorton. -Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon -aŭ alglui ĝin en la adreskampo de via retumilo. - -Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la -sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. - -Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi -kiu petis la ŝanĝon. - -Sekvu ĉi tion ligilon por konfirmi vian identecon: - -{{$reset_link}} - -Poste, vi ricevos mesaĝon enhavonte la novan pasvorton. - -Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti. - -La akreditaĵoj estas: - -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} - - - - -Salutoj, - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl deleted file mode 100644 index 607744bfe..000000000 --- a/view/es/lostpass_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Estimado/a $username, - - Se ha recibido una solicitud en $sitename recientemente para restablecer -tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de -verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador. - -Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora -y/o elimina este mensaje. - -Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien -emitió esta solicitud. - -Sigue este enlace para verificar tu identidad: - -$reset_link - -A continuación recibirás un mensaje con la nueva contraseña. - -Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de -configuración. - -Los datos de acceso son los siguientes: - -Sitio: $siteurl -Nombre: $email - - - - -Saludos, - La administración de $sitename - - diff --git a/view/es/smarty3/lostpass_eml.tpl b/view/es/smarty3/lostpass_eml.tpl deleted file mode 100644 index 61c35c68d..000000000 --- a/view/es/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Estimado/a {{$username}}, - - Se ha recibido una solicitud en {{$sitename}} recientemente para restablecer -tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de -verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador. - -Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora -y/o elimina este mensaje. - -Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien -emitió esta solicitud. - -Sigue este enlace para verificar tu identidad: - -{{$reset_link}} - -A continuación recibirás un mensaje con la nueva contraseña. - -Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de -configuración. - -Los datos de acceso son los siguientes: - -Sitio: {{$siteurl}} -Nombre: {{$email}} - - - - -Saludos, - La administración de {{$sitename}} - - diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl deleted file mode 100644 index 96c11d723..000000000 --- a/view/fr/lostpass_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Cher(e) $username, - - Nous avons récemment reçu, chez $sitename, une demande de remise -à zéro du mot de passe protégeant votre compte. Pour confirmer cette -demande, merci de cliquer sur le lien de vérification suivant, ou de le -coller dans la barre d'adresse de votre navigateur web. - -Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre -le lien en question, et d'ignorer/supprimer ce courriel. - -Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu -nous assurer que vous êtes bien à l'origine de cette demande. - -Merci de suivre le lien suivant pour confirmer votre identité : - -$reset_link - -Vous recevrez en retour un message avec votre nouveau mot de passe. - -Vous pourrez ensuite changer ce mot de passe, après connexion, dans la -page des réglages du compte. - -Les informations du compte concerné sont : - -Site : $siteurl -Pseudo/Courriel : $email - - - -Sincèrement votre, - l'administrateur de $sitename - - diff --git a/view/fr/smarty3/lostpass_eml.tpl b/view/fr/smarty3/lostpass_eml.tpl deleted file mode 100644 index 301c45fe6..000000000 --- a/view/fr/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Cher(e) {{$username}}, - - Nous avons récemment reçu, chez {{$sitename}}, une demande de remise -à zéro du mot de passe protégeant votre compte. Pour confirmer cette -demande, merci de cliquer sur le lien de vérification suivant, ou de le -coller dans la barre d'adresse de votre navigateur web. - -Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre -le lien en question, et d'ignorer/supprimer ce courriel. - -Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu -nous assurer que vous êtes bien à l'origine de cette demande. - -Merci de suivre le lien suivant pour confirmer votre identité : - -{{$reset_link}} - -Vous recevrez en retour un message avec votre nouveau mot de passe. - -Vous pourrez ensuite changer ce mot de passe, après connexion, dans la -page des réglages du compte. - -Les informations du compte concerné sont : - -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} - - - -Sincèrement votre, - l'administrateur de {{$sitename}} - - diff --git a/view/is/lostpass_eml.tpl b/view/is/lostpass_eml.tpl deleted file mode 100644 index 053612adb..000000000 --- a/view/is/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Góðan dag $[username], - Beiðni barst á $[sitename] um að endursetja -aðgangsorðið. Til að staðfesta þessa beiði, veldu slóðina -hér fyrir neðan og settu í slóðastiku vafra. - -Ef þú samþykkir ekki þessa breytingu, EKKI fara á slóðina -sem upp er gefinn heldur hunsaðu og/eða eyddu þessum tölvupósti. - -Aðgangsorðið verður ekki breytt nama við getum staðfest að þú -baðst um þessa breytingu. - -Farðu á slóðina til að staðfesta: - -$[reset_link] - -Þú munnt fá annan tölvupóst með nýja aðgangsorðinu. - -Þú getur síðan breytt því aðgangsorði í stillingar síðunni eftir að þú innskráir þig. - -Innskráningar upplýsingarnar eru eftirfarandi: - -Vefþjónn: $[siteurl] -Notendanafn: $[email] - - - - -Bestu kveðjur, - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl deleted file mode 100644 index 2ff6812ae..000000000 --- a/view/is/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Góðan dag {{$username}}, - Beiðni barst á {{$sitename}} um að endursetja -aðgangsorðið. Til að staðfesta þessa beiði, veldu slóðina -hér fyrir neðan og settu í slóðastiku vafra. - -Ef þú samþykkir ekki þessa breytingu, EKKI fara á slóðina -sem upp er gefinn heldur hunsaðu og/eða eyddu þessum tölvupósti. - -Aðgangsorðið verður ekki breytt nama við getum staðfest að þú -baðst um þessa breytingu. - -Farðu á slóðina til að staðfesta: - -{{$reset_link}} - -Þú munnt fá annan tölvupóst með nýja aðgangsorðinu. - -Þú getur síðan breytt því aðgangsorði í stillingar síðunni eftir að þú innskráir þig. - -Innskráningar upplýsingarnar eru eftirfarandi: - -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} - - - - -Bestu kveðjur, - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl deleted file mode 100644 index 3601f18a7..000000000 --- a/view/it/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Ciao {{$username}}, - Su {{$sitename}} è stata ricevuta una richiesta di azzeramento della password del tuo account. -Per confermare la richiesta, clicca sul link di verifica -qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. - -Se NON hai richiesto l'azzeramento, NON seguire il link -e ignora e/o cancella questa email. - -La tua password non sarà modificata finché non avremo verificato che -hai fatto questa richiesta. - -Per verificare la tua identità clicca su: - -{{$reset_link}} - -Dopo la verifica riceverai un messaggio di risposta con la nuova password. - -Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso. - -I dati di accesso sono i seguenti: - -Sito:»{{$siteurl}} -Nome utente:»{{$email}} - - - - -Saluti, - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/nb-no/lostpass_eml.tpl b/view/nb-no/lostpass_eml.tpl deleted file mode 100644 index 762c8c2e9..000000000 --- a/view/nb-no/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Kjære $[username], - En forespørsel ble nylig mottatt hos $[sitename] om å tilbakestille din kontos -passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken -nedenfor eller lim den inn på adresselinjen i nettleseren din. - -Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken -som er oppgitt og ignorer og/eller slett denne e-posten. - -Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du -sendte denne forespørselen. - -Følg denne lenken for å bekrefte din identitet: - -$[reset_link] - -Du vil da motta en oppfølgings melding med det nye passordet. - -Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging. - -Innloggingsdetaljene er som følger: - -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] - - - - -Beste hilsen, - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/lostpass_eml.tpl b/view/nb-no/smarty3/lostpass_eml.tpl deleted file mode 100644 index b84b0f1d2..000000000 --- a/view/nb-no/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Kjære {{$username}}, - En forespørsel ble nylig mottatt hos {{$sitename}} om å tilbakestille din kontos -passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken -nedenfor eller lim den inn på adresselinjen i nettleseren din. - -Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken -som er oppgitt og ignorer og/eller slett denne e-posten. - -Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du -sendte denne forespørselen. - -Følg denne lenken for å bekrefte din identitet: - -{{$reset_link}} - -Du vil da motta en oppfølgings melding med det nye passordet. - -Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging. - -Innloggingsdetaljene er som følger: - -Nettstedsadresse:»{{$siteurl}} -Brukernavn:»{{$email}} - - - - -Beste hilsen, - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nl/lostpass_eml.tpl b/view/nl/lostpass_eml.tpl deleted file mode 100644 index dd62b4da1..000000000 --- a/view/nl/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Beste $[username], - Een verzoek werd onlangs ontvangen van $[sitename] om uw account te herstellen -wachtwoord. Om dit te bevestigen, selecteert u de verificatie-link -hieronder of plak deze in je web browser adresbalk. - -Als je GEEN wachtwoord hebt aangevraagd gebruik deze link dan NIET -verstrekt en te negeren en / of verwijderen van deze e-mail. - -Uw wachtwoord wordt niet gewijzigd, tenzij we kunnen controleren of u -dit heeft aangevraagd - -Volg deze link om uw identiteit te verifiëren: - -$[reset_link] - -U ontvangt dan een follow-up bericht met het nieuwe wachtwoord. - -U kunt u wachtwoord wijzigen in gebruikers instellingen na het inloggen - -De login-gegevens zijn als volgt: - -site locatie:»$[siteurl] -Gebruikers naam:»$[email] - - - - -Met vriendelijke groet, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/lostpass_eml.tpl b/view/pl/lostpass_eml.tpl deleted file mode 100644 index 9663bf86c..000000000 --- a/view/pl/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -$[username], - Ze strony $[sitename] wpłynęła prośba z zresetowanie -hasła. W celu potwierdzenia kliknij w weryfikacyjny link -zamieszczony poniżej, lub wklej go do pasku adresu twojej przeglądarki. - -Jeśli uważasz, że wiadomość nie jest przeznaczona dla ciebie, nie klikaj w linka! -Zignoruj tego emaila i usuń. - -Twoje hasło nie może zostać zmienione zanim nie potwierdzimy -twojego żądania. - -Aby potwierdzić kliknik w link weryfikacyjny: - -$[reset_link] - -Otrzymasz od nas wiadomość zwrotną zawierającą nowe hasło. - -Po zalogowaniu się, będziesz miał możliwość zmiany hasła na takie jakie chcesz. - -Dane do zalogowania: - -Adres strony: $[siteurl] -Login: $[email] - - - - -Z poważaniem, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/lostpass_eml.tpl b/view/pl/smarty3/lostpass_eml.tpl deleted file mode 100644 index 87b3ad56d..000000000 --- a/view/pl/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -{{$username}}, - Ze strony {{$sitename}} wpłynęła prośba z zresetowanie -hasła. W celu potwierdzenia kliknij w weryfikacyjny link -zamieszczony poniżej, lub wklej go do pasku adresu twojej przeglądarki. - -Jeśli uważasz, że wiadomość nie jest przeznaczona dla ciebie, nie klikaj w linka! -Zignoruj tego emaila i usuń. - -Twoje hasło nie może zostać zmienione zanim nie potwierdzimy -twojego żądania. - -Aby potwierdzić kliknik w link weryfikacyjny: - -{{$reset_link}} - -Otrzymasz od nas wiadomość zwrotną zawierającą nowe hasło. - -Po zalogowaniu się, będziesz miał możliwość zmiany hasła na takie jakie chcesz. - -Dane do zalogowania: - -Adres strony: {{$siteurl}} -Login: {{$email}} - - - - -Z poważaniem, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/lostpass_eml.tpl b/view/ro/smarty3/lostpass_eml.tpl deleted file mode 100644 index a20970cc9..000000000 --- a/view/ro/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Dragă $[username], - O cerere a fost primită recent de la $ [sitename] pentru a reseta -parola contului dvs. În scopul confitmării aceastei cereri, vă rugăm să selectați link-ul de verificare -de mai jos sau inserați în bara de adrese a web browser-ului . - -Dacă nu ați solicitat această schimbare, vă rugăm să nu urmaţi link-ul -furnizat și ignoră și / sau șterge acest e-mail. - -Parola dvs nu va fi schimbată dacă nu putem verifica dacă dvs -a emis această cerere. - -Urmaţi acest link pentru a verifica identitatea dvs. : - -$[reset_link] - -Veți primi apoi un mesaj de follow-up care conține noua parolă. - -Puteți schimba această parola din pagina de setări a contului dvs. după logare - -Detaliile de login sunt următoarele ; - -Locaţie Site: »$[siteurl] -Login Name: $[email] - - - - -Cu stimă, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl deleted file mode 100644 index df338fa69..000000000 --- a/view/sv/lostpass_eml.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$username, - -En begäran om återställning av lösenord på $sitename har mottagits. -Gå till adressen nedan för att bekräfta denna begäran. Du kan också -klistra in länken i adressfältet i din webbläsare. - -Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. -Då kan du ignorera det här meddelandet. - -Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du -initierat detta. - -Med den här länken kan du bekräfta din identitet: - -$reset_link - -Sedan kommer du att få ett meddelande med ett nytt lösenord. - -Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. - -Detaljerna ser ut så här: - -Webbplats: $siteurl -Inloggningsnamn: $email - -Hälsningar, -$sitename admin - - \ No newline at end of file diff --git a/view/sv/smarty3/lostpass_eml.tpl b/view/sv/smarty3/lostpass_eml.tpl deleted file mode 100644 index f8668ce4e..000000000 --- a/view/sv/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,30 +0,0 @@ - -{{$username}}, - -En begäran om återställning av lösenord på {{$sitename}} har mottagits. -Gå till adressen nedan för att bekräfta denna begäran. Du kan också -klistra in länken i adressfältet i din webbläsare. - -Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. -Då kan du ignorera det här meddelandet. - -Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du -initierat detta. - -Med den här länken kan du bekräfta din identitet: - -{{$reset_link}} - -Sedan kommer du att få ett meddelande med ett nytt lösenord. - -Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. - -Detaljerna ser ut så här: - -Webbplats: {{$siteurl}} -Inloggningsnamn: {{$email}} - -Hälsningar, -{{$sitename}} admin - - \ No newline at end of file diff --git a/view/zh-cn/lostpass_eml.tpl b/view/zh-cn/lostpass_eml.tpl deleted file mode 100644 index 8c5ec5c7b..000000000 --- a/view/zh-cn/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -尊敬的$[username]， - $[sitename]最近收到一个要求复位您的账户 -密码。为肯定这个要求，请点击肯定按钮 -在下边或粘贴在您的游览器地址条 - -如果您没有要求这个变化，请别点击这个按努i -和不理或删除这个邮件。 - -您密码没有被变化直到我们证实您 -发送这个要求时。 - -点击这个按钮为证实您的同一个人： - -$[reset_link] - -然后您收到后续通信包括新密码。 - -您会变化密码在您的账户设置页登记后。 - -登记细节是： - -网站位置: $[siteurl] -登记名: $[email] - - - - -谨上， - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/lostpass_eml.tpl b/view/zh-cn/smarty3/lostpass_eml.tpl deleted file mode 100644 index 7af16a778..000000000 --- a/view/zh-cn/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -尊敬的{{$username}}， - {{$sitename}}最近收到一个要求复位您的账户 -密码。为肯定这个要求，请点击肯定按钮 -在下边或粘贴在您的游览器地址条 - -如果您没有要求这个变化，请别点击这个按努i -和不理或删除这个邮件。 - -您密码没有被变化直到我们证实您 -发送这个要求时。 - -点击这个按钮为证实您的同一个人： - -{{$reset_link}} - -然后您收到后续通信包括新密码。 - -您会变化密码在您的账户设置页登记后。 - -登记细节是： - -网站位置: {{$siteurl}} -登记名: {{$email}} - - - - -谨上， - {{$sitename}}行政人员 - - \ No newline at end of file From 9a0c37eb47cde20f532d7dcac583ca95a8cd4d24 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:20:06 +0200 Subject: [PATCH 06/14] new password mail via notification() new include/text.php::deindent() function remove unused templates --- include/Emailer.php | 2 +- include/text.php | 19 +++++++ mod/lostpass.php | 77 +++++++++++++++----------- view/ca/passchanged_eml.tpl | 19 ------- view/ca/smarty3/passchanged_eml.tpl | 20 ------- view/cs/passchanged_eml.tpl | 14 ----- view/cs/smarty3/passchanged_eml.tpl | 15 ----- view/de/passchanged_eml.tpl | 20 ------- view/de/smarty3/passchanged_eml.tpl | 21 ------- view/en/passchanged_eml.tpl | 20 ------- view/en/smarty3/passchanged_eml.tpl | 21 ------- view/eo/passchanged_eml.tpl | 20 ------- view/eo/smarty3/passchanged_eml.tpl | 21 ------- view/es/passchanged_eml.tpl | 19 ------- view/es/smarty3/passchanged_eml.tpl | 20 ------- view/fr/passchanged_eml.tpl | 20 ------- view/fr/smarty3/passchanged_eml.tpl | 21 ------- view/is/passchanged_eml.tpl | 20 ------- view/is/smarty3/passchanged_eml.tpl | 21 ------- view/it/smarty3/passchanged_eml.tpl | 20 ------- view/nb-no/passchanged_eml.tpl | 20 ------- view/nb-no/smarty3/passchanged_eml.tpl | 21 ------- view/nl/passchanged_eml.tpl | 20 ------- view/pl/passchanged_eml.tpl | 20 ------- view/pl/smarty3/passchanged_eml.tpl | 21 ------- view/ro/smarty3/passchanged_eml.tpl | 20 ------- view/sv/passchanged_eml.tpl | 18 ------ view/sv/smarty3/passchanged_eml.tpl | 19 ------- view/zh-cn/passchanged_eml.tpl | 20 ------- view/zh-cn/smarty3/passchanged_eml.tpl | 21 ------- 30 files changed, 64 insertions(+), 566 deletions(-) delete mode 100644 view/ca/passchanged_eml.tpl delete mode 100644 view/ca/smarty3/passchanged_eml.tpl delete mode 100644 view/cs/passchanged_eml.tpl delete mode 100644 view/cs/smarty3/passchanged_eml.tpl delete mode 100644 view/de/passchanged_eml.tpl delete mode 100644 view/de/smarty3/passchanged_eml.tpl delete mode 100644 view/en/passchanged_eml.tpl delete mode 100644 view/en/smarty3/passchanged_eml.tpl delete mode 100644 view/eo/passchanged_eml.tpl delete mode 100644 view/eo/smarty3/passchanged_eml.tpl delete mode 100644 view/es/passchanged_eml.tpl delete mode 100644 view/es/smarty3/passchanged_eml.tpl delete mode 100644 view/fr/passchanged_eml.tpl delete mode 100644 view/fr/smarty3/passchanged_eml.tpl delete mode 100644 view/is/passchanged_eml.tpl delete mode 100644 view/is/smarty3/passchanged_eml.tpl delete mode 100644 view/it/smarty3/passchanged_eml.tpl delete mode 100644 view/nb-no/passchanged_eml.tpl delete mode 100644 view/nb-no/smarty3/passchanged_eml.tpl delete mode 100644 view/nl/passchanged_eml.tpl delete mode 100644 view/pl/passchanged_eml.tpl delete mode 100644 view/pl/smarty3/passchanged_eml.tpl delete mode 100644 view/ro/smarty3/passchanged_eml.tpl delete mode 100644 view/sv/passchanged_eml.tpl delete mode 100644 view/sv/smarty3/passchanged_eml.tpl delete mode 100644 view/zh-cn/passchanged_eml.tpl delete mode 100644 view/zh-cn/smarty3/passchanged_eml.tpl diff --git a/include/Emailer.php b/include/Emailer.php index a5b600e36..2baa27980 100644 --- a/include/Emailer.php +++ b/include/Emailer.php @@ -56,7 +56,7 @@ class Emailer { $messageHeader // message headers ); logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); - logger("return value " . $res, LOGGER_DEBUG); + logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG); } } ?> diff --git a/include/text.php b/include/text.php index 84195b036..00cbc2b59 100644 --- a/include/text.php +++ b/include/text.php @@ -2229,3 +2229,22 @@ function is_a_date_arg($s) { } return false; } + +/** + * remove intentation from a text + */ +function deindent($text, $chr="[\t ]", $count=NULL) { + $text = fix_mce_lf($text); + $lines = explode("\n", $text); + if (is_null($count)) { + $m = array(); + $k=0; while($kget_baseurl(); $resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password; - $preamble = t('Dear %1$s, - A request was recently received at "%2$s" to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. + $preamble = deindent(t(' + Dear %1$s, + A request was recently received at "%2$s" to reset your account + password. In order to confirm this request, please select the verification link + below or paste it into your web browser address bar. -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. + If you did NOT request this change, please DO NOT follow the link + provided and ignore and/or delete this email. -Your password will not be changed unless we can verify that you -issued this request.'); - $body = t('Follow this link to verify your identity: + Your password will not be changed unless we can verify that you + issued this request.')); + $body = deindent(t(' + Follow this link to verify your identity: -%1$s + %1$s -You will then receive a follow-up message containing the new password. + You will then receive a follow-up message containing the new password. + You may change that password from your account settings page after logging in. -You may change that password from your account settings page after logging in. + The login details are as follows: -The login details are as follows: - -Site Location: %2$s -Login Name: %3$s'); + Site Location: %2$s + Login Name: %3$s')); $preamble = sprintf($preamble, $username, $sitename); $body = sprintf($body, $resetlink, $siteurl, $email); @@ -71,7 +72,6 @@ Login Name: %3$s'); 'preamble'=> $preamble, 'body' => $body)); - goaway(z_root()); } @@ -88,9 +88,8 @@ function lostpass_content(&$a) { dbesc($hash) ); if(! count($r)) { - notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL); - goaway(z_root()); - return; + $o = t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."); + return $o; } $uid = $r[0]['uid']; $username = $r[0]['username']; @@ -119,22 +118,34 @@ function lostpass_content(&$a) { info("Your password has been reset." . EOL); + $sitename = $a->config['sitename']; + $siteurl = $a->get_baseurl(); + // $username, $email, $new_password + $preamble = deindent(t(' + Dear %1$s, + Your password has been changed as requested. Please retain this + information for your records (or change your password immediately to + something that you will remember). + ')); + $body = deindent(t(' + Your login details are as follows: - $email_tpl = get_intltext_template("passchanged_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $username, - '$email' => $email, - '$new_password' => $new_password, - '$uid' => $newuid )); + Site Location: %1$s + Login Name: %2$s + Password: %3$s - $subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']); + You may change that password from your account settings page after logging in. + ')); - $res = mail($email, email_header_encode( $subject, 'UTF-8'), $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + $preamble = sprintf($preamble, $username); + $body = sprintf($body, $siteurl, $email, $new_password); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Your password has been changed at %s'),$sitename), + 'preamble'=> $preamble, + 'body' => $body)); return $o; } diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl deleted file mode 100644 index 22e54b8c0..000000000 --- a/view/ca/passchanged_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Apreciat/da $username, - - La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació -(o canvía immediatament la contrasenya amb quelcom que recordis). - - -Les teves dades d'accés son les següents: - -Lloc: $siteurl -Nom: $email -Contrasenya: $new_password - -Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil. - - - $sitename - - diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl deleted file mode 100644 index 43063fc81..000000000 --- a/view/ca/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Apreciat/da {{$username}}, - - La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació -(o canvía immediatament la contrasenya amb quelcom que recordis). - - -Les teves dades d'accés son les següents: - -Lloc: {{$siteurl}} -Nom: {{$email}} -Contrasenya: {{$new_password}} - -Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil. - - - {{$sitename}} - - diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl deleted file mode 100644 index 5447d2e80..000000000 --- a/view/cs/passchanged_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Milý/Milá $username, - Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat). - -Vaše přihlašovací údaje jsou tato: - -Adresa webu: $siteurl -Přihlašovací jméno: $email -Heslo: $new_password - -Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte. - -S pozdravem, - $sitename administrátor diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl deleted file mode 100644 index cfc71356d..000000000 --- a/view/cs/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Milý/Milá {{$username}}, - Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat). - -Vaše přihlašovací údaje jsou tato: - -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} -Heslo: {{$new_password}} - -Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte. - -S pozdravem, - {{$sitename}} administrátor diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl deleted file mode 100644 index dcabbbe49..000000000 --- a/view/de/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Hallo $[username], - Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese -Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort -in etwas, was du dir merken kannst). - - -Deine Login Daten wurden wie folgt geändert: - -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[new_password] - -Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist. - - -Beste Grüße, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl deleted file mode 100644 index 2c4576f0d..000000000 --- a/view/de/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Hallo {{$username}}, - Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese -Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort -in etwas, was du dir merken kannst). - - -Deine Login Daten wurden wie folgt geändert: - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} -Passwort: {{$new_password}} - -Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist. - - -Beste Grüße, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl deleted file mode 100644 index e7cc0e2dc..000000000 --- a/view/en/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Dear $[username], - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). - - -Your login details are as follows: - -Site Location: $[siteurl] -Login Name: $[email] -Password: $[new_password] - -You may change that password from your account settings page after logging in. - - -Sincerely, - $[sitename] Administrator - - diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl deleted file mode 100644 index fb931387b..000000000 --- a/view/en/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Dear {{$username}}, - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). - - -Your login details are as follows: - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$new_password}} - -You may change that password from your account settings page after logging in. - - -Sincerely, - {{$sitename}} Administrator - - diff --git a/view/eo/passchanged_eml.tpl b/view/eo/passchanged_eml.tpl deleted file mode 100644 index ee775d5dd..000000000 --- a/view/eo/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Kara $[username], - Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun -informon (aŭ tuj ŝanĝu vian pasvorton al -iu kiun vi povas memori). - - -Jen viaj legitimaĵoj: - -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[new_password] - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita. - - -Salutoj, - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl deleted file mode 100644 index f348aaf70..000000000 --- a/view/eo/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Kara {{$username}}, - Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun -informon (aŭ tuj ŝanĝu vian pasvorton al -iu kiun vi povas memori). - - -Jen viaj legitimaĵoj: - -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} -Pasvorto:»{{$new_password}} - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita. - - -Salutoj, - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl deleted file mode 100644 index 7959846b7..000000000 --- a/view/es/passchanged_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Estimado/a $username, - - Tu contraseña ha sido modificada como has solicitado. Anota esta información -(o cambia inmediatamente la contraseña con algo que recuerdes). - - -Tus datos de acceso son los siguientes: - -Sitio: $siteurl -Nombre: $email -Contraseña: $new_password - -Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil. - - - $sitename - - diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl deleted file mode 100644 index c3003b2ce..000000000 --- a/view/es/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Estimado/a {{$username}}, - - Tu contraseña ha sido modificada como has solicitado. Anota esta información -(o cambia inmediatamente la contraseña con algo que recuerdes). - - -Tus datos de acceso son los siguientes: - -Sitio: {{$siteurl}} -Nombre: {{$email}} -Contraseña: {{$new_password}} - -Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil. - - - {{$sitename}} - - diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl deleted file mode 100644 index ff518670e..000000000 --- a/view/fr/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Cher/Chère $[username], - Votre mot de passe a été changé comme demandé. Merci de -mémoriser cette information (ou de changer immédiatement pour un -mot de passe que vous retiendrez). - - -Vos identifiants sont comme suit : - -Adresse du site: $[siteurl] -Utilisateur: $[email] -Mot de passe: $[new_password] - -Vous pouvez changer ce mot de passe depuis vos 'Réglages' une fois connecté. - - -Sincèrement, - l'administrateur de $[sitename] - - \ No newline at end of file diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl deleted file mode 100644 index a7a4bd306..000000000 --- a/view/fr/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Cher(e) {{$username}}, - - Votre mot de passe a été modifié comme demandé. Merci de conserver -cette information pour un usage ultérieur (ou bien de changer votre mot de -passe immédiatement en quelque chose dont vous vous souviendrez). - -Vos informations de connexion sont désormais : - -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} -Mot de passe : {{$new_password}} - -Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, -après connexion - -Sincèrement votre, - l'administrateur de {{$sitename}} - - diff --git a/view/is/passchanged_eml.tpl b/view/is/passchanged_eml.tpl deleted file mode 100644 index d2aa68797..000000000 --- a/view/is/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Góðan daginn $[username], - Lykilorð þínu hefur verið breytt einsog umbeðið var. Endilega geyma þessar -upplýsingar (eða skiptu strax um aðgangsorð -yfir í eitthvað sem þú mannst). - - -Innskráningar upplýsingar þínar eru: - -Vefþjónn: $[siteurl] -Notendanafn: $[email] -Aðgangsorð: $[new_password] - -Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig. - - -Bestu kveðjur, - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl deleted file mode 100644 index 8574b8278..000000000 --- a/view/is/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Góðan daginn {{$username}}, - Lykilorð þínu hefur verið breytt einsog umbeðið var. Endilega geyma þessar -upplýsingar (eða skiptu strax um aðgangsorð -yfir í eitthvað sem þú mannst). - - -Innskráningar upplýsingar þínar eru: - -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} -Aðgangsorð: {{$new_password}} - -Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig. - - -Bestu kveðjur, - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl deleted file mode 100644 index fccc0928f..000000000 --- a/view/it/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Ciao {{$username}}, - La tua password è stata cambiata, come hai richiesto. Conserva queste -informazioni (oppure cambia immediatamente la password con -qualcosa che ti è più facile ricordare). - - -I tuoi dati di accesso sono i seguenti: - -Sito:»{{$siteurl}} -Soprannome:»{{$email}} -Password:»{{$new_password}} - -Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso. - - -Saluti, - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/nb-no/passchanged_eml.tpl b/view/nb-no/passchanged_eml.tpl deleted file mode 100644 index 6f153d38c..000000000 --- a/view/nb-no/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Kjære $[username], - Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne -meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til -noe du husker). - - -Dine logg inn-detaljer er som følger: - -Nettsted:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[new_password] - -Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging. - - -Med vennlig hilsen, - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/passchanged_eml.tpl b/view/nb-no/smarty3/passchanged_eml.tpl deleted file mode 100644 index bc9c7e4f5..000000000 --- a/view/nb-no/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Kjære {{$username}}, - Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne -meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til -noe du husker). - - -Dine logg inn-detaljer er som følger: - -Nettsted:»{{$siteurl}} -Brukernavn:»{{$email}} -Passord:»{{$new_password}} - -Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging. - - -Med vennlig hilsen, - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nl/passchanged_eml.tpl b/view/nl/passchanged_eml.tpl deleted file mode 100644 index 463753ce8..000000000 --- a/view/nl/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Beste $[username], - Uw wachtwoord is veranderd op uw verzoek. Onthou dit -wachtwoord goed (of verander het wachtwoord naar een -die u beter kunt onthouden). - - -Uw inloginformatie is als volgt: - -Friendica-site:»$[siteurl] -Inlognaam:$[email] -Wachtwoord:»$[new_password] - -U kunt dit wachtwoord veranderen in uw account-instellingen, nadat u bent ingelogd. - - -Vriendelijke groet, - Beheerder: $[sitename] - - \ No newline at end of file diff --git a/view/pl/passchanged_eml.tpl b/view/pl/passchanged_eml.tpl deleted file mode 100644 index 4ff6a9875..000000000 --- a/view/pl/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Drogi $[username], - Twoje hasło zostało zmienione. Zachowaj tę -Informację dla dokumentacji (lub zmień swoje hasło -na takie, które zapamiętasz). - - -Dane do logowania: - -Strona:»$[siteurl] -Twój login:»$[email] -Twoje nowe hasło:»$[new_password] - -Po zalogowaniu możesz zmienić swoje hasło w ustawieniach konta - - -Z poważaniem, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/passchanged_eml.tpl b/view/pl/smarty3/passchanged_eml.tpl deleted file mode 100644 index aa3163c60..000000000 --- a/view/pl/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Drogi {{$username}}, - Twoje hasło zostało zmienione. Zachowaj tę -Informację dla dokumentacji (lub zmień swoje hasło -na takie, które zapamiętasz). - - -Dane do logowania: - -Strona:»{{$siteurl}} -Twój login:»{{$email}} -Twoje nowe hasło:»{{$new_password}} - -Po zalogowaniu możesz zmienić swoje hasło w ustawieniach konta - - -Z poważaniem, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/passchanged_eml.tpl b/view/ro/smarty3/passchanged_eml.tpl deleted file mode 100644 index 5b35f3f2c..000000000 --- a/view/ro/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Dragă $[username], - Parola dvs. a fost schimbată așa cum a solicitat. Vă rugăm să păstrați aceste -Informații pentru evidența dvs. (sau schimbaţi imediat parola -cu ceva care iti vei reaminti). - - -Detaliile dvs. de login sunt următoarele ; - -Locaţie Site»$[siteurl] -Login Name: $[email] -Parolă:»$[new_password] - -Puteți schimba această parolă de la pagina setări cont după logare. - - -Cu stimă, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl deleted file mode 100644 index 590462468..000000000 --- a/view/sv/passchanged_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -$username, - -Lösenordet har ändrats enligt din begäran. Behåll den här -informationen om den skulle behövas i framtiden. (eller ändra lösenord -på en gång till något som du kommer ihåg). - - -Här är dina inloggningsuppgifter: - -Webbplats: $siteurl -Användarnamn: $email -Lösenord: $new_password - -När du loggat in kan du byta lösenord bland inställningarna. - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl deleted file mode 100644 index 8b724f7fc..000000000 --- a/view/sv/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -{{$username}}, - -Lösenordet har ändrats enligt din begäran. Behåll den här -informationen om den skulle behövas i framtiden. (eller ändra lösenord -på en gång till något som du kommer ihåg). - - -Här är dina inloggningsuppgifter: - -Webbplats: {{$siteurl}} -Användarnamn: {{$email}} -Lösenord: {{$new_password}} - -När du loggat in kan du byta lösenord bland inställningarna. - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/passchanged_eml.tpl b/view/zh-cn/passchanged_eml.tpl deleted file mode 100644 index 1c6e7655b..000000000 --- a/view/zh-cn/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -尊敬的$[username]。 - 您的随您要求密码变化了。请保持这 -信息为您的备案(或立即变化您的密码成 -什么容易记住)。 - - -您的登记信息是： - -网站位置: $[siteurl] -登记名: $[email] -密码: $[new_password] - -您会变化这个密码在您的账户设置页登记后。 - - -谨上， - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/passchanged_eml.tpl b/view/zh-cn/smarty3/passchanged_eml.tpl deleted file mode 100644 index 321f5eef2..000000000 --- a/view/zh-cn/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -尊敬的{{$username}}。 - 您的随您要求密码变化了。请保持这 -信息为您的备案(或立即变化您的密码成 -什么容易记住)。 - - -您的登记信息是： - -网站位置: {{$siteurl}} -登记名: {{$email}} -密码: {{$new_password}} - -您会变化这个密码在您的账户设置页登记后。 - - -谨上， - {{$sitename}}行政人员 - - \ No newline at end of file From 9368c7e5104e217d0b9983c9af9daad86c182769 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:20:56 +0200 Subject: [PATCH 07/14] html mail template add img tag only if source_photo is defined --- view/templates/email_notify_html.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/templates/email_notify_html.tpl b/view/templates/email_notify_html.tpl index 4eccff63f..94fac7447 100644 --- a/view/templates/email_notify_html.tpl +++ b/view/templates/email_notify_html.tpl @@ -15,8 +15,10 @@ {{if $content_allowed}} + {{if $source_photo}} {{$source_name}} + {{/if}} {{$title}} {{$htmlversion}} {{/if}} From fe02619114e30198e1360e41b4c7cd385c1ed8ba Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:31:42 +0200 Subject: [PATCH 08/14] fix indentation --- mod/admin.php | 133 +++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 24069c5d9..5da07b33e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -419,9 +419,9 @@ function admin_page_site_post(&$a){ set_config('system','banner', $banner); } if ($info=="") { - del_config('config','info'); + del_config('config','info'); } else { - set_config('config','info',$info); + set_config('config','info',$info); } set_config('system','language', $language); set_config('system','theme', $theme); @@ -429,12 +429,12 @@ function admin_page_site_post(&$a){ del_config('system','mobile-theme'); } else { set_config('system','mobile-theme', $theme_mobile); - } - if ( $singleuser === '---' ) { - del_config('system','singleuser'); - } else { - set_config('system','singleuser', $singleuser); - } + } + if ( $singleuser === '---' ) { + del_config('system','singleuser'); + } else { + set_config('system','singleuser', $singleuser); + } set_config('system','maximagesize', $maximagesize); set_config('system','max_image_length', $maximagelength); set_config('system','jpeg_quality', $jpegimagequality); @@ -473,7 +473,7 @@ function admin_page_site_post(&$a){ set_config('system','curl_timeout', $timeout); set_config('system','dfrn_only', $dfrn_only); set_config('system','ostatus_disabled', $ostatus_disabled); - set_config('system','ostatus_poll_interval', $ostatus_poll_interval); + set_config('system','ostatus_poll_interval', $ostatus_poll_interval); set_config('system','diaspora_enabled', $diaspora_enabled); set_config('config','private_addons', $private_addons); @@ -524,32 +524,32 @@ function admin_page_site(&$a) { foreach($files as $file) { $f = basename($file); $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - if (file_exists($file . '/mobile')) { - $theme_choices_mobile[$f] = $theme_name; - } + if (file_exists($file . '/mobile')) { + $theme_choices_mobile[$f] = $theme_name; + } else { - $theme_choices[$f] = $theme_name; + $theme_choices[$f] = $theme_name; } } - } + } - /* OStatus conversation poll choices */ - $ostatus_poll_choices = array( + /* OStatus conversation poll choices */ + $ostatus_poll_choices = array( "-2" => t("Never"), "-1" => t("At post arrival"), "0" => t("Frequently"), "60" => t("Hourly"), "720" => t("Twice daily"), "1440" => t("Daily") - ); + ); - /* get user names to make the install a personal install of X */ - $user_names = array(); - $user_names['---'] = t('Multi user instance'); - $users = q("SELECT username, nickname FROM `user`"); - foreach ($users as $user) { - $user_names[$user['nickname']] = $user['username']; - } + /* get user names to make the install a personal install of X */ + $user_names = array(); + $user_names['---'] = t('Multi user instance'); + $users = q("SELECT username, nickname FROM `user`"); + foreach ($users as $user) { + $user_names[$user['nickname']] = $user['username']; + } /* Banner */ $banner = get_config('system','banner'); @@ -626,9 +626,9 @@ function admin_page_site(&$a) { '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")), - '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), '$ostatus_poll_interval' => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices), - '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), + '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), @@ -651,7 +651,7 @@ function admin_page_site(&$a) { '$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."), '$enable_noscrape'=> array('enable_noscrape', t("Enable noscrape"), get_config('system','enable_noscrape'), t("The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping.")), - '$form_security_token' => get_form_security_token("admin_site") + '$form_security_token' => get_form_security_token("admin_site") )); @@ -744,39 +744,40 @@ function admin_page_dbsync(&$a) { function admin_page_users_post(&$a){ $pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() ); $users = ( x($_POST, 'user') ? $_POST['user'] : Array() ); - $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); - $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); - $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); + $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); + $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); - check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); + check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); - if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { - require_once('include/user.php'); - require_once('include/email.php'); - $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) ); - if(! $result['success']) { - notice($result['message']); - return; - } - $nu = $result['user']; - $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $nu['username'], - '$email' => $nu['email'], - '$password' => $result['password'], - '$uid' => $nu['uid'] )); - - $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - if ($res) { - info( t('Registration successful. Email send to user').EOL ); - } - } + if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { + require_once('include/user.php'); + require_once('include/email.php'); + $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) ); + if(! $result['success']) { + notice($result['message']); + return; + } + $nu = $result['user']; + + $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); + $email_tpl = replace_macros($email_tpl, array( + '$sitename' => $a->config['sitename'], + '$siteurl' => $a->get_baseurl(), + '$username' => $nu['username'], + '$email' => $nu['email'], + '$password' => $result['password'], + '$uid' => $nu['uid'] )); + + $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), + $email_tpl, + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + if ($res) { + info( t('Registration successful. Email send to user').EOL ); + } + } if (x($_POST,'page_users_block')){ foreach($users as $uid){ @@ -825,7 +826,7 @@ function admin_page_users(&$a){ } switch($a->argv[2]){ case "delete":{ - check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); + check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); // delete user require_once("include/Contact.php"); user_remove($uid); @@ -833,7 +834,7 @@ function admin_page_users(&$a){ notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL); }; break; case "block":{ - check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); + check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); q("UPDATE `user` SET `blocked`=%d WHERE `uid`=%s", intval( 1-$user[0]['blocked'] ), intval( $uid ) @@ -889,7 +890,7 @@ function admin_page_users(&$a){ t('Normal Account'), t('Soapbox Account'), t('Community/Celebrity Account'), - t('Automatic Friend Account') + t('Automatic Friend Account') ); $e['page-flags'] = $accounts[$e['page-flags']]; $e['register_date'] = relative_date($e['register_date']); @@ -1094,7 +1095,7 @@ function admin_page_plugins(&$a){ '$baseurl' => $a->get_baseurl(true), '$function' => 'plugins', '$plugins' => $plugins, - '$form_security_token' => get_form_security_token("admin_themes"), + '$form_security_token' => get_form_security_token("admin_themes"), )); } @@ -1296,7 +1297,7 @@ function admin_page_themes(&$a){ '$plugins' => $xthemes, '$experimental' => t('[Experimental]'), '$unsupported' => t('[Unsupported]'), - '$form_security_token' => get_form_security_token("admin_themes"), + '$form_security_token' => get_form_security_token("admin_themes"), )); } @@ -1309,7 +1310,7 @@ function admin_page_themes(&$a){ function admin_page_logs_post(&$a) { if (x($_POST,"page_logs")) { - check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); + check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); $logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : ''); $debugging = ((x($_POST,'debugging')) ? true : false); @@ -1348,7 +1349,7 @@ function admin_page_logs(&$a){ $data = ''; if(!file_exists($f)) { - $data = t("Error trying to open $f log file.\r\n
Check to see if file $f exist and is + $data = t("Error trying to open $f log file.\r\n
Check to see if file $f exist and is readable."); } else { @@ -1388,7 +1389,7 @@ readable."); '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), - '$form_security_token' => get_form_security_token("admin_logs"), + '$form_security_token' => get_form_security_token("admin_logs"), )); } From 803854738b9bf514d11f6e8c7c0ac84aad874ae6 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:48:23 +0200 Subject: [PATCH 09/14] another massacre of templates --- mod/admin.php | 53 ++++++++++++++++------- view/cs/smarty3/register_adminadd_eml.tpl | 32 -------------- view/de/smarty3/register_adminadd_eml.tpl | 32 -------------- view/en/register_adminadd_eml.tpl | 32 -------------- view/en/smarty3/register_adminadd_eml.tpl | 32 -------------- view/fr/smarty3/register_adminadd_eml.tpl | 32 -------------- view/it/smarty3/register_adminadd_eml.tpl | 32 -------------- view/ro/smarty3/register_adminadd_eml.tpl | 32 -------------- 8 files changed, 37 insertions(+), 240 deletions(-) delete mode 100644 view/cs/smarty3/register_adminadd_eml.tpl delete mode 100644 view/de/smarty3/register_adminadd_eml.tpl delete mode 100644 view/en/register_adminadd_eml.tpl delete mode 100644 view/en/smarty3/register_adminadd_eml.tpl delete mode 100644 view/fr/smarty3/register_adminadd_eml.tpl delete mode 100644 view/it/smarty3/register_adminadd_eml.tpl delete mode 100644 view/ro/smarty3/register_adminadd_eml.tpl diff --git a/mod/admin.php b/mod/admin.php index 5da07b33e..db3c8b189 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -759,24 +759,45 @@ function admin_page_users_post(&$a){ return; } $nu = $result['user']; + $preamble = deindent(t(' + Dear %1$s, + the administrator of %2$s has set up an account for you.'); + $body = deindent(t(' + The login details are as follows: - $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $nu['username'], - '$email' => $nu['email'], - '$password' => $result['password'], - '$uid' => $nu['uid'] )); + Site Location: %1$s + Login Name: %2$s + Password: %3$s + + You may change your password from your account "Settings" page after logging + in. + + Please take a few moments to review the other account settings on that page. + + 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 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 + you to make some new and interesting friends. + + Thank you and welcome to %4$s.'); + + $preamble = sprintf($preamble, $nu['username'], $a->config['sitename']); + $body = sprintf($body, $a->get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Registration details for %s'), $a->config['sitename']), + 'preamble'=> $preamble, + 'body' => $body)); - $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - if ($res) { - info( t('Registration successful. Email send to user').EOL ); - } } if (x($_POST,'page_users_block')){ diff --git a/view/cs/smarty3/register_adminadd_eml.tpl b/view/cs/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 63efc7151..000000000 --- a/view/cs/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Drahý {{$username}}, - administrátor webu {{$sitename}} pro Vás vytvořil uživatelský účet. - -Vaše přihlašovací údaje jsou tyto: - - -Adresa webu: {{$siteurl}} -Uživatelské jméno: {{$email}} -Heslo: {{$password}} - -Vaše heslo si můžete po přihlášení změnit na stránce -. - -Prosím věnujte chvíli k revizi ostatních nastavení svého účtu. - -Můžete také přidat některé základní informace do Vašeho defaultního profilu - (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. - -Doporučujeme nastavit celé jméno, přidat profilové foto -, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a - zemi, ve které žijete. Nemusíte zadávat víc -informací. - -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto -položek můžete získat nové a zajímavé přátele. - - -Díky a vítejte na {{$sitename}}. - -S pozdravem, - {{$sitename}} administrátor \ No newline at end of file diff --git a/view/de/smarty3/register_adminadd_eml.tpl b/view/de/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index dbe1412b9..000000000 --- a/view/de/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Hallo {{$username}}, - der Administrator von {{$sitename}} hat einen Account für dich eingerichtet. - -Hier die Login Details: - - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} -Passwort: {{$password}} - -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf {{$sitename}}. - -Beste Grüße, - {{$sitename}} Administrator diff --git a/view/en/register_adminadd_eml.tpl b/view/en/register_adminadd_eml.tpl deleted file mode 100644 index 6d324809c..000000000 --- a/view/en/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dear {{$username}}, - the administrator of {{$sitename}} has set up an account for you. - -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -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 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 -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator diff --git a/view/en/smarty3/register_adminadd_eml.tpl b/view/en/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 6d324809c..000000000 --- a/view/en/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dear {{$username}}, - the administrator of {{$sitename}} has set up an account for you. - -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -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 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 -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator diff --git a/view/fr/smarty3/register_adminadd_eml.tpl b/view/fr/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index c12264087..000000000 --- a/view/fr/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Chère, Cher {{$username}}, - l'administrateur de {{$sitename}} vous à créé un compte. - -Les détails de connexion sont les suivants : - - -Emplacement du site : {{$siteurl}} -Nom de connexion : {{$email}} -Mot de passe : {{$password}} - -Vous pouvez modifier votre mot de passe à la page des "Paramètres" de votre compte, une fois -connecté. - -Veuillez prendre le temps d'examiner les autres paramètres de votre compte sur cette page. - -Vous pouvez aussi ajouter quelques informatiques de base à votre profil par défaut -(sur la page "Profils") pour que d'autres personnes vous trouvent facilement. - -Nous vous recommandons d'indiquer votre nom complet, d'ajouter une photo pour votre profil, -d'ajouter quelques "mots-clés" (très efficace pour se faire de nouveaux amis) - et -peut-être aussi votre pays de résidence ; sauf si vous souhaitez pas être -aussi spécifique. - -Nous respectons entièrement votre vie privée, et aucun de ces éléments n'est nécessaire. -Si vous êtes nouveau et ne connaissez personne, ils peuvent vous -aider à vous faire de nouveaux et interessants amis. - - -Merci, et bienvenue sur {{$sitename}}. - -Sincèrement votre, - L'administrateur de {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_adminadd_eml.tpl b/view/it/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 20a9cb176..000000000 --- a/view/it/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Ciao {{$username}}, - l'amministratore di {{{{$sitename}}}} ha creato un account per te. - -I dettagli di accesso sono i seguenti - - -Sito:»{{$siteurl}} -Soprannome:»{{$email}} -Password:»{{$password}} - -Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso - - -Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina. - -Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo -(nella pagina "Profilo") per rendere più facile trovarti alle altre persone. - -Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto, -di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e -magari il paese dove vivi; se non vuoi essere più dettagliato -di così. - -Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. -Se non ancora non conosci nessuno qui, posso essere d'aiuto -per farti nuovi e interessanti amici. - - -Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} - -Saluti, - l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/ro/smarty3/register_adminadd_eml.tpl b/view/ro/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index b32f223a0..000000000 --- a/view/ro/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dragă {{$username}}, - administratorul {{$sitename}} v-a configurat un cont pentru dvs. - -Detaliile de autentificare sunt următoarele: - - -Locație Site: {{$siteurl}} -Nume Autentificare:⇥{{$email}} -Parolă:⇥{{$password}} - -Vă puteți schimba parola din pagina contului dvs. de "Configurări", după autentificare -în. - -Vă rugăm să acordați câteva momente pentru revizuirea altor configurări de cont de pe această pagină. - -Puteți de asemenea să adăugați câteva informații generale profilului dvs. implicit -(pe "Profile" pagina), astfel încât alte persoane să vă găsească uşor. - -Vă recomandăm să vă specificați numele complet, adăugând o fotografie de profil, -adăugând profilului câteva "cuvinte cheie" (foarte utile pentru a vă face noi prieteni) - și -poate în ce țara locuiți; dacă nu doriți să dați mai multe detalii -decât acestea. - -Respectăm pe deplin dreptul la intimitate, și nici unul dintre aceste elemente nu sunt necesar. -Dacă sunteți nou si nu ştiţi pe nimeni pe aici, ele pot ajuta -să vă faceți niște prieteni noi și interesanţi. - - -Vă multumim și vă urăm bun venit la {{$sitename}}. - -Cu stimă, - Administratorul {{$sitename}} \ No newline at end of file From 5997fb19ee93c21092ddba9ba7c5cfa34f4272d5 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 12:29:13 +0200 Subject: [PATCH 10/14] More template gore! --- include/user.php | 79 +++++++++++++++++++----- mod/admin.php | 8 ++- mod/lostpass.php | 1 + mod/register.php | 25 +++----- mod/regmod.php | 23 +++---- view/ca/register_open_eml.tpl | 22 ------- view/ca/smarty3/register_open_eml.tpl | 23 ------- view/cs/register_open_eml.tpl | 23 ------- view/cs/smarty3/register_open_eml.tpl | 24 ------- view/de/register_open_eml.tpl | 34 ---------- view/de/smarty3/register_open_eml.tpl | 35 ----------- view/en/register_open_eml.tpl | 34 ---------- view/en/smarty3/register_open_eml.tpl | 35 ----------- view/eo/register_open_eml.tpl | 34 ---------- view/eo/smarty3/register_open_eml.tpl | 35 ----------- view/es/register_open_eml.tpl | 21 ------- view/es/smarty3/register_open_eml.tpl | 22 ------- view/fr/register_open_eml.tpl | 34 ---------- view/fr/smarty3/register_open_eml.tpl | 23 ------- view/is/register_open_eml.tpl | 34 ---------- view/is/smarty3/register_open_eml.tpl | 35 ----------- view/it/smarty3/register_open_eml.tpl | 34 ---------- view/nb-no/register_open_eml.tpl | 34 ---------- view/nb-no/smarty3/register_open_eml.tpl | 35 ----------- view/nl/register_open_eml.tpl | 34 ---------- view/pl/register_open_eml.tpl | 36 ----------- view/pl/smarty3/register_open_eml.tpl | 37 ----------- view/ro/smarty3/register_open_eml.tpl | 34 ---------- view/sv/register_open_eml.tpl | 17 ----- view/sv/smarty3/register_open_eml.tpl | 18 ------ view/zh-cn/register_open_eml.tpl | 34 ---------- view/zh-cn/smarty3/register_open_eml.tpl | 35 ----------- 32 files changed, 86 insertions(+), 866 deletions(-) delete mode 100644 view/ca/register_open_eml.tpl delete mode 100644 view/ca/smarty3/register_open_eml.tpl delete mode 100644 view/cs/register_open_eml.tpl delete mode 100644 view/cs/smarty3/register_open_eml.tpl delete mode 100644 view/de/register_open_eml.tpl delete mode 100644 view/de/smarty3/register_open_eml.tpl delete mode 100644 view/en/register_open_eml.tpl delete mode 100644 view/en/smarty3/register_open_eml.tpl delete mode 100644 view/eo/register_open_eml.tpl delete mode 100644 view/eo/smarty3/register_open_eml.tpl delete mode 100644 view/es/register_open_eml.tpl delete mode 100644 view/es/smarty3/register_open_eml.tpl delete mode 100644 view/fr/register_open_eml.tpl delete mode 100644 view/fr/smarty3/register_open_eml.tpl delete mode 100644 view/is/register_open_eml.tpl delete mode 100644 view/is/smarty3/register_open_eml.tpl delete mode 100644 view/it/smarty3/register_open_eml.tpl delete mode 100644 view/nb-no/register_open_eml.tpl delete mode 100644 view/nb-no/smarty3/register_open_eml.tpl delete mode 100644 view/nl/register_open_eml.tpl delete mode 100644 view/pl/register_open_eml.tpl delete mode 100644 view/pl/smarty3/register_open_eml.tpl delete mode 100644 view/ro/smarty3/register_open_eml.tpl delete mode 100644 view/sv/register_open_eml.tpl delete mode 100644 view/sv/smarty3/register_open_eml.tpl delete mode 100644 view/zh-cn/register_open_eml.tpl delete mode 100644 view/zh-cn/smarty3/register_open_eml.tpl diff --git a/include/user.php b/include/user.php index 8528bfbfa..bf29daf1a 100644 --- a/include/user.php +++ b/include/user.php @@ -6,6 +6,7 @@ require_once('include/plugin.php'); require_once('include/text.php'); require_once('include/pgettext.php'); require_once('include/datetime.php'); +require_once('include/enotify.php'); function create_user($arr) { @@ -44,7 +45,7 @@ function create_user($arr) { $result['message'] .= t('Invitation could not be verified.') . EOL; return $result; } - } + } if((! x($username)) || (! x($email)) || (! x($nickname))) { if($openid_url) { @@ -57,17 +58,17 @@ function create_user($arr) { require_once('library/openid.php'); $openid = new LightOpenID; $openid->identity = $openid_url; - $openid->returnUrl = $a->get_baseurl() . '/openid'; + $openid->returnUrl = $a->get_baseurl() . '/openid'; $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson'); $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); - try { + try { $authurl = $openid->authUrl(); } catch (Exception $e){ - $result['message'] .= t("We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."). EOL . EOL . t("The error message was:") . $e->getMessage() . EOL; + $result['message'] .= t("We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."). EOL . EOL . t("The error message was:") . $e->getMessage() . EOL; return $result; } goaway($authurl); - // NOTREACHED + // NOTREACHED } notice( t('Please enter the required information.') . EOL ); @@ -90,12 +91,12 @@ function create_user($arr) { // I don't really like having this rule, but it cuts down // on the number of auto-registrations by Russian spammers - + // Using preg_match was completely unreliable, due to mixed UTF-8 regex support // $no_utf = get_config('system','no_utf'); - // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); + // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); - // So now we are just looking for a space in the full name. + // So now we are just looking for a space in the full name. $loose_reg = get_config('system','no_regfullname'); if(! $loose_reg) { @@ -182,7 +183,7 @@ function create_user($arr) { * will take several minutes each to process. * */ - + $sres = new_keypair(512); $sprvkey = $sres['prvkey']; $spubkey = $sres['pubkey']; @@ -207,7 +208,7 @@ function create_user($arr) { ); if($r) { - $r = q("SELECT * FROM `user` + $r = q("SELECT * FROM `user` WHERE `username` = '%s' AND `password` = '%s' LIMIT 1", dbesc($username), dbesc($new_password_encoded) @@ -220,10 +221,10 @@ function create_user($arr) { else { $result['message'] .= t('An error occurred during registration. Please try again.') . EOL ; return $result; - } + } /** - * if somebody clicked submit twice very quickly, they could end up with two accounts + * if somebody clicked submit twice very quickly, they could end up with two accounts * due to race condition. Remove this one. */ @@ -281,8 +282,8 @@ function create_user($arr) { dbesc(datetime_convert()) ); - // Create a group with no members. This allows somebody to use it - // right away as a default group for new contacts. + // Create a group with no members. This allows somebody to use it + // right away as a default group for new contacts. require_once('include/group.php'); group_add($newuid, t('Friends')); @@ -323,7 +324,7 @@ function create_user($arr) { // guess mimetype from headers or filename $type = guess_image_type($photo,true); - + $img = new Photo($img_str, $type); if($img->is_valid()) { @@ -365,3 +366,51 @@ function create_user($arr) { return $result; } + + +/* + * send registration confirmation. + * It's here as a function because the mail is sent + * from different parts + */ +function send_register_open_eml($email, $sitename, $siteurl, $username, $password){ + $preamble = deindent(t(' + Dear %1$s, + Thank you for registering at %2$s. Your account has been created. + ')); + $body = deindent(t(' + The login details are as follows: + Site Location: %3$s + Login Name: %1$s + Password: %5$ + + You may change your password from your account "Settings" page after logging + in. + + Please take a few moments to review the other account settings on that page. + + 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 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 + you to make some new and interesting friends. + + + Thank you and welcome to %2$s.')); + + $preamble = sprintf($preamble, $username, $sitename); + $body = sprintf($body, $email, $sitename, $siteurl, $username, $password); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Registration details for %s'), $sitename), + 'preamble'=> $preamble, + 'body' => $body)); +} diff --git a/mod/admin.php b/mod/admin.php index db3c8b189..6064a04ff 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -4,6 +4,8 @@ * Friendica admin */ require_once("include/remoteupdate.php"); +require_once("include/enotify.php"); +require_once("include/text.php"); /** @@ -752,7 +754,7 @@ function admin_page_users_post(&$a){ if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { require_once('include/user.php'); - require_once('include/email.php'); + $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) ); if(! $result['success']) { notice($result['message']); @@ -761,7 +763,7 @@ function admin_page_users_post(&$a){ $nu = $result['user']; $preamble = deindent(t(' Dear %1$s, - the administrator of %2$s has set up an account for you.'); + the administrator of %2$s has set up an account for you.')); $body = deindent(t(' The login details are as follows: @@ -786,7 +788,7 @@ function admin_page_users_post(&$a){ If you are new and do not know anybody here, they may help you to make some new and interesting friends. - Thank you and welcome to %4$s.'); + Thank you and welcome to %4$s.')); $preamble = sprintf($preamble, $nu['username'], $a->config['sitename']); $body = sprintf($body, $a->get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']); diff --git a/mod/lostpass.php b/mod/lostpass.php index f955c020e..938d1cbb0 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -2,6 +2,7 @@ require_once('include/email.php'); require_once('include/enotify.php'); +require_once('include/text.php'); function lostpass_post(&$a) { diff --git a/mod/register.php b/mod/register.php index 5e011cb9a..b9a9808b9 100644 --- a/mod/register.php +++ b/mod/register.php @@ -2,6 +2,7 @@ require_once('include/email.php'); require_once('include/bbcode.php'); +require_once('include/user.php'); if(! function_exists('register_post')) { function register_post(&$a) { @@ -45,7 +46,7 @@ function register_post(&$a) { $verified = 0; break; } - + require_once('include/user.php'); @@ -62,7 +63,7 @@ function register_post(&$a) { } $user = $result['user']; - + if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { $url = $a->get_baseurl() . '/profile/' . $user['nickname']; proc_run('php',"include/directory.php","$url"); @@ -80,20 +81,12 @@ function register_post(&$a) { set_pconfig($user['uid'],'system','invites_remaining',$num_invites); } - $email_tpl = get_intltext_template("register_open_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user['username'], - '$email' => $user['email'], - '$password' => $result['password'], - '$uid' => $user['uid'] )); - - $res = mail($user['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + send_register_open_eml( + $user['email'], + $a->config['sitename'], + $a->get_baseurl(), + $user['username'], + $result['password']); if($res) { diff --git a/mod/regmod.php b/mod/regmod.php index 96708eeaa..05f33ab11 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -1,6 +1,6 @@ $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user[0]['username'], - '$email' => $user[0]['email'], - '$password' => $register[0]['password'], - '$uid' => $user[0]['uid'] - )); - - $res = mail($user[0]['email'], email_header_encode( sprintf(t('Registration details for %s'), $a->config['sitename']), 'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + send_register_open_eml( + $user[0]['email'], + $a->config['sitename'], + $a->get_baseurl(), + $user[0]['username'], + $register[0]['password']); pop_lang(); diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl deleted file mode 100644 index 0170c98e3..000000000 --- a/view/ca/register_open_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Apreciat/da $username, - - Gràcies per registrar-te en $sitename. El teu compte ha estat creat. - - -Les dades d'accés són les següents: - - -Lloc: $siteurl -Nom: $email -Contrasenya: $password - - -Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració". - -Pren un moment per revisar les altres configuracions del compte en aquesta pàgina. - - -Gràcies i benvingut/da $sitename. - - diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl deleted file mode 100644 index ba56d6ae8..000000000 --- a/view/ca/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Apreciat/da {{$username}}, - - Gràcies per registrar-te en {{$sitename}}. El teu compte ha estat creat. - - -Les dades d'accés són les següents: - - -Lloc: {{$siteurl}} -Nom: {{$email}} -Contrasenya: {{$password}} - - -Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració". - -Pren un moment per revisar les altres configuracions del compte en aquesta pàgina. - - -Gràcies i benvingut/da {{$sitename}}. - - diff --git a/view/cs/register_open_eml.tpl b/view/cs/register_open_eml.tpl deleted file mode 100644 index f8e42678b..000000000 --- a/view/cs/register_open_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ -Milý/milá $username, - Díky za registraci na $sitename. Váš účet byl vytvořen. -Vaše přihlašovací údaje jsou tato: - -Adresa webu: $siteurl -Přihlašovací jméno: $email -Heslo: $password - -Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte. - -Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce. - -Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. - -Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací. - -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele. - -Díky a vítejte na $sitename. - -S pozdravem, - $sitename administrátor diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl deleted file mode 100644 index df9bcf53c..000000000 --- a/view/cs/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - -Milý/milá {{$username}}, - Díky za registraci na {{$sitename}}. Váš účet byl vytvořen. -Vaše přihlašovací údaje jsou tato: - -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} -Heslo: {{$password}} - -Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte. - -Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce. - -Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. - -Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací. - -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele. - -Díky a vítejte na {{$sitename}}. - -S pozdravem, - {{$sitename}} administrátor diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl deleted file mode 100644 index 4392e8da2..000000000 --- a/view/de/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Hallo $[username], - Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. -Hier die Login Details: - - -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[password] - -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf $[sitename]. - -Beste Grüße, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl deleted file mode 100644 index acd286935..000000000 --- a/view/de/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Hallo {{$username}}, - Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. -Hier die Login Details: - - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} -Passwort: {{$password}} - -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf {{$sitename}}. - -Beste Grüße, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl deleted file mode 100644 index c55ac1e7e..000000000 --- a/view/en/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Dear $[username], - Thank you for registering at $[sitename]. Your account has been created. -The login details are as follows: - - -Site Location: $[siteurl] -Login Name: $[email] -Password: $[password] - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -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 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 -you to make some new and interesting friends. - - -Thank you and welcome to $[sitename]. - -Sincerely, - $[sitename] Administrator - - diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl deleted file mode 100644 index 63aca9334..000000000 --- a/view/en/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Dear {{$username}}, - Thank you for registering at {{$sitename}}. Your account has been created. -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -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 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 -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator - - diff --git a/view/eo/register_open_eml.tpl b/view/eo/register_open_eml.tpl deleted file mode 100644 index 735ea9a4b..000000000 --- a/view/eo/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Kara $[username], - Dankon pro via registrado ĉe $[sitename]. Vian konton estas kreita. -Jen viaj legitimaĵoj: - - -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[password] - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas -ensalutita. - -Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn. - -Eble vi volas aldoni kelkajn bazajn informojn al via profilo -(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj. - -Ni rekomendas agordi vian plenan noman, aldoni profilbildon, -kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj -eble en kiu lando vi loĝas, se vi ne volas pli specifa -ol tio. - -Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. -Se vi novas kaj ne konas iun ĉi tie, ili eble helpas -vin trovi novajn kaj interesajn amikojn. - - -Dankon kaj bonvenon ĉe $[sitename]. - -Salutoj, - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/register_open_eml.tpl b/view/eo/smarty3/register_open_eml.tpl deleted file mode 100644 index b2cabc68c..000000000 --- a/view/eo/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Kara {{$username}}, - Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. -Jen viaj legitimaĵoj: - - -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} -Pasvorto:»{{$password}} - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas -ensalutita. - -Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn. - -Eble vi volas aldoni kelkajn bazajn informojn al via profilo -(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj. - -Ni rekomendas agordi vian plenan noman, aldoni profilbildon, -kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj -eble en kiu lando vi loĝas, se vi ne volas pli specifa -ol tio. - -Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. -Se vi novas kaj ne konas iun ĉi tie, ili eble helpas -vin trovi novajn kaj interesajn amikojn. - - -Dankon kaj bonvenon ĉe {{$sitename}}. - -Salutoj, - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl deleted file mode 100644 index 7c7a90b40..000000000 --- a/view/es/register_open_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -Estimado/a $username, - - Gracias por registrarte en $sitename. Tu cuenta ha sido creada. - - -Los datos de acceso son los siguientes: - -Sitio: $siteurl -Nombre: $email -Contraseña: $password - - -Después de acceder puedes cambiar tu contraseña en la página de "Configuración". - -Toma un momento para revisar las otras configuraciones de la cuenta en esa página. - - -Gracias y bienvenido/a $sitename. - - diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl deleted file mode 100644 index 0d0cc5ae0..000000000 --- a/view/es/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - - -Estimado/a {{$username}}, - - Gracias por registrarte en {{$sitename}}. Tu cuenta ha sido creada. - - -Los datos de acceso son los siguientes: - -Sitio: {{$siteurl}} -Nombre: {{$email}} -Contraseña: {{$password}} - - -Después de acceder puedes cambiar tu contraseña en la página de "Configuración". - -Toma un momento para revisar las otras configuraciones de la cuenta en esa página. - - -Gracias y bienvenido/a {{$sitename}}. - - diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl deleted file mode 100644 index 427ad561a..000000000 --- a/view/fr/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Cher $[username], - Merci de vous être inscrit sur $[sitename]. Votre compte est bien créé. -Vos informations de connexion sont comme suit : - - -Adresse du site: $[siteurl] -Utilisateur: $[email] -Mot de passe: $[password] - -Vous pouvez changer votre mot de passe depuis la page "Réglages" une fois -connecté. - -Merci de prender quelques instants pour vérifier les autres réglages de cette page. - -Vous pouvez aussi ajouter quelques informatiques de base à votre profil par défaut -(sur la page "Profils") pour que les autres membres vous trouvent facilement. - -Nous vous recommandons d'indiquer un nom complet, d'ajouter une photo -de profil, quelques "mots-clés" (très efficace pour rencontrer des gens) - et -peut-être aussi votre pays de résidence ; sauf si vous souhaitez être plus -précis, bien sûr. - -Nous avons le plus grand respect pour votre vie privée, et aucun de ces éléments n'est nécessaire. -Si vous êtes nouveau et ne connaissez personne, ils peuvent cependant vous -aider à vous faire quelques nouveaux et intéressants contacts. - - -Merci, et bienvenue sur $[sitename]. - -Sincèrement votre, - l'administrateur de $[sitename] - - \ No newline at end of file diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl deleted file mode 100644 index 3e8121354..000000000 --- a/view/fr/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Cher(e) {{$username}}, - - Merci de votre inscription à {{$sitename}}. Votre compte a été créé. -Les informations de connexion sont les suivantes : - -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} -Mot de passe : {{$password}} - -Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte, -après connexion. - -Merci de prendre quelques minutes pour découvrir les autres réglages disponibles -sur cette page. - -Merci, et bienvenue sur {{$sitename}}. - -Sincèrement votre, - l'administrateur de {{$sitename}} - - diff --git a/view/is/register_open_eml.tpl b/view/is/register_open_eml.tpl deleted file mode 100644 index fd564a142..000000000 --- a/view/is/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Góðan daginn $[username], - Takk fyrir að skrá þig á $[sitename]. Notandinn þinn hefur verið stofnaður. -Innskráningar upplýsingarnar þínar eru eftirfarandi: - - -Vefþjónn: $[siteurl] -Notendanafn: $[email] -Aðgangsorð: $[password] - -Þú getur breytt aðgangsorðinu þínu á "Stillingar" síðunni eftir að þú hefur skráð þig -inn. - -Endilega eyddu smá tíma í að yfirfara aðrar notenda stillingar á þeirri síðu. - -Einnig gætir þú bætt við grunnupplýsingum á sjálfgefna prófílinn -(á "Forsíður" síðunni) svo aðrið geti auðveldlega fundið þig. - -Við mælum með að þú setjir fullt nafn, bætir við prófíl mynd, -bætir nokkrum "leitarorðum" (mjög gagnlegt við að eignast nýja vini) og -mögulega bætir við í hvaða landi þú býrð, ef þú villt ekki vera nákvæmari -en það. - -Við virðum að fullu rétt þinn til einkalífs, því er ekkert að þessum atriðum skilyrði. -Ef þú ert byrjandi og þekkir ekki einhvern hér, þér eru hér fólk -sem getur aðstoðað þig við að eignast nýja og áhugaverða vini. - - -Takk fyrir og velkomin(n) á $[sitename]. - -Bestu kveðjur, - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl deleted file mode 100644 index 3391c08c1..000000000 --- a/view/is/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Góðan daginn {{$username}}, - Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. -Innskráningar upplýsingarnar þínar eru eftirfarandi: - - -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} -Aðgangsorð: {{$password}} - -Þú getur breytt aðgangsorðinu þínu á "Stillingar" síðunni eftir að þú hefur skráð þig -inn. - -Endilega eyddu smá tíma í að yfirfara aðrar notenda stillingar á þeirri síðu. - -Einnig gætir þú bætt við grunnupplýsingum á sjálfgefna prófílinn -(á "Forsíður" síðunni) svo aðrið geti auðveldlega fundið þig. - -Við mælum með að þú setjir fullt nafn, bætir við prófíl mynd, -bætir nokkrum "leitarorðum" (mjög gagnlegt við að eignast nýja vini) og -mögulega bætir við í hvaða landi þú býrð, ef þú villt ekki vera nákvæmari -en það. - -Við virðum að fullu rétt þinn til einkalífs, því er ekkert að þessum atriðum skilyrði. -Ef þú ert byrjandi og þekkir ekki einhvern hér, þér eru hér fólk -sem getur aðstoðað þig við að eignast nýja og áhugaverða vini. - - -Takk fyrir og velkomin(n) á {{$sitename}}. - -Bestu kveðjur, - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl deleted file mode 100644 index 23dcaf2c8..000000000 --- a/view/it/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Ciao {{$username}}, - Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. -I dettagli di accesso sono i seguenti - - -Sito:»{{$siteurl}} -Nome utente:»{{$email}} -Password:»{{$password}} - -Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso -. - -Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina. - -Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo -(nella pagina "Profilo") per rendere agli altri più facile trovarti. - -Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto, -di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e -magari il paese dove vivi; se non vuoi essere più dettagliato -di così. - -Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. -Se ancora non conosci nessuno qui, potrebbe esserti di aiuto -per farti nuovi e interessanti amici. - - -Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} - -Saluti, - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/nb-no/register_open_eml.tpl b/view/nb-no/register_open_eml.tpl deleted file mode 100644 index 345ca0b65..000000000 --- a/view/nb-no/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Kjære $[username], - Takk for at du registrerte deg hos $[sitename]. Kontoen din er opprettet. -Innloggingsdetaljene er som følger: - - -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[password] - -Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget -inn. - -Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden. - -Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din -(på siden "Profiler") slik at folk lettere kan finne deg. - -Vi anbefaler å oppgi fullt navn, legge til et profilbilde, -legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og -kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk -enn det. - -Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige. -Hvis du er ny og ikke kjenner noen her, så kan de hjelpe -deg å få noen nye og interessante venner. - - -Takk og velkommen til $[sitename]. - -Beste hilsen, - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/register_open_eml.tpl b/view/nb-no/smarty3/register_open_eml.tpl deleted file mode 100644 index 1361a0488..000000000 --- a/view/nb-no/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Kjære {{$username}}, - Takk for at du registrerte deg hos {{$sitename}}. Kontoen din er opprettet. -Innloggingsdetaljene er som følger: - - -Nettstedsadresse:»{{$siteurl}} -Brukernavn:»{{$email}} -Passord:»{{$password}} - -Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget -inn. - -Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden. - -Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din -(på siden "Profiler") slik at folk lettere kan finne deg. - -Vi anbefaler å oppgi fullt navn, legge til et profilbilde, -legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og -kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk -enn det. - -Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige. -Hvis du er ny og ikke kjenner noen her, så kan de hjelpe -deg å få noen nye og interessante venner. - - -Takk og velkommen til {{$sitename}}. - -Beste hilsen, - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nl/register_open_eml.tpl b/view/nl/register_open_eml.tpl deleted file mode 100644 index 4e575a4a1..000000000 --- a/view/nl/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Beste $[username], - Bedankt voor uw registratie op $[sitename]. Uw account is gecreëerd. -De inloggegevens zijn als volgt: - - -Website-adres:»$[siteurl] -Inlognaam:»$[email] -Wachtwoord:»$[password] - -U kunt dit wachtwoord veranderen in uw account-instellingen, nadat u bent -ingelogd. - -Neem even een moment om de overige account-instellingen na te gaan. - -U wilt misschien ook wat algemene informatie toevoegen aan uw standaardprofiel -(op de "Profiel"-pagina), zodat andere mensen u eenvoudiger kunnen vinden. - -Wanneer u niet te specifiek wilt zijn, dan adviseren wij om uw volledige naam, -een profielfoto, enkele "trefwoorden (erg handig om nieuwe mensen te leren kennen) -en het land waar u woont toe -te voegen. - -Wij respecteren volledig uw recht op privacy en u bent daarom niet verplicht om hier iets in te vullen. -Wanneer u hier nieuw bent en hier niemand kent, dan kunnen deze -gegevens u wellicht helpen om enkele nieuwe en interessante mensen te leren kennen. - - -Bedankt en welkom op $[sitename]. - -Vriendelijke groet, - Beheerder $[sitename] - - \ No newline at end of file diff --git a/view/pl/register_open_eml.tpl b/view/pl/register_open_eml.tpl deleted file mode 100644 index 0321f8e3f..000000000 --- a/view/pl/register_open_eml.tpl +++ /dev/null @@ -1,36 +0,0 @@ - -Drogi $[username], - Dziękujemy za rejestrację na $[sitename]. Twoje konto zostało utworzone pomyślnie. -Dane do logowania: - - -Strona:»$[siteurl] -Twój Nick:»$[email] -Hasło:»$[password] - -Możesz zmienić swoje hasło odwiedzając zakładkę ustawienia konta po zalogowaniu - -się. - -Przejrzyj też inne ustawienia konta. To zajmie Ci tylko chwilę. - -Jeżeli chcesz, by inni mogli Cię łatwo znaleść wystarczy dodać podstawowe informacje -o sobie na stronie "Profile". - -Zalecamy dodać prawdziwe imię i nazwisko, zdjęcie profilowe, -słowa kluczowe (pomocne w zdobywaniu nowych przyjaciół) - i -może kraj, w którym mieszkasz, jeżeli nie chcesz dodać bardziej szczegółowych - -informacji niż ta. - -Szanujemy też twoją prywatność, więc żadna z podpowiadanych wyżej czynności nie jest przymusowa. -Jeżeli jesteś nowy i nie znasz tu nikogo, mogą one jedynie -pomóć w zdobywaniu nowych znajomości. - - -Dziękujemy i witamy na $[sitename]. - -Z poważaniem, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/register_open_eml.tpl b/view/pl/smarty3/register_open_eml.tpl deleted file mode 100644 index 6361e3c38..000000000 --- a/view/pl/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - -Drogi {{$username}}, - Dziękujemy za rejestrację na {{$sitename}}. Twoje konto zostało utworzone pomyślnie. -Dane do logowania: - - -Strona:»{{$siteurl}} -Twój Nick:»{{$email}} -Hasło:»{{$password}} - -Możesz zmienić swoje hasło odwiedzając zakładkę ustawienia konta po zalogowaniu - -się. - -Przejrzyj też inne ustawienia konta. To zajmie Ci tylko chwilę. - -Jeżeli chcesz, by inni mogli Cię łatwo znaleść wystarczy dodać podstawowe informacje -o sobie na stronie "Profile". - -Zalecamy dodać prawdziwe imię i nazwisko, zdjęcie profilowe, -słowa kluczowe (pomocne w zdobywaniu nowych przyjaciół) - i -może kraj, w którym mieszkasz, jeżeli nie chcesz dodać bardziej szczegółowych - -informacji niż ta. - -Szanujemy też twoją prywatność, więc żadna z podpowiadanych wyżej czynności nie jest przymusowa. -Jeżeli jesteś nowy i nie znasz tu nikogo, mogą one jedynie -pomóć w zdobywaniu nowych znajomości. - - -Dziękujemy i witamy na {{$sitename}}. - -Z poważaniem, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/register_open_eml.tpl b/view/ro/smarty3/register_open_eml.tpl deleted file mode 100644 index d1c71134d..000000000 --- a/view/ro/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Dragă $[username], - Vă mulțumim pentru înregistrare de la $ [SITENAME]. Contul dvs. a fost creat. -Detaliile de login sunt următoarele ; - - -Locaţie Site»$[siteurl] -Login Name: $[email] -Parolă: $[password] - -Puteți schimba parola dvs. de la pagina "Setări" cont după logare. -in. - -Vă rugăm ia câteva momente pentru revizuirea altor setări din cont pe această pagină. - -Ați putea dori, de asemenea, să adăugați câteva Informații generale la profilul dvs. implicit -(pe "Profile" pagina), astfel încât alte persoane să vă găsească uşor. - -Vă recomandăm să vă setați numele complet, adăugând o fotografie de profil, -adăugând câteva "cuvinte cheie" de profil (foarte utile în a face noi prieteni) - și -poate în ce țara locuiți; dacă nu doriți să fie mai specifice -decât atât. - -Respectăm pe deplin dreptul la intimitate, și nici unul dintre aceşti itemi nu sunt necesari. -Dacă sunteți nou si nu ştiţi pe nimeni pe aici, ele pot ajuta -să faceți niște prieteni noi și interesanţi. - - -Vă multumim si bine aţi venit la $[sitename]. - -Cu stimă, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl deleted file mode 100644 index 1471c9b98..000000000 --- a/view/sv/register_open_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ -$username, -Tack för att du registrerat dig på $sitename. Kontot har skapats. -Här är dina inloggningsuppgifter: - -Webbplats: $siteurl -Användarnamn: $email -Lösenord: $password - -Lösenordet kan ändras på sidan Inställningar efter att du loggat in. - -Ägna en liten stund åt att gå igenom alla kontoinställningar där. - -Välkommen till $sitename. - -Hälsningar, -$sitename admin - diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl deleted file mode 100644 index a399bd02b..000000000 --- a/view/sv/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -{{$username}}, -Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. -Här är dina inloggningsuppgifter: - -Webbplats: {{$siteurl}} -Användarnamn: {{$email}} -Lösenord: {{$password}} - -Lösenordet kan ändras på sidan Inställningar efter att du loggat in. - -Ägna en liten stund åt att gå igenom alla kontoinställningar där. - -Välkommen till {{$sitename}}. - -Hälsningar, -{{$sitename}} admin - diff --git a/view/zh-cn/register_open_eml.tpl b/view/zh-cn/register_open_eml.tpl deleted file mode 100644 index 9eb43b33b..000000000 --- a/view/zh-cn/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -尊敬的$[username]， - 谢谢注册在$[sitename]。您的账户造成了。 -登记信息是： - - -网页位置: $[siteurl] -用户名: $[email] -密码: $[password] - -您会变化您的密码在您的账户「设置」页 -登记后。 - -请抽几片刻评论别的账户设置在这个页。 - -您也可能想添加一些基础信息给您的默认简介 -(在「简介」页)为让别人容易地搜索。 - -我们建议您指定您全名，添加简介照片， -添加一些简介关键字(很有用找朋友们)和 -也许您的国家，如果您不想更具体 -的。 - -我们完全尊敬您隐私权利，这些项目没有必要的。 -您新注册，人们熟，他们会帮您 -找新和有意思的朋友们。 - - -谢谢您，$[sitename]欢迎您。 - -谨上 - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/register_open_eml.tpl b/view/zh-cn/smarty3/register_open_eml.tpl deleted file mode 100644 index 75756d41f..000000000 --- a/view/zh-cn/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -尊敬的{{$username}}， - 谢谢注册在{{$sitename}}。您的账户造成了。 -登记信息是： - - -网页位置: {{$siteurl}} -用户名: {{$email}} -密码: {{$password}} - -您会变化您的密码在您的账户「设置」页 -登记后。 - -请抽几片刻评论别的账户设置在这个页。 - -您也可能想添加一些基础信息给您的默认简介 -(在「简介」页)为让别人容易地搜索。 - -我们建议您指定您全名，添加简介照片， -添加一些简介关键字(很有用找朋友们)和 -也许您的国家，如果您不想更具体 -的。 - -我们完全尊敬您隐私权利，这些项目没有必要的。 -您新注册，人们熟，他们会帮您 -找新和有意思的朋友们。 - - -谢谢您，{{$sitename}}欢迎您。 - -谨上 - {{$sitename}}行政人员 - - \ No newline at end of file From a5df9b8b5d0d1763009d5d20e034a9a26f3fa976 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 12:35:08 +0200 Subject: [PATCH 11/14] Somebody stop me! (not really..) --- view/ca/request_notify_eml.tpl | 13 ------------- view/ca/smarty3/request_notify_eml.tpl | 14 -------------- view/cs/request_notify_eml.tpl | 15 --------------- view/cs/smarty3/request_notify_eml.tpl | 16 ---------------- view/de/request_notify_eml.tpl | 17 ----------------- view/de/smarty3/request_notify_eml.tpl | 18 ------------------ view/en/request_notify_eml.tpl | 17 ----------------- view/en/smarty3/request_notify_eml.tpl | 18 ------------------ view/eo/request_notify_eml.tpl | 17 ----------------- view/eo/smarty3/request_notify_eml.tpl | 18 ------------------ view/es/request_notify_eml.tpl | 13 ------------- view/es/smarty3/request_notify_eml.tpl | 14 -------------- view/fr/request_notify_eml.tpl | 17 ----------------- view/fr/smarty3/request_notify_eml.tpl | 18 ------------------ view/is/request_notify_eml.tpl | 17 ----------------- view/is/smarty3/request_notify_eml.tpl | 18 ------------------ view/it/smarty3/request_notify_eml.tpl | 17 ----------------- view/nb-no/request_notify_eml.tpl | 17 ----------------- view/nb-no/smarty3/request_notify_eml.tpl | 18 ------------------ view/nl/request_notify_eml.tpl | 17 ----------------- view/pl/request_notify_eml.tpl | 17 ----------------- view/pl/smarty3/request_notify_eml.tpl | 18 ------------------ view/ro/smarty3/request_notify_eml.tpl | 17 ----------------- view/sv/request_notify_eml.tpl | 13 ------------- view/sv/smarty3/request_notify_eml.tpl | 14 -------------- view/zh-cn/request_notify_eml.tpl | 17 ----------------- view/zh-cn/smarty3/request_notify_eml.tpl | 18 ------------------ 27 files changed, 443 deletions(-) delete mode 100644 view/ca/request_notify_eml.tpl delete mode 100644 view/ca/smarty3/request_notify_eml.tpl delete mode 100644 view/cs/request_notify_eml.tpl delete mode 100644 view/cs/smarty3/request_notify_eml.tpl delete mode 100644 view/de/request_notify_eml.tpl delete mode 100644 view/de/smarty3/request_notify_eml.tpl delete mode 100644 view/en/request_notify_eml.tpl delete mode 100644 view/en/smarty3/request_notify_eml.tpl delete mode 100644 view/eo/request_notify_eml.tpl delete mode 100644 view/eo/smarty3/request_notify_eml.tpl delete mode 100644 view/es/request_notify_eml.tpl delete mode 100644 view/es/smarty3/request_notify_eml.tpl delete mode 100644 view/fr/request_notify_eml.tpl delete mode 100644 view/fr/smarty3/request_notify_eml.tpl delete mode 100644 view/is/request_notify_eml.tpl delete mode 100644 view/is/smarty3/request_notify_eml.tpl delete mode 100644 view/it/smarty3/request_notify_eml.tpl delete mode 100644 view/nb-no/request_notify_eml.tpl delete mode 100644 view/nb-no/smarty3/request_notify_eml.tpl delete mode 100644 view/nl/request_notify_eml.tpl delete mode 100644 view/pl/request_notify_eml.tpl delete mode 100644 view/pl/smarty3/request_notify_eml.tpl delete mode 100644 view/ro/smarty3/request_notify_eml.tpl delete mode 100644 view/sv/request_notify_eml.tpl delete mode 100644 view/sv/smarty3/request_notify_eml.tpl delete mode 100644 view/zh-cn/request_notify_eml.tpl delete mode 100644 view/zh-cn/smarty3/request_notify_eml.tpl diff --git a/view/ca/request_notify_eml.tpl b/view/ca/request_notify_eml.tpl deleted file mode 100644 index 276624aae..000000000 --- a/view/ca/request_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Apreciat/da $myname, - -Acabes de rebre una sol·licitud de connexió de '$requestor' en $sitename. - -Pots visitar el seu perfil en $url. - -Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud. - -$siteurl - - - $sitename diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl deleted file mode 100644 index 5bef9f672..000000000 --- a/view/ca/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Apreciat/da {{$myname}}, - -Acabes de rebre una sol·licitud de connexió de '{{$requestor}}' en {{$sitename}}. - -Pots visitar el seu perfil en {{$url}}. - -Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl deleted file mode 100644 index 74010c79c..000000000 --- a/view/cs/request_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -Milý/Milá $username, - -Právě jste obdržel/obdržela požadavek na spojení na webu $sitename - -od '$requestor'. - -Můžete navštívit jeho/její profil na následujícím odkazu $url. - -Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost. - -$siteurl - -S pozdravem, - $sitename administrátor diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl deleted file mode 100644 index 6fd4d02bc..000000000 --- a/view/cs/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - -Milý/Milá {{$username}}, - -Právě jste obdržel/obdržela požadavek na spojení na webu {{$sitename}} - -od '{{$requestor}}'. - -Můžete navštívit jeho/její profil na následujícím odkazu {{$url}}. - -Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost. - -{{$siteurl}} - -S pozdravem, - {{$sitename}} administrátor diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl deleted file mode 100644 index da1fe5bdc..000000000 --- a/view/de/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Hallo $[myname], - -du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename] - -erhalten. - -Du kannst sein/ihr Profil unter $[url] finden. - -Bitte melde dich an um die komplette Anfrage einzusehen -und die Kontaktanfrage zu bestätigen oder zu ignorieren oder abzulehnen. - -$[siteurl] - -Beste Grüße, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl deleted file mode 100644 index a68032c20..000000000 --- a/view/de/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Hallo {{$myname}}, - -du hast eine Kontaktanfrage von '{{$requestor}}' auf {{$sitename}} - -erhalten. - -Du kannst sein/ihr Profil unter {{$url}} finden. - -Bitte melde dich an um die komplette Anfrage einzusehen -und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen. - -{{$siteurl}} - -Beste Grüße, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl deleted file mode 100644 index ad118a673..000000000 --- a/view/en/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Dear $[myname], - -You have just received a connection request at $[sitename] - -from '$[requestor]'. - -You may visit their profile at $[url]. - -Please login to your site to view the complete introduction -and approve or ignore/cancel the request. - -$[siteurl] - -Regards, - - $[sitename] administrator diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl deleted file mode 100644 index b36525251..000000000 --- a/view/en/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Dear {{$myname}}, - -You have just received a connection request at {{$sitename}} - -from '{{$requestor}}'. - -You may visit their profile at {{$url}}. - -Please login to your site to view the complete introduction -and approve or ignore/cancel the request. - -{{$siteurl}} - -Regards, - - {{$sitename}} administrator diff --git a/view/eo/request_notify_eml.tpl b/view/eo/request_notify_eml.tpl deleted file mode 100644 index eb91414b9..000000000 --- a/view/eo/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Kara $[myname], - -Vi ĵus ricevis kontaktpeton ĉe $[sitename] - -de '$[requestor]'. - -Vi eblas viziti la profilon de la petanto ĉe $[url]. - -Bonvolu ensaluti en la retejo por vidi la plenan prezenton -kaj aprobi aŭ ignori/nuligi la peton. - -$[siteurl] - -Salutoj, - - $[sitename] administranto \ No newline at end of file diff --git a/view/eo/smarty3/request_notify_eml.tpl b/view/eo/smarty3/request_notify_eml.tpl deleted file mode 100644 index 9032ab7b6..000000000 --- a/view/eo/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Kara {{$myname}}, - -Vi ĵus ricevis kontaktpeton ĉe {{$sitename}} - -de '{{$requestor}}'. - -Vi eblas viziti la profilon de la petanto ĉe {{$url}}. - -Bonvolu ensaluti en la retejo por vidi la plenan prezenton -kaj aprobi aŭ ignori/nuligi la peton. - -{{$siteurl}} - -Salutoj, - - {{$sitename}} administranto \ No newline at end of file diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl deleted file mode 100644 index 6161c45c1..000000000 --- a/view/es/request_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Estimado/a $myname, - -Acabas de recibir una solicitud de conexión de '$requestor' en $sitename. - -Puedes visitar su perfil en $url. - -Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud. - -$siteurl - - - $sitename diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl deleted file mode 100644 index e4eae838b..000000000 --- a/view/es/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Estimado/a {{$myname}}, - -Acabas de recibir una solicitud de conexión de '{{$requestor}}' en {{$sitename}}. - -Puedes visitar su perfil en {{$url}}. - -Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl deleted file mode 100644 index 9234ceaaa..000000000 --- a/view/fr/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Cher(e) $myname, - -Vous venez de recevoir une demande de mise en relation sur $sitename - -venant de « $requestor ». - -Vous pouvez visiter son profil sur $url. - -Vous pouvez vous connecter à votre site pour voir la demande -complète et l'approuver ou l'ignorer/annuler. - -$siteurl - -Cordialement, - - l'administrateur de $sitename diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl deleted file mode 100644 index 6fa998a76..000000000 --- a/view/fr/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Cher(e) {{$myname}}, - -Vous venez de recevoir une demande de mise en relation sur {{$sitename}} - -venant de « {{$requestor}} ». - -Vous pouvez visiter son profil sur {{$url}}. - -Vous pouvez vous connecter à votre site pour voir la demande -complète et l'approuver ou l'ignorer/annuler. - -{{$siteurl}} - -Cordialement, - - l'administrateur de {{$sitename}} diff --git a/view/is/request_notify_eml.tpl b/view/is/request_notify_eml.tpl deleted file mode 100644 index 7adb48e0d..000000000 --- a/view/is/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Góðan dag $[myname], - -Þér hefur borist beiðni um tengingu á $[sitename] - -frá '$[requestor]'. - -Þú getur heimsótt forsíðuna á $[url]. - -skráðu þig inn á þína síðu til að skoða alla kynninguna -og þar getur þú hunsað/hætt við beiðnina. - -$[siteurl] - -Kveðja, - - Kerfisstjóri $[sitename] \ No newline at end of file diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl deleted file mode 100644 index 09a80902a..000000000 --- a/view/is/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Góðan dag {{$myname}}, - -Þér hefur borist beiðni um tengingu á {{$sitename}} - -frá '{{$requestor}}'. - -Þú getur heimsótt forsíðuna á {{$url}}. - -skráðu þig inn á þína síðu til að skoða alla kynninguna -og þar getur þú hunsað/hætt við beiðnina. - -{{$siteurl}} - -Kveðja, - - Kerfisstjóri {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl deleted file mode 100644 index b0efcb40b..000000000 --- a/view/it/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Ciao {{$myname}}, - -Hai appena ricevuto una richiesta di connessione su {{$sitename}} - -da '{{$requestor}}'. - -Puoi visitare il suo profilo su {{$url}}. - -Accedi al tuo sito per vedere la richiesta completa -e approva o ignora/annulla la richiesta. - -{{$siteurl}} - -Saluti, - - l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/nb-no/request_notify_eml.tpl b/view/nb-no/request_notify_eml.tpl deleted file mode 100644 index e6a62c51f..000000000 --- a/view/nb-no/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Kjære $[myname], - -Du har akkurat mottatt en kontaktforespørsel hos $[sitename] - -fra '$[requestor]'. - -Du kan besøke profilen på $[url]. - -Vennligst logg inn på ditt nettsted for å se hele introduksjonen -og godkjenne eller ignorere/avbryte forespørselen. - -$[siteurl] - -Beste hilsen, - - $[siteurl] administrator \ No newline at end of file diff --git a/view/nb-no/smarty3/request_notify_eml.tpl b/view/nb-no/smarty3/request_notify_eml.tpl deleted file mode 100644 index d12e3b75a..000000000 --- a/view/nb-no/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Kjære {{$myname}}, - -Du har akkurat mottatt en kontaktforespørsel hos {{$sitename}} - -fra '{{$requestor}}'. - -Du kan besøke profilen på {{$url}}. - -Vennligst logg inn på ditt nettsted for å se hele introduksjonen -og godkjenne eller ignorere/avbryte forespørselen. - -{{$siteurl}} - -Beste hilsen, - - {{$siteurl}} administrator \ No newline at end of file diff --git a/view/nl/request_notify_eml.tpl b/view/nl/request_notify_eml.tpl deleted file mode 100644 index 78d28c27b..000000000 --- a/view/nl/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Beste $[myname], - -U heeft zojuist een contactaanvraag ontvangen op $[sitename] - -van '$[requestor]'. - -U kunt het profiel bezoeken op $[url]. - -U moet op uw Friendica-site inloggen om de volledige contactaanvraag te bekijken en -goed te keuren, of om te negeren/annuleren. - -$[siteurl] - -Vriendelijke groet, - - Beheerder $[sitename] \ No newline at end of file diff --git a/view/pl/request_notify_eml.tpl b/view/pl/request_notify_eml.tpl deleted file mode 100644 index aece35d11..000000000 --- a/view/pl/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Drogi/a $[myname], - -Otrzymałeś właśnie zaproszenie do znajomych na stronie $[sitename] - -od '$[requestor]'. - -Skorzystaj z tego linku, aby odwiedzić jego profil: $[url]. - -Proszę się zalogować, aby zobaczyć pełen opis -i zaakceptować lub zignorować / anulować. - -$[siteurl] - -Pozdrawiam - - $[sitename] administrator \ No newline at end of file diff --git a/view/pl/smarty3/request_notify_eml.tpl b/view/pl/smarty3/request_notify_eml.tpl deleted file mode 100644 index d1431bb6f..000000000 --- a/view/pl/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Drogi/a {{$myname}}, - -Otrzymałeś właśnie zaproszenie do znajomych na stronie {{$sitename}} - -od '{{$requestor}}'. - -Skorzystaj z tego linku, aby odwiedzić jego profil: {{$url}}. - -Proszę się zalogować, aby zobaczyć pełen opis -i zaakceptować lub zignorować / anulować. - -{{$siteurl}} - -Pozdrawiam - - {{$sitename}} administrator \ No newline at end of file diff --git a/view/ro/smarty3/request_notify_eml.tpl b/view/ro/smarty3/request_notify_eml.tpl deleted file mode 100644 index d8b2d440c..000000000 --- a/view/ro/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Dragă $[myname], - -Aţi primit o cerere de conectare la $[sitename] - -de la '$[requestor]'. - -Puteţi vizita profilul lor la $[url]. - -Vă rugăm să vă logaţi pe site-ul dvs. pentru a vedea introducerea completă -şi aprobaţi sau ignoraţi/ştergeţi cererea. - -$[siteurl] - -Cu respect, - - $[sitename] administrator \ No newline at end of file diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl deleted file mode 100644 index 893bce17c..000000000 --- a/view/sv/request_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ -$myname, - -Du har just fått en kontaktförfrågan på $sitename från '$requestor' - -Profilen finns på $url. - -Logga in för att se hela förfrågan och godkänna eller -avslå den. - -$siteurl - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl deleted file mode 100644 index 97a0b9618..000000000 --- a/view/sv/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -{{$myname}}, - -Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}' - -Profilen finns på {{$url}}. - -Logga in för att se hela förfrågan och godkänna eller -avslå den. - -{{$siteurl}} - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/request_notify_eml.tpl b/view/zh-cn/request_notify_eml.tpl deleted file mode 100644 index 9dd5527a3..000000000 --- a/view/zh-cn/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -尊敬的$[myname]， - -您刚才受到了一个连接要求在$[sitename] - -从「$[requestor]」。 - -您会看他的简介在[$url]。 - -请登记在您的网站为看他们全介绍 -和批准或不理／注销要求。 - -$[siteurl] - -谨上， - - $[sitename]行政人员 \ No newline at end of file diff --git a/view/zh-cn/smarty3/request_notify_eml.tpl b/view/zh-cn/smarty3/request_notify_eml.tpl deleted file mode 100644 index 682c06fcc..000000000 --- a/view/zh-cn/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -尊敬的{{$myname}}， - -您刚才受到了一个连接要求在{{$sitename}} - -从「{{$requestor}}」。 - -您会看他的简介在[{{$url}}]。 - -请登记在您的网站为看他们全介绍 -和批准或不理／注销要求。 - -{{$siteurl}} - -谨上， - - {{$sitename}}行政人员 \ No newline at end of file From 5861bdd6e92af3bb5898ab3ceb8e2a5457f8919d Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 13:55:02 +0200 Subject: [PATCH 12/14] registration request as system notification kill the template send email to all admins --- include/enotify.php | 20 +++++++- mod/register.php | 58 ++++++++++------------ view/ca/register_verify_eml.tpl | 23 --------- view/ca/smarty3/register_verify_eml.tpl | 24 --------- view/cs/register_verify_eml.tpl | 22 -------- view/cs/smarty3/register_verify_eml.tpl | 23 --------- view/de/register_verify_eml.tpl | 25 ---------- view/de/smarty3/register_verify_eml.tpl | 26 ---------- view/en/register_verify_eml.tpl | 26 ---------- view/en/smarty3/register_verify_eml.tpl | 27 ---------- view/eo/register_verify_eml.tpl | 25 ---------- view/eo/smarty3/register_verify_eml.tpl | 26 ---------- view/es/register_verify_eml.tpl | 22 -------- view/es/smarty3/register_verify_eml.tpl | 23 --------- view/fr/register_verify_eml.tpl | 25 ---------- view/fr/smarty3/register_verify_eml.tpl | 28 ----------- view/is/register_verify_eml.tpl | 25 ---------- view/is/smarty3/register_verify_eml.tpl | 26 ---------- view/it/smarty3/register_verify_eml.tpl | 25 ---------- view/nb-no/register_verify_eml.tpl | 25 ---------- view/nb-no/smarty3/register_verify_eml.tpl | 26 ---------- view/nl/register_verify_eml.tpl | 25 ---------- view/pl/register_verify_eml.tpl | 25 ---------- view/pl/smarty3/register_verify_eml.tpl | 26 ---------- view/ro/smarty3/register_verify_eml.tpl | 25 ---------- view/sv/register_verify_eml.tpl | 17 ------- view/sv/smarty3/register_verify_eml.tpl | 18 ------- view/zh-cn/register_verify_eml.tpl | 25 ---------- view/zh-cn/smarty3/register_verify_eml.tpl | 26 ---------- 29 files changed, 45 insertions(+), 692 deletions(-) delete mode 100644 view/ca/register_verify_eml.tpl delete mode 100644 view/ca/smarty3/register_verify_eml.tpl delete mode 100644 view/cs/register_verify_eml.tpl delete mode 100644 view/cs/smarty3/register_verify_eml.tpl delete mode 100644 view/de/register_verify_eml.tpl delete mode 100644 view/de/smarty3/register_verify_eml.tpl delete mode 100644 view/en/register_verify_eml.tpl delete mode 100644 view/en/smarty3/register_verify_eml.tpl delete mode 100644 view/eo/register_verify_eml.tpl delete mode 100644 view/eo/smarty3/register_verify_eml.tpl delete mode 100644 view/es/register_verify_eml.tpl delete mode 100644 view/es/smarty3/register_verify_eml.tpl delete mode 100644 view/fr/register_verify_eml.tpl delete mode 100644 view/fr/smarty3/register_verify_eml.tpl delete mode 100644 view/is/register_verify_eml.tpl delete mode 100644 view/is/smarty3/register_verify_eml.tpl delete mode 100644 view/it/smarty3/register_verify_eml.tpl delete mode 100644 view/nb-no/register_verify_eml.tpl delete mode 100644 view/nb-no/smarty3/register_verify_eml.tpl delete mode 100644 view/nl/register_verify_eml.tpl delete mode 100644 view/pl/register_verify_eml.tpl delete mode 100644 view/pl/smarty3/register_verify_eml.tpl delete mode 100644 view/ro/smarty3/register_verify_eml.tpl delete mode 100644 view/sv/register_verify_eml.tpl delete mode 100644 view/sv/smarty3/register_verify_eml.tpl delete mode 100644 view/zh-cn/register_verify_eml.tpl delete mode 100644 view/zh-cn/smarty3/register_verify_eml.tpl diff --git a/include/enotify.php b/include/enotify.php index 631cb8aed..54db6912c 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -308,7 +308,24 @@ function notification($params) { } if($params['type'] == NOTIFY_SYSTEM) { - //I have yet to find what system notificatons are... + switch($params['event']) { + case "SYSTEM_REGISTER_REQUEST": + $subject = sprintf( t('[Friendica System:Notify] registration request')); + $preamble = sprintf( t('You\'ve received a registration request from \'%1$s\' at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('You\'ve received a registration request [url=%1$s]an introduction[/url] from %2$s.'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = sprintf( t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s (%4$s)'), + $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick']); + + $sitelink = t('Please visit %s to approve or reject the request.'); + $tsitelink = sprintf( $sitelink, $params['link'] ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + break; + case "SYSTEM_DB_UPDATE_FAIL": + break; + } } if ($params['type'] == "SYSTEM_EMAIL"){ @@ -360,6 +377,7 @@ function notification($params) { if ($show_in_notification_page) { + logger("adding notification entry", LOGGER_DEBUG); do { $dups = false; $hash = random_string(); diff --git a/mod/register.php b/mod/register.php index b9a9808b9..50f5fedb5 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,6 +1,6 @@ config['admin_email'])); - - $r = q("SELECT `language` FROM `user` WHERE `email` = '%s' LIMIT 1", - //dbesc($a->config['admin_email']) - dbesc($adminlist[0]) - ); - if(count($r)) - push_lang($r[0]['language']); - else - push_lang('en'); - + // invite system if($using_invites && $invite_id) { q("delete * from register where hash = '%s' limit 1", dbesc($invite_id)); set_pconfig($user['uid'],'system','invites_remaining',$num_invites); } - $email_tpl = get_intltext_template("register_verify_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user['username'], - '$email' => $user['email'], - '$password' => $result['password'], - '$uid' => $user['uid'], - '$hash' => $hash - )); + // send email to admins + $admin_mail_list = "'".implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email']))))."'"; + $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s) LIMIT 1", + $admin_mail_list + ); - $res = mail($a->config['admin_email'], email_header_encode( sprintf(t('Registration request at %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - pop_lang(); - - if($res) { - info( t('Your registration is pending approval by the site owner.') . EOL ) ; - goaway(z_root()); + foreach ($adminlist as $admin) { + notification(array( + 'type' => NOTIFY_SYSTEM, + 'event' => 'SYSTEM_REGISTER_REQUEST', + 'source_name' => $user['username'], + 'source_mail' => $user['email'], + 'source_nick' => $user['nickname'], + 'source_link' => $a->get_baseurl()."/admin/users/", + 'link' => $a->get_baseurl()."/admin/users/", + 'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg", + 'to_email' => $admin['mail'], + 'uid' => $admin['uid'], + 'language' => ($admin['language']?$admin['language']:'en')) + ); } + + info( t('Your registration is pending approval by the site owner.') . EOL ) ; + goaway(z_root()); + + } return; diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl deleted file mode 100644 index 3dd966e0a..000000000 --- a/view/ca/register_verify_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -S'ha rebut la sol·licitud de registre d'un nou usuari en -$sitename que requereix la teva aprovació. - -Les dades d'accés són els següents: - -Nom Complet: $username -Lloc: $siteurl -Nom: $email - - -Per aprovar aquesta sol·licitud, visita el següent enllaç: - -$siteurl/regmod/allow/$hash - -Per denegar la sol·licitud i eliminar el compte, per favor visita: - -$siteurl/regmod/deny/$hash - - -Gràcies. - - diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl deleted file mode 100644 index 070288a43..000000000 --- a/view/ca/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - -S'ha rebut la sol·licitud de registre d'un nou usuari en -{{$sitename}} que requereix la teva aprovació. - -Les dades d'accés són els següents: - -Nom Complet: {{$username}} -Lloc: {{$siteurl}} -Nom: {{$email}} - - -Per aprovar aquesta sol·licitud, visita el següent enllaç: - -{{$siteurl}}/regmod/allow/{{$hash}} - -Per denegar la sol·licitud i eliminar el compte, per favor visita: - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Gràcies. - - diff --git a/view/cs/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl deleted file mode 100644 index 4b34c6b6d..000000000 --- a/view/cs/register_verify_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Na webu $sitename byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení. - -Přihlašovací údaje jsou tato: - -Celé jméno: $username -Adresa webu: $siteurl -Přihlašovací jméno: $email - -Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz: - - -$siteurl/regmod/allow/$hash - - -Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz: - - -$siteurl/regmod/deny/$hash - - -Díky. diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl deleted file mode 100644 index 7d08ffa00..000000000 --- a/view/cs/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení. - -Přihlašovací údaje jsou tato: - -Celé jméno: {{$username}} -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} - -Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Díky. diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl deleted file mode 100644 index 8f25f5c36..000000000 --- a/view/de/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Eine Neuanmeldung auf $[sitename] benötigt -deine Aufmerksamkeit. - - -Die Login-Einzelheiten sind die folgenden: - -Kompletter Name: $[username] -Adresse der Seite: $[siteurl] -Login Name: $[email] - - -Um die Anfrage zu bestätigen besuche bitte: - - -$[siteurl]/regmod/allow/$[hash] - - -Um die Anfrage abzulehnen und den Account zu löschen besuche bitte: - - -$[siteurl]/regmod/deny/$[hash] - - -Danke! diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl deleted file mode 100644 index 9c0bb77f2..000000000 --- a/view/de/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Eine Neuanmeldung auf {{$sitename}} benötigt -deine Aufmerksamkeit. - - -Die Login-Einzelheiten sind die folgenden: - -Kompletter Name: {{$username}} -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} - - -Um die Anfrage zu bestätigen besuche bitte: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Um die Anfrage abzulehnen und den Account zu löschen besuche bitte: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Danke! diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl deleted file mode 100644 index 73980bb5c..000000000 --- a/view/en/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - -A new user registration request was received at $[sitename] which requires -your approval. - - -The login details are as follows: - -Full Name: $[username] -Site Location: $[siteurl] -Login Name: $[email] - - -To approve this request please visit the following link: - - -$[siteurl]/regmod/allow/$[hash] - - -To deny the request and remove the account, please visit: - - -$[siteurl]/regmod/deny/$[hash] - - -Thank you. - diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl deleted file mode 100644 index 962e82a83..000000000 --- a/view/en/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,27 +0,0 @@ - - -A new user registration request was received at {{$sitename}} which requires -your approval. - - -The login details are as follows: - -Full Name: {{$username}} -Site Location: {{$siteurl}} -Login Name: {{$email}} - - -To approve this request please visit the following link: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -To deny the request and remove the account, please visit: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Thank you. - diff --git a/view/eo/register_verify_eml.tpl b/view/eo/register_verify_eml.tpl deleted file mode 100644 index cc99ab4b6..000000000 --- a/view/eo/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Nova peto por registrado atendas ĉe $[sitename] -kaj bezonas vian aprobon. - - -Jen la detaloj de la peto: - -Plena Nomo:»$[username] -Retejo:»$[siteurl] -Salutnomo:»$[email] - - -Aprobonte la peton, bonvolu klaki tiun ligilon: - - -$[siteurl]/regmod/allow/$[hash] - - -Malaprobonte kaj forviŝonte la konton, bonvolu klaki: - - -$[siteurl]/regmod/deny/$[hash] - - -Dankon! diff --git a/view/eo/smarty3/register_verify_eml.tpl b/view/eo/smarty3/register_verify_eml.tpl deleted file mode 100644 index bb5bc65e2..000000000 --- a/view/eo/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Nova peto por registrado atendas ĉe {{$sitename}} -kaj bezonas vian aprobon. - - -Jen la detaloj de la peto: - -Plena Nomo:»{{$username}} -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} - - -Aprobonte la peton, bonvolu klaki tiun ligilon: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Malaprobonte kaj forviŝonte la konton, bonvolu klaki: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Dankon! diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl deleted file mode 100644 index 9f2cc4d9b..000000000 --- a/view/es/register_verify_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Se ha recibido la solicitud de registro de un nuevo usuario en -$sitename que requiere tu aprobación. - -Los datos de acceso son los siguientes: - -Nombre Completo: $username -Sitio: $siteurl -Nombre: $email - - -Para aprobar esta solicitud, visita el siguiente enlace: - -$siteurl/regmod/allow/$hash - -Para denegar la solicitud y eliminar la cuenta, por favor visita: - -$siteurl/regmod/deny/$hash - - -Gracias. - diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl deleted file mode 100644 index b49a616d2..000000000 --- a/view/es/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Se ha recibido la solicitud de registro de un nuevo usuario en -{{$sitename}} que requiere tu aprobación. - -Los datos de acceso son los siguientes: - -Nombre Completo: {{$username}} -Sitio: {{$siteurl}} -Nombre: {{$email}} - - -Para aprobar esta solicitud, visita el siguiente enlace: - -{{$siteurl}}/regmod/allow/{{$hash}} - -Para denegar la solicitud y eliminar la cuenta, por favor visita: - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Gracias. - diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl deleted file mode 100644 index 35d0a730b..000000000 --- a/view/fr/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Une nouvelle demande d'inscription a été reçue par $[sitename], elle -nécessite votre approbation. - - -Les détails du compte sont: - -Nom complet: $[username] -Adresse du site: $[siteurl] -Utilisateur: $[email] - - -Pour approuver, merci de visiter le lien suivant: - - -$[siteurl]/regmod/allow/$[hash] - - -Pour refuser et supprimer le compte: - - -$[siteurl]/regmod/deny/$[hash] - - -Merci d'avance. diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl deleted file mode 100644 index f046797db..000000000 --- a/view/fr/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - -Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle -nécessite votre approbation. - - -Les informations de connexion sont les suivantes : - -Nom complet : {{$username}} -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} - - -Pour approuver cette demande, merci de suivre le lien : - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Pour rejeter cette demande et supprimer le compte associé, -merci de suivre le lien : - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -En vous remerçiant. - diff --git a/view/is/register_verify_eml.tpl b/view/is/register_verify_eml.tpl deleted file mode 100644 index 3ebc6fda4..000000000 --- a/view/is/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Beiðni um nýjan notanda barst $[sitename] sem krefst -þíns samþykkis. - - -Innskráningar upplýsingarnar eru eftirfarandi: - -Fullt nafn: $[username] -Vefþjónn: $[siteurl] -Notendanafn: $[email] - - -Til að samþykkja beiðnina þarf að heimsækja eftirfarandi slóð: - - -$[siteurl]/regmod/allow/$[hash] - - -Til að synja beiðni og eyða notanda þá heimsækir þú slóðina: - - -$[siteurl]/regmod/deny/$[hash] - - -Takk fyrir. diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl deleted file mode 100644 index 0b16695a9..000000000 --- a/view/is/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Beiðni um nýjan notanda barst {{$sitename}} sem krefst -þíns samþykkis. - - -Innskráningar upplýsingarnar eru eftirfarandi: - -Fullt nafn: {{$username}} -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} - - -Til að samþykkja beiðnina þarf að heimsækja eftirfarandi slóð: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Til að synja beiðni og eyða notanda þá heimsækir þú slóðina: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Takk fyrir. diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl deleted file mode 100644 index 931d9d4b0..000000000 --- a/view/it/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede -la tua approvazione. - - -I dati di accesso sono i seguenti: - -Nome completo:»{{$username}} -Sito:»{{$siteurl}} -Nome utente:»{{$email}} - - -Per approvare questa richiesta clicca su: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Per negare la richiesta e rimuovere il profilo, clicca su: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Grazie. diff --git a/view/nb-no/register_verify_eml.tpl b/view/nb-no/register_verify_eml.tpl deleted file mode 100644 index 4c2176d7d..000000000 --- a/view/nb-no/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -En ny forespørsel om brukerregistering ble mottatt hos $[sitename] og krever -din godkjenning. - - -Innloggingsdetaljene er som følger: - -Fullt navn:»$[username] -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] - - -For å godkjenne denne forespørselen, vennligst besøk følgende lenke: - - -$[siteurl]/regmod/allow/$[hash] - - -For å avslå denne forespørselen og fjerne kontoen, vennligst besøk: - - -$[siteurl]/regmod/deny/$[hash] - - -Mange takk. diff --git a/view/nb-no/smarty3/register_verify_eml.tpl b/view/nb-no/smarty3/register_verify_eml.tpl deleted file mode 100644 index 00b5b93cf..000000000 --- a/view/nb-no/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -En ny forespørsel om brukerregistering ble mottatt hos {{$sitename}} og krever -din godkjenning. - - -Innloggingsdetaljene er som følger: - -Fullt navn:»{{$username}} -Nettstedsadresse:»{{$siteurl}} -Brukernavn:»{{$email}} - - -For å godkjenne denne forespørselen, vennligst besøk følgende lenke: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -For å avslå denne forespørselen og fjerne kontoen, vennligst besøk: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Mange takk. diff --git a/view/nl/register_verify_eml.tpl b/view/nl/register_verify_eml.tpl deleted file mode 100644 index 23388678d..000000000 --- a/view/nl/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Er heeft zich op $[sitename] een nieuwe gebruiker aangemeld. Dit verzoek vereist -uw toestemming. - - -De inloggegevens zijn als volgt: - -Volledige naam:»$[username] -Friendica-site:»$[siteurl] -Inlognaam:»$[email] - - -Om dit verzoek goed te keuren moet u op de volgende link klikken: - - -$[siteurl]/regmod/allow/$[hash] - - -Om dit verzoek af te keuren en de nieuwe gebruiker weer te verwijderen, moet u op de volgende link klikken: - - -$[siteurl]/regmod/deny/$[hash] - - -Bedankt. diff --git a/view/pl/register_verify_eml.tpl b/view/pl/register_verify_eml.tpl deleted file mode 100644 index 8faf05aeb..000000000 --- a/view/pl/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Nowy wniosek o rejestrację użytkownika wpłynął na $[sitename] i wymaga -potwierdzenia. - - -Oto szczegóły konta: - -Pełna nazwa:»$[username] -Jesteś na: $[siteurl] -Login:»$[email] - - -Aby potwierdzić rejestrację wejdź na: - - -$[siteurl]/regmod/allow/$[hash] - - -Aby anulować rejestrację i usunąć konto wejdź na: - - -$[siteurl]/regmod/deny/$[hash] - - -Dziękuję. diff --git a/view/pl/smarty3/register_verify_eml.tpl b/view/pl/smarty3/register_verify_eml.tpl deleted file mode 100644 index 2457f74e4..000000000 --- a/view/pl/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Nowy wniosek o rejestrację użytkownika wpłynął na {{$sitename}} i wymaga -potwierdzenia. - - -Oto szczegóły konta: - -Pełna nazwa:»{{$username}} -Jesteś na: {{$siteurl}} -Login:»{{$email}} - - -Aby potwierdzić rejestrację wejdź na: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Aby anulować rejestrację i usunąć konto wejdź na: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Dziękuję. diff --git a/view/ro/smarty3/register_verify_eml.tpl b/view/ro/smarty3/register_verify_eml.tpl deleted file mode 100644 index 8d63a4eb5..000000000 --- a/view/ro/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -O nouă cererea de înregistrare utilizator a fost primită la $ [sitename], care impune -aprobarea ta. - - -Detaliile de login sunt următoarele ; - -Nume complet:»[$[username], -Locaţie Site»$[siteurl] -Login Name: $[email] - - -Pentru a aproba această cerere va rugam sa accesati link-ul următor: - - -$[siteurl]/regmod/allow/$[hash] - - -Pentru a refuza cererea și elimina contul, vă rugăm să vizitați: - - -$[siteurl]/regmod/deny/$[hash] - - -Vă mulţumesc. diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl deleted file mode 100644 index aa72bc9aa..000000000 --- a/view/sv/register_verify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ -En registreringsförfrågan som kräver svar har mottagits -på $sitename - - -Här är inloggningsuppgifterna: - -Fullständigt namn: $username -Webbplats: $siteurl -Användarnamn: $email - - -Gå till denna adress om du vill godkänna: -$siteurl/regmod/allow/$hash - -Gå till denna adress om du vill avslå förfrågan och ta bort kontot: -$siteurl/regmod/deny/$hash - diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl deleted file mode 100644 index 369c9a53c..000000000 --- a/view/sv/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -En registreringsförfrågan som kräver svar har mottagits -på {{$sitename}} - - -Här är inloggningsuppgifterna: - -Fullständigt namn: {{$username}} -Webbplats: {{$siteurl}} -Användarnamn: {{$email}} - - -Gå till denna adress om du vill godkänna: -{{$siteurl}}/regmod/allow/{{$hash}} - -Gå till denna adress om du vill avslå förfrågan och ta bort kontot: -{{$siteurl}}/regmod/deny/{{$hash}} - diff --git a/view/zh-cn/register_verify_eml.tpl b/view/zh-cn/register_verify_eml.tpl deleted file mode 100644 index eead002f5..000000000 --- a/view/zh-cn/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -受到新的用户注册要求在$[sitename]，要 -您的批准。 - - -登记信息是： - -全名: $[username] -网站位置: $[siteurl] -登记名: $[email] - - -为批准这个要求请点击这个按钮： - - -$[siteurl]/regmod/allow/$[hash] - - -为否定这个要求和删除账户，请点击这个按钮： - - -$[siteurl]/regmod/deny/$[hash] - - -谢谢您。 diff --git a/view/zh-cn/smarty3/register_verify_eml.tpl b/view/zh-cn/smarty3/register_verify_eml.tpl deleted file mode 100644 index 16a935fce..000000000 --- a/view/zh-cn/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -受到新的用户注册要求在{{$sitename}}，要 -您的批准。 - - -登记信息是： - -全名: {{$username}} -网站位置: {{$siteurl}} -登记名: {{$email}} - - -为批准这个要求请点击这个按钮： - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -为否定这个要求和删除账户，请点击这个按钮： - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -谢谢您。 From a8c90155f822986dea2087af779988be086e953d Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 14:23:03 +0200 Subject: [PATCH 13/14] db update mail via notification() remove last template --- boot.php | 124 ++++++++++--------------- include/dbstructure.php | 61 ++++++++++++ include/enotify.php | 2 +- mod/register.php | 2 +- view/ca/update_fail_eml.tpl | 11 --- view/cs/update_fail_eml.tpl | 11 --- view/de/smarty3/update_fail_eml.tpl | 12 --- view/de/update_fail_eml.tpl | 11 --- view/en/smarty3/update_fail_eml.tpl | 12 --- view/en/update_fail_eml.tpl | 11 --- view/eo/smarty3/update_fail_eml.tpl | 12 --- view/eo/update_fail_eml.tpl | 11 --- view/es/update_fail_eml.tpl | 11 --- view/fr/update_fail_eml.tpl | 11 --- view/is/smarty3/update_fail_eml.tpl | 12 --- view/is/update_fail_eml.tpl | 11 --- view/it/smarty3/update_fail_eml.tpl | 11 --- view/nb-no/smarty3/update_fail_eml.tpl | 12 --- view/nb-no/update_fail_eml.tpl | 11 --- view/nl/update_fail_eml.tpl | 11 --- view/pl/smarty3/update_fail_eml.tpl | 12 --- view/pl/update_fail_eml.tpl | 11 --- view/pt-br/smarty3/update_fail_eml.tpl | 12 --- view/pt-br/update_fail_eml.tpl | 11 --- view/ro/smarty3/update_fail_eml.tpl | 11 --- view/zh-cn/smarty3/update_fail_eml.tpl | 12 --- view/zh-cn/update_fail_eml.tpl | 11 --- 27 files changed, 113 insertions(+), 337 deletions(-) delete mode 100644 view/ca/update_fail_eml.tpl delete mode 100644 view/cs/update_fail_eml.tpl delete mode 100644 view/de/smarty3/update_fail_eml.tpl delete mode 100644 view/de/update_fail_eml.tpl delete mode 100644 view/en/smarty3/update_fail_eml.tpl delete mode 100644 view/en/update_fail_eml.tpl delete mode 100644 view/eo/smarty3/update_fail_eml.tpl delete mode 100644 view/eo/update_fail_eml.tpl delete mode 100644 view/es/update_fail_eml.tpl delete mode 100644 view/fr/update_fail_eml.tpl delete mode 100644 view/is/smarty3/update_fail_eml.tpl delete mode 100644 view/is/update_fail_eml.tpl delete mode 100644 view/it/smarty3/update_fail_eml.tpl delete mode 100644 view/nb-no/smarty3/update_fail_eml.tpl delete mode 100644 view/nb-no/update_fail_eml.tpl delete mode 100644 view/nl/update_fail_eml.tpl delete mode 100644 view/pl/smarty3/update_fail_eml.tpl delete mode 100644 view/pl/update_fail_eml.tpl delete mode 100644 view/pt-br/smarty3/update_fail_eml.tpl delete mode 100644 view/pt-br/update_fail_eml.tpl delete mode 100644 view/ro/smarty3/update_fail_eml.tpl delete mode 100644 view/zh-cn/smarty3/update_fail_eml.tpl delete mode 100644 view/zh-cn/update_fail_eml.tpl diff --git a/boot.php b/boot.php index 5ef24f494..41b24220d 100644 --- a/boot.php +++ b/boot.php @@ -789,7 +789,7 @@ if(! class_exists('App')) { } if ($name===""){ echo "template engine $class cannot be registered without a name.\n"; - killme(); + killme(); } $this->template_engines[$name] = $class; } @@ -797,7 +797,7 @@ if(! class_exists('App')) { /** * return template engine instance. If $name is not defined, * return engine defined by theme, or default - * + * * @param strin $name Template engine name * @return object Template Engine instance */ @@ -1025,26 +1025,14 @@ if(! function_exists('update_db')) { require_once("include/dbstructure.php"); $retval = update_structure(false, true); if($retval) { - //send the administrator an e-mail - $email_tpl = get_intltext_template("update_fail_eml.tpl"); - $email_msg = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$update' => DB_UPDATE_VERSION, - '$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION) - )); - $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); - require_once('include/email.php'); - $subject = email_header_encode($subject,'UTF-8'); - mail($a->config['admin_email'], $subject, $email_msg, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME']."\n" - .'Content-type: text/plain; charset=UTF-8'."\n" - .'Content-transfer-encoding: 8bit'); - //try the logger - logger("CRITICAL: Database structure update failed: ".$retval); + update_fail( + DB_UPDATE_VERSION, + sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION) + ); break; - } else + } else { set_config('database','dbupdate_'.DB_UPDATE_VERSION, 'success'); + } for($x = $stored; $x < $current; $x ++) { if(function_exists('update_' . $x)) { @@ -1068,22 +1056,10 @@ if(! function_exists('update_db')) { $retval = $func(); if($retval) { //send the administrator an e-mail - $email_tpl = get_intltext_template("update_fail_eml.tpl"); - $email_msg = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$update' => $x, - '$error' => sprintf( t('Update %s failed. See error logs.'), $x) - )); - $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); - require_once('include/email.php'); - $subject = email_header_encode($subject,'UTF-8'); - mail($a->config['admin_email'], $subject, $email_msg, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - //try the logger - logger('CRITICAL: Update Failed: '. $x); + update_fail( + $x, + sprintf(t('Update %s failed. See error logs.'), $x) + ); break; } else { set_config('database','update_' . $x, 'success'); @@ -1209,7 +1185,7 @@ if(! function_exists('login')) { } $noid = get_config('system','no_openid'); - + $dest_url = $a->get_baseurl(true) . '/' . $a->query_string; if(local_user()) { @@ -1230,18 +1206,18 @@ if(! function_exists('login')) { '$dest_url' => $dest_url, '$logout' => t('Logout'), '$login' => t('Login'), - + '$lname' => array('username', t('Nickname or Email address: ') , '', ''), '$lpassword' => array('password', t('Password: '), '', ''), '$lremember' => array('remember', t('Remember me'), 0, ''), - + '$openid' => !$noid, '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''), - + '$hiddens' => $hiddens, - + '$register' => $reg, - + '$lostpass' => t('Forgot your password?'), '$lostlink' => t('Password Reset'), @@ -1304,9 +1280,9 @@ if(! function_exists('remote_user')) { if(! function_exists('notice')) { /** * Show an error message to user. - * + * * This function save text in session, to be shown to the user at next page load - * + * * @param string $s - Text of notice */ function notice($s) { @@ -1319,9 +1295,9 @@ if(! function_exists('notice')) { if(! function_exists('info')) { /** * Show an info message to user. - * + * * This function save text in session, to be shown to the user at next page load - * + * * @param string $s - Text of notice */ function info($s) { @@ -1745,7 +1721,7 @@ if(! function_exists('get_birthdays')) { $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . t('[today]') : ''); $rr['startime'] = Null; $rr['today'] = $today; - + } } } @@ -1820,7 +1796,7 @@ if(! function_exists('get_events')) { $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']); $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false); - + $rr['link'] = $md; $rr['title'] = $title; $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : ''); @@ -1880,7 +1856,7 @@ if(! function_exists('proc_run')) { } $args = $newargs; - + $arr = array('args' => $args, 'run_cmd' => true); call_hooks("proc_run", $arr); @@ -1889,14 +1865,14 @@ if(! function_exists('proc_run')) { if(count($args) && $args[0] === 'php') $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - + // add baseurl to args. cli scripts can't construct it $args[] = $a->get_baseurl(); - + for($x = 0; $x < count($args); $x ++) $args[$x] = escapeshellarg($args[$x]); - + $cmdline = implode($args," "); if(get_config('system','proc_windows')) @@ -1909,9 +1885,9 @@ if(! function_exists('proc_run')) { if(! function_exists('current_theme')) { function current_theme(){ $app_base_themes = array('duepuntozero', 'dispy', 'quattro'); - + $a = get_app(); - + // $mobile_detect = new Mobile_Detect(); // $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); $is_mobile = $a->is_mobile || $a->is_tablet; @@ -1941,17 +1917,17 @@ if(! function_exists('current_theme')) { (file_exists('view/theme/' . $theme_name . '/style.css') || file_exists('view/theme/' . $theme_name . '/style.php'))) return($theme_name); - + foreach($app_base_themes as $t) { if(file_exists('view/theme/' . $t . '/style.css')|| file_exists('view/theme/' . $t . '/style.php')) return($t); } - + $fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php')); if(count($fallback)) return (str_replace('view/theme/','', substr($fallback[0],0,-10))); - + } } @@ -1991,7 +1967,7 @@ if(! function_exists('feed_birthday')) { * */ - + $birthday = ''; if(! strlen($tz)) @@ -2061,13 +2037,13 @@ if(! function_exists('load_contact_links')) { if(! function_exists('profile_tabs')){ function profile_tabs($a, $is_owner=False, $nickname=Null){ //echo "
"; var_dump($a->user); killme();
-	
+
 		if (is_null($nickname))
 			$nickname  = $a->user['nickname'];
-		
+
 		if(x($_GET,'tab'))
 			$tab = notags(trim($_GET['tab']));
-	
+
 		$url = $a->get_baseurl() . '/profile/' . $nickname;
 
 		$tabs = array(
@@ -2100,7 +2076,7 @@ if(! function_exists('profile_tabs')){
 				'id' => 'video-tab',
 			),
 		);
-	
+
 		if ($is_owner){
 			$tabs[] = array(
 				'label' => t('Events'),
@@ -2121,7 +2097,7 @@ if(! function_exists('profile_tabs')){
 
 		$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
 		call_hooks('profile_tabs', $arr);
-	
+
 		$tpl = get_markup_template('common_tabs.tpl');
 
 		return replace_macros($tpl,array('$tabs' => $arr['tabs']));
@@ -2160,28 +2136,28 @@ function zrl($s,$force = false) {
 /**
 * returns querystring as string from a mapped array
 *
-* @param params Array 
+* @param params Array
 * @return string
 */
-function build_querystring($params, $name=null) { 
-    $ret = ""; 
+function build_querystring($params, $name=null) {
+    $ret = "";
     foreach($params as $key=>$val) {
-        if(is_array($val)) { 
+        if(is_array($val)) {
             if($name==null) {
-                $ret .= build_querystring($val, $key); 
+                $ret .= build_querystring($val, $key);
             } else {
-                $ret .= build_querystring($val, $name."[$key]");    
+                $ret .= build_querystring($val, $name."[$key]");
             }
         } else {
             $val = urlencode($val);
             if($name!=null) {
-                $ret.=$name."[$key]"."=$val&"; 
+                $ret.=$name."[$key]"."=$val&";
             } else {
-                $ret.= "$key=$val&"; 
+                $ret.= "$key=$val&";
             }
-        } 
-    } 
-    return $ret;    
+        }
+    }
+    return $ret;
 }
 
 function explode_querystring($query) {
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 77482d41b..010f86218 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1,5 +1,66 @@
 config['admin_email']))))."'";
+	$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
+		$admin_mail_list
+	);
+
+	// every admin could had different language
+
+	foreach ($adminlist as $admin) {
+		$lang = (($admin['language'])?$admin['language']:'en');
+		push_lang($lang);
+
+		$preamble = deindent(t("
+			The friendica developers released update %s recently,
+			but when I tried to install it, something went terribly wrong.
+			This needs to be fixed soon and I can't do it alone. Please contact a
+			friendica developer if you can not help me on your own. My database might be invalid.");
+		$body = t("The error message is\n[pre]%s[/pre]");
+		$preamble = sprintf($preamble, $update_id);
+		$body = sprintf($body, $error_message);
+
+		notification(array(
+			'type' => "SYSTEM_EMAIL",
+			'to_email' => $admin['email'],
+			'preamble' => $preamble,
+			'body' => $body,
+			'language' => $lang,
+		));
+	}
+
+
+
+
+	/*
+	$email_tpl = get_intltext_template("update_fail_eml.tpl");
+	$email_msg = replace_macros($email_tpl, array(
+		'$sitename' => $a->config['sitename'],
+		'$siteurl' =>  $a->get_baseurl(),
+		'$update' => DB_UPDATE_VERSION,
+		'$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
+	));
+	$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+	require_once('include/email.php');
+	$subject = email_header_encode($subject,'UTF-8');
+	mail($a->config['admin_email'], $subject, $email_msg,
+		'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME']."\n"
+		.'Content-type: text/plain; charset=UTF-8'."\n"
+		.'Content-transfer-encoding: 8bit');
+	*/
+	//try the logger
+	logger("CRITICAL: Database structure update failed: ".$retval);
+	break;
+}
 
 function dbstructure_run(&$argv, &$argc) {
 	global $a, $db;
diff --git a/include/enotify.php b/include/enotify.php
index 54db6912c..9ca9d7970 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -312,7 +312,7 @@ function notification($params) {
 			case "SYSTEM_REGISTER_REQUEST":
 				$subject = sprintf( t('[Friendica System:Notify] registration request'));
 				$preamble = sprintf( t('You\'ve received a registration request from \'%1$s\' at %2$s'), $params['source_name'], $sitename);
-				$epreamble = sprintf( t('You\'ve received a registration request [url=%1$s]an introduction[/url] from %2$s.'),
+				$epreamble = sprintf( t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.'),
 										$itemlink,
 										'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
 				$body = sprintf( t('Full Name:	%1$s\nSite Location:	%2$s\nLogin Name:	%3$s (%4$s)'),
diff --git a/mod/register.php b/mod/register.php
index 50f5fedb5..eb6fda737 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -120,7 +120,7 @@ function register_post(&$a) {
 
 		// send email to admins
 		$admin_mail_list = "'".implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email']))))."'";
-		$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s) LIMIT 1",
+		$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
 			$admin_mail_list
 		);
 
diff --git a/view/ca/update_fail_eml.tpl b/view/ca/update_fail_eml.tpl
deleted file mode 100644
index ab7e1e269..000000000
--- a/view/ca/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Cheic, 
-Jo soc a $sitename.   
-Els desenvolupadors de Friendica han alliberat una actualització $update recentment, 
-però quan vaig intentar actualitzar, quelcom terrible va anar malament.  
-Això necessita ser reparat aviat i no ho puc fer sol. Per favor, contacta amb 
-un desenvolupador de Friendica si no em pots ajudar per tu mateix. La meva base de dades es pot corrompre. 
-
-El missatge d'error va ser '$error'.   
-
-Ho lamento. 
-El teu servidor friendica a $siteurl
\ No newline at end of file
diff --git a/view/cs/update_fail_eml.tpl b/view/cs/update_fail_eml.tpl
deleted file mode 100644
index e23f2d18c..000000000
--- a/view/cs/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Ahoj, 
-Já jsem $sitename.   
-Vývojáři friendica nednávno uvolnili aktualizaci $update, 
-ale když jsem se ji snažil nainstalovat, nepovedlo se mi to.  
-Je to třeba rychle opravit a já to sám nedokážu. Prosím kontaktuj 
-vývojáře friendica, pokud mi nemůžeš pomoct ty sám. Moje databáze může být nekonzistentní. 
-
-Chybová zpráva je '$error'.   
-
-Je mi líto, 
-Tvůj web friendica na $siteurl
\ No newline at end of file
diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl
deleted file mode 100644
index 8a480d502..000000000
--- a/view/de/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Hi, 
-ich bin {{$sitename}}.   
-Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, 
-aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.  
-Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen. 
-Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein. 
-
-Die Fehlermeldung lautet '{{$error}}'.   
-
-Tut mir Leid! 
-Deine friendica Instanz auf {{$siteurl}}
\ No newline at end of file
diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl
deleted file mode 100644
index fb885d9c3..000000000
--- a/view/de/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hi, 
-$sitename   
-Die friendica Entwickler haben jüngst Update $update veröffentlicht, 
-aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.  
-Das sollte schnellst möglich behoben werden und ich kann das nicht alleine machen. 
-Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein. 
-
-Die Fehlermeldung lautet '$error'.   
-
-Tut mir Leid! 
-Deine friendica Instanz auf $siteurl
\ No newline at end of file
diff --git a/view/en/smarty3/update_fail_eml.tpl b/view/en/smarty3/update_fail_eml.tpl
deleted file mode 100644
index a85f163a8..000000000
--- a/view/en/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Hey, 
-I'm {{$sitename}};   
-The friendica developers released update {{$update}} recently, 
-but when I tried to install it, something went terribly wrong.  
-This needs to be fixed soon and I can't do it alone. Please contact a 
-friendica developer if you can not help me on your own. My database might be invalid. 
-
-The error message is '{{$error}}'.   
-
-I'm sorry, 
-your friendica server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl
deleted file mode 100644
index 548e1a0df..000000000
--- a/view/en/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hey, 
-I'm $sitename;   
-The friendica developers released update $update recently, 
-but when I tried to install it, something went terribly wrong.  
-This needs to be fixed soon and I can't do it alone. Please contact a 
-friendica developer if you can not help me on your own. My database might be invalid. 
-
-The error message is '$error'.   
-
-I'm sorry, 
-your friendica server at $siteurl
\ No newline at end of file
diff --git a/view/eo/smarty3/update_fail_eml.tpl b/view/eo/smarty3/update_fail_eml.tpl
deleted file mode 100644
index 109b6b4b3..000000000
--- a/view/eo/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Saluton! 
-Mi estas {{$sitename}}.   
-La programistoj de Frienda eldonis ĝisdatigon {{$update}} antaŭ ne longe, 
-sed kiam mi provis instali ĝin, io terure malsukcesis.  
-Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti 
-Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas. 
-
-La erarmesaĝo estas '{{$error}}'.   
-
-Mi bedaŭras, 
-via Friendica servilo ĉe {{$siteurl}}
\ No newline at end of file
diff --git a/view/eo/update_fail_eml.tpl b/view/eo/update_fail_eml.tpl
deleted file mode 100644
index f7e0d8bce..000000000
--- a/view/eo/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Saluton! 
-Mi estas $sitename.   
-La programistoj de Frienda eldonis ĝisdatigon $update antaŭ ne longe, 
-sed kiam mi provis instali ĝin, io terure malsukcesis.  
-Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti 
-Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas. 
-
-La erarmesaĝo estas '$error'.   
-
-Mi bedaŭras, 
-via Friendica servilo ĉe $siteurl
\ No newline at end of file
diff --git a/view/es/update_fail_eml.tpl b/view/es/update_fail_eml.tpl
deleted file mode 100644
index e75a70813..000000000
--- a/view/es/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hola, 
-Estoy en $sitename;   
-Los desarrolladores actualizaron a $update recientemente, 
-pero cuando intento instalarlo, algo falla.  
-Este error debe ser corregido, pero no puedo hacerlo solo. Por favor, 
-avisa a algún desarrollador si no puedes ayudarme tú mismo. Mi  
-
-base de datos puede estar corrupta. El error que me da es '$error'.   
-
-Lo siento, 
-tu servidor de Friendica en $siteurl
\ No newline at end of file
diff --git a/view/fr/update_fail_eml.tpl b/view/fr/update_fail_eml.tpl
deleted file mode 100644
index f43b20bd9..000000000
--- a/view/fr/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Salut, 
-Je suis $sitename;   
-Les développeurs de Friendica ont publié la mise-à-jour $update récemment, 
-mais quand j'essaye de l'installer, quelque-chose merdoie violemment.  
-Il faudrait réparer ça rapidement, et je ne peux le faire tout seul. Merci de contacter un développeur Friendica 
- si vous ne pensez pas pouvoir m'aider tout seul. Ma base de données pourrait tout à fait être corrompue. 
-
-Le message d'erreur est '$error'.   
-
-Je suis vraiment désolé, 
-votre dévoué serveur friendica, situé à $siteurl
\ No newline at end of file
diff --git a/view/is/smarty3/update_fail_eml.tpl b/view/is/smarty3/update_fail_eml.tpl
deleted file mode 100644
index c14afe557..000000000
--- a/view/is/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Hæ, 
-Ég er {{$sitename}}.   
-Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, 
-En þegar ég reyndi að uppfæra, gerist eitthvað hræðilegt.  
-Þetta þarf að laga strax og ég get það ekki ein.  Hafðu samband við 
-þróunarteymi friendica ef þú getur ekki hjálpað mér.  Gagnagrunnurinn minn gæti verið skemmdur 
-
-Villuskilaboðin eru '{{$error}}'.   
-
-Fyrirgefðu, 
-þinn friendica þjónn á {{$siteurl}}
\ No newline at end of file
diff --git a/view/is/update_fail_eml.tpl b/view/is/update_fail_eml.tpl
deleted file mode 100644
index 5d73d7d25..000000000
--- a/view/is/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hæ, 
-Ég er $sitename;   
-Þróunarteymi friendica gáfu nýlega út uppfærslu $update, 
-En þegar ég reyndi að uppfæra, gerist eitthvað hræðilegt.  
-Þetta þarf að laga strax og ég get það ekki ein.  Hafðu samband við 
-þróunarteymi friendica ef þú getur ekki hjálpað mér.  Gagnagrunnurinn minn gæti verið skemmdur 
-
-Villuskilaboðin eru '$error'.   
-
-Fyrirgefðu, 
-þinn friendica þjónn á $siteurl
\ No newline at end of file
diff --git a/view/it/smarty3/update_fail_eml.tpl b/view/it/smarty3/update_fail_eml.tpl
deleted file mode 100644
index d647e26d8..000000000
--- a/view/it/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Ehi, 
-Sono {{$sitename}};   
-Gli sviluppatori di Friendica hanno appena rilasciato la nuova versione {{$update}}, 
-ma appena ho provato ad installarla qualcosa è andato tremendamente storto.  
-Le cose vanno messe a posto al più presto e non riesco a farlo da solo. Contatta uno 
-sviluppatore di friendica se non riesci ad aiutarmi da solo. Il mio database potrebbe non essere più a posto. 
-
-Il messaggio di errore è: '{{$error}}'.   
-
-Mi dispiace, 
-il tuo server friendica su {{$siteurl}}
\ No newline at end of file
diff --git a/view/nb-no/smarty3/update_fail_eml.tpl b/view/nb-no/smarty3/update_fail_eml.tpl
deleted file mode 100644
index 2f1f3ea2b..000000000
--- a/view/nb-no/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Hei,  
-jeg er {{$sitename}}.   
-Friendica-utviklerne slapp nylig oppdateringen {{$update}}, 
-men da jeg prøvde å installere den, gikk noe forferdelig galt.  
-Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en 
-Friendica-utvikler hvis du ikke kan hjelpe meg på egenhånd. Databasen min er kanskje ugyldig. 
-
-Feilmeldingen er '{{$error}}'.   
-
-Jeg beklager,  
-din Friendica-tjener hos {{$siteurl}} 
\ No newline at end of file
diff --git a/view/nb-no/update_fail_eml.tpl b/view/nb-no/update_fail_eml.tpl
deleted file mode 100644
index ba526f2b9..000000000
--- a/view/nb-no/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hei,  
-Jeg er $sitename;   
-Friendica-utviklerne slapp nylig oppdateringen $update, 
-men da jeg prøvde å installere den, gikk noe forferdelig galt.  
-Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en 
-Friendica-utvikler hvis du ikke kan hjelpe meg på egenhånd. Databasen min er kanskje ugyldig. 
-
-Feilmeldingen er '$error'.   
-
-Jeg beklager,  
-din Friendica-tjener hos $siteurl 
\ No newline at end of file
diff --git a/view/nl/update_fail_eml.tpl b/view/nl/update_fail_eml.tpl
deleted file mode 100644
index db1a90aa2..000000000
--- a/view/nl/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hallo, 
-Ik ben $sitename;   
-De friendica ontwikkelaars hebben update $update vrijgegeven. 
-Maar toen ik probeerde te installeren ging het vreselijk fout  
-Dit moet snel gerepareerd worden maar dat kan ik niet alleen, Contacteer a.u.b. 
-een Friendica ontwikkelaar als je me niet zelf kunt helpen. Mijn database kan ongeldig zijn. 
-
-De foutmeldimg is '$error'.   
-
-Sorry, 
-je Friendica server op $siteurl
\ No newline at end of file
diff --git a/view/pl/smarty3/update_fail_eml.tpl b/view/pl/smarty3/update_fail_eml.tpl
deleted file mode 100644
index 15d578cc2..000000000
--- a/view/pl/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Hey,  
-Jestem {{$sitename}}.   
-Deweloperzy friendica wydali ostatnio aktualizację {{$update}}, 
-ale kiedy próbowałem ją zainstalować, coś poszło nie tak.  
-To musi być szybko poprawione, ale nie mogę zrobić tego sam. Proszę o kontakt z 
-deweloperami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być uszkodzona. 
-
-Komunikat o błędzie: '{{$error}}'.   
-
-Przepraszam, 
-twój serwer friendica w {{$siteurl}}
\ No newline at end of file
diff --git a/view/pl/update_fail_eml.tpl b/view/pl/update_fail_eml.tpl
deleted file mode 100644
index 0910b901f..000000000
--- a/view/pl/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Hey,  
-Jestem $sitename;   
-Deweloperzy friendica wydali ostatnio aktualizację $update, 
-ale kiedy próbowałem ją zainstalować, coś poszło nie tak.  
-To musi być szybko poprawione, ale nie mogę zrobić tego sam. Proszę o kontakt z 
-deweloperami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być uszkodzona. 
-
-Komunikat o błędzie: '$error'.   
-
-Przepraszam, 
-twój serwer friendica w $siteurl
\ No newline at end of file
diff --git a/view/pt-br/smarty3/update_fail_eml.tpl b/view/pt-br/smarty3/update_fail_eml.tpl
deleted file mode 100644
index a101bba54..000000000
--- a/view/pt-br/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Oi, 
-Eu sou {{$sitename}}   
-Os desenvolvedores do friendica lançaram uma atualização {{$update}} recentemente, 
-mas quando tentei instalá-la algo de errado aconeteceu.  
-Isso precisa ser corrigido logo e não posso fazê-lo sozinho. Por favor contacte um 
-desenvolvedor do friendica se você não puder fazer a correção. Meu banco de dados pode estar inválido. 
-
-A mensagem de erro é : '{{$error}}'.   
-
-Lamento. 
-Seu servidor friendica em {{$siteurl}}
\ No newline at end of file
diff --git a/view/pt-br/update_fail_eml.tpl b/view/pt-br/update_fail_eml.tpl
deleted file mode 100644
index 580ca7d64..000000000
--- a/view/pt-br/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Oi, 
-Eu sou $sitename   
-Os desenvolvedores do friendica lançaram uma atualização $update recentemente, 
-mas quando tentei instalá-la algo de errado aconeteceu.  
-Isso precisa ser corrigido logo e não posso fazê-lo sozinho. Por favor contacte um 
-desenvolvedor do friendica se você não puder fazer a correção. Meu banco de dados pode estar inválido. 
-
-A mensagem de erro é : '$error'.   
-
-Lamento. 
-Seu servidor friendica em $siteurl
\ No newline at end of file
diff --git a/view/ro/smarty3/update_fail_eml.tpl b/view/ro/smarty3/update_fail_eml.tpl
deleted file mode 100644
index 93fc63b5b..000000000
--- a/view/ro/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-Bună, 
-Sunt $sitename;   
-Dezvoltatorii friendica au  lansat actualizarea $update recent, 
-dar când am incercat s-o instalez, ceva a mers teribil de prost.  
-Aceasta trebuie fixată curând . Nu o pot face singur. Vă rog contactaţi-mă la 
-friendica dezvoltator dacă nu mă pot ajuta pe cont propriu. Baza mea de date ar putea fi invalidă. 
-
-Mesajul de eraoare este '$error'.   
-
-Îmi pare rău. 
-serverul dvs. friendica la  $siteurl
\ No newline at end of file
diff --git a/view/zh-cn/smarty3/update_fail_eml.tpl b/view/zh-cn/smarty3/update_fail_eml.tpl
deleted file mode 100644
index 41bd9b1de..000000000
--- a/view/zh-cn/smarty3/update_fail_eml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Hey, 
-I'm {{$sitename}}.   
-The friendica developers released update {{$update}} recently, 
-but when I tried to install it, something went terribly wrong.  
-This needs to be fixed soon and I can't do it alone. Please contact a 
-friendica developer if you can not help me on your own. My database might be invalid. 
-
-The error message is '{{$error}}'.   
-
-I'm sorry, 
-your friendica server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/zh-cn/update_fail_eml.tpl b/view/zh-cn/update_fail_eml.tpl
deleted file mode 100644
index d52c17583..000000000
--- a/view/zh-cn/update_fail_eml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-你好， 
-我是$sitename；   
-Friendica开发者最近出版更新$update， 
-可我安装的时候，遇到什么灾害，  
-这要紧急地维修，可我不会自己做。请联系 
-一个Friendica开发者如果你不会自己帮我。我的数据库会不效。 
-
-错误通信是「$error」   
-
-不好意思， 
-你Friendica服务器在$siteurl
\ No newline at end of file

From ec1d321e336bc13504b55ac42f4bd9ff340fb51d Mon Sep 17 00:00:00 2001
From: fabrixxm 
Date: Sun, 7 Sep 2014 14:32:41 +0200
Subject: [PATCH 14/14] update messages.po

---
 util/messages.po | 12983 +++++++++++++++++++++++----------------------
 1 file changed, 6616 insertions(+), 6367 deletions(-)

diff --git a/util/messages.po b/util/messages.po
index a3bac6207..f325c52a6 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.2.1752\n"
+"Project-Id-Version: 3.2.1753\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-10 15:13+0200\n"
+"POT-Creation-Date: 2014-09-07 14:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -18,218 +18,307 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: ../../object/Item.php:92
-msgid "This entry was edited"
-msgstr ""
-
-#: ../../object/Item.php:113 ../../mod/content.php:620
-#: ../../mod/photos.php:1357
-msgid "Private Message"
-msgstr ""
-
-#: ../../object/Item.php:117 ../../mod/editpost.php:109
-#: ../../mod/content.php:728 ../../mod/settings.php:673
-msgid "Edit"
-msgstr ""
-
-#: ../../object/Item.php:126 ../../mod/content.php:437
-#: ../../mod/content.php:740 ../../mod/photos.php:1651
-#: ../../include/conversation.php:612
-msgid "Select"
-msgstr ""
-
-#: ../../object/Item.php:127 ../../mod/admin.php:922 ../../mod/content.php:438
-#: ../../mod/content.php:741 ../../mod/contacts.php:703
-#: ../../mod/settings.php:674 ../../mod/group.php:171
-#: ../../mod/photos.php:1652 ../../include/conversation.php:613
-msgid "Delete"
-msgstr ""
-
-#: ../../object/Item.php:130 ../../mod/content.php:763
-msgid "save to folder"
-msgstr ""
-
-#: ../../object/Item.php:192 ../../mod/content.php:753
-msgid "add star"
-msgstr ""
-
-#: ../../object/Item.php:193 ../../mod/content.php:754
-msgid "remove star"
-msgstr ""
-
-#: ../../object/Item.php:194 ../../mod/content.php:755
-msgid "toggle star status"
-msgstr ""
-
-#: ../../object/Item.php:197 ../../mod/content.php:758
-msgid "starred"
-msgstr ""
-
-#: ../../object/Item.php:202 ../../mod/content.php:759
-msgid "add tag"
-msgstr ""
-
-#: ../../object/Item.php:213 ../../mod/content.php:684
-#: ../../mod/photos.php:1540
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../object/Item.php:213 ../../mod/content.php:684
-msgid "like"
-msgstr ""
-
-#: ../../object/Item.php:214 ../../mod/content.php:685
-#: ../../mod/photos.php:1541
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../object/Item.php:214 ../../mod/content.php:685
-msgid "dislike"
-msgstr ""
-
-#: ../../object/Item.php:216 ../../mod/content.php:687
-msgid "Share this"
-msgstr ""
-
-#: ../../object/Item.php:216 ../../mod/content.php:687
-msgid "share"
-msgstr ""
-
-#: ../../object/Item.php:298 ../../include/conversation.php:665
-msgid "Categories:"
-msgstr ""
-
-#: ../../object/Item.php:299 ../../include/conversation.php:666
-msgid "Filed under:"
-msgstr ""
-
-#: ../../object/Item.php:308 ../../object/Item.php:309
-#: ../../mod/content.php:471 ../../mod/content.php:852
-#: ../../mod/content.php:853 ../../include/conversation.php:653
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../object/Item.php:310 ../../mod/content.php:854
-msgid "to"
-msgstr ""
-
-#: ../../object/Item.php:311
-msgid "via"
-msgstr ""
-
-#: ../../object/Item.php:312 ../../mod/content.php:855
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: ../../object/Item.php:313 ../../mod/content.php:856
-msgid "via Wall-To-Wall:"
-msgstr ""
-
-#: ../../object/Item.php:322 ../../mod/content.php:481
-#: ../../mod/content.php:864 ../../include/conversation.php:673
-#, php-format
-msgid "%s from %s"
-msgstr ""
-
-#: ../../object/Item.php:342 ../../object/Item.php:658 ../../boot.php:713
-#: ../../mod/content.php:709 ../../mod/photos.php:1562
-#: ../../mod/photos.php:1606 ../../mod/photos.php:1694
-msgid "Comment"
-msgstr ""
-
-#: ../../object/Item.php:345 ../../mod/wallmessage.php:156
-#: ../../mod/editpost.php:124 ../../mod/content.php:499
-#: ../../mod/content.php:883 ../../mod/message.php:334
-#: ../../mod/message.php:565 ../../mod/photos.php:1543
-#: ../../include/conversation.php:691 ../../include/conversation.php:1108
-msgid "Please wait"
-msgstr ""
-
-#: ../../object/Item.php:368 ../../mod/content.php:603
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../object/Item.php:370 ../../object/Item.php:383
-#: ../../mod/content.php:605 ../../include/text.php:1968
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../object/Item.php:371 ../../boot.php:714 ../../mod/content.php:606
-#: ../../include/contact_widgets.php:204
-msgid "show more"
-msgstr ""
-
-#: ../../object/Item.php:656 ../../mod/content.php:707
-#: ../../mod/photos.php:1560 ../../mod/photos.php:1604
-#: ../../mod/photos.php:1692
-msgid "This is you"
-msgstr ""
-
-#: ../../object/Item.php:659 ../../view/theme/perihel/config.php:95
-#: ../../view/theme/diabook/theme.php:633
-#: ../../view/theme/diabook/config.php:148
-#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../view/theme/clean/config.php:79
-#: ../../view/theme/_clean_repo/config.php:79
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/vier/config.php:51
-#: ../../view/theme/vier-mobil/config.php:47 ../../mod/mood.php:137
-#: ../../mod/install.php:248 ../../mod/install.php:286
-#: ../../mod/crepair.php:171 ../../mod/content.php:710
-#: ../../mod/contacts.php:464 ../../mod/profiles.php:642
+#: ../../view/theme/vier/config.php:52 ../../view/theme/diabook/config.php:148
+#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
+#: ../../object/Item.php:678 ../../mod/contacts.php:470
+#: ../../mod/manage.php:110 ../../mod/fsuggest.php:107
+#: ../../mod/photos.php:1084 ../../mod/photos.php:1205
+#: ../../mod/photos.php:1512 ../../mod/photos.php:1563
+#: ../../mod/photos.php:1607 ../../mod/photos.php:1695
+#: ../../mod/invite.php:140 ../../mod/events.php:478 ../../mod/mood.php:137
 #: ../../mod/message.php:335 ../../mod/message.php:564
-#: ../../mod/localtime.php:45 ../../mod/photos.php:1084
-#: ../../mod/photos.php:1205 ../../mod/photos.php:1512
-#: ../../mod/photos.php:1563 ../../mod/photos.php:1607
-#: ../../mod/photos.php:1695 ../../mod/poke.php:199 ../../mod/events.php:478
-#: ../../mod/fsuggest.php:107 ../../mod/invite.php:140
-#: ../../mod/manage.php:110
+#: ../../mod/profiles.php:645 ../../mod/install.php:248
+#: ../../mod/install.php:286 ../../mod/crepair.php:179
+#: ../../mod/content.php:710 ../../mod/poke.php:199 ../../mod/localtime.php:45
 msgid "Submit"
 msgstr ""
 
-#: ../../object/Item.php:660 ../../mod/content.php:711
-msgid "Bold"
+#: ../../view/theme/cleanzero/config.php:82
+#: ../../view/theme/vier/config.php:54 ../../view/theme/diabook/config.php:150
+#: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72
+msgid "Theme settings"
 msgstr ""
 
-#: ../../object/Item.php:661 ../../mod/content.php:712
-msgid "Italic"
+#: ../../view/theme/cleanzero/config.php:83
+msgid "Set resize level for images in posts and comments (width and height)"
 msgstr ""
 
-#: ../../object/Item.php:662 ../../mod/content.php:713
-msgid "Underline"
+#: ../../view/theme/cleanzero/config.php:84
+#: ../../view/theme/diabook/config.php:151
+#: ../../view/theme/dispy/config.php:73
+msgid "Set font-size for posts and comments"
 msgstr ""
 
-#: ../../object/Item.php:663 ../../mod/content.php:714
-msgid "Quote"
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
 msgstr ""
 
-#: ../../object/Item.php:664 ../../mod/content.php:715
-msgid "Code"
+#: ../../view/theme/cleanzero/config.php:86
+#: ../../view/theme/quattro/config.php:68
+msgid "Color scheme"
 msgstr ""
 
-#: ../../object/Item.php:665 ../../mod/content.php:716
-msgid "Image"
+#: ../../view/theme/vier/config.php:55
+msgid "Set style"
 msgstr ""
 
-#: ../../object/Item.php:666 ../../mod/content.php:717
-msgid "Link"
+#: ../../view/theme/diabook/config.php:142
+#: ../../view/theme/diabook/theme.php:621 ../../include/acl_selectors.php:328
+msgid "don't show"
 msgstr ""
 
-#: ../../object/Item.php:667 ../../mod/content.php:718
-msgid "Video"
+#: ../../view/theme/diabook/config.php:142
+#: ../../view/theme/diabook/theme.php:621 ../../include/acl_selectors.php:327
+msgid "show"
 msgstr ""
 
-#: ../../object/Item.php:668 ../../mod/editpost.php:145
-#: ../../mod/content.php:719 ../../mod/photos.php:1564
-#: ../../mod/photos.php:1608 ../../mod/photos.php:1696
-#: ../../include/conversation.php:1125
-msgid "Preview"
+#: ../../view/theme/diabook/config.php:152
+#: ../../view/theme/dispy/config.php:74
+msgid "Set line-height for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:153
+msgid "Set resolution for middle column"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:154
+msgid "Set color scheme"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:155
+msgid "Set zoomfactor for Earth Layer"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:156
+#: ../../view/theme/diabook/theme.php:585
+msgid "Set longitude (X) for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:157
+#: ../../view/theme/diabook/theme.php:586
+msgid "Set latitude (Y) for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:158
+#: ../../view/theme/diabook/theme.php:130
+#: ../../view/theme/diabook/theme.php:544
+#: ../../view/theme/diabook/theme.php:624
+msgid "Community Pages"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:159
+#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:625
+msgid "Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:160
+#: ../../view/theme/diabook/theme.php:391
+#: ../../view/theme/diabook/theme.php:626
+msgid "Community Profiles"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:161
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:627
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:162
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:628
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:163
+#: ../../view/theme/diabook/theme.php:523
+#: ../../view/theme/diabook/theme.php:629
+msgid "Find Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:164
+#: ../../view/theme/diabook/theme.php:412
+#: ../../view/theme/diabook/theme.php:630
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:165
+#: ../../view/theme/diabook/theme.php:486
+#: ../../view/theme/diabook/theme.php:631
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:166
+#: ../../view/theme/diabook/theme.php:441
+#: ../../view/theme/diabook/theme.php:632
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:105
+#: ../../include/nav.php:146 ../../mod/notifications.php:93
+msgid "Home"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:76
+#: ../../include/nav.php:146
+msgid "Your posts and conversations"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:124 ../../boot.php:2070
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:87
+#: ../../include/nav.php:77 ../../mod/profperm.php:103
+#: ../../mod/newmember.php:32
+msgid "Profile"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:124 ../../include/nav.php:77
+msgid "Your profile page"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:125 ../../include/nav.php:175
+#: ../../mod/contacts.php:694
+msgid "Contacts"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:125
+msgid "Your contacts"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:126 ../../boot.php:2077
+#: ../../include/nav.php:78 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:78
+msgid "Your photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:127 ../../boot.php:2094
+#: ../../include/nav.php:80 ../../mod/events.php:370
+msgid "Events"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:80
+msgid "Your events"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:81
+msgid "Personal notes"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:128
+msgid "Your personal photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:129 ../../include/nav.php:129
+#: ../../mod/community.php:32
+msgid "Community"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:463 ../../include/conversation.php:118
+#: ../../include/conversation.php:246 ../../include/text.php:1964
+msgid "event"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:466
+#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:1919
+#: ../../include/conversation.php:121 ../../include/conversation.php:130
+#: ../../include/conversation.php:249 ../../include/conversation.php:258
+#: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87
+#: ../../mod/tagger.php:62
+msgid "status"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:1919
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../include/text.php:1966 ../../mod/like.php:149
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62
+msgid "photo"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:1935
+#: ../../include/conversation.php:137 ../../mod/like.php:166
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:499 ../../mod/photos.php:60
+#: ../../mod/photos.php:155 ../../mod/photos.php:1064
+#: ../../mod/photos.php:1189 ../../mod/photos.php:1212
+#: ../../mod/photos.php:1758 ../../mod/photos.php:1770
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:500 ../../include/user.php:335
+#: ../../include/user.php:342 ../../include/user.php:349
+#: ../../mod/photos.php:155 ../../mod/photos.php:731 ../../mod/photos.php:1189
+#: ../../mod/photos.php:1212 ../../mod/profile_photo.php:74
+#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
+#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
+#: ../../mod/profile_photo.php:305
+msgid "Profile Photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:524
+msgid "Local Directory"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:525 ../../mod/directory.php:51
+msgid "Global Directory"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:526 ../../include/contact_widgets.php:36
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:527 ../../include/contact_widgets.php:35
+#: ../../mod/suggest.php:66
+msgid "Friend Suggestions"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:528 ../../include/contact_widgets.php:38
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:544
+#: ../../view/theme/diabook/theme.php:648 ../../include/nav.php:170
+#: ../../mod/settings.php:85 ../../mod/admin.php:1065 ../../mod/admin.php:1286
+#: ../../mod/newmember.php:22
+msgid "Settings"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:584
+msgid "Set zoomfactor for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:622
+msgid "Show/hide boxes at right-hand column:"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:67
+msgid "Alignment"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:67
+msgid "Left"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:67
+msgid "Center"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:69
+msgid "Posts font size"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:70
+msgid "Textareas font size"
+msgstr ""
+
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"
 msgstr ""
 
 #: ../../index.php:203 ../../mod/apps.php:7
@@ -248,28 +337,28 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../index.php:360 ../../mod/mood.php:114 ../../mod/display.php:319
-#: ../../mod/register.php:41 ../../mod/dfrn_confirm.php:53
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/suggest.php:56
-#: ../../mod/network.php:4 ../../mod/install.php:151 ../../mod/editpost.php:10
-#: ../../mod/attach.php:33 ../../mod/regmod.php:118 ../../mod/crepair.php:117
-#: ../../mod/uimport.php:23 ../../mod/notes.php:20 ../../mod/contacts.php:246
-#: ../../mod/settings.php:102 ../../mod/settings.php:593
-#: ../../mod/settings.php:598 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:575 ../../mod/group.php:19 ../../mod/follow.php:9
-#: ../../mod/message.php:38 ../../mod/message.php:174
-#: ../../mod/viewcontacts.php:22 ../../mod/photos.php:134
-#: ../../mod/photos.php:1050 ../../mod/wall_attach.php:55
-#: ../../mod/poke.php:135 ../../mod/wall_upload.php:66
+#: ../../index.php:360 ../../include/items.php:4550 ../../mod/attach.php:33
+#: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
+#: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
+#: ../../mod/group.php:19 ../../mod/delegate.php:6
+#: ../../mod/notifications.php:66 ../../mod/settings.php:102
+#: ../../mod/settings.php:593 ../../mod/settings.php:598
+#: ../../mod/contacts.php:249 ../../mod/wall_attach.php:55
+#: ../../mod/register.php:42 ../../mod/manage.php:96 ../../mod/editpost.php:10
+#: ../../mod/regmod.php:109 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/suggest.php:56 ../../mod/nogroup.php:25 ../../mod/fsuggest.php:78
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_upload.php:66
+#: ../../mod/notes.php:20 ../../mod/network.php:4 ../../mod/photos.php:134
+#: ../../mod/photos.php:1050 ../../mod/follow.php:9 ../../mod/uimport.php:23
+#: ../../mod/invite.php:15 ../../mod/invite.php:101 ../../mod/events.php:140
+#: ../../mod/mood.php:114 ../../mod/message.php:38 ../../mod/message.php:174
+#: ../../mod/profiles.php:148 ../../mod/profiles.php:577
+#: ../../mod/install.php:151 ../../mod/crepair.php:117 ../../mod/poke.php:135
+#: ../../mod/display.php:455 ../../mod/dfrn_confirm.php:55
+#: ../../mod/item.php:148 ../../mod/item.php:164
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../mod/events.php:140 ../../mod/delegate.php:6 ../../mod/nogroup.php:25
-#: ../../mod/fsuggest.php:78 ../../mod/item.php:148 ../../mod/item.php:164
-#: ../../mod/notifications.php:66 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/manage.php:96 ../../mod/allfriends.php:9
-#: ../../include/items.php:4496
+#: ../../mod/allfriends.php:9
 msgid "Permission denied."
 msgstr ""
 
@@ -277,943 +366,2701 @@ msgstr ""
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:33
-#: ../../view/theme/diabook/theme.php:123 ../../mod/notifications.php:93
-#: ../../include/nav.php:105 ../../include/nav.php:146
-msgid "Home"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:33
-#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:76
-#: ../../include/nav.php:146
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:34
-#: ../../view/theme/diabook/theme.php:124 ../../boot.php:2021
-#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../include/nav.php:77 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:84
-msgid "Profile"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:34
-#: ../../view/theme/diabook/theme.php:124 ../../include/nav.php:77
-msgid "Your profile page"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:35
-#: ../../view/theme/diabook/theme.php:126 ../../boot.php:2028
-#: ../../mod/fbrowser.php:25 ../../include/nav.php:78
-msgid "Photos"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:35
-#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:78
-msgid "Your photos"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:36
-#: ../../view/theme/diabook/theme.php:127 ../../boot.php:2045
-#: ../../mod/events.php:370 ../../include/nav.php:80
-msgid "Events"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:36
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:80
-msgid "Your events"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:37
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:81
-msgid "Personal notes"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:37
-#: ../../view/theme/diabook/theme.php:128
-msgid "Your personal photos"
-msgstr ""
-
-#: ../../view/theme/perihel/theme.php:38
-#: ../../view/theme/diabook/theme.php:129 ../../mod/community.php:32
-#: ../../include/nav.php:129
-msgid "Community"
-msgstr ""
-
-#: ../../view/theme/perihel/config.php:89
-#: ../../view/theme/diabook/theme.php:621
-#: ../../view/theme/diabook/config.php:142 ../../include/acl_selectors.php:328
-msgid "don't show"
-msgstr ""
-
-#: ../../view/theme/perihel/config.php:89
-#: ../../view/theme/diabook/theme.php:621
-#: ../../view/theme/diabook/config.php:142 ../../include/acl_selectors.php:327
-msgid "show"
-msgstr ""
-
-#: ../../view/theme/perihel/config.php:97
-#: ../../view/theme/diabook/config.php:150
-#: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72
-#: ../../view/theme/clean/config.php:81
-#: ../../view/theme/_clean_repo/config.php:81
-#: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/vier/config.php:53
-#: ../../view/theme/vier-mobil/config.php:49
-msgid "Theme settings"
-msgstr ""
-
-#: ../../view/theme/perihel/config.php:98
-#: ../../view/theme/diabook/config.php:151
-#: ../../view/theme/dispy/config.php:73
-#: ../../view/theme/cleanzero/config.php:84
-msgid "Set font-size for posts and comments"
-msgstr ""
-
-#: ../../view/theme/perihel/config.php:99
-#: ../../view/theme/diabook/config.php:152
-#: ../../view/theme/dispy/config.php:74
-msgid "Set line-height for posts and comments"
-msgstr ""
-
-#: ../../view/theme/perihel/config.php:100
-#: ../../view/theme/diabook/config.php:153
-msgid "Set resolution for middle column"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:125 ../../mod/contacts.php:688
-#: ../../include/nav.php:175
-msgid "Contacts"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:125
-msgid "Your contacts"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:130
-#: ../../view/theme/diabook/theme.php:544
-#: ../../view/theme/diabook/theme.php:624
-#: ../../view/theme/diabook/config.php:158
-msgid "Community Pages"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:391
-#: ../../view/theme/diabook/theme.php:626
-#: ../../view/theme/diabook/config.php:160
-msgid "Community Profiles"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:412
-#: ../../view/theme/diabook/theme.php:630
-#: ../../view/theme/diabook/config.php:164
-msgid "Last users"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:441
-#: ../../view/theme/diabook/theme.php:632
-#: ../../view/theme/diabook/config.php:166
-msgid "Last likes"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:463 ../../include/conversation.php:118
-#: ../../include/conversation.php:246 ../../include/text.php:1962
-msgid "event"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:466
-#: ../../view/theme/diabook/theme.php:475 ../../mod/tagger.php:62
-#: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87
-#: ../../include/conversation.php:121 ../../include/conversation.php:130
-#: ../../include/conversation.php:249 ../../include/conversation.php:258
-#: ../../include/diaspora.php:1920
-msgid "status"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:471 ../../mod/tagger.php:62
-#: ../../mod/like.php:149 ../../mod/subthread.php:87
-#: ../../include/conversation.php:126 ../../include/conversation.php:254
-#: ../../include/text.php:1964 ../../include/diaspora.php:1920
-msgid "photo"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:480 ../../mod/like.php:166
-#: ../../include/conversation.php:137 ../../include/diaspora.php:1936
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:486
-#: ../../view/theme/diabook/theme.php:631
-#: ../../view/theme/diabook/config.php:165
-msgid "Last photos"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:499 ../../mod/photos.php:60
-#: ../../mod/photos.php:155 ../../mod/photos.php:1064
-#: ../../mod/photos.php:1189 ../../mod/photos.php:1212
-#: ../../mod/photos.php:1758 ../../mod/photos.php:1770
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:500 ../../mod/photos.php:155
-#: ../../mod/photos.php:731 ../../mod/photos.php:1189
-#: ../../mod/photos.php:1212 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
-#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
-#: ../../mod/profile_photo.php:305 ../../include/user.php:334
-#: ../../include/user.php:341 ../../include/user.php:348
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:523
-#: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:163
-msgid "Find Friends"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:524
-msgid "Local Directory"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:525 ../../mod/directory.php:49
-msgid "Global Directory"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:526 ../../include/contact_widgets.php:35
-msgid "Similar Interests"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:527 ../../mod/suggest.php:66
-#: ../../include/contact_widgets.php:34
-msgid "Friend Suggestions"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:528 ../../include/contact_widgets.php:37
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:544
-#: ../../view/theme/diabook/theme.php:648 ../../mod/newmember.php:22
-#: ../../mod/admin.php:1019 ../../mod/admin.php:1238 ../../mod/settings.php:85
-#: ../../include/nav.php:170
-msgid "Settings"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:579
-#: ../../view/theme/diabook/theme.php:625
-#: ../../view/theme/diabook/config.php:159
-msgid "Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:584
-msgid "Set zoomfactor for Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:585
-#: ../../view/theme/diabook/config.php:156
-msgid "Set longitude (X) for Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:586
-#: ../../view/theme/diabook/config.php:157
-msgid "Set latitude (Y) for Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:627
-#: ../../view/theme/diabook/config.php:161
-msgid "Help or @NewHere ?"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:628
-#: ../../view/theme/diabook/config.php:162
-msgid "Connect Services"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:622
-msgid "Show/hide boxes at right-hand column:"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:154
-msgid "Set color scheme"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:155
-msgid "Set zoomfactor for Earth Layer"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:67
-msgid "Alignment"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:67
-msgid "Left"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:67
-msgid "Center"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:68 ../../view/theme/clean/config.php:84
-#: ../../view/theme/_clean_repo/config.php:84
-#: ../../view/theme/cleanzero/config.php:86
-msgid "Color scheme"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:69
-msgid "Posts font size"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:70
-msgid "Textareas font size"
-msgstr ""
-
-#: ../../view/theme/dispy/config.php:75
-msgid "Set colour scheme"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:56
-#: ../../view/theme/_clean_repo/config.php:56 ../../include/user.php:246
-#: ../../include/text.php:1698
-msgid "default"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:57
-#: ../../view/theme/_clean_repo/config.php:57
-msgid "dark"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:58
-#: ../../view/theme/_clean_repo/config.php:58
-msgid "black"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:82
-#: ../../view/theme/_clean_repo/config.php:82
-msgid "Background Image"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:82
-#: ../../view/theme/_clean_repo/config.php:82
-msgid ""
-"The URL to a picture (e.g. from your photo album) that should be used as "
-"background image."
-msgstr ""
-
-#: ../../view/theme/clean/config.php:83
-#: ../../view/theme/_clean_repo/config.php:83
-msgid "Background Color"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:83
-#: ../../view/theme/_clean_repo/config.php:83
-msgid "HEX value for the background color. Don't include the #"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:85
-#: ../../view/theme/_clean_repo/config.php:85
-msgid "font size"
-msgstr ""
-
-#: ../../view/theme/clean/config.php:85
-#: ../../view/theme/_clean_repo/config.php:85
-msgid "base font size for your interface"
-msgstr ""
-
-#: ../../view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
-msgstr ""
-
-#: ../../view/theme/cleanzero/config.php:85
-msgid "Set theme width"
-msgstr ""
-
-#: ../../view/theme/vier/config.php:54
-#: ../../view/theme/vier-mobil/config.php:50
-msgid "Set style"
-msgstr ""
-
-#: ../../boot.php:712
+#: ../../boot.php:719
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:715
+#: ../../boot.php:720 ../../object/Item.php:361 ../../object/Item.php:677
+#: ../../mod/photos.php:1562 ../../mod/photos.php:1606
+#: ../../mod/photos.php:1694 ../../mod/content.php:709
+msgid "Comment"
+msgstr ""
+
+#: ../../boot.php:721 ../../include/contact_widgets.php:205
+#: ../../object/Item.php:390 ../../mod/content.php:606
+msgid "show more"
+msgstr ""
+
+#: ../../boot.php:722
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:1049
+#: ../../boot.php:1042 ../../boot.php:1073
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1051
-#, php-format
-msgid "Update Error at %s"
-msgstr ""
-
-#: ../../boot.php:1177
+#: ../../boot.php:1194
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:1178 ../../mod/register.php:279 ../../include/nav.php:109
+#: ../../boot.php:1195 ../../include/nav.php:109 ../../mod/register.php:266
 msgid "Register"
 msgstr ""
 
-#: ../../boot.php:1202 ../../include/nav.php:73
+#: ../../boot.php:1219 ../../include/nav.php:73
 msgid "Logout"
 msgstr ""
 
-#: ../../boot.php:1203 ../../include/nav.php:92
+#: ../../boot.php:1220 ../../include/nav.php:92
 msgid "Login"
 msgstr ""
 
-#: ../../boot.php:1205
+#: ../../boot.php:1222
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:1206
+#: ../../boot.php:1223
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:1207
+#: ../../boot.php:1224
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1210
+#: ../../boot.php:1227
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:1216
+#: ../../boot.php:1233
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1217 ../../mod/lostpass.php:84
+#: ../../boot.php:1234 ../../mod/lostpass.php:109
 msgid "Password Reset"
 msgstr ""
 
-#: ../../boot.php:1219
+#: ../../boot.php:1236
 msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../boot.php:1220
+#: ../../boot.php:1237
 msgid "terms of service"
 msgstr ""
 
-#: ../../boot.php:1222
+#: ../../boot.php:1239
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../boot.php:1223
+#: ../../boot.php:1240
 msgid "privacy policy"
 msgstr ""
 
-#: ../../boot.php:1356
+#: ../../boot.php:1373
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1395 ../../mod/profile.php:21
+#: ../../boot.php:1412 ../../mod/profile.php:21
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../boot.php:1435 ../../boot.php:1539
+#: ../../boot.php:1455 ../../boot.php:1589
+#: ../../include/profile_advanced.php:84
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1487 ../../mod/suggest.php:88 ../../mod/match.php:58
-#: ../../include/contact_widgets.php:9
+#: ../../boot.php:1522 ../../include/contact_widgets.php:10
+#: ../../mod/suggest.php:88 ../../mod/match.php:58
 msgid "Connect"
 msgstr ""
 
-#: ../../boot.php:1501
+#: ../../boot.php:1554
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1509 ../../include/nav.php:173
+#: ../../boot.php:1560 ../../include/nav.php:173
 msgid "Profiles"
 msgstr ""
 
-#: ../../boot.php:1509
+#: ../../boot.php:1560
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1515 ../../boot.php:1541 ../../mod/profiles.php:738
+#: ../../boot.php:1565 ../../boot.php:1591 ../../mod/profiles.php:763
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../boot.php:1516 ../../mod/profiles.php:739
+#: ../../boot.php:1566 ../../mod/profiles.php:764
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../boot.php:1526 ../../mod/profiles.php:750
+#: ../../boot.php:1576 ../../mod/profiles.php:775
 msgid "Profile Image"
 msgstr ""
 
-#: ../../boot.php:1529 ../../mod/profiles.php:752
+#: ../../boot.php:1579 ../../mod/profiles.php:777
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../boot.php:1530 ../../mod/profiles.php:753
+#: ../../boot.php:1580 ../../mod/profiles.php:778
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../boot.php:1555 ../../mod/directory.php:134 ../../mod/events.php:471
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:156
+#: ../../boot.php:1602 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:156 ../../mod/events.php:471
+#: ../../mod/directory.php:136
 msgid "Location:"
 msgstr ""
 
-#: ../../boot.php:1557 ../../mod/directory.php:136
-#: ../../include/profile_advanced.php:17
+#: ../../boot.php:1604 ../../include/profile_advanced.php:17
+#: ../../mod/directory.php:138
 msgid "Gender:"
 msgstr ""
 
-#: ../../boot.php:1560 ../../mod/directory.php:138
-#: ../../include/profile_advanced.php:37
+#: ../../boot.php:1607 ../../include/profile_advanced.php:37
+#: ../../mod/directory.php:140
 msgid "Status:"
 msgstr ""
 
-#: ../../boot.php:1562 ../../mod/directory.php:140
-#: ../../include/profile_advanced.php:48
+#: ../../boot.php:1609 ../../include/profile_advanced.php:48
+#: ../../mod/directory.php:142
 msgid "Homepage:"
 msgstr ""
 
-#: ../../boot.php:1638 ../../boot.php:1724
+#: ../../boot.php:1657
+msgid "Network:"
+msgstr ""
+
+#: ../../boot.php:1687 ../../boot.php:1773
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1639 ../../boot.php:1725
+#: ../../boot.php:1688 ../../boot.php:1774
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1684 ../../boot.php:1765
+#: ../../boot.php:1733 ../../boot.php:1814
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1696
+#: ../../boot.php:1745
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1697
+#: ../../boot.php:1746
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1758
+#: ../../boot.php:1807
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1776
+#: ../../boot.php:1825
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1777
+#: ../../boot.php:1826
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:2014 ../../include/nav.php:76
+#: ../../boot.php:2063 ../../include/nav.php:76
 msgid "Status"
 msgstr ""
 
-#: ../../boot.php:2017
+#: ../../boot.php:2066
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:2024
+#: ../../boot.php:2073
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:2031 ../../mod/photos.php:52
+#: ../../boot.php:2080 ../../mod/photos.php:52
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../boot.php:2035 ../../boot.php:2038 ../../include/nav.php:79
+#: ../../boot.php:2084 ../../boot.php:2087 ../../include/nav.php:79
 msgid "Videos"
 msgstr ""
 
-#: ../../boot.php:2048
+#: ../../boot.php:2097
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:2052 ../../mod/notes.php:44
+#: ../../boot.php:2101 ../../mod/notes.php:44
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../boot.php:2055
+#: ../../boot.php:2104
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:227
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:30
+msgid "Post Composition Features"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Richtext Editor"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Enable richtext editor"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Post Preview"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Allow previewing posts and comments before publishing them"
+msgstr ""
+
+#: ../../include/features.php:33
+msgid "Auto-mention Forums"
+msgstr ""
+
+#: ../../include/features.php:33
+msgid ""
+"Add/remove mention when a fourm page is selected/deselected in ACL window."
+msgstr ""
+
+#: ../../include/features.php:38
+msgid "Network Sidebar Widgets"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Group Filter"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Enable widget to display Network posts only from selected group"
+msgstr ""
+
+#: ../../include/features.php:41
+msgid "Network Filter"
+msgstr ""
+
+#: ../../include/features.php:41
+msgid "Enable widget to display Network posts only from selected network"
+msgstr ""
+
+#: ../../include/features.php:42 ../../mod/network.php:188
+#: ../../mod/search.php:30
+msgid "Saved Searches"
+msgstr ""
+
+#: ../../include/features.php:42
+msgid "Save search terms for re-use"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Network Tabs"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Network Personal Tab"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Network New Tab"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Network Shared Links Tab"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Enable tab to display only Network posts with links in them"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Post/Comment Tools"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Multiple Deletion"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Select and delete multiple posts/comments at once"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Edit Sent Posts"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Edit and correct posts and comments after sending"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Tagging"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Ability to tag existing posts"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Post Categories"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Add categories to your posts"
+msgstr ""
+
+#: ../../include/features.php:60 ../../include/contact_widgets.php:104
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Dislike Posts"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Ability to dislike posts/comments"
+msgstr ""
+
+#: ../../include/features.php:62
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:62
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
+#: ../../include/features.php:63
+msgid "Mute Post Notifications"
+msgstr ""
+
+#: ../../include/features.php:63
+msgid "Ability to mute notifications for a thread"
+msgstr ""
+
+#: ../../include/items.php:2090 ../../include/datetime.php:472
 #, php-format
-msgid "%1$s is currently %2$s"
+msgid "%s's birthday"
 msgstr ""
 
-#: ../../mod/mood.php:133
-msgid "Mood"
+#: ../../include/items.php:2091 ../../include/datetime.php:473
+#, php-format
+msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../mod/mood.php:134
-msgid "Set your current mood and tell your friends"
+#: ../../include/items.php:3856 ../../mod/dfrn_request.php:721
+#: ../../mod/dfrn_confirm.php:752
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/display.php:45 ../../mod/_search.php:89
-#: ../../mod/directory.php:31 ../../mod/search.php:89
-#: ../../mod/dfrn_request.php:761 ../../mod/community.php:18
-#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:920
-#: ../../mod/videos.php:115
-msgid "Public access denied."
-msgstr ""
-
-#: ../../mod/display.php:104 ../../mod/display.php:323
-#: ../../mod/decrypt.php:15 ../../mod/admin.php:164 ../../mod/admin.php:967
-#: ../../mod/admin.php:1178 ../../mod/notice.php:15 ../../mod/viewsrc.php:15
-#: ../../include/items.php:4300
+#: ../../include/items.php:4354 ../../mod/admin.php:166
+#: ../../mod/admin.php:1013 ../../mod/admin.php:1226 ../../mod/viewsrc.php:15
+#: ../../mod/notice.php:15 ../../mod/display.php:70 ../../mod/display.php:240
+#: ../../mod/display.php:459
 msgid "Item not found."
 msgstr ""
 
-#: ../../mod/display.php:152 ../../mod/profile.php:155
-msgid "Access to this profile has been restricted."
+#: ../../include/items.php:4393
+msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: ../../mod/display.php:316
-msgid "Item has been removed."
-msgstr ""
-
-#: ../../mod/decrypt.php:9 ../../mod/viewsrc.php:7
-msgid "Access denied."
-msgstr ""
-
-#: ../../mod/friendica.php:62
-msgid "This is Friendica, version"
-msgstr ""
-
-#: ../../mod/friendica.php:63
-msgid "running at web location"
-msgstr ""
-
-#: ../../mod/friendica.php:65
-msgid ""
-"Please visit Friendica.com to learn "
-"more about the Friendica project."
-msgstr ""
-
-#: ../../mod/friendica.php:67
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: ../../mod/friendica.php:68
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr ""
-
-#: ../../mod/friendica.php:82
-msgid "Installed plugins/addons/apps:"
-msgstr ""
-
-#: ../../mod/friendica.php:95
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr ""
-
-#: ../../mod/register.php:92 ../../mod/admin.php:749 ../../mod/regmod.php:54
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../mod/register.php:100
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-
-#: ../../mod/register.php:104
-msgid "Failed to send email message. Here is the message that failed."
-msgstr ""
-
-#: ../../mod/register.php:109
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: ../../mod/register.php:149
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../mod/register.php:158
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: ../../mod/register.php:196 ../../mod/uimport.php:50
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:224
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr ""
-
-#: ../../mod/register.php:225
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-
-#: ../../mod/register.php:226
-msgid "Your OpenID (optional): "
-msgstr ""
-
-#: ../../mod/register.php:240
-msgid "Include your profile in member directory?"
-msgstr ""
-
-#: ../../mod/register.php:243 ../../mod/api.php:105 ../../mod/suggest.php:29
-#: ../../mod/dfrn_request.php:836 ../../mod/contacts.php:326
-#: ../../mod/settings.php:1007 ../../mod/settings.php:1013
-#: ../../mod/settings.php:1021 ../../mod/settings.php:1025
-#: ../../mod/settings.php:1030 ../../mod/settings.php:1036
-#: ../../mod/settings.php:1042 ../../mod/settings.php:1048
-#: ../../mod/settings.php:1078 ../../mod/settings.php:1079
-#: ../../mod/settings.php:1080 ../../mod/settings.php:1081
-#: ../../mod/settings.php:1082 ../../mod/profiles.php:618
-#: ../../mod/profiles.php:621 ../../mod/message.php:209
-#: ../../include/items.php:4341
-msgid "Yes"
-msgstr ""
-
-#: ../../mod/register.php:244 ../../mod/api.php:106
-#: ../../mod/dfrn_request.php:837 ../../mod/settings.php:1007
+#: ../../include/items.php:4395 ../../mod/settings.php:1007
 #: ../../mod/settings.php:1013 ../../mod/settings.php:1021
 #: ../../mod/settings.php:1025 ../../mod/settings.php:1030
 #: ../../mod/settings.php:1036 ../../mod/settings.php:1042
 #: ../../mod/settings.php:1048 ../../mod/settings.php:1078
 #: ../../mod/settings.php:1079 ../../mod/settings.php:1080
 #: ../../mod/settings.php:1081 ../../mod/settings.php:1082
-#: ../../mod/profiles.php:618 ../../mod/profiles.php:622
-msgid "No"
+#: ../../mod/contacts.php:332 ../../mod/register.php:230
+#: ../../mod/dfrn_request.php:834 ../../mod/api.php:105
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+#: ../../mod/profiles.php:620 ../../mod/profiles.php:623
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/register.php:261
-msgid "Membership on this site is by invitation only."
+#: ../../include/items.php:4398 ../../include/conversation.php:1129
+#: ../../mod/settings.php:612 ../../mod/settings.php:638
+#: ../../mod/contacts.php:335 ../../mod/editpost.php:148
+#: ../../mod/dfrn_request.php:848 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/suggest.php:32
+#: ../../mod/photos.php:203 ../../mod/photos.php:292 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/message.php:212
+msgid "Cancel"
 msgstr ""
 
-#: ../../mod/register.php:262
-msgid "Your invitation ID: "
+#: ../../include/items.php:4616
+msgid "Archives"
 msgstr ""
 
-#: ../../mod/register.php:265 ../../mod/admin.php:585
-msgid "Registration"
-msgstr ""
-
-#: ../../mod/register.php:273
-msgid "Your Full Name (e.g. Joe Smith): "
-msgstr ""
-
-#: ../../mod/register.php:274
-msgid "Your Email Address: "
-msgstr ""
-
-#: ../../mod/register.php:275
+#: ../../include/group.php:25
 msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be 'nickname@$sitename'."
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../mod/register.php:276
-msgid "Choose a nickname: "
+#: ../../include/group.php:207
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../mod/register.php:285 ../../mod/uimport.php:64
-msgid "Import"
+#: ../../include/group.php:226
+msgid "Everybody"
 msgstr ""
 
-#: ../../mod/register.php:286
-msgid "Import your profile to this friendica instance"
+#: ../../include/group.php:249
+msgid "edit"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:62 ../../mod/profiles.php:18
-#: ../../mod/profiles.php:133 ../../mod/profiles.php:160
-#: ../../mod/profiles.php:587
-msgid "Profile not found."
+#: ../../include/group.php:270 ../../mod/newmember.php:66
+msgid "Groups"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:118 ../../mod/crepair.php:131
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
+#: ../../include/group.php:271
+msgid "Edit group"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:119
+#: ../../include/group.php:272
+msgid "Create a new group"
+msgstr ""
+
+#: ../../include/group.php:273
+msgid "Contacts not in any group"
+msgstr ""
+
+#: ../../include/group.php:275 ../../mod/network.php:189
+msgid "add"
+msgstr ""
+
+#: ../../include/Photo_old.php:911 ../../include/Photo_old.php:926
+#: ../../include/Photo_old.php:933 ../../include/Photo_old.php:955
+#: ../../include/Photo.php:911 ../../include/Photo.php:926
+#: ../../include/Photo.php:933 ../../include/Photo.php:955
+#: ../../include/message.php:144 ../../mod/wall_upload.php:169
+#: ../../mod/wall_upload.php:178 ../../mod/wall_upload.php:185
+#: ../../mod/item.php:463
+msgid "Wall Photos"
+msgstr ""
+
+#: ../../include/dba.php:51 ../../include/dba_pdo.php:72
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr ""
+
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
+msgstr ""
+
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
+msgstr ""
+
+#: ../../include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr ""
+
+#: ../../include/contact_widgets.php:24
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:30
+msgid "Find People"
+msgstr ""
+
+#: ../../include/contact_widgets.php:31
+msgid "Enter name or interest"
+msgstr ""
+
+#: ../../include/contact_widgets.php:32
+msgid "Connect/Follow"
+msgstr ""
+
+#: ../../include/contact_widgets.php:33
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr ""
+
+#: ../../include/contact_widgets.php:34 ../../mod/contacts.php:700
+#: ../../mod/directory.php:63
+msgid "Find"
+msgstr ""
+
+#: ../../include/contact_widgets.php:37
+msgid "Random Profile"
+msgstr ""
+
+#: ../../include/contact_widgets.php:71
+msgid "Networks"
+msgstr ""
+
+#: ../../include/contact_widgets.php:74
+msgid "All Networks"
+msgstr ""
+
+#: ../../include/contact_widgets.php:107 ../../include/contact_widgets.php:139
+msgid "Everything"
+msgstr ""
+
+#: ../../include/contact_widgets.php:136
+msgid "Categories"
+msgstr ""
+
+#: ../../include/contact_widgets.php:200 ../../mod/contacts.php:427
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/enotify.php:18
+msgid "Friendica Notification"
+msgstr ""
+
+#: ../../include/enotify.php:21
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/enotify.php:23
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: ../../include/enotify.php:30 ../../include/delivery.php:467
+#: ../../include/notifier.php:784
+msgid "noreply"
+msgstr ""
+
+#: ../../include/enotify.php:55
+#, php-format
+msgid "%s "
+msgstr ""
+
+#: ../../include/enotify.php:59
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr ""
+
+#: ../../include/enotify.php:61
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:62
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:62
+msgid "a private message"
+msgstr ""
+
+#: ../../include/enotify.php:63
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: ../../include/enotify.php:115
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr ""
+
+#: ../../include/enotify.php:122
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+msgstr ""
+
+#: ../../include/enotify.php:130
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr ""
+
+#: ../../include/enotify.php:140
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:141
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr ""
+
+#: ../../include/enotify.php:144 ../../include/enotify.php:159
+#: ../../include/enotify.php:172 ../../include/enotify.php:185
+#: ../../include/enotify.php:203 ../../include/enotify.php:216
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr ""
+
+#: ../../include/enotify.php:151
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: ../../include/enotify.php:153
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:155
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr ""
+
+#: ../../include/enotify.php:166
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:167
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:168
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr ""
+
+#: ../../include/enotify.php:179
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
+msgstr ""
+
+#: ../../include/enotify.php:180
+#, php-format
+msgid "%1$s shared a new post at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:181
+#, php-format
+msgid "%1$s [url=%2$s]shared a post[/url]."
+msgstr ""
+
+#: ../../include/enotify.php:193
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr ""
+
+#: ../../include/enotify.php:194
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:195
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr ""
+
+#: ../../include/enotify.php:210
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:211
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:212
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr ""
+
+#: ../../include/enotify.php:223
+msgid "[Friendica:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:224
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:225
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:228 ../../include/enotify.php:270
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../include/enotify.php:230
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr ""
+
+#: ../../include/enotify.php:238
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr ""
+
+#: ../../include/enotify.php:239 ../../include/enotify.php:240
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:246
+msgid "[Friendica:Notify] You have a new follower"
+msgstr ""
+
+#: ../../include/enotify.php:247 ../../include/enotify.php:248
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr ""
+
+#: ../../include/enotify.php:261
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../include/enotify.php:262
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:263
+#, php-format
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr ""
+
+#: ../../include/enotify.php:268
+msgid "Name:"
+msgstr ""
+
+#: ../../include/enotify.php:269
+msgid "Photo:"
+msgstr ""
+
+#: ../../include/enotify.php:272
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: ../../include/enotify.php:280 ../../include/enotify.php:293
+msgid "[Friendica:Notify] Connection accepted"
+msgstr ""
+
+#: ../../include/enotify.php:281 ../../include/enotify.php:294
+#, php-format
+msgid "'%1$s' has acepted your connection request at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:282 ../../include/enotify.php:295
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr ""
+
+#: ../../include/enotify.php:285
 msgid ""
-"This may occasionally happen if contact was requested by both persons and it "
-"has already been approved."
+"You are now mutual friends and may exchange status updates, photos, and "
+"email\n"
+"\twithout restriction."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:237
-msgid "Response from remote site was not understood."
+#: ../../include/enotify.php:288 ../../include/enotify.php:302
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:246
-msgid "Unexpected response from remote site: "
+#: ../../include/enotify.php:298
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a \"fan\", which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:254
-msgid "Confirmation completed successfully."
+#: ../../include/enotify.php:300
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future. "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
-#: ../../mod/dfrn_confirm.php:277
-msgid "Remote site reported: "
+#: ../../include/enotify.php:313
+msgid "[Friendica System:Notify] registration request"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:268
-msgid "Temporary failure. Please wait and try again."
+#: ../../include/enotify.php:314
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:275
-msgid "Introduction failed or was revoked."
+#: ../../include/enotify.php:315
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:420
-msgid "Unable to set contact photo."
+#: ../../include/enotify.php:318
+#, php-format
+msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:477 ../../include/conversation.php:172
-#: ../../include/diaspora.php:620
+#: ../../include/enotify.php:321
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr ""
+
+#: ../../include/api.php:262 ../../include/api.php:273
+#: ../../include/api.php:374 ../../include/api.php:958
+#: ../../include/api.php:960
+msgid "User not found."
+msgstr ""
+
+#: ../../include/api.php:1167
+msgid "There is no status with this id."
+msgstr ""
+
+#: ../../include/api.php:1237
+msgid "There is no conversation with this id."
+msgstr ""
+
+#: ../../include/network.php:892
+msgid "view full size"
+msgstr ""
+
+#: ../../include/Scrape.php:584
+msgid " on Last.fm"
+msgstr ""
+
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1125
+msgid "Full Name:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:22
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/profile_advanced.php:23
+msgid "j F"
+msgstr ""
+
+#: ../../include/profile_advanced.php:30
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:34
+msgid "Age:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:43
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:673
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:675
+msgid "Hometown:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:52
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:676
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:56
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:58 ../../mod/directory.php:144
+msgid "About:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:60
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:680
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:681
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:67
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:69
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:71
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:73
+msgid "Television:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:75
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:77
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:79
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:81
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/nav.php:34 ../../mod/navigation.php:20
+msgid "Nothing new here"
+msgstr ""
+
+#: ../../include/nav.php:38 ../../mod/navigation.php:24
+msgid "Clear notifications"
+msgstr ""
+
+#: ../../include/nav.php:73
+msgid "End this session"
+msgstr ""
+
+#: ../../include/nav.php:79
+msgid "Your videos"
+msgstr ""
+
+#: ../../include/nav.php:81
+msgid "Your personal notes"
+msgstr ""
+
+#: ../../include/nav.php:92
+msgid "Sign in"
+msgstr ""
+
+#: ../../include/nav.php:105
+msgid "Home Page"
+msgstr ""
+
+#: ../../include/nav.php:109
+msgid "Create an account"
+msgstr ""
+
+#: ../../include/nav.php:114 ../../mod/help.php:84
+msgid "Help"
+msgstr ""
+
+#: ../../include/nav.php:114
+msgid "Help and documentation"
+msgstr ""
+
+#: ../../include/nav.php:117
+msgid "Apps"
+msgstr ""
+
+#: ../../include/nav.php:117
+msgid "Addon applications, utilities, games"
+msgstr ""
+
+#: ../../include/nav.php:119 ../../include/text.php:952
+#: ../../include/text.php:953 ../../mod/search.php:99
+msgid "Search"
+msgstr ""
+
+#: ../../include/nav.php:119
+msgid "Search site content"
+msgstr ""
+
+#: ../../include/nav.php:129
+msgid "Conversations on this site"
+msgstr ""
+
+#: ../../include/nav.php:131
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:131
+msgid "People directory"
+msgstr ""
+
+#: ../../include/nav.php:133
+msgid "Information"
+msgstr ""
+
+#: ../../include/nav.php:133
+msgid "Information about this friendica instance"
+msgstr ""
+
+#: ../../include/nav.php:143 ../../mod/notifications.php:83
+msgid "Network"
+msgstr ""
+
+#: ../../include/nav.php:143
+msgid "Conversations from your friends"
+msgstr ""
+
+#: ../../include/nav.php:144
+msgid "Network Reset"
+msgstr ""
+
+#: ../../include/nav.php:144
+msgid "Load Network page with no filters"
+msgstr ""
+
+#: ../../include/nav.php:152 ../../mod/notifications.php:98
+msgid "Introductions"
+msgstr ""
+
+#: ../../include/nav.php:152
+msgid "Friend Requests"
+msgstr ""
+
+#: ../../include/nav.php:153 ../../mod/notifications.php:220
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:154
+msgid "See all notifications"
+msgstr ""
+
+#: ../../include/nav.php:155
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:159 ../../mod/notifications.php:103
+#: ../../mod/message.php:182
+msgid "Messages"
+msgstr ""
+
+#: ../../include/nav.php:159
+msgid "Private mail"
+msgstr ""
+
+#: ../../include/nav.php:160
+msgid "Inbox"
+msgstr ""
+
+#: ../../include/nav.php:161
+msgid "Outbox"
+msgstr ""
+
+#: ../../include/nav.php:162 ../../mod/message.php:9
+msgid "New Message"
+msgstr ""
+
+#: ../../include/nav.php:165
+msgid "Manage"
+msgstr ""
+
+#: ../../include/nav.php:165
+msgid "Manage other pages"
+msgstr ""
+
+#: ../../include/nav.php:168 ../../mod/settings.php:62
+msgid "Delegations"
+msgstr ""
+
+#: ../../include/nav.php:168 ../../mod/delegate.php:124
+msgid "Delegate Page Management"
+msgstr ""
+
+#: ../../include/nav.php:170
+msgid "Account settings"
+msgstr ""
+
+#: ../../include/nav.php:173
+msgid "Manage/Edit Profiles"
+msgstr ""
+
+#: ../../include/nav.php:175
+msgid "Manage/edit friends and contacts"
+msgstr ""
+
+#: ../../include/nav.php:182 ../../mod/admin.php:128
+msgid "Admin"
+msgstr ""
+
+#: ../../include/nav.php:182
+msgid "Site setup and configuration"
+msgstr ""
+
+#: ../../include/nav.php:186
+msgid "Navigation"
+msgstr ""
+
+#: ../../include/nav.php:186
+msgid "Site map"
+msgstr ""
+
+#: ../../include/plugin.php:455 ../../include/plugin.php:457
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/plugin.php:463
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/plugin.php:468
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
+#: ../../include/follow.php:27 ../../mod/dfrn_request.php:507
+msgid "Disallowed profile URL."
+msgstr ""
+
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
+msgstr ""
+
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr ""
+
+#: ../../include/follow.php:60 ../../include/follow.php:80
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr ""
+
+#: ../../include/follow.php:78
+msgid "The profile address specified does not provide adequate information."
+msgstr ""
+
+#: ../../include/follow.php:82
+msgid "An author or name was not found."
+msgstr ""
+
+#: ../../include/follow.php:84
+msgid "No browser URL could be matched to this address."
+msgstr ""
+
+#: ../../include/follow.php:86
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr ""
+
+#: ../../include/follow.php:87
+msgid "Use mailto: in front of address to force email check."
+msgstr ""
+
+#: ../../include/follow.php:93
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr ""
+
+#: ../../include/follow.php:103
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr ""
+
+#: ../../include/follow.php:205
+msgid "Unable to retrieve contact information."
+msgstr ""
+
+#: ../../include/follow.php:259
+msgid "following"
+msgstr ""
+
+#: ../../include/uimport.php:94
+msgid "Error decoding account file"
+msgstr ""
+
+#: ../../include/uimport.php:100
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: ../../include/uimport.php:116 ../../include/uimport.php:127
+msgid "Error! Cannot check nickname"
+msgstr ""
+
+#: ../../include/uimport.php:120 ../../include/uimport.php:131
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr ""
+
+#: ../../include/uimport.php:153
+msgid "User creation error"
+msgstr ""
+
+#: ../../include/uimport.php:171
+msgid "User profile creation error"
+msgstr ""
+
+#: ../../include/uimport.php:220
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/uimport.php:290
+msgid "Done. You can now login with your username and password"
+msgstr ""
+
+#: ../../include/event.php:11 ../../include/bb2diaspora.php:134
+#: ../../mod/localtime.php:12
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:140
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:148
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/Contact.php:115
+msgid "stopped following"
+msgstr ""
+
+#: ../../include/Contact.php:228 ../../include/conversation.php:882
+msgid "Poke"
+msgstr ""
+
+#: ../../include/Contact.php:229 ../../include/conversation.php:876
+msgid "View Status"
+msgstr ""
+
+#: ../../include/Contact.php:230 ../../include/conversation.php:877
+msgid "View Profile"
+msgstr ""
+
+#: ../../include/Contact.php:231 ../../include/conversation.php:878
+msgid "View Photos"
+msgstr ""
+
+#: ../../include/Contact.php:232 ../../include/Contact.php:255
+#: ../../include/conversation.php:879
+msgid "Network Posts"
+msgstr ""
+
+#: ../../include/Contact.php:233 ../../include/Contact.php:255
+#: ../../include/conversation.php:880
+msgid "Edit Contact"
+msgstr ""
+
+#: ../../include/Contact.php:234
+msgid "Drop Contact"
+msgstr ""
+
+#: ../../include/Contact.php:235 ../../include/Contact.php:255
+#: ../../include/conversation.php:881
+msgid "Send PM"
+msgstr ""
+
+#: ../../include/dbstructure.php:23
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
+msgstr ""
+
+#: ../../include/dbstructure.php:28
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr ""
+
+#: ../../include/dbstructure.php:181
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../include/dbstructure.php:239
+msgid "Errors encountered performing database changes."
+msgstr ""
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../include/datetime.php:153 ../../include/datetime.php:285
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:158 ../../include/datetime.php:286
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:163 ../../include/datetime.php:288
+msgid "day"
+msgstr ""
+
+#: ../../include/datetime.php:276
+msgid "never"
+msgstr ""
+
+#: ../../include/datetime.php:282
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:285
+msgid "years"
+msgstr ""
+
+#: ../../include/datetime.php:286
+msgid "months"
+msgstr ""
+
+#: ../../include/datetime.php:287
+msgid "week"
+msgstr ""
+
+#: ../../include/datetime.php:287
+msgid "weeks"
+msgstr ""
+
+#: ../../include/datetime.php:288
+msgid "days"
+msgstr ""
+
+#: ../../include/datetime.php:289
+msgid "hour"
+msgstr ""
+
+#: ../../include/datetime.php:289
+msgid "hours"
+msgstr ""
+
+#: ../../include/datetime.php:290
+msgid "minute"
+msgstr ""
+
+#: ../../include/datetime.php:290
+msgid "minutes"
+msgstr ""
+
+#: ../../include/datetime.php:291
+msgid "second"
+msgstr ""
+
+#: ../../include/datetime.php:291
+msgid "seconds"
+msgstr ""
+
+#: ../../include/datetime.php:300
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr ""
+
+#: ../../include/message.php:15 ../../include/message.php:172
+msgid "[no subject]"
+msgstr ""
+
+#: ../../include/delivery.php:456 ../../include/notifier.php:774
+msgid "(no subject)"
+msgstr ""
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr ""
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr ""
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr ""
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr ""
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr ""
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr ""
+
+#: ../../include/contact_selectors.php:56 ../../mod/admin.php:542
+msgid "Frequently"
+msgstr ""
+
+#: ../../include/contact_selectors.php:57 ../../mod/admin.php:543
+msgid "Hourly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:58 ../../mod/admin.php:544
+msgid "Twice daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:59 ../../mod/admin.php:545
+msgid "Daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:76 ../../mod/dfrn_request.php:840
+msgid "Friendica"
+msgstr ""
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:86 ../../mod/admin.php:964
+#: ../../mod/admin.php:976 ../../mod/admin.php:977 ../../mod/admin.php:992
+msgid "Email"
+msgstr ""
+
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:733
+#: ../../mod/dfrn_request.php:842
+msgid "Diaspora"
+msgstr ""
+
+#: ../../include/contact_selectors.php:81 ../../mod/newmember.php:49
+#: ../../mod/newmember.php:51
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr ""
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr ""
+
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
+msgstr ""
+
+#: ../../include/contact_selectors.php:88
+msgid "pump.io"
+msgstr ""
+
+#: ../../include/contact_selectors.php:89
+msgid "Twitter"
+msgstr ""
+
+#: ../../include/contact_selectors.php:90
+msgid "Diaspora Connector"
+msgstr ""
+
+#: ../../include/contact_selectors.php:91
+msgid "Statusnet"
+msgstr ""
+
+#: ../../include/contact_selectors.php:92
+msgid "App.net"
+msgstr ""
+
+#: ../../include/diaspora.php:620 ../../include/conversation.php:172
+#: ../../mod/dfrn_confirm.php:486
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:562
+#: ../../include/diaspora.php:703
+msgid "Sharing notification from Diaspora network"
+msgstr ""
+
+#: ../../include/diaspora.php:2312
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/conversation.php:140 ../../mod/like.php:168
 #, php-format
-msgid "No user record found for '%s' "
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:572
-msgid "Our site encryption key is apparently messed up."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:583
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:604
-msgid "Contact record was not found for you on our site."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:618
+#: ../../include/conversation.php:207
 #, php-format
-msgid "Site public key not available in contact record for URL %s."
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:638
+#: ../../include/conversation.php:211 ../../include/text.php:1004
+msgid "poked"
+msgstr ""
+
+#: ../../include/conversation.php:227 ../../mod/mood.php:62
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:266 ../../mod/tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr ""
+
+#: ../../include/conversation.php:291
+msgid "post/item"
+msgstr ""
+
+#: ../../include/conversation.php:292
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr ""
+
+#: ../../include/conversation.php:613 ../../object/Item.php:129
+#: ../../mod/photos.php:1651 ../../mod/content.php:437
+#: ../../mod/content.php:740
+msgid "Select"
+msgstr ""
+
+#: ../../include/conversation.php:614 ../../object/Item.php:130
+#: ../../mod/group.php:171 ../../mod/settings.php:674
+#: ../../mod/contacts.php:709 ../../mod/admin.php:968
+#: ../../mod/photos.php:1652 ../../mod/content.php:438
+#: ../../mod/content.php:741
+msgid "Delete"
+msgstr ""
+
+#: ../../include/conversation.php:654 ../../object/Item.php:326
+#: ../../object/Item.php:327 ../../mod/content.php:471
+#: ../../mod/content.php:852 ../../mod/content.php:853
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:666 ../../object/Item.php:316
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:667 ../../object/Item.php:317
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:674 ../../object/Item.php:340
+#: ../../mod/content.php:481 ../../mod/content.php:864
+#, php-format
+msgid "%s from %s"
+msgstr ""
+
+#: ../../include/conversation.php:690 ../../mod/content.php:497
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:692 ../../include/conversation.php:1109
+#: ../../object/Item.php:364 ../../mod/wallmessage.php:156
+#: ../../mod/editpost.php:124 ../../mod/photos.php:1543
+#: ../../mod/message.php:334 ../../mod/message.php:565
+#: ../../mod/content.php:499 ../../mod/content.php:883
+msgid "Please wait"
+msgstr ""
+
+#: ../../include/conversation.php:772
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:776
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:875
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:944
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:944
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:949
+#, php-format
+msgid "%2$d people like this"
+msgstr ""
+
+#: ../../include/conversation.php:952
+#, php-format
+msgid "%2$d people don't like this"
+msgstr ""
+
+#: ../../include/conversation.php:966
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:972
+#, php-format
+msgid ", and %d other people"
+msgstr ""
+
+#: ../../include/conversation.php:974
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:974
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1001 ../../include/conversation.php:1019
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
+#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
+#: ../../mod/message.php:283 ../../mod/message.php:291
+#: ../../mod/message.php:466 ../../mod/message.php:474
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1003 ../../include/conversation.php:1021
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1004 ../../include/conversation.php:1022
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1005 ../../include/conversation.php:1023
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1006 ../../include/conversation.php:1024
+#: ../../mod/filer.php:30
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1007 ../../include/conversation.php:1025
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1008
+msgid "Delete item(s)?"
+msgstr ""
+
+#: ../../include/conversation.php:1051
+msgid "Post to Email"
+msgstr ""
+
+#: ../../include/conversation.php:1056
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr ""
+
+#: ../../include/conversation.php:1057 ../../mod/settings.php:1025
+msgid "Hide your profile details from unknown viewers?"
+msgstr ""
+
+#: ../../include/conversation.php:1090 ../../mod/photos.php:1542
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1091 ../../mod/wallmessage.php:154
+#: ../../mod/editpost.php:110 ../../mod/message.php:332
+#: ../../mod/message.php:562
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1092 ../../mod/editpost.php:111
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1093 ../../mod/editpost.php:112
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1094 ../../mod/editpost.php:113
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1095 ../../mod/wallmessage.php:155
+#: ../../mod/editpost.php:114 ../../mod/message.php:333
+#: ../../mod/message.php:563
+msgid "Insert web link"
+msgstr ""
+
+#: ../../include/conversation.php:1096 ../../mod/editpost.php:115
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1097 ../../mod/editpost.php:116
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1098 ../../mod/editpost.php:117
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1099 ../../mod/editpost.php:118
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1100 ../../mod/editpost.php:119
+msgid "audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:120
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1102 ../../mod/editpost.php:121
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1103 ../../mod/editpost.php:122
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1104 ../../mod/editpost.php:123
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:1106 ../../mod/editpost.php:137
+msgid "Set title"
+msgstr ""
+
+#: ../../include/conversation.php:1108 ../../mod/editpost.php:139
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1110 ../../mod/editpost.php:125
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1111
+msgid "permissions"
+msgstr ""
+
+#: ../../include/conversation.php:1119 ../../mod/editpost.php:133
+msgid "CC: email addresses"
+msgstr ""
+
+#: ../../include/conversation.php:1120 ../../mod/editpost.php:134
+msgid "Public post"
+msgstr ""
+
+#: ../../include/conversation.php:1122 ../../mod/editpost.php:140
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../include/conversation.php:1126 ../../object/Item.php:687
+#: ../../mod/editpost.php:145 ../../mod/photos.php:1564
+#: ../../mod/photos.php:1608 ../../mod/photos.php:1696
+#: ../../mod/content.php:719
+msgid "Preview"
+msgstr ""
+
+#: ../../include/conversation.php:1135
+msgid "Post to Groups"
+msgstr ""
+
+#: ../../include/conversation.php:1136
+msgid "Post to Contacts"
+msgstr ""
+
+#: ../../include/conversation.php:1137
+msgid "Private post"
+msgstr ""
+
+#: ../../include/text.php:296
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:298
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:303
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:305
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:337
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:340
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:854
+msgid "No contacts"
+msgstr ""
+
+#: ../../include/text.php:863
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:875 ../../mod/viewcontacts.php:76
+msgid "View Contacts"
+msgstr ""
+
+#: ../../include/text.php:955 ../../mod/editpost.php:109
+#: ../../mod/notes.php:63 ../../mod/filer.php:31
+msgid "Save"
+msgstr ""
+
+#: ../../include/text.php:1004
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:1005
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:1005
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:1006
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:1006
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:1007
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:1007
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:1008
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:1008
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:1009
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:1009
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1023
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1024
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1025
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1026
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1027
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1028
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1029
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:1030
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1031
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1032
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1033
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1034
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1035
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1036
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1037
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1038
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1039
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1040
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1041
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1042
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1210
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1210
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1210
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1210
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1210
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1210
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1210
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1214
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1403 ../../mod/videos.php:301
+msgid "View Video"
+msgstr ""
+
+#: ../../include/text.php:1435
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:1459 ../../include/text.php:1471
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1645 ../../include/text.php:1655
+#: ../../mod/events.php:335
+msgid "link to source"
+msgstr ""
+
+#: ../../include/text.php:1700 ../../include/user.php:247
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1712
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1968
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1970 ../../object/Item.php:389
+#: ../../object/Item.php:402 ../../mod/content.php:605
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:1971
+msgid "post"
+msgstr ""
+
+#: ../../include/text.php:2139
+msgid "Item filed"
+msgstr ""
+
+#: ../../include/auth.php:38
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:112 ../../include/auth.php:175
+#: ../../mod/openid.php:93
+msgid "Login failed."
+msgstr ""
+
+#: ../../include/auth.php:128 ../../include/user.php:67
 msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:649
-msgid "Unable to set your contact credentials on our system."
+#: ../../include/auth.php:128 ../../include/user.php:67
+msgid "The error message was:"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:716
-msgid "Unable to update your contact profile details on our system"
+#: ../../include/bbcode.php:449 ../../include/bbcode.php:1050
+#: ../../include/bbcode.php:1051
+msgid "Image/photo"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:751
+#: ../../include/bbcode.php:545
 #, php-format
-msgid "Connection accepted at %s"
+msgid "%2$s %3$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:800
+#: ../../include/bbcode.php:579
 #, php-format
-msgid "%1$s has joined %2$s"
-msgstr ""
-
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr ""
-
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr ""
-
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr ""
-
-#: ../../mod/api.php:104
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+"%s wrote the following post"
 msgstr ""
 
-#: ../../mod/lostpass.php:17
-msgid "No valid account found."
+#: ../../include/bbcode.php:1014 ../../include/bbcode.php:1034
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../mod/lostpass.php:33
-msgid "Password reset request issued. Check your email."
+#: ../../include/bbcode.php:1059 ../../include/bbcode.php:1060
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../mod/lostpass.php:44
+#: ../../include/security.php:22
+msgid "Welcome "
+msgstr ""
+
+#: ../../include/security.php:23
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: ../../include/security.php:26
+msgid "Welcome back "
+msgstr ""
+
+#: ../../include/security.php:366
+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 ""
+
+#: ../../include/oembed.php:205
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:214
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Males"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Females"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
+msgstr ""
+
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Single"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Available"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42 ../../include/user.php:289
+#: ../../include/user.php:293
+msgid "Friends"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Married"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
+msgstr ""
+
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
+msgstr ""
+
+#: ../../include/user.php:40
+msgid "An invitation is required."
+msgstr ""
+
+#: ../../include/user.php:45
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: ../../include/user.php:53
+msgid "Invalid OpenID url"
+msgstr ""
+
+#: ../../include/user.php:74
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../include/user.php:88
+msgid "Please use a shorter name."
+msgstr ""
+
+#: ../../include/user.php:90
+msgid "Name too short."
+msgstr ""
+
+#: ../../include/user.php:105
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr ""
+
+#: ../../include/user.php:110
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
+
+#: ../../include/user.php:113
+msgid "Not a valid email address."
+msgstr ""
+
+#: ../../include/user.php:126
+msgid "Cannot use that email."
+msgstr ""
+
+#: ../../include/user.php:132
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr ""
+
+#: ../../include/user.php:138 ../../include/user.php:236
+msgid "Nickname is already registered. Please choose another."
+msgstr ""
+
+#: ../../include/user.php:148
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr ""
+
+#: ../../include/user.php:164
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr ""
+
+#: ../../include/user.php:222
+msgid "An error occurred during registration. Please try again."
+msgstr ""
+
+#: ../../include/user.php:257
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+
+#: ../../include/user.php:377
 #, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: ../../mod/lostpass.php:66
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t"
 msgstr ""
 
-#: ../../mod/lostpass.php:85
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../mod/lostpass.php:86
-msgid "Your new password is"
-msgstr ""
-
-#: ../../mod/lostpass.php:87
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../mod/lostpass.php:88
-msgid "click here to login"
-msgstr ""
-
-#: ../../mod/lostpass.php:89
+#: ../../include/user.php:381
 msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
+"\n"
+"\t\tThe login details are as follows:\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t%1$s\n"
+"\t\t\tPassword:\t%5$\n"
+"\n"
+"\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\tin.\n"
+"\n"
+"\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\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"
+"\n"
+"\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\n"
+"\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: ../../mod/lostpass.php:107
+#: ../../include/user.php:413 ../../mod/admin.php:799
 #, php-format
-msgid "Your password has been changed at %s"
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
+#: ../../include/acl_selectors.php:326
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../object/Item.php:94
+msgid "This entry was edited"
 msgstr ""
 
-#: ../../mod/lostpass.php:124
-msgid "Nickname or Email: "
+#: ../../object/Item.php:116 ../../mod/photos.php:1357
+#: ../../mod/content.php:620
+msgid "Private Message"
 msgstr ""
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
+#: ../../object/Item.php:120 ../../mod/settings.php:673
+#: ../../mod/content.php:728
+msgid "Edit"
+msgstr ""
+
+#: ../../object/Item.php:133 ../../mod/content.php:763
+msgid "save to folder"
+msgstr ""
+
+#: ../../object/Item.php:195 ../../mod/content.php:753
+msgid "add star"
+msgstr ""
+
+#: ../../object/Item.php:196 ../../mod/content.php:754
+msgid "remove star"
+msgstr ""
+
+#: ../../object/Item.php:197 ../../mod/content.php:755
+msgid "toggle star status"
+msgstr ""
+
+#: ../../object/Item.php:200 ../../mod/content.php:758
+msgid "starred"
+msgstr ""
+
+#: ../../object/Item.php:208
+msgid "ignore thread"
+msgstr ""
+
+#: ../../object/Item.php:209
+msgid "unignore thread"
+msgstr ""
+
+#: ../../object/Item.php:210
+msgid "toggle ignore status"
+msgstr ""
+
+#: ../../object/Item.php:213
+msgid "ignored"
+msgstr ""
+
+#: ../../object/Item.php:220 ../../mod/content.php:759
+msgid "add tag"
+msgstr ""
+
+#: ../../object/Item.php:231 ../../mod/photos.php:1540
+#: ../../mod/content.php:684
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../object/Item.php:231 ../../mod/content.php:684
+msgid "like"
+msgstr ""
+
+#: ../../object/Item.php:232 ../../mod/photos.php:1541
+#: ../../mod/content.php:685
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../object/Item.php:232 ../../mod/content.php:685
+msgid "dislike"
+msgstr ""
+
+#: ../../object/Item.php:234 ../../mod/content.php:687
+msgid "Share this"
+msgstr ""
+
+#: ../../object/Item.php:234 ../../mod/content.php:687
+msgid "share"
+msgstr ""
+
+#: ../../object/Item.php:328 ../../mod/content.php:854
+msgid "to"
+msgstr ""
+
+#: ../../object/Item.php:329
+msgid "via"
+msgstr ""
+
+#: ../../object/Item.php:330 ../../mod/content.php:855
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../object/Item.php:331 ../../mod/content.php:856
+msgid "via Wall-To-Wall:"
+msgstr ""
+
+#: ../../object/Item.php:387 ../../mod/content.php:603
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../object/Item.php:675 ../../mod/photos.php:1560
+#: ../../mod/photos.php:1604 ../../mod/photos.php:1692
+#: ../../mod/content.php:707
+msgid "This is you"
+msgstr ""
+
+#: ../../object/Item.php:679 ../../mod/content.php:711
+msgid "Bold"
+msgstr ""
+
+#: ../../object/Item.php:680 ../../mod/content.php:712
+msgid "Italic"
+msgstr ""
+
+#: ../../object/Item.php:681 ../../mod/content.php:713
+msgid "Underline"
+msgstr ""
+
+#: ../../object/Item.php:682 ../../mod/content.php:714
+msgid "Quote"
+msgstr ""
+
+#: ../../object/Item.php:683 ../../mod/content.php:715
+msgid "Code"
+msgstr ""
+
+#: ../../object/Item.php:684 ../../mod/content.php:716
+msgid "Image"
+msgstr ""
+
+#: ../../object/Item.php:685 ../../mod/content.php:717
+msgid "Link"
+msgstr ""
+
+#: ../../object/Item.php:686 ../../mod/content.php:718
+msgid "Video"
+msgstr ""
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr ""
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
 msgstr ""
 
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
@@ -1245,13 +3092,6 @@ msgstr ""
 msgid "No recipient."
 msgstr ""
 
-#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
-#: ../../mod/message.php:283 ../../mod/message.php:291
-#: ../../mod/message.php:466 ../../mod/message.php:474
-#: ../../include/conversation.php:1001 ../../include/conversation.php:1019
-msgid "Please enter a link URL:"
-msgstr ""
-
 #: ../../mod/wallmessage.php:142 ../../mod/message.php:319
 msgid "Send Private Message"
 msgstr ""
@@ -1273,227 +3113,1638 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:151 ../../mod/message.php:329
-#: ../../mod/message.php:558 ../../mod/invite.php:134
+#: ../../mod/wallmessage.php:151 ../../mod/invite.php:134
+#: ../../mod/message.php:329 ../../mod/message.php:558
 msgid "Your message:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:154 ../../mod/editpost.php:110
-#: ../../mod/message.php:332 ../../mod/message.php:562
-#: ../../include/conversation.php:1090
-msgid "Upload photo"
+#: ../../mod/group.php:29
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/wallmessage.php:155 ../../mod/editpost.php:114
-#: ../../mod/message.php:333 ../../mod/message.php:563
-#: ../../include/conversation.php:1094
-msgid "Insert web link"
+#: ../../mod/group.php:35
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendica"
+#: ../../mod/group.php:47 ../../mod/group.php:140
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
+#: ../../mod/group.php:60
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/newmember.php:12
+#: ../../mod/group.php:87
+msgid "Save Group"
+msgstr ""
+
+#: ../../mod/group.php:93
+msgid "Create a group of contacts/friends."
+msgstr ""
+
+#: ../../mod/group.php:94 ../../mod/group.php:180
+msgid "Group Name: "
+msgstr ""
+
+#: ../../mod/group.php:113
+msgid "Group removed."
+msgstr ""
+
+#: ../../mod/group.php:115
+msgid "Unable to remove group."
+msgstr ""
+
+#: ../../mod/group.php:179
+msgid "Group Editor"
+msgstr ""
+
+#: ../../mod/group.php:192
+msgid "Members"
+msgstr ""
+
+#: ../../mod/group.php:194 ../../mod/contacts.php:562
+msgid "All Contacts"
+msgstr ""
+
+#: ../../mod/group.php:224 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr ""
+
+#: ../../mod/delegate.php:126
 msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page. A link to this page "
-"will be visible from your home page for two weeks after your initial "
-"registration and then will quietly disappear."
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/newmember.php:14
-msgid "Getting Started"
+#: ../../mod/delegate.php:127
+msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/newmember.php:18
-msgid "Friendica Walk-Through"
+#: ../../mod/delegate.php:129
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/newmember.php:18
+#: ../../mod/delegate.php:131
+msgid "Potential Delegates"
+msgstr ""
+
+#: ../../mod/delegate.php:133 ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/delegate.php:134
+msgid "Add"
+msgstr ""
+
+#: ../../mod/delegate.php:135
+msgid "No entries."
+msgstr ""
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr ""
+
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
+msgid "Discard"
+msgstr ""
+
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:443
+#: ../../mod/contacts.php:497 ../../mod/contacts.php:707
+msgid "Ignore"
+msgstr ""
+
+#: ../../mod/notifications.php:78
+msgid "System"
+msgstr ""
+
+#: ../../mod/notifications.php:88 ../../mod/network.php:365
+msgid "Personal"
+msgstr ""
+
+#: ../../mod/notifications.php:122
+msgid "Show Ignored Requests"
+msgstr ""
+
+#: ../../mod/notifications.php:122
+msgid "Hide Ignored Requests"
+msgstr ""
+
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
+msgid "Notification type: "
+msgstr ""
+
+#: ../../mod/notifications.php:150
+msgid "Friend Suggestion"
+msgstr ""
+
+#: ../../mod/notifications.php:152
+#, php-format
+msgid "suggested by %s"
+msgstr ""
+
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/contacts.php:503
+msgid "Hide this contact from others"
+msgstr ""
+
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+msgid "Post a new friend activity"
+msgstr ""
+
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+msgid "if applicable"
+msgstr ""
+
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:966
+msgid "Approve"
+msgstr ""
+
+#: ../../mod/notifications.php:181
+msgid "Claims to be known to you: "
+msgstr ""
+
+#: ../../mod/notifications.php:181
+msgid "yes"
+msgstr ""
+
+#: ../../mod/notifications.php:181
+msgid "no"
+msgstr ""
+
+#: ../../mod/notifications.php:188
+msgid "Approve as: "
+msgstr ""
+
+#: ../../mod/notifications.php:189
+msgid "Friend"
+msgstr ""
+
+#: ../../mod/notifications.php:190
+msgid "Sharer"
+msgstr ""
+
+#: ../../mod/notifications.php:190
+msgid "Fan/Admirer"
+msgstr ""
+
+#: ../../mod/notifications.php:196
+msgid "Friend/Connect Request"
+msgstr ""
+
+#: ../../mod/notifications.php:196
+msgid "New Follower"
+msgstr ""
+
+#: ../../mod/notifications.php:217
+msgid "No introductions."
+msgstr ""
+
+#: ../../mod/notifications.php:258 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:478
+#, php-format
+msgid "%s liked %s's post"
+msgstr ""
+
+#: ../../mod/notifications.php:268 ../../mod/notifications.php:397
+#: ../../mod/notifications.php:488
+#, php-format
+msgid "%s disliked %s's post"
+msgstr ""
+
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:412
+#: ../../mod/notifications.php:503
+#, php-format
+msgid "%s is now friends with %s"
+msgstr ""
+
+#: ../../mod/notifications.php:290 ../../mod/notifications.php:419
+#, php-format
+msgid "%s created a new post"
+msgstr ""
+
+#: ../../mod/notifications.php:291 ../../mod/notifications.php:420
+#: ../../mod/notifications.php:513
+#, php-format
+msgid "%s commented on %s's post"
+msgstr ""
+
+#: ../../mod/notifications.php:306
+msgid "No more network notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:310
+msgid "Network Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:336 ../../mod/notify.php:75
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:340 ../../mod/notify.php:79
+msgid "System Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:435
+msgid "No more personal notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:439
+msgid "Personal Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:520
+msgid "No more home notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:524
+msgid "Home Notifications"
+msgstr ""
+
+#: ../../mod/hcard.php:10
+msgid "No profile"
+msgstr ""
+
+#: ../../mod/settings.php:29 ../../mod/photos.php:80
+msgid "everybody"
+msgstr ""
+
+#: ../../mod/settings.php:36 ../../mod/admin.php:977
+msgid "Account"
+msgstr ""
+
+#: ../../mod/settings.php:41
+msgid "Additional features"
+msgstr ""
+
+#: ../../mod/settings.php:46
+msgid "Display"
+msgstr ""
+
+#: ../../mod/settings.php:52 ../../mod/settings.php:777
+msgid "Social Networks"
+msgstr ""
+
+#: ../../mod/settings.php:57 ../../mod/admin.php:106 ../../mod/admin.php:1063
+#: ../../mod/admin.php:1116
+msgid "Plugins"
+msgstr ""
+
+#: ../../mod/settings.php:67
+msgid "Connected apps"
+msgstr ""
+
+#: ../../mod/settings.php:72 ../../mod/uexport.php:85
+msgid "Export personal data"
+msgstr ""
+
+#: ../../mod/settings.php:77
+msgid "Remove account"
+msgstr ""
+
+#: ../../mod/settings.php:129
+msgid "Missing some important data!"
+msgstr ""
+
+#: ../../mod/settings.php:132 ../../mod/settings.php:637
+#: ../../mod/contacts.php:705
+msgid "Update"
+msgstr ""
+
+#: ../../mod/settings.php:238
+msgid "Failed to connect with email account using the settings provided."
+msgstr ""
+
+#: ../../mod/settings.php:243
+msgid "Email settings updated."
+msgstr ""
+
+#: ../../mod/settings.php:258
+msgid "Features updated"
+msgstr ""
+
+#: ../../mod/settings.php:321
+msgid "Relocate message has been send to your contacts"
+msgstr ""
+
+#: ../../mod/settings.php:335
+msgid "Passwords do not match. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:340
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:348
+msgid "Wrong password."
+msgstr ""
+
+#: ../../mod/settings.php:359
+msgid "Password changed."
+msgstr ""
+
+#: ../../mod/settings.php:361
+msgid "Password update failed. Please try again."
+msgstr ""
+
+#: ../../mod/settings.php:426
+msgid " Please use a shorter name."
+msgstr ""
+
+#: ../../mod/settings.php:428
+msgid " Name too short."
+msgstr ""
+
+#: ../../mod/settings.php:437
+msgid "Wrong Password"
+msgstr ""
+
+#: ../../mod/settings.php:442
+msgid " Not valid email."
+msgstr ""
+
+#: ../../mod/settings.php:448
+msgid " Cannot change to that email."
+msgstr ""
+
+#: ../../mod/settings.php:503
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr ""
+
+#: ../../mod/settings.php:507
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr ""
+
+#: ../../mod/settings.php:537
+msgid "Settings updated."
+msgstr ""
+
+#: ../../mod/settings.php:610 ../../mod/settings.php:636
+#: ../../mod/settings.php:672
+msgid "Add application"
+msgstr ""
+
+#: ../../mod/settings.php:611 ../../mod/settings.php:721
+#: ../../mod/settings.php:795 ../../mod/settings.php:877
+#: ../../mod/settings.php:1110 ../../mod/admin.php:588
+#: ../../mod/admin.php:1117 ../../mod/admin.php:1319 ../../mod/admin.php:1406
+msgid "Save Settings"
+msgstr ""
+
+#: ../../mod/settings.php:613 ../../mod/settings.php:639
+#: ../../mod/admin.php:964 ../../mod/admin.php:976 ../../mod/admin.php:977
+#: ../../mod/admin.php:990 ../../mod/crepair.php:158
+msgid "Name"
+msgstr ""
+
+#: ../../mod/settings.php:614 ../../mod/settings.php:640
+msgid "Consumer Key"
+msgstr ""
+
+#: ../../mod/settings.php:615 ../../mod/settings.php:641
+msgid "Consumer Secret"
+msgstr ""
+
+#: ../../mod/settings.php:616 ../../mod/settings.php:642
+msgid "Redirect"
+msgstr ""
+
+#: ../../mod/settings.php:617 ../../mod/settings.php:643
+msgid "Icon url"
+msgstr ""
+
+#: ../../mod/settings.php:628
+msgid "You can't edit this application."
+msgstr ""
+
+#: ../../mod/settings.php:671
+msgid "Connected Apps"
+msgstr ""
+
+#: ../../mod/settings.php:675
+msgid "Client key starts with"
+msgstr ""
+
+#: ../../mod/settings.php:676
+msgid "No name"
+msgstr ""
+
+#: ../../mod/settings.php:677
+msgid "Remove authorization"
+msgstr ""
+
+#: ../../mod/settings.php:689
+msgid "No Plugin settings configured"
+msgstr ""
+
+#: ../../mod/settings.php:697
+msgid "Plugin Settings"
+msgstr ""
+
+#: ../../mod/settings.php:711
+msgid "Off"
+msgstr ""
+
+#: ../../mod/settings.php:711
+msgid "On"
+msgstr ""
+
+#: ../../mod/settings.php:719
+msgid "Additional Features"
+msgstr ""
+
+#: ../../mod/settings.php:733 ../../mod/settings.php:734
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr ""
+
+#: ../../mod/settings.php:733 ../../mod/settings.php:734
+msgid "enabled"
+msgstr ""
+
+#: ../../mod/settings.php:733 ../../mod/settings.php:734
+msgid "disabled"
+msgstr ""
+
+#: ../../mod/settings.php:734
+msgid "StatusNet"
+msgstr ""
+
+#: ../../mod/settings.php:770
+msgid "Email access is disabled on this site."
+msgstr ""
+
+#: ../../mod/settings.php:782
+msgid "Email/Mailbox Setup"
+msgstr ""
+
+#: ../../mod/settings.php:783
 msgid ""
-"On your Quick Start page - find a brief introduction to your "
-"profile and network tabs, make some new connections, and find some groups to "
-"join."
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/newmember.php:26
-msgid "Go to Your Settings"
+#: ../../mod/settings.php:784
+msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/newmember.php:26
+#: ../../mod/settings.php:786
+msgid "IMAP server name:"
+msgstr ""
+
+#: ../../mod/settings.php:787
+msgid "IMAP port:"
+msgstr ""
+
+#: ../../mod/settings.php:788
+msgid "Security:"
+msgstr ""
+
+#: ../../mod/settings.php:788 ../../mod/settings.php:793
+msgid "None"
+msgstr ""
+
+#: ../../mod/settings.php:789
+msgid "Email login name:"
+msgstr ""
+
+#: ../../mod/settings.php:790
+msgid "Email password:"
+msgstr ""
+
+#: ../../mod/settings.php:791
+msgid "Reply-to address:"
+msgstr ""
+
+#: ../../mod/settings.php:792
+msgid "Send public posts to all email contacts:"
+msgstr ""
+
+#: ../../mod/settings.php:793
+msgid "Action after import:"
+msgstr ""
+
+#: ../../mod/settings.php:793
+msgid "Mark as seen"
+msgstr ""
+
+#: ../../mod/settings.php:793
+msgid "Move to folder"
+msgstr ""
+
+#: ../../mod/settings.php:794
+msgid "Move to folder:"
+msgstr ""
+
+#: ../../mod/settings.php:825 ../../mod/admin.php:523
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: ../../mod/settings.php:875
+msgid "Display Settings"
+msgstr ""
+
+#: ../../mod/settings.php:881 ../../mod/settings.php:896
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:882
+msgid "Mobile Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:883
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../mod/settings.php:883
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../mod/settings.php:884
+msgid "Number of items to display per page:"
+msgstr ""
+
+#: ../../mod/settings.php:884 ../../mod/settings.php:885
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../mod/settings.php:885
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr ""
+
+#: ../../mod/settings.php:886
+msgid "Don't show emoticons"
+msgstr ""
+
+#: ../../mod/settings.php:887
+msgid "Don't show notices"
+msgstr ""
+
+#: ../../mod/settings.php:888
+msgid "Infinite scroll"
+msgstr ""
+
+#: ../../mod/settings.php:889
+msgid "Automatic updates only at the top of the network page"
+msgstr ""
+
+#: ../../mod/settings.php:966
+msgid "User Types"
+msgstr ""
+
+#: ../../mod/settings.php:967
+msgid "Community Types"
+msgstr ""
+
+#: ../../mod/settings.php:968
+msgid "Normal Account Page"
+msgstr ""
+
+#: ../../mod/settings.php:969
+msgid "This account is a normal personal profile"
+msgstr ""
+
+#: ../../mod/settings.php:972
+msgid "Soapbox Page"
+msgstr ""
+
+#: ../../mod/settings.php:973
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr ""
+
+#: ../../mod/settings.php:976
+msgid "Community Forum/Celebrity Account"
+msgstr ""
+
+#: ../../mod/settings.php:977
+msgid "Automatically approve all connection/friend requests as read-write fans"
+msgstr ""
+
+#: ../../mod/settings.php:980
+msgid "Automatic Friend Page"
+msgstr ""
+
+#: ../../mod/settings.php:981
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr ""
+
+#: ../../mod/settings.php:984
+msgid "Private Forum [Experimental]"
+msgstr ""
+
+#: ../../mod/settings.php:985
+msgid "Private forum - approved members only"
+msgstr ""
+
+#: ../../mod/settings.php:997
+msgid "OpenID:"
+msgstr ""
+
+#: ../../mod/settings.php:997
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr ""
+
+#: ../../mod/settings.php:1007
+msgid "Publish your default profile in your local site directory?"
+msgstr ""
+
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1013
+#: ../../mod/settings.php:1021 ../../mod/settings.php:1025
+#: ../../mod/settings.php:1030 ../../mod/settings.php:1036
+#: ../../mod/settings.php:1042 ../../mod/settings.php:1048
+#: ../../mod/settings.php:1078 ../../mod/settings.php:1079
+#: ../../mod/settings.php:1080 ../../mod/settings.php:1081
+#: ../../mod/settings.php:1082 ../../mod/register.php:231
+#: ../../mod/dfrn_request.php:834 ../../mod/api.php:106
+#: ../../mod/profiles.php:620 ../../mod/profiles.php:624
+msgid "No"
+msgstr ""
+
+#: ../../mod/settings.php:1013
+msgid "Publish your default profile in the global social directory?"
+msgstr ""
+
+#: ../../mod/settings.php:1021
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr ""
+
+#: ../../mod/settings.php:1030
+msgid "Allow friends to post to your profile page?"
+msgstr ""
+
+#: ../../mod/settings.php:1036
+msgid "Allow friends to tag your posts?"
+msgstr ""
+
+#: ../../mod/settings.php:1042
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr ""
+
+#: ../../mod/settings.php:1048
+msgid "Permit unknown people to send you private mail?"
+msgstr ""
+
+#: ../../mod/settings.php:1056
+msgid "Profile is not published."
+msgstr ""
+
+#: ../../mod/settings.php:1059 ../../mod/profile_photo.php:248
+msgid "or"
+msgstr ""
+
+#: ../../mod/settings.php:1064
+msgid "Your Identity Address is"
+msgstr ""
+
+#: ../../mod/settings.php:1075
+msgid "Automatically expire posts after this many days:"
+msgstr ""
+
+#: ../../mod/settings.php:1075
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr ""
+
+#: ../../mod/settings.php:1076
+msgid "Advanced expiration settings"
+msgstr ""
+
+#: ../../mod/settings.php:1077
+msgid "Advanced Expiration"
+msgstr ""
+
+#: ../../mod/settings.php:1078
+msgid "Expire posts:"
+msgstr ""
+
+#: ../../mod/settings.php:1079
+msgid "Expire personal notes:"
+msgstr ""
+
+#: ../../mod/settings.php:1080
+msgid "Expire starred posts:"
+msgstr ""
+
+#: ../../mod/settings.php:1081
+msgid "Expire photos:"
+msgstr ""
+
+#: ../../mod/settings.php:1082
+msgid "Only expire posts by others:"
+msgstr ""
+
+#: ../../mod/settings.php:1108
+msgid "Account Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1116
+msgid "Password Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1117
+msgid "New Password:"
+msgstr ""
+
+#: ../../mod/settings.php:1118
+msgid "Confirm:"
+msgstr ""
+
+#: ../../mod/settings.php:1118
+msgid "Leave password fields blank unless changing"
+msgstr ""
+
+#: ../../mod/settings.php:1119
+msgid "Current Password:"
+msgstr ""
+
+#: ../../mod/settings.php:1119 ../../mod/settings.php:1120
+msgid "Your current password to confirm the changes"
+msgstr ""
+
+#: ../../mod/settings.php:1120
+msgid "Password:"
+msgstr ""
+
+#: ../../mod/settings.php:1124
+msgid "Basic Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1126
+msgid "Email Address:"
+msgstr ""
+
+#: ../../mod/settings.php:1127
+msgid "Your Timezone:"
+msgstr ""
+
+#: ../../mod/settings.php:1128
+msgid "Default Post Location:"
+msgstr ""
+
+#: ../../mod/settings.php:1129
+msgid "Use Browser Location:"
+msgstr ""
+
+#: ../../mod/settings.php:1132
+msgid "Security and Privacy Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1134
+msgid "Maximum Friend Requests/Day:"
+msgstr ""
+
+#: ../../mod/settings.php:1134 ../../mod/settings.php:1164
+msgid "(to prevent spam abuse)"
+msgstr ""
+
+#: ../../mod/settings.php:1135
+msgid "Default Post Permissions"
+msgstr ""
+
+#: ../../mod/settings.php:1136
+msgid "(click to open/close)"
+msgstr ""
+
+#: ../../mod/settings.php:1145 ../../mod/photos.php:1146
+#: ../../mod/photos.php:1517
+msgid "Show to Groups"
+msgstr ""
+
+#: ../../mod/settings.php:1146 ../../mod/photos.php:1147
+#: ../../mod/photos.php:1518
+msgid "Show to Contacts"
+msgstr ""
+
+#: ../../mod/settings.php:1147
+msgid "Default Private Post"
+msgstr ""
+
+#: ../../mod/settings.php:1148
+msgid "Default Public Post"
+msgstr ""
+
+#: ../../mod/settings.php:1152
+msgid "Default Permissions for New Posts"
+msgstr ""
+
+#: ../../mod/settings.php:1164
+msgid "Maximum private messages per day from unknown people:"
+msgstr ""
+
+#: ../../mod/settings.php:1167
+msgid "Notification Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1168
+msgid "By default post a status message when:"
+msgstr ""
+
+#: ../../mod/settings.php:1169
+msgid "accepting a friend request"
+msgstr ""
+
+#: ../../mod/settings.php:1170
+msgid "joining a forum/community"
+msgstr ""
+
+#: ../../mod/settings.php:1171
+msgid "making an interesting profile change"
+msgstr ""
+
+#: ../../mod/settings.php:1172
+msgid "Send a notification email when:"
+msgstr ""
+
+#: ../../mod/settings.php:1173
+msgid "You receive an introduction"
+msgstr ""
+
+#: ../../mod/settings.php:1174
+msgid "Your introductions are confirmed"
+msgstr ""
+
+#: ../../mod/settings.php:1175
+msgid "Someone writes on your profile wall"
+msgstr ""
+
+#: ../../mod/settings.php:1176
+msgid "Someone writes a followup comment"
+msgstr ""
+
+#: ../../mod/settings.php:1177
+msgid "You receive a private message"
+msgstr ""
+
+#: ../../mod/settings.php:1178
+msgid "You receive a friend suggestion"
+msgstr ""
+
+#: ../../mod/settings.php:1179
+msgid "You are tagged in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1180
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1183
+msgid "Advanced Account/Page Type Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1184
+msgid "Change the behaviour of this account for special situations"
+msgstr ""
+
+#: ../../mod/settings.php:1187
+msgid "Relocate"
+msgstr ""
+
+#: ../../mod/settings.php:1188
 msgid ""
-"On your Settings page -  change your initial password. Also make a "
-"note of your Identity Address. This looks just like an email address - and "
-"will be useful in making friends on the free social web."
+"If you have moved this profile from another server, and some of your "
+"contacts don't receive your updates, try pushing this button."
 msgstr ""
 
-#: ../../mod/newmember.php:28
+#: ../../mod/settings.php:1189
+msgid "Resend relocate message to contacts"
+msgstr ""
+
+#: ../../mod/common.php:42
+msgid "Common Friends"
+msgstr ""
+
+#: ../../mod/common.php:78
+msgid "No contacts in common."
+msgstr ""
+
+#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../mod/lockview.php:48
+msgid "Visible to:"
+msgstr ""
+
+#: ../../mod/contacts.php:107
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/contacts.php:138 ../../mod/contacts.php:267
+msgid "Could not access contact record."
+msgstr ""
+
+#: ../../mod/contacts.php:152
+msgid "Could not locate selected profile."
+msgstr ""
+
+#: ../../mod/contacts.php:181
+msgid "Contact updated."
+msgstr ""
+
+#: ../../mod/contacts.php:183 ../../mod/dfrn_request.php:576
+msgid "Failed to update contact record."
+msgstr ""
+
+#: ../../mod/contacts.php:282
+msgid "Contact has been blocked"
+msgstr ""
+
+#: ../../mod/contacts.php:282
+msgid "Contact has been unblocked"
+msgstr ""
+
+#: ../../mod/contacts.php:293
+msgid "Contact has been ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:293
+msgid "Contact has been unignored"
+msgstr ""
+
+#: ../../mod/contacts.php:305
+msgid "Contact has been archived"
+msgstr ""
+
+#: ../../mod/contacts.php:305
+msgid "Contact has been unarchived"
+msgstr ""
+
+#: ../../mod/contacts.php:330 ../../mod/contacts.php:703
+msgid "Do you really want to delete this contact?"
+msgstr ""
+
+#: ../../mod/contacts.php:347
+msgid "Contact has been removed."
+msgstr ""
+
+#: ../../mod/contacts.php:385
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr ""
+
+#: ../../mod/contacts.php:389
+#, php-format
+msgid "You are sharing with %s"
+msgstr ""
+
+#: ../../mod/contacts.php:394
+#, php-format
+msgid "%s is sharing with you"
+msgstr ""
+
+#: ../../mod/contacts.php:411
+msgid "Private communications are not available for this contact."
+msgstr ""
+
+#: ../../mod/contacts.php:414 ../../mod/admin.php:540
+msgid "Never"
+msgstr ""
+
+#: ../../mod/contacts.php:418
+msgid "(Update was successful)"
+msgstr ""
+
+#: ../../mod/contacts.php:418
+msgid "(Update was not successful)"
+msgstr ""
+
+#: ../../mod/contacts.php:420
+msgid "Suggest friends"
+msgstr ""
+
+#: ../../mod/contacts.php:424
+#, php-format
+msgid "Network type: %s"
+msgstr ""
+
+#: ../../mod/contacts.php:432
+msgid "View all contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:437 ../../mod/contacts.php:496
+#: ../../mod/contacts.php:706 ../../mod/admin.php:970
+msgid "Unblock"
+msgstr ""
+
+#: ../../mod/contacts.php:437 ../../mod/contacts.php:496
+#: ../../mod/contacts.php:706 ../../mod/admin.php:969
+msgid "Block"
+msgstr ""
+
+#: ../../mod/contacts.php:440
+msgid "Toggle Blocked status"
+msgstr ""
+
+#: ../../mod/contacts.php:443 ../../mod/contacts.php:497
+#: ../../mod/contacts.php:707
+msgid "Unignore"
+msgstr ""
+
+#: ../../mod/contacts.php:446
+msgid "Toggle Ignored status"
+msgstr ""
+
+#: ../../mod/contacts.php:450 ../../mod/contacts.php:708
+msgid "Unarchive"
+msgstr ""
+
+#: ../../mod/contacts.php:450 ../../mod/contacts.php:708
+msgid "Archive"
+msgstr ""
+
+#: ../../mod/contacts.php:453
+msgid "Toggle Archive status"
+msgstr ""
+
+#: ../../mod/contacts.php:456
+msgid "Repair"
+msgstr ""
+
+#: ../../mod/contacts.php:459
+msgid "Advanced Contact Settings"
+msgstr ""
+
+#: ../../mod/contacts.php:465
+msgid "Communications lost with this contact!"
+msgstr ""
+
+#: ../../mod/contacts.php:468
+msgid "Contact Editor"
+msgstr ""
+
+#: ../../mod/contacts.php:471
+msgid "Profile Visibility"
+msgstr ""
+
+#: ../../mod/contacts.php:472
+#, php-format
 msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished "
-"directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
-msgid "Upload Profile Photo"
+#: ../../mod/contacts.php:473
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/newmember.php:36
+#: ../../mod/contacts.php:474
+msgid "Edit contact notes"
+msgstr ""
+
+#: ../../mod/contacts.php:479 ../../mod/contacts.php:671
+#: ../../mod/nogroup.php:40 ../../mod/viewcontacts.php:62
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr ""
+
+#: ../../mod/contacts.php:480
+msgid "Block/Unblock contact"
+msgstr ""
+
+#: ../../mod/contacts.php:481
+msgid "Ignore contact"
+msgstr ""
+
+#: ../../mod/contacts.php:482
+msgid "Repair URL settings"
+msgstr ""
+
+#: ../../mod/contacts.php:483
+msgid "View conversations"
+msgstr ""
+
+#: ../../mod/contacts.php:485
+msgid "Delete contact"
+msgstr ""
+
+#: ../../mod/contacts.php:489
+msgid "Last update:"
+msgstr ""
+
+#: ../../mod/contacts.php:491
+msgid "Update public posts"
+msgstr ""
+
+#: ../../mod/contacts.php:493 ../../mod/admin.php:1464
+msgid "Update now"
+msgstr ""
+
+#: ../../mod/contacts.php:500
+msgid "Currently blocked"
+msgstr ""
+
+#: ../../mod/contacts.php:501
+msgid "Currently ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:502
+msgid "Currently archived"
+msgstr ""
+
+#: ../../mod/contacts.php:503
 msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make "
-"friends than people who do not."
+"Replies/likes to your public posts may still be visible"
 msgstr ""
 
-#: ../../mod/newmember.php:38
-msgid "Edit Your Profile"
+#: ../../mod/contacts.php:504
+msgid "Notification for new posts"
 msgstr ""
 
-#: ../../mod/newmember.php:38
+#: ../../mod/contacts.php:504
+msgid "Send a notification of every new post of this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:505
+msgid "Fetch further information for feeds"
+msgstr ""
+
+#: ../../mod/contacts.php:556
+msgid "Suggestions"
+msgstr ""
+
+#: ../../mod/contacts.php:559
+msgid "Suggest potential friends"
+msgstr ""
+
+#: ../../mod/contacts.php:565
+msgid "Show all contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:568
+msgid "Unblocked"
+msgstr ""
+
+#: ../../mod/contacts.php:571
+msgid "Only show unblocked contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:575
+msgid "Blocked"
+msgstr ""
+
+#: ../../mod/contacts.php:578
+msgid "Only show blocked contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:582
+msgid "Ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:585
+msgid "Only show ignored contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:589
+msgid "Archived"
+msgstr ""
+
+#: ../../mod/contacts.php:592
+msgid "Only show archived contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:596
+msgid "Hidden"
+msgstr ""
+
+#: ../../mod/contacts.php:599
+msgid "Only show hidden contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:647
+msgid "Mutual Friendship"
+msgstr ""
+
+#: ../../mod/contacts.php:651
+msgid "is a fan of yours"
+msgstr ""
+
+#: ../../mod/contacts.php:655
+msgid "you are a fan of"
+msgstr ""
+
+#: ../../mod/contacts.php:672 ../../mod/nogroup.php:41
+msgid "Edit contact"
+msgstr ""
+
+#: ../../mod/contacts.php:698
+msgid "Search your contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:699 ../../mod/directory.php:61
+msgid "Finding: "
+msgstr ""
+
+#: ../../mod/wall_attach.php:75
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr ""
+
+#: ../../mod/wall_attach.php:75
+msgid "Or - did you try to upload an empty file?"
+msgstr ""
+
+#: ../../mod/wall_attach.php:81
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr ""
+
+#: ../../mod/wall_attach.php:122 ../../mod/wall_attach.php:133
+msgid "File upload failed."
+msgstr ""
+
+#: ../../mod/update_community.php:18 ../../mod/update_network.php:25
+#: ../../mod/update_notes.php:37 ../../mod/update_display.php:22
+#: ../../mod/update_profile.php:41
+msgid "[Embedded content - reload page to view]"
+msgstr ""
+
+#: ../../mod/uexport.php:77
+msgid "Export account"
+msgstr ""
+
+#: ../../mod/uexport.php:77
 msgid ""
-"Edit your default profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown "
-"visitors."
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
 msgstr ""
 
-#: ../../mod/newmember.php:40
-msgid "Profile Keywords"
+#: ../../mod/uexport.php:78
+msgid "Export all"
 msgstr ""
 
-#: ../../mod/newmember.php:40
+#: ../../mod/uexport.php:78
 msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
+"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)"
 msgstr ""
 
-#: ../../mod/newmember.php:44
-msgid "Connecting"
-msgstr ""
-
-#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr ""
-
-#: ../../mod/newmember.php:49
+#: ../../mod/register.php:93
 msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/newmember.php:51
+#: ../../mod/register.php:97
+msgid "Failed to send email message. Here is the message that failed."
+msgstr ""
+
+#: ../../mod/register.php:102
+msgid "Your registration can not be processed."
+msgstr ""
+
+#: ../../mod/register.php:145
+msgid "Your registration is pending approval by the site owner."
+msgstr ""
+
+#: ../../mod/register.php:183 ../../mod/uimport.php:50
 msgid ""
-"If this is your own personal server, installing the Facebook addon "
-"may ease your transition to the free social web."
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/newmember.php:56
-msgid "Importing Emails"
-msgstr ""
-
-#: ../../mod/newmember.php:56
+#: ../../mod/register.php:211
 msgid ""
-"Enter your email access information on your Connector Settings page if you "
-"wish to import and interact with friends or mailing lists from your email "
-"INBOX"
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/newmember.php:58
-msgid "Go to Your Contacts Page"
-msgstr ""
-
-#: ../../mod/newmember.php:58
+#: ../../mod/register.php:212
 msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the Add New Contact dialog."
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: ../../mod/newmember.php:60
-msgid "Go to Your Site's Directory"
+#: ../../mod/register.php:213
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/newmember.php:60
+#: ../../mod/register.php:227
+msgid "Include your profile in member directory?"
+msgstr ""
+
+#: ../../mod/register.php:248
+msgid "Membership on this site is by invitation only."
+msgstr ""
+
+#: ../../mod/register.php:249
+msgid "Your invitation ID: "
+msgstr ""
+
+#: ../../mod/register.php:252 ../../mod/admin.php:589
+msgid "Registration"
+msgstr ""
+
+#: ../../mod/register.php:260
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr ""
+
+#: ../../mod/register.php:261
+msgid "Your Email Address: "
+msgstr ""
+
+#: ../../mod/register.php:262
 msgid ""
-"The Directory page lets you find other people in this network or other "
-"federated sites. Look for a Connect or Follow link on "
-"their profile page. Provide your own Identity Address if requested."
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be 'nickname@$sitename'."
 msgstr ""
 
-#: ../../mod/newmember.php:62
-msgid "Finding New People"
+#: ../../mod/register.php:263
+msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/newmember.php:62
+#: ../../mod/register.php:272 ../../mod/uimport.php:64
+msgid "Import"
+msgstr ""
+
+#: ../../mod/register.php:273
+msgid "Import your profile to this friendica instance"
+msgstr ""
+
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
+msgstr ""
+
+#: ../../mod/maintenance.php:5
+msgid "System down for maintenance"
+msgstr ""
+
+#: ../../mod/profile.php:155 ../../mod/display.php:288
+msgid "Access to this profile has been restricted."
+msgstr ""
+
+#: ../../mod/profile.php:180
+msgid "Tips for New Members"
+msgstr ""
+
+#: ../../mod/videos.php:115 ../../mod/dfrn_request.php:766
+#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:920
+#: ../../mod/search.php:89 ../../mod/community.php:18
+#: ../../mod/display.php:180 ../../mod/directory.php:33
+msgid "Public access denied."
+msgstr ""
+
+#: ../../mod/videos.php:125
+msgid "No videos selected"
+msgstr ""
+
+#: ../../mod/videos.php:226 ../../mod/photos.php:1031
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/videos.php:308 ../../mod/photos.php:1806
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/videos.php:317
+msgid "Recent Videos"
+msgstr ""
+
+#: ../../mod/videos.php:319
+msgid "Upload New Videos"
+msgstr ""
+
+#: ../../mod/manage.php:106
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: ../../mod/manage.php:107
 msgid ""
-"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."
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: ../../mod/newmember.php:66 ../../include/group.php:270
-msgid "Groups"
+#: ../../mod/manage.php:108
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/newmember.php:70
-msgid "Group Your Contacts"
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/newmember.php:70
+#: ../../mod/editpost.php:39
+msgid "Edit post"
+msgstr ""
+
+#: ../../mod/dirfind.php:26
+msgid "People Search"
+msgstr ""
+
+#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+msgid "No matches"
+msgstr ""
+
+#: ../../mod/regmod.php:54
+msgid "Account approved."
+msgstr ""
+
+#: ../../mod/regmod.php:91
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../mod/regmod.php:103
+msgid "Please login."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:95
+msgid "This introduction has already been accepted."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:518
+msgid "Profile location is not valid or does not contain profile information."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:523
+msgid "Warning: profile location has no identifiable owner name."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:525
+msgid "Warning: profile location has no profile photo."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:528
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/dfrn_request.php:172
+msgid "Introduction complete."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:214
+msgid "Unrecoverable protocol error."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:242
+msgid "Profile unavailable."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:267
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:268
+msgid "Spam protection measures have been invoked."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:269
+msgid "Friends are advised to please try again in 24 hours."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:331
+msgid "Invalid locator"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:340
+msgid "Invalid email address."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:367
+msgid "This account has not been configured for email. Request failed."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:463
+msgid "Unable to resolve your name at the provided location."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:476
+msgid "You have already introduced yourself here."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:480
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:501
+msgid "Invalid profile URL."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:597
+msgid "Your introduction has been sent."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:650
+msgid "Please login to confirm introduction."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:664
 msgid ""
-"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."
+"Incorrect identity currently logged in. Please login to this profile."
 msgstr ""
 
-#: ../../mod/newmember.php:73
-msgid "Why Aren't My Posts Public?"
+#: ../../mod/dfrn_request.php:675
+msgid "Hide this contact"
 msgstr ""
 
-#: ../../mod/newmember.php:73
+#: ../../mod/dfrn_request.php:678
+#, php-format
+msgid "Welcome home %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:679
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:680
+msgid "Confirm"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:808
 msgid ""
-"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."
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
 msgstr ""
 
-#: ../../mod/newmember.php:78
-msgid "Getting Help"
-msgstr ""
-
-#: ../../mod/newmember.php:82
-msgid "Go to the Help Section"
-msgstr ""
-
-#: ../../mod/newmember.php:82
+#: ../../mod/dfrn_request.php:828
 msgid ""
-"Our help pages may be consulted for detail on other program "
-"features and resources."
+"If you are not yet a member of the free social web, follow this link to find a public Friendica site "
+"and join us today."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:831
+msgid "Friend/Connection Request"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:832
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:833
+msgid "Please answer the following:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:834
+#, php-format
+msgid "Does %s know you?"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:838
+msgid "Add a personal note:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:841
+msgid "StatusNet/Federated Social Web"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:843
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:844
+msgid "Your Identity Address:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:847
+msgid "Submit Request"
+msgstr ""
+
+#: ../../mod/fbrowser.php:113
+msgid "Files"
+msgstr ""
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr ""
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr ""
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr ""
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
 #: ../../mod/suggest.php:27
 msgid "Do you really want to delete this suggestion?"
 msgstr ""
 
-#: ../../mod/suggest.php:32 ../../mod/editpost.php:148
-#: ../../mod/dfrn_request.php:848 ../../mod/contacts.php:329
-#: ../../mod/settings.php:612 ../../mod/settings.php:638
-#: ../../mod/message.php:212 ../../mod/photos.php:203 ../../mod/photos.php:292
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../include/conversation.php:1128
-#: ../../include/items.php:4344
-msgid "Cancel"
-msgstr ""
-
 #: ../../mod/suggest.php:72
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
@@ -1504,23 +4755,990 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
+#: ../../mod/nogroup.php:59
+msgid "Contacts who are not members of a group"
+msgstr ""
+
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+#: ../../mod/crepair.php:131 ../../mod/dfrn_confirm.php:120
+msgid "Contact not found."
+msgstr ""
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr ""
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr ""
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr ""
+
+#: ../../mod/share.php:44
+msgid "link"
+msgstr ""
+
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
+msgstr ""
+
+#: ../../mod/admin.php:57
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:104 ../../mod/admin.php:587
+msgid "Site"
+msgstr ""
+
+#: ../../mod/admin.php:105 ../../mod/admin.php:959 ../../mod/admin.php:974
+msgid "Users"
+msgstr ""
+
+#: ../../mod/admin.php:107 ../../mod/admin.php:1284 ../../mod/admin.php:1318
+msgid "Themes"
+msgstr ""
+
+#: ../../mod/admin.php:108
+msgid "DB updates"
+msgstr ""
+
+#: ../../mod/admin.php:123 ../../mod/admin.php:130 ../../mod/admin.php:1405
+msgid "Logs"
+msgstr ""
+
+#: ../../mod/admin.php:129
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../mod/admin.php:131
+msgid "User registrations waiting for confirmation"
+msgstr ""
+
+#: ../../mod/admin.php:190 ../../mod/admin.php:913
+msgid "Normal Account"
+msgstr ""
+
+#: ../../mod/admin.php:191 ../../mod/admin.php:914
+msgid "Soapbox Account"
+msgstr ""
+
+#: ../../mod/admin.php:192 ../../mod/admin.php:915
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: ../../mod/admin.php:193 ../../mod/admin.php:916
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: ../../mod/admin.php:194
+msgid "Blog Account"
+msgstr ""
+
+#: ../../mod/admin.php:195
+msgid "Private Forum"
+msgstr ""
+
+#: ../../mod/admin.php:214
+msgid "Message queues"
+msgstr ""
+
+#: ../../mod/admin.php:219 ../../mod/admin.php:586 ../../mod/admin.php:958
+#: ../../mod/admin.php:1062 ../../mod/admin.php:1115 ../../mod/admin.php:1283
+#: ../../mod/admin.php:1317 ../../mod/admin.php:1404
+msgid "Administration"
+msgstr ""
+
+#: ../../mod/admin.php:220
+msgid "Summary"
+msgstr ""
+
+#: ../../mod/admin.php:222
+msgid "Registered users"
+msgstr ""
+
+#: ../../mod/admin.php:224
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../mod/admin.php:225
+msgid "Version"
+msgstr ""
+
+#: ../../mod/admin.php:227
+msgid "Active plugins"
+msgstr ""
+
+#: ../../mod/admin.php:250
+msgid "Can not parse base url. Must have at least ://"
+msgstr ""
+
+#: ../../mod/admin.php:494
+msgid "Site settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:541
+msgid "At post arrival"
+msgstr ""
+
+#: ../../mod/admin.php:550
+msgid "Multi user instance"
+msgstr ""
+
+#: ../../mod/admin.php:573
+msgid "Closed"
+msgstr ""
+
+#: ../../mod/admin.php:574
+msgid "Requires approval"
+msgstr ""
+
+#: ../../mod/admin.php:575
+msgid "Open"
+msgstr ""
+
+#: ../../mod/admin.php:579
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: ../../mod/admin.php:580
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:581
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: ../../mod/admin.php:590
+msgid "File upload"
+msgstr ""
+
+#: ../../mod/admin.php:591
+msgid "Policies"
+msgstr ""
+
+#: ../../mod/admin.php:592
+msgid "Advanced"
+msgstr ""
+
+#: ../../mod/admin.php:593
+msgid "Performance"
+msgstr ""
+
+#: ../../mod/admin.php:594
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr ""
+
+#: ../../mod/admin.php:597
+msgid "Site name"
+msgstr ""
+
+#: ../../mod/admin.php:598
+msgid "Banner/Logo"
+msgstr ""
+
+#: ../../mod/admin.php:599
+msgid "Additional Info"
+msgstr ""
+
+#: ../../mod/admin.php:599
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at dir.friendica.com/siteinfo."
+msgstr ""
+
+#: ../../mod/admin.php:600
+msgid "System language"
+msgstr ""
+
+#: ../../mod/admin.php:601
+msgid "System theme"
+msgstr ""
+
+#: ../../mod/admin.php:601
+msgid ""
+"Default system theme - may be over-ridden by user profiles - change theme settings"
+msgstr ""
+
+#: ../../mod/admin.php:602
+msgid "Mobile system theme"
+msgstr ""
+
+#: ../../mod/admin.php:602
+msgid "Theme for mobile devices"
+msgstr ""
+
+#: ../../mod/admin.php:603
+msgid "SSL link policy"
+msgstr ""
+
+#: ../../mod/admin.php:603
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:604
+msgid "Old style 'Share'"
+msgstr ""
+
+#: ../../mod/admin.php:604
+msgid "Deactivates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: ../../mod/admin.php:605
+msgid "Hide help entry from navigation menu"
+msgstr ""
+
+#: ../../mod/admin.php:605
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr ""
+
+#: ../../mod/admin.php:606
+msgid "Single user instance"
+msgstr ""
+
+#: ../../mod/admin.php:606
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr ""
+
+#: ../../mod/admin.php:607
+msgid "Maximum image size"
+msgstr ""
+
+#: ../../mod/admin.php:607
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../mod/admin.php:608
+msgid "Maximum image length"
+msgstr ""
+
+#: ../../mod/admin.php:608
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr ""
+
+#: ../../mod/admin.php:609
+msgid "JPEG image quality"
+msgstr ""
+
+#: ../../mod/admin.php:609
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr ""
+
+#: ../../mod/admin.php:611
+msgid "Register policy"
+msgstr ""
+
+#: ../../mod/admin.php:612
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: ../../mod/admin.php:612
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user "
+"registrations to accept per day.  If register is set to closed, this setting "
+"has no effect."
+msgstr ""
+
+#: ../../mod/admin.php:613
+msgid "Register text"
+msgstr ""
+
+#: ../../mod/admin.php:613
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../mod/admin.php:614
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: ../../mod/admin.php:614
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: ../../mod/admin.php:615
+msgid "Allowed friend domains"
+msgstr ""
+
+#: ../../mod/admin.php:615
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: ../../mod/admin.php:616
+msgid "Allowed email domains"
+msgstr ""
+
+#: ../../mod/admin.php:616
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: ../../mod/admin.php:617
+msgid "Block public"
+msgstr ""
+
+#: ../../mod/admin.php:617
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr ""
+
+#: ../../mod/admin.php:618
+msgid "Force publish"
+msgstr ""
+
+#: ../../mod/admin.php:618
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../mod/admin.php:619
+msgid "Global directory update URL"
+msgstr ""
+
+#: ../../mod/admin.php:619
+msgid ""
+"URL to update the global directory. If this is not set, the global directory "
+"is completely unavailable to the application."
+msgstr ""
+
+#: ../../mod/admin.php:620
+msgid "Allow threaded items"
+msgstr ""
+
+#: ../../mod/admin.php:620
+msgid "Allow infinite level threading for items on this site."
+msgstr ""
+
+#: ../../mod/admin.php:621
+msgid "Private posts by default for new users"
+msgstr ""
+
+#: ../../mod/admin.php:621
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr ""
+
+#: ../../mod/admin.php:622
+msgid "Don't include post content in email notifications"
+msgstr ""
+
+#: ../../mod/admin.php:622
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr ""
+
+#: ../../mod/admin.php:623
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr ""
+
+#: ../../mod/admin.php:623
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr ""
+
+#: ../../mod/admin.php:624
+msgid "Don't embed private images in posts"
+msgstr ""
+
+#: ../../mod/admin.php:624
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a while."
+msgstr ""
+
+#: ../../mod/admin.php:625
+msgid "Allow Users to set remote_self"
+msgstr ""
+
+#: ../../mod/admin.php:625
+msgid ""
+"With checking this, every user is allowed to mark every contact as a "
+"remote_self in the repair contact dialog. Setting this flag on a contact "
+"causes mirroring every posting of that contact in the users stream."
+msgstr ""
+
+#: ../../mod/admin.php:626
+msgid "Block multiple registrations"
+msgstr ""
+
+#: ../../mod/admin.php:626
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: ../../mod/admin.php:627
+msgid "OpenID support"
+msgstr ""
+
+#: ../../mod/admin.php:627
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: ../../mod/admin.php:628
+msgid "Fullname check"
+msgstr ""
+
+#: ../../mod/admin.php:628
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: ../../mod/admin.php:629
+msgid "UTF-8 Regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:629
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:630
+msgid "Show Community Page"
+msgstr ""
+
+#: ../../mod/admin.php:630
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr ""
+
+#: ../../mod/admin.php:631
+msgid "Enable OStatus support"
+msgstr ""
+
+#: ../../mod/admin.php:631
+msgid ""
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr ""
+
+#: ../../mod/admin.php:632
+msgid "OStatus conversation completion interval"
+msgstr ""
+
+#: ../../mod/admin.php:632
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr ""
+
+#: ../../mod/admin.php:633
+msgid "Enable Diaspora support"
+msgstr ""
+
+#: ../../mod/admin.php:633
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: ../../mod/admin.php:634
+msgid "Only allow Friendica contacts"
+msgstr ""
+
+#: ../../mod/admin.php:634
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: ../../mod/admin.php:635
+msgid "Verify SSL"
+msgstr ""
+
+#: ../../mod/admin.php:635
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you "
+"cannot connect (at all) to self-signed SSL sites."
+msgstr ""
+
+#: ../../mod/admin.php:636
+msgid "Proxy user"
+msgstr ""
+
+#: ../../mod/admin.php:637
+msgid "Proxy URL"
+msgstr ""
+
+#: ../../mod/admin.php:638
+msgid "Network timeout"
+msgstr ""
+
+#: ../../mod/admin.php:638
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../mod/admin.php:639
+msgid "Delivery interval"
+msgstr ""
+
+#: ../../mod/admin.php:639
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr ""
+
+#: ../../mod/admin.php:640
+msgid "Poll interval"
+msgstr ""
+
+#: ../../mod/admin.php:640
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: ../../mod/admin.php:641
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../mod/admin.php:641
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: ../../mod/admin.php:643
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: ../../mod/admin.php:643
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: ../../mod/admin.php:644
+msgid "Suppress Language"
+msgstr ""
+
+#: ../../mod/admin.php:644
+msgid "Suppress language information in meta information about a posting."
+msgstr ""
+
+#: ../../mod/admin.php:645
+msgid "Path to item cache"
+msgstr ""
+
+#: ../../mod/admin.php:646
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: ../../mod/admin.php:646
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One "
+"day). To disable the item cache, set the value to -1."
+msgstr ""
+
+#: ../../mod/admin.php:647
+msgid "Maximum numbers of comments per post"
+msgstr ""
+
+#: ../../mod/admin.php:647
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr ""
+
+#: ../../mod/admin.php:648
+msgid "Path for lock file"
+msgstr ""
+
+#: ../../mod/admin.php:649
+msgid "Temp path"
+msgstr ""
+
+#: ../../mod/admin.php:650
+msgid "Base path to installation"
+msgstr ""
+
+#: ../../mod/admin.php:651
+msgid "Disable picture proxy"
+msgstr ""
+
+#: ../../mod/admin.php:651
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on "
+"systems with very low bandwith."
+msgstr ""
+
+#: ../../mod/admin.php:653
+msgid "New base url"
+msgstr ""
+
+#: ../../mod/admin.php:655
+msgid "Enable noscrape"
+msgstr ""
+
+#: ../../mod/admin.php:655
+msgid ""
+"The noscrape feature speeds up directory submissions by using JSON data "
+"instead of HTML scraping."
+msgstr ""
+
+#: ../../mod/admin.php:672
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../mod/admin.php:680
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr ""
+
+#: ../../mod/admin.php:683
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr ""
+
+#: ../../mod/admin.php:695
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr ""
+
+#: ../../mod/admin.php:698
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../mod/admin.php:702
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../mod/admin.php:704
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr ""
+
+#: ../../mod/admin.php:723
+msgid "No failed updates."
+msgstr ""
+
+#: ../../mod/admin.php:724
+msgid "Check database structure"
+msgstr ""
+
+#: ../../mod/admin.php:729
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../mod/admin.php:730
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: ../../mod/admin.php:731
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../mod/admin.php:732
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../mod/admin.php:764
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
+msgstr ""
+
+#: ../../mod/admin.php:767
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$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\tThank you and welcome to %4$s."
+msgstr ""
+
+#: ../../mod/admin.php:811
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:818
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:857
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: ../../mod/admin.php:865
+#, php-format
+msgid "User '%s' unblocked"
+msgstr ""
+
+#: ../../mod/admin.php:865
+#, php-format
+msgid "User '%s' blocked"
+msgstr ""
+
+#: ../../mod/admin.php:960
+msgid "Add User"
+msgstr ""
+
+#: ../../mod/admin.php:961
+msgid "select all"
+msgstr ""
+
+#: ../../mod/admin.php:962
+msgid "User registrations waiting for confirm"
+msgstr ""
+
+#: ../../mod/admin.php:963
+msgid "User waiting for permanent deletion"
+msgstr ""
+
+#: ../../mod/admin.php:964
+msgid "Request date"
+msgstr ""
+
+#: ../../mod/admin.php:965
+msgid "No registrations."
+msgstr ""
+
+#: ../../mod/admin.php:967
+msgid "Deny"
+msgstr ""
+
+#: ../../mod/admin.php:971
+msgid "Site admin"
+msgstr ""
+
+#: ../../mod/admin.php:972
+msgid "Account expired"
+msgstr ""
+
+#: ../../mod/admin.php:975
+msgid "New User"
+msgstr ""
+
+#: ../../mod/admin.php:976 ../../mod/admin.php:977
+msgid "Register date"
+msgstr ""
+
+#: ../../mod/admin.php:976 ../../mod/admin.php:977
+msgid "Last login"
+msgstr ""
+
+#: ../../mod/admin.php:976 ../../mod/admin.php:977
+msgid "Last item"
+msgstr ""
+
+#: ../../mod/admin.php:976
+msgid "Deleted since"
+msgstr ""
+
+#: ../../mod/admin.php:979
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../mod/admin.php:980
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../mod/admin.php:990
+msgid "Name of the new user."
+msgstr ""
+
+#: ../../mod/admin.php:991
+msgid "Nickname"
+msgstr ""
+
+#: ../../mod/admin.php:991
+msgid "Nickname of the new user."
+msgstr ""
+
+#: ../../mod/admin.php:992
+msgid "Email address of the new user."
+msgstr ""
+
+#: ../../mod/admin.php:1025
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: ../../mod/admin.php:1029
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1255
+msgid "Disable"
+msgstr ""
+
+#: ../../mod/admin.php:1041 ../../mod/admin.php:1257
+msgid "Enable"
+msgstr ""
+
+#: ../../mod/admin.php:1064 ../../mod/admin.php:1285
+msgid "Toggle"
+msgstr ""
+
+#: ../../mod/admin.php:1072 ../../mod/admin.php:1295
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:1073 ../../mod/admin.php:1296
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../mod/admin.php:1215
+msgid "No themes found."
+msgstr ""
+
+#: ../../mod/admin.php:1277
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:1323
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../mod/admin.php:1324
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:1351
+msgid "Log settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:1407
+msgid "Clear"
+msgstr ""
+
+#: ../../mod/admin.php:1413
+msgid "Enable Debugging"
+msgstr ""
+
+#: ../../mod/admin.php:1414
+msgid "Log file"
+msgstr ""
+
+#: ../../mod/admin.php:1414
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr ""
+
+#: ../../mod/admin.php:1415
+msgid "Log level"
+msgstr ""
+
+#: ../../mod/admin.php:1465
+msgid "Close"
+msgstr ""
+
+#: ../../mod/admin.php:1471
+msgid "FTP Host"
+msgstr ""
+
+#: ../../mod/admin.php:1472
+msgid "FTP Path"
+msgstr ""
+
+#: ../../mod/admin.php:1473
+msgid "FTP User"
+msgstr ""
+
+#: ../../mod/admin.php:1474
+msgid "FTP Password"
+msgstr ""
+
+#: ../../mod/wall_upload.php:122 ../../mod/profile_photo.php:144
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr ""
+
+#: ../../mod/wall_upload.php:144 ../../mod/photos.php:807
+#: ../../mod/profile_photo.php:153
+msgid "Unable to process image."
+msgstr ""
+
+#: ../../mod/wall_upload.php:172 ../../mod/photos.php:834
+#: ../../mod/profile_photo.php:301
+msgid "Image upload failed."
+msgstr ""
+
+#: ../../mod/home.php:35
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr ""
+
 #: ../../mod/network.php:136
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:179 ../../mod/_search.php:21 ../../mod/search.php:21
+#: ../../mod/network.php:179 ../../mod/search.php:21
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:188 ../../mod/_search.php:30 ../../mod/search.php:30
-#: ../../include/features.php:42
-msgid "Saved Searches"
-msgstr ""
-
-#: ../../mod/network.php:189 ../../include/group.php:275
-msgid "add"
-msgstr ""
-
 #: ../../mod/network.php:350
 msgid "Commented Order"
 msgstr ""
@@ -1537,10 +5755,6 @@ msgstr ""
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:365 ../../mod/notifications.php:88
-msgid "Personal"
-msgstr ""
-
 #: ../../mod/network.php:368
 msgid "Posts that mention or involve you"
 msgstr ""
@@ -1605,6 +5819,1075 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
+#: ../../mod/filer.php:30
+msgid "- select -"
+msgstr ""
+
+#: ../../mod/friendica.php:62
+msgid "This is Friendica, version"
+msgstr ""
+
+#: ../../mod/friendica.php:63
+msgid "running at web location"
+msgstr ""
+
+#: ../../mod/friendica.php:65
+msgid ""
+"Please visit Friendica.com to learn "
+"more about the Friendica project."
+msgstr ""
+
+#: ../../mod/friendica.php:67
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: ../../mod/friendica.php:68
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr ""
+
+#: ../../mod/friendica.php:82
+msgid "Installed plugins/addons/apps:"
+msgstr ""
+
+#: ../../mod/friendica.php:95
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: ../../mod/apps.php:11
+msgid "Applications"
+msgstr ""
+
+#: ../../mod/apps.php:14
+msgid "No installed applications."
+msgstr ""
+
+#: ../../mod/photos.php:67 ../../mod/photos.php:1228 ../../mod/photos.php:1817
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../mod/photos.php:144
+msgid "Contact information unavailable"
+msgstr ""
+
+#: ../../mod/photos.php:165
+msgid "Album not found."
+msgstr ""
+
+#: ../../mod/photos.php:188 ../../mod/photos.php:200 ../../mod/photos.php:1206
+msgid "Delete Album"
+msgstr ""
+
+#: ../../mod/photos.php:198
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr ""
+
+#: ../../mod/photos.php:278 ../../mod/photos.php:289 ../../mod/photos.php:1513
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../mod/photos.php:287
+msgid "Do you really want to delete this photo?"
+msgstr ""
+
+#: ../../mod/photos.php:662
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr ""
+
+#: ../../mod/photos.php:662
+msgid "a photo"
+msgstr ""
+
+#: ../../mod/photos.php:767
+msgid "Image exceeds size limit of "
+msgstr ""
+
+#: ../../mod/photos.php:775
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../mod/photos.php:930
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:1094
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr ""
+
+#: ../../mod/photos.php:1129
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../mod/photos.php:1133 ../../mod/photos.php:1201
+msgid "New album name: "
+msgstr ""
+
+#: ../../mod/photos.php:1134
+msgid "or existing album name: "
+msgstr ""
+
+#: ../../mod/photos.php:1135
+msgid "Do not show a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:1137 ../../mod/photos.php:1508
+msgid "Permissions"
+msgstr ""
+
+#: ../../mod/photos.php:1148
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:1149
+msgid "Public Photo"
+msgstr ""
+
+#: ../../mod/photos.php:1216
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:1222
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:1224
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:1257 ../../mod/photos.php:1800
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:1292
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:1294
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:1350
+msgid "View photo"
+msgstr ""
+
+#: ../../mod/photos.php:1350
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:1351
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:1376
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:1455
+msgid "Tags: "
+msgstr ""
+
+#: ../../mod/photos.php:1458
+msgid "[Remove any tag]"
+msgstr ""
+
+#: ../../mod/photos.php:1498
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:1499
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:1501
+msgid "New album name"
+msgstr ""
+
+#: ../../mod/photos.php:1504
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:1506
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:1510
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+
+#: ../../mod/photos.php:1519
+msgid "Private photo"
+msgstr ""
+
+#: ../../mod/photos.php:1520
+msgid "Public photo"
+msgstr ""
+
+#: ../../mod/photos.php:1815
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../mod/follow.php:27
+msgid "Contact added"
+msgstr ""
+
+#: ../../mod/uimport.php:66
+msgid "Move account"
+msgstr ""
+
+#: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr ""
+
+#: ../../mod/uimport.php:68
+msgid ""
+"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."
+msgstr ""
+
+#: ../../mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
+msgstr ""
+
+#: ../../mod/uimport.php:70
+msgid "Account file"
+msgstr ""
+
+#: ../../mod/uimport.php:70
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr ""
+
+#: ../../mod/invite.php:27
+msgid "Total invitation limit exceeded."
+msgstr ""
+
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../mod/invite.php:73
+msgid "Please join us on Friendica"
+msgstr ""
+
+#: ../../mod/invite.php:84
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: ../../mod/invite.php:89
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../mod/invite.php:93
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/invite.php:112
+msgid "You have no more invitations available"
+msgstr ""
+
+#: ../../mod/invite.php:120
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many "
+"other social networks."
+msgstr ""
+
+#: ../../mod/invite.php:122
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr ""
+
+#: ../../mod/invite.php:123
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr ""
+
+#: ../../mod/invite.php:126
+msgid ""
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
+msgstr ""
+
+#: ../../mod/invite.php:132
+msgid "Send invitations"
+msgstr ""
+
+#: ../../mod/invite.php:133
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../mod/invite.php:135
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr ""
+
+#: ../../mod/invite.php:137
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr ""
+
+#: ../../mod/invite.php:137
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr ""
+
+#: ../../mod/invite.php:139
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr ""
+
+#: ../../mod/viewsrc.php:7
+msgid "Access denied."
+msgstr ""
+
+#: ../../mod/lostpass.php:19
+msgid "No valid account found."
+msgstr ""
+
+#: ../../mod/lostpass.php:35
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: ../../mod/lostpass.php:42
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tA request was recently received at \"%2$s\" to reset your account\n"
+"\t\tpassword. In order to confirm this request, please select the "
+"verification link\n"
+"\t\tbelow or paste it into your web browser address bar.\n"
+"\n"
+"\t\tIf you did NOT request this change, please DO NOT follow the link\n"
+"\t\tprovided and ignore and/or delete this email.\n"
+"\n"
+"\t\tYour password will not be changed unless we can verify that you\n"
+"\t\tissued this request."
+msgstr ""
+
+#: ../../mod/lostpass.php:53
+#, php-format
+msgid ""
+"\n"
+"\t\tFollow this link to verify your identity:\n"
+"\n"
+"\t\t%1$s\n"
+"\n"
+"\t\tYou will then receive a follow-up message containing the new password.\n"
+"\t\tYou may change that password from your account settings page after "
+"logging in.\n"
+"\n"
+"\t\tThe login details are as follows:\n"
+"\n"
+"\t\tSite Location:\t%2$s\n"
+"\t\tLogin Name:\t%3$s"
+msgstr ""
+
+#: ../../mod/lostpass.php:72
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:92
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../mod/lostpass.php:110
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../mod/lostpass.php:111
+msgid "Your new password is"
+msgstr ""
+
+#: ../../mod/lostpass.php:112
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../mod/lostpass.php:113
+msgid "click here to login"
+msgstr ""
+
+#: ../../mod/lostpass.php:114
+msgid ""
+"Your password may be changed from the Settings page after "
+"successful login."
+msgstr ""
+
+#: ../../mod/lostpass.php:125
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tDear %1$s,\n"
+"\t\t\t\t\tYour password has been changed as requested. Please retain this\n"
+"\t\t\t\tinformation for your records (or change your password immediately "
+"to\n"
+"\t\t\t\tsomething that you will remember).\n"
+"\t\t\t"
+msgstr ""
+
+#: ../../mod/lostpass.php:131
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tYour login details are as follows:\n"
+"\n"
+"\t\t\t\tSite Location:\t%1$s\n"
+"\t\t\t\tLogin Name:\t%2$s\n"
+"\t\t\t\tPassword:\t%3$s\n"
+"\n"
+"\t\t\t\tYou may change that password from your account settings page after "
+"logging in.\n"
+"\t\t\t"
+msgstr ""
+
+#: ../../mod/lostpass.php:147
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:159
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../mod/lostpass.php:160
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../mod/lostpass.php:161
+msgid "Nickname or Email: "
+msgstr ""
+
+#: ../../mod/lostpass.php:162
+msgid "Reset"
+msgstr ""
+
+#: ../../mod/babel.php:17
+msgid "Source (bbcode) text:"
+msgstr ""
+
+#: ../../mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
+msgstr ""
+
+#: ../../mod/babel.php:31
+msgid "Source input: "
+msgstr ""
+
+#: ../../mod/babel.php:35
+msgid "bb2html (raw HTML): "
+msgstr ""
+
+#: ../../mod/babel.php:39
+msgid "bb2html: "
+msgstr ""
+
+#: ../../mod/babel.php:43
+msgid "bb2html2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:47
+msgid "bb2md: "
+msgstr ""
+
+#: ../../mod/babel.php:51
+msgid "bb2md2html: "
+msgstr ""
+
+#: ../../mod/babel.php:55
+msgid "bb2dia2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:59
+msgid "bb2md2html2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:69
+msgid "Source input (Diaspora format): "
+msgstr ""
+
+#: ../../mod/babel.php:74
+msgid "diaspora2bb: "
+msgstr ""
+
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr ""
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr ""
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr ""
+
+#: ../../mod/removeme.php:46 ../../mod/removeme.php:49
+msgid "Remove My Account"
+msgstr ""
+
+#: ../../mod/removeme.php:47
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr ""
+
+#: ../../mod/removeme.php:48
+msgid "Please enter your password for verification:"
+msgstr ""
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: ../../mod/profperm.php:114
+msgid "Visible To"
+msgstr ""
+
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
+msgstr ""
+
+#: ../../mod/match.php:12
+msgid "Profile Match"
+msgstr ""
+
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr ""
+
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr ""
+
+#: ../../mod/events.php:66
+msgid "Event title and start time are required."
+msgstr ""
+
+#: ../../mod/events.php:291
+msgid "l, F j"
+msgstr ""
+
+#: ../../mod/events.php:313
+msgid "Edit event"
+msgstr ""
+
+#: ../../mod/events.php:371
+msgid "Create New Event"
+msgstr ""
+
+#: ../../mod/events.php:372
+msgid "Previous"
+msgstr ""
+
+#: ../../mod/events.php:373 ../../mod/install.php:207
+msgid "Next"
+msgstr ""
+
+#: ../../mod/events.php:446
+msgid "hour:minute"
+msgstr ""
+
+#: ../../mod/events.php:456
+msgid "Event details"
+msgstr ""
+
+#: ../../mod/events.php:457
+#, php-format
+msgid "Format is %s %s. Starting date and Title are required."
+msgstr ""
+
+#: ../../mod/events.php:459
+msgid "Event Starts:"
+msgstr ""
+
+#: ../../mod/events.php:459 ../../mod/events.php:473
+msgid "Required"
+msgstr ""
+
+#: ../../mod/events.php:462
+msgid "Finish date/time is not known or not relevant"
+msgstr ""
+
+#: ../../mod/events.php:464
+msgid "Event Finishes:"
+msgstr ""
+
+#: ../../mod/events.php:467
+msgid "Adjust for viewer timezone"
+msgstr ""
+
+#: ../../mod/events.php:469
+msgid "Description:"
+msgstr ""
+
+#: ../../mod/events.php:473
+msgid "Title:"
+msgstr ""
+
+#: ../../mod/events.php:475
+msgid "Share this event"
+msgstr ""
+
+#: ../../mod/ping.php:240
+msgid "{0} wants to be your friend"
+msgstr ""
+
+#: ../../mod/ping.php:245
+msgid "{0} sent you a message"
+msgstr ""
+
+#: ../../mod/ping.php:250
+msgid "{0} requested registration"
+msgstr ""
+
+#: ../../mod/ping.php:256
+#, php-format
+msgid "{0} commented %s's post"
+msgstr ""
+
+#: ../../mod/ping.php:261
+#, php-format
+msgid "{0} liked %s's post"
+msgstr ""
+
+#: ../../mod/ping.php:266
+#, php-format
+msgid "{0} disliked %s's post"
+msgstr ""
+
+#: ../../mod/ping.php:271
+#, php-format
+msgid "{0} is now friends with %s"
+msgstr ""
+
+#: ../../mod/ping.php:276
+msgid "{0} posted"
+msgstr ""
+
+#: ../../mod/ping.php:281
+#, php-format
+msgid "{0} tagged %s's post with #%s"
+msgstr ""
+
+#: ../../mod/ping.php:287
+msgid "{0} mentioned you in a post"
+msgstr ""
+
+#: ../../mod/mood.php:133
+msgid "Mood"
+msgstr ""
+
+#: ../../mod/mood.php:134
+msgid "Set your current mood and tell your friends"
+msgstr ""
+
+#: ../../mod/search.php:170 ../../mod/search.php:196
+#: ../../mod/community.php:62 ../../mod/community.php:71
+msgid "No results."
+msgstr ""
+
+#: ../../mod/message.php:67
+msgid "Unable to locate contact information."
+msgstr ""
+
+#: ../../mod/message.php:207
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#: ../../mod/message.php:227
+msgid "Message deleted."
+msgstr ""
+
+#: ../../mod/message.php:258
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../mod/message.php:371
+msgid "No messages."
+msgstr ""
+
+#: ../../mod/message.php:378
+#, php-format
+msgid "Unknown sender - %s"
+msgstr ""
+
+#: ../../mod/message.php:381
+#, php-format
+msgid "You and %s"
+msgstr ""
+
+#: ../../mod/message.php:384
+#, php-format
+msgid "%s and You"
+msgstr ""
+
+#: ../../mod/message.php:405 ../../mod/message.php:546
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../mod/message.php:408
+msgid "D, d M Y - g:i A"
+msgstr ""
+
+#: ../../mod/message.php:411
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/message.php:450
+msgid "Message not available."
+msgstr ""
+
+#: ../../mod/message.php:520
+msgid "Delete message"
+msgstr ""
+
+#: ../../mod/message.php:548
+msgid ""
+"No secure communications available. You may be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:552
+msgid "Send Reply"
+msgstr ""
+
+#: ../../mod/community.php:23
+msgid "Not available."
+msgstr ""
+
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:133
+#: ../../mod/profiles.php:162 ../../mod/profiles.php:589
+#: ../../mod/dfrn_confirm.php:64
+msgid "Profile not found."
+msgstr ""
+
+#: ../../mod/profiles.php:37
+msgid "Profile deleted."
+msgstr ""
+
+#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
+msgid "Profile-"
+msgstr ""
+
+#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
+msgid "New profile created."
+msgstr ""
+
+#: ../../mod/profiles.php:95
+msgid "Profile unavailable to clone."
+msgstr ""
+
+#: ../../mod/profiles.php:172
+msgid "Profile Name is required."
+msgstr ""
+
+#: ../../mod/profiles.php:323
+msgid "Marital Status"
+msgstr ""
+
+#: ../../mod/profiles.php:327
+msgid "Romantic Partner"
+msgstr ""
+
+#: ../../mod/profiles.php:331
+msgid "Likes"
+msgstr ""
+
+#: ../../mod/profiles.php:335
+msgid "Dislikes"
+msgstr ""
+
+#: ../../mod/profiles.php:339
+msgid "Work/Employment"
+msgstr ""
+
+#: ../../mod/profiles.php:342
+msgid "Religion"
+msgstr ""
+
+#: ../../mod/profiles.php:346
+msgid "Political Views"
+msgstr ""
+
+#: ../../mod/profiles.php:350
+msgid "Gender"
+msgstr ""
+
+#: ../../mod/profiles.php:354
+msgid "Sexual Preference"
+msgstr ""
+
+#: ../../mod/profiles.php:358
+msgid "Homepage"
+msgstr ""
+
+#: ../../mod/profiles.php:362 ../../mod/profiles.php:657
+msgid "Interests"
+msgstr ""
+
+#: ../../mod/profiles.php:366
+msgid "Address"
+msgstr ""
+
+#: ../../mod/profiles.php:373 ../../mod/profiles.php:653
+msgid "Location"
+msgstr ""
+
+#: ../../mod/profiles.php:456
+msgid "Profile updated."
+msgstr ""
+
+#: ../../mod/profiles.php:527
+msgid " and "
+msgstr ""
+
+#: ../../mod/profiles.php:535
+msgid "public profile"
+msgstr ""
+
+#: ../../mod/profiles.php:538
+#, php-format
+msgid "%1$s changed %2$s to “%3$s”"
+msgstr ""
+
+#: ../../mod/profiles.php:539
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../mod/profiles.php:542
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../mod/profiles.php:617
+msgid "Hide contacts and friends:"
+msgstr ""
+
+#: ../../mod/profiles.php:622
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr ""
+
+#: ../../mod/profiles.php:644
+msgid "Edit Profile Details"
+msgstr ""
+
+#: ../../mod/profiles.php:646
+msgid "Change Profile Photo"
+msgstr ""
+
+#: ../../mod/profiles.php:647
+msgid "View this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:648
+msgid "Create a new profile using these settings"
+msgstr ""
+
+#: ../../mod/profiles.php:649
+msgid "Clone this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:650
+msgid "Delete this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:651
+msgid "Basic information"
+msgstr ""
+
+#: ../../mod/profiles.php:652
+msgid "Profile picture"
+msgstr ""
+
+#: ../../mod/profiles.php:654
+msgid "Preferences"
+msgstr ""
+
+#: ../../mod/profiles.php:655
+msgid "Status information"
+msgstr ""
+
+#: ../../mod/profiles.php:656
+msgid "Additional information"
+msgstr ""
+
+#: ../../mod/profiles.php:658 ../../mod/newmember.php:36
+#: ../../mod/profile_photo.php:244
+msgid "Upload Profile Photo"
+msgstr ""
+
+#: ../../mod/profiles.php:659
+msgid "Profile Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:660
+msgid "Your Full Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:661
+msgid "Title/Description:"
+msgstr ""
+
+#: ../../mod/profiles.php:662
+msgid "Your Gender:"
+msgstr ""
+
+#: ../../mod/profiles.php:663
+#, php-format
+msgid "Birthday (%s):"
+msgstr ""
+
+#: ../../mod/profiles.php:664
+msgid "Street Address:"
+msgstr ""
+
+#: ../../mod/profiles.php:665
+msgid "Locality/City:"
+msgstr ""
+
+#: ../../mod/profiles.php:666
+msgid "Postal/Zip Code:"
+msgstr ""
+
+#: ../../mod/profiles.php:667
+msgid "Country:"
+msgstr ""
+
+#: ../../mod/profiles.php:668
+msgid "Region/State:"
+msgstr ""
+
+#: ../../mod/profiles.php:669
+msgid "♥ Marital Status:"
+msgstr ""
+
+#: ../../mod/profiles.php:670
+msgid "Who: (if applicable)"
+msgstr ""
+
+#: ../../mod/profiles.php:671
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr ""
+
+#: ../../mod/profiles.php:672
+msgid "Since [date]:"
+msgstr ""
+
+#: ../../mod/profiles.php:674
+msgid "Homepage URL:"
+msgstr ""
+
+#: ../../mod/profiles.php:677
+msgid "Religious Views:"
+msgstr ""
+
+#: ../../mod/profiles.php:678
+msgid "Public Keywords:"
+msgstr ""
+
+#: ../../mod/profiles.php:679
+msgid "Private Keywords:"
+msgstr ""
+
+#: ../../mod/profiles.php:682
+msgid "Example: fishing photography software"
+msgstr ""
+
+#: ../../mod/profiles.php:683
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr ""
+
+#: ../../mod/profiles.php:684
+msgid "(Used for searching profiles, never shown to others)"
+msgstr ""
+
+#: ../../mod/profiles.php:685
+msgid "Tell us about yourself..."
+msgstr ""
+
+#: ../../mod/profiles.php:686
+msgid "Hobbies/Interests"
+msgstr ""
+
+#: ../../mod/profiles.php:687
+msgid "Contact information and Social Networks"
+msgstr ""
+
+#: ../../mod/profiles.php:688
+msgid "Musical interests"
+msgstr ""
+
+#: ../../mod/profiles.php:689
+msgid "Books, literature"
+msgstr ""
+
+#: ../../mod/profiles.php:690
+msgid "Television"
+msgstr ""
+
+#: ../../mod/profiles.php:691
+msgid "Film/dance/culture/entertainment"
+msgstr ""
+
+#: ../../mod/profiles.php:692
+msgid "Love/romance"
+msgstr ""
+
+#: ../../mod/profiles.php:693
+msgid "Work/employment"
+msgstr ""
+
+#: ../../mod/profiles.php:694
+msgid "School/education"
+msgstr ""
+
+#: ../../mod/profiles.php:699
+msgid ""
+"This is your public profile.
It may "
+"be visible to anybody using the internet."
+msgstr ""
+
+#: ../../mod/profiles.php:709 ../../mod/directory.php:113
+msgid "Age: "
+msgstr ""
+
+#: ../../mod/profiles.php:762
+msgid "Edit/Manage Profiles"
+msgstr ""
+
 #: ../../mod/install.php:117
 msgid "Friendica Communications Server - Setup"
 msgstr ""
@@ -1636,10 +6919,6 @@ msgstr ""
 msgid "System check"
 msgstr ""
 
-#: ../../mod/install.php:207 ../../mod/events.php:373
-msgid "Next"
-msgstr ""
-
 #: ../../mod/install.php:208
 msgid "Check again"
 msgstr ""
@@ -1899,1090 +7178,8 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/admin.php:55
-msgid "Theme settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:102 ../../mod/admin.php:583
-msgid "Site"
-msgstr ""
-
-#: ../../mod/admin.php:103 ../../mod/admin.php:913 ../../mod/admin.php:928
-msgid "Users"
-msgstr ""
-
-#: ../../mod/admin.php:104 ../../mod/admin.php:1017 ../../mod/admin.php:1070
-#: ../../mod/settings.php:57
-msgid "Plugins"
-msgstr ""
-
-#: ../../mod/admin.php:105 ../../mod/admin.php:1236 ../../mod/admin.php:1270
-msgid "Themes"
-msgstr ""
-
-#: ../../mod/admin.php:106
-msgid "DB updates"
-msgstr ""
-
-#: ../../mod/admin.php:121 ../../mod/admin.php:128 ../../mod/admin.php:1357
-msgid "Logs"
-msgstr ""
-
-#: ../../mod/admin.php:126 ../../include/nav.php:182
-msgid "Admin"
-msgstr ""
-
-#: ../../mod/admin.php:127
-msgid "Plugin Features"
-msgstr ""
-
-#: ../../mod/admin.php:129
-msgid "User registrations waiting for confirmation"
-msgstr ""
-
-#: ../../mod/admin.php:188 ../../mod/admin.php:867
-msgid "Normal Account"
-msgstr ""
-
-#: ../../mod/admin.php:189 ../../mod/admin.php:868
-msgid "Soapbox Account"
-msgstr ""
-
-#: ../../mod/admin.php:190 ../../mod/admin.php:869
-msgid "Community/Celebrity Account"
-msgstr ""
-
-#: ../../mod/admin.php:191 ../../mod/admin.php:870
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: ../../mod/admin.php:192
-msgid "Blog Account"
-msgstr ""
-
-#: ../../mod/admin.php:193
-msgid "Private Forum"
-msgstr ""
-
-#: ../../mod/admin.php:212
-msgid "Message queues"
-msgstr ""
-
-#: ../../mod/admin.php:217 ../../mod/admin.php:582 ../../mod/admin.php:912
-#: ../../mod/admin.php:1016 ../../mod/admin.php:1069 ../../mod/admin.php:1235
-#: ../../mod/admin.php:1269 ../../mod/admin.php:1356
-msgid "Administration"
-msgstr ""
-
-#: ../../mod/admin.php:218
-msgid "Summary"
-msgstr ""
-
-#: ../../mod/admin.php:220
-msgid "Registered users"
-msgstr ""
-
-#: ../../mod/admin.php:222
-msgid "Pending registrations"
-msgstr ""
-
-#: ../../mod/admin.php:223
-msgid "Version"
-msgstr ""
-
-#: ../../mod/admin.php:225
-msgid "Active plugins"
-msgstr ""
-
-#: ../../mod/admin.php:248
-msgid "Can not parse base url. Must have at least ://"
-msgstr ""
-
-#: ../../mod/admin.php:490
-msgid "Site settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:519 ../../mod/settings.php:825
-msgid "No special theme for mobile devices"
-msgstr ""
-
-#: ../../mod/admin.php:536 ../../mod/contacts.php:408
-msgid "Never"
-msgstr ""
-
-#: ../../mod/admin.php:537
-msgid "At post arrival"
-msgstr ""
-
-#: ../../mod/admin.php:538 ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr ""
-
-#: ../../mod/admin.php:539 ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr ""
-
-#: ../../mod/admin.php:540 ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr ""
-
-#: ../../mod/admin.php:541 ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr ""
-
-#: ../../mod/admin.php:546
-msgid "Multi user instance"
-msgstr ""
-
-#: ../../mod/admin.php:569
-msgid "Closed"
-msgstr ""
-
-#: ../../mod/admin.php:570
-msgid "Requires approval"
-msgstr ""
-
-#: ../../mod/admin.php:571
-msgid "Open"
-msgstr ""
-
-#: ../../mod/admin.php:575
-msgid "No SSL policy, links will track page SSL state"
-msgstr ""
-
-#: ../../mod/admin.php:576
-msgid "Force all links to use SSL"
-msgstr ""
-
-#: ../../mod/admin.php:577
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr ""
-
-#: ../../mod/admin.php:584 ../../mod/admin.php:1071 ../../mod/admin.php:1271
-#: ../../mod/admin.php:1358 ../../mod/settings.php:611
-#: ../../mod/settings.php:721 ../../mod/settings.php:795
-#: ../../mod/settings.php:877 ../../mod/settings.php:1110
-msgid "Save Settings"
-msgstr ""
-
-#: ../../mod/admin.php:586
-msgid "File upload"
-msgstr ""
-
-#: ../../mod/admin.php:587
-msgid "Policies"
-msgstr ""
-
-#: ../../mod/admin.php:588
-msgid "Advanced"
-msgstr ""
-
-#: ../../mod/admin.php:589
-msgid "Performance"
-msgstr ""
-
-#: ../../mod/admin.php:590
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr ""
-
-#: ../../mod/admin.php:593
-msgid "Site name"
-msgstr ""
-
-#: ../../mod/admin.php:594
-msgid "Banner/Logo"
-msgstr ""
-
-#: ../../mod/admin.php:595
-msgid "Additional Info"
-msgstr ""
-
-#: ../../mod/admin.php:595
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at dir.friendica.com/siteinfo."
-msgstr ""
-
-#: ../../mod/admin.php:596
-msgid "System language"
-msgstr ""
-
-#: ../../mod/admin.php:597
-msgid "System theme"
-msgstr ""
-
-#: ../../mod/admin.php:597
-msgid ""
-"Default system theme - may be over-ridden by user profiles - change theme settings"
-msgstr ""
-
-#: ../../mod/admin.php:598
-msgid "Mobile system theme"
-msgstr ""
-
-#: ../../mod/admin.php:598
-msgid "Theme for mobile devices"
-msgstr ""
-
-#: ../../mod/admin.php:599
-msgid "SSL link policy"
-msgstr ""
-
-#: ../../mod/admin.php:599
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr ""
-
-#: ../../mod/admin.php:600
-msgid "Old style 'Share'"
-msgstr ""
-
-#: ../../mod/admin.php:600
-msgid "Deactivates the bbcode element 'share' for repeating items."
-msgstr ""
-
-#: ../../mod/admin.php:601
-msgid "Hide help entry from navigation menu"
-msgstr ""
-
-#: ../../mod/admin.php:601
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr ""
-
-#: ../../mod/admin.php:602
-msgid "Single user instance"
-msgstr ""
-
-#: ../../mod/admin.php:602
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr ""
-
-#: ../../mod/admin.php:603
-msgid "Maximum image size"
-msgstr ""
-
-#: ../../mod/admin.php:603
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr ""
-
-#: ../../mod/admin.php:604
-msgid "Maximum image length"
-msgstr ""
-
-#: ../../mod/admin.php:604
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr ""
-
-#: ../../mod/admin.php:605
-msgid "JPEG image quality"
-msgstr ""
-
-#: ../../mod/admin.php:605
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr ""
-
-#: ../../mod/admin.php:607
-msgid "Register policy"
-msgstr ""
-
-#: ../../mod/admin.php:608
-msgid "Maximum Daily Registrations"
-msgstr ""
-
-#: ../../mod/admin.php:608
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user "
-"registrations to accept per day.  If register is set to closed, this setting "
-"has no effect."
-msgstr ""
-
-#: ../../mod/admin.php:609
-msgid "Register text"
-msgstr ""
-
-#: ../../mod/admin.php:609
-msgid "Will be displayed prominently on the registration page."
-msgstr ""
-
-#: ../../mod/admin.php:610
-msgid "Accounts abandoned after x days"
-msgstr ""
-
-#: ../../mod/admin.php:610
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-
-#: ../../mod/admin.php:611
-msgid "Allowed friend domains"
-msgstr ""
-
-#: ../../mod/admin.php:611
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr ""
-
-#: ../../mod/admin.php:612
-msgid "Allowed email domains"
-msgstr ""
-
-#: ../../mod/admin.php:612
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr ""
-
-#: ../../mod/admin.php:613
-msgid "Block public"
-msgstr ""
-
-#: ../../mod/admin.php:613
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr ""
-
-#: ../../mod/admin.php:614
-msgid "Force publish"
-msgstr ""
-
-#: ../../mod/admin.php:614
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: ../../mod/admin.php:615
-msgid "Global directory update URL"
-msgstr ""
-
-#: ../../mod/admin.php:615
-msgid ""
-"URL to update the global directory. If this is not set, the global directory "
-"is completely unavailable to the application."
-msgstr ""
-
-#: ../../mod/admin.php:616
-msgid "Allow threaded items"
-msgstr ""
-
-#: ../../mod/admin.php:616
-msgid "Allow infinite level threading for items on this site."
-msgstr ""
-
-#: ../../mod/admin.php:617
-msgid "Private posts by default for new users"
-msgstr ""
-
-#: ../../mod/admin.php:617
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr ""
-
-#: ../../mod/admin.php:618
-msgid "Don't include post content in email notifications"
-msgstr ""
-
-#: ../../mod/admin.php:618
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr ""
-
-#: ../../mod/admin.php:619
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr ""
-
-#: ../../mod/admin.php:619
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr ""
-
-#: ../../mod/admin.php:620
-msgid "Don't embed private images in posts"
-msgstr ""
-
-#: ../../mod/admin.php:620
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a while."
-msgstr ""
-
-#: ../../mod/admin.php:621
-msgid "Allow Users to set remote_self"
-msgstr ""
-
-#: ../../mod/admin.php:621
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
-msgstr ""
-
-#: ../../mod/admin.php:622
-msgid "Block multiple registrations"
-msgstr ""
-
-#: ../../mod/admin.php:622
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr ""
-
-#: ../../mod/admin.php:623
-msgid "OpenID support"
-msgstr ""
-
-#: ../../mod/admin.php:623
-msgid "OpenID support for registration and logins."
-msgstr ""
-
-#: ../../mod/admin.php:624
-msgid "Fullname check"
-msgstr ""
-
-#: ../../mod/admin.php:624
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr ""
-
-#: ../../mod/admin.php:625
-msgid "UTF-8 Regular expressions"
-msgstr ""
-
-#: ../../mod/admin.php:625
-msgid "Use PHP UTF8 regular expressions"
-msgstr ""
-
-#: ../../mod/admin.php:626
-msgid "Show Community Page"
-msgstr ""
-
-#: ../../mod/admin.php:626
-msgid ""
-"Display a Community page showing all recent public postings on this site."
-msgstr ""
-
-#: ../../mod/admin.php:627
-msgid "Enable OStatus support"
-msgstr ""
-
-#: ../../mod/admin.php:627
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr ""
-
-#: ../../mod/admin.php:628
-msgid "OStatus conversation completion interval"
-msgstr ""
-
-#: ../../mod/admin.php:628
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
-msgstr ""
-
-#: ../../mod/admin.php:629
-msgid "Enable Diaspora support"
-msgstr ""
-
-#: ../../mod/admin.php:629
-msgid "Provide built-in Diaspora network compatibility."
-msgstr ""
-
-#: ../../mod/admin.php:630
-msgid "Only allow Friendica contacts"
-msgstr ""
-
-#: ../../mod/admin.php:630
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr ""
-
-#: ../../mod/admin.php:631
-msgid "Verify SSL"
-msgstr ""
-
-#: ../../mod/admin.php:631
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you "
-"cannot connect (at all) to self-signed SSL sites."
-msgstr ""
-
-#: ../../mod/admin.php:632
-msgid "Proxy user"
-msgstr ""
-
-#: ../../mod/admin.php:633
-msgid "Proxy URL"
-msgstr ""
-
-#: ../../mod/admin.php:634
-msgid "Network timeout"
-msgstr ""
-
-#: ../../mod/admin.php:634
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr ""
-
-#: ../../mod/admin.php:635
-msgid "Delivery interval"
-msgstr ""
-
-#: ../../mod/admin.php:635
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr ""
-
-#: ../../mod/admin.php:636
-msgid "Poll interval"
-msgstr ""
-
-#: ../../mod/admin.php:636
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr ""
-
-#: ../../mod/admin.php:637
-msgid "Maximum Load Average"
-msgstr ""
-
-#: ../../mod/admin.php:637
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr ""
-
-#: ../../mod/admin.php:639
-msgid "Use MySQL full text engine"
-msgstr ""
-
-#: ../../mod/admin.php:639
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr ""
-
-#: ../../mod/admin.php:640
-msgid "Suppress Language"
-msgstr ""
-
-#: ../../mod/admin.php:640
-msgid "Suppress language information in meta information about a posting."
-msgstr ""
-
-#: ../../mod/admin.php:641
-msgid "Path to item cache"
-msgstr ""
-
-#: ../../mod/admin.php:642
-msgid "Cache duration in seconds"
-msgstr ""
-
-#: ../../mod/admin.php:642
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One "
-"day). To disable the item cache, set the value to -1."
-msgstr ""
-
-#: ../../mod/admin.php:643
-msgid "Maximum numbers of comments per post"
-msgstr ""
-
-#: ../../mod/admin.php:643
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr ""
-
-#: ../../mod/admin.php:644
-msgid "Path for lock file"
-msgstr ""
-
-#: ../../mod/admin.php:645
-msgid "Temp path"
-msgstr ""
-
-#: ../../mod/admin.php:646
-msgid "Base path to installation"
-msgstr ""
-
-#: ../../mod/admin.php:648
-msgid "New base url"
-msgstr ""
-
-#: ../../mod/admin.php:650
-msgid "Enable noscrape"
-msgstr ""
-
-#: ../../mod/admin.php:650
-msgid ""
-"The noscrape feature speeds up directory submissions by using JSON data "
-"instead of HTML scraping."
-msgstr ""
-
-#: ../../mod/admin.php:667
-msgid "Update has been marked successful"
-msgstr ""
-
-#: ../../mod/admin.php:677
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr ""
-
-#: ../../mod/admin.php:680
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: ../../mod/admin.php:684
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: ../../mod/admin.php:687
-#, php-format
-msgid "Update function %s could not be found."
-msgstr ""
-
-#: ../../mod/admin.php:702
-msgid "No failed updates."
-msgstr ""
-
-#: ../../mod/admin.php:706
-msgid "Failed Updates"
-msgstr ""
-
-#: ../../mod/admin.php:707
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr ""
-
-#: ../../mod/admin.php:708
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: ../../mod/admin.php:709
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: ../../mod/admin.php:755
-msgid "Registration successful. Email send to user"
-msgstr ""
-
-#: ../../mod/admin.php:765
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:772
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:811
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: ../../mod/admin.php:819
-#, php-format
-msgid "User '%s' unblocked"
-msgstr ""
-
-#: ../../mod/admin.php:819
-#, php-format
-msgid "User '%s' blocked"
-msgstr ""
-
-#: ../../mod/admin.php:914
-msgid "Add User"
-msgstr ""
-
-#: ../../mod/admin.php:915
-msgid "select all"
-msgstr ""
-
-#: ../../mod/admin.php:916
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: ../../mod/admin.php:917
-msgid "User waiting for permanent deletion"
-msgstr ""
-
-#: ../../mod/admin.php:918
-msgid "Request date"
-msgstr ""
-
-#: ../../mod/admin.php:918 ../../mod/admin.php:930 ../../mod/admin.php:931
-#: ../../mod/admin.php:944 ../../mod/crepair.php:150
-#: ../../mod/settings.php:613 ../../mod/settings.php:639
-msgid "Name"
-msgstr ""
-
-#: ../../mod/admin.php:918 ../../mod/admin.php:930 ../../mod/admin.php:931
-#: ../../mod/admin.php:946 ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86
-msgid "Email"
-msgstr ""
-
-#: ../../mod/admin.php:919
-msgid "No registrations."
-msgstr ""
-
-#: ../../mod/admin.php:920 ../../mod/notifications.php:161
-#: ../../mod/notifications.php:208
-msgid "Approve"
-msgstr ""
-
-#: ../../mod/admin.php:921
-msgid "Deny"
-msgstr ""
-
-#: ../../mod/admin.php:923 ../../mod/contacts.php:431
-#: ../../mod/contacts.php:490 ../../mod/contacts.php:700
-msgid "Block"
-msgstr ""
-
-#: ../../mod/admin.php:924 ../../mod/contacts.php:431
-#: ../../mod/contacts.php:490 ../../mod/contacts.php:700
-msgid "Unblock"
-msgstr ""
-
-#: ../../mod/admin.php:925
-msgid "Site admin"
-msgstr ""
-
-#: ../../mod/admin.php:926
-msgid "Account expired"
-msgstr ""
-
-#: ../../mod/admin.php:929
-msgid "New User"
-msgstr ""
-
-#: ../../mod/admin.php:930 ../../mod/admin.php:931
-msgid "Register date"
-msgstr ""
-
-#: ../../mod/admin.php:930 ../../mod/admin.php:931
-msgid "Last login"
-msgstr ""
-
-#: ../../mod/admin.php:930 ../../mod/admin.php:931
-msgid "Last item"
-msgstr ""
-
-#: ../../mod/admin.php:930
-msgid "Deleted since"
-msgstr ""
-
-#: ../../mod/admin.php:931 ../../mod/settings.php:36
-msgid "Account"
-msgstr ""
-
-#: ../../mod/admin.php:933
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../mod/admin.php:934
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../mod/admin.php:944
-msgid "Name of the new user."
-msgstr ""
-
-#: ../../mod/admin.php:945
-msgid "Nickname"
-msgstr ""
-
-#: ../../mod/admin.php:945
-msgid "Nickname of the new user."
-msgstr ""
-
-#: ../../mod/admin.php:946
-msgid "Email address of the new user."
-msgstr ""
-
-#: ../../mod/admin.php:979
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: ../../mod/admin.php:983
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: ../../mod/admin.php:993 ../../mod/admin.php:1207
-msgid "Disable"
-msgstr ""
-
-#: ../../mod/admin.php:995 ../../mod/admin.php:1209
-msgid "Enable"
-msgstr ""
-
-#: ../../mod/admin.php:1018 ../../mod/admin.php:1237
-msgid "Toggle"
-msgstr ""
-
-#: ../../mod/admin.php:1026 ../../mod/admin.php:1247
-msgid "Author: "
-msgstr ""
-
-#: ../../mod/admin.php:1027 ../../mod/admin.php:1248
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../mod/admin.php:1167
-msgid "No themes found."
-msgstr ""
-
-#: ../../mod/admin.php:1229
-msgid "Screenshot"
-msgstr ""
-
-#: ../../mod/admin.php:1275
-msgid "[Experimental]"
-msgstr ""
-
-#: ../../mod/admin.php:1276
-msgid "[Unsupported]"
-msgstr ""
-
-#: ../../mod/admin.php:1303
-msgid "Log settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:1359
-msgid "Clear"
-msgstr ""
-
-#: ../../mod/admin.php:1365
-msgid "Enable Debugging"
-msgstr ""
-
-#: ../../mod/admin.php:1366
-msgid "Log file"
-msgstr ""
-
-#: ../../mod/admin.php:1366
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: ../../mod/admin.php:1367
-msgid "Log level"
-msgstr ""
-
-#: ../../mod/admin.php:1416 ../../mod/contacts.php:487
-msgid "Update now"
-msgstr ""
-
-#: ../../mod/admin.php:1417
-msgid "Close"
-msgstr ""
-
-#: ../../mod/admin.php:1423
-msgid "FTP Host"
-msgstr ""
-
-#: ../../mod/admin.php:1424
-msgid "FTP Path"
-msgstr ""
-
-#: ../../mod/admin.php:1425
-msgid "FTP User"
-msgstr ""
-
-#: ../../mod/admin.php:1426
-msgid "FTP Password"
-msgstr ""
-
-#: ../../mod/_search.php:99 ../../mod/search.php:99 ../../include/text.php:952
-#: ../../include/text.php:953 ../../include/nav.php:119
-msgid "Search"
-msgstr ""
-
-#: ../../mod/_search.php:180 ../../mod/_search.php:206
-#: ../../mod/search.php:170 ../../mod/search.php:196
-#: ../../mod/community.php:62 ../../mod/community.php:71
-msgid "No results."
-msgstr ""
-
-#: ../../mod/profile.php:180
-msgid "Tips for New Members"
-msgstr ""
-
-#: ../../mod/share.php:44
-msgid "link"
-msgstr ""
-
-#: ../../mod/tagger.php:95 ../../include/conversation.php:266
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr ""
-
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
-msgstr ""
-
-#: ../../mod/editpost.php:39
-msgid "Edit post"
-msgstr ""
-
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1091
-msgid "upload photo"
-msgstr ""
-
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1092
-msgid "Attach file"
-msgstr ""
-
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1093
-msgid "attach file"
-msgstr ""
-
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1095
-msgid "web link"
-msgstr ""
-
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1096
-msgid "Insert video link"
-msgstr ""
-
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1097
-msgid "video link"
-msgstr ""
-
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1098
-msgid "Insert audio link"
-msgstr ""
-
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1099
-msgid "audio link"
-msgstr ""
-
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1100
-msgid "Set your location"
-msgstr ""
-
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1101
-msgid "set location"
-msgstr ""
-
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1102
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../mod/editpost.php:123 ../../include/conversation.php:1103
-msgid "clear location"
-msgstr ""
-
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1109
-msgid "Permission settings"
-msgstr ""
-
-#: ../../mod/editpost.php:133 ../../include/conversation.php:1118
-msgid "CC: email addresses"
-msgstr ""
-
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1119
-msgid "Public post"
-msgstr ""
-
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1105
-msgid "Set title"
-msgstr ""
-
-#: ../../mod/editpost.php:139 ../../include/conversation.php:1107
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../mod/editpost.php:140 ../../include/conversation.php:1121
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: ../../mod/attach.php:8
-msgid "Item not available."
-msgstr ""
-
-#: ../../mod/attach.php:20
-msgid "Item was not found."
-msgstr ""
-
-#: ../../mod/regmod.php:63
-msgid "Account approved."
-msgstr ""
-
-#: ../../mod/regmod.php:100
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../mod/regmod.php:112
-msgid "Please login."
-msgstr ""
-
-#: ../../mod/directory.php:57
-msgid "Find on this site"
-msgstr ""
-
-#: ../../mod/directory.php:59 ../../mod/contacts.php:693
-msgid "Finding: "
-msgstr ""
-
-#: ../../mod/directory.php:60
-msgid "Site Directory"
-msgstr ""
-
-#: ../../mod/directory.php:61 ../../mod/contacts.php:694
-#: ../../include/contact_widgets.php:33
-msgid "Find"
-msgstr ""
-
-#: ../../mod/directory.php:111 ../../mod/profiles.php:698
-msgid "Age: "
-msgstr ""
-
-#: ../../mod/directory.php:114
-msgid "Gender: "
-msgstr ""
-
-#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58
-msgid "About:"
-msgstr ""
-
-#: ../../mod/directory.php:187
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/help.php:79
+msgid "Help:"
 msgstr ""
 
 #: ../../mod/crepair.php:104
@@ -3013,2009 +7210,239 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:151
+#: ../../mod/crepair.php:159
 msgid "Account Nickname"
 msgstr ""
 
-#: ../../mod/crepair.php:152
+#: ../../mod/crepair.php:160
 msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: ../../mod/crepair.php:153
+#: ../../mod/crepair.php:161
 msgid "Account URL"
 msgstr ""
 
-#: ../../mod/crepair.php:154
+#: ../../mod/crepair.php:162
 msgid "Friend Request URL"
 msgstr ""
 
-#: ../../mod/crepair.php:155
+#: ../../mod/crepair.php:163
 msgid "Friend Confirm URL"
 msgstr ""
 
-#: ../../mod/crepair.php:156
+#: ../../mod/crepair.php:164
 msgid "Notification Endpoint URL"
 msgstr ""
 
-#: ../../mod/crepair.php:157
+#: ../../mod/crepair.php:165
 msgid "Poll/Feed URL"
 msgstr ""
 
-#: ../../mod/crepair.php:158
+#: ../../mod/crepair.php:166
 msgid "New photo from this URL"
 msgstr ""
 
-#: ../../mod/crepair.php:159
+#: ../../mod/crepair.php:167
 msgid "Remote Self"
 msgstr ""
 
-#: ../../mod/crepair.php:161
+#: ../../mod/crepair.php:169
 msgid "Mirror postings from this contact"
 msgstr ""
 
-#: ../../mod/crepair.php:161
+#: ../../mod/crepair.php:169
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
 msgstr ""
 
-#: ../../mod/uimport.php:66
-msgid "Move account"
+#: ../../mod/crepair.php:169
+msgid "No mirroring"
 msgstr ""
 
-#: ../../mod/uimport.php:67
-msgid "You can import an account from another Friendica server."
+#: ../../mod/crepair.php:169
+msgid "Mirror as forwarded posting"
 msgstr ""
 
-#: ../../mod/uimport.php:68
+#: ../../mod/crepair.php:169
+msgid "Mirror as my own posting"
+msgstr ""
+
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
+msgstr ""
+
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
+msgstr ""
+
+#: ../../mod/newmember.php:12
 msgid ""
-"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."
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
 msgstr ""
 
-#: ../../mod/uimport.php:69
+#: ../../mod/newmember.php:14
+msgid "Getting Started"
+msgstr ""
+
+#: ../../mod/newmember.php:18
+msgid "Friendica Walk-Through"
+msgstr ""
+
+#: ../../mod/newmember.php:18
 msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (statusnet/identi.ca) or from Diaspora"
+"On your Quick Start page - find a brief introduction to your "
+"profile and network tabs, make some new connections, and find some groups to "
+"join."
 msgstr ""
 
-#: ../../mod/uimport.php:70
-msgid "Account file"
+#: ../../mod/newmember.php:26
+msgid "Go to Your Settings"
 msgstr ""
 
-#: ../../mod/uimport.php:70
+#: ../../mod/newmember.php:26
 msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
+"On your Settings page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
 msgstr ""
 
-#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../mod/lockview.php:48
-msgid "Visible to:"
-msgstr ""
-
-#: ../../mod/notes.php:63 ../../mod/filer.php:31 ../../include/text.php:955
-msgid "Save"
-msgstr ""
-
-#: ../../mod/help.php:79
-msgid "Help:"
-msgstr ""
-
-#: ../../mod/help.php:84 ../../include/nav.php:114
-msgid "Help"
-msgstr ""
-
-#: ../../mod/hcard.php:10
-msgid "No profile"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:93
-msgid "This introduction has already been accepted."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
-msgid "Profile location is not valid or does not contain profile information."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
-msgid "Warning: profile location has no profile photo."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
-#, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/dfrn_request.php:170
-msgid "Introduction complete."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:209
-msgid "Unrecoverable protocol error."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:237
-msgid "Profile unavailable."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:262
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:263
-msgid "Spam protection measures have been invoked."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:264
-msgid "Friends are advised to please try again in 24 hours."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:326
-msgid "Invalid locator"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:335
-msgid "Invalid email address."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:362
-msgid "This account has not been configured for email. Request failed."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:458
-msgid "Unable to resolve your name at the provided location."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:471
-msgid "You have already introduced yourself here."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:475
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:496
-msgid "Invalid profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
-msgid "Disallowed profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:180
-msgid "Failed to update contact record."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:592
-msgid "Your introduction has been sent."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:645
-msgid "Please login to confirm introduction."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:659
+#: ../../mod/newmember.php:28
 msgid ""
-"Incorrect identity currently logged in. Please login to this profile."
+"Review the other settings, particularly the privacy settings. An unpublished "
+"directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:670
-msgid "Hide this contact"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:673
-#, php-format
-msgid "Welcome home %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:674
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:675
-msgid "Confirm"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:716 ../../include/items.php:3797
-msgid "[Name Withheld]"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:811
+#: ../../mod/newmember.php:36
 msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make "
+"friends than people who do not."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:827
-msgid "Connect as an email follower (Coming soon)"
+#: ../../mod/newmember.php:38
+msgid "Edit Your Profile"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:829
+#: ../../mod/newmember.php:38
 msgid ""
-"If you are not yet a member of the free social web, follow this link to find a public Friendica site "
-"and join us today."
+"Edit your default profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown "
+"visitors."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:832
-msgid "Friend/Connection Request"
+#: ../../mod/newmember.php:40
+msgid "Profile Keywords"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:833
+#: ../../mod/newmember.php:40
 msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:834
-msgid "Please answer the following:"
+#: ../../mod/newmember.php:44
+msgid "Connecting"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:835
-#, php-format
-msgid "Does %s know you?"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:838
-msgid "Add a personal note:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:841
-msgid "StatusNet/Federated Social Web"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:733
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:843
-#, php-format
+#: ../../mod/newmember.php:49
 msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search "
-"bar."
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:844
-msgid "Your Identity Address:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:847
-msgid "Submit Request"
-msgstr ""
-
-#: ../../mod/update_profile.php:41 ../../mod/update_network.php:25
-#: ../../mod/update_display.php:22 ../../mod/update_community.php:18
-#: ../../mod/update_notes.php:41
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: ../../mod/content.php:497 ../../include/conversation.php:689
-msgid "View in context"
-msgstr ""
-
-#: ../../mod/contacts.php:104
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/contacts.php:135 ../../mod/contacts.php:264
-msgid "Could not access contact record."
-msgstr ""
-
-#: ../../mod/contacts.php:149
-msgid "Could not locate selected profile."
-msgstr ""
-
-#: ../../mod/contacts.php:178
-msgid "Contact updated."
-msgstr ""
-
-#: ../../mod/contacts.php:278
-msgid "Contact has been blocked"
-msgstr ""
-
-#: ../../mod/contacts.php:278
-msgid "Contact has been unblocked"
-msgstr ""
-
-#: ../../mod/contacts.php:288
-msgid "Contact has been ignored"
-msgstr ""
-
-#: ../../mod/contacts.php:288
-msgid "Contact has been unignored"
-msgstr ""
-
-#: ../../mod/contacts.php:299
-msgid "Contact has been archived"
-msgstr ""
-
-#: ../../mod/contacts.php:299
-msgid "Contact has been unarchived"
-msgstr ""
-
-#: ../../mod/contacts.php:324 ../../mod/contacts.php:697
-msgid "Do you really want to delete this contact?"
-msgstr ""
-
-#: ../../mod/contacts.php:341
-msgid "Contact has been removed."
-msgstr ""
-
-#: ../../mod/contacts.php:379
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr ""
-
-#: ../../mod/contacts.php:383
-#, php-format
-msgid "You are sharing with %s"
-msgstr ""
-
-#: ../../mod/contacts.php:388
-#, php-format
-msgid "%s is sharing with you"
-msgstr ""
-
-#: ../../mod/contacts.php:405
-msgid "Private communications are not available for this contact."
-msgstr ""
-
-#: ../../mod/contacts.php:412
-msgid "(Update was successful)"
-msgstr ""
-
-#: ../../mod/contacts.php:412
-msgid "(Update was not successful)"
-msgstr ""
-
-#: ../../mod/contacts.php:414
-msgid "Suggest friends"
-msgstr ""
-
-#: ../../mod/contacts.php:418
-#, php-format
-msgid "Network type: %s"
-msgstr ""
-
-#: ../../mod/contacts.php:421 ../../include/contact_widgets.php:199
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/contacts.php:426
-msgid "View all contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:434
-msgid "Toggle Blocked status"
-msgstr ""
-
-#: ../../mod/contacts.php:437 ../../mod/contacts.php:491
-#: ../../mod/contacts.php:701
-msgid "Unignore"
-msgstr ""
-
-#: ../../mod/contacts.php:437 ../../mod/contacts.php:491
-#: ../../mod/contacts.php:701 ../../mod/notifications.php:51
-#: ../../mod/notifications.php:164 ../../mod/notifications.php:210
-msgid "Ignore"
-msgstr ""
-
-#: ../../mod/contacts.php:440
-msgid "Toggle Ignored status"
-msgstr ""
-
-#: ../../mod/contacts.php:444 ../../mod/contacts.php:702
-msgid "Unarchive"
-msgstr ""
-
-#: ../../mod/contacts.php:444 ../../mod/contacts.php:702
-msgid "Archive"
-msgstr ""
-
-#: ../../mod/contacts.php:447
-msgid "Toggle Archive status"
-msgstr ""
-
-#: ../../mod/contacts.php:450
-msgid "Repair"
-msgstr ""
-
-#: ../../mod/contacts.php:453
-msgid "Advanced Contact Settings"
-msgstr ""
-
-#: ../../mod/contacts.php:459
-msgid "Communications lost with this contact!"
-msgstr ""
-
-#: ../../mod/contacts.php:462
-msgid "Contact Editor"
-msgstr ""
-
-#: ../../mod/contacts.php:465
-msgid "Profile Visibility"
-msgstr ""
-
-#: ../../mod/contacts.php:466
-#, php-format
+#: ../../mod/newmember.php:51
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+"If this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
 msgstr ""
 
-#: ../../mod/contacts.php:467
-msgid "Contact Information / Notes"
+#: ../../mod/newmember.php:56
+msgid "Importing Emails"
 msgstr ""
 
-#: ../../mod/contacts.php:468
-msgid "Edit contact notes"
-msgstr ""
-
-#: ../../mod/contacts.php:473 ../../mod/contacts.php:665
-#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr ""
-
-#: ../../mod/contacts.php:474
-msgid "Block/Unblock contact"
-msgstr ""
-
-#: ../../mod/contacts.php:475
-msgid "Ignore contact"
-msgstr ""
-
-#: ../../mod/contacts.php:476
-msgid "Repair URL settings"
-msgstr ""
-
-#: ../../mod/contacts.php:477
-msgid "View conversations"
-msgstr ""
-
-#: ../../mod/contacts.php:479
-msgid "Delete contact"
-msgstr ""
-
-#: ../../mod/contacts.php:483
-msgid "Last update:"
-msgstr ""
-
-#: ../../mod/contacts.php:485
-msgid "Update public posts"
-msgstr ""
-
-#: ../../mod/contacts.php:494
-msgid "Currently blocked"
-msgstr ""
-
-#: ../../mod/contacts.php:495
-msgid "Currently ignored"
-msgstr ""
-
-#: ../../mod/contacts.php:496
-msgid "Currently archived"
-msgstr ""
-
-#: ../../mod/contacts.php:497 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:204
-msgid "Hide this contact from others"
-msgstr ""
-
-#: ../../mod/contacts.php:497
+#: ../../mod/newmember.php:56
 msgid ""
-"Replies/likes to your public posts may still be visible"
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
 msgstr ""
 
-#: ../../mod/contacts.php:498
-msgid "Notification for new posts"
+#: ../../mod/newmember.php:58
+msgid "Go to Your Contacts Page"
 msgstr ""
 
-#: ../../mod/contacts.php:498
-msgid "Send a notification of every new post of this contact"
-msgstr ""
-
-#: ../../mod/contacts.php:499
-msgid "Fetch further information for feeds"
-msgstr ""
-
-#: ../../mod/contacts.php:550
-msgid "Suggestions"
-msgstr ""
-
-#: ../../mod/contacts.php:553
-msgid "Suggest potential friends"
-msgstr ""
-
-#: ../../mod/contacts.php:556 ../../mod/group.php:194
-msgid "All Contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:559
-msgid "Show all contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:562
-msgid "Unblocked"
-msgstr ""
-
-#: ../../mod/contacts.php:565
-msgid "Only show unblocked contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:569
-msgid "Blocked"
-msgstr ""
-
-#: ../../mod/contacts.php:572
-msgid "Only show blocked contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:576
-msgid "Ignored"
-msgstr ""
-
-#: ../../mod/contacts.php:579
-msgid "Only show ignored contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:583
-msgid "Archived"
-msgstr ""
-
-#: ../../mod/contacts.php:586
-msgid "Only show archived contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:590
-msgid "Hidden"
-msgstr ""
-
-#: ../../mod/contacts.php:593
-msgid "Only show hidden contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:641
-msgid "Mutual Friendship"
-msgstr ""
-
-#: ../../mod/contacts.php:645
-msgid "is a fan of yours"
-msgstr ""
-
-#: ../../mod/contacts.php:649
-msgid "you are a fan of"
-msgstr ""
-
-#: ../../mod/contacts.php:666 ../../mod/nogroup.php:41
-msgid "Edit contact"
-msgstr ""
-
-#: ../../mod/contacts.php:692
-msgid "Search your contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:699 ../../mod/settings.php:132
-#: ../../mod/settings.php:637
-msgid "Update"
-msgstr ""
-
-#: ../../mod/settings.php:29 ../../mod/photos.php:80
-msgid "everybody"
-msgstr ""
-
-#: ../../mod/settings.php:41
-msgid "Additional features"
-msgstr ""
-
-#: ../../mod/settings.php:46
-msgid "Display"
-msgstr ""
-
-#: ../../mod/settings.php:52 ../../mod/settings.php:777
-msgid "Social Networks"
-msgstr ""
-
-#: ../../mod/settings.php:62 ../../include/nav.php:168
-msgid "Delegations"
-msgstr ""
-
-#: ../../mod/settings.php:67
-msgid "Connected apps"
-msgstr ""
-
-#: ../../mod/settings.php:72 ../../mod/uexport.php:85
-msgid "Export personal data"
-msgstr ""
-
-#: ../../mod/settings.php:77
-msgid "Remove account"
-msgstr ""
-
-#: ../../mod/settings.php:129
-msgid "Missing some important data!"
-msgstr ""
-
-#: ../../mod/settings.php:238
-msgid "Failed to connect with email account using the settings provided."
-msgstr ""
-
-#: ../../mod/settings.php:243
-msgid "Email settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:258
-msgid "Features updated"
-msgstr ""
-
-#: ../../mod/settings.php:321
-msgid "Relocate message has been send to your contacts"
-msgstr ""
-
-#: ../../mod/settings.php:335
-msgid "Passwords do not match. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:340
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:348
-msgid "Wrong password."
-msgstr ""
-
-#: ../../mod/settings.php:359
-msgid "Password changed."
-msgstr ""
-
-#: ../../mod/settings.php:361
-msgid "Password update failed. Please try again."
-msgstr ""
-
-#: ../../mod/settings.php:426
-msgid " Please use a shorter name."
-msgstr ""
-
-#: ../../mod/settings.php:428
-msgid " Name too short."
-msgstr ""
-
-#: ../../mod/settings.php:437
-msgid "Wrong Password"
-msgstr ""
-
-#: ../../mod/settings.php:442
-msgid " Not valid email."
-msgstr ""
-
-#: ../../mod/settings.php:448
-msgid " Cannot change to that email."
-msgstr ""
-
-#: ../../mod/settings.php:503
-msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr ""
-
-#: ../../mod/settings.php:507
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr ""
-
-#: ../../mod/settings.php:537
-msgid "Settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:610 ../../mod/settings.php:636
-#: ../../mod/settings.php:672
-msgid "Add application"
-msgstr ""
-
-#: ../../mod/settings.php:614 ../../mod/settings.php:640
-msgid "Consumer Key"
-msgstr ""
-
-#: ../../mod/settings.php:615 ../../mod/settings.php:641
-msgid "Consumer Secret"
-msgstr ""
-
-#: ../../mod/settings.php:616 ../../mod/settings.php:642
-msgid "Redirect"
-msgstr ""
-
-#: ../../mod/settings.php:617 ../../mod/settings.php:643
-msgid "Icon url"
-msgstr ""
-
-#: ../../mod/settings.php:628
-msgid "You can't edit this application."
-msgstr ""
-
-#: ../../mod/settings.php:671
-msgid "Connected Apps"
-msgstr ""
-
-#: ../../mod/settings.php:675
-msgid "Client key starts with"
-msgstr ""
-
-#: ../../mod/settings.php:676
-msgid "No name"
-msgstr ""
-
-#: ../../mod/settings.php:677
-msgid "Remove authorization"
-msgstr ""
-
-#: ../../mod/settings.php:689
-msgid "No Plugin settings configured"
-msgstr ""
-
-#: ../../mod/settings.php:697
-msgid "Plugin Settings"
-msgstr ""
-
-#: ../../mod/settings.php:711
-msgid "Off"
-msgstr ""
-
-#: ../../mod/settings.php:711
-msgid "On"
-msgstr ""
-
-#: ../../mod/settings.php:719
-msgid "Additional Features"
-msgstr ""
-
-#: ../../mod/settings.php:733 ../../mod/settings.php:734
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr ""
-
-#: ../../mod/settings.php:733 ../../mod/settings.php:734
-msgid "enabled"
-msgstr ""
-
-#: ../../mod/settings.php:733 ../../mod/settings.php:734
-msgid "disabled"
-msgstr ""
-
-#: ../../mod/settings.php:734
-msgid "StatusNet"
-msgstr ""
-
-#: ../../mod/settings.php:770
-msgid "Email access is disabled on this site."
-msgstr ""
-
-#: ../../mod/settings.php:782
-msgid "Email/Mailbox Setup"
-msgstr ""
-
-#: ../../mod/settings.php:783
+#: ../../mod/newmember.php:58
 msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the Add New Contact dialog."
 msgstr ""
 
-#: ../../mod/settings.php:784
-msgid "Last successful email check:"
+#: ../../mod/newmember.php:60
+msgid "Go to Your Site's Directory"
 msgstr ""
 
-#: ../../mod/settings.php:786
-msgid "IMAP server name:"
-msgstr ""
-
-#: ../../mod/settings.php:787
-msgid "IMAP port:"
-msgstr ""
-
-#: ../../mod/settings.php:788
-msgid "Security:"
-msgstr ""
-
-#: ../../mod/settings.php:788 ../../mod/settings.php:793
-msgid "None"
-msgstr ""
-
-#: ../../mod/settings.php:789
-msgid "Email login name:"
-msgstr ""
-
-#: ../../mod/settings.php:790
-msgid "Email password:"
-msgstr ""
-
-#: ../../mod/settings.php:791
-msgid "Reply-to address:"
-msgstr ""
-
-#: ../../mod/settings.php:792
-msgid "Send public posts to all email contacts:"
-msgstr ""
-
-#: ../../mod/settings.php:793
-msgid "Action after import:"
-msgstr ""
-
-#: ../../mod/settings.php:793
-msgid "Mark as seen"
-msgstr ""
-
-#: ../../mod/settings.php:793
-msgid "Move to folder"
-msgstr ""
-
-#: ../../mod/settings.php:794
-msgid "Move to folder:"
-msgstr ""
-
-#: ../../mod/settings.php:875
-msgid "Display Settings"
-msgstr ""
-
-#: ../../mod/settings.php:881 ../../mod/settings.php:896
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:882
-msgid "Mobile Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:883
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:883
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:884
-msgid "Number of items to display per page:"
-msgstr ""
-
-#: ../../mod/settings.php:884 ../../mod/settings.php:885
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: ../../mod/settings.php:885
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr ""
-
-#: ../../mod/settings.php:886
-msgid "Don't show emoticons"
-msgstr ""
-
-#: ../../mod/settings.php:887
-msgid "Don't show notices"
-msgstr ""
-
-#: ../../mod/settings.php:888
-msgid "Infinite scroll"
-msgstr ""
-
-#: ../../mod/settings.php:889
-msgid "Automatic updates only at the top of the network page"
-msgstr ""
-
-#: ../../mod/settings.php:966
-msgid "User Types"
-msgstr ""
-
-#: ../../mod/settings.php:967
-msgid "Community Types"
-msgstr ""
-
-#: ../../mod/settings.php:968
-msgid "Normal Account Page"
-msgstr ""
-
-#: ../../mod/settings.php:969
-msgid "This account is a normal personal profile"
-msgstr ""
-
-#: ../../mod/settings.php:972
-msgid "Soapbox Page"
-msgstr ""
-
-#: ../../mod/settings.php:973
-msgid "Automatically approve all connection/friend requests as read-only fans"
-msgstr ""
-
-#: ../../mod/settings.php:976
-msgid "Community Forum/Celebrity Account"
-msgstr ""
-
-#: ../../mod/settings.php:977
-msgid "Automatically approve all connection/friend requests as read-write fans"
-msgstr ""
-
-#: ../../mod/settings.php:980
-msgid "Automatic Friend Page"
-msgstr ""
-
-#: ../../mod/settings.php:981
-msgid "Automatically approve all connection/friend requests as friends"
-msgstr ""
-
-#: ../../mod/settings.php:984
-msgid "Private Forum [Experimental]"
-msgstr ""
-
-#: ../../mod/settings.php:985
-msgid "Private forum - approved members only"
-msgstr ""
-
-#: ../../mod/settings.php:997
-msgid "OpenID:"
-msgstr ""
-
-#: ../../mod/settings.php:997
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr ""
-
-#: ../../mod/settings.php:1007
-msgid "Publish your default profile in your local site directory?"
-msgstr ""
-
-#: ../../mod/settings.php:1013
-msgid "Publish your default profile in the global social directory?"
-msgstr ""
-
-#: ../../mod/settings.php:1021
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr ""
-
-#: ../../mod/settings.php:1025 ../../include/conversation.php:1056
-msgid "Hide your profile details from unknown viewers?"
-msgstr ""
-
-#: ../../mod/settings.php:1030
-msgid "Allow friends to post to your profile page?"
-msgstr ""
-
-#: ../../mod/settings.php:1036
-msgid "Allow friends to tag your posts?"
-msgstr ""
-
-#: ../../mod/settings.php:1042
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr ""
-
-#: ../../mod/settings.php:1048
-msgid "Permit unknown people to send you private mail?"
-msgstr ""
-
-#: ../../mod/settings.php:1056
-msgid "Profile is not published."
-msgstr ""
-
-#: ../../mod/settings.php:1059 ../../mod/profile_photo.php:248
-msgid "or"
-msgstr ""
-
-#: ../../mod/settings.php:1064
-msgid "Your Identity Address is"
-msgstr ""
-
-#: ../../mod/settings.php:1075
-msgid "Automatically expire posts after this many days:"
-msgstr ""
-
-#: ../../mod/settings.php:1075
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr ""
-
-#: ../../mod/settings.php:1076
-msgid "Advanced expiration settings"
-msgstr ""
-
-#: ../../mod/settings.php:1077
-msgid "Advanced Expiration"
-msgstr ""
-
-#: ../../mod/settings.php:1078
-msgid "Expire posts:"
-msgstr ""
-
-#: ../../mod/settings.php:1079
-msgid "Expire personal notes:"
-msgstr ""
-
-#: ../../mod/settings.php:1080
-msgid "Expire starred posts:"
-msgstr ""
-
-#: ../../mod/settings.php:1081
-msgid "Expire photos:"
-msgstr ""
-
-#: ../../mod/settings.php:1082
-msgid "Only expire posts by others:"
-msgstr ""
-
-#: ../../mod/settings.php:1108
-msgid "Account Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1116
-msgid "Password Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1117
-msgid "New Password:"
-msgstr ""
-
-#: ../../mod/settings.php:1118
-msgid "Confirm:"
-msgstr ""
-
-#: ../../mod/settings.php:1118
-msgid "Leave password fields blank unless changing"
-msgstr ""
-
-#: ../../mod/settings.php:1119
-msgid "Current Password:"
-msgstr ""
-
-#: ../../mod/settings.php:1119 ../../mod/settings.php:1120
-msgid "Your current password to confirm the changes"
-msgstr ""
-
-#: ../../mod/settings.php:1120
-msgid "Password:"
-msgstr ""
-
-#: ../../mod/settings.php:1124
-msgid "Basic Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1125 ../../include/profile_advanced.php:15
-msgid "Full Name:"
-msgstr ""
-
-#: ../../mod/settings.php:1126
-msgid "Email Address:"
-msgstr ""
-
-#: ../../mod/settings.php:1127
-msgid "Your Timezone:"
-msgstr ""
-
-#: ../../mod/settings.php:1128
-msgid "Default Post Location:"
-msgstr ""
-
-#: ../../mod/settings.php:1129
-msgid "Use Browser Location:"
-msgstr ""
-
-#: ../../mod/settings.php:1132
-msgid "Security and Privacy Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1134
-msgid "Maximum Friend Requests/Day:"
-msgstr ""
-
-#: ../../mod/settings.php:1134 ../../mod/settings.php:1164
-msgid "(to prevent spam abuse)"
-msgstr ""
-
-#: ../../mod/settings.php:1135
-msgid "Default Post Permissions"
-msgstr ""
-
-#: ../../mod/settings.php:1136
-msgid "(click to open/close)"
-msgstr ""
-
-#: ../../mod/settings.php:1145 ../../mod/photos.php:1146
-#: ../../mod/photos.php:1517
-msgid "Show to Groups"
-msgstr ""
-
-#: ../../mod/settings.php:1146 ../../mod/photos.php:1147
-#: ../../mod/photos.php:1518
-msgid "Show to Contacts"
-msgstr ""
-
-#: ../../mod/settings.php:1147
-msgid "Default Private Post"
-msgstr ""
-
-#: ../../mod/settings.php:1148
-msgid "Default Public Post"
-msgstr ""
-
-#: ../../mod/settings.php:1152
-msgid "Default Permissions for New Posts"
-msgstr ""
-
-#: ../../mod/settings.php:1164
-msgid "Maximum private messages per day from unknown people:"
-msgstr ""
-
-#: ../../mod/settings.php:1167
-msgid "Notification Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1168
-msgid "By default post a status message when:"
-msgstr ""
-
-#: ../../mod/settings.php:1169
-msgid "accepting a friend request"
-msgstr ""
-
-#: ../../mod/settings.php:1170
-msgid "joining a forum/community"
-msgstr ""
-
-#: ../../mod/settings.php:1171
-msgid "making an interesting profile change"
-msgstr ""
-
-#: ../../mod/settings.php:1172
-msgid "Send a notification email when:"
-msgstr ""
-
-#: ../../mod/settings.php:1173
-msgid "You receive an introduction"
-msgstr ""
-
-#: ../../mod/settings.php:1174
-msgid "Your introductions are confirmed"
-msgstr ""
-
-#: ../../mod/settings.php:1175
-msgid "Someone writes on your profile wall"
-msgstr ""
-
-#: ../../mod/settings.php:1176
-msgid "Someone writes a followup comment"
-msgstr ""
-
-#: ../../mod/settings.php:1177
-msgid "You receive a private message"
-msgstr ""
-
-#: ../../mod/settings.php:1178
-msgid "You receive a friend suggestion"
-msgstr ""
-
-#: ../../mod/settings.php:1179
-msgid "You are tagged in a post"
-msgstr ""
-
-#: ../../mod/settings.php:1180
-msgid "You are poked/prodded/etc. in a post"
-msgstr ""
-
-#: ../../mod/settings.php:1183
-msgid "Advanced Account/Page Type Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1184
-msgid "Change the behaviour of this account for special situations"
-msgstr ""
-
-#: ../../mod/settings.php:1187
-msgid "Relocate"
-msgstr ""
-
-#: ../../mod/settings.php:1188
+#: ../../mod/newmember.php:60
 msgid ""
-"If you have moved this profile from another server, and some of your "
-"contacts don't receive your updates, try pushing this button."
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a Connect or Follow link on "
+"their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/settings.php:1189
-msgid "Resend relocate message to contacts"
+#: ../../mod/newmember.php:62
+msgid "Finding New People"
 msgstr ""
 
-#: ../../mod/profiles.php:37
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
-msgid "Profile-"
-msgstr ""
-
-#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
-msgid "New profile created."
-msgstr ""
-
-#: ../../mod/profiles.php:95
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../mod/profiles.php:170
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../mod/profiles.php:321
-msgid "Marital Status"
-msgstr ""
-
-#: ../../mod/profiles.php:325
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../mod/profiles.php:329
-msgid "Likes"
-msgstr ""
-
-#: ../../mod/profiles.php:333
-msgid "Dislikes"
-msgstr ""
-
-#: ../../mod/profiles.php:337
-msgid "Work/Employment"
-msgstr ""
-
-#: ../../mod/profiles.php:340
-msgid "Religion"
-msgstr ""
-
-#: ../../mod/profiles.php:344
-msgid "Political Views"
-msgstr ""
-
-#: ../../mod/profiles.php:348
-msgid "Gender"
-msgstr ""
-
-#: ../../mod/profiles.php:352
-msgid "Sexual Preference"
-msgstr ""
-
-#: ../../mod/profiles.php:356
-msgid "Homepage"
-msgstr ""
-
-#: ../../mod/profiles.php:360
-msgid "Interests"
-msgstr ""
-
-#: ../../mod/profiles.php:364
-msgid "Address"
-msgstr ""
-
-#: ../../mod/profiles.php:371
-msgid "Location"
-msgstr ""
-
-#: ../../mod/profiles.php:454
-msgid "Profile updated."
-msgstr ""
-
-#: ../../mod/profiles.php:525
-msgid " and "
-msgstr ""
-
-#: ../../mod/profiles.php:533
-msgid "public profile"
-msgstr ""
-
-#: ../../mod/profiles.php:536
-#, php-format
-msgid "%1$s changed %2$s to “%3$s”"
-msgstr ""
-
-#: ../../mod/profiles.php:537
-#, php-format
-msgid " - Visit %1$s's %2$s"
-msgstr ""
-
-#: ../../mod/profiles.php:540
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr ""
-
-#: ../../mod/profiles.php:615
-msgid "Hide contacts and friends:"
-msgstr ""
-
-#: ../../mod/profiles.php:620
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr ""
-
-#: ../../mod/profiles.php:641
-msgid "Edit Profile Details"
-msgstr ""
-
-#: ../../mod/profiles.php:643
-msgid "Change Profile Photo"
-msgstr ""
-
-#: ../../mod/profiles.php:644
-msgid "View this profile"
-msgstr ""
-
-#: ../../mod/profiles.php:645
-msgid "Create a new profile using these settings"
-msgstr ""
-
-#: ../../mod/profiles.php:646
-msgid "Clone this profile"
-msgstr ""
-
-#: ../../mod/profiles.php:647
-msgid "Delete this profile"
-msgstr ""
-
-#: ../../mod/profiles.php:648
-msgid "Profile Name:"
-msgstr ""
-
-#: ../../mod/profiles.php:649
-msgid "Your Full Name:"
-msgstr ""
-
-#: ../../mod/profiles.php:650
-msgid "Title/Description:"
-msgstr ""
-
-#: ../../mod/profiles.php:651
-msgid "Your Gender:"
-msgstr ""
-
-#: ../../mod/profiles.php:652
-#, php-format
-msgid "Birthday (%s):"
-msgstr ""
-
-#: ../../mod/profiles.php:653
-msgid "Street Address:"
-msgstr ""
-
-#: ../../mod/profiles.php:654
-msgid "Locality/City:"
-msgstr ""
-
-#: ../../mod/profiles.php:655
-msgid "Postal/Zip Code:"
-msgstr ""
-
-#: ../../mod/profiles.php:656
-msgid "Country:"
-msgstr ""
-
-#: ../../mod/profiles.php:657
-msgid "Region/State:"
-msgstr ""
-
-#: ../../mod/profiles.php:658
-msgid "♥ Marital Status:"
-msgstr ""
-
-#: ../../mod/profiles.php:659
-msgid "Who: (if applicable)"
-msgstr ""
-
-#: ../../mod/profiles.php:660
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr ""
-
-#: ../../mod/profiles.php:661
-msgid "Since [date]:"
-msgstr ""
-
-#: ../../mod/profiles.php:662 ../../include/profile_advanced.php:46
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../mod/profiles.php:663
-msgid "Homepage URL:"
-msgstr ""
-
-#: ../../mod/profiles.php:664 ../../include/profile_advanced.php:50
-msgid "Hometown:"
-msgstr ""
-
-#: ../../mod/profiles.php:665 ../../include/profile_advanced.php:54
-msgid "Political Views:"
-msgstr ""
-
-#: ../../mod/profiles.php:666
-msgid "Religious Views:"
-msgstr ""
-
-#: ../../mod/profiles.php:667
-msgid "Public Keywords:"
-msgstr ""
-
-#: ../../mod/profiles.php:668
-msgid "Private Keywords:"
-msgstr ""
-
-#: ../../mod/profiles.php:669 ../../include/profile_advanced.php:62
-msgid "Likes:"
-msgstr ""
-
-#: ../../mod/profiles.php:670 ../../include/profile_advanced.php:64
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../mod/profiles.php:671
-msgid "Example: fishing photography software"
-msgstr ""
-
-#: ../../mod/profiles.php:672
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr ""
-
-#: ../../mod/profiles.php:673
-msgid "(Used for searching profiles, never shown to others)"
-msgstr ""
-
-#: ../../mod/profiles.php:674
-msgid "Tell us about yourself..."
-msgstr ""
-
-#: ../../mod/profiles.php:675
-msgid "Hobbies/Interests"
-msgstr ""
-
-#: ../../mod/profiles.php:676
-msgid "Contact information and Social Networks"
-msgstr ""
-
-#: ../../mod/profiles.php:677
-msgid "Musical interests"
-msgstr ""
-
-#: ../../mod/profiles.php:678
-msgid "Books, literature"
-msgstr ""
-
-#: ../../mod/profiles.php:679
-msgid "Television"
-msgstr ""
-
-#: ../../mod/profiles.php:680
-msgid "Film/dance/culture/entertainment"
-msgstr ""
-
-#: ../../mod/profiles.php:681
-msgid "Love/romance"
-msgstr ""
-
-#: ../../mod/profiles.php:682
-msgid "Work/employment"
-msgstr ""
-
-#: ../../mod/profiles.php:683
-msgid "School/education"
-msgstr ""
-
-#: ../../mod/profiles.php:688
+#: ../../mod/newmember.php:62
 msgid ""
-"This is your public profile.
It may "
-"be visible to anybody using the internet."
+"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."
 msgstr ""
 
-#: ../../mod/profiles.php:737
-msgid "Edit/Manage Profiles"
+#: ../../mod/newmember.php:70
+msgid "Group Your Contacts"
 msgstr ""
 
-#: ../../mod/group.php:29
-msgid "Group created."
-msgstr ""
-
-#: ../../mod/group.php:35
-msgid "Could not create group."
-msgstr ""
-
-#: ../../mod/group.php:47 ../../mod/group.php:140
-msgid "Group not found."
-msgstr ""
-
-#: ../../mod/group.php:60
-msgid "Group name changed."
-msgstr ""
-
-#: ../../mod/group.php:87
-msgid "Save Group"
-msgstr ""
-
-#: ../../mod/group.php:93
-msgid "Create a group of contacts/friends."
-msgstr ""
-
-#: ../../mod/group.php:94 ../../mod/group.php:180
-msgid "Group Name: "
-msgstr ""
-
-#: ../../mod/group.php:113
-msgid "Group removed."
-msgstr ""
-
-#: ../../mod/group.php:115
-msgid "Unable to remove group."
-msgstr ""
-
-#: ../../mod/group.php:179
-msgid "Group Editor"
-msgstr ""
-
-#: ../../mod/group.php:192
-msgid "Members"
-msgstr ""
-
-#: ../../mod/group.php:224 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: ../../mod/babel.php:17
-msgid "Source (bbcode) text:"
-msgstr ""
-
-#: ../../mod/babel.php:23
-msgid "Source (Diaspora) text to convert to BBcode:"
-msgstr ""
-
-#: ../../mod/babel.php:31
-msgid "Source input: "
-msgstr ""
-
-#: ../../mod/babel.php:35
-msgid "bb2html (raw HTML): "
-msgstr ""
-
-#: ../../mod/babel.php:39
-msgid "bb2html: "
-msgstr ""
-
-#: ../../mod/babel.php:43
-msgid "bb2html2bb: "
-msgstr ""
-
-#: ../../mod/babel.php:47
-msgid "bb2md: "
-msgstr ""
-
-#: ../../mod/babel.php:51
-msgid "bb2md2html: "
-msgstr ""
-
-#: ../../mod/babel.php:55
-msgid "bb2dia2bb: "
-msgstr ""
-
-#: ../../mod/babel.php:59
-msgid "bb2md2html2bb: "
-msgstr ""
-
-#: ../../mod/babel.php:69
-msgid "Source input (Diaspora format): "
-msgstr ""
-
-#: ../../mod/babel.php:74
-msgid "diaspora2bb: "
-msgstr ""
-
-#: ../../mod/community.php:23
-msgid "Not available."
-msgstr ""
-
-#: ../../mod/follow.php:27
-msgid "Contact added"
-msgstr ""
-
-#: ../../mod/notify.php:75 ../../mod/notifications.php:336
-msgid "No more system notifications."
-msgstr ""
-
-#: ../../mod/notify.php:79 ../../mod/notifications.php:340
-msgid "System Notifications"
-msgstr ""
-
-#: ../../mod/message.php:9 ../../include/nav.php:162
-msgid "New Message"
-msgstr ""
-
-#: ../../mod/message.php:67
-msgid "Unable to locate contact information."
-msgstr ""
-
-#: ../../mod/message.php:182 ../../mod/notifications.php:103
-#: ../../include/nav.php:159
-msgid "Messages"
-msgstr ""
-
-#: ../../mod/message.php:207
-msgid "Do you really want to delete this message?"
-msgstr ""
-
-#: ../../mod/message.php:227
-msgid "Message deleted."
-msgstr ""
-
-#: ../../mod/message.php:258
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../mod/message.php:371
-msgid "No messages."
-msgstr ""
-
-#: ../../mod/message.php:378
-#, php-format
-msgid "Unknown sender - %s"
-msgstr ""
-
-#: ../../mod/message.php:381
-#, php-format
-msgid "You and %s"
-msgstr ""
-
-#: ../../mod/message.php:384
-#, php-format
-msgid "%s and You"
-msgstr ""
-
-#: ../../mod/message.php:405 ../../mod/message.php:546
-msgid "Delete conversation"
-msgstr ""
-
-#: ../../mod/message.php:408
-msgid "D, d M Y - g:i A"
-msgstr ""
-
-#: ../../mod/message.php:411
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/message.php:450
-msgid "Message not available."
-msgstr ""
-
-#: ../../mod/message.php:520
-msgid "Delete message"
-msgstr ""
-
-#: ../../mod/message.php:548
+#: ../../mod/newmember.php:70
 msgid ""
-"No secure communications available. You may be able to "
-"respond from the sender's profile 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."
 msgstr ""
 
-#: ../../mod/message.php:552
-msgid "Send Reply"
+#: ../../mod/newmember.php:73
+msgid "Why Aren't My Posts Public?"
 msgstr ""
 
-#: ../../mod/like.php:168 ../../include/conversation.php:140
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/oexchange.php:25
-msgid "Post successful."
-msgstr ""
-
-#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:134
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../mod/localtime.php:24
-msgid "Time Conversion"
-msgstr ""
-
-#: ../../mod/localtime.php:26
+#: ../../mod/newmember.php:73
 msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
+"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."
 msgstr ""
 
-#: ../../mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
+#: ../../mod/newmember.php:78
+msgid "Getting Help"
 msgstr ""
 
-#: ../../mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
+#: ../../mod/newmember.php:82
+msgid "Go to the Help Section"
 msgstr ""
 
-#: ../../mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
-msgstr ""
-
-#: ../../mod/localtime.php:41
-msgid "Please select your timezone:"
-msgstr ""
-
-#: ../../mod/filer.php:30 ../../include/conversation.php:1005
-#: ../../include/conversation.php:1023
-msgid "Save to Folder:"
-msgstr ""
-
-#: ../../mod/filer.php:30
-msgid "- select -"
-msgstr ""
-
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
-msgstr ""
-
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
-msgstr ""
-
-#: ../../mod/profperm.php:114
-msgid "Visible To"
-msgstr ""
-
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
-msgstr ""
-
-#: ../../mod/viewcontacts.php:39
-msgid "No contacts."
-msgstr ""
-
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:875
-msgid "View Contacts"
-msgstr ""
-
-#: ../../mod/dirfind.php:26
-msgid "People Search"
-msgstr ""
-
-#: ../../mod/dirfind.php:60 ../../mod/match.php:65
-msgid "No matches"
-msgstr ""
-
-#: ../../mod/photos.php:67 ../../mod/photos.php:1228 ../../mod/photos.php:1817
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../mod/photos.php:144
-msgid "Contact information unavailable"
-msgstr ""
-
-#: ../../mod/photos.php:165
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:188 ../../mod/photos.php:200 ../../mod/photos.php:1206
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:198
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr ""
-
-#: ../../mod/photos.php:278 ../../mod/photos.php:289 ../../mod/photos.php:1513
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:287
-msgid "Do you really want to delete this photo?"
-msgstr ""
-
-#: ../../mod/photos.php:662
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr ""
-
-#: ../../mod/photos.php:662
-msgid "a photo"
-msgstr ""
-
-#: ../../mod/photos.php:767
-msgid "Image exceeds size limit of "
-msgstr ""
-
-#: ../../mod/photos.php:775
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../mod/photos.php:807 ../../mod/wall_upload.php:112
-#: ../../mod/profile_photo.php:153
-msgid "Unable to process image."
-msgstr ""
-
-#: ../../mod/photos.php:834 ../../mod/wall_upload.php:138
-#: ../../mod/profile_photo.php:301
-msgid "Image upload failed."
-msgstr ""
-
-#: ../../mod/photos.php:930
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:1031 ../../mod/videos.php:226
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:1094
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:1129
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:1133 ../../mod/photos.php:1201
-msgid "New album name: "
-msgstr ""
-
-#: ../../mod/photos.php:1134
-msgid "or existing album name: "
-msgstr ""
-
-#: ../../mod/photos.php:1135
-msgid "Do not show a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:1137 ../../mod/photos.php:1508
-msgid "Permissions"
-msgstr ""
-
-#: ../../mod/photos.php:1148
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:1149
-msgid "Public Photo"
-msgstr ""
-
-#: ../../mod/photos.php:1216
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:1222
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:1224
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:1257 ../../mod/photos.php:1800
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:1292
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:1294
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:1350
-msgid "View photo"
-msgstr ""
-
-#: ../../mod/photos.php:1350
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:1351
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:1376
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:1455
-msgid "Tags: "
-msgstr ""
-
-#: ../../mod/photos.php:1458
-msgid "[Remove any tag]"
-msgstr ""
-
-#: ../../mod/photos.php:1498
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:1499
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../mod/photos.php:1501
-msgid "New album name"
-msgstr ""
-
-#: ../../mod/photos.php:1504
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:1506
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:1510
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr ""
-
-#: ../../mod/photos.php:1519
-msgid "Private photo"
-msgstr ""
-
-#: ../../mod/photos.php:1520
-msgid "Public photo"
-msgstr ""
-
-#: ../../mod/photos.php:1542 ../../include/conversation.php:1089
-msgid "Share"
-msgstr ""
-
-#: ../../mod/photos.php:1806 ../../mod/videos.php:308
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/photos.php:1815
-msgid "Recent Photos"
-msgstr ""
-
-#: ../../mod/wall_attach.php:75
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr ""
-
-#: ../../mod/wall_attach.php:75
-msgid "Or - did you try to upload an empty file?"
-msgstr ""
-
-#: ../../mod/wall_attach.php:81
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../mod/wall_attach.php:122 ../../mod/wall_attach.php:133
-msgid "File upload failed."
-msgstr ""
-
-#: ../../mod/videos.php:125
-msgid "No videos selected"
-msgstr ""
-
-#: ../../mod/videos.php:301 ../../include/text.php:1401
-msgid "View Video"
-msgstr ""
-
-#: ../../mod/videos.php:317
-msgid "Recent Videos"
-msgstr ""
-
-#: ../../mod/videos.php:319
-msgid "Upload New Videos"
+#: ../../mod/newmember.php:82
+msgid ""
+"Our help pages may be consulted for detail on other program "
+"features and resources."
 msgstr ""
 
 #: ../../mod/poke.php:192
@@ -5038,51 +7465,138 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
+#: ../../mod/prove.php:93
+msgid ""
+"\n"
+"\t\tDear $[username],\n"
+"\t\t\tYour password has been changed as requested. Please retain this\n"
+"\t\tinformation for your records (or change your password immediately to\n"
+"\t\tsomething that you will remember).\n"
+"\t"
+msgstr ""
+
+#: ../../mod/display.php:452
+msgid "Item has been removed."
+msgstr ""
+
 #: ../../mod/subthread.php:103
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/uexport.php:77
-msgid "Export account"
-msgstr ""
-
-#: ../../mod/uexport.php:77
-msgid ""
-"Export your account info and contacts. Use this to make a backup of your "
-"account and/or to move it to another server."
-msgstr ""
-
-#: ../../mod/uexport.php:78
-msgid "Export all"
-msgstr ""
-
-#: ../../mod/uexport.php:78
-msgid ""
-"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)"
-msgstr ""
-
-#: ../../mod/common.php:42
-msgid "Common Friends"
-msgstr ""
-
-#: ../../mod/common.php:78
-msgid "No contacts in common."
-msgstr ""
-
-#: ../../mod/wall_upload.php:90 ../../mod/profile_photo.php:144
+#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
 #, php-format
-msgid "Image exceeds size limit of %d"
+msgid "%1$s welcomes %2$s"
 msgstr ""
 
-#: ../../mod/wall_upload.php:135 ../../mod/wall_upload.php:144
-#: ../../mod/wall_upload.php:151 ../../mod/item.php:463
-#: ../../include/Photo.php:911 ../../include/Photo.php:926
-#: ../../include/Photo.php:933 ../../include/Photo.php:955
-#: ../../include/message.php:144
-msgid "Wall Photos"
+#: ../../mod/dfrn_confirm.php:121
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:240
+msgid "Response from remote site was not understood."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:249 ../../mod/dfrn_confirm.php:254
+msgid "Unexpected response from remote site: "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:263
+msgid "Confirmation completed successfully."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:265 ../../mod/dfrn_confirm.php:279
+#: ../../mod/dfrn_confirm.php:286
+msgid "Remote site reported: "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:277
+msgid "Temporary failure. Please wait and try again."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:284
+msgid "Introduction failed or was revoked."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:429
+msgid "Unable to set contact photo."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:571
+#, php-format
+msgid "No user record found for '%s' "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:581
+msgid "Our site encryption key is apparently messed up."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:592
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:613
+msgid "Contact record was not found for you on our site."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:627
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:647
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:658
+msgid "Unable to set your contact credentials on our system."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:725
+msgid "Unable to update your contact profile details on our system"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:797
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr ""
+
+#: ../../mod/item.php:113
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../mod/item.php:324
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../mod/item.php:915
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../mod/item.php:941
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social network."
+msgstr ""
+
+#: ../../mod/item.php:943
+#, php-format
+msgid "You may visit them online at %s"
+msgstr ""
+
+#: ../../mod/item.php:944
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr ""
+
+#: ../../mod/item.php:948
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
 #: ../../mod/profile_photo.php:44
@@ -5141,545 +7655,6 @@ msgstr ""
 msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/apps.php:11
-msgid "Applications"
-msgstr ""
-
-#: ../../mod/apps.php:14
-msgid "No installed applications."
-msgstr ""
-
-#: ../../mod/navigation.php:20 ../../include/nav.php:34
-msgid "Nothing new here"
-msgstr ""
-
-#: ../../mod/navigation.php:24 ../../include/nav.php:38
-msgid "Clear notifications"
-msgstr ""
-
-#: ../../mod/match.php:12
-msgid "Profile Match"
-msgstr ""
-
-#: ../../mod/match.php:20
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr ""
-
-#: ../../mod/match.php:57
-msgid "is interested in:"
-msgstr ""
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr ""
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr ""
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr ""
-
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:133
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/events.php:66
-msgid "Event title and start time are required."
-msgstr ""
-
-#: ../../mod/events.php:291
-msgid "l, F j"
-msgstr ""
-
-#: ../../mod/events.php:313
-msgid "Edit event"
-msgstr ""
-
-#: ../../mod/events.php:335 ../../include/text.php:1643
-#: ../../include/text.php:1653
-msgid "link to source"
-msgstr ""
-
-#: ../../mod/events.php:371
-msgid "Create New Event"
-msgstr ""
-
-#: ../../mod/events.php:372
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/events.php:446
-msgid "hour:minute"
-msgstr ""
-
-#: ../../mod/events.php:456
-msgid "Event details"
-msgstr ""
-
-#: ../../mod/events.php:457
-#, php-format
-msgid "Format is %s %s. Starting date and Title are required."
-msgstr ""
-
-#: ../../mod/events.php:459
-msgid "Event Starts:"
-msgstr ""
-
-#: ../../mod/events.php:459 ../../mod/events.php:473
-msgid "Required"
-msgstr ""
-
-#: ../../mod/events.php:462
-msgid "Finish date/time is not known or not relevant"
-msgstr ""
-
-#: ../../mod/events.php:464
-msgid "Event Finishes:"
-msgstr ""
-
-#: ../../mod/events.php:467
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../mod/events.php:469
-msgid "Description:"
-msgstr ""
-
-#: ../../mod/events.php:473
-msgid "Title:"
-msgstr ""
-
-#: ../../mod/events.php:475
-msgid "Share this event"
-msgstr ""
-
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr ""
-
-#: ../../mod/delegate.php:124 ../../include/nav.php:168
-msgid "Delegate Page Management"
-msgstr ""
-
-#: ../../mod/delegate.php:126
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr ""
-
-#: ../../mod/delegate.php:127
-msgid "Existing Page Managers"
-msgstr ""
-
-#: ../../mod/delegate.php:129
-msgid "Existing Page Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:131
-msgid "Potential Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:134
-msgid "Add"
-msgstr ""
-
-#: ../../mod/delegate.php:135
-msgid "No entries."
-msgstr ""
-
-#: ../../mod/nogroup.php:59
-msgid "Contacts who are not members of a group"
-msgstr ""
-
-#: ../../mod/fbrowser.php:113
-msgid "Files"
-msgstr ""
-
-#: ../../mod/maintenance.php:5
-msgid "System down for maintenance"
-msgstr ""
-
-#: ../../mod/removeme.php:46 ../../mod/removeme.php:49
-msgid "Remove My Account"
-msgstr ""
-
-#: ../../mod/removeme.php:47
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr ""
-
-#: ../../mod/removeme.php:48
-msgid "Please enter your password for verification:"
-msgstr ""
-
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr ""
-
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr ""
-
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr ""
-
-#: ../../mod/item.php:113
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../mod/item.php:324
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../mod/item.php:918
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../mod/item.php:945
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
-msgstr ""
-
-#: ../../mod/item.php:947
-#, php-format
-msgid "You may visit them online at %s"
-msgstr ""
-
-#: ../../mod/item.php:948
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr ""
-
-#: ../../mod/item.php:952
-#, php-format
-msgid "%s posted an update."
-msgstr ""
-
-#: ../../mod/ping.php:238
-msgid "{0} wants to be your friend"
-msgstr ""
-
-#: ../../mod/ping.php:243
-msgid "{0} sent you a message"
-msgstr ""
-
-#: ../../mod/ping.php:248
-msgid "{0} requested registration"
-msgstr ""
-
-#: ../../mod/ping.php:254
-#, php-format
-msgid "{0} commented %s's post"
-msgstr ""
-
-#: ../../mod/ping.php:259
-#, php-format
-msgid "{0} liked %s's post"
-msgstr ""
-
-#: ../../mod/ping.php:264
-#, php-format
-msgid "{0} disliked %s's post"
-msgstr ""
-
-#: ../../mod/ping.php:269
-#, php-format
-msgid "{0} is now friends with %s"
-msgstr ""
-
-#: ../../mod/ping.php:274
-msgid "{0} posted"
-msgstr ""
-
-#: ../../mod/ping.php:279
-#, php-format
-msgid "{0} tagged %s's post with #%s"
-msgstr ""
-
-#: ../../mod/ping.php:285
-msgid "{0} mentioned you in a post"
-msgstr ""
-
-#: ../../mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: ../../mod/openid.php:53
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr ""
-
-#: ../../mod/openid.php:93 ../../include/auth.php:112
-#: ../../include/auth.php:175
-msgid "Login failed."
-msgstr ""
-
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr ""
-
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
-#: ../../mod/notifications.php:211
-msgid "Discard"
-msgstr ""
-
-#: ../../mod/notifications.php:78
-msgid "System"
-msgstr ""
-
-#: ../../mod/notifications.php:83 ../../include/nav.php:143
-msgid "Network"
-msgstr ""
-
-#: ../../mod/notifications.php:98 ../../include/nav.php:152
-msgid "Introductions"
-msgstr ""
-
-#: ../../mod/notifications.php:122
-msgid "Show Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:122
-msgid "Hide Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
-msgid "Notification type: "
-msgstr ""
-
-#: ../../mod/notifications.php:150
-msgid "Friend Suggestion"
-msgstr ""
-
-#: ../../mod/notifications.php:152
-#, php-format
-msgid "suggested by %s"
-msgstr ""
-
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "Post a new friend activity"
-msgstr ""
-
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "if applicable"
-msgstr ""
-
-#: ../../mod/notifications.php:181
-msgid "Claims to be known to you: "
-msgstr ""
-
-#: ../../mod/notifications.php:181
-msgid "yes"
-msgstr ""
-
-#: ../../mod/notifications.php:181
-msgid "no"
-msgstr ""
-
-#: ../../mod/notifications.php:188
-msgid "Approve as: "
-msgstr ""
-
-#: ../../mod/notifications.php:189
-msgid "Friend"
-msgstr ""
-
-#: ../../mod/notifications.php:190
-msgid "Sharer"
-msgstr ""
-
-#: ../../mod/notifications.php:190
-msgid "Fan/Admirer"
-msgstr ""
-
-#: ../../mod/notifications.php:196
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: ../../mod/notifications.php:196
-msgid "New Follower"
-msgstr ""
-
-#: ../../mod/notifications.php:217
-msgid "No introductions."
-msgstr ""
-
-#: ../../mod/notifications.php:220 ../../include/nav.php:153
-msgid "Notifications"
-msgstr ""
-
-#: ../../mod/notifications.php:258 ../../mod/notifications.php:387
-#: ../../mod/notifications.php:478
-#, php-format
-msgid "%s liked %s's post"
-msgstr ""
-
-#: ../../mod/notifications.php:268 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:488
-#, php-format
-msgid "%s disliked %s's post"
-msgstr ""
-
-#: ../../mod/notifications.php:283 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:503
-#, php-format
-msgid "%s is now friends with %s"
-msgstr ""
-
-#: ../../mod/notifications.php:290 ../../mod/notifications.php:419
-#, php-format
-msgid "%s created a new post"
-msgstr ""
-
-#: ../../mod/notifications.php:291 ../../mod/notifications.php:420
-#: ../../mod/notifications.php:513
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: ../../mod/notifications.php:306
-msgid "No more network notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:310
-msgid "Network Notifications"
-msgstr ""
-
-#: ../../mod/notifications.php:435
-msgid "No more personal notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:439
-msgid "Personal Notifications"
-msgstr ""
-
-#: ../../mod/notifications.php:520
-msgid "No more home notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:524
-msgid "Home Notifications"
-msgstr ""
-
-#: ../../mod/invite.php:27
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: ../../mod/invite.php:73
-msgid "Please join us on Friendica"
-msgstr ""
-
-#: ../../mod/invite.php:84
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: ../../mod/invite.php:89
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: ../../mod/invite.php:93
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/invite.php:112
-msgid "You have no more invitations available"
-msgstr ""
-
-#: ../../mod/invite.php:120
-#, php-format
-msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many "
-"other social networks."
-msgstr ""
-
-#: ../../mod/invite.php:122
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr ""
-
-#: ../../mod/invite.php:123
-#, php-format
-msgid ""
-"Friendica sites all inter-connect to create a huge privacy-enhanced social "
-"web that is owned and controlled by its members. They can also connect with "
-"many traditional social networks. See %s for a list of alternate Friendica "
-"sites you can join."
-msgstr ""
-
-#: ../../mod/invite.php:126
-msgid ""
-"Our apologies. This system is not currently configured to connect with other "
-"public sites or invite members."
-msgstr ""
-
-#: ../../mod/invite.php:132
-msgid "Send invitations"
-msgstr ""
-
-#: ../../mod/invite.php:133
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: ../../mod/invite.php:135
-msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
-msgstr ""
-
-#: ../../mod/invite.php:137
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr ""
-
-#: ../../mod/invite.php:137
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr ""
-
-#: ../../mod/invite.php:139
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
-msgstr ""
-
-#: ../../mod/manage.php:106
-msgid "Manage Identities and/or Pages"
-msgstr ""
-
-#: ../../mod/manage.php:107
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr ""
-
-#: ../../mod/manage.php:108
-msgid "Select an identity to manage: "
-msgstr ""
-
-#: ../../mod/home.php:34
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
 #: ../../mod/allfriends.php:34
 #, php-format
 msgid "Friends of %s"
@@ -5689,1773 +7664,47 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../include/contact_widgets.php:6
-msgid "Add New Contact"
+#: ../../mod/directory.php:59
+msgid "Find on this site"
 msgstr ""
 
-#: ../../include/contact_widgets.php:7
-msgid "Enter address or web location"
+#: ../../mod/directory.php:62
+msgid "Site Directory"
 msgstr ""
 
-#: ../../include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../mod/directory.php:116
+msgid "Gender: "
 msgstr ""
 
-#: ../../include/contact_widgets.php:23
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:29
-msgid "Find People"
+#: ../../mod/directory.php:189
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../include/contact_widgets.php:30
-msgid "Enter name or interest"
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
 msgstr ""
 
-#: ../../include/contact_widgets.php:31
-msgid "Connect/Follow"
-msgstr ""
-
-#: ../../include/contact_widgets.php:32
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr ""
-
-#: ../../include/contact_widgets.php:36
-msgid "Random Profile"
-msgstr ""
-
-#: ../../include/contact_widgets.php:70
-msgid "Networks"
-msgstr ""
-
-#: ../../include/contact_widgets.php:73
-msgid "All Networks"
-msgstr ""
-
-#: ../../include/contact_widgets.php:103 ../../include/features.php:60
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
-msgid "Everything"
-msgstr ""
-
-#: ../../include/contact_widgets.php:135
-msgid "Categories"
-msgstr ""
-
-#: ../../include/plugin.php:455 ../../include/plugin.php:457
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/plugin.php:463
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/plugin.php:468
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
-#: ../../include/api.php:263 ../../include/api.php:274
-#: ../../include/api.php:375
-msgid "User not found."
-msgstr ""
-
-#: ../../include/api.php:1139
-msgid "There is no status with this id."
-msgstr ""
-
-#: ../../include/api.php:1209
-msgid "There is no conversation with this id."
-msgstr ""
-
-#: ../../include/network.php:892
-msgid "view full size"
-msgstr ""
-
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:140
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:148
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/dba_pdo.php:72 ../../include/dba.php:51
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-
-#: ../../include/notifier.php:774 ../../include/delivery.php:456
-msgid "(no subject)"
-msgstr ""
-
-#: ../../include/notifier.php:784 ../../include/enotify.php:28
-#: ../../include/delivery.php:467
-msgid "noreply"
-msgstr ""
-
-#: ../../include/user.php:39
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/user.php:44
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/user.php:52
-msgid "Invalid OpenID url"
-msgstr ""
-
-#: ../../include/user.php:66 ../../include/auth.php:128
+#: ../../mod/localtime.php:26
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: ../../include/user.php:66 ../../include/auth.php:128
-msgid "The error message was:"
-msgstr ""
-
-#: ../../include/user.php:73
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/user.php:87
-msgid "Please use a shorter name."
-msgstr ""
-
-#: ../../include/user.php:89
-msgid "Name too short."
-msgstr ""
-
-#: ../../include/user.php:104
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr ""
-
-#: ../../include/user.php:109
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-
-#: ../../include/user.php:112
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../../include/user.php:125
-msgid "Cannot use that email."
-msgstr ""
-
-#: ../../include/user.php:131
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr ""
-
-#: ../../include/user.php:137 ../../include/user.php:235
-msgid "Nickname is already registered. Please choose another."
-msgstr ""
-
-#: ../../include/user.php:147
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr ""
-
-#: ../../include/user.php:163
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr ""
-
-#: ../../include/user.php:221
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-
-#: ../../include/user.php:256
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-
-#: ../../include/user.php:288 ../../include/user.php:292
-#: ../../include/profile_selectors.php:42
-msgid "Friends"
-msgstr ""
-
-#: ../../include/conversation.php:207
+#: ../../mod/localtime.php:30
 #, php-format
-msgid "%1$s poked %2$s"
+msgid "UTC time: %s"
 msgstr ""
 
-#: ../../include/conversation.php:211 ../../include/text.php:1004
-msgid "poked"
-msgstr ""
-
-#: ../../include/conversation.php:291
-msgid "post/item"
-msgstr ""
-
-#: ../../include/conversation.php:292
+#: ../../mod/localtime.php:33
 #, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
+msgid "Current timezone: %s"
 msgstr ""
 
-#: ../../include/conversation.php:771
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:775
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:874
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:875 ../../include/Contact.php:229
-msgid "View Status"
-msgstr ""
-
-#: ../../include/conversation.php:876 ../../include/Contact.php:230
-msgid "View Profile"
-msgstr ""
-
-#: ../../include/conversation.php:877 ../../include/Contact.php:231
-msgid "View Photos"
-msgstr ""
-
-#: ../../include/conversation.php:878 ../../include/Contact.php:232
-#: ../../include/Contact.php:255
-msgid "Network Posts"
-msgstr ""
-
-#: ../../include/conversation.php:879 ../../include/Contact.php:233
-#: ../../include/Contact.php:255
-msgid "Edit Contact"
-msgstr ""
-
-#: ../../include/conversation.php:880 ../../include/Contact.php:235
-#: ../../include/Contact.php:255
-msgid "Send PM"
-msgstr ""
-
-#: ../../include/conversation.php:881 ../../include/Contact.php:228
-msgid "Poke"
-msgstr ""
-
-#: ../../include/conversation.php:943
+#: ../../mod/localtime.php:36
 #, php-format
-msgid "%s likes this."
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: ../../include/conversation.php:943
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../include/conversation.php:948
-#, php-format
-msgid "%2$d people like this"
-msgstr ""
-
-#: ../../include/conversation.php:951
-#, php-format
-msgid "%2$d people don't like this"
-msgstr ""
-
-#: ../../include/conversation.php:965
-msgid "and"
-msgstr ""
-
-#: ../../include/conversation.php:971
-#, php-format
-msgid ", and %d other people"
-msgstr ""
-
-#: ../../include/conversation.php:973
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:973
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1000 ../../include/conversation.php:1018
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
-msgid "Please enter a video link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1003 ../../include/conversation.php:1021
-msgid "Please enter an audio link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1004 ../../include/conversation.php:1022
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1006 ../../include/conversation.php:1024
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1007
-msgid "Delete item(s)?"
-msgstr ""
-
-#: ../../include/conversation.php:1050
-msgid "Post to Email"
-msgstr ""
-
-#: ../../include/conversation.php:1055
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr ""
-
-#: ../../include/conversation.php:1110
-msgid "permissions"
-msgstr ""
-
-#: ../../include/conversation.php:1134
-msgid "Post to Groups"
-msgstr ""
-
-#: ../../include/conversation.php:1135
-msgid "Post to Contacts"
-msgstr ""
-
-#: ../../include/conversation.php:1136
-msgid "Private post"
-msgstr ""
-
-#: ../../include/auth.php:38
-msgid "Logged out."
-msgstr ""
-
-#: ../../include/uimport.php:94
-msgid "Error decoding account file"
-msgstr ""
-
-#: ../../include/uimport.php:100
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr ""
-
-#: ../../include/uimport.php:116 ../../include/uimport.php:127
-msgid "Error! Cannot check nickname"
-msgstr ""
-
-#: ../../include/uimport.php:120 ../../include/uimport.php:131
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr ""
-
-#: ../../include/uimport.php:153
-msgid "User creation error"
-msgstr ""
-
-#: ../../include/uimport.php:171
-msgid "User profile creation error"
-msgstr ""
-
-#: ../../include/uimport.php:220
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/uimport.php:290
-msgid "Done. You can now login with your username and password"
-msgstr ""
-
-#: ../../include/text.php:296
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:298
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:303
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:305
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:337
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:340
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:854
-msgid "No contacts"
-msgstr ""
-
-#: ../../include/text.php:863
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:1004
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:1005
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:1005
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:1006
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:1006
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:1007
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:1007
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:1008
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:1008
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:1009
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:1009
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1023
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1024
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1025
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1026
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1027
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1028
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1029
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:1030
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1031
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1032
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1033
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1034
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1035
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1036
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1037
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1038
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:1039
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:1040
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:1041
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:1042
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1210
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:1210
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:1210
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:1210
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:1210
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:1210
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:1210
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:1214
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:1433
-msgid "bytes"
-msgstr ""
-
-#: ../../include/text.php:1457 ../../include/text.php:1469
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1710
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1966
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:1969
-msgid "post"
-msgstr ""
-
-#: ../../include/text.php:2137
-msgid "Item filed"
-msgstr ""
-
-#: ../../include/enotify.php:16
-msgid "Friendica Notification"
-msgstr ""
-
-#: ../../include/enotify.php:19
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/enotify.php:21
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: ../../include/enotify.php:40
-#, php-format
-msgid "%s "
-msgstr ""
-
-#: ../../include/enotify.php:44
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr ""
-
-#: ../../include/enotify.php:46
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr ""
-
-#: ../../include/enotify.php:47
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr ""
-
-#: ../../include/enotify.php:47
-msgid "a private message"
-msgstr ""
-
-#: ../../include/enotify.php:48
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: ../../include/enotify.php:91
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
-msgstr ""
-
-#: ../../include/enotify.php:98
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
-msgstr ""
-
-#: ../../include/enotify.php:106
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr ""
-
-#: ../../include/enotify.php:116
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:117
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr ""
-
-#: ../../include/enotify.php:120 ../../include/enotify.php:135
-#: ../../include/enotify.php:148 ../../include/enotify.php:161
-#: ../../include/enotify.php:179 ../../include/enotify.php:192
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr ""
-
-#: ../../include/enotify.php:127
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr ""
-
-#: ../../include/enotify.php:129
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:131
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr ""
-
-#: ../../include/enotify.php:142
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr ""
-
-#: ../../include/enotify.php:143
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:144
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr ""
-
-#: ../../include/enotify.php:155
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
-msgstr ""
-
-#: ../../include/enotify.php:156
-#, php-format
-msgid "%1$s shared a new post at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:157
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
-msgstr ""
-
-#: ../../include/enotify.php:169
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr ""
-
-#: ../../include/enotify.php:170
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:171
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr ""
-
-#: ../../include/enotify.php:186
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr ""
-
-#: ../../include/enotify.php:187
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:188
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr ""
-
-#: ../../include/enotify.php:199
-msgid "[Friendica:Notify] Introduction received"
-msgstr ""
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:201
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr ""
-
-#: ../../include/enotify.php:204 ../../include/enotify.php:222
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr ""
-
-#: ../../include/enotify.php:206
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr ""
-
-#: ../../include/enotify.php:213
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr ""
-
-#: ../../include/enotify.php:214
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:215
-#, php-format
-msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr ""
-
-#: ../../include/enotify.php:220
-msgid "Name:"
-msgstr ""
-
-#: ../../include/enotify.php:221
-msgid "Photo:"
-msgstr ""
-
-#: ../../include/enotify.php:224
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr ""
-
-#: ../../include/Scrape.php:584
-msgid " on Last.fm"
-msgstr ""
-
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:207
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: ../../include/group.php:226
-msgid "Everybody"
-msgstr ""
-
-#: ../../include/group.php:249
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:271
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:272
-msgid "Create a new group"
-msgstr ""
-
-#: ../../include/group.php:273
-msgid "Contacts not in any group"
-msgstr ""
-
-#: ../../include/follow.php:32
-msgid "Connect URL missing."
-msgstr ""
-
-#: ../../include/follow.php:59
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr ""
-
-#: ../../include/follow.php:60 ../../include/follow.php:80
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr ""
-
-#: ../../include/follow.php:78
-msgid "The profile address specified does not provide adequate information."
-msgstr ""
-
-#: ../../include/follow.php:82
-msgid "An author or name was not found."
-msgstr ""
-
-#: ../../include/follow.php:84
-msgid "No browser URL could be matched to this address."
-msgstr ""
-
-#: ../../include/follow.php:86
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr ""
-
-#: ../../include/follow.php:87
-msgid "Use mailto: in front of address to force email check."
-msgstr ""
-
-#: ../../include/follow.php:93
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr ""
-
-#: ../../include/follow.php:103
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr ""
-
-#: ../../include/follow.php:205
-msgid "Unable to retrieve contact information."
-msgstr ""
-
-#: ../../include/follow.php:259
-msgid "following"
-msgstr ""
-
-#: ../../include/message.php:15 ../../include/message.php:172
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/nav.php:73
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:79
-msgid "Your videos"
-msgstr ""
-
-#: ../../include/nav.php:81
-msgid "Your personal notes"
-msgstr ""
-
-#: ../../include/nav.php:92
-msgid "Sign in"
-msgstr ""
-
-#: ../../include/nav.php:105
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:109
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:114
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:117
-msgid "Apps"
-msgstr ""
-
-#: ../../include/nav.php:117
-msgid "Addon applications, utilities, games"
-msgstr ""
-
-#: ../../include/nav.php:119
-msgid "Search site content"
-msgstr ""
-
-#: ../../include/nav.php:129
-msgid "Conversations on this site"
-msgstr ""
-
-#: ../../include/nav.php:131
-msgid "Directory"
-msgstr ""
-
-#: ../../include/nav.php:131
-msgid "People directory"
-msgstr ""
-
-#: ../../include/nav.php:133
-msgid "Information"
-msgstr ""
-
-#: ../../include/nav.php:133
-msgid "Information about this friendica instance"
-msgstr ""
-
-#: ../../include/nav.php:143
-msgid "Conversations from your friends"
-msgstr ""
-
-#: ../../include/nav.php:144
-msgid "Network Reset"
-msgstr ""
-
-#: ../../include/nav.php:144
-msgid "Load Network page with no filters"
-msgstr ""
-
-#: ../../include/nav.php:152
-msgid "Friend Requests"
-msgstr ""
-
-#: ../../include/nav.php:154
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:155
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:159
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:160
-msgid "Inbox"
-msgstr ""
-
-#: ../../include/nav.php:161
-msgid "Outbox"
-msgstr ""
-
-#: ../../include/nav.php:165
-msgid "Manage"
-msgstr ""
-
-#: ../../include/nav.php:165
-msgid "Manage other pages"
-msgstr ""
-
-#: ../../include/nav.php:170
-msgid "Account settings"
-msgstr ""
-
-#: ../../include/nav.php:173
-msgid "Manage/Edit Profiles"
-msgstr ""
-
-#: ../../include/nav.php:175
-msgid "Manage/edit friends and contacts"
-msgstr ""
-
-#: ../../include/nav.php:182
-msgid "Site setup and configuration"
-msgstr ""
-
-#: ../../include/nav.php:186
-msgid "Navigation"
-msgstr ""
-
-#: ../../include/nav.php:186
-msgid "Site map"
-msgstr ""
-
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/profile_advanced.php:23
-msgid "j F"
-msgstr ""
-
-#: ../../include/profile_advanced.php:30
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:43
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/profile_advanced.php:52
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:56
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:60
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:67
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:69
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:71
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:73
-msgid "Television:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:75
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:77
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:79
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:81
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/bbcode.php:381 ../../include/bbcode.php:961
-#: ../../include/bbcode.php:962
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:477
-#, php-format
-msgid "%2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:511
-#, php-format
-msgid ""
-"%s wrote the following post"
-msgstr ""
-
-#: ../../include/bbcode.php:925 ../../include/bbcode.php:945
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/bbcode.php:970 ../../include/bbcode.php:971
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
-msgstr ""
-
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
-msgstr ""
-
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
-msgstr ""
-
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
-msgstr ""
-
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
-msgstr ""
-
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
-msgstr ""
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr ""
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr ""
-
-#: ../../include/contact_selectors.php:87
-msgid "Google+"
-msgstr ""
-
-#: ../../include/contact_selectors.php:88
-msgid "pump.io"
-msgstr ""
-
-#: ../../include/contact_selectors.php:89
-msgid "Twitter"
-msgstr ""
-
-#: ../../include/contact_selectors.php:90
-msgid "Diaspora Connector"
-msgstr ""
-
-#: ../../include/contact_selectors.php:91
-msgid "Statusnet"
-msgstr ""
-
-#: ../../include/contact_selectors.php:92
-msgid "App.net"
-msgstr ""
-
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../include/datetime.php:153 ../../include/datetime.php:285
-msgid "year"
-msgstr ""
-
-#: ../../include/datetime.php:158 ../../include/datetime.php:286
-msgid "month"
-msgstr ""
-
-#: ../../include/datetime.php:163 ../../include/datetime.php:288
-msgid "day"
-msgstr ""
-
-#: ../../include/datetime.php:276
-msgid "never"
-msgstr ""
-
-#: ../../include/datetime.php:282
-msgid "less than a second ago"
-msgstr ""
-
-#: ../../include/datetime.php:285
-msgid "years"
-msgstr ""
-
-#: ../../include/datetime.php:286
-msgid "months"
-msgstr ""
-
-#: ../../include/datetime.php:287
-msgid "week"
-msgstr ""
-
-#: ../../include/datetime.php:287
-msgid "weeks"
-msgstr ""
-
-#: ../../include/datetime.php:288
-msgid "days"
-msgstr ""
-
-#: ../../include/datetime.php:289
-msgid "hour"
-msgstr ""
-
-#: ../../include/datetime.php:289
-msgid "hours"
-msgstr ""
-
-#: ../../include/datetime.php:290
-msgid "minute"
-msgstr ""
-
-#: ../../include/datetime.php:290
-msgid "minutes"
-msgstr ""
-
-#: ../../include/datetime.php:291
-msgid "second"
-msgstr ""
-
-#: ../../include/datetime.php:291
-msgid "seconds"
-msgstr ""
-
-#: ../../include/datetime.php:300
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: ../../include/datetime.php:472 ../../include/items.php:2071
-#, php-format
-msgid "%s's birthday"
-msgstr ""
-
-#: ../../include/datetime.php:473 ../../include/items.php:2072
-#, php-format
-msgid "Happy Birthday %s"
-msgstr ""
-
-#: ../../include/features.php:23
-msgid "General Features"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Multiple Profiles"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Ability to create multiple profiles"
-msgstr ""
-
-#: ../../include/features.php:30
-msgid "Post Composition Features"
-msgstr ""
-
-#: ../../include/features.php:31
-msgid "Richtext Editor"
-msgstr ""
-
-#: ../../include/features.php:31
-msgid "Enable richtext editor"
-msgstr ""
-
-#: ../../include/features.php:32
-msgid "Post Preview"
-msgstr ""
-
-#: ../../include/features.php:32
-msgid "Allow previewing posts and comments before publishing them"
-msgstr ""
-
-#: ../../include/features.php:33
-msgid "Auto-mention Forums"
-msgstr ""
-
-#: ../../include/features.php:33
-msgid ""
-"Add/remove mention when a fourm page is selected/deselected in ACL window."
-msgstr ""
-
-#: ../../include/features.php:38
-msgid "Network Sidebar Widgets"
-msgstr ""
-
-#: ../../include/features.php:39
-msgid "Search by Date"
-msgstr ""
-
-#: ../../include/features.php:39
-msgid "Ability to select posts by date ranges"
-msgstr ""
-
-#: ../../include/features.php:40
-msgid "Group Filter"
-msgstr ""
-
-#: ../../include/features.php:40
-msgid "Enable widget to display Network posts only from selected group"
-msgstr ""
-
-#: ../../include/features.php:41
-msgid "Network Filter"
-msgstr ""
-
-#: ../../include/features.php:41
-msgid "Enable widget to display Network posts only from selected network"
-msgstr ""
-
-#: ../../include/features.php:42
-msgid "Save search terms for re-use"
-msgstr ""
-
-#: ../../include/features.php:47
-msgid "Network Tabs"
-msgstr ""
-
-#: ../../include/features.php:48
-msgid "Network Personal Tab"
-msgstr ""
-
-#: ../../include/features.php:48
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr ""
-
-#: ../../include/features.php:49
-msgid "Network New Tab"
-msgstr ""
-
-#: ../../include/features.php:49
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Network Shared Links Tab"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Enable tab to display only Network posts with links in them"
-msgstr ""
-
-#: ../../include/features.php:55
-msgid "Post/Comment Tools"
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Multiple Deletion"
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Select and delete multiple posts/comments at once"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid "Edit Sent Posts"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid "Edit and correct posts and comments after sending"
-msgstr ""
-
-#: ../../include/features.php:58
-msgid "Tagging"
-msgstr ""
-
-#: ../../include/features.php:58
-msgid "Ability to tag existing posts"
-msgstr ""
-
-#: ../../include/features.php:59
-msgid "Post Categories"
-msgstr ""
-
-#: ../../include/features.php:59
-msgid "Add categories to your posts"
-msgstr ""
-
-#: ../../include/features.php:60
-msgid "Ability to file posts under folders"
-msgstr ""
-
-#: ../../include/features.php:61
-msgid "Dislike Posts"
-msgstr ""
-
-#: ../../include/features.php:61
-msgid "Ability to dislike posts/comments"
-msgstr ""
-
-#: ../../include/features.php:62
-msgid "Star Posts"
-msgstr ""
-
-#: ../../include/features.php:62
-msgid "Ability to mark special posts with a star indicator"
-msgstr ""
-
-#: ../../include/diaspora.php:703
-msgid "Sharing notification from Diaspora network"
-msgstr ""
-
-#: ../../include/diaspora.php:2313
-msgid "Attachments:"
-msgstr ""
-
-#: ../../include/dbstructure.php:118
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../include/dbstructure.php:176
-msgid "Errors encountered performing database changes."
-msgstr ""
-
-#: ../../include/acl_selectors.php:326
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/items.php:3804
-msgid "A new person is sharing with you at "
-msgstr ""
-
-#: ../../include/items.php:3804
-msgid "You have a new follower at "
-msgstr ""
-
-#: ../../include/items.php:4339
-msgid "Do you really want to delete this item?"
-msgstr ""
-
-#: ../../include/items.php:4566
-msgid "Archives"
-msgstr ""
-
-#: ../../include/oembed.php:200
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:209
-msgid "Embedding disabled"
-msgstr ""
-
-#: ../../include/security.php:22
-msgid "Welcome "
-msgstr ""
-
-#: ../../include/security.php:23
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: ../../include/security.php:26
-msgid "Welcome back "
-msgstr ""
-
-#: ../../include/security.php:366
-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 ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Other"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Males"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Females"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
-msgstr ""
-
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Single"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Available"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Married"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
-msgstr ""
-
-#: ../../include/Contact.php:115
-msgid "stopped following"
-msgstr ""
-
-#: ../../include/Contact.php:234
-msgid "Drop Contact"
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
 msgstr ""