Statusnet is now GNU Social

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index f0ac87a09f32b4f3e7759cec13acc5c5568137c0..f104866232d4326f36cc3669636986682770b67f 100644 (file)
--- 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 f61eab0a1bf0920cd87d4b0f3414b2d2e3dd9302..ffa4f3ed72ca865d63a81c3fca47eff4a81de60e 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -57,8 +57,8 @@ function uimport_content(&$a) {
                unset($_SESSION['theme']);\r
        if(x($_SESSION,'mobile-theme'))\r
                unset($_SESSION['mobile-theme']);\r
-       \r
-       \r
+\r
+\r
     $tpl = get_markup_template("uimport.tpl");\r
     return replace_macros($tpl, array(\r
         '$regbutt' => t('Import'),\r
@@ -66,8 +66,8 @@ function uimport_content(&$a) {
             'title' => t("Move account"),\r
                        'intro' => t("You can import an account from another Friendica server."),\r
                        '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."),\r
-                       'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"),\r
+                       'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),\r
             '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"')),\r
-        ),  \r
+        ),\r
     ));\r
 }\r