Browse Source

Statusnet is now GNU Social

pull/1979/head
Michael Vogel 6 years ago
parent
commit
a11833e248
2 changed files with 5 additions and 5 deletions
  1. +1
    -1
      include/contact_selectors.php
  2. +4
    -4
      mod/uimport.php

+ 1
- 1
include/contact_selectors.php View File

@ -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')
);


+ 4
- 4
mod/uimport.php View File

@ -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'),'<input id="id_accountfile" name="accountfile" type="file">', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')),
),
),
));
}

Loading…
Cancel
Save