Finish t() for mod

finished mod folder

mod/invite.php

@@ -51,7 +51,7 @@ function invite_post(App $a) {
 		$recip = trim($recip);
 
 		if (! valid_email($recip)) {
-			notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
+			notice(sprintf(L10n::t('%s : Not a valid email address.'), $recip) . EOL);
 			continue;
 		}
 
@@ -76,7 +76,7 @@ function invite_post(App $a) {
 			$nmessage = $message;
 		}
 
-		$res = mail($recip, Email::encodeHeader(t('Please join us on Friendica'),'UTF-8'),
+		$res = mail($recip, Email::encodeHeader(L10n::t('Please join us on Friendica'), 'UTF-8'),
 			$nmessage,
 			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -122,32 +122,32 @@ function invite_content(App $a) {
 	$dirloc = Config::get('system', 'directory');
 	if (strlen($dirloc)) {
 		if ($a->config['register_policy'] == REGISTER_CLOSED) {
-			$linktxt = sprintf( t('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.'), $dirloc . '/servers');
+			$linktxt = sprintf(L10n::t('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.'), $dirloc . '/servers');
 		} else {
-			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), System::baseUrl())
+			$linktxt = sprintf(L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), System::baseUrl())
-			. "\r\n" . "\r\n" . sprintf( t('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.'),$dirloc . '/servers');
+			. "\r\n" . "\r\n" . sprintf(L10n::t('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.'), $dirloc . '/servers');
 		}
 	} else { // there is no global directory URL defined
 		if ($a->config['register_policy'] == REGISTER_CLOSED) {
-			$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
+			$o = L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
 			return $o;
 		} else {
-			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s.'), System::baseUrl()
+			$linktxt = sprintf(L10n::t('To accept this invitation, please visit and register at %s.'), System::baseUrl()
-			. "\r\n" . "\r\n" . t('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.'));
+			. "\r\n" . "\r\n" . L10n::t('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.'));
 		}
 	}
 
 	$o = replace_macros($tpl, [
 		'$form_security_token' => get_form_security_token("send_invite"),
-		'$invite'              => t('Send invitations'),
+		'$invite'              => L10n::t('Send invitations'),
-		'$addr_text'           => t('Enter email addresses, one per line:'),
+		'$addr_text'           => L10n::t('Enter email addresses, one per line:'),
-		'$msg_text'            => t('Your message:'),
+		'$msg_text'            => L10n::t('Your message:'),
-		'$default_message'     => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
+		'$default_message'     => L10n::t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
 			. $linktxt
-			. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
+			. "\r\n" . "\r\n" . (($invonly) ? L10n::t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .L10n::t('Once you have registered, please connect with me via my profile page at:')
 			. "\r\n" . "\r\n" . System::baseUrl() . '/profile/' . $a->user['nickname']
-			. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n"  ,
+			. "\r\n" . "\r\n" . L10n::t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n"  ,
-		'$submit'              => t('Submit')
+		'$submit'              => L10n::t('Submit')
 	]);
 
 	return $o;

mod/localtime.php

@@ -1,51 +1,58 @@
 <?php
-
+/**
+ * @file mod/localtime.php
+ */
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 
-require_once('include/datetime.php');
+require_once 'include/datetime.php';
-
-function localtime_post(App $a) {
 
+function localtime_post(App $a)
+{
 	$t = $_REQUEST['time'];
-	if(! $t)
+	if (! $t) {
 		$t = 'now';
-
-	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
-
-	if($_POST['timezone'])
-		$a->data['mod-localtime'] = datetime_convert('UTC',$_POST['timezone'],$t,$bd_format);
-
 	}
 
-function localtime_content(App $a) {
+	$bd_format = L10n::t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
+
+	if ($_POST['timezone']) {
+		$a->data['mod-localtime'] = datetime_convert('UTC', $_POST['timezone'], $t, $bd_format);
+	}
+}
+
+function localtime_content(App $a)
+{
 	$t = $_REQUEST['time'];
-	if(! $t)
+	if (! $t) {
 		$t = 'now';
+	}
 
-	$o .= '<h3>' . t('Time Conversion') . '</h3>';
+	$o .= '<h3>' . L10n::t('Time Conversion') . '</h3>';
 
-	$o .= '<p>' . t('Friendica provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
+	$o .= '<p>' . L10n::t('Friendica provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
 
 
 
-	$o .= '<p>' . sprintf( t('UTC time: %s'), $t) . '</p>';
+	$o .= '<p>' . sprintf(L10n::t('UTC time: %s'), $t) . '</p>';
 
-	if($_REQUEST['timezone'])
+	if ($_REQUEST['timezone']) {
-		$o .= '<p>' . sprintf( t('Current timezone: %s'), $_REQUEST['timezone']) . '</p>';
+		$o .= '<p>' . sprintf(L10n::t('Current timezone: %s'), $_REQUEST['timezone']) . '</p>';
+	}
 
-	if(x($a->data,'mod-localtime'))
+	if (x($a->data, 'mod-localtime')) {
-		$o .= '<p>' . sprintf( t('Converted localtime: %s'),$a->data['mod-localtime']) . '</p>';
+		$o .= '<p>' . sprintf(L10n::t('Converted localtime: %s'), $a->data['mod-localtime']) . '</p>';
+	}
 
 
 	$o .= '<form action ="' . System::baseUrl() . '/localtime?f=&time=' . $t . '" method="post" >';
 
-	$o .= '<p>' . t('Please select your timezone:') . '</p>';
+	$o .= '<p>' . L10n::t('Please select your timezone:') . '</p>';
 
 	$o .= select_timezone(($_REQUEST['timezone']) ? $_REQUEST['timezone'] : 'America/Los_Angeles');
 
-	$o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form>';
+	$o .= '<input type="submit" name="submit" value="' . L10n::t('Submit') . '" /></form>';
 
 	return $o;
-
 }

mod/lockview.php

@@ -1,7 +1,10 @@
 <?php
-
+/**
+ * @file mod/lockview.php
+ */
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 
 function lockview_content(App $a) {
@@ -32,7 +35,7 @@ function lockview_content(App $a) {
 	Addon::callHooks('lockview_content', $item);
 
 	if($item['uid'] != local_user()) {
-		echo t('Remote privacy information not available.') . '<br />';
+		echo L10n::t('Remote privacy information not available.') . '<br />';
 		killme();
 	}
 
@@ -40,7 +43,7 @@ function lockview_content(App $a) {
 	if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid']))
 		&& (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
 
-		echo t('Remote privacy information not available.') . '<br />';
+		echo L10n::t('Remote privacy information not available.') . '<br />';
 		killme();
 	}
 
@@ -49,7 +52,7 @@ function lockview_content(App $a) {
 	$deny_users = expand_acl($item['deny_cid']);
 	$deny_groups = expand_acl($item['deny_gid']);
 
-	$o = t('Visible to:') . '<br />';
+	$o = L10n::t('Visible to:') . '<br />';
 	$l = [];
 
 	if(count($allowed_groups)) {

mod/lostpass.php

@@ -37,13 +37,13 @@ function lostpass_post(App $a)
 	];
 	$result = dba::update('user', $fields, ['uid' => $user['uid']]);
 	if ($result) {
-		info(t('Password reset request issued. Check your email.') . EOL);
+		info(L10n::t('Password reset request issued. Check your email.') . EOL);
 	}
 
 	$sitename = $a->config['sitename'];
 	$resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
 
-	$preamble = deindent(t('
+	$preamble = deindent(L10n::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
@@ -54,7 +54,7 @@ function lostpass_post(App $a)
 
 		Your password will not be changed unless we can verify that you
 		issued this request.', $user['username'], $sitename));
-	$body = deindent(t('
+	$body = deindent(L10n::t('
 		Follow this link soon to verify your identity:
 
 		%1$s
@@ -70,7 +70,7 @@ function lostpass_post(App $a)
 	notification([
 		'type'     => SYSTEM_EMAIL,
 		'to_email' => $user['email'],
-		'subject'  => t('Password reset requested at %s', $sitename),
+		'subject'  => L10n::t('Password reset requested at %s', $sitename),
 		'preamble' => $preamble,
 		'body'     => $body
 	]);
@@ -114,10 +114,10 @@ function lostpass_form()
 {
 	$tpl = get_markup_template('lostpass.tpl');
 	$o = replace_macros($tpl, [
-		'$title' => t('Forgot your Password?'),
+		'$title' => L10n::t('Forgot your Password?'),
-		'$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
+		'$desc' => L10n::t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
-		'$name' => t('Nickname or Email: '),
+		'$name' => L10n::t('Nickname or Email: '),
-		'$submit' => t('Reset')
+		'$submit' => L10n::t('Reset')
 	]);
 
 	return $o;
@@ -132,12 +132,12 @@ function lostpass_generate_password($user)
 	if (DBM::is_result($result)) {
 		$tpl = get_markup_template('pwdreset.tpl');
 		$o .= replace_macros($tpl, [
-			'$lbl1'    => t('Password Reset'),
+			'$lbl1'    => L10n::t('Password Reset'),
-			'$lbl2'    => t('Your password has been reset as requested.'),
+			'$lbl2'    => L10n::t('Your password has been reset as requested.'),
-			'$lbl3'    => t('Your new password is'),
+			'$lbl3'    => L10n::t('Your new password is'),
-			'$lbl4'    => t('Save or copy your new password - and then'),
+			'$lbl4'    => L10n::t('Save or copy your new password - and then'),
-			'$lbl5'    => '<a href="' . System::baseUrl() . '">' . t('click here to login') . '</a>.',
+			'$lbl5'    => '<a href="' . System::baseUrl() . '">' . L10n::t('click here to login') . '</a>.',
-			'$lbl6'    => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
+			'$lbl6'    => L10n::t('Your password may be changed from the <em>Settings</em> page after successful login.'),
 			'$newpass' => $new_password,
 			'$baseurl' => System::baseUrl()
 		]);
@@ -145,13 +145,13 @@ function lostpass_generate_password($user)
 		info("Your password has been reset." . EOL);
 
 		$sitename = $a->config['sitename'];
-		$preamble = deindent(t('
+		$preamble = deindent(L10n::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).
 		', $user['username']));
-		$body = deindent(t('
+		$body = deindent(L10n::t('
 			Your login details are as follows:
 
 			Site Location:	%1$s
@@ -164,7 +164,7 @@ function lostpass_generate_password($user)
 		notification([
 			'type'     => SYSTEM_EMAIL,
 			'to_email' => $user['email'],
-			'subject'  => t('Your password has been changed at %s', $sitename),
+			'subject'  => L10n::t('Your password has been changed at %s', $sitename),
 			'preamble' => $preamble,
 			'body'     => $body
 		]);

mod/manage.php

@@ -155,11 +155,11 @@ function manage_content(App $a) {
 	}
 
 	$o = replace_macros(get_markup_template('manage.tpl'), [
-		'$title' => t('Manage Identities and/or Pages'),
+		'$title' => L10n::t('Manage Identities and/or Pages'),
-		'$desc' => t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
+		'$desc' => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
-		'$choose' => t('Select an identity to manage: '),
+		'$choose' => L10n::t('Select an identity to manage: '),
 		'$identities' => $identities,
-		'$submit' => t('Submit'),
+		'$submit' => L10n::t('Submit'),
 	]);
 
 	return $o;

mod/match.php

@@ -85,8 +85,8 @@ function match_content(App $a)
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 					$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
 					$photo_menu = [
-						'profile' => [t("View Profile"), Profile::zrl($jj->url)],
+						'profile' => [L10n::t("View Profile"), Profile::zrl($jj->url)],
-						'follow' => [t("Connect/Follow"), $connlnk]
+						'follow' => [L10n::t("Connect/Follow"), $connlnk]
 					];
 
 					$contact_details = Contact::getDetailsByURL($jj->url, local_user());
@@ -100,8 +100,8 @@ function match_content(App $a)
 						'about'         => $contact_details['about'],
 						'account_type'  => Contact::getAccountType($contact_details),
 						'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-						'inttxt' => ' ' . t('is interested in:'),
+						'inttxt' => ' ' . L10n::t('is interested in:'),
-						'conntxt' => t('Connect'),
+						'conntxt' => L10n::t('Connect'),
 						'connlnk' => $connlnk,
 						'img_hover' => $jj->tags,
 						'photo_menu' => $photo_menu,
@@ -116,12 +116,12 @@ function match_content(App $a)
 			$o .= replace_macros(
 				$tpl,
 				[
-				'$title' => t('Profile Match'),
+				'$title' => L10n::t('Profile Match'),
 				'$contacts' => $entries,
 				'$paginate' => paginate($a)]
 			);
 		} else {
-			info(t('No matches') . EOL);
+			info(L10n::t('No matches') . EOL);
 		}
 	}
 

mod/message.php

@@ -23,7 +23,7 @@ function message_init(App $a)
 	}
 
 	$new = [
-		'label' => t('New Message'),
+		'label' => L10n::t('New Message'),
 		'url' => 'message/new',
 		'sel' => $a->argc > 1 && $a->argv[1] == 'new',
 		'accesskey' => 'm',
@@ -79,7 +79,7 @@ function message_post(App $a)
 			notice(L10n::t('Message collection failure.') . EOL);
 			break;
 		default:
-			info(t('Message sent.') . EOL);
+			info(L10n::t('Message sent.') . EOL);
 	}
 
 	// fake it to go back to the input form if no recipient listed
@@ -105,7 +105,7 @@ function message_content(App $a)
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, [
-		'$messages' => t('Messages'),
+		'$messages' => L10n::t('Messages'),
 	]);
 
 	if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
@@ -129,12 +129,12 @@ function message_content(App $a)
 			//$a->page['aside'] = '';
 			return replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'get',
-				'$message' => t('Do you really want to delete this message?'),
+				'$message' => L10n::t('Do you really want to delete this message?'),
 				'$extra_inputs' => $inputs,
-				'$confirm' => t('Yes'),
+				'$confirm' => L10n::t('Yes'),
 				'$confirm_url' => $query['base'],
 				'$confirm_name' => 'confirmed',
-				'$cancel' => t('Cancel'),
+				'$cancel' => L10n::t('Cancel'),
 			]);
 		}
 		// Now check how the user responded to the confirmation query
@@ -149,7 +149,7 @@ function message_content(App $a)
 				intval(local_user())
 			);
 			if ($r) {
-				info(t('Message deleted.') . EOL);
+				info(L10n::t('Message deleted.') . EOL);
 			}
 			//goaway(System::baseUrl(true) . '/message' );
 			goaway($_SESSION['return_url']);
@@ -178,7 +178,7 @@ function message_content(App $a)
 				//}
 
 				if ($r) {
-					info(t('Conversation removed.') . EOL);
+					info(L10n::t('Conversation removed.') . EOL);
 				}
 			}
 			//goaway(System::baseUrl(true) . '/message' );
@@ -193,14 +193,14 @@ function message_content(App $a)
 		$a->page['htmlhead'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
 		$preselect = isset($a->argv[2]) ? [$a->argv[2]] : false;
@@ -243,23 +243,23 @@ function message_content(App $a)
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl, [
-			'$header' => t('Send Private Message'),
+			'$header' => L10n::t('Send Private Message'),
-			'$to' => t('To:'),
+			'$to' => L10n::t('To:'),
 			'$showinputs' => 'true',
 			'$prefill' => $prefill,
 			'$autocomp' => $autocomp,
 			'$preid' => $preid,
-			'$subject' => t('Subject:'),
+			'$subject' => L10n::t('Subject:'),
 			'$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
 			'$text' => x($_REQUEST, 'body') ? escape_tags(htmlspecialchars($_REQUEST['body'])) : '',
 			'$readonly' => '',
-			'$yourmessage' => t('Your message:'),
+			'$yourmessage' => L10n::t('Your message:'),
 			'$select' => $select,
 			'$parent' => '',
-			'$upload' => t('Upload photo'),
+			'$upload' => L10n::t('Upload photo'),
-			'$insert' => t('Insert web link'),
+			'$insert' => L10n::t('Insert web link'),
-			'$wait' => t('Please wait'),
+			'$wait' => L10n::t('Please wait'),
-			'$submit' => t('Submit')
+			'$submit' => L10n::t('Submit')
 		]);
 		return $o;
 	}
@@ -285,7 +285,7 @@ function message_content(App $a)
 		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
 		if (!DBM::is_result($r)) {
-			info(t('No messages.') . EOL);
+			info(L10n::t('No messages.') . EOL);
 			return $o;
 		}
 
@@ -339,14 +339,14 @@ function message_content(App $a)
 		$a->page['htmlhead'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
+			'$linkurl' => L10n::t('Please enter a link URL:')
 		]);
 
 		$mails = [];
@@ -393,7 +393,7 @@ function message_content(App $a)
 				'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
 				'subject' => $subject_e,
 				'body' => $body_e,
-				'delete' => t('Delete message'),
+				'delete' => L10n::t('Delete message'),
 				'to_name' => $to_name_e,
 				'date' => datetime_convert('UTC', date_default_timezone_get(), $message['created'], 'D, d M Y - g:i A'),
 				'ago' => relative_date($message['created']),
@@ -410,26 +410,26 @@ function message_content(App $a)
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
 			'$thread_seen' => $seen,
-			'$delete' => t('Delete conversation'),
+			'$delete' => L10n::t('Delete conversation'),
 			'$canreply' => (($unknown) ? false : '1'),
-			'$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
+			'$unknown_text' => L10n::t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
 			'$mails' => $mails,
 
 			// reply
-			'$header' => t('Send Reply'),
+			'$header' => L10n::t('Send Reply'),
-			'$to' => t('To:'),
+			'$to' => L10n::t('To:'),
 			'$showinputs' => '',
-			'$subject' => t('Subject:'),
+			'$subject' => L10n::t('Subject:'),
 			'$subjtxt' => $message['title'],
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-			'$yourmessage' => t('Your message:'),
+			'$yourmessage' => L10n::t('Your message:'),
 			'$text' => '',
 			'$select' => $select,
 			'$parent' => $parent,
-			'$upload' => t('Upload photo'),
+			'$upload' => L10n::t('Upload photo'),
-			'$insert' => t('Insert web link'),
+			'$insert' => L10n::t('Insert web link'),
-			'$submit' => t('Submit'),
+			'$submit' => L10n::t('Submit'),
-			'$wait' => t('Please wait')
+			'$wait' => L10n::t('Please wait')
 		]);
 
 		return $o;
@@ -467,11 +467,11 @@ function render_messages(array $msg, $t)
 
 	foreach ($msg as $rr) {
 		if ($rr['unknown']) {
-			$participants = t("Unknown sender - %s", $rr['from-name']);
+			$participants = L10n::t("Unknown sender - %s", $rr['from-name']);
 		} elseif (link_compare($rr['from-url'], $myprofile)) {
-			$participants = t("You and %s", $rr['name']);
+			$participants = L10n::t("You and %s", $rr['name']);
 		} else {
-			$participants = t("%s and You", $rr['from-name']);
+			$participants = L10n::t("%s and You", $rr['from-name']);
 		}
 
 		$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
@@ -493,10 +493,10 @@ function render_messages(array $msg, $t)
 			'$sparkle' => ' sparkle',
 			'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
 			'$subject' => $subject_e,
-			'$delete' => t('Delete conversation'),
+			'$delete' => L10n::t('Delete conversation'),
 			'$body' => $body_e,
 			'$to_name' => $to_name_e,
-			'$date' => datetime_convert('UTC', date_default_timezone_get(), $rr['mailcreated'], t('D, d M Y - g:i A')),
+			'$date' => datetime_convert('UTC', date_default_timezone_get(), $rr['mailcreated'], L10n::t('D, d M Y - g:i A')),
 			'$ago' => relative_date($rr['mailcreated']),
 			'$seen' => $rr['mailseen'],
 			'$count' => L10n::tt('%d message', '%d messages', $rr['count']),

mod/network.php

@@ -188,15 +188,15 @@ function saved_searches($search)
 			'id'          => $rr['id'],
 			'term'        => $rr['term'],
 			'encodedterm' => urlencode($rr['term']),
-			'delete'      => t('Remove term'),
+			'delete'      => L10n::t('Remove term'),
 			'selected'    => ($search == $rr['term']),
 		];
 	}
 
 	$tpl = get_markup_template('saved_searches_aside.tpl');
 	$o = replace_macros($tpl, [
-		'$title'     => t('Saved Searches'),
+		'$title'     => L10n::t('Saved Searches'),
-		'$add'       => t('add'),
+		'$add'       => L10n::t('add'),
 		'$searchbox' => search($search, 'netsearch-box', $srchurl, true),
 		'$saved'     => $saved,
 	]);
@@ -633,11 +633,11 @@ function networkThreadedView(App $a, $update = 0)
 			$sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '" . protect_sprintf('%<' . intval($gid) . '>%') . "' AND `temp1`.`private`))";
 		} else {
 			$sql_extra3 .= " AND false ";
-			info(t('Group is empty'));
+			info(L10n::t('Group is empty'));
 		}
 
 		$o = replace_macros(get_markup_template('section_title.tpl'), [
-			'$title' => t('Group: %s', $group['name'])
+			'$title' => L10n::t('Group: %s', $group['name'])
 		]) . $o;
 	} elseif ($cid) {
 		$fields = ['id', 'name', 'network', 'writable', 'nurl',
@@ -909,18 +909,18 @@ function network_tabs(App $a)
 	// tabs
 	$tabs = [
 		[
-			'label'	=> t('Commented Order'),
+			'label'	=> L10n::t('Commented Order'),
 			'url'	=> str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
 			'sel'	=> $all_active,
-			'title'	=> t('Sort by Comment Date'),
+			'title'	=> L10n::t('Sort by Comment Date'),
 			'id'	=> 'commented-order-tab',
 			'accesskey' => 'e',
 		],
 		[
-			'label'	=> t('Posted Order'),
+			'label'	=> L10n::t('Posted Order'),
 			'url'	=> str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
 			'sel'	=> $postord_active,
-			'title'	=> t('Sort by Post Date'),
+			'title'	=> L10n::t('Sort by Post Date'),
 			'id'	=> 'posted-order-tab',
 			'accesskey' => 't',
 		],
@@ -928,10 +928,10 @@ function network_tabs(App $a)
 
 	if (Feature::isEnabled(local_user(), 'personal_tab')) {
 		$tabs[] = [
-			'label'	=> t('Personal'),
+			'label'	=> L10n::t('Personal'),
 			'url'	=> str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
 			'sel'	=> $conv_active,
-			'title'	=> t('Posts that mention or involve you'),
+			'title'	=> L10n::t('Posts that mention or involve you'),
 			'id'	=> 'personal-tab',
 			'accesskey' => 'r',
 		];
@@ -939,10 +939,10 @@ function network_tabs(App $a)
 
 	if (Feature::isEnabled(local_user(), 'new_tab')) {
 		$tabs[] = [
-			'label'	=> t('New'),
+			'label'	=> L10n::t('New'),
 			'url'	=> 'network/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
 			'sel'	=> $new_active,
-			'title'	=> t('Activity Stream - by date'),
+			'title'	=> L10n::t('Activity Stream - by date'),
 			'id'	=> 'activitiy-by-date-tab',
 			'accesskey' => 'w',
 		];
@@ -950,10 +950,10 @@ function network_tabs(App $a)
 
 	if (Feature::isEnabled(local_user(), 'link_tab')) {
 		$tabs[] = [
-			'label'	=> t('Shared Links'),
+			'label'	=> L10n::t('Shared Links'),
 			'url'	=> str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
 			'sel'	=> $bookmarked_active,
-			'title'	=> t('Interesting Links'),
+			'title'	=> L10n::t('Interesting Links'),
 			'id'	=> 'shared-links-tab',
 			'accesskey' => 'b',
 		];
@@ -961,10 +961,10 @@ function network_tabs(App $a)
 
 	if (Feature::isEnabled(local_user(), 'star_posts')) {
 		$tabs[] = [
-			'label'	=> t('Starred'),
+			'label'	=> L10n::t('Starred'),
 			'url'	=> str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
 			'sel'	=> $starred_active,
-			'title'	=> t('Favourite Posts'),
+			'title'	=> L10n::t('Favourite Posts'),
 			'id'	=> 'starred-posts-tab',
 			'accesskey' => 'm',
 		];

mod/newmember.php

@@ -1,54 +1,57 @@
 <?php
-
+/**
+ * @file mod/newmember.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 
-function newmember_content(App $a) {
+function newmember_content(App $a)
-
+{
-	$o = '<h1>' . t('Welcome to Friendica') . '</h1>';
+	$o = '<h1>' . L10n::t('Welcome to Friendica') . '</h1>';
-	$o .= '<h3>' . t('New Member Checklist') . '</h3>';
+	$o .= '<h3>' . L10n::t('New Member Checklist') . '</h3>';
 	$o .= '<div style="font-size: 120%;">';
-	$o .= t('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.');
+	$o .= L10n::t('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.');
-	$o .= '<h4>' . t('Getting Started') . '</h4>';
+	$o .= '<h4>' . L10n::t('Getting Started') . '</h4>';
 	$o .= '<ul>';
-	$o .= '<li> ' . '<a target="newmember" href="help/guide">' . t('Friendica Walk-Through') . '</a><br />' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
+	$o .= '<li> ' . '<a target="newmember" href="help/guide">' . L10n::t('Friendica Walk-Through') . '</a><br />' . L10n::t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
 	$o .= '</ul>';
-	$o .= '<h4>' . t('Settings') . '</h4>';
+	$o .= '<h4>' . L10n::t('Settings') . '</h4>';
 	$o .= '<ul>';
-	$o .= '<li>' . '<a target="newmember" href="settings">' . t('Go to Your Settings') . '</a><br />' . t('On your <em>Settings</em> 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.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="settings">' . L10n::t('Go to Your Settings') . '</a><br />' . L10n::t('On your <em>Settings</em> 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.') . '</li>' . EOL;
-	$o .= '<li>' . t('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.') . '</li>' . EOL;
+	$o .= '<li>' . L10n::t('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.') . '</li>' . EOL;
 	$o .= '</ul>';
-	$o .= '<h4>' . t('Profile') . '</h4>';
+	$o .= '<h4>' . L10n::t('Profile') . '</h4>';
 	$o .= '<ul>';
-	$o .= '<li>' . '<a target="newmember" href="profile_photo">' . t('Upload Profile Photo') . '</a><br />' . t('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.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="profile_photo">' . L10n::t('Upload Profile Photo') . '</a><br />' . L10n::t('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.') . '</li>' . EOL;
-	$o .= '<li>' . '<a target="newmember" href="profiles">' . t('Edit Your Profile') . '</a><br />' . t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="profiles">' . L10n::t('Edit Your Profile') . '</a><br />' . L10n::t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</li>' . EOL;
-	$o .= '<li>' . '<a target="newmember" href="profiles">' . t('Profile Keywords') . '</a><br />' . t('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.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="profiles">' . L10n::t('Profile Keywords') . '</a><br />' . L10n::t('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.') . '</li>' . EOL;
 	$o .= '</ul>';
-	$o .= '<h4>' . t('Connecting') . '</h4>';
+	$o .= '<h4>' . L10n::t('Connecting') . '</h4>';
 	$o .= '<ul>';
 
 	$mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
 
 	if (!$mail_disabled) {
-		$o .= '<li>' . '<a target="newmember" href="settings/connectors">' . t('Importing Emails') . '</a><br />' . t('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') . '</li>' . EOL;
+		$o .= '<li>' . '<a target="newmember" href="settings/connectors">' . L10n::t('Importing Emails') . '</a><br />' . L10n::t('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') . '</li>' . EOL;
 	}
 
-	$o .= '<li>' . '<a target="newmember" href="contacts">' . t('Go to Your Contacts Page') . '</a><br />' . t('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 <em>Add New Contact</em> dialog.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="contacts">' . L10n::t('Go to Your Contacts Page') . '</a><br />' . L10n::t('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 <em>Add New Contact</em> dialog.') . '</li>' . EOL;
-	$o .= '<li>' . '<a target="newmember" href="directory">' . t("Go to Your Site's Directory") . '</a><br />' . t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="directory">' . L10n::t("Go to Your Site's Directory") . '</a><br />' . L10n::t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.') . '</li>' . EOL;
-	$o .= '<li>' . '<a target="newmember" href="contacts">' . t('Finding New People') . '</a><br />' . t("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.") . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="contacts">' . L10n::t('Finding New People') . '</a><br />' . L10n::t("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.") . '</li>' . EOL;
 	$o .= '</ul>';
-	$o .= '<h4>' . t('Groups') . '</h4>';
+	$o .= '<h4>' . L10n::t('Groups') . '</h4>';
 	$o .= '<ul>';
-	$o .= '<li>' . '<a target="newmember" href="contacts">' . t('Group Your Contacts') . '</a><br />' . t('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.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="contacts">' . L10n::t('Group Your Contacts') . '</a><br />' . L10n::t('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.') . '</li>' . EOL;
 
 	if (Config::get('system', 'newuser_private')) {
-		$o .= '<li>' . '<a target="newmember" href="help/Groups-and-Privacy">' . t("Why Aren't My Posts Public?") . '</a><br />' . t("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.") . '</li>' . EOL;
+		$o .= '<li>' . '<a target="newmember" href="help/Groups-and-Privacy">' . L10n::t("Why Aren't My Posts Public?") . '</a><br />' . L10n::t("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.") . '</li>' . EOL;
 	}
 
 	$o .= '</ul>';
-	$o .= '<h4>' . t('Getting Help') . '</h4>';
+	$o .= '<h4>' . L10n::t('Getting Help') . '</h4>';
 	$o .= '<ul>';
-	$o .= '<li>' . '<a target="newmember" href="help">' . t('Go to the Help Section') . '</a><br />' . t('Our <strong>help</strong> pages may be consulted for detail on other program features and resources.') . '</li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="help">' . L10n::t('Go to the Help Section') . '</a><br />' . L10n::t('Our <strong>help</strong> pages may be consulted for detail on other program features and resources.') . '</li>' . EOL;
 	$o .= '</ul>';
 	$o .= '</div>';
 

mod/nogroup.php

@@ -39,8 +39,8 @@ function nogroup_content(App $a)
 			$contact_details = Contact::getDetailsByURL($rr['url'], local_user(), $rr);
 
 			$contacts[] = [
-				'img_hover' => t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
+				'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
-				'edit_hover' => t('Edit contact'),
+				'edit_hover' => L10n::t('Edit contact'),
 				'photo_menu' => Contact::photoMenu($rr),
 				'id' => $rr['id'],
 				'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
@@ -60,7 +60,7 @@ function nogroup_content(App $a)
 	$o = replace_macros(
 		$tpl,
 		[
-		'$header' => t('Contacts who are not members of a group'),
+		'$header' => L10n::t('Contacts who are not members of a group'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a)]
 	);

mod/notes.php

@@ -8,8 +8,8 @@ use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
 
-function notes_init(App $a) {
+function notes_init(App $a)
-
+{
 	if (! local_user()) {
 		return;
 	}
@@ -21,21 +21,20 @@ function notes_init(App $a) {
 	Nav::setSelected('home');
 
 	//Profile::load($a, $which, $profile);
-
 }
 
 
-function notes_content(App $a, $update = false) {
+function notes_content(App $a, $update = false)
-
+{
 	if (! local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
-	require_once("include/bbcode.php");
+	require_once 'include/bbcode.php';
-	require_once('include/security.php');
+	require_once 'include/security.php';
-	require_once('include/conversation.php');
+	require_once 'include/conversation.php';
-	require_once('include/acl_selectors.php');
+	require_once 'include/acl_selectors.php';
 	$groups = [];
 
 
@@ -52,7 +51,7 @@ function notes_content(App $a, $update = false) {
 	$o .= Profile::getTabs($a, true);
 
 	if (!$update) {
-		$o .= '<h3>' . t('Personal Notes') . '</h3>';
+		$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
 
 		$commpage = false;
 		$commvisitor = false;
@@ -67,12 +66,11 @@ function notes_content(App $a, $update = false) {
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-			'button' => t('Save'),
+			'button' => L10n::t('Save'),
 			'acl_data' => '',
 		];
 
 		$o .= status_editor($a, $x, $a->contact['id']);
-
 	}
 
 	// Construct permissions
@@ -86,9 +84,9 @@ function notes_content(App $a, $update = false) {
 		WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
 		AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
 		$sql_extra ",
-		item_joins(), item_condition(),
+		item_joins(),
+		item_condition(),
 		intval(local_user())
-
 	);
 
 	if (DBM::is_result($r)) {
@@ -101,7 +99,8 @@ function notes_content(App $a, $update = false) {
 		AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
 		$sql_extra
 		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-		item_joins(), item_condition(),
+		item_joins(),
+		item_condition(),
 		intval(local_user()),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -112,15 +111,18 @@ function notes_content(App $a, $update = false) {
 	$parents_str = '';
 
 	if (DBM::is_result($r)) {
-		foreach($r as $rr)
+		foreach ($r as $rr) {
 			$parents_arr[] = $rr['item_id'];
+		}
 		$parents_str = implode(', ', $parents_arr);
 
 		$r = q("SELECT %s FROM `item` %s
 			WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
 			$sql_extra
 			ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
-			item_fieldlists(), item_joins(), item_condition(),
+			item_fieldlists(),
+			item_joins(),
+			item_condition(),
 			intval(local_user()),
 			dbesc($parents_str)
 		);
@@ -132,7 +134,6 @@ function notes_content(App $a, $update = false) {
 		}
 	}
 
-
 	$o .= paginate($a);
 	return $o;
 }

mod/notifications.php

@@ -45,7 +45,7 @@ function notifications_post(App $a) {
 
 		$fid = $r[0]['fid'];
 
-		if($_POST['submit'] == t('Discard')) {
+		if($_POST['submit'] == L10n::t('Discard')) {
 			$r = q("DELETE FROM `intro` WHERE `id` = %d",
 				intval($intro_id)
 			);
@@ -61,7 +61,7 @@ function notifications_post(App $a) {
 			}
 			goaway('notifications/intros');
 		}
-		if($_POST['submit'] == t('Ignore')) {
+		if($_POST['submit'] == L10n::t('Ignore')) {
 			$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
 				intval($intro_id));
 			goaway('notifications/intros');
@@ -97,7 +97,7 @@ function notifications_content(App $a) {
 	// Get introductions
 	if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
 		Nav::setSelected('introductions');
-		$notif_header = t('Notifications');
+		$notif_header = L10n::t('Notifications');
 
 		$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
@@ -106,25 +106,25 @@ function notifications_content(App $a) {
 	// Get the network notifications
 	} else if (($a->argc > 1) && ($a->argv[1] == 'network')) {
 
-		$notif_header = t('Network Notifications');
+		$notif_header = L10n::t('Network Notifications');
 		$notifs = $nm->networkNotifs($show, $startrec, $perpage);
 
 	// Get the system notifications
 	} else if (($a->argc > 1) && ($a->argv[1] == 'system')) {
 
-		$notif_header = t('System Notifications');
+		$notif_header = L10n::t('System Notifications');
 		$notifs = $nm->systemNotifs($show, $startrec, $perpage);
 
 	// Get the personal notifications
 	} else if (($a->argc > 1) && ($a->argv[1] == 'personal')) {
 
-		$notif_header = t('Personal Notifications');
+		$notif_header = L10n::t('Personal Notifications');
 		$notifs = $nm->personalNotifs($show, $startrec, $perpage);
 
 	// Get the home notifications
 	} else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
 
-		$notif_header = t('Home Notifications');
+		$notif_header = L10n::t('Home Notifications');
 		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
 
 	}
@@ -153,7 +153,7 @@ function notifications_content(App $a) {
 		// The link to switch between ignored and normal connection requests
 		$notif_show_lnk = [
 			'href' => (!$all ? 'notifications/intros/all' : 'notifications/intros' ),
-			'text' => (!$all ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
+			'text' => (!$all ? L10n::t('Show Ignored Requests') : L10n::t('Hide Ignored Requests'))
 		];
 
 		// Loop through all introduction notifications.This creates an array with the output html for each
@@ -165,23 +165,23 @@ function notifications_content(App $a) {
 			switch ($it['label']) {
 				case 'friend_suggestion':
 					$notif_content[] = replace_macros($sugg, [
-						'$str_notifytype' => t('Notification type: '),
+						'$str_notifytype' => L10n::t('Notification type: '),
 						'$notify_type' => $it['notify_type'],
 						'$intro_id' => $it['intro_id'],
-						'$madeby' => sprintf( t('suggested by %s'),$it['madeby']),
+						'$madeby' => sprintf(L10n::t('suggested by %s'), $it['madeby']),
 						'$contact_id' => $it['contact-id'],
 						'$photo' => $it['photo'],
 						'$fullname' => $it['name'],
 						'$url' => $it['url'],
-						'$hidden' => ['hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''],
+						'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
-						'$activity' => ['activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')],
+						'$activity' => ['activity', L10n::t('Post a new friend activity'), $it['post_newfriend'], L10n::t('if applicable')],
 
 						'$knowyou' => $it['knowyou'],
-						'$approve' => t('Approve'),
+						'$approve' => L10n::t('Approve'),
 						'$note' => $it['note'],
 						'$request' => $it['request'],
-						'$ignore' => t('Ignore'),
+						'$ignore' => L10n::t('Ignore'),
-						'$discard' => t('Discard'),
+						'$discard' => L10n::t('Discard'),
 					]);
 					break;
 
@@ -196,16 +196,16 @@ function notifications_content(App $a) {
 
 					if($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
 						if($it['network'] === NETWORK_DFRN) {
-							$lbl_knowyou = t('Claims to be known to you: ');
+							$lbl_knowyou = L10n::t('Claims to be known to you: ');
-							$knowyou = (($it['knowyou']) ? t('yes') : t('no'));
+							$knowyou = (($it['knowyou']) ? L10n::t('yes') : L10n::t('no'));
-							$helptext = t('Shall your connection be bidirectional or not?');
+							$helptext = L10n::t('Shall your connection be bidirectional or not?');
-							$helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
+							$helptext2 = sprintf(L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
-							$helptext3 = sprintf(t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
+							$helptext3 = sprintf(L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
 						} else {
 							$knowyou = '';
-							$helptext = t('Shall your connection be bidirectional or not?');
+							$helptext = L10n::t('Shall your connection be bidirectional or not?');
-							$helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
+							$helptext2 = sprintf(L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']);
-							$helptext3 = sprintf(t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
+							$helptext3 = sprintf(L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']);
 						}
 					}
 
@@ -216,8 +216,8 @@ function notifications_content(App $a) {
 						'$approve_as1' => $helptext,
 						'$approve_as2' => $helptext2,
 						'$approve_as3' => $helptext3,
-						'$as_friend' => t('Friend'),
+						'$as_friend' => L10n::t('Friend'),
-						'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Subscriber'))
+						'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
 					]);
 
 					$header = $it["name"];
@@ -228,14 +228,14 @@ function notifications_content(App $a) {
 					$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
 
 					if ($it['network'] != NETWORK_DIASPORA) {
-						$discard = t('Discard');
+						$discard = L10n::t('Discard');
 					} else {
 						$discard = '';
 					}
 
 					$notif_content[] = replace_macros($tpl, [
 						'$header' => htmlentities($header),
-						'$str_notifytype' => t('Notification type: '),
+						'$str_notifytype' => L10n::t('Notification type: '),
 						'$notify_type' => $it['notify_type'],
 						'$dfrn_text' => $dfrn_text,
 						'$dfrn_id' => $it['dfrn_id'],
@@ -245,26 +245,26 @@ function notifications_content(App $a) {
 						'$photo' => $it['photo'],
 						'$fullname' => $it['name'],
 						'$location' => $it['location'],
-						'$lbl_location' => t('Location:'),
+						'$lbl_location' => L10n::t('Location:'),
 						'$about' => $it['about'],
-						'$lbl_about' => t('About:'),
+						'$lbl_about' => L10n::t('About:'),
 						'$keywords' => $it['keywords'],
-						'$lbl_keywords' => t('Tags:'),
+						'$lbl_keywords' => L10n::t('Tags:'),
 						'$gender' => $it['gender'],
-						'$lbl_gender' => t('Gender:'),
+						'$lbl_gender' => L10n::t('Gender:'),
-						'$hidden' => ['hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''],
+						'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
-						'$activity' => ['activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')],
+						'$activity' => ['activity', L10n::t('Post a new friend activity'), $it['post_newfriend'], L10n::t('if applicable')],
 						'$url' => $it['url'],
 						'$zrl' => $it['zrl'],
-						'$lbl_url' => t('Profile URL'),
+						'$lbl_url' => L10n::t('Profile URL'),
 						'$addr' => $it['addr'],
 						'$lbl_knowyou' => $lbl_knowyou,
-						'$lbl_network' => t('Network:'),
+						'$lbl_network' => L10n::t('Network:'),
 						'$network' => ContactSelector::networkToName($it['network'], $it['url']),
 						'$knowyou' => $knowyou,
-						'$approve' => t('Approve'),
+						'$approve' => L10n::t('Approve'),
 						'$note' => $it['note'],
-						'$ignore' => t('Ignore'),
+						'$ignore' => L10n::t('Ignore'),
 						'$discard' => $discard,
 
 					]);
@@ -314,13 +314,13 @@ function notifications_content(App $a) {
 		if($show == 0 || intval($show) && $notifs['total'] > 0) {
 			$notif_show_lnk = [
 				'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
-				'text' => ($show ? t('Show unread') : t('Show all')),
+				'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
 			];
 		}
 
 		// Output if there aren't any notifications available
 		if($notifs['total'] == 0)
-			$notif_nocontent = sprintf( t('No more %s notifications.'), $notifs['ident']);
+			$notif_nocontent = sprintf(L10n::t('No more %s notifications.'), $notifs['ident']);
 	}
 
 	$o .= replace_macros($notif_tpl, [

mod/notify.php

@@ -1,12 +1,16 @@
 <?php
-
+/**
+ * @file mod/notify.php
+ */
 use Friendica\App;
 use Friendica\Core\NotificationsManager;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Module\Login;
 
-function notify_init(App $a) {
+function notify_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -41,10 +45,10 @@ function notify_init(App $a) {
 		echo $j;
 		killme();
 	}
-
 }
 
-function notify_content(App $a) {
+function notify_content(App $a)
+{
 	if (! local_user()) {
 		return Login::form();
 	}
@@ -67,16 +71,14 @@ function notify_content(App $a) {
 			]);
 		}
 	} else {
-		$notif_content .= t('No more system notifications.');
+		$notif_content .= L10n::t('No more system notifications.');
 	}
 
 	$o .= replace_macros($notif_tpl, [
-		'$notif_header' => t('System Notifications'),
+		'$notif_header' => L10n::t('System Notifications'),
 		'$tabs' => false, // $tabs,
 		'$notif_content' => $notif_content,
 	]);
 
 	return $o;
-
-
 }

mod/photos.php

@@ -82,7 +82,7 @@ function photos_init(App $a) {
 			$ret['albums'] = [];
 			foreach ($albums as $k => $album) {
 				//hide profile photos to others
-				if (!$is_owner && !remote_user() && ($album['album'] == t('Profile Photos')))
+				if (!$is_owner && !remote_user() && ($album['album'] == L10n::t('Profile Photos')))
 					continue;
 				$entry = [
 					'text'      => $album['album'],
@@ -102,11 +102,11 @@ function photos_init(App $a) {
 		if ($ret['success']) {
 			$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), [
 				'$nick'     => $a->data['user']['nickname'],
-				'$title'    => t('Photo Albums'),
+				'$title'    => L10n::t('Photo Albums'),
-				'$recent'   => t('Recent Photos'),
+				'$recent'   => L10n::t('Recent Photos'),
 				'$albums'   => $ret['albums'],
 				'$baseurl'  => System::baseUrl(),
-				'$upload'   => [t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
+				'$upload'   => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
 				'$can_post' => $can_post
 			]);
 		}
@@ -120,7 +120,7 @@ function photos_init(App $a) {
 
 		$tpl = get_markup_template("photos_head.tpl");
 		$a->page['htmlhead'] .= replace_macros($tpl,[
-			'$ispublic' => t('everybody')
+			'$ispublic' => L10n::t('everybody')
 		]);
 	}
 
@@ -188,7 +188,7 @@ function photos_post(App $a)
 	if ($a->argc > 3 && $a->argv[2] === 'album') {
 		$album = hex2bin($a->argv[3]);
 
-		if ($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
+		if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
 			goaway($_SESSION['photo_return']);
 			return; // NOTREACHED
 		}
@@ -228,7 +228,7 @@ function photos_post(App $a)
 		 * DELETE photo album and all its photos
 		 */
 
-		if ($_POST['dropalbum'] == t('Delete Album')) {
+		if ($_POST['dropalbum'] == L10n::t('Delete Album')) {
 			// Check if we should do HTML-based delete confirmation
 			if (x($_REQUEST, 'confirm')) {
 				$drop_url = $a->query_string;
@@ -237,12 +237,12 @@ function photos_post(App $a)
 				];
 				$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 					'$method' => 'post',
-					'$message' => t('Do you really want to delete this photo album and all its photos?'),
+					'$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
 					'$extra_inputs' => $extra_inputs,
-					'$confirm' => t('Delete Album'),
+					'$confirm' => L10n::t('Delete Album'),
 					'$confirm_url' => $drop_url,
 					'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
-					'$cancel' => t('Cancel'),
+					'$cancel' => L10n::t('Cancel'),
 				]);
 				$a->error = 1; // Set $a->error so the other module functions don't execute
 				return;
@@ -317,7 +317,7 @@ function photos_post(App $a)
 		goaway($_SESSION['photo_return']);
 	}
 
-	if ($a->argc > 2 && defaults($_POST, 'delete', '') === t('Delete Photo')) {
+	if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) {
 
 		// same as above but remove single photo
 
@@ -326,12 +326,12 @@ function photos_post(App $a)
 			$drop_url = $a->query_string;
 			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'post',
-				'$message' => t('Do you really want to delete this photo?'),
+				'$message' => L10n::t('Do you really want to delete this photo?'),
 				'$extra_inputs' => [],
-				'$confirm' => t('Delete Photo'),
+				'$confirm' => L10n::t('Delete Photo'),
 				'$confirm_url' => $drop_url,
 				'$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
-				'$cancel' => t('Cancel'),
+				'$cancel' => L10n::t('Cancel'),
 			]);
 			$a->error = 1; // Set $a->error so the other module functions don't execute
 			return;
@@ -695,7 +695,7 @@ function photos_post(App $a)
 					$arr['tag']           = $tagged[4];
 					$arr['inform']        = $tagged[2];
 					$arr['origin']        = 1;
-					$arr['body']          = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+					$arr['body']          = sprintf( L10n::t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
 					$arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
 
 					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
@@ -750,7 +750,7 @@ function photos_post(App $a)
 		dbesc($album),
 		intval($page_owner_uid)
 	);
-	if (!DBM::is_result($r) || ($album == t('Profile Photos'))) {
+	if (!DBM::is_result($r) || ($album == L10n::t('Profile Photos'))) {
 		$visible = 1;
 	} else {
 		$visible = 0;
@@ -1091,7 +1091,7 @@ function photos_content(App $a)
 		$albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
 		if (count($a->data['albums'])) {
 			foreach ($a->data['albums'] as $album) {
-				if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) {
+				if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) {
 					continue;
 				}
 				$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
@@ -1109,7 +1109,7 @@ function photos_content(App $a)
 
 		$default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), []);
 		$default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), [
-			'$submit' => t('Submit'),
+			'$submit' => L10n::t('Submit'),
 		]);
 
 		$usage_message = '';
@@ -1119,15 +1119,15 @@ function photos_content(App $a)
 		$aclselect_e = ($visitor ? '' : populate_acl($a->user));
 
 		$o .= replace_macros($tpl,[
-			'$pagename' => t('Upload Photos'),
+			'$pagename' => L10n::t('Upload Photos'),
 			'$sessid' => session_id(),
 			'$usage' => $usage_message,
 			'$nickname' => $a->data['user']['nickname'],
-			'$newalbum' => t('New album name: '),
+			'$newalbum' => L10n::t('New album name: '),
-			'$existalbumtext' => t('or existing album name: '),
+			'$existalbumtext' => L10n::t('or existing album name: '),
-			'$nosharetext' => t('Do not show a status post for this upload'),
+			'$nosharetext' => L10n::t('Do not show a status post for this upload'),
 			'$albumselect' => $albumselect,
-			'$permissions' => t('Permissions'),
+			'$permissions' => L10n::t('Permissions'),
 			'$aclselect' => $aclselect_e,
 			'$alt_uploader' => $ret['addon_text'],
 			'$default_upload_box' => ($ret['default_upload'] ? $default_upload_box : ''),
@@ -1135,8 +1135,8 @@ function photos_content(App $a)
 			'$uploadurl' => $ret['post_url'],
 
 			// ACL permissions box
-			'$group_perms' => t('Show to Groups'),
+			'$group_perms' => L10n::t('Show to Groups'),
-			'$contact_perms' => t('Show to Contacts'),
+			'$contact_perms' => L10n::t('Show to Contacts'),
 			'$return_path' => $a->query_string,
 		]);
 
@@ -1178,32 +1178,32 @@ function photos_content(App $a)
 
 		// edit album name
 		if ($cmd === 'edit') {
-			if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
+			if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos'))) {
 				if ($can_post) {
 					$edit_tpl = get_markup_template('album_edit.tpl');
 
 					$album_e = $album;
 
 					$o .= replace_macros($edit_tpl,[
-						'$nametext' => t('New album name: '),
+						'$nametext' => L10n::t('New album name: '),
 						'$nickname' => $a->data['user']['nickname'],
 						'$album' => $album_e,
 						'$hexalbum' => bin2hex($album),
-						'$submit' => t('Submit'),
+						'$submit' => L10n::t('Submit'),
-						'$dropsubmit' => t('Delete Album')
+						'$dropsubmit' => L10n::t('Delete Album')
 					]);
 				}
 			}
 		} else {
-			if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos')) && $can_post) {
+			if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos')) && $can_post) {
-				$edit = [t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
+				$edit = [L10n::t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
 			}
 		}
 
 		if ($order_field === 'posted') {
-			$order =  [t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
+			$order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
 		} else {
-			$order = [t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
+			$order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
 		}
 
 		$photos = [];
@@ -1224,7 +1224,7 @@ function photos_content(App $a)
 					'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
 					'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
 						. ($order_field === 'posted' ? '?f=&order=posted' : ''),
-					'title' => t('View Photo'),
+					'title' => L10n::t('View Photo'),
 					'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
 					'alt' => $imgalt_e,
 					'desc'=> $desc_e,
@@ -1239,7 +1239,7 @@ function photos_content(App $a)
 				'$photos' => $photos,
 				'$album' => $album,
 				'$can_post' => $can_post,
-				'$upload' => [t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
+				'$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
 				'$order' => $order,
 				'$edit' => $edit,
 				'$paginate' => paginate($a),
@@ -1330,14 +1330,14 @@ function photos_content(App $a)
 
 		if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
 			$tools = [
-				'edit'	=> ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))],
+				'edit'	=> ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? L10n::t('View photo') : L10n::t('Edit photo'))],
-				'profile'=>['profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')],
+				'profile'=>['profile_photo/use/'.$ph[0]['resource-id'], L10n::t('Use as profile photo')],
 			];
 
 			// lock
 			$lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
 					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
-					? t('Private Message')
+					? L10n::t('Private Message')
 					: Null);
 
 
@@ -1356,7 +1356,7 @@ function photos_content(App $a)
 
 		$photo = [
 			'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
-			'title'=> t('View Full Size'),
+			'title'=> L10n::t('View Full Size'),
 			'src'  => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
 			'height' => $hires['height'],
 			'width' => $hires['width'],
@@ -1447,10 +1447,10 @@ function photos_content(App $a)
 				}
 				$tag_str .= bbcode($t);
 			}
-			$tags = [t('Tags: '), $tag_str];
+			$tags = [L10n::t('Tags: '), $tag_str];
 			if ($cmd === 'edit') {
 				$tags[] = 'tagrm/' . $link_item['id'];
-				$tags[] = t('[Remove any tag]');
+				$tags[] = L10n::t('[Remove any tag]');
 			}
 		}
 
@@ -1465,25 +1465,25 @@ function photos_content(App $a)
 
 			$edit = replace_macros($edit_tpl, [
 				'$id' => $ph[0]['id'],
-				'$album' => ['albname', t('New album name'), $album_e,''],
+				'$album' => ['albname', L10n::t('New album name'), $album_e,''],
-				'$caption' => ['desc', t('Caption'), $caption_e, ''],
+				'$caption' => ['desc', L10n::t('Caption'), $caption_e, ''],
-				'$tags' => ['newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
+				'$tags' => ['newtag', L10n::t('Add a Tag'), "", L10n::t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
-				'$rotate_none' => ['rotate', t('Do not rotate'),0,'', true],
+				'$rotate_none' => ['rotate', L10n::t('Do not rotate'),0,'', true],
-				'$rotate_cw' => ['rotate', t('Rotate CW (right)'),1,''],
+				'$rotate_cw' => ['rotate', L10n::t('Rotate CW (right)'),1,''],
-				'$rotate_ccw' => ['rotate', t('Rotate CCW (left)'),2,''],
+				'$rotate_ccw' => ['rotate', L10n::t('Rotate CCW (left)'),2,''],
 
 				'$nickname' => $a->data['user']['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
-				'$permissions' => t('Permissions'),
+				'$permissions' => L10n::t('Permissions'),
 				'$aclselect' => $aclselect_e,
 
 				'$item_id' => defaults($link_item, 'id', 0),
-				'$submit' => t('Submit'),
+				'$submit' => L10n::t('Submit'),
-				'$delete' => t('Delete Photo'),
+				'$delete' => L10n::t('Delete Photo'),
 
 				// ACL permissions box
-				'$group_perms' => t('Show to Groups'),
+				'$group_perms' => L10n::t('Show to Groups'),
-				'$contact_perms' => t('Show to Contacts'),
+				'$contact_perms' => L10n::t('Show to Contacts'),
 				'$return_path' => $a->query_string,
 			]);
 		}
@@ -1504,9 +1504,9 @@ function photos_content(App $a)
 				$like_tpl = get_markup_template('like_noshare.tpl');
 				$likebuttons = replace_macros($like_tpl, [
 					'$id' => $link_item['id'],
-					'$likethis' => t("I like this \x28toggle\x29"),
+					'$likethis' => L10n::t("I like this \x28toggle\x29"),
-					'$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
+					'$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? L10n::t("I don't like this \x28toggle\x29") : ''),
-					'$wait' => t('Please wait'),
+					'$wait' => L10n::t('Please wait'),
 					'$return_path' => $a->query_string,
 				]);
 			}
@@ -1521,12 +1521,12 @@ function photos_content(App $a)
 						'$parent' => $link_item['id'],
 						'$profile_uid' =>  $owner_uid,
 						'$mylink' => $contact['url'],
-						'$mytitle' => t('This is you'),
+						'$mytitle' => L10n::t('This is you'),
 						'$myphoto' => $contact['thumb'],
-						'$comment' => t('Comment'),
+						'$comment' => L10n::t('Comment'),
-						'$submit' => t('Submit'),
+						'$submit' => L10n::t('Submit'),
-						'$preview' => t('Preview'),
+						'$preview' => L10n::t('Preview'),
-						'$sourceapp' => t($a->sourcename),
+						'$sourceapp' => L10n::t($a->sourcename),
 						'$ww' => '',
 						'$rand_num' => random_digits(12)
 					]);
@@ -1534,8 +1534,8 @@ function photos_content(App $a)
 			}
 
 			$conv_responses = [
-				'like' => ['title' => t('Likes','title')],'dislike' => ['title' => t('Dislikes','title')],
+				'like' => ['title' => L10n::t('Likes','title')],'dislike' => ['title' => L10n::t('Dislikes','title')],
-				'attendyes' => ['title' => t('Attending','title')], 'attendno' => ['title' => t('Not attending','title')], 'attendmaybe' => ['title' => t('Might attend','title')]
+				'attendyes' => ['title' => L10n::t('Attending','title')], 'attendno' => ['title' => L10n::t('Not attending','title')], 'attendmaybe' => ['title' => L10n::t('Might attend','title')]
 			];
 
 			// display comments
@@ -1560,12 +1560,12 @@ function photos_content(App $a)
 						'$parent' => $link_item['id'],
 						'$profile_uid' =>  $owner_uid,
 						'$mylink' => $contact['url'],
-						'$mytitle' => t('This is you'),
+						'$mytitle' => L10n::t('This is you'),
 						'$myphoto' => $contact['thumb'],
-						'$comment' => t('Comment'),
+						'$comment' => L10n::t('Comment'),
-						'$submit' => t('Submit'),
+						'$submit' => L10n::t('Submit'),
-						'$preview' => t('Preview'),
+						'$preview' => L10n::t('Preview'),
-						'$sourceapp' => t($a->sourcename),
+						'$sourceapp' => L10n::t($a->sourcename),
 						'$ww' => '',
 						'$rand_num' => random_digits(12)
 					]);
@@ -1602,8 +1602,8 @@ function photos_content(App $a)
 					$drop = [
 						'dropping' => $dropping,
 						'pagedrop' => false,
-						'select' => t('Select'),
+						'select' => L10n::t('Select'),
-						'delete' => t('Delete'),
+						'delete' => L10n::t('Delete'),
 					];
 
 					$name_e = $profile_name;
@@ -1633,12 +1633,12 @@ function photos_content(App $a)
 							'$parent' => $item['parent'],
 							'$profile_uid' =>  $owner_uid,
 							'$mylink' => $contact['url'],
-							'$mytitle' => t('This is you'),
+							'$mytitle' => L10n::t('This is you'),
 							'$myphoto' => $contact['thumb'],
-							'$comment' => t('Comment'),
+							'$comment' => L10n::t('Comment'),
-							'$submit' => t('Submit'),
+							'$submit' => L10n::t('Submit'),
-							'$preview' => t('Preview'),
+							'$preview' => L10n::t('Preview'),
-							'$sourceapp' => t($a->sourcename),
+							'$sourceapp' => L10n::t($a->sourcename),
 							'$ww' => '',
 							'$rand_num' => random_digits(12)
 						]);
