diff --git a/include/contact_selectors.php b/include/contact_selectors.php index f0ac87a09..f10486623 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -88,7 +88,7 @@ function network_to_name($s, $profile = "") { NETWORK_PUMPIO => t('pump.io'), NETWORK_TWITTER => t('Twitter'), NETWORK_DIASPORA2 => t('Diaspora Connector'), - NETWORK_STATUSNET => t('Statusnet'), + NETWORK_STATUSNET => t('GNU Social'), NETWORK_APPNET => t('App.net') ); diff --git a/mod/uimport.php b/mod/uimport.php index f61eab0a1..ffa4f3ed7 100644 --- a/mod/uimport.php +++ b/mod/uimport.php @@ -57,8 +57,8 @@ function uimport_content(&$a) { unset($_SESSION['theme']); if(x($_SESSION,'mobile-theme')) unset($_SESSION['mobile-theme']); - - + + $tpl = get_markup_template("uimport.tpl"); return replace_macros($tpl, array( '$regbutt' => t('Import'), @@ -66,8 +66,8 @@ function uimport_content(&$a) { 'title' => t("Move account"), 'intro' => 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."), - 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"), + 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"), 'field' => array('accountfile', t('Account file'),'', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')), - ), + ), )); }