Merge branch 'fabrixxm-master'

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

diff --combined util/strings.php
index 41a8a68ff47c20090636c67f0039237a4d65db6b,9942439763fbe9f3fc208d6fb019f37ba3cea543..a7ef2361ac50f2323c3cb45a70e9014a477bf625
--- 1/util/strings.php
--- 2/util/strings.php
+++ b/util/strings.php
@@@ -502,7 -502,7 +502,7 @@@ $a->strings['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';
@@@ -665,7 -665,6 +665,6 @@@ $a->strings['America/Managua'] = 'Ameri
  $a->strings['America/Manaus'] = 'America/Manaus';
  $a->strings['America/Marigot'] = 'America/Marigot';
  $a->strings['America/Martinique'] = 'America/Martinique';
- $a->strings['America/Matamoros'] = 'America/Matamoros';
  $a->strings['America/Mazatlan'] = 'America/Mazatlan';
  $a->strings['America/Mendoza'] = 'America/Mendoza';
  $a->strings['America/Menominee'] = 'America/Menominee';
@@@ -684,7 -683,6 +683,6 @@@ $a->strings['America/Nome'] = 'America/
  $a->strings['America/Noronha'] = 'America/Noronha';
  $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
  $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
- $a->strings['America/Ojinaga'] = 'America/Ojinaga';
  $a->strings['America/Panama'] = 'America/Panama';
  $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
  $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@@@ -701,7 -699,6 +699,6 @@@ $a->strings['America/Regina'] = 'Americ
  $a->strings['America/Resolute'] = 'America/Resolute';
  $a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
  $a->strings['America/Rosario'] = 'America/Rosario';
- $a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
  $a->strings['America/Santarem'] = 'America/Santarem';
  $a->strings['America/Santiago'] = 'America/Santiago';
  $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
@@@ -730,7 -727,6 +727,6 @@@ $a->strings['America/Yellowknife'] = 'A
  $a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
  $a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
  $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
- $a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
  $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
  $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
  $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@@@ -793,7 -789,6 +789,6 @@@ $a->strings['Asia/Makassar'] = 'Asia/Ma
  $a->strings['Asia/Manila'] = 'Asia/Manila';
  $a->strings['Asia/Muscat'] = 'Asia/Muscat';
  $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
- $a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
  $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
  $a->strings['Asia/Omsk'] = 'Asia/Omsk';
  $a->strings['Asia/Oral'] = 'Asia/Oral';