@@ -1667,7 +1667,7 @@ function photos_content(App $a)
 			'$tags' => $tags,
 			'$edit' => $edit,
 			'$map' => $map,
-			'$map_text' => t('Map'),
+			'$map_text' => L10n::t('Map'),
 			'$likebuttons' => $likebuttons,
 			'$like' => $like,
 			'$dislike' => $dislike,
@@ -1692,7 +1692,7 @@ function photos_content(App $a)
 		$sql_extra GROUP BY `resource-id`",
 		intval($a->data['user']['uid']),
 		dbesc('Contact Photos'),
-		dbesc( t('Contact Photos'))
+		dbesc(L10n::t('Contact Photos'))
 	);
 	if (DBM::is_result($r)) {
 		$a->set_pager_total(count($r));
@@ -1706,7 +1706,7 @@ function photos_content(App $a)
 		$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
 		intval($a->data['user']['uid']),
 		dbesc('Contact Photos'),
-		dbesc( t('Contact Photos')),
+		dbesc(L10n::t('Contact Photos')),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
@@ -1717,7 +1717,7 @@ function photos_content(App $a)
 		$twist = false;
 		foreach ($r as $rr) {
 			//hide profile photos to others
-			if (!$is_owner && !remote_user() && ($rr['album'] == t('Profile Photos')))
+			if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos')))
 				continue;
 
 			$twist = !$twist;
@@ -1731,13 +1731,13 @@ function photos_content(App $a)
 				'id'		=> $rr['id'],
 				'twist'		=> ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
 				'link'  	=> 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
-				'title' 	=> t('View Photo'),
+				'title' 	=> L10n::t('View Photo'),
 				'src'     	=> 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
 				'alt'     	=> $alt_e,
 				'album'	=> [
 					'link'  => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
 					'name'  => $name_e,
-					'alt'   => t('View Album'),
+					'alt'   => L10n::t('View Album'),
 				],
 
 			];
@@ -1746,9 +1746,9 @@ function photos_content(App $a)
 
 	$tpl = get_markup_template('photos_recent.tpl');
 	$o .= replace_macros($tpl, [
-		'$title' => t('Recent Photos'),
+		'$title' => L10n::t('Recent Photos'),
 		'$can_post' => $can_post,
-		'$upload' => [t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
+		'$upload' => [L10n::t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
 		'$photos' => $photos,
 		'$paginate' => paginate($a),
 	]);

mod/ping.php

@@ -7,6 +7,7 @@ use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
@@ -286,7 +287,7 @@ function ping_init(App $a)
 					'photo'   => $intro['photo'],
 					'date'    => $intro['datetime'],
 					'seen'    => false,
-					'message' => t('{0} wants to be your friend'),
+					'message' => L10n::t('{0} wants to be your friend'),
 				];
 				$notifs[] = $notif;
 			}
@@ -301,7 +302,7 @@ function ping_init(App $a)
 					'photo'   => $mail['from-photo'],
 					'date'    => $mail['created'],
 					'seen'    => false,
-					'message' => t('{0} sent you a message'),
+					'message' => L10n::t('{0} sent you a message'),
 				];
 				$notifs[] = $notif;
 			}
