From a11833e2486382be9c996bdbd4e5081d8f54a0f3 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 24 Oct 2015 20:44:18 +0200 Subject: [PATCH] Statusnet is now GNU Social --- include/contact_selectors.php | 2 +- mod/uimport.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/contact_selectors.php b/include/contact_selectors.php index f0ac87a09f..f104866232 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 f61eab0a1b..ffa4f3ed72 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"')), - ), + ), )); } -- 2.39.5