aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-14 20:37:42 -0700
committerFriendika <info@friendika.com>2011-04-14 20:37:42 -0700
commit44c47f118c20a22c1540c6c88823b48a357e5ca3 (patch)
treef2332bbfec210ca17c2ffb489ebf1b575262e593 /mod
parentb5ccb8e2055bf08d282ebb0cba2cac0d850fdc5a (diff)
downloadvolse-hubzilla-44c47f118c20a22c1540c6c88823b48a357e5ca3.tar.gz
volse-hubzilla-44c47f118c20a22c1540c6c88823b48a357e5ca3.tar.bz2
volse-hubzilla-44c47f118c20a22c1540c6c88823b48a357e5ca3.zip
"profile locator/address" is now called "Identity Address" to reduce confusion
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_request.php5
-rw-r--r--mod/settings.php3
2 files changed, 5 insertions, 3 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 3c1c216fe..4463c713f 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -618,17 +618,18 @@ function dfrn_request_content(&$a) {
$o .= replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),
+ '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
'$pls_answer' => t('Please answer the following:'),
'$does_know' => t('Does $name know you?'),
'$yes' => t('Yes'),
'$no' => t('No'),
'$add_note' => t('Add a personal note:'),
- '$page_desc' => t('Please enter your profile address from one of the following supported social networks:'),
+ '$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
'$friendika' => t('Friendika'),
'$statusnet' => t('StatusNet/Federated Social Web'),
'$private_net' => t("Private \x28secure\x29 network"),
'$public_net' => t("Public \x28insecure\x29 network"),
- '$your_address' => t('Your profile address:'),
+ '$your_address' => t('Your Identity Address:'),
'$submit' => t('Submit Request'),
'$cancel' => t('Cancel'),
'$nickname' => $a->argv[1],
diff --git a/mod/settings.php b/mod/settings.php
index 42529ae23..caf29df35 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -331,6 +331,7 @@ function settings_content(&$a) {
$theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
}
}
+
$theme_selector .= '</select>';
$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
@@ -338,7 +339,7 @@ function settings_content(&$a) {
$tpl_addr = load_view_file("view/settings_nick_set.tpl");
$prof_addr = replace_macros($tpl_addr,array(
- '$desc' => t('Your profile address is'),
+ '$desc' => t('Your Identity Address is'),
'$nickname' => $nickname,
'$subdir' => $subdir,
'$basepath' => $a->get_hostname()