@@ -316,7 +317,7 @@ function ping_init(App $a)
 					'photo'   => $reg['micro'],
 					'date'    => $reg['created'],
 					'seen'    => false,
-					'message' => t('{0} requested registration'),
+					'message' => L10n::t('{0} requested registration'),
 				];
 				$notifs[] = $notif;
 			}

mod/poke.php

@@ -124,7 +124,7 @@ function poke_init(App $a) {
 	$arr['object-type']   = ACTIVITY_OBJ_PERSON;
 
 	$arr['origin']        = 1;
-	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
+	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . L10n::t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
 
 	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . System::baseUrl() . '/contact/' . $target['id'] . '</id>';
 	$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
@@ -197,14 +197,14 @@ function poke_content(App $a) {
 	$tpl = get_markup_template('poke_content.tpl');
 
 	$o = replace_macros($tpl,[
-		'$title' => t('Poke/Prod'),
+		'$title' => L10n::t('Poke/Prod'),
-		'$desc' => t('poke, prod or do other things to somebody'),
+		'$desc' => L10n::t('poke, prod or do other things to somebody'),
-		'$clabel' => t('Recipient'),
+		'$clabel' => L10n::t('Recipient'),
-		'$choice' => t('Choose what you wish to do to recipient'),
+		'$choice' => L10n::t('Choose what you wish to do to recipient'),
 		'$verbs' => $shortlist,
 		'$parent' => $parent,
-		'$prv_desc' => t('Make this post private'),
+		'$prv_desc' => L10n::t('Make this post private'),
-		'$submit' => t('Submit'),
+		'$submit' => L10n::t('Submit'),
 		'$name' => $name,
 		'$id' => $id
 	]);

mod/probe.php

@@ -1,13 +1,16 @@
 <?php
-
+/**
+ * @file mod/probe.php
+ */
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Network\Probe;
 
-function probe_content(App $a) {
+function probe_content(App $a)
-
+{
 	if (!local_user()) {
-		http_status_exit(403, ["title" => t("Public access denied."),
+		http_status_exit(403, ["title" => L10n::t("Public access denied."),
-			"description" => t("Only logged in users are permitted to perform a probing.")]);
+			"description" => L10n::t("Only logged in users are permitted to perform a probing.")]);
 		killme();
 	}
 

mod/profile.php

@@ -71,9 +71,9 @@ function profile_init(App $a)
 	}
 
 	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\r\n";
-	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
-	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
-	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
 	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
 	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
 	header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
@@ -189,7 +189,7 @@ function profile_content(App $a, $update = 0)
 		$o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
 
 		if (x($_SESSION, 'new_member') && $is_owner) {
-			$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL;
+			$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . L10n::t('Tips for New Members') . '</b></a>' . EOL;
 		}
 
 		$commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;

mod/profile_photo.php

@@ -24,7 +24,7 @@ function profile_photo_init(App $a)
 function profile_photo_post(App $a) {
 
 	if (! local_user()) {
-		notice ( t('Permission denied.') . EOL );
+		notice(L10n::t('Permission denied.') . EOL );
 		return;
 	}
 
@@ -79,26 +79,26 @@ function profile_photo_post(App $a) {
 			if ($Image->isValid()) {
 				$Image->crop(175,$srcX,$srcY,$srcW,$srcH);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 4, $is_default_profile);
 
 				if ($r === false) {
-					notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
+					notice(sprintf(L10n::t('Image size reduction [%s] failed.'),"175") . EOL);
 				}
 
 				$Image->scaleDown(80);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 5, $is_default_profile);
 
 				if ($r === false) {
-					notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
+					notice( sprintf(L10n::t('Image size reduction [%s] failed.'),"80") . EOL );
 				}
 
 				$Image->scaleDown(48);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 6, $is_default_profile);
 
 				if ($r === false) {
-					notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
+					notice( sprintf(L10n::t('Image size reduction [%s] failed.'),"48") . EOL );
 				}
 
 				// If setting for the default profile, unset the profile photo flag from any other photos I own
@@ -160,7 +160,7 @@ function profile_photo_post(App $a) {
 	$maximagesize = Config::get('system', 'maximagesize');
 
 	if (($maximagesize) && ($filesize > $maximagesize)) {
-		notice(sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
+		notice(sprintf(L10n::t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
 		@unlink($src);
 		return;
 	}
@@ -218,7 +218,7 @@ function profile_photo_content(App $a) {
 
 		// set an already uloaded photo as profile photo
 		// if photo is in 'Profile Photos', change it in db
-		if (($r[0]['album']== t('Profile Photos')) && ($havescale)){
+		if (($r[0]['album']== L10n::t('Profile Photos')) && ($havescale)){
 			$r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
 				intval(local_user()));
 
@@ -257,13 +257,13 @@ function profile_photo_content(App $a) {
 
 		$o .= replace_macros($tpl,[
 			'$user' => $a->user['nickname'],
-			'$lbl_upfile' => t('Upload File:'),
+			'$lbl_upfile' => L10n::t('Upload File:'),
-			'$lbl_profiles' => t('Select a profile:'),
+			'$lbl_profiles' => L10n::t('Select a profile:'),
-			'$title' => t('Upload Profile Photo'),
+			'$title' => L10n::t('Upload Profile Photo'),
-			'$submit' => t('Upload'),
+			'$submit' => L10n::t('Upload'),
 			'$profiles' => $profiles,
 			'$form_security_token' => get_form_security_token("profile_photo"),
-			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
+			'$select' => sprintf('%s %s', L10n::t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
 		]);
 
 		return $o;
@@ -277,10 +277,10 @@ function profile_photo_content(App $a) {
 			'$profile' => intval($_REQUEST['profile']),
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
 			'$image_url' => System::baseUrl() . '/photo/' . $filename,
-			'$title' => t('Crop Image'),
+			'$title' => L10n::t('Crop Image'),
-			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+			'$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'),
 			'$form_security_token' => get_form_security_token("profile_photo"),
-			'$done' => t('Done Editing')
+			'$done' => L10n::t('Done Editing')
 		]);
 		return $o;
 	}
@@ -312,7 +312,7 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
 
 	$smallest = 0;
 
-	$r = Photo::store($Image, local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
+	$r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0);
 
 	if ($r) {
 		info(L10n::t('Image uploaded successfully.') . EOL);
@@ -322,10 +322,10 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
 
 	if ($width > 640 || $height > 640) {
 		$Image->scaleDown(640);
-		$r = Photo::store($Image, local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
+		$r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
 
 		if ($r === false) {
-			notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
+			notice(sprintf(L10n::t('Image size reduction [%s] failed.'), "640") . EOL);
 		} else {
 			$smallest = 1;
 		}

mod/profiles.php

@@ -50,7 +50,7 @@ function profiles_init(App $a) {
 			intval(local_user())
 		);
 		if (DBM::is_result($r)) {
-			info(t('Profile deleted.').EOL);
+			info(L10n::t('Profile deleted.').EOL);
 		}
 
 		goaway('profiles');
@@ -66,7 +66,7 @@ function profiles_init(App $a) {
 
 		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
 
-		$name = t('Profile-') . ($num_profiles + 1);
+		$name = L10n::t('Profile-') . ($num_profiles + 1);
 
 		$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
 			intval(local_user()));
@@ -102,7 +102,7 @@ function profiles_init(App $a) {
 
 		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
 
-		$name = t('Profile-') . ($num_profiles + 1);
+		$name = L10n::t('Profile-') . ($num_profiles + 1);
 		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 			intval(local_user()),
 			intval($a->argv[2])
@@ -338,61 +338,61 @@ function profiles_post(App $a) {
 		$value = '';
 		if ($is_default) {
 			if ($marital != $orig[0]['marital']) {
-				$changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
+				$changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Marital Status');
 				$value = $marital;
 			}
 			if ($withchanged) {
-				$changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
+				$changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Romantic Partner');
 				$value = strip_tags($with);
 			}
 			if ($likes != $orig[0]['likes']) {
-				$changes[] = t('Likes');
+				$changes[] = L10n::t('Likes');
 				$value = $likes;
 			}
 			if ($dislikes != $orig[0]['dislikes']) {
-				$changes[] = t('Dislikes');
+				$changes[] = L10n::t('Dislikes');
 				$value = $dislikes;
 			}
 			if ($work != $orig[0]['work']) {
-				$changes[] = t('Work/Employment');
+				$changes[] = L10n::t('Work/Employment');
 			}
 			if ($religion != $orig[0]['religion']) {
-				$changes[] = t('Religion');
+				$changes[] = L10n::t('Religion');
 				$value = $religion;
 			}
 			if ($politic != $orig[0]['politic']) {
-				$changes[] = t('Political Views');
+				$changes[] = L10n::t('Political Views');
 				$value = $politic;
 			}
 			if ($gender != $orig[0]['gender']) {
-				$changes[] = t('Gender');
+				$changes[] = L10n::t('Gender');
 				$value = $gender;
 			}
 			if ($sexual != $orig[0]['sexual']) {
-				$changes[] = t('Sexual Preference');
+				$changes[] = L10n::t('Sexual Preference');
 				$value = $sexual;
 			}
 			if ($xmpp != $orig[0]['xmpp']) {
-				$changes[] = t('XMPP');
+				$changes[] = L10n::t('XMPP');
 				$value = $xmpp;
 			}
 			if ($homepage != $orig[0]['homepage']) {
-				$changes[] = t('Homepage');
+				$changes[] = L10n::t('Homepage');
 				$value = $homepage;
 			}
 			if ($interest != $orig[0]['interest']) {
-				$changes[] = t('Interests');
+				$changes[] = L10n::t('Interests');
 				$value = $interest;
 			}
 			if ($address != $orig[0]['address']) {
-				$changes[] = t('Address');
+				$changes[] = L10n::t('Address');
 				// New address not sent in notifications, potential privacy issues
 				// in case this leaks to unintended recipients. Yes, it's in the public
 				// profile but that doesn't mean we have to broadcast it to everybody.
 			}
 			if ($locality != $orig[0]['locality'] || $region != $orig[0]['region']
 				|| $country_name != $orig[0]['country-name']) {
- 				$changes[] = t('Location');
+ 				$changes[] = L10n::t('Location');
 				$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
 				$comma2 = (($region && $country_name) ? ', ' : '');
 				$value = $locality . $comma1 . $region . $comma2 . $country_name;
@@ -477,7 +477,7 @@ function profiles_post(App $a) {
 		);
 
 		if ($r) {
-			info(t('Profile updated.') . EOL);
+			info(L10n::t('Profile updated.') . EOL);
 		}
 
 
@@ -569,7 +569,7 @@ function profile_activity($changed, $value) {
 	foreach ($changed as $ch) {
 		if (strlen($changes)) {
 			if ($z == ($t - 1)) {
-				$changes .= t(' and ');
+				$changes .= L10n::t(' and ');
 			} else {
 				$changes .= ', ';
 			}
@@ -578,13 +578,13 @@ function profile_activity($changed, $value) {
 		$changes .= $ch;
 	}
 
-	$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
+	$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . L10n::t('public profile') . '[/url]';
 
 	if ($t == 1 && strlen($value)) {
-		$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
+		$message = sprintf(L10n::t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
-		$message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
+		$message .= "\n\n" . sprintf(L10n::t(' - Visit %1$s\'s %2$s'), $A, $prof);
 	} else {
-		$message = 	sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+		$message = 	sprintf(L10n::t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
 	}
 
 
@@ -638,14 +638,14 @@ function profiles_content(App $a) {
 		$hide_friends = replace_macros($opt_tpl,[
 			'$yesno' => [
 				'hide-friends', //Name
-				t('Hide contacts and friends:'), //Label
+				L10n::t('Hide contacts and friends:'), //Label
 				!!$r[0]['hide-friends'], //Value
 				'', //Help string
-				[t('No'), t('Yes')] //Off - On strings
+				[L10n::t('No'), L10n::t('Yes')] //Off - On strings
 			],
-			'$desc' => t('Hide your contact/friend list from viewers of this profile?'),
+			'$desc' => L10n::t('Hide your contact/friend list from viewers of this profile?'),
-			'$yes_str' => t('Yes'),
+			'$yes_str' => L10n::t('Yes'),
-			'$no_str' => t('No'),
+			'$no_str' => L10n::t('No'),
 			'$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
 			'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
 		]);
@@ -663,10 +663,10 @@ function profiles_content(App $a) {
 
 			'$details' => [
 				'detailled_profile', //Name
-				t('Show more profile fields:'), //Label
+				L10n::t('Show more profile fields:'), //Label
 				$detailled_profile, //Value
 				'', //Help string
-				[t('No'), t('Yes')] //Off - On strings
+				[L10n::t('No'), L10n::t('Yes')] //Off - On strings
 			],
 
 			'$multi_profiles'		=> Feature::isEnabled(local_user(), 'multi_profiles'),
@@ -675,73 +675,73 @@ function profiles_content(App $a) {
 			'$profile_clone_link'		=> ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
 			'$profile_drop_link'		=> 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
 
-			'$profile_action' => t('Profile Actions'),
+			'$profile_action' => L10n::t('Profile Actions'),
-			'$banner'	=> t('Edit Profile Details'),
+			'$banner'	=> L10n::t('Edit Profile Details'),
-			'$submit'	=> t('Submit'),
+			'$submit'	=> L10n::t('Submit'),
-			'$profpic'	=> t('Change Profile Photo'),
+			'$profpic'	=> L10n::t('Change Profile Photo'),
-			'$viewprof'	=> t('View this profile'),
+			'$viewprof'	=> L10n::t('View this profile'),
-			'$editvis' 	=> t('Edit visibility'),
+			'$editvis' 	=> L10n::t('Edit visibility'),
-			'$cr_prof'	=> t('Create a new profile using these settings'),
+			'$cr_prof'	=> L10n::t('Create a new profile using these settings'),
-			'$cl_prof'	=> t('Clone this profile'),
+			'$cl_prof'	=> L10n::t('Clone this profile'),
-			'$del_prof'	=> t('Delete this profile'),
+			'$del_prof'	=> L10n::t('Delete this profile'),
 
-			'$lbl_basic_section' => t('Basic information'),
+			'$lbl_basic_section' => L10n::t('Basic information'),
-			'$lbl_picture_section' => t('Profile picture'),
+			'$lbl_picture_section' => L10n::t('Profile picture'),
-			'$lbl_location_section' => t('Location'),
+			'$lbl_location_section' => L10n::t('Location'),
-			'$lbl_preferences_section' => t('Preferences'),
+			'$lbl_preferences_section' => L10n::t('Preferences'),
-			'$lbl_status_section' => t('Status information'),
+			'$lbl_status_section' => L10n::t('Status information'),
-			'$lbl_about_section' => t('Additional information'),
+			'$lbl_about_section' => L10n::t('Additional information'),
-			'$lbl_interests_section' => t('Interests'),
+			'$lbl_interests_section' => L10n::t('Interests'),
-			'$lbl_personal_section' => t('Personal'),
+			'$lbl_personal_section' => L10n::t('Personal'),
-			'$lbl_relation_section' => t('Relation'),
+			'$lbl_relation_section' => L10n::t('Relation'),
-			'$lbl_miscellaneous_section' => t('Miscellaneous'),
+			'$lbl_miscellaneous_section' => L10n::t('Miscellaneous'),
 
-			'$lbl_profile_photo' => t('Upload Profile Photo'),
+			'$lbl_profile_photo' => L10n::t('Upload Profile Photo'),
-			'$lbl_gender' => t('Your Gender:'),
+			'$lbl_gender' => L10n::t('Your Gender:'),
-			'$lbl_marital' => t('<span class="heart">&hearts;</span> Marital Status:'),
+			'$lbl_marital' => L10n::t('<span class="heart">&hearts;</span> Marital Status:'),
-			'$lbl_sexual' => t('Sexual Preference:'),
+			'$lbl_sexual' => L10n::t('Sexual Preference:'),
-			'$lbl_ex2' => t('Example: fishing photography software'),
+			'$lbl_ex2' => L10n::t('Example: fishing photography software'),
 
 			'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
 			'$baseurl' => System::baseUrl(true),
 			'$profile_id' => $r[0]['id'],
-			'$profile_name' => ['profile_name', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'],
+			'$profile_name' => ['profile_name', L10n::t('Profile Name:'), $r[0]['profile-name'], L10n::t('Required'), '*'],
 			'$is_default'   => $is_default,
-			'$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
+			'$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . L10n::t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
-			'$name' => ['name', t('Your Full Name:'), $r[0]['name']],
+			'$name' => ['name', L10n::t('Your Full Name:'), $r[0]['name']],
-			'$pdesc' => ['pdesc', t('Title/Description:'), $r[0]['pdesc']],
+			'$pdesc' => ['pdesc', L10n::t('Title/Description:'), $r[0]['pdesc']],
 			'$dob' => dob($r[0]['dob']),
 			'$hide_friends' => $hide_friends,
-			'$address' => ['address', t('Street Address:'), $r[0]['address']],
+			'$address' => ['address', L10n::t('Street Address:'), $r[0]['address']],
-			'$locality' => ['locality', t('Locality/City:'), $r[0]['locality']],
+			'$locality' => ['locality', L10n::t('Locality/City:'), $r[0]['locality']],
-			'$region' => ['region', t('Region/State:'), $r[0]['region']],
+			'$region' => ['region', L10n::t('Region/State:'), $r[0]['region']],
-			'$postal_code' => ['postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']],
+			'$postal_code' => ['postal_code', L10n::t('Postal/Zip Code:'), $r[0]['postal-code']],
-			'$country_name' => ['country_name', t('Country:'), $r[0]['country-name']],
+			'$country_name' => ['country_name', L10n::t('Country:'), $r[0]['country-name']],
-			'$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
+			'$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
 			'$gender' => ContactSelector::gender($r[0]['gender']),
 			'$marital' => ContactSelector::maritalStatus($r[0]['marital']),
-			'$with' => ['with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')],
+			'$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
-			'$howlong' => ['howlong', t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))],
+			'$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))],
 			'$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
-			'$about' => ['about', t('Tell us about yourself...'), $r[0]['about']],
+			'$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
-			'$xmpp' => ['xmpp', t('XMPP (Jabber) address:'), $r[0]['xmpp'], t("The XMPP address will be propagated to your contacts so that they can follow you.")],
+			'$xmpp' => ['xmpp', L10n::t('XMPP (Jabber) address:'), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
-			'$homepage' => ['homepage', t('Homepage URL:'), $r[0]['homepage']],
+			'$homepage' => ['homepage', L10n::t('Homepage URL:'), $r[0]['homepage']],
-			'$hometown' => ['hometown', t('Hometown:'), $r[0]['hometown']],
+			'$hometown' => ['hometown', L10n::t('Hometown:'), $r[0]['hometown']],
-			'$politic' => ['politic', t('Political Views:'), $r[0]['politic']],
+			'$politic' => ['politic', L10n::t('Political Views:'), $r[0]['politic']],
-			'$religion' => ['religion', t('Religious Views:'), $r[0]['religion']],
+			'$religion' => ['religion', L10n::t('Religious Views:'), $r[0]['religion']],
-			'$pub_keywords' => ['pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")],
+			'$pub_keywords' => ['pub_keywords', L10n::t('Public Keywords:'), $r[0]['pub_keywords'], L10n::t("\x28Used for suggesting potential friends, can be seen by others\x29")],
-			'$prv_keywords' => ['prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")],
+			'$prv_keywords' => ['prv_keywords', L10n::t('Private Keywords:'), $r[0]['prv_keywords'], L10n::t("\x28Used for searching profiles, never shown to others\x29")],
-			'$likes' => ['likes', t('Likes:'), $r[0]['likes']],
+			'$likes' => ['likes', L10n::t('Likes:'), $r[0]['likes']],
-			'$dislikes' => ['dislikes', t('Dislikes:'), $r[0]['dislikes']],
+			'$dislikes' => ['dislikes', L10n::t('Dislikes:'), $r[0]['dislikes']],
-			'$music' => ['music', t('Musical interests'), $r[0]['music']],
+			'$music' => ['music', L10n::t('Musical interests'), $r[0]['music']],
-			'$book' => ['book', t('Books, literature'), $r[0]['book']],
+			'$book' => ['book', L10n::t('Books, literature'), $r[0]['book']],
-			'$tv' => ['tv', t('Television'), $r[0]['tv']],
+			'$tv' => ['tv', L10n::t('Television'), $r[0]['tv']],
-			'$film' => ['film', t('Film/dance/culture/entertainment'), $r[0]['film']],
+			'$film' => ['film', L10n::t('Film/dance/culture/entertainment'), $r[0]['film']],
-			'$interest' => ['interest', t('Hobbies/Interests'), $r[0]['interest']],
+			'$interest' => ['interest', L10n::t('Hobbies/Interests'), $r[0]['interest']],
-			'$romance' => ['romance', t('Love/romance'), $r[0]['romance']],
+			'$romance' => ['romance', L10n::t('Love/romance'), $r[0]['romance']],
-			'$work' => ['work', t('Work/employment'), $r[0]['work']],
+			'$work' => ['work', L10n::t('Work/employment'), $r[0]['work']],
-			'$education' => ['education', t('School/education'), $r[0]['education']],
+			'$education' => ['education', L10n::t('School/education'), $r[0]['education']],
-			'$contact' => ['contact', t('Contact information and Social Networks'), $r[0]['contact']],
+			'$contact' => ['contact', L10n::t('Contact information and Social Networks'), $r[0]['contact']],
 		]);
 
 		$arr = ['profile' => $r[0], 'entry' => $o];
@@ -772,18 +772,18 @@ function profiles_content(App $a) {
 				$profiles .= replace_macros($tpl, [
 					'$photo'        => $a->remove_baseurl($rr['thumb']),
 					'$id'           => $rr['id'],
-					'$alt'          => t('Profile Image'),
+					'$alt'          => L10n::t('Profile Image'),
 					'$profile_name' => $rr['profile-name'],
-					'$visible'      => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>'
+					'$visible'      => (($rr['is-default']) ? '<strong>' . L10n::t('visible to everybody') . '</strong>'
-						: '<a href="'.'profperm/'.$rr['id'].'" />' . t('Edit visibility') . '</a>')
+						: '<a href="'.'profperm/'.$rr['id'].'" />' . L10n::t('Edit visibility') . '</a>')
 				]);
 			}
 
 			$tpl_header = get_markup_template('profile_listing_header.tpl');
 			$o .= replace_macros($tpl_header,[
-				'$header'      => t('Edit/Manage Profiles'),
+				'$header'      => L10n::t('Edit/Manage Profiles'),
-				'$chg_photo'   => t('Change profile photo'),
+				'$chg_photo'   => L10n::t('Change profile photo'),
-				'$cr_new'      => t('Create New Profile'),
+				'$cr_new'      => L10n::t('Create New Profile'),
 				'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
 				'$profiles'    => $profiles
 			]);

mod/profperm.php

@@ -106,11 +106,11 @@ function profperm_content(App $a) {
 					$ingroup[] = $member['id'];
 		}
 
-		$o .= '<h2>' . t('Profile Visibility Editor') . '</h2>';
+		$o .= '<h2>' . L10n::t('Profile Visibility Editor') . '</h2>';
 
-		$o .= '<h3>' . t('Profile') . ' \'' . $profile['profile-name'] . '\'</h3>';
+		$o .= '<h3>' . L10n::t('Profile') . ' \'' . $profile['profile-name'] . '\'</h3>';
 
-		$o .= '<div id="prof-edit-desc">' . t('Click on a contact to add or remove.') . '</div>';
+		$o .= '<div id="prof-edit-desc">' . L10n::t('Click on a contact to add or remove.') . '</div>';
 
 	}
 
@@ -119,7 +119,7 @@ function profperm_content(App $a) {
 		$o = '';
 
 	$o .= '<div id="prof-members-title">';
-	$o .= '<h3>' . t('Visible To') . '</h3>';
+	$o .= '<h3>' . L10n::t('Visible To') . '</h3>';
 	$o .= '</div>';
 	$o .= '<div id="prof-members">';
 
@@ -135,7 +135,7 @@ function profperm_content(App $a) {
 	$o .= '<hr id="prof-separator" />';
 
 	$o .= '<div id="prof-all-contcts-title">';
-	$o .= '<h3>' . t("All Contacts \x28with secure profile access\x29") . '</h3>';
+	$o .= '<h3>' . L10n::t("All Contacts \x28with secure profile access\x29") . '</h3>';
 	$o .= '</div>';
 	$o .= '<div id="prof-all-contacts">';
 

mod/register.php

@@ -93,18 +93,18 @@ function register_post(App $a)
 					$user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']);
 
 			if ($res) {
-				info(t('Registration successful. Please check your email for further instructions.') . EOL);
+				info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
 				goaway(System::baseUrl());
 			} else {
 				notice(
-					t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
+					L10n::t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
 						$user['email'],
 						$result['password'])
 					. EOL
 				);
 			}
 		} else {
-			info(t('Registration successful.') . EOL);
+			info(L10n::t('Registration successful.') . EOL);
 			goaway(System::baseUrl());
 		}
 	} elseif ($a->config['register_policy'] == REGISTER_APPROVE) {
@@ -156,7 +156,7 @@ function register_post(App $a)
 		User::sendRegisterPendingEmail(
 			$user['email'], $a->config['sitename'], $user['username']);
 
-		info(t('Your registration is pending approval by the site owner.') . EOL);
+		info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
 		goaway(System::baseUrl());
 	}
 
@@ -214,13 +214,13 @@ function register_content(App $a)
 		$oidlabel = '';
 	} else {
 		$oidhtml  = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
-		$fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
+		$fillwith = L10n::t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
-		$fillext  = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
+		$fillext  = L10n::t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
-		$oidlabel = t("Your OpenID \x28optional\x29: ");
+		$oidlabel = L10n::t("Your OpenID \x28optional\x29: ");
 	}
 
 	// I set this and got even more fake names than before...
-	$realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
+	$realpeople = ''; // L10n::t('Members of this network prefer to communicate with real people who use their real names.');
 
 	if (Config::get('system', 'publish_all')) {
 		$profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
@@ -228,11 +228,11 @@ function register_content(App $a)
 		$publish_tpl = get_markup_template("profile_publish.tpl");
 		$profile_publish = replace_macros($publish_tpl, [
 			'$instance' => 'reg',
-			'$pubdesc' => t('Include your profile in member directory?'),
+			'$pubdesc' => L10n::t('Include your profile in member directory?'),
 			'$yes_selected' => ' checked="checked" ',
 			'$no_selected' => '',
-			'$str_yes' => t('Yes'),
+			'$str_yes' => L10n::t('Yes'),
-			'$str_no' => t('No'),
+			'$str_no' => L10n::t('No'),
 		]);
 	}
 
@@ -253,34 +253,34 @@ function register_content(App $a)
 		'$oidhtml' => $oidhtml,
 		'$invitations' => Config::get('system', 'invitation_only'),
 		'$permonly'    => $a->config['register_policy'] == REGISTER_APPROVE,
-		'$permonlybox' => ['permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')],
+		'$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
-		'$invite_desc' => t('Membership on this site is by invitation only.'),
+		'$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
-		'$invite_label' => t('Your invitation ID: '),
+		'$invite_label' => L10n::t('Your invitation ID: '),
 		'$invite_id'  => $invite_id,
 		'$realpeople' => $realpeople,
-		'$regtitle'  => t('Registration'),
+		'$regtitle'  => L10n::t('Registration'),
 		'$registertext' => x($a->config, 'register_text') ? bbcode($a->config['register_text']) : "",
 		'$fillwith'  => $fillwith,
 		'$fillext'   => $fillext,
 		'$oidlabel'  => $oidlabel,
 		'$openid'    => $openid_url,
-		'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '),
+		'$namelabel' => L10n::t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '),
-		'$addrlabel' => t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'),
+		'$addrlabel' => L10n::t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'),
 		'$passwords' => $passwords,
-		'$password1' => ['password1', t('New Password:'), '', t('Leave empty for an auto generated password.')],
+		'$password1' => ['password1', L10n::t('New Password:'), '', L10n::t('Leave empty for an auto generated password.')],
-		'$password2' => ['confirm', t('Confirm:'), '', ''],
+		'$password2' => ['confirm', L10n::t('Confirm:'), '', ''],
-		'$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@%s</strong>\'.', $a->get_hostname()),
+		'$nickdesc'  => L10n::t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@%s</strong>\'.', $a->get_hostname()),
-		'$nicklabel' => t('Choose a nickname: '),
+		'$nicklabel' => L10n::t('Choose a nickname: '),
 		'$photo'     => $photo,
 		'$publish'   => $profile_publish,
-		'$regbutt'   => t('Register'),
+		'$regbutt'   => L10n::t('Register'),
 		'$username'  => $username,
 		'$email'     => $email,
 		'$nickname'  => $nickname,
 		'$license'   => $license,
 		'$sitename'  => $a->get_hostname(),
-		'$importh'   => t('Import'),
+		'$importh'   => L10n::t('Import'),
-		'$importt'   => t('Import your profile to this friendica instance'),
+		'$importt'   => L10n::t('Import your profile to this friendica instance'),
 		'$form_security_token' => get_form_security_token("register")
 	]);
 	return $o;

mod/removeme.php

@@ -1,6 +1,9 @@
 <?php
-
+/**
+ * @file mod/removeme.php
+ */
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Model\User;
 
@@ -49,10 +52,10 @@ function removeme_content(App $a)
 	$o .= replace_macros($tpl, [
 		'$basedir' => System::baseUrl(),
 		'$hash' => $hash,
-		'$title' => t('Remove My Account'),
+		'$title' => L10n::t('Remove My Account'),
-		'$desc' => t('This will completely remove your account. Once this has been done it is not recoverable.'),
+		'$desc' => L10n::t('This will completely remove your account. Once this has been done it is not recoverable.'),
-		'$passwd' => t('Please enter your password for verification:'),
+		'$passwd' => L10n::t('Please enter your password for verification:'),
-		'$submit' => t('Remove My Account')
+		'$submit' => L10n::t('Remove My Account')
 	]);
 
 	return $o;

mod/search.php

@@ -33,7 +33,7 @@ function search_saved_searches() {
 				'id'		=> $rr['id'],
 				'term'		=> $rr['term'],
 				'encodedterm'	=> urlencode($rr['term']),
-				'delete'	=> t('Remove term'),
+				'delete'	=> L10n::t('Remove term'),
 				'selected'	=> ($search==$rr['term']),
 			];
 		}
@@ -42,7 +42,7 @@ function search_saved_searches() {
 		$tpl = get_markup_template("saved_searches_aside.tpl");
 
 		$o .= replace_macros($tpl, [
-			'$title'	=> t('Saved Searches'),
+			'$title'	=> L10n::t('Saved Searches'),
 			'$add'		=> '',
 			'$searchbox'	=> '',
 			'$saved' 	=> $saved,
@@ -100,8 +100,8 @@ function search_content(App $a) {
 
 	if (Config::get('system','local_search') && !local_user() && !remote_user()) {
 		http_status_exit(403,
-				["title" => t("Public access denied."),
+				["title" => L10n::t("Public access denied."),
-					"description" => t("Only logged in users are permitted to perform a search.")]);
+					"description" => L10n::t("Only logged in users are permitted to perform a search.")]);
 		killme();
 		//notice(L10n::t('Public access denied.').EOL);
 		//return;
@@ -125,8 +125,8 @@ function search_content(App $a) {
 			$resultdata = json_decode($result);
 			if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) {
 				http_status_exit(429,
-						["title" => t("Too Many Requests"),
+						["title" => L10n::t("Too Many Requests"),
-							"description" => t("Only one search per minute is permitted for not logged in users.")]);
+							"description" => L10n::t("Only one search per minute is permitted for not logged in users.")]);
 				killme();
 			}
 			Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), CACHE_HOUR);
@@ -151,7 +151,7 @@ function search_content(App $a) {
 	// contruct a wrapper for the search header
 	$o .= replace_macros(get_markup_template("content_wrapper.tpl"),[
 		'name' => "search-header",
-		'$title' => t("Search"),
+		'$title' => L10n::t("Search"),
 		'$title_size' => 3,
 		'$content' => search($search,'search-box','search',((local_user()) ? true : false), false)
 	]);
@@ -227,9 +227,9 @@ function search_content(App $a) {
 
 
 	if ($tag)
-		$title = sprintf( t('Items tagged with: %s'), $search);
+		$title = sprintf(L10n::t('Items tagged with: %s'), $search);
 	else
-		$title = sprintf( t('Results for: %s'), $search);
+		$title = sprintf(L10n::t('Results for: %s'), $search);
 
 	$o .= replace_macros(get_markup_template("section_title.tpl"),[
 		'$title' => $title

mod/settings.php

@@ -43,12 +43,12 @@ function settings_init(App $a)
 
 	$tpl = get_markup_template('settings/head.tpl');
 	$a->page['htmlhead'] .= replace_macros($tpl, [
-		'$ispublic' => t('everybody')
+		'$ispublic' => L10n::t('everybody')
 	]);
 
 	$tabs = [
 		[
-			'label'	=> t('Account'),
+			'label'	=> L10n::t('Account'),
 			'url' 	=> 'settings',
 			'selected'	=>  (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
 			'accesskey' => 'o',
@@ -57,7 +57,7 @@ function settings_init(App $a)
 
 	if (Feature::get()) {
 		$tabs[] =	[
-					'label'	=> t('Additional features'),
+					'label'	=> L10n::t('Additional features'),
 					'url' 	=> 'settings/features',
 					'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
 					'accesskey' => 't',
@@ -65,49 +65,49 @@ function settings_init(App $a)
 	}
 
 	$tabs[] =	[
-		'label'	=> t('Display'),
+		'label'	=> L10n::t('Display'),
 		'url' 	=> 'settings/display',
 		'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
 		'accesskey' => 'i',
 	];
 
 	$tabs[] =	[
-		'label'	=> t('Social Networks'),
+		'label'	=> L10n::t('Social Networks'),
 		'url' 	=> 'settings/connectors',
 		'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
 		'accesskey' => 'w',
 	];
 
 	$tabs[] =	[
-		'label'	=> t('Addons'),
+		'label'	=> L10n::t('Addons'),
 		'url' 	=> 'settings/addon',
 		'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
 		'accesskey' => 'l',
 	];
 
 	$tabs[] =	[
-		'label'	=> t('Delegations'),
+		'label'	=> L10n::t('Delegations'),
 		'url' 	=> 'delegate',
 		'selected'	=> (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
 		'accesskey' => 'd',
 	];
 
 	$tabs[] =	[
-		'label' => t('Connected apps'),
+		'label' => L10n::t('Connected apps'),
 		'url' => 'settings/oauth',
 		'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
 		'accesskey' => 'b',
 	];
 
 	$tabs[] =	[
-		'label' => t('Export personal data'),
+		'label' => L10n::t('Export personal data'),
 		'url' => 'uexport',
 		'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
 		'accesskey' => 'e',
 	];
 
 	$tabs[] =	[
-		'label' => t('Remove account'),
+		'label' => L10n::t('Remove account'),
 		'url' => 'removeme',
 		'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
 		'accesskey' => 'r',
@@ -116,7 +116,7 @@ function settings_init(App $a)
 
 	$tabtpl = get_markup_template("generic_links_widget.tpl");
 	$a->page['aside'] = replace_macros($tabtpl, [
-		'$title' => t('Settings'),
+		'$title' => L10n::t('Settings'),
 		'$class' => 'settings-widget',
 		'$items' => $tabs,
 	]);
@@ -163,7 +163,7 @@ function settings_post(App $a)
 		if ($name == "" || $key == "" || $secret == "") {
 			notice(L10n::t("Missing some important data!"));
 		} else {
-			if ($_POST['submit']==t("Update")) {
+			if ($_POST['submit'] == L10n::t("Update")) {
 				q("UPDATE clients SET
 							client_id='%s',
 							pw='%s',
@@ -277,7 +277,7 @@ function settings_post(App $a)
 					}
 				}
 				if (!$failed) {
-					info(t('Email settings updated.') . EOL);
+					info(L10n::t('Email settings updated.') . EOL);
 				}
 			}
 		}
@@ -293,7 +293,7 @@ function settings_post(App $a)
 				PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
 			}
 		}
-		info(t('Features updated') . EOL);
+		info(L10n::t('Features updated') . EOL);
 		return;
 	}
 
@@ -365,7 +365,7 @@ function settings_post(App $a)
 
 	if (x($_POST,'resend_relocate')) {
 		Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
-		info(t("Relocate message has been send to your contacts"));
+		info(L10n::t("Relocate message has been send to your contacts"));
 		goaway('settings');
 	}
 
@@ -395,7 +395,7 @@ function settings_post(App $a)
 		if (!$err) {
 			$result = User::updatePassword(local_user(), $newpass);
 			if (DBM::is_result($result)) {
-				info(t('Password changed.') . EOL);
+				info(L10n::t('Password changed.') . EOL);
 			} else {
 				notice(L10n::t('Password update failed. Please try again.') . EOL);
 			}
@@ -487,10 +487,10 @@ function settings_post(App $a)
 	if ($username != $a->user['username']) {
 		$name_change = true;
 		if (strlen($username) > 40) {
-			$err .= t(' Please use a shorter name.');
+			$err .= L10n::t(' Please use a shorter name.');
 		}
 		if (strlen($username) < 3) {
-			$err .= t(' Name too short.');
+			$err .= L10n::t(' Name too short.');
 		}
 	}
 
@@ -498,19 +498,19 @@ function settings_post(App $a)
 		$email_changed = true;
 		//  check for the correct password
 		if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
-			$err .= t('Wrong Password') . EOL;
+			$err .= L10n::t('Wrong Password') . EOL;
 			$email = $a->user['email'];
 		}
 		//  check the email is valid
 		if (!valid_email($email)) {
-			$err .= t('Invalid email.');
+			$err .= L10n::t('Invalid email.');
 		}
 		//  ensure new email is not the admin mail
 		//if ((x($a->config, 'admin_email')) && (strcasecmp($email, $a->config['admin_email']) == 0)) {
 		if (x($a->config, 'admin_email')) {
 			$adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
 			if (in_array(strtolower($email), $adminlist)) {
-				$err .= t('Cannot change to that email.');
+				$err .= L10n::t('Cannot change to that email.');
 				$email = $a->user['email'];
 			}
 		}
@@ -564,7 +564,7 @@ function settings_post(App $a)
 		$hidewall = 1;
 		if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) {
 			if ($def_gid) {
-				info(t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
+				info(L10n::t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
 				$str_group_allow = '<' . $def_gid . '>';
 			} else {
 				notice(L10n::t('Private forum has no privacy permissions and no default privacy group.') . EOL);
@@ -607,7 +607,7 @@ function settings_post(App $a)
 			intval(local_user())
 	);
 	if (DBM::is_result($r)) {
-		info(t('Settings updated.') . EOL);
+		info(L10n::t('Settings updated.') . EOL);
 	}
 
 	// clear session language
@@ -673,14 +673,14 @@ function settings_content(App $a)
 			$tpl = get_markup_template('settings/oauth_edit.tpl');
 			$o .= replace_macros($tpl, [
 				'$form_security_token' => get_form_security_token("settings_oauth"),
-				'$title'	=> t('Add application'),
+				'$title'	=> L10n::t('Add application'),
-				'$submit'	=> t('Save Settings'),
+				'$submit'	=> L10n::t('Save Settings'),
-				'$cancel'	=> t('Cancel'),
+				'$cancel'	=> L10n::t('Cancel'),
-				'$name'		=> ['name', t('Name'), '', ''],
+				'$name'		=> ['name', L10n::t('Name'), '', ''],
-				'$key'		=> ['key', t('Consumer Key'), '', ''],
+				'$key'		=> ['key', L10n::t('Consumer Key'), '', ''],
-				'$secret'	=> ['secret', t('Consumer Secret'), '', ''],
+				'$secret'	=> ['secret', L10n::t('Consumer Secret'), '', ''],
-				'$redirect'	=> ['redirect', t('Redirect'), '', ''],
+				'$redirect'	=> ['redirect', L10n::t('Redirect'), '', ''],
-				'$icon'		=> ['icon', t('Icon url'), '', ''],
+				'$icon'		=> ['icon', L10n::t('Icon url'), '', ''],
 			]);
 			return $o;
 		}
@@ -699,14 +699,14 @@ function settings_content(App $a)
 			$tpl = get_markup_template('settings/oauth_edit.tpl');
 			$o .= replace_macros($tpl, [
 				'$form_security_token' => get_form_security_token("settings_oauth"),
-				'$title'	=> t('Add application'),
+				'$title'	=> L10n::t('Add application'),
-				'$submit'	=> t('Update'),
+				'$submit'	=> L10n::t('Update'),
-				'$cancel'	=> t('Cancel'),
+				'$cancel'	=> L10n::t('Cancel'),
-				'$name'		=> ['name', t('Name'), $app['name'] , ''],
+				'$name'		=> ['name', L10n::t('Name'), $app['name'] , ''],
-				'$key'		=> ['key', t('Consumer Key'), $app['client_id'], ''],
+				'$key'		=> ['key', L10n::t('Consumer Key'), $app['client_id'], ''],
-				'$secret'	=> ['secret', t('Consumer Secret'), $app['pw'], ''],
+				'$secret'	=> ['secret', L10n::t('Consumer Secret'), $app['pw'], ''],
-				'$redirect'	=> ['redirect', t('Redirect'), $app['redirect_uri'], ''],
+				'$redirect'	=> ['redirect', L10n::t('Redirect'), $app['redirect_uri'], ''],
-				'$icon'		=> ['icon', t('Icon url'), $app['icon'], ''],
+				'$icon'		=> ['icon', L10n::t('Icon url'), $app['icon'], ''],
 			]);
 			return $o;
 		}
@@ -734,13 +734,13 @@ function settings_content(App $a)
 		$o .= replace_macros($tpl, [
 			'$form_security_token' => get_form_security_token("settings_oauth"),
 			'$baseurl'	=> System::baseUrl(true),
-			'$title'	=> t('Connected Apps'),
+			'$title'	=> L10n::t('Connected Apps'),
-			'$add'		=> t('Add application'),
+			'$add'		=> L10n::t('Add application'),
-			'$edit'		=> t('Edit'),
+			'$edit'		=> L10n::t('Edit'),
-			'$delete'		=> t('Delete'),
+			'$delete'		=> L10n::t('Delete'),
-			'$consumerkey' => t('Client key starts with'),
+			'$consumerkey' => L10n::t('Client key starts with'),
-			'$noname'	=> t('No name'),
+			'$noname'	=> L10n::t('No name'),
-			'$remove'	=> t('Remove authorization'),
+			'$remove'	=> L10n::t('Remove authorization'),
 			'$apps'		=> $r,
 		]);
 		return $o;
@@ -751,7 +751,7 @@ function settings_content(App $a)
 
 		$r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
 		if (!DBM::is_result($r)) {
-			$settings_addons = t('No Addon settings configured');
+			$settings_addons = L10n::t('No Addon settings configured');
 		}
 
 		Addon::callHooks('addon_settings', $settings_addons);
@@ -760,7 +760,7 @@ function settings_content(App $a)
 		$tpl = get_markup_template('settings/addons.tpl');
 		$o .= replace_macros($tpl, [
 			'$form_security_token' => get_form_security_token("settings_addon"),
-			'$title'	=> t('Addon Settings'),
+			'$title'	=> L10n::t('Addon Settings'),
 			'$settings_addons' => $settings_addons
 		]);
 		return $o;
@@ -774,16 +774,16 @@ function settings_content(App $a)
 			$arr[$fname] = [];
 			$arr[$fname][0] = $fdata[0];
 			foreach (array_slice($fdata,1) as $f) {
-				$arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[t('Off'), t('On')]];
+				$arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[L10n::t('Off'), L10n::t('On')]];
 			}
 		}
 
 		$tpl = get_markup_template('settings/features.tpl');
 		$o .= replace_macros($tpl, [
 			'$form_security_token' => get_form_security_token("settings_features"),
-			'$title'               => t('Additional Features'),
+			'$title'               => L10n::t('Additional Features'),
 			'$features'            => $arr,
-			'$submit'              => t('Save Settings'),
+			'$submit'              => L10n::t('Save Settings'),
 		]);
 		return $o;
 	}
@@ -803,8 +803,8 @@ function settings_content(App $a)
 		Addon::callHooks('connector_settings', $settings_connectors);
 
 		if (is_site_admin()) {
-			$diasp_enabled = t('Built-in support for %s connectivity is %s', t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? t('enabled') : t('disabled')));
+			$diasp_enabled = L10n::t('Built-in support for %s connectivity is %s', L10n::t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? L10n::t('enabled') : L10n::t('disabled')));
-			$ostat_enabled = t('Built-in support for %s connectivity is %s', t('GNU Social (OStatus)'), ((Config::get('system', 'ostatus_disabled')) ? t('disabled') : t('enabled')));
+			$ostat_enabled = L10n::t('Built-in support for %s connectivity is %s', L10n::t('GNU Social (OStatus)'), ((Config::get('system', 'ostatus_disabled')) ? L10n::t('disabled') : L10n::t('enabled')));
 		} else {
 			$diasp_enabled = "";
 			$ostat_enabled = "";
@@ -835,41 +835,41 @@ function settings_content(App $a)
 
 		$tpl = get_markup_template('settings/connectors.tpl');
 
-		$mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
+		$mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
 
 		$o .= replace_macros($tpl, [
 			'$form_security_token' => get_form_security_token("settings_connectors"),
 
-			'$title'	=> t('Social Networks'),
+			'$title'	=> L10n::t('Social Networks'),
 
 			'$diasp_enabled' => $diasp_enabled,
 			'$ostat_enabled' => $ostat_enabled,
 
-			'$general_settings' => t('General Social Media Settings'),
+			'$general_settings' => L10n::t('General Social Media Settings'),
-			'$no_intelligent_shortening' => ['no_intelligent_shortening', t('Disable intelligent shortening'), $no_intelligent_shortening, t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
+			'$no_intelligent_shortening' => ['no_intelligent_shortening', L10n::t('Disable intelligent shortening'), $no_intelligent_shortening, L10n::t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
-			'$ostatus_autofriend' => ['snautofollow', t('Automatically follow any GNU Social (OStatus) followers/mentioners'), $ostatus_autofriend, t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
+			'$ostatus_autofriend' => ['snautofollow', L10n::t('Automatically follow any GNU Social (OStatus) followers/mentioners'), $ostatus_autofriend, L10n::t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
-			'$default_group' => Group::displayGroupSelection(local_user(), $default_group, t("Default group for OStatus contacts")),
+			'$default_group' => Group::displayGroupSelection(local_user(), $default_group, L10n::t("Default group for OStatus contacts")),
-			'$legacy_contact' => ['legacy_contact', t('Your legacy GNU Social account'), $legacy_contact, t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.')],
+			'$legacy_contact' => ['legacy_contact', L10n::t('Your legacy GNU Social account'), $legacy_contact, L10n::t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.')],
 
 			'$repair_ostatus_url' => System::baseUrl() . '/repair_ostatus',
-			'$repair_ostatus_text' => t('Repair OStatus subscriptions'),
+			'$repair_ostatus_text' => L10n::t('Repair OStatus subscriptions'),
 
 			'$settings_connectors' => $settings_connectors,
 
-			'$h_imap' => t('Email/Mailbox Setup'),
+			'$h_imap' => L10n::t('Email/Mailbox Setup'),
-			'$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+			'$imap_desc' => L10n::t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
-			'$imap_lastcheck' => ['imap_lastcheck', t('Last successful email check:'), $mail_chk, ''],
+			'$imap_lastcheck' => ['imap_lastcheck', L10n::t('Last successful email check:'), $mail_chk, ''],
 			'$mail_disabled' => $mail_disabled_message,
-			'$mail_server'	=> ['mail_server',  t('IMAP server name:'), $mail_server, ''],
+			'$mail_server'	=> ['mail_server',  L10n::t('IMAP server name:'), $mail_server, ''],
-			'$mail_port'	=> ['mail_port', 	 t('IMAP port:'), $mail_port, ''],
+			'$mail_port'	=> ['mail_port', 	 L10n::t('IMAP port:'), $mail_port, ''],
-			'$mail_ssl'		=> ['mail_ssl', 	 t('Security:'), strtoupper($mail_ssl), '', ['notls'=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL']],
+			'$mail_ssl'		=> ['mail_ssl', 	 L10n::t('Security:'), strtoupper($mail_ssl), '', ['notls'=>L10n::t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL']],
-			'$mail_user'	=> ['mail_user',    t('Email login name:'), $mail_user, ''],
+			'$mail_user'	=> ['mail_user',    L10n::t('Email login name:'), $mail_user, ''],
-			'$mail_pass'	=> ['mail_pass', 	 t('Email password:'), '', ''],
+			'$mail_pass'	=> ['mail_pass', 	 L10n::t('Email password:'), '', ''],
-			'$mail_replyto'	=> ['mail_replyto', t('Reply-to address:'), $mail_replyto, 'Optional'],
+			'$mail_replyto'	=> ['mail_replyto', L10n::t('Reply-to address:'), $mail_replyto, 'Optional'],
-			'$mail_pubmail'	=> ['mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''],
+			'$mail_pubmail'	=> ['mail_pubmail', L10n::t('Send public posts to all email contacts:'), $mail_pubmail, ''],
-			'$mail_action'	=> ['mail_action',	 t('Action after import:'), $mail_action, '', [0=>t('None'), /*1=>t('Delete'),*/ 2=>t('Mark as seen'), 3=>t('Move to folder')]],
+			'$mail_action'	=> ['mail_action',	 L10n::t('Action after import:'), $mail_action, '', [0=>L10n::t('None'), /*1=>L10n::t('Delete'),*/ 2=>L10n::t('Mark as seen'), 3=>L10n::t('Move to folder')]],
-			'$mail_movetofolder'	=> ['mail_movetofolder',	 t('Move to folder:'), $mail_movetofolder, ''],
+			'$mail_movetofolder'	=> ['mail_movetofolder',	 L10n::t('Move to folder:'), $mail_movetofolder, ''],
-			'$submit' => t('Save Settings'),
+			'$submit' => L10n::t('Save Settings'),
 		]);
 
 		Addon::callHooks('display_settings', $o);
@@ -902,7 +902,7 @@ function settings_content(App $a)
 
 
 		$themes = [];
-		$mobile_themes = ["---" => t('No special theme for mobile devices')];
+		$mobile_themes = ["---" => L10n::t('No special theme for mobile devices')];
 		if ($allowed_themes) {
 			foreach ($allowed_themes as $theme) {
 				$is_experimental = file_exists('view/theme/' . $theme . '/experimental');
@@ -911,9 +911,9 @@ function settings_content(App $a)
 				if (!$is_experimental || ($is_experimental && (Config::get('experimentals', 'exp_themes')==1 || is_null(Config::get('experimentals', 'exp_themes'))))) {
 					$theme_name = ucfirst($theme);
 					if ($is_unsupported) {
-						$theme_name = t("%s - (Unsupported)", $theme_name);
+						$theme_name = L10n::t("%s - (Unsupported)", $theme_name);
 					} elseif ($is_experimental) {
-						$theme_name = t("%s - (Experimental)", $theme_name);
+						$theme_name = L10n::t("%s - (Experimental)", $theme_name);
 					}
 					if ($is_mobile) {
 						$mobile_themes[$theme] = $theme_name;
@@ -940,7 +940,7 @@ function settings_content(App $a)
 
 		$nosmile = PConfig::get(local_user(), 'system', 'no_smilies', 0);
 		$first_day_of_week = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
-		$weekdays = [0 => t("Sunday"), 1 => t("Monday")];
+		$weekdays = [0 => L10n::t("Sunday"), 1 => L10n::t("Monday")];
 
 		$noinfo = PConfig::get(local_user(), 'system', 'ignore_info', 0);
 		$infinite_scroll = PConfig::get(local_user(), 'system', 'infinite_scroll', 0);
@@ -956,37 +956,37 @@ function settings_content(App $a)
 
 		$tpl = get_markup_template('settings/display.tpl');
 		$o = replace_macros($tpl, [
-			'$ptitle' 	=> t('Display Settings'),
+			'$ptitle' 	=> L10n::t('Display Settings'),
 			'$form_security_token' => get_form_security_token("settings_display"),
-			'$submit' 	=> t('Save Settings'),
+			'$submit' 	=> L10n::t('Save Settings'),
 			'$baseurl' => System::baseUrl(true),
 			'$uid' => local_user(),
 
-			'$theme'	=> ['theme', t('Display Theme:'), $theme_selected, '', $themes, true],
+			'$theme'	=> ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes, true],
-			'$mobile_theme'	=> ['mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
+			'$mobile_theme'	=> ['mobile_theme', L10n::t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
-			'$nowarn_insecure' => ['nowarn_insecure',  t('Suppress warning of insecure networks'), $nowarn_insecure, t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")],
+			'$nowarn_insecure' => ['nowarn_insecure',  L10n::t('Suppress warning of insecure networks'), $nowarn_insecure, L10n::t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")],
-			'$ajaxint'   => ['browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds. Enter -1 to disable it.')],
+			'$ajaxint'   => ['browser_update',  L10n::t("Update browser every xx seconds"), $browser_update, L10n::t('Minimum of 10 seconds. Enter -1 to disable it.')],
-			'$itemspage_network'   => ['itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')],
+			'$itemspage_network'   => ['itemspage_network',  L10n::t("Number of items to display per page:"), $itemspage_network, L10n::t('Maximum of 100 items')],
-			'$itemspage_mobile_network'   => ['itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')],
+			'$itemspage_mobile_network'   => ['itemspage_mobile_network',  L10n::t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, L10n::t('Maximum of 100 items')],
-			'$nosmile'	=> ['nosmile', t("Don't show emoticons"), $nosmile, ''],
+			'$nosmile'	=> ['nosmile', L10n::t("Don't show emoticons"), $nosmile, ''],
-			'$calendar_title' => t('Calendar'),
+			'$calendar_title' => L10n::t('Calendar'),
-			'$first_day_of_week'	=> ['first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
+			'$first_day_of_week'	=> ['first_day_of_week', L10n::t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
-			'$noinfo'	=> ['noinfo', t("Don't show notices"), $noinfo, ''],
+			'$noinfo'	=> ['noinfo', L10n::t("Don't show notices"), $noinfo, ''],
-			'$infinite_scroll'	=> ['infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''],
+			'$infinite_scroll'	=> ['infinite_scroll', L10n::t("Infinite scroll"), $infinite_scroll, ''],
-			'$no_auto_update'	=> ['no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, t('When disabled, the network page is updated all the time, which could be confusing while reading.')],
+			'$no_auto_update'	=> ['no_auto_update', L10n::t("Automatic updates only at the top of the network page"), $no_auto_update, L10n::t('When disabled, the network page is updated all the time, which could be confusing while reading.')],
-			'$bandwidth_saver' => ['bandwidth_saver', t('Bandwith Saver Mode'), $bandwidth_saver, t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')],
+			'$bandwidth_saver' => ['bandwidth_saver', L10n::t('Bandwith Saver Mode'), $bandwidth_saver, L10n::t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')],
-			'$smart_threading' => ['smart_threading', t('Smart Threading'), $smart_threading, t('When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled.')],
+			'$smart_threading' => ['smart_threading', L10n::t('Smart Threading'), $smart_threading, L10n::t('When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled.')],
 
-			'$d_tset' => t('General Theme Settings'),
+			'$d_tset' => L10n::t('General Theme Settings'),
-			'$d_ctset' => t('Custom Theme Settings'),
+			'$d_ctset' => L10n::t('Custom Theme Settings'),
-			'$d_cset' => t('Content Settings'),
+			'$d_cset' => L10n::t('Content Settings'),
-			'stitle' => t('Theme settings'),
+			'stitle' => L10n::t('Theme settings'),
 			'$theme_config' => $theme_config,
 		]);
 
 		$tpl = get_markup_template('settings/display_end.tpl');
 		$a->page['end'] .= replace_macros($tpl, [
-			'$theme'	=> ['theme', t('Display Theme:'), $theme_selected, '', $themes]
+			'$theme'	=> ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes]
 		]);
 
 		return $o;
@@ -1043,49 +1043,49 @@ function settings_content(App $a)
 	$pageset_tpl = get_markup_template('settings/pagetypes.tpl');
 
 	$pagetype = replace_macros($pageset_tpl, [
-		'$account_types'	=> t("Account Types"),
+		'$account_types'	=> L10n::t("Account Types"),
-		'$user' 		=> t("Personal Page Subtypes"),
+		'$user' 		=> L10n::t("Personal Page Subtypes"),
-		'$community'		=> t("Community Forum Subtypes"),
+		'$community'		=> L10n::t("Community Forum Subtypes"),
 		'$account_type'		=> $a->user['account-type'],
 		'$type_person'		=> ACCOUNT_TYPE_PERSON,
 		'$type_organisation' 	=> ACCOUNT_TYPE_ORGANISATION,
 		'$type_news'		=> ACCOUNT_TYPE_NEWS,
 		'$type_community' 	=> ACCOUNT_TYPE_COMMUNITY,
 
-		'$account_person' 	=> ['account-type', t('Personal Page'), ACCOUNT_TYPE_PERSON,
+		'$account_person' 	=> ['account-type', L10n::t('Personal Page'), ACCOUNT_TYPE_PERSON,
-									t('Account for a personal profile.'),
+									L10n::t('Account for a personal profile.'),
 									($a->user['account-type'] == ACCOUNT_TYPE_PERSON)],
 
-		'$account_organisation'	=> ['account-type', t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
+		'$account_organisation'	=> ['account-type', L10n::t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
-									t('Account for an organisation that automatically approves contact requests as "Followers".'),
+									L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'),
 									($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)],
 
-		'$account_news'		=> ['account-type', t('News Page'), ACCOUNT_TYPE_NEWS,
+		'$account_news'		=> ['account-type', L10n::t('News Page'), ACCOUNT_TYPE_NEWS,
-									t('Account for a news reflector that automatically approves contact requests as "Followers".'),
+									L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'),
 									($a->user['account-type'] == ACCOUNT_TYPE_NEWS)],
 
-		'$account_community' 	=> ['account-type', t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
+		'$account_community' 	=> ['account-type', L10n::t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
-									t('Account for community discussions.'),
+									L10n::t('Account for community discussions.'),
 									($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)],
 
-		'$page_normal'		=> ['page-flags', t('Normal Account Page'), PAGE_NORMAL,
+		'$page_normal'		=> ['page-flags', L10n::t('Normal Account Page'), PAGE_NORMAL,
-									t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
+									L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
 									($a->user['page-flags'] == PAGE_NORMAL)],
 
-		'$page_soapbox' 	=> ['page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
+		'$page_soapbox' 	=> ['page-flags', L10n::t('Soapbox Page'), PAGE_SOAPBOX,
-									t('Account for a public profile that automatically approves contact requests as "Followers".'),
+									L10n::t('Account for a public profile that automatically approves contact requests as "Followers".'),
 									($a->user['page-flags'] == PAGE_SOAPBOX)],
 
-		'$page_community'	=> ['page-flags', t('Public Forum'), PAGE_COMMUNITY,
+		'$page_community'	=> ['page-flags', L10n::t('Public Forum'), PAGE_COMMUNITY,
-									t('Automatically approves all contact requests.'),
+									L10n::t('Automatically approves all contact requests.'),
 									($a->user['page-flags'] == PAGE_COMMUNITY)],
 
-		'$page_freelove' 	=> ['page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
+		'$page_freelove' 	=> ['page-flags', L10n::t('Automatic Friend Page'), PAGE_FREELOVE,
-									t('Account for a popular profile that automatically approves contact requests as "Friends".'),
+									L10n::t('Account for a popular profile that automatically approves contact requests as "Friends".'),
 									($a->user['page-flags'] == PAGE_FREELOVE)],
 
-		'$page_prvgroup' 	=> ['page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
+		'$page_prvgroup' 	=> ['page-flags', L10n::t('Private Forum [Experimental]'), PAGE_PRVGROUP,
-									t('Requires manual approval of contact requests.'),
+									L10n::t('Requires manual approval of contact requests.'),
 									($a->user['page-flags'] == PAGE_PRVGROUP)],
 
 
@@ -1096,7 +1096,7 @@ function settings_content(App $a)
 	if ($noid) {
 		$openid_field = false;
 	} else {
-		$openid_field = ['openid_url', t('OpenID:'), $openid, t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url"];
+		$openid_field = ['openid_url', L10n::t('OpenID:'), $openid, L10n::t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url"];
 	}
 
 	$opt_tpl = get_markup_template("field_yesno.tpl");
@@ -1104,64 +1104,64 @@ function settings_content(App $a)
 		$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
 	} else {
 		$profile_in_dir = replace_macros($opt_tpl, [
-			'$field' => ['profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), [t('No'), t('Yes')]]
+			'$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t("Your profile may be visible in public."), [L10n::t('No'), L10n::t('Yes')]]
 		]);
 	}
 
 	if (strlen(Config::get('system', 'directory'))) {
 		$profile_in_net_dir = replace_macros($opt_tpl, [
-			'$field' => ['profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', [t('No'), t('Yes')]]
+			'$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', [L10n::t('No'), L10n::t('Yes')]]
 		]);
 	} else {
 		$profile_in_net_dir = '';
 	}
 
 	$hide_friends = replace_macros($opt_tpl, [
-		'$field' => ['hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', [t('No'), t('Yes')]],
+		'$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', [L10n::t('No'), L10n::t('Yes')]],
 	]);
 
 	$hide_wall = replace_macros($opt_tpl, [
-		'$field' => ['hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), [t('No'), t('Yes')]],
+		'$field' => ['hidewall', L10n::t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], L10n::t("If enabled, posting public messages to Diaspora and other networks isn't possible."), [L10n::t('No'), L10n::t('Yes')]],
 	]);
 
 	$blockwall = replace_macros($opt_tpl, [
-		'$field' => ['blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', [t('No'), t('Yes')]],
+		'$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', [L10n::t('No'), L10n::t('Yes')]],
 	]);
 
 	$blocktags = replace_macros($opt_tpl, [
-		'$field' => ['blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', [t('No'), t('Yes')]],
+		'$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', [L10n::t('No'), L10n::t('Yes')]],
 	]);
 
 	$suggestme = replace_macros($opt_tpl, [
-		'$field' => ['suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', [t('No'), t('Yes')]],
+		'$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', [L10n::t('No'), L10n::t('Yes')]],
 	]);
 
 	$unkmail = replace_macros($opt_tpl, [
-		'$field' => ['unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', [t('No'), t('Yes')]],
+		'$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, '', [L10n::t('No'), L10n::t('Yes')]],
 	]);
 
 	if (!$profile['publish'] && !$profile['net-publish']) {
-		info(t('Profile is <strong>not published</strong>.') . EOL);
+		info(L10n::t('Profile is <strong>not published</strong>.') . EOL);
 	}
 
 	$tpl_addr = get_markup_template('settings/nick_set.tpl');
 
 	$prof_addr = replace_macros($tpl_addr,[
-		'$desc' => t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname),
+		'$desc' => L10n::t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname),
 		'$basepath' => $a->get_hostname()
 	]);
 
 	$stpl = get_markup_template('settings/settings.tpl');
 
 	$expire_arr = [
-		'days' => ['expire',  t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')],
+		'days' => ['expire',  L10n::t("Automatically expire posts after this many days:"), $expire, L10n::t('If empty, posts will not expire. Expired posts will be deleted')],
-		'advanced' => t('Advanced expiration settings'),
+		'advanced' => L10n::t('Advanced expiration settings'),
-		'label' => t('Advanced Expiration'),
+		'label' => L10n::t('Advanced Expiration'),
-		'items' => ['expire_items',  t("Expire posts:"), $expire_items, '', [t('No'), t('Yes')]],
+		'items' => ['expire_items',  L10n::t("Expire posts:"), $expire_items, '', [L10n::t('No'), L10n::t('Yes')]],
-		'notes' => ['expire_notes',  t("Expire personal notes:"), $expire_notes, '', [t('No'), t('Yes')]],
+		'notes' => ['expire_notes',  L10n::t("Expire personal notes:"), $expire_notes, '', [L10n::t('No'), L10n::t('Yes')]],
-		'starred' => ['expire_starred',  t("Expire starred posts:"), $expire_starred, '', [t('No'), t('Yes')]],
+		'starred' => ['expire_starred',  L10n::t("Expire starred posts:"), $expire_starred, '', [L10n::t('No'), L10n::t('Yes')]],
-		'photos' => ['expire_photos',  t("Expire photos:"), $expire_photos, '', [t('No'), t('Yes')]],
+		'photos' => ['expire_photos',  L10n::t("Expire photos:"), $expire_photos, '', [L10n::t('No'), L10n::t('Yes')]],
-		'network_only' => ['expire_network_only',  t("Only expire posts by others:"), $expire_network_only, '', [t('No'), t('Yes')]],
+		'network_only' => ['expire_network_only',  L10n::t("Only expire posts by others:"), $expire_network_only, '', [L10n::t('No'), L10n::t('Yes')]],
 	];
 
 	$group_select = Group::displayGroupSelection(local_user(), $a->user['def_gid']);
@@ -1191,51 +1191,51 @@ function settings_content(App $a)
 
 	/// @TODO Fix indending (or so)
 	$o .= replace_macros($stpl, [
-		'$ptitle' 	=> t('Account Settings'),
+		'$ptitle' 	=> L10n::t('Account Settings'),
 
-		'$submit' 	=> t('Save Settings'),
+		'$submit' 	=> L10n::t('Save Settings'),
 		'$baseurl' => System::baseUrl(true),
 		'$uid' => local_user(),
 		'$form_security_token' => get_form_security_token("settings"),
 		'$nickname_block' => $prof_addr,
 
-		'$h_pass' 	=> t('Password Settings'),
+		'$h_pass' 	=> L10n::t('Password Settings'),
-		'$password1'=> ['password', t('New Password:'), '', ''],
+		'$password1'=> ['password', L10n::t('New Password:'), '', ''],
-		'$password2'=> ['confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')],
+		'$password2'=> ['confirm', L10n::t('Confirm:'), '', L10n::t('Leave password fields blank unless changing')],
-		'$password3'=> ['opassword', t('Current Password:'), '', t('Your current password to confirm the changes')],
+		'$password3'=> ['opassword', L10n::t('Current Password:'), '', L10n::t('Your current password to confirm the changes')],
-		'$password4'=> ['mpassword', t('Password:'), '', t('Your current password to confirm the changes')],
+		'$password4'=> ['mpassword', L10n::t('Password:'), '', L10n::t('Your current password to confirm the changes')],
 		'$oid_enable' => (!Config::get('system', 'no_openid')),
 		'$openid'	=> $openid_field,
 
-		'$h_basic' 	=> t('Basic Settings'),
+		'$h_basic' 	=> L10n::t('Basic Settings'),
-		'$username' => ['username',  t('Full Name:'), $username, ''],
+		'$username' => ['username',  L10n::t('Full Name:'), $username, ''],
-		'$email' 	=> ['email', t('Email Address:'), $email, '', '', '', 'email'],
+		'$email' 	=> ['email', L10n::t('Email Address:'), $email, '', '', '', 'email'],
-		'$timezone' => ['timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''],
+		'$timezone' => ['timezone_select' , L10n::t('Your Timezone:'), select_timezone($timezone), ''],
-		'$language' => ['language', t('Your Language:'), $language, t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],
+		'$language' => ['language', L10n::t('Your Language:'), $language, L10n::t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],
-		'$defloc'	=> ['defloc', t('Default Post Location:'), $defloc, ''],
+		'$defloc'	=> ['defloc', L10n::t('Default Post Location:'), $defloc, ''],
-		'$allowloc' => ['allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''],
+		'$allowloc' => ['allow_location', L10n::t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''],
 
 
-		'$h_prv' 	=> t('Security and Privacy Settings'),
+		'$h_prv' 	=> L10n::t('Security and Privacy Settings'),
 
-		'$maxreq' 	=> ['maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")],
+		'$maxreq' 	=> ['maxreq', L10n::t('Maximum Friend Requests/Day:'), $maxreq , L10n::t("\x28to prevent spam abuse\x29")],
-		'$permissions' => t('Default Post Permissions'),
+		'$permissions' => L10n::t('Default Post Permissions'),
-		'$permdesc' => t("\x28click to open/close\x29"),
+		'$permdesc' => L10n::t("\x28click to open/close\x29"),
 		'$visibility' => $profile['net-publish'],
 		'$aclselect' => populate_acl($a->user),
 		'$suggestme' => $suggestme,
-		'$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
+		'$blockwall'=> $blockwall, // array('blockwall', L10n::t('Allow friends to post to your profile page:'), !$blockwall, ''),
-		'$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
+		'$blocktags'=> $blocktags, // array('blocktags', L10n::t('Allow friends to tag your posts:'), !$blocktags, ''),
 
 		// ACL permissions box
-		'$group_perms' => t('Show to Groups'),
+		'$group_perms' => L10n::t('Show to Groups'),
-		'$contact_perms' => t('Show to Contacts'),
+		'$contact_perms' => L10n::t('Show to Contacts'),
-		'$private' => t('Default Private Post'),
+		'$private' => L10n::t('Default Private Post'),
-		'$public' => t('Default Public Post'),
+		'$public' => L10n::t('Default Public Post'),
 		'$is_private' => $private_post,
 		'$return_path' => $query_str,
 		'$public_link' => $public_post_link,
-		'$settings_perms' => t('Default Permissions for New Posts'),
+		'$settings_perms' => L10n::t('Default Permissions for New Posts'),
 
 		'$group_select' => $group_select,
 
@@ -1247,41 +1247,41 @@ function settings_content(App $a)
 		'$hide_friends' => $hide_friends,
 		'$hide_wall' => $hide_wall,
 		'$unkmail' => $unkmail,
-		'$cntunkmail' 	=> ['cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")],
+		'$cntunkmail' 	=> ['cntunkmail', L10n::t('Maximum private messages per day from unknown people:'), $cntunkmail , L10n::t("\x28to prevent spam abuse\x29")],
 
 
-		'$h_not' 	=> t('Notification Settings'),
+		'$h_not' 	=> L10n::t('Notification Settings'),
-		'$activity_options' => t('By default post a status message when:'),
+		'$activity_options' => L10n::t('By default post a status message when:'),
-		'$post_newfriend' => ['post_newfriend',  t('accepting a friend request'), $post_newfriend, ''],
+		'$post_newfriend' => ['post_newfriend',  L10n::t('accepting a friend request'), $post_newfriend, ''],
-		'$post_joingroup' => ['post_joingroup',  t('joining a forum/community'), $post_joingroup, ''],
+		'$post_joingroup' => ['post_joingroup',  L10n::t('joining a forum/community'), $post_joingroup, ''],
-		'$post_profilechange' => ['post_profilechange',  t('making an <em>interesting</em> profile change'), $post_profilechange, ''],
+		'$post_profilechange' => ['post_profilechange',  L10n::t('making an <em>interesting</em> profile change'), $post_profilechange, ''],
-		'$lbl_not' 	=> t('Send a notification email when:'),
+		'$lbl_not' 	=> L10n::t('Send a notification email when:'),
-		'$notify1'	=> ['notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''],
+		'$notify1'	=> ['notify1', L10n::t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''],
-		'$notify2'	=> ['notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''],
+		'$notify2'	=> ['notify2', L10n::t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''],
-		'$notify3'	=> ['notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
+		'$notify3'	=> ['notify3', L10n::t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
-		'$notify4'	=> ['notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
+		'$notify4'	=> ['notify4', L10n::t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
-		'$notify5'	=> ['notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
+		'$notify5'	=> ['notify5', L10n::t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
-		'$notify6'  => ['notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
+		'$notify6'  => ['notify6', L10n::t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
-		'$notify7'  => ['notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
+		'$notify7'  => ['notify7', L10n::t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
-		'$notify8'  => ['notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
+		'$notify8'  => ['notify8', L10n::t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
 
-		'$desktop_notifications' => ['desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')],
+		'$desktop_notifications' => ['desktop_notifications', L10n::t('Activate desktop notifications') , false, L10n::t('Show desktop popup on new notifications')],
 
-		'$email_textonly' => ['email_textonly', t('Text-only notification emails'),
+		'$email_textonly' => ['email_textonly', L10n::t('Text-only notification emails'),
 									PConfig::get(local_user(), 'system', 'email_textonly'),
-									t('Send text only notification emails, without the html part')],
+									L10n::t('Send text only notification emails, without the html part')],
 
-		'$detailed_notif' => ['detailed_notif', t('Show detailled notifications'),
+		'$detailed_notif' => ['detailed_notif', L10n::t('Show detailled notifications'),
 									PConfig::get(local_user(), 'system', 'detailed_notif'),
-									t('Per default the notificiation are condensed to a single notification per item. When enabled, every notification is displayed.')],
+									L10n::t('Per default the notificiation are condensed to a single notification per item. When enabled, every notification is displayed.')],
 
-		'$h_advn' => t('Advanced Account/Page Type Settings'),
+		'$h_advn' => L10n::t('Advanced Account/Page Type Settings'),
-		'$h_descadvn' => t('Change the behaviour of this account for special situations'),
+		'$h_descadvn' => L10n::t('Change the behaviour of this account for special situations'),
 		'$pagetype' => $pagetype,
 
-		'$relocate' => t('Relocate'),
+		'$relocate' => L10n::t('Relocate'),
-		'$relocate_text' => t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
+		'$relocate_text' => L10n::t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
-		'$relocate_button' => t("Resend relocate message to contacts"),
+		'$relocate_button' => L10n::t("Resend relocate message to contacts"),
 
 	]);
 

mod/subthread.php

@@ -1,13 +1,16 @@
 <?php
-
+/**
+ * @file mod/subthread.php
+ */
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once('include/security.php');
+require_once 'include/security.php';
-require_once('include/bbcode.php');
+require_once 'include/bbcode.php';
-require_once('include/items.php');
+require_once 'include/items.php';
 
 function subthread_content(App $a) {
 
@@ -89,7 +92,7 @@ function subthread_content(App $a) {
 
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 
-	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
+	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
@@ -105,7 +108,7 @@ function subthread_content(App $a) {
 		<content>$body</content>
 	</object>
 EOT;
-	$bodyverb = t('%1$s is following %2$s\'s %3$s');
+	$bodyverb = L10n::t('%1$s is following %2$s\'s %3$s');
 
 	if (! isset($bodyverb)) {
 		return;

mod/suggest.php

@@ -33,12 +33,12 @@ function suggest_init(App $a) {
 
 			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'get',
-				'$message' => t('Do you really want to delete this suggestion?'),
+				'$message' => L10n::t('Do you really want to delete this suggestion?'),
 				'$extra_inputs' => $inputs,
-				'$confirm' => t('Yes'),
+				'$confirm' => L10n::t('Yes'),
 				'$confirm_url' => $query['base'],
 				'$confirm_name' => 'confirmed',
-				'$cancel' => t('Cancel'),
+				'$cancel' => L10n::t('Cancel'),
 			]);
 			$a->error = 1; // Set $a->error so the other module functions don't execute
 			return;
@@ -70,7 +70,7 @@ function suggest_content(App $a) {
 	$r = GContact::suggestionQuery(local_user());
 
 	if (! DBM::is_result($r)) {
-		$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
+		$o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
 
@@ -79,9 +79,9 @@ function suggest_content(App $a) {
 		$connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
 		$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
 		$photo_menu = [
-			'profile' => [t("View Profile"), Profile::zrl($rr["url"])],
+			'profile' => [L10n::t("View Profile"), Profile::zrl($rr["url"])],
-			'follow' => [t("Connect/Follow"), $connlnk],
+			'follow' => [L10n::t("Connect/Follow"), $connlnk],
-			'hide' => [t('Ignore/Hide'), $ignlnk]
+			'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
 		];
 
 		$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
@@ -98,10 +98,10 @@ function suggest_content(App $a) {
 			'account_type'  => Contact::getAccountType($contact_details),
 			'ignlnk' => $ignlnk,
 			'ignid' => $rr['id'],
-			'conntxt' => t('Connect'),
+			'conntxt' => L10n::t('Connect'),
 			'connlnk' => $connlnk,
 			'photo_menu' => $photo_menu,
-			'ignore' => t('Ignore/Hide'),
+			'ignore' => L10n::t('Ignore/Hide'),
 			'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
 			'id' => ++$id,
 		];
@@ -111,7 +111,7 @@ function suggest_content(App $a) {
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
 	$o .= replace_macros($tpl,[
-		'$title' => t('Friend Suggestions'),
+		'$title' => L10n::t('Friend Suggestions'),
 		'$contacts' => $entries,
 	]);
 

mod/tagger.php

@@ -1,14 +1,17 @@
 <?php
-
+/**
+ * @file mod/tagger.php
+ */
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 
-require_once('include/security.php');
+require_once 'include/security.php';
-require_once('include/bbcode.php');
+require_once 'include/bbcode.php';
-require_once('include/items.php');
+require_once 'include/items.php';
 
 function tagger_content(App $a) {
 
@@ -64,7 +67,7 @@ function tagger_content(App $a) {
 
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 	$xterm = xmlify($term);
-	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
+	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 
 	$link = xmlify('<link rel="alternate" type="text/html" href="'
@@ -97,7 +100,7 @@ EOT;
 	</object>
 EOT;
 
-	$bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
+	$bodyverb = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s');
 
 	if (! isset($bodyverb)) {
 		return;

mod/tagrm.php

@@ -15,7 +15,7 @@ function tagrm_post(App $a) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
-	if ((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel'))) {
+	if ((x($_POST,'submit')) && ($_POST['submit'] === L10n::t('Cancel'))) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
@@ -86,9 +86,9 @@ function tagrm_content(App $a) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
-	$o .= '<h3>' . t('Remove Item Tag') . '</h3>';
+	$o .= '<h3>' . L10n::t('Remove Item Tag') . '</h3>';
 
-	$o .= '<p id="tag-remove-desc">' . t('Select a tag to remove: ') . '</p>';
+	$o .= '<p id="tag-remove-desc">' . L10n::t('Select a tag to remove: ') . '</p>';
 
 	$o .= '<form id="tagrm" action="tagrm" method="post" >';
 	$o .= '<input type="hidden" name="item" value="' . $item . '" />';
@@ -99,8 +99,8 @@ function tagrm_content(App $a) {
 	}
 
 	$o .= '</ul>';
-	$o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . t('Remove') .'" />';
+	$o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . L10n::t('Remove') .'" />';
-	$o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . t('Cancel') .'" />';
+	$o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . L10n::t('Cancel') .'" />';
 	$o .= '</form>';
 
 	return $o;

mod/uexport.php

@@ -1,7 +1,10 @@
 <?php
-
+/**
+ * @file mod/uexport.php
+ */
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
@@ -38,15 +41,15 @@ function uexport_content(App $a) {
 	 * list of array( 'link url', 'link text', 'help text' )
 	 */
 	$options = [
-		['uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')],
+		['uexport/account', L10n::t('Export account'), L10n::t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')],
-		['uexport/backup', t('Export all'), t('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)')],
+		['uexport/backup', L10n::t('Export all'), L10n::t('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)')],
 	];
 	Addon::callHooks('uexport_options', $options);
 
 	$tpl = get_markup_template("uexport.tpl");
 	return replace_macros($tpl, [
 		'$baseurl' => System::baseUrl(),
-		'$title' => t('Export personal data'),
+		'$title' => L10n::t('Export personal data'),
 		'$options' => $options
 	]);
 }

mod/uimport.php

@@ -9,7 +9,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\UserImport;
 
-function uimport_post(App $a) {
+function uimport_post(App $a)
+{
 	switch ($a->config['register_policy']) {
 		case REGISTER_OPEN:
 			$blocked = 0;
@@ -66,13 +67,13 @@ function uimport_content(App $a) {
 
 	$tpl = get_markup_template("uimport.tpl");
 	return replace_macros($tpl, [
-		'$regbutt' => t('Import'),
+		'$regbutt' => L10n::t('Import'),
 		'$import' => [
-			'title' => t("Move account"),
+			'title' => L10n::t("Move account"),
-			'intro' => t("You can import an account from another Friendica server."),
+			'intro' => L10n::t("You can import an account from another Friendica server."),
-			'instruct' => t("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."),
+			'instruct' => L10n::t("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."),
-			'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
+			'warn' => L10n::t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
-			'field' => ['accountfile', t('Account file'), '<input id="id_accountfile" name="accountfile" type="file">', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')],
+			'field' => ['accountfile', L10n::t('Account file'), '<input id="id_accountfile" name="accountfile" type="file">', L10n::t('To export your account, go to "Settings->Export your personal data" and select "Export account"')],
 		],
 	]);
 }

mod/unfollow.php

@@ -44,15 +44,15 @@ function unfollow_post(App $a)
 		}
 		dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
 
-		info(t('Contact unfollowed').EOL);
+		info(L10n::t('Contact unfollowed').EOL);
 		goaway(System::baseUrl().'/contacts/'.$contact['id']);
 	}
 	goaway($return_url);
 	// NOTREACHED
 }
 
-function unfollow_content(App $a) {
+function unfollow_content(App $a)
-
+{
 	if (! local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
@@ -62,7 +62,7 @@ function unfollow_content(App $a) {
 	$uid = local_user();
 	$url = notags(trim($_REQUEST['url']));
 
-	$submit = t('Submit Request');
+	$submit = L10n::t('Submit Request');
 
 	$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
 			local_user(), CONTACT_IS_FRIEND, normalise_link($url),
@@ -97,7 +97,7 @@ function unfollow_content(App $a) {
 	// Makes the connection request for friendica contacts easier
 	$_SESSION["fastlane"] = $contact["url"];
 
-	$header = t("Disconnect/Unfollow");
+	$header = L10n::t("Disconnect/Unfollow");
 
 	$o  = replace_macros($tpl, [
 			'$header' => htmlentities($header),
@@ -110,16 +110,16 @@ function unfollow_content(App $a) {
 			'$statusnet' => "",
 			'$diaspora' => "",
 			'$diasnote' => "",
-			'$your_address' => t('Your Identity Address:'),
+			'$your_address' => L10n::t('Your Identity Address:'),
 			'$invite_desc' => "",
 			'$emailnet' => "",
 			'$submit' => $submit,
-			'$cancel' => t('Cancel'),
+			'$cancel' => L10n::t('Cancel'),
 			'$nickname' => "",
 			'$name' => $contact["name"],
 			'$url' => $contact["url"],
 			'$zrl' => Profile::zrl($contact["url"]),
-			'$url_label' => t("Profile URL"),
+			'$url_label' => L10n::t("Profile URL"),
 			'$myaddr' => $myaddr,
 			'$request' => $request,
 			'$keywords' => "",
@@ -129,7 +129,7 @@ function unfollow_content(App $a) {
 	$a->page['aside'] = "";
 	Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 
-	$o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => t('Status Messages and Posts')]);
+	$o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
 
 	// Show last public posts
 	$o .= Contact::getPostsFromUrl($contact["url"]);

mod/videos.php

@@ -72,7 +72,7 @@ function videos_init(App $a) {
 
 			if($albums_visible) {
 				$o .= '<div id="sidebar-photos-albums" class="widget">';
-				$o .= '<h3>' . '<a href="' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
+				$o .= '<h3>' . '<a href="' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '">' . L10n::t('Photo Albums') . '</a></h3>';
 
 				$o .= '<ul>';
 				foreach($albums as $album) {
@@ -80,14 +80,14 @@ function videos_init(App $a) {
 					// don't show contact photos. We once translated this name, but then you could still access it under
 					// a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
 
-					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos')))
 						continue;
 					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>';
 				}
 				$o .= '</ul>';
 			}
 			if(local_user() && $a->data['user']['uid'] == local_user()) {
-				$o .= '<div id="photo-albums-upload-link"><a href="' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
+				$o .= '<div id="photo-albums-upload-link"><a href="' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .L10n::t('Upload New Photos') . '</a></div>';
 			}
 
 			$o .= '</div>';
@@ -134,15 +134,15 @@ function videos_post(App $a) {
 			$drop_url = $a->query_string;
 			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'post',
-				'$message' => t('Do you really want to delete this video?'),
+				'$message' => L10n::t('Do you really want to delete this video?'),
 				'$extra_inputs' => [
 					['name'=>'id', 'value'=> $_POST['id']],
 					['name'=>'delete', 'value'=>'x']
 				],
-				'$confirm' => t('Delete Video'),
+				'$confirm' => L10n::t('Delete Video'),
 				'$confirm_url' => $drop_url,
 				'$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement
-				'$cancel' => t('Cancel'),
+				'$cancel' => L10n::t('Cancel'),
 
 			]);
 			$a->error = 1; // Set $a->error so the other module functions don't execute
@@ -391,14 +391,14 @@ function videos_content(App $a) {
 			$videos[] = [
 				'id'       => $rr['id'],
 				'link'     => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
-				'title'    => t('View Video'),
+				'title'    => L10n::t('View Video'),
 				'src'      => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
 				'alt'      => $alt_e,
 				'mime'     => $rr['filetype'],
 				'album' => [
 					'link'  => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
 					'name'  => $name_e,
-					'alt'   => t('View Album'),
+					'alt'   => L10n::t('View Album'),
 				],
 
 			];
@@ -407,9 +407,9 @@ function videos_content(App $a) {
 
 	$tpl = get_markup_template('videos_recent.tpl');
 	$o .= replace_macros($tpl, [
-		'$title'      => t('Recent Videos'),
+		'$title'      => L10n::t('Recent Videos'),
 		'$can_post'   => $can_post,
-		'$upload'     => [t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'],
+		'$upload'     => [L10n::t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'],
 		'$videos'     => $videos,
 		'$delete_url' => (($can_post)?System::baseUrl().'/videos/'.$a->data['user']['nickname']:False)
 	]);

mod/viewcontacts.php

@@ -11,8 +11,8 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
-function viewcontacts_init(App $a) {
+function viewcontacts_init(App $a)
-
+{
 	if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
@@ -37,8 +37,8 @@ function viewcontacts_init(App $a) {
 	}
 }
 
-
+function viewcontacts_content(App $a)
-function viewcontacts_content(App $a) {
+{
 	require_once("mod/proxy.php");
 
 	if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
@@ -65,8 +65,9 @@ function viewcontacts_content(App $a) {
 		dbesc(NETWORK_DIASPORA),
 		dbesc(NETWORK_OSTATUS)
 	);
-	if (DBM::is_result($r))
+	if (DBM::is_result($r)) {
 		$a->set_pager_total($r[0]['total']);
+	}
 
 	$r = q("SELECT * FROM `contact`
 		WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
@@ -81,7 +82,7 @@ function viewcontacts_content(App $a) {
 		intval($a->pager['itemspage'])
 	);
 	if (!DBM::is_result($r)) {
-		info(t('No contacts.').EOL);
+		info(L10n::t('No contacts.').EOL);
 		return $o;
 	}
 
@@ -99,16 +100,17 @@ function viewcontacts_content(App $a) {
 
 		$is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false);
 
-		if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
+		if ($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
 			$url = 'redir/' . $rr['id'];
-		else
+		} else {
 			$url = Profile::zrl($url);
+		}
 
 		$contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
 
 		$contacts[] = [
 			'id' => $rr['id'],
-			'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
+			'img_hover' => sprintf(L10n::t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
 			'photo_menu' => Contact::photoMenu($rr),
 			'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
 			'name' => htmlentities(substr($contact_details['name'], 0, 20)),
@@ -127,7 +129,7 @@ function viewcontacts_content(App $a) {
 
 	$tpl = get_markup_template("viewcontact_template.tpl");
 	$o .= replace_macros($tpl, [
-		'$title' => t('Contacts'),
+		'$title' => L10n::t('Contacts'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
 	]);

mod/wall_attach.php

@@ -21,7 +21,7 @@ function wall_attach_post(App $a) {
 		);
 		if (! DBM::is_result($r)) {
 			if ($r_json) {
-				echo json_encode(['error'=>t('Invalid request.')]);
+				echo json_encode(['error'=>L10n::t('Invalid request.')]);
 				killme();
 			}
 			return;
@@ -29,7 +29,7 @@ function wall_attach_post(App $a) {
 
 	} else {
 		if ($r_json) {
-			echo json_encode(['error'=>t('Invalid request.')]);
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 			killme();
 		}
 		return;
@@ -71,7 +71,7 @@ function wall_attach_post(App $a) {
 	}
 	if(! $can_post) {
 		if ($r_json) {
-			echo json_encode(['error'=>t('Permission denied.')]);
+			echo json_encode(['error'=>L10n::t('Permission denied.')]);
 			killme();
 		}
 		notice(L10n::t('Permission denied.') . EOL );
@@ -80,7 +80,7 @@ function wall_attach_post(App $a) {
 
 	if(! x($_FILES,'userfile')) {
 		if ($r_json) {
-			echo json_encode(['error'=>t('Invalid request.')]);
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 		}
 		killme();
 	}
@@ -98,7 +98,7 @@ function wall_attach_post(App $a) {
 	 */
 
 	if($filesize <=0) {
-		$msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?'));
+		$msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?'));
 		if ($r_json) {
 			echo json_encode(['error'=>$msg]);
 		} else {
@@ -109,7 +109,7 @@ function wall_attach_post(App $a) {
 	}
 
 	if(($maxfilesize) && ($filesize > $maxfilesize)) {
-		$msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize));
+		$msg = sprintf(L10n::t('File exceeds size limit of %s'), formatBytes($maxfilesize));
 		if ($r_json) {
 			echo json_encode(['error'=>$msg]);
 		} else {
@@ -133,7 +133,7 @@ function wall_attach_post(App $a) {
 	@unlink($src);
 
 	if(! $r) {
-		$msg =  t('File upload failed.');
+		$msg =  L10n::t('File upload failed.');
 		if ($r_json) {
 			echo json_encode(['error'=>$msg]);
 		} else {
@@ -149,7 +149,7 @@ function wall_attach_post(App $a) {
 	);
 
 	if (! DBM::is_result($r)) {
-		$msg = t('File upload failed.');
+		$msg = L10n::t('File upload failed.');
 		if ($r_json) {
 			echo json_encode(['error'=>$msg]);
 		} else {

mod/wall_upload.php

@@ -35,7 +35,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 			if (! DBM::is_result($r)) {
 				if ($r_json) {
-					echo json_encode(['error'=>t('Invalid request.')]);
+					echo json_encode(['error'=>L10n::t('Invalid request.')]);
 					killme();
 				}
 				return;
@@ -51,7 +51,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		}
 	} else {
 		if ($r_json) {
-			echo json_encode(['error'=>t('Invalid request.')]);
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 			killme();
 		}
 		return;
@@ -100,7 +100,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	if (! $can_post) {
 		if ($r_json) {
-			echo json_encode(['error'=>t('Permission denied.')]);
+			echo json_encode(['error'=>L10n::t('Permission denied.')]);
 			killme();
 		}
 		notice(L10n::t('Permission denied.') . EOL);
@@ -109,7 +109,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	if (! x($_FILES, 'userfile') && ! x($_FILES, 'media')) {
 		if ($r_json) {
-			echo json_encode(['error'=>t('Invalid request.')]);
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 		}
 		killme();
 	}
@@ -149,7 +149,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	if ($src=="") {
 		if ($r_json) {
-			echo json_encode(['error'=>t('Invalid request.')]);
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 			killme();
 		}
 		notice(L10n::t('Invalid request.').EOL);
@@ -180,7 +180,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$maximagesize = Config::get('system', 'maximagesize');
 
 	if (($maximagesize) && ($filesize > $maximagesize)) {
-		$msg = sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize));
+		$msg = sprintf(L10n::t('Image exceeds size limit of %s'), formatBytes($maximagesize));
 		if ($r_json) {
 			echo json_encode(['error'=>$msg]);
 		} else {
@@ -194,7 +194,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$Image = new Image($imagedata, $filetype);
 
 	if (! $Image->isValid()) {
-		$msg = t('Unable to process image.');
+		$msg = L10n::t('Unable to process image.');
 		if ($r_json) {
 			echo json_encode(['error'=>$msg]);
 		} else {
@@ -225,7 +225,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	// If we don't have an album name use the Wall Photos album
 	if (! strlen($album)) {
-		$album = t('Wall Photos');
+		$album = L10n::t('Wall Photos');
 	}
 
 	$defperm = '<' . $default_cid . '>';
@@ -233,7 +233,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
 
 	if (! $r) {
-		$msg = t('Image upload failed.');
+		$msg = L10n::t('Image upload failed.');
 		if ($r_json) {
 			echo json_encode(['error'=>$msg]);
 		} else {

mod/wallmessage.php

@@ -46,7 +46,7 @@ function wallmessage_post(App $a) {
 	);
 
 	if ($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+		notice(sprintf(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
 		return;
 	}
 
@@ -70,7 +70,6 @@ function wallmessage_post(App $a) {
 	}
 
 	goaway('profile/'.$user['nickname']);
-
 }
 
 
@@ -110,7 +109,7 @@ function wallmessage_content(App $a) {
 	);
 
 	if ($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+		notice(sprintf(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
 		return;
 	}
 
@@ -118,33 +117,33 @@ function wallmessage_content(App $a) {
 	$a->page['htmlhead'] .= replace_macros($tpl, [
 		'$baseurl' => System::baseUrl(true),
 		'$nickname' => $user['nickname'],
-		'$linkurl' => t('Please enter a link URL:')
+		'$linkurl' => L10n::t('Please enter a link URL:')
 	]);
 
 	$tpl = get_markup_template('wallmsg-end.tpl');
 	$a->page['end'] .= replace_macros($tpl, [
 		'$baseurl' => System::baseUrl(true),
 		'$nickname' => $user['nickname'],
-		'$linkurl' => t('Please enter a link URL:')
+		'$linkurl' => L10n::t('Please enter a link URL:')
 	]);
 
 	$tpl = get_markup_template('wallmessage.tpl');
 	$o .= replace_macros($tpl, [
-		'$header' => t('Send Private Message'),
+		'$header' => L10n::t('Send Private Message'),
-		'$subheader' => sprintf( t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']),
+		'$subheader' => sprintf(L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']),
-		'$to' => t('To:'),
+		'$to' => L10n::t('To:'),
-		'$subject' => t('Subject:'),
+		'$subject' => L10n::t('Subject:'),
 		'$recipname' => $user['username'],
 		'$nickname' => $user['nickname'],
 		'$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''),
 		'$text' => ((x($_REQUEST, 'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
 		'$readonly' => '',
-		'$yourmessage' => t('Your message:'),
+		'$yourmessage' => L10n::t('Your message:'),
 		'$select' => $select,
 		'$parent' => '',
-		'$upload' => t('Upload photo'),
+		'$upload' => L10n::t('Upload photo'),
-		'$insert' => t('Insert web link'),
+		'$insert' => L10n::t('Insert web link'),
-		'$wait' => t('Please wait')
+		'$wait' => L10n::t('Please wait')
 	]);
 
 	return $o;

mod/webfinger.php

@@ -1,14 +1,21 @@
 <?php
-
+/**
+ * @file mod/webfinger.php
+ */
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Network\Probe;
 
-function webfinger_content(App $a) {
+function webfinger_content(App $a)
-
+{
 	if (!local_user()) {
-		http_status_exit(403,
+		http_status_exit(
-				["title" => t("Public access denied."),
+			403,
-					"description" => t("Only logged in users are permitted to perform a probing.")]);
+			[
+				"title" => L10n::t("Public access denied."),
+				"description" => L10n::t("Only logged in users are permitted to perform a probing.")
+			]
+		);
 		killme();
 	}