Genericons — A free, GPL, flexible icon font for blogs!
- - - -Genericons are vector icons embedded in a webfont designed to be clean and simple keeping with a generic aesthetic. Use for instant HiDPI or to easily change colors on the fly.
-diff --git a/CONFIGURE b/CONFIGURE
index 7e76ccf91b..25af381332 100644
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -393,8 +393,7 @@ resource: a unique identifier for the connection to the server. This
is actually used as a prefix for each XMPP component in the system.
password: password for the user account.
host: some XMPP domains are served by machines with a different
- hostname. (For example, @gmail.com GTalk users connect to
- talk.google.com). Set this to the correct hostname if that's the
+ hostname. Set this to the correct hostname if that's the
case with your server.
encryption: Whether to encrypt the connection between StatusNet and the
XMPP server. Defaults to true, but you can get
@@ -502,7 +501,7 @@ restore: whether users can restore their profiles from backup files. Defaults
to true.
delete: whether users can delete their own accounts. Defaults to false.
move: whether users can move their accounts to another server. Defaults
- to true.
+ to true.
newuser
-------
@@ -583,7 +582,7 @@ maxaliases: maximum number of aliases a group can have. Default 3. Set
desclimit: maximum number of characters to allow in group descriptions.
null (default) means to use the site-wide text limits. 0
means no limit.
-addtag: Whether to add a tag for the group nickname for every group post
+addtag: Whether to add a tag for the group nickname for every group post
(pre-1.0.x behaviour). Defaults to false.
search
@@ -709,7 +708,7 @@ external: external links in notices. One of three values: 'sometimes',
url
---
-These are some options for fine-tuning how and when the server will
+These are some options for fine-tuning how and when the server will
shorten URLs.
shortener: URL shortening service to use by default. Users can override
@@ -780,5 +779,3 @@ oldschool
enabled: enable certain old-style user settings options, like stream-only mode,
conversation trees, and nicknames in streams. Off by default, and
may not be well supported in future versions.
-
-
diff --git a/EVENTS.txt b/EVENTS.txt
index 2f91a305f0..e3181faadb 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -42,11 +42,10 @@ EndShowUAStyles: End showing custom User-Agent links; good place to add user-age
StartShowScripts: Showing JavaScript links
- $action: the current action
-EndShowScripts: End showing JavaScript links; good place to add custom
- links like Google Analytics
+EndShowScripts: End showing JavaScript links; good place to add custom links
- $action: the current action
-StartShowJQueryScripts: Showing JQuery script links (use this to link to e.g. Google mirrors)
+StartShowJQueryScripts: Showing JQuery script links
- $action: the current action
EndShowJQueryScripts: End showing JQuery script links
@@ -1431,7 +1430,7 @@ StartNoticeListPrefill: Before pre-filling a list of notices with extra data
EndNoticeListPrefill: After pre-filling a list of notices with extra data
- &$notices: Notices that were pre-filled
-- &$profiles: Profiles that were pre-filled
+- &$profiles: Profiles that were pre-filled
- $avatarSize: The avatar size for the list
OtherAccountProfiles: Hook to add account profiles to a user account profile block
diff --git a/PLUGINS.txt b/PLUGINS.txt
index d2b7015bf5..44d2ea2d44 100644
--- a/PLUGINS.txt
+++ b/PLUGINS.txt
@@ -10,13 +10,13 @@ and has a choice of accepting or rejecting the events.
In the simplest case, you can add a function to config.php and use the
Event::addHandler() function to hook an event:
- function AddGoogleLink($action)
- {
- $action->menuItem('http://www.google.com/', _('Google'), _('Search engine'));
- return true;
- }
+function AddMyWebsiteLink($action)
+{
+$action->menuItem('http://mywebsite.net/', _('My web site'), _('Example web link'));
+return true;
+}
- Event::addHandler('EndPrimaryNav', 'AddGoogleLink');
+Event::addHandler('EndPrimaryNav', 'AddMyWebsiteLink');
This adds a menu item to the end of the main navigation menu. You can
see the list of existing events, and parameters that handlers must
diff --git a/README.md b/README.md
index 3127bb4795..7dfe8ae05c 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ polls, announce events, or other social activities
(and you can add more!). Users can choose which
people to "follow" and receive only their friends'
or colleagues' status messages. It provides a
-similar service to sites like Twitter, Google+ or
-Facebook, but is much more awesome.
+similar service to proprietary social network sites,
+but is much more awesome.
With a little work, status messages can be sent to
mobile phones, instant messenger programs (using
@@ -248,4 +248,3 @@ built the fediverse network to what it is today.
### License help from
* Bradley M. Kuhn
-
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index b14635ac33..13fb6022d7 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -92,7 +92,7 @@
%s
where
the url-encoded original URI should be inserted (sample:
- http://www.google.com/url?q=%s
).
-
+ https://searx.laquadrature.net/?q=%s
).
+
Uses for this directive: -
-+
Prior to HTML Purifier 3.1.1, this directive also enabled the munging
of browsable external resources, which could break things if your redirection
script was a splash page or used meta
tags. To revert to
previous behavior, please use %URI.MungeResources.
-
+
+You may want to also use %URI.MungeSecretKey along with this directive in order to enforce what URIs your redirector script allows. Open redirector scripts can be a security risk and negatively affect the reputation of your domain name. -
-+
+Starting with HTML Purifier 3.1.1, there is also these substitutions: -
-Key | -Description | -Example <a href=""> |
-
---|---|---|
Key | +Description | +Example <a href=""> |
+
%r | -1 - The URI embeds a resource (blank) - The URI is merely a link |
- - |
%n | -The name of the tag this URI came from | -a | -
%m | -The name of the attribute this URI came from | -href | -
%p | -The name of the CSS property this URI came from, or blank if irrelevant | -- |
%r | +1 - The URI embeds a resource (blank) - The URI is merely a link |
+ + |
%n | +The name of the tag this URI came from | +a | +
%m | +The name of the attribute this URI came from | +href | +
%p | +The name of the CSS property this URI came from, or blank if irrelevant | ++ |
+
Admittedly, these letters are somewhat arbitrary; the only stipulation was that they couldn't be a through f. r is for resource (I would have preferred e, but you take what you can get), n is for name, m was picked because it came after n (and I couldn't use a), p is for property. -
---# vim: et sw=4 sts=4 + + --# vim: et sw=4 sts=4 diff --git a/extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php b/extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php index 069708c250..8bc4f4b896 100644 --- a/extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php +++ b/extlib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php @@ -27,7 +27,7 @@ class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector if (strpos($token->data, '://') === false) { // our really quick heuristic failed, abort // this may not work so well if we want to match things like - // "google.com", but then again, most people don't + // "domainname.com", but then again, most people don't return; } diff --git a/extlib/OAuth.php b/extlib/OAuth.php index 495121374e..2e9142ab65 100644 --- a/extlib/OAuth.php +++ b/extlib/OAuth.php @@ -108,9 +108,9 @@ abstract class OAuthSignatureMethod { } /** - * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104] - * where the Signature Base String is the text and the key is the concatenated values (each first - * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&' + * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104] + * where the Signature Base String is the text and the key is the concatenated values (each first + * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&' * character (ASCII code 38) even if empty. * - Chapter 9.2 ("HMAC-SHA1") */ @@ -136,7 +136,7 @@ class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod { } /** - * The PLAINTEXT method does not provide any security protection and SHOULD only be used + * The PLAINTEXT method does not provide any security protection and SHOULD only be used * over a secure channel such as HTTPS. It does not use the Signature Base String. * - Chapter 9.4 ("PLAINTEXT") */ @@ -146,8 +146,8 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod { } /** - * oauth_signature is set to the concatenated encoded values of the Consumer Secret and - * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is + * oauth_signature is set to the concatenated encoded values of the Consumer Secret and + * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is * empty. The result MUST be encoded again. * - Chapter 9.4.1 ("Generating Signatures") * @@ -169,10 +169,10 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod { } /** - * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in - * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for - * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a - * verified way to the Service Provider, in a manner which is beyond the scope of this + * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in + * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for + * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a + * verified way to the Service Provider, in a manner which is beyond the scope of this * specification. * - Chapter 9.3 ("RSA-SHA1") */ @@ -573,7 +573,7 @@ class OAuthServer { private function get_version(&$request) { $version = $request->get_parameter("oauth_version"); if (!$version) { - // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present. + // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present. // Chapter 7.0 ("Accessing Protected Ressources") $version = '1.0'; } @@ -587,7 +587,7 @@ class OAuthServer { * figure out the signature with some defaults */ private function get_signature_method($request) { - $signature_method = $request instanceof OAuthRequest + $signature_method = $request instanceof OAuthRequest ? $request->get_parameter("oauth_signature_method") : NULL; @@ -612,7 +612,7 @@ class OAuthServer { * try to find the consumer for the provided request's consumer key */ private function get_consumer($request) { - $consumer_key = $request instanceof OAuthRequest + $consumer_key = $request instanceof OAuthRequest ? $request->get_parameter("oauth_consumer_key") : NULL; @@ -684,7 +684,7 @@ class OAuthServer { throw new OAuthException( 'Missing timestamp parameter. The parameter is required' ); - + // verify that timestamp is recentish $now = time(); if (abs($now - $timestamp) > $this->timestamp_threshold) { @@ -770,7 +770,6 @@ class OAuthUtil { // parameters, has to do some unescaping // Can filter out any non-oauth parameters if needed (default behaviour) // May 28th, 2010 - method updated to tjerk.meesters for a speed improvement. - // see http://code.google.com/p/oauth/issues/detail?id=163 public static function split_header($header, $only_allow_oauth_parameters = true) { $params = array(); if (preg_match_all('/('.($only_allow_oauth_parameters ? 'oauth_' : '').'[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches)) { diff --git a/extlib/README b/extlib/README index 83ca7cec6c..d4be0a1219 100644 --- a/extlib/README +++ b/extlib/README @@ -84,7 +84,7 @@ and the URLs are listed here for your convenience. - PEAR Net_Socket, if you use the SMTP factory for notifications http://pear.php.net/package/Net_Socket - XMPPHP, the follow-up to Class.Jabber.php. Probably the best XMPP - library available for PHP. http://xmpphp.googlecode.com/. Note that + library available for PHP. https://github.com/heshanlk/XMPPHP. Note that as of this writing the version of this library that is available in the extlib directory is *significantly different* from the upstream version (patches have been submitted). Upgrading to the upstream diff --git a/extlib/php-gettext/README b/extlib/php-gettext/README index bca4f916d5..8f1ffddb6f 100644 --- a/extlib/php-gettext/README +++ b/extlib/php-gettext/README @@ -28,7 +28,7 @@ Why? I got used to having gettext work even without gettext library. It's there in my favourite language Python, so I was - surprised that I couldn't find it in PHP. I even Googled for it, + surprised that I couldn't find it in PHP. I even searched for it, but to no avail. So, I said, what the heck, I'm going to write it for this diff --git a/js/extlib/jquery-ui/jquery-ui.js b/js/extlib/jquery-ui/jquery-ui.js index 583a1b24b9..1eeb5298b0 100644 --- a/js/extlib/jquery-ui/jquery-ui.js +++ b/js/extlib/jquery-ui/jquery-ui.js @@ -14626,7 +14626,6 @@ color.fn = jQuery.extend( color.prototype, { color.fn.parse.prototype = color.fn; // hsla conversions adapted from: -// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021 function hue2rgb( p, q, h ) { h = ( h + 1 ) % 1; diff --git a/js/extlib/jquery.js b/js/extlib/jquery.js index eed17778c6..0724878f73 100644 --- a/js/extlib/jquery.js +++ b/js/extlib/jquery.js @@ -9083,7 +9083,6 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( // Support: Safari<7+, Chrome<37+ // Add the top/left cssHooks using jQuery.fn.position // Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084 -// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280 // getComputedStyle returns percent when specified for top/left/bottom/right; // rather than make the css module depend on the offset module, just check for it here jQuery.each( [ "top", "left" ], function( i, prop ) { diff --git a/js/geometa.js b/js/geometa.js deleted file mode 100644 index bba59b4486..0000000000 --- a/js/geometa.js +++ /dev/null @@ -1,217 +0,0 @@ -// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API -if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) { (function(){ - -// -- BEGIN GEARS_INIT -(function() { - // We are already defined. Hooray! - if (window.google && google.gears) { - return; - } - - var factory = null; - - // Firefox - if (typeof GearsFactory != 'undefined') { - factory = new GearsFactory(); - } else { - // IE - try { - factory = new ActiveXObject('Gears.Factory'); - // privateSetGlobalObject is only required and supported on WinCE. - if (factory.getBuildInfo().indexOf('ie_mobile') != -1) { - factory.privateSetGlobalObject(this); - } - } catch (e) { - // Safari - if ((typeof navigator.mimeTypes != 'undefined') && navigator.mimeTypes["application/x-googlegears"]) { - factory = document.createElement("object"); - factory.style.display = "none"; - factory.width = 0; - factory.height = 0; - factory.type = "application/x-googlegears"; - document.documentElement.appendChild(factory); - } - } - } - - // *Do not* define any objects if Gears is not installed. This mimics the - // behavior of Gears defining the objects in the future. - if (!factory) { - return; - } - - // Now set up the objects, being careful not to overwrite anything. - // - // Note: In Internet Explorer for Windows Mobile, you can't add properties to - // the window object. However, global objects are automatically added as - // properties of the window object in all browsers. - if (!window.google) { - google = {}; - } - - if (!google.gears) { - google.gears = {factory: factory}; - } -})(); -// -- END GEARS_INIT - -var GearsGeoLocation = (function() { - // -- PRIVATE - var geo = google.gears.factory.create('beta.geolocation'); - - var wrapSuccess = function(callback, self) { // wrap it for lastPosition love - return function(position) { - callback(position); - self.lastPosition = position; - }; - }; - - // -- PUBLIC - return { - shim: true, - - type: "Gears", - - lastPosition: null, - - getCurrentPosition: function(successCallback, errorCallback, options) { - var self = this; - var sc = wrapSuccess(successCallback, self); - geo.getCurrentPosition(sc, errorCallback, options); - }, - - watchPosition: function(successCallback, errorCallback, options) { - geo.watchPosition(successCallback, errorCallback, options); - }, - - clearWatch: function(watchId) { - geo.clearWatch(watchId); - }, - - getPermission: function(siteName, imageUrl, extraMessage) { - geo.getPermission(siteName, imageUrl, extraMessage); - } - - }; -}); - -var AjaxGeoLocation = (function() { - // -- PRIVATE - var loading = false; - var loadGoogleLoader = function() { - if (!hasGoogleLoader() && !loading) { - loading = true; - var s = document.createElement('script'); - s.src = (document.location.protocol == "https:"?"https://":"http://") + 'www.google.com/jsapi?callback=_google_loader_apiLoaded'; - s.type = "text/javascript"; - document.getElementsByTagName('body')[0].appendChild(s); - } - }; - - var queue = []; - var addLocationQueue = function(callback) { - queue.push(callback); - }; - - var runLocationQueue = function() { - if (hasGoogleLoader()) { - while (queue.length > 0) { - var call = queue.pop(); - call(); - } - } - }; - - window['_google_loader_apiLoaded'] = function() { - runLocationQueue(); - }; - - var hasGoogleLoader = function() { - return (window['google'] && google['loader']); - }; - - var checkGoogleLoader = function(callback) { - if (hasGoogleLoader()) { return true; } - - addLocationQueue(callback); - - loadGoogleLoader(); - - return false; - }; - - loadGoogleLoader(); // start to load as soon as possible just in case - - // -- PUBLIC - return { - shim: true, - - type: "ClientLocation", - - lastPosition: null, - - getCurrentPosition: function(successCallback, errorCallback, options) { - var self = this; - if (!checkGoogleLoader(function() { - self.getCurrentPosition(successCallback, errorCallback, options); - })) { return; } - - if (google.loader.ClientLocation) { - var cl = google.loader.ClientLocation; - - var position = { - coords: { - latitude: cl.latitude, - longitude: cl.longitude, - altitude: null, - accuracy: 43000, // same as Gears accuracy over wifi? - altitudeAccuracy: null, - heading: null, - speed: null - }, - // extra info that is outside of the bounds of the core API - address: { - city: cl.address.city, - country: cl.address.country, - country_code: cl.address.country_code, - region: cl.address.region - }, - timestamp: new Date() - }; - - successCallback(position); - - this.lastPosition = position; - } else if (errorCallback === "function") { - errorCallback({ code: 3, message: "Using the Google ClientLocation API and it is not able to calculate a location."}); - } - }, - - watchPosition: function(successCallback, errorCallback, options) { - this.getCurrentPosition(successCallback, errorCallback, options); - - var self = this; - var watchId = setInterval(function() { - self.getCurrentPosition(successCallback, errorCallback, options); - }, 10000); - - return watchId; - }, - - clearWatch: function(watchId) { - clearInterval(watchId); - }, - - getPermission: function(siteName, imageUrl, extraMessage) { - // for now just say yes :) - return true; - } - - }; -}); - -// If you have Gears installed use that, else use Ajax ClientLocation -navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation(); - -})(); -} diff --git a/lib/action.php b/lib/action.php index 4e629c2bc3..284f160e67 100644 --- a/lib/action.php +++ b/lib/action.php @@ -394,8 +394,7 @@ class Action extends HTMLOutputter // lawsuit { $theme = new Theme($mainTheme); - // Some themes may have external stylesheets, such as using the - // Google Font APIs to load webfonts. + // Some themes may have external stylesheets foreach ($theme->getExternals() as $url) { $this->cssLink($url, $mainTheme, $media); } diff --git a/lib/searchaction.php b/lib/searchaction.php index f8acf34f07..aea8860356 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -137,7 +137,7 @@ class SearchAction extends Action * [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s) * [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s) -* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s) +* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s) * [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s) "), $qe, $qe, $qe, $qe); $message .= "\n"; diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index d84bdd4fd1..9cff720c77 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 1c67521ba8..f605c4f0c3 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10620,7 +10620,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 57568a9105..e1f428d81e 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10620,7 +10620,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/ast/LC_MESSAGES/statusnet.po b/locale/ast/LC_MESSAGES/statusnet.po index 12c6f8cd52..5d9ee350ee 100644 --- a/locale/ast/LC_MESSAGES/statusnet.po +++ b/locale/ast/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/be-tarask/LC_MESSAGES/statusnet.po b/locale/be-tarask/LC_MESSAGES/statusnet.po index ef26a6b644..7197dd1ba3 100644 --- a/locale/be-tarask/LC_MESSAGES/statusnet.po +++ b/locale/be-tarask/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10558,7 +10558,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index d3cc337c3c..44bdd171ae 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/bn_IN/LC_MESSAGES/statusnet.po b/locale/bn_IN/LC_MESSAGES/statusnet.po index d1c9930e93..424bfa845c 100644 --- a/locale/bn_IN/LC_MESSAGES/statusnet.po +++ b/locale/bn_IN/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 103f031466..1fcd9e18ad 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 203d88702b..42ca707bec 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 802ca819ef..fba1d58777 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # digital dreamer, 2014 msgid "" @@ -10528,7 +10528,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po index 22b97ee042..7461fd0358 100644 --- a/locale/da/LC_MESSAGES/statusnet.po +++ b/locale/da/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 7bc0a2cd22..84e97e91f3 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # D P, 2015 msgid "" @@ -10497,7 +10497,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index a16b96cf75..776da8cf9e 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -10496,7 +10496,7 @@ msgid "" "\n" "* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)\n" -"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n" +"* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)\n" "* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 6bf784e322..dff9d4adbe 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Luke HollinsNote: Please set $min_cachePath
+
Note: Please set $min_cachePath
in /min/config.php to improve performance.
Note: Your webserver does not seem to - support mod_rewrite (used in /min/.htaccess). Your Minify URIs will contain "?", which + support mod_rewrite (used in /min/.htaccess). Your Minify URIs will contain "?", which may reduce the benefit of proxy cache servers.
@@ -100,9 +100,9 @@ available URIs to add.@import
If your CSS files contain @import
declarations, Minify will not
+
If your CSS files contain @import
declarations, Minify will not
remove them. Therefore, you will want to remove those that point to files already
-in your list, and move any others to the top of the first file in your list
+in your list, and move any others to the top of the first file in your list
(imports below any styles will be ignored by browsers as invalid).
If you desire, you can use Minify URIs in imports and they will not be touched
by Minify. E.g. @import "/min/?g=css2";
@import "/min/?g=css2";
<
Need help? Search or post to the Minify discussion list.
-This app is minified :) view -source
- - - '; -} - - - - -/** - * A ReCaptchaResponse is returned from recaptcha_check_answer() - */ -class ReCaptchaResponse { - var $is_valid; - var $error; -} - - -/** - * Calls an HTTP POST function to verify if the user's guess was correct - * @param string $privkey - * @param string $remoteip - * @param string $challenge - * @param string $response - * @param array $extra_params an array of extra variables to post to the server - * @return ReCaptchaResponse - */ -function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) -{ - if ($privkey == null || $privkey == '') { - die ("To use reCAPTCHA you must get an API key from http://recaptcha.net/api/getkey"); - } - - if ($remoteip == null || $remoteip == '') { - die ("For security reasons, you must pass the remote ip to reCAPTCHA"); - } - - - - //discard spam submissions - if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { - $recaptcha_response = new ReCaptchaResponse(); - $recaptcha_response->is_valid = false; - $recaptcha_response->error = 'incorrect-captcha-sol'; - return $recaptcha_response; - } - - $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify", - array ( - 'privatekey' => $privkey, - 'remoteip' => $remoteip, - 'challenge' => $challenge, - 'response' => $response - ) + $extra_params - ); - - $answers = explode ("\n", $response [1]); - $recaptcha_response = new ReCaptchaResponse(); - - if (trim ($answers [0]) == 'true') { - $recaptcha_response->is_valid = true; - } - else { - $recaptcha_response->is_valid = false; - $recaptcha_response->error = $answers [1]; - } - return $recaptcha_response; - -} - -/** - * gets a URL where the user can sign up for reCAPTCHA. If your application - * has a configuration page where you enter a key, you should provide a link - * using this function. - * @param string $domain The domain where the page is hosted - * @param string $appname The name of your application - */ -function recaptcha_get_signup_url ($domain = null, $appname = null) { - return "http://recaptcha.net/api/getkey?" . _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname)); -} - -function _recaptcha_aes_pad($val) { - $block_size = 16; - $numpad = $block_size - (strlen ($val) % $block_size); - return str_pad($val, strlen ($val) + $numpad, chr($numpad)); -} - -/* Mailhide related code */ - -function _recaptcha_aes_encrypt($val,$ky) { - if (! function_exists ("mcrypt_encrypt")) { - die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); - } - $mode=MCRYPT_MODE_CBC; - $enc=MCRYPT_RIJNDAEL_128; - $val=_recaptcha_aes_pad($val); - return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); -} - - -function _recaptcha_mailhide_urlbase64 ($x) { - return strtr(base64_encode ($x), '+/', '-_'); -} - -/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ -function recaptcha_mailhide_url($pubkey, $privkey, $email) { - if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { - die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . - "you can do so at http://mailhide.recaptcha.net/apikey"); - } - - - $ky = pack('H*', $privkey); - $cryptmail = _recaptcha_aes_encrypt ($email, $ky); - - return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail); -} - -/** - * gets the parts of the email to expose to the user. - * eg, given johndoe@example,com return ["john", "example.com"]. - * the email is then displayed as john...@example.com - */ -function _recaptcha_mailhide_email_parts ($email) { - $arr = preg_split("/@/", $email ); - - if (strlen ($arr[0]) <= 4) { - $arr[0] = substr ($arr[0], 0, 1); - } else if (strlen ($arr[0]) <= 6) { - $arr[0] = substr ($arr[0], 0, 3); - } else { - $arr[0] = substr ($arr[0], 0, 4); - } - return $arr; -} - -/** - * Gets html to display an email address given a public an private key. - * to get a key, go to: - * - * http://mailhide.recaptcha.net/apikey - */ -function recaptcha_mailhide_html($pubkey, $privkey, $email) { - $emailparts = _recaptcha_mailhide_email_parts ($email); - $url = recaptcha_mailhide_url ($pubkey, $privkey, $email); - - return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); - -} diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index a1fe90b4b4..366f1fb982 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -100,7 +100,7 @@ class SitemapPlugin extends Plugin /** * Meta tags for "claiming" a site * - * We add extra meta tags that search engines like Yahoo!, Google, and Bing + * We add extra meta tags that search engines like Yahoo! and Bing * require to let you claim your site. * * @param Action $action Action being executed @@ -118,8 +118,7 @@ class SitemapPlugin extends Plugin if (($singleUser && $actionName == 'showstream') || (!$singleUser && $actionName == 'public')) { - $keys = array('googlekey' => 'google-site-verification', - 'yahookey' => 'y_key', + $keys = array('yahookey' => 'y_key', 'bingkey' => 'msvalidate.01'); // XXX: is this the same for all sites? foreach ($keys as $config => $metaname) { @@ -184,7 +183,7 @@ class SitemapPlugin extends Plugin 'homepage' => $url, 'rawdescription' => // TRANS: Plugin description. - _m('This plugin allows creation of sitemaps for Bing, Yahoo! and Google.')); + _m('This plugin allows creation of sitemaps for Bing and Yahoo!.')); return true; } diff --git a/plugins/Sitemap/actions/sitemapadminpanel.php b/plugins/Sitemap/actions/sitemapadminpanel.php index 3304cfd011..3bf5310cb0 100644 --- a/plugins/Sitemap/actions/sitemapadminpanel.php +++ b/plugins/Sitemap/actions/sitemapadminpanel.php @@ -83,7 +83,7 @@ class SitemapadminpanelAction extends AdminPanelAction */ function saveSettings() { - static $settings = array('sitemap' => array('googlekey', 'yahookey', 'bingkey')); + static $settings = array('sitemap' => array('yahookey', 'bingkey')); $values = array(); @@ -162,14 +162,6 @@ class SitemapAdminPanelForm extends AdminForm { $this->out->elementStart('ul', 'form_data'); $this->li(); - $this->input('googlekey', - // TRANS: Field label. - _m('Google key'), - // TRANS: Title for field label. - _m('Google Webmaster Tools verification key.'), - 'sitemap'); - $this->unli(); - $this->li(); $this->input('yahookey', // TRANS: Field label. _m('Yahoo key'), diff --git a/plugins/Sitemap/locale/Sitemap.pot b/plugins/Sitemap/locale/Sitemap.pot index 70c9d6687d..09d94d6117 100644 --- a/plugins/Sitemap/locale/Sitemap.pot +++ b/plugins/Sitemap/locale/Sitemap.pot @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/af/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/af/LC_MESSAGES/Sitemap.po index 2f5e0b6c11..0d957a7399 100644 --- a/plugins/Sitemap/locale/af/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/af/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/ar/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ar/LC_MESSAGES/Sitemap.po index 2ae78f06e4..2ec71cb810 100644 --- a/plugins/Sitemap/locale/ar/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ar/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/arz/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/arz/LC_MESSAGES/Sitemap.po index cf28ec1680..dc125b0aca 100644 --- a/plugins/Sitemap/locale/arz/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/arz/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/ast/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ast/LC_MESSAGES/Sitemap.po index 6998d845dc..c220821155 100644 --- a/plugins/Sitemap/locale/ast/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ast/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/be-tarask/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/be-tarask/LC_MESSAGES/Sitemap.po index 85465f61b1..3a6531adf0 100644 --- a/plugins/Sitemap/locale/be-tarask/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/be-tarask/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/bg/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/bg/LC_MESSAGES/Sitemap.po index a026cb813a..e01582dd5f 100644 --- a/plugins/Sitemap/locale/bg/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/bg/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/bn_IN/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/bn_IN/LC_MESSAGES/Sitemap.po index 2038fcf524..a3d40c8b1e 100644 --- a/plugins/Sitemap/locale/bn_IN/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/bn_IN/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po index 917d4b2181..e71498a6b7 100644 --- a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "Tres al lec'hienn" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Alc'hwez Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "Tres al lec'hienn" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Gant an astenn-mañ e c'haller sevel tresoù lec'hiennoù evit Bing, Yahoo! ha Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Gant an astenn-mañ e c'haller sevel tresoù lec'hiennoù evit Bing and Yahoo!." diff --git a/plugins/Sitemap/locale/ca/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ca/LC_MESSAGES/Sitemap.po index 005e87be45..3162496ebe 100644 --- a/plugins/Sitemap/locale/ca/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ca/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/cs/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/cs/LC_MESSAGES/Sitemap.po index 4f378db122..53debc7d9f 100644 --- a/plugins/Sitemap/locale/cs/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/cs/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/da/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/da/LC_MESSAGES/Sitemap.po index 7964ddbfd7..c6b1f04a60 100644 --- a/plugins/Sitemap/locale/da/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/da/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po index a3297f46d5..56cb37d659 100644 --- a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "Sitemap" msgid "Sitemap settings for this StatusNet site" msgstr "Sitemap-Einstellungen dieser StatusNet-Website" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Google-Schlüssel" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Google Webmaster-Tools-Verifikationsschlüssel." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "Sitemap" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Dieses Plugin ermöglicht die Erstellung von Sitemaps für Bing, Yahoo! und Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Dieses Plugin ermöglicht die Erstellung von Sitemaps für Bing and Yahoo!." diff --git a/plugins/Sitemap/locale/diq/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/diq/LC_MESSAGES/Sitemap.po index 62122ae525..bb712f812e 100644 --- a/plugins/Sitemap/locale/diq/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/diq/LC_MESSAGES/Sitemap.po @@ -26,14 +26,6 @@ msgstr "Pusulay sita" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -msgid "Google key" -msgstr "Google kesa" - -#. TRANS: Title for field label. -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. msgid "Yahoo key" msgstr "Yahoo kesa" @@ -69,5 +61,5 @@ msgid "Sitemap" msgstr "Pusulay sita" #. TRANS: Plugin description. -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/el/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/el/LC_MESSAGES/Sitemap.po index 56ea730d26..4d10db9d5b 100644 --- a/plugins/Sitemap/locale/el/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/el/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: msgid "" msgstr "" @@ -27,16 +27,6 @@ msgstr "" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "" - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." msgstr "" diff --git a/plugins/Sitemap/locale/en_GB/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/en_GB/LC_MESSAGES/Sitemap.po index 6a279e69c5..aa6f2a9587 100644 --- a/plugins/Sitemap/locale/en_GB/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/en_GB/LC_MESSAGES/Sitemap.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Luke HollinsToday we’ve turned on PuSH support for the more than 10.5 million blogs on WordPress.com. There’s nothing to configure, it’s working right now behind the scenes to help others keep up to date with your posts.
For those using the WordPress.org software we are releasing a new PuSH plugin: PuSHPress. This plugin differs from the current PuSH related plugins by including a built-in hub.
-For more PuSH related reading check out the PubSubHubbub project site and Google Group. And if you really want to geek out there’s always the PubSubHubbub Spec
Genericons are vector icons embedded in a webfont designed to be clean and simple keeping with a generic aesthetic. Use for instant HiDPI or to easily change colors on the fly.
-