Merge branch 'fabrixxm-master'

Conflicts:
	addon/statusnet/statusnet.php
	util/strings.php

diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
index 3dd4b5e9841be88aeffc56fd49438524f49f4a63..c7e16b56e9cc3b421635f9054570caf2ad39fea6 100644 (file)
--- a/addon/statusnet/statusnet.php
+++ b/addon/statusnet/statusnet.php
@@ -133,7 +133,7 @@ function statusnet_settings(&$a,&$s) {
                $s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
                 $s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>';
                $s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
-                $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t('Base API Path \x28remember the trailing &#47;\x29') .'</label>';
+                $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
                $s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br  />';
                 $s .= '</div><div class="clear"></div>';
                 $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';

diff --git a/util/strings.php b/util/strings.php
index 9942439763fbe9f3fc208d6fb019f37ba3cea543..a7ef2361ac50f2323c3cb45a70e9014a477bf625 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -502,7 +502,7 @@ $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
 $a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.';
 $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
 $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
-$a->strings['Base API Path \x28remember the trailing &#47;\x29'] = 'Base API Path \x28remember the trailing &#47;\x29';
+$a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x28remember the trailing /\x29";
 $a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.';
 $a->strings['Log in with StatusNet'] = 'Log in with StatusNet';
 $a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here';