From 11c57e7aee073f7587e0594577da385e85f168bc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 20 Mar 2016 13:06:58 +0000 Subject: [PATCH] Remove Google References This removes most references to Google, with some remaining since they may point to things which are still relevant. References to Google Code, Google Buzz and Google Maps have been removed --- CONFIGURE | 11 +- EVENTS.txt | 7 +- PLUGINS.txt | 12 +- README.md | 5 +- actions/apitimelinefriends.php | 4 +- db/notice_source.sql | 8 +- .../HTMLPurifier/AttrDef/CSS/FontFamily.php | 2 - .../ConfigSchema/schema/URI.Munge.txt | 98 +-- .../HTMLPurifier/Injector/Linkify.php | 2 +- extlib/OAuth.php | 29 +- extlib/README | 2 +- extlib/php-gettext/README | 2 +- js/extlib/jquery-ui/jquery-ui.js | 1 - js/extlib/jquery.js | 1 - js/geometa.js | 217 ------ lib/action.php | 3 +- lib/searchaction.php | 2 +- locale/af/LC_MESSAGES/statusnet.po | 4 +- locale/ar/LC_MESSAGES/statusnet.po | 4 +- locale/arz/LC_MESSAGES/statusnet.po | 4 +- locale/ast/LC_MESSAGES/statusnet.po | 4 +- locale/be-tarask/LC_MESSAGES/statusnet.po | 4 +- locale/bg/LC_MESSAGES/statusnet.po | 4 +- locale/bn_IN/LC_MESSAGES/statusnet.po | 4 +- locale/br/LC_MESSAGES/statusnet.po | 4 +- locale/ca/LC_MESSAGES/statusnet.po | 4 +- locale/cs/LC_MESSAGES/statusnet.po | 4 +- locale/da/LC_MESSAGES/statusnet.po | 4 +- locale/de/LC_MESSAGES/statusnet.po | 4 +- locale/el/LC_MESSAGES/statusnet.po | 4 +- locale/en_GB/LC_MESSAGES/statusnet.po | 6 +- locale/eo/LC_MESSAGES/statusnet.po | 4 +- locale/es/LC_MESSAGES/statusnet.po | 6 +- locale/eu/LC_MESSAGES/statusnet.po | 4 +- locale/fa/LC_MESSAGES/statusnet.po | 4 +- locale/fi/LC_MESSAGES/statusnet.po | 4 +- locale/fr/LC_MESSAGES/statusnet.po | 4 +- locale/fur/LC_MESSAGES/statusnet.po | 4 +- locale/gl/LC_MESSAGES/statusnet.po | 4 +- locale/he/LC_MESSAGES/statusnet.po | 4 +- locale/hsb/LC_MESSAGES/statusnet.po | 4 +- locale/hu/LC_MESSAGES/statusnet.po | 4 +- locale/hy_AM/LC_MESSAGES/statusnet.po | 4 +- locale/ia/LC_MESSAGES/statusnet.po | 4 +- locale/id/LC_MESSAGES/statusnet.po | 4 +- locale/io/LC_MESSAGES/statusnet.po | 4 +- locale/is/LC_MESSAGES/statusnet.po | 4 +- locale/it/LC_MESSAGES/statusnet.po | 6 +- locale/ja/LC_MESSAGES/statusnet.po | 4 +- locale/ka/LC_MESSAGES/statusnet.po | 4 +- locale/ko/LC_MESSAGES/statusnet.po | 4 +- locale/ksh/LC_MESSAGES/statusnet.po | 4 +- locale/lb/LC_MESSAGES/statusnet.po | 4 +- locale/lt/LC_MESSAGES/statusnet.po | 4 +- locale/lv/LC_MESSAGES/statusnet.po | 4 +- locale/mg/LC_MESSAGES/statusnet.po | 4 +- locale/mk/LC_MESSAGES/statusnet.po | 4 +- locale/ml/LC_MESSAGES/statusnet.po | 4 +- locale/ms/LC_MESSAGES/statusnet.po | 4 +- locale/my/LC_MESSAGES/statusnet.po | 4 +- locale/nb/LC_MESSAGES/statusnet.po | 4 +- locale/ne/LC_MESSAGES/statusnet.po | 4 +- locale/nl/LC_MESSAGES/statusnet.po | 4 +- locale/nn/LC_MESSAGES/statusnet.po | 4 +- locale/pl/LC_MESSAGES/statusnet.po | 4 +- locale/pt/LC_MESSAGES/statusnet.po | 4 +- locale/pt_BR/LC_MESSAGES/statusnet.po | 6 +- locale/ro_RO/LC_MESSAGES/statusnet.po | 4 +- locale/ru/LC_MESSAGES/statusnet.po | 6 +- locale/sl/LC_MESSAGES/statusnet.po | 4 +- locale/sr-ec/LC_MESSAGES/statusnet.po | 4 +- locale/statusnet.pot | 2 +- locale/sv/LC_MESSAGES/statusnet.po | 4 +- locale/ta/LC_MESSAGES/statusnet.po | 4 +- locale/te/LC_MESSAGES/statusnet.po | 4 +- locale/tl/LC_MESSAGES/statusnet.po | 4 +- locale/tr/LC_MESSAGES/statusnet.po | 4 +- locale/uk/LC_MESSAGES/statusnet.po | 4 +- locale/ur_PK/LC_MESSAGES/statusnet.po | 4 +- locale/vi/LC_MESSAGES/statusnet.po | 4 +- locale/zh/LC_MESSAGES/statusnet.po | 4 +- locale/zh_CN/LC_MESSAGES/statusnet.po | 4 +- locale/zh_TW/LC_MESSAGES/statusnet.po | 4 +- plugins/BitlyUrl/BitlyUrlPlugin.php | 1 - .../lib/extendedprofilewidget.php | 1 - .../locale/eu/LC_MESSAGES/ForceGroup.po | 4 +- plugins/LRDD/lib/discovery.php | 5 +- plugins/Mapstraction/MapstractionPlugin.php | 8 +- plugins/Mapstraction/OpenLayers/OpenLayers.js | 2 +- .../OpenLayers/theme/default/google.css | 10 - .../OpenLayers/theme/default/style.css | 90 +-- .../Mapstraction/js/mxn.(provider).core.js | 116 +-- plugins/Mapstraction/js/mxn.cloudmade.core.js | 20 +- plugins/Mapstraction/js/mxn.core.js | 145 ++-- .../Mapstraction/js/mxn.geocommons.core.js | 35 +- plugins/Mapstraction/js/mxn.google.core.js | 519 ------------- .../Mapstraction/js/mxn.google.geocoder.js | 179 ----- plugins/Mapstraction/js/mxn.googlev3.core.js | 443 ----------- plugins/Mapstraction/js/mxn.js | 83 +- .../Mapstraction/js/mxn.openlayers.core.js | 64 +- plugins/Minify/extlib/minify/README.txt | 22 +- plugins/Minify/extlib/minify/UPGRADING.txt | 8 +- plugins/Minify/extlib/minify/min/README.txt | 28 +- .../extlib/minify/min/builder/index.php | 21 +- .../Minify/extlib/minify/min/lib/JSMin.php | 33 +- .../Minify/extlib/minify/min/lib/Minify.php | 167 ++-- .../extlib/minify/min/lib/Minify/CSS.php | 7 +- .../minify/min/lib/Minify/CSS/Compressor.php | 91 ++- .../minify/min/lib/Minify/Controller/Page.php | 30 +- .../extlib/minify/min/lib/Minify/Packer.php | 11 +- plugins/OStatus/lib/magicenvelope.php | 5 +- plugins/OStatus/tests/MagicEnvelopeTest.php | 1 - .../PiwikAnalytics/PiwikAnalyticsPlugin.php | 2 +- plugins/Recaptcha/LICENSE | 22 - plugins/Recaptcha/README | 28 - plugins/Recaptcha/RecaptchaPlugin.php | 119 --- plugins/Recaptcha/locale/Recaptcha.pot | 35 - .../locale/af/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ar/LC_MESSAGES/Recaptcha.po | 36 - .../locale/arz/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ast/LC_MESSAGES/Recaptcha.po | 36 - .../locale/be-tarask/LC_MESSAGES/Recaptcha.po | 36 - .../locale/bg/LC_MESSAGES/Recaptcha.po | 36 - .../locale/bn_IN/LC_MESSAGES/Recaptcha.po | 36 - .../locale/br/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ca/LC_MESSAGES/Recaptcha.po | 36 - .../locale/cs/LC_MESSAGES/Recaptcha.po | 36 - .../locale/da/LC_MESSAGES/Recaptcha.po | 36 - .../locale/de/LC_MESSAGES/Recaptcha.po | 36 - .../locale/el/LC_MESSAGES/Recaptcha.po | 36 - .../locale/en_GB/LC_MESSAGES/Recaptcha.po | 37 - .../locale/eo/LC_MESSAGES/Recaptcha.po | 36 - .../locale/es/LC_MESSAGES/Recaptcha.po | 37 - .../locale/eu/LC_MESSAGES/Recaptcha.po | 36 - .../locale/fa/LC_MESSAGES/Recaptcha.po | 36 - .../locale/fi/LC_MESSAGES/Recaptcha.po | 36 - .../locale/fr/LC_MESSAGES/Recaptcha.po | 36 - .../locale/fur/LC_MESSAGES/Recaptcha.po | 36 - .../locale/gl/LC_MESSAGES/Recaptcha.po | 36 - .../locale/he/LC_MESSAGES/Recaptcha.po | 36 - .../locale/hsb/LC_MESSAGES/Recaptcha.po | 36 - .../locale/hu/LC_MESSAGES/Recaptcha.po | 36 - .../locale/hy_AM/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ia/LC_MESSAGES/Recaptcha.po | 36 - .../locale/id/LC_MESSAGES/Recaptcha.po | 36 - .../locale/io/LC_MESSAGES/Recaptcha.po | 37 - .../locale/is/LC_MESSAGES/Recaptcha.po | 36 - .../locale/it/LC_MESSAGES/Recaptcha.po | 37 - .../locale/ja/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ka/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ko/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ksh/LC_MESSAGES/Recaptcha.po | 36 - .../locale/lb/LC_MESSAGES/Recaptcha.po | 36 - .../locale/lt/LC_MESSAGES/Recaptcha.po | 36 - .../locale/lv/LC_MESSAGES/Recaptcha.po | 36 - .../locale/mg/LC_MESSAGES/Recaptcha.po | 36 - .../locale/mk/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ml/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ms/LC_MESSAGES/Recaptcha.po | 36 - .../locale/my/LC_MESSAGES/Recaptcha.po | 36 - .../locale/nb/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ne/LC_MESSAGES/Recaptcha.po | 36 - .../locale/nl/LC_MESSAGES/Recaptcha.po | 36 - .../locale/nn/LC_MESSAGES/Recaptcha.po | 36 - .../locale/pl/LC_MESSAGES/Recaptcha.po | 36 - .../locale/pt/LC_MESSAGES/Recaptcha.po | 36 - .../locale/pt_BR/LC_MESSAGES/Recaptcha.po | 37 - .../locale/ro_RO/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ru/LC_MESSAGES/Recaptcha.po | 36 - .../locale/sl/LC_MESSAGES/Recaptcha.po | 36 - .../locale/sr-ec/LC_MESSAGES/Recaptcha.po | 36 - .../locale/sv/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ta/LC_MESSAGES/Recaptcha.po | 36 - .../locale/te/LC_MESSAGES/Recaptcha.po | 36 - .../locale/tl/LC_MESSAGES/Recaptcha.po | 36 - .../locale/tr/LC_MESSAGES/Recaptcha.po | 36 - .../locale/uk/LC_MESSAGES/Recaptcha.po | 36 - .../locale/ur_PK/LC_MESSAGES/Recaptcha.po | 36 - .../locale/vi/LC_MESSAGES/Recaptcha.po | 36 - .../locale/zh/LC_MESSAGES/Recaptcha.po | 36 - .../locale/zh_CN/LC_MESSAGES/Recaptcha.po | 36 - .../locale/zh_TW/LC_MESSAGES/Recaptcha.po | 36 - plugins/Recaptcha/recaptchalib.php | 276 ------- plugins/Sitemap/SitemapPlugin.php | 7 +- plugins/Sitemap/actions/sitemapadminpanel.php | 10 +- plugins/Sitemap/locale/Sitemap.pot | 12 +- .../Sitemap/locale/af/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ar/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/arz/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ast/LC_MESSAGES/Sitemap.po | 14 +- .../locale/be-tarask/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/bg/LC_MESSAGES/Sitemap.po | 14 +- .../locale/bn_IN/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/br/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/ca/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/cs/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/da/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/de/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/diq/LC_MESSAGES/Sitemap.po | 10 +- .../Sitemap/locale/el/LC_MESSAGES/Sitemap.po | 14 +- .../locale/en_GB/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/eo/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/es/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/eu/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/fa/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/fi/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/fr/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/fur/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/gl/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/he/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/hsb/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/hu/LC_MESSAGES/Sitemap.po | 14 +- .../locale/hy_AM/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ia/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/id/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/io/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/is/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/it/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ja/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ka/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ko/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ksh/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/lb/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/lt/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/lv/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/mg/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/mk/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/ml/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ms/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/my/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/nb/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ne/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/nl/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/nn/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/pl/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/pt/LC_MESSAGES/Sitemap.po | 14 +- .../locale/pt_BR/LC_MESSAGES/Sitemap.po | 14 +- .../locale/ro_RO/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ru/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/sl/LC_MESSAGES/Sitemap.po | 14 +- .../locale/sr-ec/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/sv/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/ta/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/te/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/tl/LC_MESSAGES/Sitemap.po | 16 +- .../Sitemap/locale/tr/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/uk/LC_MESSAGES/Sitemap.po | 16 +- .../locale/ur_PK/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/vi/LC_MESSAGES/Sitemap.po | 14 +- .../Sitemap/locale/zh/LC_MESSAGES/Sitemap.po | 14 +- .../locale/zh_CN/LC_MESSAGES/Sitemap.po | 14 +- .../locale/zh_TW/LC_MESSAGES/Sitemap.po | 14 +- .../webfinger/example@example.com.xml | 14 +- tests/ActivityParseTests.php | 29 +- theme/base/images/icons/README | 2 +- theme/neo-quitter/README.md | 30 +- theme/neo-quitter/css/genericons/example.html | 719 ------------------ .../neo-quitter/css/genericons/genericons.css | 8 +- theme/neo/README | 2 +- 259 files changed, 860 insertions(+), 6573 deletions(-) delete mode 100644 js/geometa.js delete mode 100644 plugins/Mapstraction/OpenLayers/theme/default/google.css delete mode 100644 plugins/Mapstraction/js/mxn.google.core.js delete mode 100644 plugins/Mapstraction/js/mxn.google.geocoder.js delete mode 100644 plugins/Mapstraction/js/mxn.googlev3.core.js delete mode 100644 plugins/Recaptcha/LICENSE delete mode 100644 plugins/Recaptcha/README delete mode 100644 plugins/Recaptcha/RecaptchaPlugin.php delete mode 100644 plugins/Recaptcha/locale/Recaptcha.pot delete mode 100644 plugins/Recaptcha/locale/af/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ar/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/arz/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ast/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/be-tarask/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/bg/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/bn_IN/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/br/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ca/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/cs/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/da/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/el/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/en_GB/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/eo/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/es/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/eu/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/fa/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/fi/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/gl/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/he/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/hsb/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/hu/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/hy_AM/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/id/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/io/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/is/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/it/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ja/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ka/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ko/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ksh/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/lb/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/lt/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/lv/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/mg/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ml/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ms/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/my/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ne/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/nn/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/pt_BR/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ro_RO/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/sl/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/sr-ec/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/sv/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ta/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/te/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/tr/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/ur_PK/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/vi/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/zh/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/zh_CN/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/locale/zh_TW/LC_MESSAGES/Recaptcha.po delete mode 100644 plugins/Recaptcha/recaptchalib.php delete mode 100644 theme/neo-quitter/css/genericons/example.html 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 @@ false Wed Mar 31 01:33:02 +0000 2010 - <a href="http://code.google.com/p/microblog-purple/">mbpidgin</a> + <a href="http://somesourcecode.net/microblog/">mbpidgin</a> 26674201 @@ -275,7 +275,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $notices = array(); $stream = new InboxNoticeStream($this->target, $this->scoped); - + $notice = $stream->getNotices(($this->page-1) * $this->count, $this->count, $this->since_id, diff --git a/db/notice_source.sql b/db/notice_source.sql index dec8080a01..69bf928e55 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -27,12 +27,12 @@ VALUES ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()), ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), - ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()), + ('Jiminy','Jiminy','', now()), ('LaTwit','LaTwit','http://latwit.mac65.com/', now()), ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()), ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()), ('maisha', 'Maisha', 'http://maisha.grango.org/', now()), - ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()), + ('mbpidgin','mbpidgin','', now()), ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()), ('moconica','Moconica','http://moconica.com/', now()), ('mustard', 'mustard', 'http://mustard.macno.org', now()), @@ -41,10 +41,10 @@ VALUES ('Pikchur','Pikchur','http://www.pikchur.com/', now()), ('Ping.fm','Ping.fm','http://ping.fm/', now()), ('pingvine','PingVine','http://pingvine.com/', now()), - ('pocketwit','PockeTwit','http://code.google.com/p/pocketwit/', now()), + ('pocketwit','PockeTwit','', now()), ('posty','Posty','http://spreadingfunkyness.com/posty/', now()), ('qtwitter','qTwitter','http://qtwitter.ayoy.net/', now()), - ('qwit', 'Qwit', 'http://code.google.com/p/qwit/', now()), + ('qwit', 'Qwit', '', now()), ('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', now()), ('rssdent','rssdent','http://github.com/zcopley/rssdent/tree/master', now()), ('rygh.no','rygh.no','http://rygh.no/', now()), diff --git a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php index 74e24c8816..86101020dc 100644 --- a/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php +++ b/extlib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php @@ -130,8 +130,6 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef // . See // the CSS3 spec for more examples: // - // You can see live samples of these on the Internet: - // // However, most of these fonts have ASCII equivalents: // for example, 'MS Mincho', and it's considered // professional to use ASCII font names instead of diff --git a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt index 58c81dcc44..179f94eb03 100644 --- a/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt +++ b/extlib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt @@ -9,75 +9,75 @@ DEFAULT: NULL absolute URIs into another URI, usually a URI redirection service. This directive accepts a URI, formatted with a %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: -

-
    +

    +
    • - Prevent PageRank leaks, while being fairly transparent - to users (you may also want to add some client side JavaScript to - override the text in the statusbar). Notice: - Many security experts believe that this form of protection does not deter spam-bots. + Prevent PageRank leaks, while being fairly transparent + to users (you may also want to add some client side JavaScript to + override the text in the statusbar). Notice: + Many security experts believe that this form of protection does not deter spam-bots.
    • - Redirect users to a splash page telling them they are leaving your - website. While this is poor usability practice, it is often mandated - in corporate environments. + Redirect users to a splash page telling them they are leaving your + website. While this is poor usability practice, it is often mandated + in corporate environments.
      • -
    -

    +

+

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: -

- +

+
- - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + -
KeyDescriptionExample <a href="">
KeyDescriptionExample <a href="">
%r1 - The URI embeds a resource
(blank) - The URI is merely a link
%nThe name of the tag this URI came froma
%mThe name of the attribute this URI came fromhref
%pThe name of the CSS property this URI came from, or blank if irrelevant
%r1 - The URI embeds a resource
(blank) - The URI is merely a link
%nThe name of the tag this URI came froma
%mThe name of the attribute this URI came fromhref
%pThe 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 Hollins , 2015 msgid "" @@ -10497,9 +10497,9 @@ 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 "You can also try your search on other engines:\n\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* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" +msgstr "You can also try your search on other engines:\n\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* [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" #. TRANS: Menu item in search group navigation panel. #: lib/searchgroupnav.php:74 diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po index 7036fb13f6..ca1ef65206 100644 --- a/locale/eo/LC_MESSAGES/statusnet.po +++ b/locale/eo/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: # Manuel Ortega , 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/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 8e76a62ec0..dc9cbe2b8d 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/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: # Juan Riquelme González , 2015 msgid "" @@ -10497,9 +10497,9 @@ 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 "Puedes intentar tu búsqueda con otros buscadores:\n\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* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" +msgstr "Puedes intentar tu búsqueda con otros buscadores:\n\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* [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" #. TRANS: Menu item in search group navigation panel. #: lib/searchgroupnav.php:74 diff --git a/locale/eu/LC_MESSAGES/statusnet.po b/locale/eu/LC_MESSAGES/statusnet.po index 455dd29108..22afeda655 100644 --- a/locale/eu/LC_MESSAGES/statusnet.po +++ b/locale/eu/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/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index b989183251..3830fbbb65 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/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 "" @@ -10465,7 +10465,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/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 40497d014d..2986ba0b63 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/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/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 493ddb96a1..06a354ef17 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/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: # b216 , 2015 # kris , 2015 @@ -10499,7 +10499,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/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po index 7dd32f0e55..29254fd306 100644 --- a/locale/fur/LC_MESSAGES/statusnet.po +++ b/locale/fur/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/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 3480ed67fd..ede1bd82fb 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/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/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 693d932bf7..68ff372bf2 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/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/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 4d5ef58438..1a829de8b8 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/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/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po index 901accfa86..f40e93bcf6 100644 --- a/locale/hu/LC_MESSAGES/statusnet.po +++ b/locale/hu/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/hy_AM/LC_MESSAGES/statusnet.po b/locale/hy_AM/LC_MESSAGES/statusnet.po index 41cf803172..ff8d4f6898 100644 --- a/locale/hy_AM/LC_MESSAGES/statusnet.po +++ b/locale/hy_AM/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/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 7f922468e8..6f7199a4d9 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/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/id/LC_MESSAGES/statusnet.po b/locale/id/LC_MESSAGES/statusnet.po index 4846251cec..7eb24e0bb1 100644 --- a/locale/id/LC_MESSAGES/statusnet.po +++ b/locale/id/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: # zk , 2015 msgid "" @@ -10466,7 +10466,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/io/LC_MESSAGES/statusnet.po b/locale/io/LC_MESSAGES/statusnet.po index 97ab336027..75e996b575 100644 --- a/locale/io/LC_MESSAGES/statusnet.po +++ b/locale/io/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: # Ciencisto Dementa , 2015 # William , 2015 @@ -10498,7 +10498,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/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index b1549f8b95..9b13f5be8b 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/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/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 5623ebb2a4..e12a6c3bdb 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/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: # Tommaso Amici , 2015 msgid "" @@ -10497,9 +10497,9 @@ 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 "Puoi provare a fare una ricerca su altri motori di ricerca:\n\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* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" +msgstr "Puoi provare a fare una ricerca su altri motori di ricerca:\n\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* [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" #. TRANS: Menu item in search group navigation panel. #: lib/searchgroupnav.php:74 diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 96bf7bffe4..4864ab23f5 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/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 "" @@ -10465,7 +10465,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/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po index 8300bd54b4..f2c70c9793 100644 --- a/locale/ka/LC_MESSAGES/statusnet.po +++ b/locale/ka/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 "" @@ -10465,7 +10465,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/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index d1e6376325..9bb2d65588 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/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 "" @@ -10465,7 +10465,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/ksh/LC_MESSAGES/statusnet.po b/locale/ksh/LC_MESSAGES/statusnet.po index a4a69e7ec1..7f199c2ce6 100644 --- a/locale/ksh/LC_MESSAGES/statusnet.po +++ b/locale/ksh/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 "" @@ -10527,7 +10527,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/lb/LC_MESSAGES/statusnet.po b/locale/lb/LC_MESSAGES/statusnet.po index f8b92679a3..e526461b01 100644 --- a/locale/lb/LC_MESSAGES/statusnet.po +++ b/locale/lb/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/lt/LC_MESSAGES/statusnet.po b/locale/lt/LC_MESSAGES/statusnet.po index 06cf18f19c..3158cb3856 100644 --- a/locale/lt/LC_MESSAGES/statusnet.po +++ b/locale/lt/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 "" @@ -10527,7 +10527,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/lv/LC_MESSAGES/statusnet.po b/locale/lv/LC_MESSAGES/statusnet.po index 06889e9c35..f4efb916e8 100644 --- a/locale/lv/LC_MESSAGES/statusnet.po +++ b/locale/lv/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 "" @@ -10527,7 +10527,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/mg/LC_MESSAGES/statusnet.po b/locale/mg/LC_MESSAGES/statusnet.po index 429d3f15ef..a15f964eb7 100644 --- a/locale/mg/LC_MESSAGES/statusnet.po +++ b/locale/mg/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/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 68bbfd7c46..e8a35bb143 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/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/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po index 614142eba5..78157de94d 100644 --- a/locale/ml/LC_MESSAGES/statusnet.po +++ b/locale/ml/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/ms/LC_MESSAGES/statusnet.po b/locale/ms/LC_MESSAGES/statusnet.po index 2865f411a7..224d1ba935 100644 --- a/locale/ms/LC_MESSAGES/statusnet.po +++ b/locale/ms/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 "" @@ -10465,7 +10465,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/my/LC_MESSAGES/statusnet.po b/locale/my/LC_MESSAGES/statusnet.po index 1adfdd0cd6..9176a6c80c 100644 --- a/locale/my/LC_MESSAGES/statusnet.po +++ b/locale/my/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 "" @@ -10465,7 +10465,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/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 47e143606a..2ee61a0d4f 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/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: # abjectio, 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/ne/LC_MESSAGES/statusnet.po b/locale/ne/LC_MESSAGES/statusnet.po index 928a109ccd..0a0ee80770 100644 --- a/locale/ne/LC_MESSAGES/statusnet.po +++ b/locale/ne/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/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 91902f8362..d0803f2b22 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/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/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 62dfa16624..b763dfb8bc 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/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/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index ffa2a3a7e9..15b72fc9e1 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/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: # Mateusz Zimniak , 2015 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/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 57f702dd2f..c4715065fc 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/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/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 291550a43c..be3279237d 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_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: # Carlos Eduardo Soares Turll , 2015 # no and no , 2015 @@ -10499,9 +10499,9 @@ 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 "Você pode também tentar pesquisar em outros mecanismos:\n\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* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" +msgstr "Você pode também tentar pesquisar em outros mecanismos:\n\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* [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" #. TRANS: Menu item in search group navigation panel. #: lib/searchgroupnav.php:74 diff --git a/locale/ro_RO/LC_MESSAGES/statusnet.po b/locale/ro_RO/LC_MESSAGES/statusnet.po index a19106bb50..113d2bd18c 100644 --- a/locale/ro_RO/LC_MESSAGES/statusnet.po +++ b/locale/ro_RO/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 "" @@ -10527,7 +10527,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/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 1bd8595bfa..1d31cf3d8e 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/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: # Boris Konstantinovich Lissov , 2015 msgid "" @@ -10559,9 +10559,9 @@ 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 "Вы также можете попытаться поискать при помощи других поисковиков:\n\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* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n" +msgstr "Вы также можете попытаться поискать при помощи других поисковиков:\n\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* [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" #. TRANS: Menu item in search group navigation panel. #: lib/searchgroupnav.php:74 diff --git a/locale/sl/LC_MESSAGES/statusnet.po b/locale/sl/LC_MESSAGES/statusnet.po index c0691e6130..5f3c97920b 100644 --- a/locale/sl/LC_MESSAGES/statusnet.po +++ b/locale/sl/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/sr-ec/LC_MESSAGES/statusnet.po b/locale/sr-ec/LC_MESSAGES/statusnet.po index 8e01d55c3e..b292c99bc7 100644 --- a/locale/sr-ec/LC_MESSAGES/statusnet.po +++ b/locale/sr-ec/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 "" @@ -10527,7 +10527,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/statusnet.pot b/locale/statusnet.pot index d670abee6a..f0fa31c473 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -9792,7 +9792,7 @@ msgid "" "* [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/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 7a56ef84e0..f8547350a2 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/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: # Kristoffer Grundström , 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/ta/LC_MESSAGES/statusnet.po b/locale/ta/LC_MESSAGES/statusnet.po index c88dc41379..cc79b8aafe 100644 --- a/locale/ta/LC_MESSAGES/statusnet.po +++ b/locale/ta/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/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 9894ecc8e7..7080968ddd 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/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/tl/LC_MESSAGES/statusnet.po b/locale/tl/LC_MESSAGES/statusnet.po index 32883b61ad..d62ca70361 100644 --- a/locale/tl/LC_MESSAGES/statusnet.po +++ b/locale/tl/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/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 3e79d202f2..efd26cef4b 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/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: # Furkan Kalkan , 2015 # Uğur KUYU , 2015 @@ -10498,7 +10498,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/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 53aae6acb6..6db5ff15ed 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/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 "" @@ -10527,7 +10527,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/ur_PK/LC_MESSAGES/statusnet.po b/locale/ur_PK/LC_MESSAGES/statusnet.po index 7c26799dd1..4023ffac26 100644 --- a/locale/ur_PK/LC_MESSAGES/statusnet.po +++ b/locale/ur_PK/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: # Aqeel Zafar , 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/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 9caed645f9..692fb213b0 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/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 "" @@ -10465,7 +10465,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/zh/LC_MESSAGES/statusnet.po b/locale/zh/LC_MESSAGES/statusnet.po index 0b95617c3a..e024fcf993 100644 --- a/locale/zh/LC_MESSAGES/statusnet.po +++ b/locale/zh/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 "" @@ -10465,7 +10465,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/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 9bfeed8178..8e702c1e0a 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/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 "" @@ -10465,7 +10465,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/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index e004dbe956..8cbf02124f 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/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: # Hong Xu , 2015 # Po-Chun Huang , 2015 @@ -10467,7 +10467,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/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index 13a1bf2ec4..ebaa2dbd2d 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -111,7 +111,6 @@ class BitlyUrlPlugin extends UrlShortenerPlugin */ protected function query($url) { - // http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/shorten $params = http_build_query(array( 'login' => $this->getLogin(), 'apiKey' => $this->getApiKey()), '', '&'); diff --git a/plugins/ExtendedProfile/lib/extendedprofilewidget.php b/plugins/ExtendedProfile/lib/extendedprofilewidget.php index f04dccd0ae..bf9703f513 100644 --- a/plugins/ExtendedProfile/lib/extendedprofilewidget.php +++ b/plugins/ExtendedProfile/lib/extendedprofilewidget.php @@ -306,7 +306,6 @@ class ExtendedProfileWidget extends Form 'facebook' => 'Facebook', 'linkedin' => 'LinkedIn', 'flickr' => 'Flickr', - 'google' => 'Google Profile', 'other' => 'Other', 'twitter' => 'Twitter' ), diff --git a/plugins/ForceGroup/locale/eu/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/eu/LC_MESSAGES/ForceGroup.po index fcf6e4a4e6..ed59600aa9 100644 --- a/plugins/ForceGroup/locale/eu/LC_MESSAGES/ForceGroup.po +++ b/plugins/ForceGroup/locale/eu/LC_MESSAGES/ForceGroup.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 "" @@ -29,4 +29,4 @@ msgstr "%1$s erabiltzailea ezin izan da %2$s taldera gehitu." msgid "" "Allows forced group memberships and forces all notices to appear in groups " "that users were forced in." -msgstr "Google Analytics erabiltzen du web gunera atzipenak jarraitu ahal izateko." +msgstr "" diff --git a/plugins/LRDD/lib/discovery.php b/plugins/LRDD/lib/discovery.php index b32ae13ec5..9825ea3cb7 100644 --- a/plugins/LRDD/lib/discovery.php +++ b/plugins/LRDD/lib/discovery.php @@ -37,7 +37,6 @@ if (!defined('GNUSOCIAL')) { exit(1); } class Discovery { const LRDD_REL = 'lrdd'; - const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from'; const HCARD = 'http://microformats.org/profile/hcard'; const MF2_HCARD = 'http://microformats.org/profile/h-card'; // microformats2 h-card @@ -117,7 +116,7 @@ class Discovery $headers[] = "Accept: {$link->type}"; } - $response = $client->get($xrd_uri, $headers); + $response = $client->get($xrd_uri, $headers); if ($response->getStatus() != 200) { throw new Exception('Unexpected HTTP status code.'); } @@ -199,5 +198,3 @@ class Discovery return $template; } } - - diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index fcc9d88e56..612dcd80cf 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -49,9 +49,9 @@ class MapstractionPlugin extends Plugin const VERSION = GNUSOCIAL_VERSION; /** provider name, one of: - 'cloudmade', 'google', 'microsoft', 'openlayers', 'yahoo' */ + 'cloudmade', 'microsoft', 'openlayers', 'yahoo' */ public $provider = 'openlayers'; - /** provider API key (or 'appid'), if required ('google' and 'yahoo' only) */ + /** provider API key (or 'appid'), if required ('yahoo' only) */ public $apikey = null; /** @@ -97,10 +97,6 @@ class MapstractionPlugin extends Plugin case 'cloudmade': $action->script('http://tile.cloudmade.com/wml/0.2/web-maps-lite.js'); break; - case 'google': - $action->script(sprintf('http://maps.google.com/maps?file=api&v=2&sensor=false&key=%s', - urlencode($this->apikey))); - break; case 'microsoft': $action->script((GNUsocial::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6'); break; diff --git a/plugins/Mapstraction/OpenLayers/OpenLayers.js b/plugins/Mapstraction/OpenLayers/OpenLayers.js index ea42b1db4e..2df823b414 100644 --- a/plugins/Mapstraction/OpenLayers/OpenLayers.js +++ b/plugins/Mapstraction/OpenLayers/OpenLayers.js @@ -1 +1 @@ -var OpenLayers={singleFile:true};(function(){var j=(typeof OpenLayers=="object"&&OpenLayers.singleFile);var a;window.OpenLayers={_scriptName:(!j)?"lib/OpenLayers.js":"OpenLayers.js",_getScriptLocation:function(){if(a!=undefined){return a}a="";var r=new RegExp("(^|(.*?\\/))("+OpenLayers._scriptName+")(\\?|$)");var n=document.getElementsByTagName("script");for(var p=0,h=n.length;p<\/script>"}else{var m=document.createElement("script");m.src=l+k[d];var f=document.getElementsByTagName("head").length?document.getElementsByTagName("head")[0]:document.body;f.appendChild(m)}}if(e){document.write(b.join(""))}}})();OpenLayers.VERSION_NUMBER="OpenLayers 2.10 -- $Revision: 10721 $";OpenLayers.String={startsWith:function(b,a){return(b.indexOf(a)==0)},contains:function(b,a){return(b.indexOf(a)!=-1)},trim:function(a){return a.replace(/^\s\s*/,"").replace(/\s\s*$/,"")},camelize:function(f){var d=f.split("-");var b=d[0];for(var c=1,a=d.length;c0){b=parseFloat(a.toPrecision(c))}return b},format:function(c,a,g,i){a=(typeof a!="undefined")?a:0;g=(typeof g!="undefined")?g:OpenLayers.Number.thousandsSeparator;i=(typeof i!="undefined")?i:OpenLayers.Number.decimalSeparator;if(a!=null){c=parseFloat(c.toFixed(a))}var b=c.toString().split(".");if(b.length==1&&a==null){a=0}var d=b[0];if(g){var e=/(-?[0-9]+)([0-9]{3})/;while(e.test(d)){d=d.replace(e,"$1"+g+"$2")}}var f;if(a==0){f=d}else{var h=b.length>1?b[1]:"0";if(a!=null){h=h+new Array(a-h.length+1).join("0")}f=d+i+h}return f}};if(!Number.prototype.limitSigDigs){Number.prototype.limitSigDigs=function(a){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"OpenLayers.Number.limitSigDigs"}));return OpenLayers.Number.limitSigDigs(this,a)}}OpenLayers.Function={bind:function(c,b){var a=Array.prototype.slice.apply(arguments,[2]);return function(){var d=a.concat(Array.prototype.slice.apply(arguments,[0]));return c.apply(b,d)}},bindAsEventListener:function(b,a){return function(c){return b.call(a,c||window.event)}},False:function(){return false},True:function(){return true}};if(!Function.prototype.bind){Function.prototype.bind=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"OpenLayers.Function.bind"}));Array.prototype.unshift.apply(arguments,[this]);return OpenLayers.Function.bind.apply(null,arguments)}}if(!Function.prototype.bindAsEventListener){Function.prototype.bindAsEventListener=function(a){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"OpenLayers.Function.bindAsEventListener"}));return OpenLayers.Function.bindAsEventListener(this,a)}}OpenLayers.Array={filter:function(g,f,b){var d=[];if(Array.prototype.filter){d=g.filter(f,b)}else{var a=g.length;if(typeof f!="function"){throw new TypeError()}for(var c=0;c1){b=d.prototype.initialize;d.prototype.initialize=function(){};c=new d();if(b===undefined){delete d.prototype.initialize}else{d.prototype.initialize=b}}g=d.prototype}else{g=d}OpenLayers.Util.extend(c,g)}e.prototype=c;return e};OpenLayers.Class.isPrototype=function(){};OpenLayers.Class.create=function(){return function(){if(arguments&&arguments[0]!=OpenLayers.Class.isPrototype){this.initialize.apply(this,arguments)}}};OpenLayers.Class.inherit=function(){var d=arguments[0];var e=new d(OpenLayers.Class.isPrototype);for(var c=1,a=arguments.length;c=0;a--){if(c[a]==b){c.splice(a,1)}}return c};OpenLayers.Util.clearArray=function(a){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"array = []"}));a.length=0};OpenLayers.Util.indexOf=function(d,c){if(typeof d.indexOf=="function"){return d.indexOf(c)}else{for(var b=0,a=d.length;b=0&&parseFloat(b)<1){e.style.filter="alpha(opacity="+(b*100)+")";e.style.opacity=b}else{if(parseFloat(b)==1){e.style.filter="";e.style.opacity=""}}};OpenLayers.Util.createDiv=function(a,i,h,f,e,c,b,g){var d=document.createElement("div");if(f){d.style.backgroundImage="url("+f+")"}if(!a){a=OpenLayers.Util.createUniqueID("OpenLayersDiv")}if(!e){e="absolute"}OpenLayers.Util.modifyDOMElement(d,a,i,h,e,c,b,g);return d};OpenLayers.Util.createImage=function(a,h,g,e,d,c,f,i){var b=document.createElement("img");if(!a){a=OpenLayers.Util.createUniqueID("OpenLayersDiv")}if(!d){d="relative"}OpenLayers.Util.modifyDOMElement(b,a,h,g,d,c,null,f);if(i){b.style.display="none";OpenLayers.Event.observe(b,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,b));OpenLayers.Event.observe(b,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,b))}b.style.alt=a;b.galleryImg="no";if(e){b.src=e}return b};OpenLayers.Util.setOpacity=function(b,a){OpenLayers.Util.modifyDOMElement(b,null,null,null,null,null,null,a)};OpenLayers.Util.onImageLoad=function(){if(!this.viewRequestID||(this.map&&this.viewRequestID==this.map.viewRequestID)){this.style.display=""}OpenLayers.Element.removeClass(this,"olImageLoadError")};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;OpenLayers.Util.onImageLoadError=function(){this._attempts=(this._attempts)?(this._attempts+1):1;if(this._attempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS){var d=this.urls;if(d&&d instanceof Array&&d.length>1){var e=this.src.toString();var c,a;for(a=0;c=d[a];a++){if(e.indexOf(c)!=-1){break}}var f=Math.floor(d.length*Math.random());var b=d[f];a=0;while(b==c&&a++<4){f=Math.floor(d.length*Math.random());b=d[f]}this.src=e.replace(c,b)}else{this.src=this.src}}else{OpenLayers.Element.addClass(this,"olImageLoadError")}this.style.display=""};OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(OpenLayers.Util.alphaHackNeeded==null){var d=navigator.appVersion.split("MSIE");var a=parseFloat(d[1]);var b=false;try{b=!!(document.body.filters)}catch(c){}OpenLayers.Util.alphaHackNeeded=(b&&(a>=5.5)&&(a<7))}return OpenLayers.Util.alphaHackNeeded};OpenLayers.Util.modifyAlphaImageDiv=function(a,b,j,i,g,f,c,d,h){OpenLayers.Util.modifyDOMElement(a,b,j,i,f,null,null,h);var e=a.childNodes[0];if(g){e.src=g}OpenLayers.Util.modifyDOMElement(e,a.id+"_innerImage",null,i,"relative",c);if(OpenLayers.Util.alphaHack()){if(a.style.display!="none"){a.style.display="inline-block"}if(d==null){d="scale"}a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+e.src+"', sizingMethod='"+d+"')";if(parseFloat(a.style.opacity)>=0&&parseFloat(a.style.opacity)<1){a.style.filter+=" alpha(opacity="+a.style.opacity*100+")"}e.style.filter="alpha(opacity=0)"}};OpenLayers.Util.createAlphaImageDiv=function(b,j,i,g,f,c,d,h,k){var a=OpenLayers.Util.createDiv();var e=OpenLayers.Util.createImage(null,null,null,null,null,null,null,false);a.appendChild(e);if(k){e.style.display="none";OpenLayers.Event.observe(e,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,a));OpenLayers.Event.observe(e,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,a))}OpenLayers.Util.modifyAlphaImageDiv(a,b,j,i,g,f,c,d,h);return a};OpenLayers.Util.upperCaseObject=function(b){var a={};for(var c in b){a[c.toUpperCase()]=b[c]}return a};OpenLayers.Util.applyDefaults=function(d,c){d=d||{};var b=typeof window.Event=="function"&&c instanceof window.Event;for(var a in c){if(d[a]===undefined||(!b&&c.hasOwnProperty&&c.hasOwnProperty(a)&&!d.hasOwnProperty(a))){d[a]=c[a]}}if(!b&&c&&c.hasOwnProperty&&c.hasOwnProperty("toString")&&!d.hasOwnProperty("toString")){d.toString=c.toString}return d};OpenLayers.Util.getParameterString=function(c){var b=[];for(var h in c){var g=c[h];if((g!=null)&&(typeof g!="function")){var d;if(typeof g=="object"&&g.constructor==Array){var e=[];var i;for(var a=0,f=g.length;a0)){if(!b){b=0}if(a[b].childNodes.length>1){return a.childNodes[1].nodeValue}else{if(a[b].childNodes.length==1){return a[b].firstChild.nodeValue}}}else{return""}};OpenLayers.Util.getXmlNodeValue=function(a){var b=null;OpenLayers.Util.Try(function(){b=a.text;if(!b){b=a.textContent}if(!b){b=a.firstChild.nodeValue}},function(){b=a.textContent});return b};OpenLayers.Util.mouseLeft=function(a,c){var b=(a.relatedTarget)?a.relatedTarget:a.toElement;while(b!=c&&b!=null){b=b.parentNode}return(b!=c)};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(b,a){if(a==null){a=OpenLayers.Util.DEFAULT_PRECISION}var b;if(a==0){b=parseFloat(b)}else{b=parseFloat(parseFloat(b).toPrecision(a))}return b};OpenLayers.Util.rad=function(a){return a*Math.PI/180};OpenLayers.Util.deg=function(a){return a*180/Math.PI};OpenLayers.Util.VincentyConstants={a:6378137,b:6356752.3142,f:1/298.257223563};OpenLayers.Util.distVincenty=function(g,e){var k=OpenLayers.Util.VincentyConstants;var M=k.a,K=k.b,G=k.f;var n=OpenLayers.Util.rad(e.lon-g.lon);var J=Math.atan((1-G)*Math.tan(OpenLayers.Util.rad(g.lat)));var I=Math.atan((1-G)*Math.tan(OpenLayers.Util.rad(e.lat)));var m=Math.sin(J),i=Math.cos(J);var l=Math.sin(I),h=Math.cos(I);var r=n,o=2*Math.PI;var q=20;while(Math.abs(r-o)>1e-12&&--q>0){var z=Math.sin(r),c=Math.cos(r);var N=Math.sqrt((h*z)*(h*z)+(i*l-m*h*c)*(i*l-m*h*c));if(N==0){return 0}var E=m*l+i*h*c;var y=Math.atan2(N,E);var j=Math.asin(i*h*z/N);var F=Math.cos(j)*Math.cos(j);var p=E-2*m*l/F;var v=G/16*F*(4+G*(4-3*F));o=r;r=n+(1-v)*G*Math.sin(j)*(y+v*N*(p+v*E*(-1+2*p*p)))}if(q==0){return NaN}var u=F*(M*M-K*K)/(K*K);var x=1+u/16384*(4096+u*(-768+u*(320-175*u)));var w=u/1024*(256+u*(-128+u*(74-47*u)));var D=w*N*(p+w/4*(E*(-1+2*p*p)-w/6*p*(-3+4*N*N)*(-3+4*p*p)));var t=K*x*(y-D);var H=t.toFixed(3)/1000;return H};OpenLayers.Util.destinationVincenty=function(l,P,E){var o=OpenLayers.Util;var i=o.VincentyConstants;var Q=i.a,O=i.b,J=i.f;var N=l.lon;var g=l.lat;var q=E;var D=o.rad(P);var G=Math.sin(D);var h=Math.cos(D);var F=(1-J)*Math.tan(o.rad(g));var c=1/Math.sqrt((1+F*F)),j=F*c;var p=Math.atan2(F,h);var y=c*G;var I=1-y*y;var t=I*(Q*Q-O*O)/(O*O);var x=1+t/16384*(4096+t*(-768+t*(320-175*t)));var v=t/1024*(256+t*(-128+t*(74-47*t)));var w=q/(O*x),K=2*Math.PI;while(Math.abs(w-K)>1e-12){var m=Math.cos(2*p+w);var R=Math.sin(w);var H=Math.cos(w);var z=v*R*(m+v/4*(H*(-1+2*m*m)-v/6*m*(-3+4*R*R)*(-3+4*m*m)));K=w;w=q/(O*x)+z}var M=j*R-c*H*h;var d=Math.atan2(j*H+c*R*h,(1-J)*Math.sqrt(y*y+M*M));var n=Math.atan2(R*G,c*H-j*R*h);var r=J/16*I*(4+J*(4-3*I));var k=n-(1-r)*J*y*(w+r*R*(m+r*H*(-1+2*m*m)));var e=Math.atan2(y,-M);return new OpenLayers.LonLat(N+o.deg(k),o.deg(d))};OpenLayers.Util.getParameters=function(b){b=b||window.location.href;var a="";if(OpenLayers.String.contains(b,"?")){var c=b.indexOf("?")+1;var e=OpenLayers.String.contains(b,"#")?b.indexOf("#"):b.length;a=b.substring(c,e)}var l={};var d=a.split(/[&;]/);for(var g=0,h=d.length;g1)?(1/b):b;return a};OpenLayers.Util.getResolutionFromScale=function(d,a){var b;if(d){if(a==null){a="degrees"}var c=OpenLayers.Util.normalizeScale(d);b=1/(c*OpenLayers.INCHES_PER_UNIT[a]*OpenLayers.DOTS_PER_INCH)}return b};OpenLayers.Util.getScaleFromResolution=function(b,a){if(a==null){a="degrees"}var c=b*OpenLayers.INCHES_PER_UNIT[a]*OpenLayers.DOTS_PER_INCH;return c};OpenLayers.Util.safeStopPropagation=function(a){OpenLayers.Event.stop(a,true)};OpenLayers.Util.pagePosition=function(f){var a=0,d=0;var b=f;var g=f;while(b){if(b==document.body){if(OpenLayers.Element.getStyle(g,"position")=="absolute"){break}}a+=b.offsetTop||0;d+=b.offsetLeft||0;g=b;try{b=b.offsetParent}catch(c){OpenLayers.Console.error(OpenLayers.i18n("pagePositionFailed",{elemId:b.id}));break}}b=f;while(b){a-=b.scrollTop||0;d-=b.scrollLeft||0;b=b.parentNode}return[d,a]};OpenLayers.Util.isEquivalentUrl=function(f,e,c){c=c||{};OpenLayers.Util.applyDefaults(c,{ignoreCase:true,ignorePort80:true,ignoreHash:true});var b=OpenLayers.Util.createUrlObject(f,c);var a=OpenLayers.Util.createUrlObject(e,c);for(var d in b){if(d!=="args"){if(b[d]!=a[d]){return false}}}for(var d in b.args){if(b.args[d]!=a.args[d]){return false}delete a.args[d]}for(var d in a.args){return false}return true};OpenLayers.Util.createUrlObject=function(c,k){k=k||{};if(!(/^\w+:\/\//).test(c)){var g=window.location;var e=g.port?":"+g.port:"";var h=g.protocol+"//"+g.host.split(":").shift()+e;if(c.indexOf("/")===0){c=h+c}else{var f=g.pathname.split("/");f.pop();c=h+f.join("/")+"/"+c}}if(k.ignoreCase){c=c.toLowerCase()}var i=document.createElement("a");i.href=c;var d={};d.host=i.host.split(":").shift();d.protocol=i.protocol;if(k.ignorePort80){d.port=(i.port=="80"||i.port=="0")?"":i.port}else{d.port=(i.port==""||i.port=="0")?"80":i.port}d.hash=(k.ignoreHash||i.hash==="#")?"":i.hash;var b=i.search;if(!b){var j=c.indexOf("?");b=(j!=-1)?c.substr(j):""}d.args=OpenLayers.Util.getParameters(b);d.pathname=(i.pathname.charAt(0)=="/")?i.pathname:"/"+i.pathname;return d};OpenLayers.Util.removeTail=function(b){var c=null;var a=b.indexOf("?");var d=b.indexOf("#");if(a==-1){c=(d!=-1)?b.substr(0,d):b}else{c=(d!=-1)?b.substr(0,Math.min(a,d)):b.substr(0,a)}return c};OpenLayers.Util.getBrowserName=function(){var b="";var a=navigator.userAgent.toLowerCase();if(a.indexOf("opera")!=-1){b="opera"}else{if(a.indexOf("msie")!=-1){b="msie"}else{if(a.indexOf("safari")!=-1){b="safari"}else{if(a.indexOf("mozilla")!=-1){if(a.indexOf("firefox")!=-1){b="firefox"}else{b="mozilla"}}}}}return b};OpenLayers.Util.getRenderedDimensions=function(b,o,p){var k,e;var a=document.createElement("div");a.style.visibility="hidden";var n=(p&&p.containerElement)?p.containerElement:document.body;if(o){if(o.w){k=o.w;a.style.width=k+"px"}else{if(o.h){e=o.h;a.style.height=e+"px"}}}if(p&&p.displayClass){a.className=p.displayClass}var f=document.createElement("div");f.innerHTML=b;f.style.overflow="visible";if(f.childNodes){for(var d=0,c=f.childNodes.length;d=0){if(a<10){a="0"+a}f+=a+"'";if(e.indexOf("dms")>=0){if(g<10){g="0"+g}f+=g+'"'}}if(b=="lon"){f+=h<0?OpenLayers.i18n("W"):OpenLayers.i18n("E")}else{f+=h<0?OpenLayers.i18n("S"):OpenLayers.i18n("N")}return f};OpenLayers.Element={visible:function(a){return OpenLayers.Util.getElement(a).style.display!="none"},toggle:function(){for(var c=0,a=arguments.length;c"+this.contentDiv.innerHTML+"";var h=(this.map)?this.map.layerContainerDiv:document.body;var i=OpenLayers.Util.getRenderedDimensions(e,null,{displayClass:this.displayClass,containerElement:h});var g=this.getSafeContentSize(i);var f=null;if(g.equals(i)){f=i}else{var b=new OpenLayers.Size();b.w=(g.w(e.w-this.map.paddingForPopups.right)){c.x=e.w-this.map.paddingForPopups.right-this.size.w}}if(d.y(e.h-this.map.paddingForPopups.bottom)){c.y=e.h-this.map.paddingForPopups.bottom-this.size.h}}var b=d.x-c.x;var a=d.y-c.y;this.map.pan(b,a)},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,true);this.events.on({mousedown:this.onmousedown,mousemove:this.onmousemove,mouseup:this.onmouseup,click:this.onclick,mouseout:this.onmouseout,dblclick:this.ondblclick,scope:this})},onmousedown:function(a){this.mousedown=true;OpenLayers.Event.stop(a,true)},onmousemove:function(a){if(this.mousedown){OpenLayers.Event.stop(a,true)}},onmouseup:function(a){if(this.mousedown){this.mousedown=false;OpenLayers.Event.stop(a,true)}},onclick:function(a){OpenLayers.Event.stop(a,true)},onmouseout:function(a){this.mousedown=false},ondblclick:function(a){OpenLayers.Event.stop(a,true)},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(d,a,b,c){if(d!=null){this.left=OpenLayers.Util.toFloat(d)}if(a!=null){this.bottom=OpenLayers.Util.toFloat(a)}if(b!=null){this.right=OpenLayers.Util.toFloat(b)}if(c!=null){this.top=OpenLayers.Util.toFloat(c)}},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top)},equals:function(b){var a=false;if(b!=null){a=((this.left==b.left)&&(this.right==b.right)&&(this.top==b.top)&&(this.bottom==b.bottom))}return a},toString:function(){return("left-bottom=("+this.left+","+this.bottom+") right-top=("+this.right+","+this.top+")")},toArray:function(a){if(a===true){return[this.bottom,this.left,this.top,this.right]}else{return[this.left,this.bottom,this.right,this.top]}},toBBOX:function(b,e){if(b==null){b=6}var g=Math.pow(10,b);var f=Math.round(this.left*g)/g;var d=Math.round(this.bottom*g)/g;var c=Math.round(this.right*g)/g;var a=Math.round(this.top*g)/g;if(e===true){return d+","+f+","+a+","+c}else{return f+","+d+","+c+","+a}},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])])},getWidth:function(){return(this.right-this.left)},getHeight:function(){return(this.top-this.bottom)},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight())},getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2)},getCenterLonLat:function(){if(!this.centerLonLat){this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2)}return this.centerLonLat},scale:function(e,c){if(c==null){c=this.getCenterLonLat()}var a,h;if(c.CLASS_NAME=="OpenLayers.LonLat"){a=c.lon;h=c.lat}else{a=c.x;h=c.y}var g=(this.left-a)*e+a;var b=(this.bottom-h)*e+h;var d=(this.right-a)*e+a;var f=(this.top-h)*e+h;return new OpenLayers.Bounds(g,b,d,f)},add:function(a,c){if((a==null)||(c==null)){var b=OpenLayers.i18n("boundsAddError");OpenLayers.Console.error(b);return null}return new OpenLayers.Bounds(this.left+a,this.bottom+c,this.right+a,this.top+c)},extend:function(a){var b=null;if(a){switch(a.CLASS_NAME){case"OpenLayers.LonLat":b=new OpenLayers.Bounds(a.lon,a.lat,a.lon,a.lat);break;case"OpenLayers.Geometry.Point":b=new OpenLayers.Bounds(a.x,a.y,a.x,a.y);break;case"OpenLayers.Bounds":b=a;break}if(b){this.centerLonLat=null;if((this.left==null)||(b.leftthis.right)){this.right=b.right}if((this.top==null)||(b.top>this.top)){this.top=b.top}}}},containsLonLat:function(b,a){return this.contains(b.lon,b.lat,a)},containsPixel:function(b,a){return this.contains(b.x,b.y,a)},contains:function(b,d,a){if(a==null){a=true}if(b==null||d==null){return false}b=OpenLayers.Util.toFloat(b);d=OpenLayers.Util.toFloat(d);var c=false;if(a){c=((b>=this.left)&&(b<=this.right)&&(d>=this.bottom)&&(d<=this.top))}else{c=((b>this.left)&&(bthis.bottom)&&(d=this.bottom)&&(e.bottom<=this.top))||((this.bottom>=e.bottom)&&(this.bottom<=e.top)));var f=(((e.top>=this.bottom)&&(e.top<=this.top))||((this.top>e.bottom)&&(this.top=this.left)&&(e.left<=this.right))||((this.left>=e.left)&&(this.left<=e.right)));var a=(((e.right>=this.left)&&(e.right<=this.right))||((this.right>=e.left)&&(this.right<=e.right)));d=((g||f)&&(c||a))}return d},containsBounds:function(g,b,a){if(b==null){b=false}if(a==null){a=true}var c=this.contains(g.left,g.bottom,a);var d=this.contains(g.right,g.bottom,a);var f=this.contains(g.left,g.top,a);var e=this.contains(g.right,g.top,a);return(b)?(c||d||f||e):(c&&d&&f&&e)},determineQuadrant:function(c){var b="";var a=this.getCenterLonLat();b+=(c.lat=a.right&&e.right>a.right){e=e.add(-a.getWidth(),0)}}return e},CLASS_NAME:"OpenLayers.Bounds"});OpenLayers.Bounds.fromString=function(b){var a=b.split(",");return OpenLayers.Bounds.fromArray(a)};OpenLayers.Bounds.fromArray=function(a){return new OpenLayers.Bounds(parseFloat(a[0]),parseFloat(a[1]),parseFloat(a[2]),parseFloat(a[3]))};OpenLayers.Bounds.fromSize=function(a){return new OpenLayers.Bounds(0,a.h,a.w,0)};OpenLayers.Bounds.oppositeQuadrant=function(a){var b="";b+=(a.charAt(0)=="t")?"b":"t";b+=(a.charAt(1)=="l")?"r":"l";return b};OpenLayers.LonLat=OpenLayers.Class({lon:0,lat:0,initialize:function(b,a){this.lon=OpenLayers.Util.toFloat(b);this.lat=OpenLayers.Util.toFloat(a)},toString:function(){return("lon="+this.lon+",lat="+this.lat)},toShortString:function(){return(this.lon+", "+this.lat)},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat)},add:function(c,a){if((c==null)||(a==null)){var b=OpenLayers.i18n("lonlatAddError");OpenLayers.Console.error(b);return null}return new OpenLayers.LonLat(this.lon+OpenLayers.Util.toFloat(c),this.lat+OpenLayers.Util.toFloat(a))},equals:function(b){var a=false;if(b!=null){a=((this.lon==b.lon&&this.lat==b.lat)||(isNaN(this.lon)&&isNaN(this.lat)&&isNaN(b.lon)&&isNaN(b.lat)))}return a},transform:function(c,b){var a=OpenLayers.Projection.transform({x:this.lon,y:this.lat},c,b);this.lon=a.x;this.lat=a.y;return this},wrapDateLine:function(a){var b=this.clone();if(a){while(b.lona.right){b.lon-=a.getWidth()}}return b},CLASS_NAME:"OpenLayers.LonLat"});OpenLayers.LonLat.fromString=function(b){var a=b.split(",");return new OpenLayers.LonLat(a[0],a[1])};OpenLayers.Pixel=OpenLayers.Class({x:0,y:0,initialize:function(a,b){this.x=parseFloat(a);this.y=parseFloat(b)},toString:function(){return("x="+this.x+",y="+this.y)},clone:function(){return new OpenLayers.Pixel(this.x,this.y)},equals:function(a){var b=false;if(a!=null){b=((this.x==a.x&&this.y==a.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y)))}return b},add:function(a,c){if((a==null)||(c==null)){var b=OpenLayers.i18n("pixelAddError");OpenLayers.Console.error(b);return null}return new OpenLayers.Pixel(this.x+a,this.y+c)},offset:function(a){var b=this.clone();if(a){b=this.add(a.x,a.y)}return b},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",autoActivate:false,active:null,handler:null,eventListeners:null,events:null,EVENT_TYPES:["activate","deactivate"],initialize:function(a){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,a);this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners)}if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")}},destroy:function(){if(this.events){if(this.eventListeners){this.events.un(this.eventListeners)}this.events.destroy();this.events=null}this.eventListeners=null;if(this.handler){this.handler.destroy();this.handler=null}if(this.handlers){for(var a in this.handlers){if(this.handlers.hasOwnProperty(a)&&typeof this.handlers[a].destroy=="function"){this.handlers[a].destroy()}}this.handlers=null}if(this.map){this.map.removeControl(this);this.map=null}},setMap:function(a){this.map=a;if(this.handler){this.handler.setMap(a)}},draw:function(a){if(this.div==null){this.div=OpenLayers.Util.createDiv(this.id);this.div.className=this.displayClass;if(!this.allowSelection){this.div.className+=" olControlNoSelect";this.div.setAttribute("unselectable","on",0);this.div.onselectstart=OpenLayers.Function.False}if(this.title!=""){this.div.title=this.title}}if(a!=null){this.position=a.clone()}this.moveTo(this.position);return this.div},moveTo:function(a){if((a!=null)&&(this.div!=null)){this.div.style.left=a.x+"px";this.div.style.top=a.y+"px"}},activate:function(){if(this.active){return false}if(this.handler){this.handler.activate()}this.active=true;if(this.map){OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active")}this.events.triggerEvent("activate");return true},deactivate:function(){if(this.active){if(this.handler){this.handler.deactivate()}this.active=false;if(this.map){OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active")}this.events.triggerEvent("deactivate");return true}return false},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){if(!OpenLayers.Lang.code){OpenLayers.Lang.setCode()}return OpenLayers.Lang.code},setCode:function(b){var d;if(!b){b=(OpenLayers.Util.getBrowserName()=="msie")?navigator.userLanguage:navigator.language}var c=b.split("-");c[0]=c[0].toLowerCase();if(typeof OpenLayers.Lang[c[0]]=="object"){d=c[0]}if(c[1]){var a=c[0]+"-"+c[1].toUpperCase();if(typeof OpenLayers.Lang[a]=="object"){d=a}}if(!d){OpenLayers.Console.warn("Failed to find OpenLayers.Lang."+c.join("-")+" dictionary, falling back to default language");d=OpenLayers.Lang.defaultCode}OpenLayers.Lang.code=d},translate:function(b,a){var d=OpenLayers.Lang[OpenLayers.Lang.getCode()];var c=d[b];if(!c){c=b}if(a){c=OpenLayers.String.format(c,a)}return c}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:true,anchor:null,initialize:function(h,d,g,c,b,f,e){var a=[h,d,g,c,f,e];OpenLayers.Popup.prototype.initialize.apply(this,a);this.anchor=(b!=null)?b:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)}},destroy:function(){this.anchor=null;this.relativePosition=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments)},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments)},moveTo:function(c){var b=this.relativePosition;this.relativePosition=this.calculateRelativePosition(c);var d=this.calculateNewPx(c);var a=new Array(d);OpenLayers.Popup.prototype.moveTo.apply(this,a);if(this.relativePosition!=b){this.updateRelativePosition()}},setSize:function(b){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if((this.lonlat)&&(this.map)){var a=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(a)}},calculateRelativePosition:function(b){var d=this.map.getLonLatFromLayerPx(b);var c=this.map.getExtent();var a=c.determineQuadrant(d);return OpenLayers.Bounds.oppositeQuadrant(a)},updateRelativePosition:function(){},calculateNewPx:function(b){var e=b.offset(this.anchor.offset);var a=this.size||this.contentSize;var d=(this.relativePosition.charAt(0)=="t");e.y+=(d)?-(a.h+this.anchor.size.h):this.anchor.size.h;var c=(this.relativePosition.charAt(1)=="l");e.x+=(c)?-(a.w+this.anchor.size.w):this.anchor.size.w;return e},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(a){this.easing=(a)?a:OpenLayers.Easing.Expo.easeOut},start:function(c,b,d,a){this.playing=true;this.begin=c;this.finish=b;this.duration=d;this.callbacks=a.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null}if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin)}this.interval=window.setInterval(OpenLayers.Function.bind(this.play,this),this.INTERVAL)},stop:function(){if(!this.playing){return}if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish)}window.clearInterval(this.interval);this.interval=null;this.playing=false},play:function(){var g={};for(var d in this.begin){var a=this.begin[d];var e=this.finish[d];if(a==null||e==null||isNaN(a)||isNaN(e)){OpenLayers.Console.error("invalid value for Tween")}var h=e-a;g[d]=this.easing.apply(this,[this.time,a,h,this.duration])}this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,g)}if(this.time>this.duration){this.stop()}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(e,a,g,f){return g*e/f+a},easeOut:function(e,a,g,f){return g*e/f+a},easeInOut:function(e,a,g,f){return g*e/f+a},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(e,a,g,f){return(e==0)?a:g*Math.pow(2,10*(e/f-1))+a},easeOut:function(e,a,g,f){return(e==f)?a+g:g*(-Math.pow(2,-10*e/f)+1)+a},easeInOut:function(e,a,g,f){if(e==0){return a}if(e==f){return a+g}if((e/=f/2)<1){return g/2*Math.pow(2,10*(e-1))+a}return g/2*(-Math.pow(2,-10*--e)+2)+a},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(e,a,g,f){return g*(e/=f)*e+a},easeOut:function(e,a,g,f){return -g*(e/=f)*(e-2)+a},easeInOut:function(e,a,g,f){if((e/=f/2)<1){return g/2*e*e+a}return -g/2*((--e)*(e-2)-1)+a},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,arguments)},setMap:function(e){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var c=0,a=this.map.controls.length;c=0;--a){this._removeButton(this.buttons[a])}},doubleClick:function(a){OpenLayers.Event.stop(a);return false},buttonDown:function(a){if(!OpenLayers.Event.isLeftClick(a)){return}switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break}OpenLayers.Event.stop(a)},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Event={observers:false,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(a){return a.target||a.srcElement},isLeftClick:function(a){return(((a.which)&&(a.which==1))||((a.button)&&(a.button==1)))},isRightClick:function(a){return(((a.which)&&(a.which==3))||((a.button)&&(a.button==2)))},stop:function(b,a){if(!a){if(b.preventDefault){b.preventDefault()}else{b.returnValue=false}}if(b.stopPropagation){b.stopPropagation()}else{b.cancelBubble=true}},findElement:function(c,b){var a=OpenLayers.Event.element(c);while(a.parentNode&&(!a.tagName||(a.tagName.toUpperCase()!=b.toUpperCase()))){a=a.parentNode}return a},observe:function(b,d,c,a){var e=OpenLayers.Util.getElement(b);a=a||false;if(d=="keypress"&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||e.attachEvent)){d="keydown"}if(!this.observers){this.observers={}}if(!e._eventCacheID){var f="eventCacheID_";if(e.id){f=e.id+"_"+f}e._eventCacheID=OpenLayers.Util.createUniqueID(f)}var g=e._eventCacheID;if(!this.observers[g]){this.observers[g]=[]}this.observers[g].push({element:e,name:d,observer:c,useCapture:a});if(e.addEventListener){e.addEventListener(d,c,a)}else{if(e.attachEvent){e.attachEvent("on"+d,c)}}},stopObservingElement:function(a){var b=OpenLayers.Util.getElement(a);var c=b._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[c])},_removeElementObservers:function(e){if(e){for(var b=e.length-1;b>=0;b--){var c=e[b];var a=new Array(c.element,c.name,c.observer,c.useCapture);var d=OpenLayers.Event.stopObserving.apply(this,a)}}},stopObserving:function(h,a,g,b){b=b||false;var f=OpenLayers.Util.getElement(h);var d=f._eventCacheID;if(a=="keypress"){if(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||f.detachEvent){a="keydown"}}var k=false;var c=OpenLayers.Event.observers[d];if(c){var e=0;while(!k&&e
To get rid of this message, select a new BaseLayer in the layer switcher in the upper-right corner.

Most likely, this is because the Google Maps library script was either not included, or does not contain the correct API key for your site.

Developers: For help getting this working correctly, click here",getLayerWarning:"The ${layerType} Layer was unable to load correctly.

To get rid of this message, select a new BaseLayer in the layer switcher in the upper-right corner.

Most likely, this is because the ${layerLib} library script was not correctly included.

Developers: For help getting this working correctly, click here",scale:"Scale = 1 : ${scaleDenom}",W:"W",E:"E",N:"N",S:"S",graticule:"Graticule",layerAlreadyAdded:"You tried to add the layer: ${layerName} to the map, but it has already been added",reprojectDeprecated:"You are using the 'reproject' option on the ${layerName} layer. This option is deprecated: its use was designed to support displaying data over commercial basemaps, but that functionality should now be achieved by using Spherical Mercator support. More information is available from http://trac.openlayers.org/wiki/SphericalMercator.",methodDeprecated:"This method has been deprecated and will be removed in 3.0. Please use ${newMethod} instead.",boundsAddError:"You must pass both x and y values to the add function.",lonlatAddError:"You must pass both lon and lat values to the add function.",pixelAddError:"You must pass both x and y values to the add function.",unsupportedGeometryType:"Unsupported geometry type: ${geomType}",pagePositionFailed:"OpenLayers.Util.pagePosition failed: element with id ${elemId} may be misplaced.",filterEvaluateNotImplemented:"evaluate is not implemented for this filter type.",end:""};OpenLayers.Popup.AnchoredBubble=OpenLayers.Class(OpenLayers.Popup.Anchored,{rounded:false,initialize:function(g,c,f,b,a,e,d){this.padding=new OpenLayers.Bounds(0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE,0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE);OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments)},draw:function(a){OpenLayers.Popup.Anchored.prototype.draw.apply(this,arguments);this.setContentHTML();this.setBackgroundColor();this.setOpacity();return this.div},updateRelativePosition:function(){this.setRicoCorners()},setSize:function(a){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.setRicoCorners()},setBackgroundColor:function(a){if(a!=undefined){this.backgroundColor=a}if(this.div!=null){if(this.contentDiv!=null){this.div.style.background="transparent";OpenLayers.Rico.Corner.changeColor(this.groupDiv,this.backgroundColor)}}},setOpacity:function(a){OpenLayers.Popup.Anchored.prototype.setOpacity.call(this,a);if(this.div!=null){if(this.groupDiv!=null){OpenLayers.Rico.Corner.changeOpacity(this.groupDiv,this.opacity)}}},setBorder:function(a){this.border=0},setRicoCorners:function(){var a=this.getCornersToRound(this.relativePosition);var b={corners:a,color:this.backgroundColor,bgColor:"transparent",blend:false};if(!this.rounded){OpenLayers.Rico.Corner.round(this.div,b);this.rounded=true}else{OpenLayers.Rico.Corner.reRound(this.groupDiv,b);this.setBackgroundColor();this.setOpacity()}},getCornersToRound:function(){var a=["tl","tr","bl","br"];var b=OpenLayers.Bounds.oppositeQuadrant(this.relativePosition);OpenLayers.Util.removeItem(a,b);return a.join(" ")},CLASS_NAME:"OpenLayers.Popup.AnchoredBubble"});OpenLayers.Popup.AnchoredBubble.CORNER_SIZE=5;OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,initialize:function(b,a){OpenLayers.Util.extend(this,a);this.projCode=b;if(window.Proj4js){this.proj=new Proj4js.Proj(b)}},getCode:function(){return this.proj?this.proj.srsCode:this.projCode},getUnits:function(){return this.proj?this.proj.units:null},toString:function(){return this.getCode()},equals:function(a){if(a&&a.getCode){return this.getCode()==a.getCode()}else{return false}},destroy:function(){delete this.proj;delete this.projCode},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};OpenLayers.Projection.addTransform=function(c,b,a){if(!OpenLayers.Projection.transforms[c]){OpenLayers.Projection.transforms[c]={}}OpenLayers.Projection.transforms[c][b]=a};OpenLayers.Projection.transform=function(a,c,b){if(c.proj&&b.proj){a=Proj4js.transform(c.proj,b.proj,a)}else{if(c&&b&&OpenLayers.Projection.transforms[c.getCode()]&&OpenLayers.Projection.transforms[c.getCode()][b.getCode()]){OpenLayers.Projection.transforms[c.getCode()][b.getCode()](a)}}return a};OpenLayers.Tile=OpenLayers.Class({EVENT_TYPES:["loadstart","loadend","reload","unload"],events:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:false,initialize:function(d,a,e,b,c){this.layer=d;this.position=a.clone();this.bounds=e.clone();this.url=b;this.size=c.clone();this.id=OpenLayers.Util.createUniqueID("Tile_");this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES)},unload:function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("unload")}},destroy:function(){this.layer=null;this.bounds=null;this.size=null;this.position=null;this.events.destroy();this.events=null},clone:function(a){if(a==null){a=new OpenLayers.Tile(this.layer,this.position,this.bounds,this.url,this.size)}OpenLayers.Util.applyDefaults(a,this);return a},draw:function(){var a=this.layer.maxExtent;var b=(a&&this.bounds.intersectsBounds(a,false));this.shouldDraw=(b||this.layer.displayOutsideMaxExtent);this.clear();return this.shouldDraw},moveTo:function(b,a,c){if(c==null){c=true}this.bounds=b.clone();this.position=a.clone();if(c){this.draw()}},clear:function(){},getBoundsFromBaseLayer:function(a){var f=OpenLayers.i18n("reprojectDeprecated",{layerName:this.layer.name});OpenLayers.Console.warn(f);var d=this.layer.map.getLonLatFromLayerPx(a);var c=a.clone();c.x+=this.size.w;c.y+=this.size.h;var b=this.layer.map.getLonLatFromLayerPx(c);if(d.lon>b.lon){if(d.lon<0){d.lon=-180-(d.lon+180)}else{b.lon=180+b.lon+180}}var e=new OpenLayers.Bounds(d.lon,b.lat,b.lon,d.lat);return e},showTile:function(){if(this.shouldDraw){this.show()}},show:function(){},hide:function(){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(d,b,a){OpenLayers.Util.extend(this,a);this.control=d;this.callbacks=b;var c=this.map||d.map;if(c){this.setMap(c)}this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},setMap:function(a){this.map=a},checkModifiers:function(a){if(this.keyMask==null){return true}var b=(a.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(a.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(a.altKey?OpenLayers.Handler.MOD_ALT:0);return(b==this.keyMask)},activate:function(){if(this.active){return false}var c=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var b=0,a=c.length;b=0;--a){this.controls[a].destroy()}this.controls=null}if(this.layers!=null){for(var a=this.layers.length-1;a>=0;--a){this.layers[a].destroy(false)}this.layers=null}if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv)}this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null}this.events.destroy();this.events=null},setOptions:function(a){OpenLayers.Util.extend(this,a)},getTileSize:function(){return this.tileSize},getBy:function(e,c,a){var d=(typeof a.test=="function");var b=OpenLayers.Array.filter(this[e],function(f){return f[c]==a||(d&&a.test(f[c]))});return b},getLayersBy:function(b,a){return this.getBy("layers",b,a)},getLayersByName:function(a){return this.getLayersBy("name",a)},getLayersByClass:function(a){return this.getLayersBy("CLASS_NAME",a)},getControlsBy:function(b,a){return this.getBy("controls",b,a)},getControlsByClass:function(a){return this.getControlsBy("CLASS_NAME",a)},getLayer:function(e){var b=null;for(var d=0,a=this.layers.length;dthis.layers.length){b=this.layers.length}}if(e!=b){this.layers.splice(e,1);this.layers.splice(b,0,d);for(var c=0,a=this.layers.length;c=0;--b){this.removePopup(this.popups[b])}}a.map=this;this.popups.push(a);var c=a.draw();if(c){c.style.zIndex=this.Z_INDEX_BASE.Popup+this.popups.length;this.layerContainerDiv.appendChild(c)}},removePopup:function(a){OpenLayers.Util.removeItem(this.popups,a);if(a.div){try{this.layerContainerDiv.removeChild(a.div)}catch(b){}}a.map=null},getSize:function(){var a=null;if(this.size!=null){a=this.size.clone()}return a},updateSize:function(){var c=this.getCurrentSize();if(c&&!isNaN(c.h)&&!isNaN(c.w)){this.events.clearMouseCache();var f=this.getSize();if(f==null){this.size=f=c}if(!c.equals(f)){this.size=c;for(var d=0,b=this.layers.length;dthis.restrictedExtent.getWidth()){g=new OpenLayers.LonLat(p.lon,g.lat)}else{if(o.leftthis.restrictedExtent.right){g=g.add(this.restrictedExtent.right-o.right,0)}}}if(o.getHeight()>this.restrictedExtent.getHeight()){g=new OpenLayers.LonLat(g.lon,p.lat)}else{if(o.bottomthis.restrictedExtent.top){g=g.add(0,this.restrictedExtent.top-o.top)}}}}}var b=c||((this.isValidZoomLevel(n))&&(n!=this.getZoom()));var e=(this.isValidLonLat(g))&&(!g.equals(this.center));if(b||e||!m){if(!this.dragging&&!h){this.events.triggerEvent("movestart")}if(e){if((!b)&&(this.center)){this.centerLayerContainer(g)}this.center=g.clone()}if((b)||(this.layerContainerOrigin==null)){this.layerContainerOrigin=this.center.clone();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px"}if(b){this.zoom=n;this.resolution=this.getResolutionForZoom(n);this.viewRequestID++}var a=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(a,b,m);if(m){this.baseLayer.events.triggerEvent("move")}else{this.baseLayer.events.triggerEvent("moveend",{zoomChanged:b})}}a=this.baseLayer.getExtent();for(var f=0,k=this.layers.length;f=0)&&(a0){a=this.layers[0].getResolution()}}return a},getUnits:function(){var a=null;if(this.baseLayer!=null){a=this.baseLayer.units}return a},getScale:function(){var c=null;if(this.baseLayer!=null){var b=this.getResolution();var a=this.baseLayer.units;c=OpenLayers.Util.getScaleFromResolution(b,a)}return c},getZoomForExtent:function(c,b){var a=null;if(this.baseLayer!=null){a=this.baseLayer.getZoomForExtent(c,b)}return a},getResolutionForZoom:function(b){var a=null;if(this.baseLayer){a=this.baseLayer.getResolutionForZoom(b)}return a},getZoomForResolution:function(a,c){var b=null;if(this.baseLayer!=null){b=this.baseLayer.getZoomForResolution(a,c)}return b},zoomTo:function(a){if(this.isValidZoomLevel(a)){this.setCenter(null,a)}},zoomIn:function(){this.zoomTo(this.getZoom()+1)},zoomOut:function(){this.zoomTo(this.getZoom()-1)},zoomToExtent:function(d,c){var b=d.getCenterLonLat();if(this.baseLayer.wrapDateLine){var a=this.getMaxExtent();d=d.clone();while(d.rightOpenLayers.IMAGE_RELOAD_ATTEMPTS){c.call(this)}};OpenLayers.Event.observe(this.imgDiv,"error",OpenLayers.Function.bind(a,this))},checkImgURL:function(){if(this.layer){var a=this.layerAlphaHack?this.imgDiv.firstChild.src:this.imgDiv.src;if(!OpenLayers.Util.isEquivalentUrl(a,this.url)){this.hide()}}},startTransition:function(){if(!this.backBufferTile||!this.backBufferTile.imgDiv){return}var d=1;if(this.backBufferTile.resolution){d=this.backBufferTile.resolution/this.layer.getResolution()}if(d!=this.lastRatio){if(this.layer.transitionEffect=="resize"){var c=new OpenLayers.LonLat(this.backBufferTile.bounds.left,this.backBufferTile.bounds.top);var b=new OpenLayers.Size(this.backBufferTile.size.w*d,this.backBufferTile.size.h*d);var a=this.layer.map.getLayerPxFromLonLat(c);OpenLayers.Util.modifyDOMElement(this.backBufferTile.frame,null,a,b);var e=this.backBufferTile.imageSize;e=new OpenLayers.Size(e.w*d,e.h*d);var f=this.backBufferTile.imageOffset;if(f){f=new OpenLayers.Pixel(f.x*d,f.y*d)}OpenLayers.Util.modifyDOMElement(this.backBufferTile.imgDiv,null,f,e);this.backBufferTile.show()}}else{if(this.layer.singleTile){this.backBufferTile.show()}else{this.backBufferTile.hide()}}this.lastRatio=d},show:function(){this.frame.style.display="";if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(navigator.userAgent.toLowerCase().indexOf("gecko")!=-1){this.frame.scrollLeft=this.frame.scrollLeft}}},hide:function(){this.frame.style.display="none"},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Tile.Image.useBlankTile=(OpenLayers.Util.getBrowserName()=="safari"||OpenLayers.Util.getBrowserName()=="opera");OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:OpenLayers.Popup.AnchoredBubble,popup:null,initialize:function(a,c,b){this.layer=a;this.lonlat=c;this.data=(b!=null)?b:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup)}}if(this.layer!=null&&this.marker!=null){this.layer.removeMarker(this.marker)}this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null}if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null}},onScreen:function(){var b=false;if((this.layer!=null)&&(this.layer.map!=null)){var a=this.layer.map.getExtent();b=a.containsLonLat(this.lonlat)}return b},createMarker:function(){if(this.lonlat!=null){this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon)}return this.marker},destroyMarker:function(){this.marker.destroy()},createPopup:function(b){if(this.lonlat!=null){var c=this.id+"_popup";var a=(this.marker)?this.marker.icon:null;if(!this.popup){this.popup=new this.popupClass(c,this.lonlat,this.data.popupSize,this.data.popupContentHTML,a,b)}if(this.data.overflow!=null){this.popup.contentDiv.style.overflow=this.data.overflow}this.popup.feature=this}return this.popup},destroyPopup:function(){if(this.popup){this.popup.feature=null;this.popup.destroy();this.popup=null}},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,"double":false,pixelTolerance:0,stopSingle:false,stopDouble:false,timerId:null,down:null,rightclickTimerId:null,initialize:function(c,b,a){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(this.pixelTolerance!=null){this.mousedown=function(d){this.down=d.xy;return true}}},mousedown:null,mouseup:function(b){var a=true;if(this.checkModifiers(b)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(b)){a=this.rightclick(b)}return a},rightclick:function(b){if(this.passesTolerance(b)){if(this.rightclickTimerId!=null){this.clearTimer();this.callback("dblrightclick",[b]);return !this.stopDouble}else{var a=this["double"]?OpenLayers.Util.extend({},b):this.callback("rightclick",[b]);var c=OpenLayers.Function.bind(this.delayedRightCall,this,a);this.rightclickTimerId=window.setTimeout(c,this.delay)}}return !this.stopSingle},delayedRightCall:function(a){this.rightclickTimerId=null;if(a){this.callback("rightclick",[a])}return !this.stopSingle},dblclick:function(a){if(this.passesTolerance(a)){if(this["double"]){this.callback("dblclick",[a])}this.clearTimer()}return !this.stopDouble},click:function(b){if(this.passesTolerance(b)){if(this.timerId!=null){this.clearTimer()}else{var a=this.single?OpenLayers.Util.extend({},b):null;this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,a),this.delay)}}return !this.stopSingle},passesTolerance:function(b){var c=true;if(this.pixelTolerance!=null&&this.down){var a=Math.sqrt(Math.pow(this.down.x-b.xy.x,2)+Math.pow(this.down.y-b.xy.y,2));if(a>this.pixelTolerance){c=false}}return c},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null}if(this.rightclickTimerId!=null){window.clearTimeout(this.rightclickTimerId);this.rightclickTimerId=null}},delayedCall:function(a){this.timerId=null;if(a){this.callback("click",[a])}},deactivate:function(){var a=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.clearTimer();this.down=null;a=true}return a},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:true,dragging:false,last:null,start:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:false,documentEvents:null,initialize:function(c,b,a){OpenLayers.Handler.prototype.initialize.apply(this,arguments)},down:function(a){},move:function(a){},up:function(a){},out:function(a){},mousedown:function(b){var a=true;this.dragging=false;if(this.checkModifiers(b)&&OpenLayers.Event.isLeftClick(b)){this.started=true;this.start=b.xy;this.last=b.xy;OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown");this.down(b);this.callback("down",[b.xy]);OpenLayers.Event.stop(b);if(!this.oldOnselectstart){this.oldOnselectstart=(document.onselectstart)?document.onselectstart:OpenLayers.Function.True}document.onselectstart=OpenLayers.Function.False;a=!this.stopDown}else{this.started=false;this.start=null;this.last=null}return a},mousemove:function(a){if(this.started&&!this.timeoutId&&(a.xy.x!=this.last.x||a.xy.y!=this.last.y)){if(this.documentDrag===true&&this.documentEvents){if(a.element===document){this.adjustXY(a);this.setEvent(a)}else{this.destroyDocumentEvents()}}if(this.interval>0){this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval)}this.dragging=true;this.move(a);this.callback("move",[a.xy]);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart;document.onselectstart=OpenLayers.Function.False}this.last=this.evt.xy}return true},removeTimeout:function(){this.timeoutId=null},mouseup:function(b){if(this.started){if(this.documentDrag===true&&this.documentEvents){this.adjustXY(b);this.destroyDocumentEvents()}var a=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(b);this.callback("up",[b.xy]);if(a){this.callback("done",[b.xy])}document.onselectstart=this.oldOnselectstart}return true},mouseout:function(b){if(this.started&&OpenLayers.Util.mouseLeft(b,this.map.div)){if(this.documentDrag===true){this.documentEvents=new OpenLayers.Events(this,document,null,null,{includeXY:true});this.documentEvents.on({mousemove:this.mousemove,mouseup:this.mouseup});OpenLayers.Element.addClass(document.body,"olDragDown")}else{var a=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(b);this.callback("out",[]);if(a){this.callback("done",[b.xy])}if(document.onselectstart){document.onselectstart=this.oldOnselectstart}}}return true},click:function(a){return(this.start==this.last)},activate:function(){var a=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;a=true}return a},deactivate:function(){var a=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.started=false;this.dragging=false;this.start=null;this.last=null;a=true;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown")}return a},adjustXY:function(a){var b=OpenLayers.Util.pagePosition(this.map.div);a.xy.x-=b[0];a.xy.y-=b[1]},destroyDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents.destroy();this.documentEvents=null},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,mousePosition:null,interval:0,delta:0,cumulative:true,initialize:function(c,b,a){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this)},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null},onWheelEvent:function(k){if(!this.map||!this.checkModifiers(k)){return}var g=false;var m=false;var f=false;var b=OpenLayers.Event.element(k);while((b!=null)&&!f&&!g){if(!g){try{if(b.currentStyle){c=b.currentStyle.overflow}else{var a=document.defaultView.getComputedStyle(b,null);var c=a.getPropertyValue("overflow")}g=(c&&(c=="auto")||(c=="scroll"))}catch(d){}}if(!m){for(var h=0,j=this.map.layers.length;h=0){this.initResolutions();break}}}},onMapResize:function(){},redraw:function(){var b=false;if(this.map){this.inRange=this.calculateInRange();var c=this.getExtent();if(c&&this.inRange&&this.visibility){var a=true;this.moveTo(c,a,false);this.events.triggerEvent("moveend",{zoomChanged:a});b=true}}return b},moveTo:function(b,a,c){var d=this.visibility;if(!this.isBaseLayer){d=d&&this.inRange}this.display(d)},setMap:function(b){if(this.map==null){this.map=b;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection)}this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var a=((this.visibility)&&(this.inRange));this.div.style.display=a?"":"none"}this.setTileSize()}},afterAdd:function(){},removeMap:function(a){},getImageSize:function(a){return(this.imageSize||this.tileSize)},setTileSize:function(a){var b=(a)?a:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=b;if(this.gutter){this.imageOffset=new OpenLayers.Pixel(-this.gutter,-this.gutter);this.imageSize=new OpenLayers.Size(b.w+(2*this.gutter),b.h+(2*this.gutter))}},getVisibility:function(){return this.visibility},setVisibility:function(a){if(a!=this.visibility){this.visibility=a;this.display(a);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"})}this.events.triggerEvent("visibilitychanged")}},display:function(a){if(a!=(this.div.style.display!="none")){this.div.style.display=(a&&this.calculateInRange())?"block":"none"}},calculateInRange:function(){var b=false;if(this.alwaysInRange){b=true}else{if(this.map){var a=this.map.getResolution();b=((a>=this.minResolution)&&(a<=this.maxResolution))}}return b},setIsBaseLayer:function(a){if(a!=this.isBaseLayer){this.isBaseLayer=a;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this})}}},initResolutions:function(){var e,a;var f={},d=true;for(e=0,a=this.RESOLUTION_PROPERTIES.length;e=e){d=j;k=f}if(j<=e){b=j;c=f;break}}var h=d-b;if(h>0){n=k+((d-e)/h)}else{n=k}}else{var l;var m=Number.POSITIVE_INFINITY;for(var f=0,g=this.resolutions.length;fm){break}m=l}else{if(this.resolutions[f]d){this.zoomBox.style.width=Math.max(1,c-e.xOffset)+"px"}if(f.y>b){this.zoomBox.style.height=Math.max(1,a-e.yOffset)+"px"}}},endBox:function(b){var a;if(Math.abs(this.dragHandler.start.x-b.x)>5||Math.abs(this.dragHandler.start.y-b.y)>5){var g=this.dragHandler.start;var f=Math.min(g.y,b.y);var c=Math.max(g.y,b.y);var e=Math.min(g.x,b.x);var d=Math.max(g.x,b.x);a=new OpenLayers.Bounds(e,c,d,f)}else{a=this.dragHandler.start.clone()}this.removeBox();this.callback("done",[a])},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxCharacteristics=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDrawBox")},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true}else{return false}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.dragHandler.deactivate();return true}else{return false}},getBoxCharacteristics:function(){if(!this.boxCharacteristics){var a=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width"))+parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width"))+1;var c=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width"))+parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"))+1;var b=OpenLayers.Util.getBrowserName()=="msie"?document.compatMode!="BackCompat":true;this.boxCharacteristics={xOffset:a,yOffset:c,newBoxModel:b}}return this.boxCharacteristics},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:false,initialize:function(d,c,e,b){var a=arguments;a=[d,b];OpenLayers.Layer.prototype.initialize.apply(this,a);this.url=c;this.params=OpenLayers.Util.extend({},e)},destroy:function(){this.url=null;this.params=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){if(a==null){a=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions())}a=OpenLayers.Layer.prototype.clone.apply(this,[a]);return a},setUrl:function(a){this.url=a},mergeNewParams:function(b){this.params=OpenLayers.Util.extend(this.params,b);var a=this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"params"})}return a},redraw:function(a){if(a){return this.mergeNewParams({_olSalt:Math.random()})}else{return OpenLayers.Layer.prototype.redraw.apply(this,[])}},selectUrl:function(e,d){var c=1;for(var b=0,a=e.length;b0){this.removeMarker(this.markers[0])}}},drawMarker:function(a){var b=this.map.getLayerPxFromLonLat(a.lonlat);if(b==null){a.display(false)}else{if(!a.isDrawn()){var c=a.draw(b);this.div.appendChild(c)}else{if(a.icon){a.icon.moveTo(b)}}}},getDataExtent:function(){var b=null;if(this.markers&&(this.markers.length>0)){var b=new OpenLayers.Bounds();for(var d=0,a=this.markers.length;d0){c.push(",")}j=f[e].geometry;h=j.CLASS_NAME.split(".")[2].toLowerCase();if(!this.extract[h]){return null}if(this.internalProjection&&this.externalProjection){j=j.clone();j.transform(this.internalProjection,this.externalProjection)}d=this.extract[h].apply(this,[j]);c.push(h.toUpperCase()+"("+d+")")}if(b){c.push(")")}return c.join("")},extract:{point:function(a){return a.x+" "+a.y},multipoint:function(c){var d=[];for(var b=0,a=c.components.length;b=i.bottom-j*this.buffer)||t=0)&&(c=0)){f=this.grid[j][c]}if((f!=null)&&(!f.queued)){b.unshift(f);f.queued=true;l=0;g=j;a=c}else{k=(k+1)%4;l++}}for(var d=0,e=b.length;d-this.tileSize.w*(b-1)){this.shiftColumn(true)}else{if(d.x<-this.tileSize.w*b){this.shiftColumn(false)}else{if(d.y>-this.tileSize.h*(b-1)){this.shiftRow(true)}else{if(d.y<-this.tileSize.h*b){this.shiftRow(false)}else{break}}}}}},shiftRow:function(n){var c=(n)?0:(this.grid.length-1);var b=this.grid;var f=b[c];var e=this.map.getResolution();var h=(n)?-this.tileSize.h:this.tileSize.h;var g=e*-h;var m=(n)?b.pop():b.shift();for(var j=0,l=f.length;je){var f=this.grid.pop();for(var b=0,a=f.length;bc){for(var b=0,a=this.grid.length;b=0&&E<=1&&C>=0&&C<=1){if(!s){f=true}else{var h=a.x1+(E*o);var g=a.y1+(E*w);f=new OpenLayers.Geometry.Point(h,g)}}}if(z){var r;if(f){if(s){var n=[a,H];var A,h,g;outer:for(var v=0;v<2;++v){A=n[v];for(var u=1;u<3;++u){h=A["x"+u];g=A["y"+u];r=Math.sqrt(Math.pow(h-f.x,2)+Math.pow(g-f.y,2));if(r=1){g=a;e=f}else{g=b+h*m;e=i+h*l}}return{distance:Math.sqrt(Math.pow(g-c,2)+Math.pow(e-j,2)),x:g,y:e}};OpenLayers.Layer.TMS=OpenLayers.Class(OpenLayers.Layer.Grid,{serviceVersion:"1.0.0",isBaseLayer:true,tileOrigin:null,serverResolutions:null,zoomOffset:0,initialize:function(d,c,b){var a=[];a.push(d,c,{},b);OpenLayers.Layer.Grid.prototype.initialize.apply(this,a)},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments)},clone:function(a){if(a==null){a=new OpenLayers.Layer.TMS(this.name,this.url,this.getOptions())}a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a]);return a},getURL:function(d){d=this.adjustBounds(d);var c=this.map.getResolution();var a=Math.round((d.left-this.tileOrigin.lon)/(c*this.tileSize.w));var g=Math.round((d.bottom-this.tileOrigin.lat)/(c*this.tileSize.h));var f=this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,c):this.map.getZoom()+this.zoomOffset;var e=this.serviceVersion+"/"+this.layername+"/"+f+"/"+a+"/"+g+"."+this.type;var b=this.url;if(b instanceof Array){b=this.selectUrl(e,b)}return b+e},addTile:function(b,a){return new OpenLayers.Tile.Image(this,a,b,null,this.tileSize)},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.bottom)}},CLASS_NAME:"OpenLayers.Layer.TMS"});OpenLayers.Layer.WMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{service:"WMS",version:"1.1.1",request:"GetMap",styles:"",exceptions:"application/vnd.ogc.se_inimage",format:"image/jpeg"},reproject:false,isBaseLayer:true,encodeBBOX:false,noMagic:false,yx:{"EPSG:4326":true},initialize:function(d,c,e,b){var a=[];e=OpenLayers.Util.upperCaseObject(e);if(parseFloat(e.VERSION)>=1.3&&!e.EXCEPTIONS){e.EXCEPTIONS="INIMAGE"}a.push(d,c,e,b);OpenLayers.Layer.Grid.prototype.initialize.apply(this,a);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));if(!this.noMagic&&this.params.TRANSPARENT&&this.params.TRANSPARENT.toString().toLowerCase()=="true"){if((b==null)||(!b.isBaseLayer)){this.isBaseLayer=false}if(this.params.FORMAT=="image/jpeg"){this.params.FORMAT=OpenLayers.Util.alphaHack()?"image/gif":"image/png"}}},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments)},clone:function(a){if(a==null){a=new OpenLayers.Layer.WMS(this.name,this.url,this.params,this.getOptions())}a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a]);return a},reverseAxisOrder:function(){return(parseFloat(this.params.VERSION)>=1.3&&!!this.yx[this.map.getProjectionObject().getCode()])},getURL:function(c){c=this.adjustBounds(c);var d=this.getImageSize();var e={};var b=this.reverseAxisOrder();e.BBOX=this.encodeBBOX?c.toBBOX(null,b):c.toArray(b);e.WIDTH=d.w;e.HEIGHT=d.h;var a=this.getFullRequestString(e);return a},addTile:function(b,a){return new OpenLayers.Tile.Image(this,a,b,null,this.tileSize)},mergeNewParams:function(c){var b=OpenLayers.Util.upperCaseObject(c);var a=[b];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,a)},getFullRequestString:function(d,b){var a=this.map.getProjection();var c=(a=="none")?null:a;if(parseFloat(this.params.VERSION)>=1.3){this.params.CRS=c}else{this.params.SRS=c}return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,arguments)},CLASS_NAME:"OpenLayers.Layer.WMS"});OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(a){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];if(a!=null){this.addComponents(a)}},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments)},clone:function(){var geometry=eval("new "+this.CLASS_NAME+"()");for(var i=0,len=this.components.length;i0){this.setBounds(this.components[0].getBounds());for(var b=1,a=this.components.length;b-1)){if(a!=null&&(a=0;--a){this.removeComponent(b[a])}},removeComponent:function(a){OpenLayers.Util.removeItem(this.components,a);this.clearBounds()},getLength:function(){var c=0;for(var b=0,a=this.components.length;b0)?e:h;c.push(f)}l=b.length;if(d===0){for(var k=0;k1)){for(var b=1,a=this.components.length;b1)){var h,g;for(var d=1,a=e.components.length;d2)){OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments)}},intersects:function(m){var c=false;var l=m.CLASS_NAME;if(l=="OpenLayers.Geometry.LineString"||l=="OpenLayers.Geometry.LinearRing"||l=="OpenLayers.Geometry.Point"){var p=this.getSortedSegments();var n;if(l=="OpenLayers.Geometry.Point"){n=[{x1:m.x,y1:m.y,x2:m.x,y2:m.y}]}else{n=m.getSortedSegments()}var s,g,e,a,r,q,d,b;outer:for(var h=0,k=p.length;he){break}if(q.x2Math.max(a,r)){continue}if(Math.max(d,b)0){var p=r.x10){a.unshift(r,1);Array.prototype.splice.apply(c,a);r+=a.length-2}if(d){for(var q=0,u=h.points.length;q0&&s.length>0){s.push(f.clone());m.push(new OpenLayers.Geometry.LineString(s))}}else{n=x.splitWith(this,b)}if(c&&c.length>1){e=true}else{c=[]}if(m&&m.length>1){l=true}else{m=[]}if(e||l){if(d){n=[m,c]}else{n=c}}return n},splitWith:function(b,a){return b.split(this,a)},getVertices:function(a){var b;if(a===true){b=[this.components[0],this.components[this.components.length-1]]}else{if(a===false){b=this.components.slice(1,this.components.length-1)}else{b=this.components.slice()}}return b},distanceTo:function(h,g){var k=!(g&&g.edge===false);var B=k&&g&&g.details;var q,e={};var t=Number.POSITIVE_INFINITY;if(h instanceof OpenLayers.Geometry.Point){var r=this.getSortedSegments();var p=h.x;var o=h.y;var z;for(var v=0,w=r.length;vp&&((o>z.y1&&oz.y2))){break}}}if(B){e={distance:e.distance,x0:e.x,y0:e.y,x1:p,y1:o}}else{e=e.distance}}else{if(h instanceof OpenLayers.Geometry.LineString){var d=this.getSortedSegments();var c=h.getSortedSegments();var b,a,n,A,f;var m=c.length;var l={point:true};outer:for(var v=0,w=d.length;v4){this.components.pop();OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);var b=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[b])}},move:function(b,d){for(var c=0,a=this.components.length;c2)){var h=0;var g=0;for(var e=0;e2)){var f=0;for(var e=0,d=this.components.length;e2){var h,g;for(var e=0;e=q&&k<=o)||q>=o&&(k<=q&&k>=o)){h=-1;break}}continue}e=s(r(j,q,d,o,b),l);if(e==k){if(d=d&&j<=b)||d>b&&(j<=d&&j>=b)){h=-1;break}}if(e<=k){continue}if(q!=o&&(eMath.max(q,o))){continue}if(d=d&&jb&&(j=b)){++h}}var p=(h==-1)?1:!!(h&1);return p},intersects:function(d){var b=false;if(d.CLASS_NAME=="OpenLayers.Geometry.Point"){b=this.containsPoint(d)}else{if(d.CLASS_NAME=="OpenLayers.Geometry.LineString"){b=d.intersects(this)}else{if(d.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){b=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[d])}else{for(var c=0,a=d.components.length;c<\/script>"}else{var m=document.createElement("script");m.src=l+k[d];var f=document.getElementsByTagName("head").length?document.getElementsByTagName("head")[0]:document.body;f.appendChild(m)}}if(e){document.write(b.join(""))}}})();OpenLayers.VERSION_NUMBER="OpenLayers 2.10 -- $Revision: 10721 $";OpenLayers.String={startsWith:function(b,a){return(b.indexOf(a)==0)},contains:function(b,a){return(b.indexOf(a)!=-1)},trim:function(a){return a.replace(/^\s\s*/,"").replace(/\s\s*$/,"")},camelize:function(f){var d=f.split("-");var b=d[0];for(var c=1,a=d.length;c0){b=parseFloat(a.toPrecision(c))}return b},format:function(c,a,g,i){a=(typeof a!="undefined")?a:0;g=(typeof g!="undefined")?g:OpenLayers.Number.thousandsSeparator;i=(typeof i!="undefined")?i:OpenLayers.Number.decimalSeparator;if(a!=null){c=parseFloat(c.toFixed(a))}var b=c.toString().split(".");if(b.length==1&&a==null){a=0}var d=b[0];if(g){var e=/(-?[0-9]+)([0-9]{3})/;while(e.test(d)){d=d.replace(e,"$1"+g+"$2")}}var f;if(a==0){f=d}else{var h=b.length>1?b[1]:"0";if(a!=null){h=h+new Array(a-h.length+1).join("0")}f=d+i+h}return f}};if(!Number.prototype.limitSigDigs){Number.prototype.limitSigDigs=function(a){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"OpenLayers.Number.limitSigDigs"}));return OpenLayers.Number.limitSigDigs(this,a)}}OpenLayers.Function={bind:function(c,b){var a=Array.prototype.slice.apply(arguments,[2]);return function(){var d=a.concat(Array.prototype.slice.apply(arguments,[0]));return c.apply(b,d)}},bindAsEventListener:function(b,a){return function(c){return b.call(a,c||window.event)}},False:function(){return false},True:function(){return true}};if(!Function.prototype.bind){Function.prototype.bind=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"OpenLayers.Function.bind"}));Array.prototype.unshift.apply(arguments,[this]);return OpenLayers.Function.bind.apply(null,arguments)}}if(!Function.prototype.bindAsEventListener){Function.prototype.bindAsEventListener=function(a){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"OpenLayers.Function.bindAsEventListener"}));return OpenLayers.Function.bindAsEventListener(this,a)}}OpenLayers.Array={filter:function(g,f,b){var d=[];if(Array.prototype.filter){d=g.filter(f,b)}else{var a=g.length;if(typeof f!="function"){throw new TypeError()}for(var c=0;c1){b=d.prototype.initialize;d.prototype.initialize=function(){};c=new d();if(b===undefined){delete d.prototype.initialize}else{d.prototype.initialize=b}}g=d.prototype}else{g=d}OpenLayers.Util.extend(c,g)}e.prototype=c;return e};OpenLayers.Class.isPrototype=function(){};OpenLayers.Class.create=function(){return function(){if(arguments&&arguments[0]!=OpenLayers.Class.isPrototype){this.initialize.apply(this,arguments)}}};OpenLayers.Class.inherit=function(){var d=arguments[0];var e=new d(OpenLayers.Class.isPrototype);for(var c=1,a=arguments.length;c=0;a--){if(c[a]==b){c.splice(a,1)}}return c};OpenLayers.Util.clearArray=function(a){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"array = []"}));a.length=0};OpenLayers.Util.indexOf=function(d,c){if(typeof d.indexOf=="function"){return d.indexOf(c)}else{for(var b=0,a=d.length;b=0&&parseFloat(b)<1){e.style.filter="alpha(opacity="+(b*100)+")";e.style.opacity=b}else{if(parseFloat(b)==1){e.style.filter="";e.style.opacity=""}}};OpenLayers.Util.createDiv=function(a,i,h,f,e,c,b,g){var d=document.createElement("div");if(f){d.style.backgroundImage="url("+f+")"}if(!a){a=OpenLayers.Util.createUniqueID("OpenLayersDiv")}if(!e){e="absolute"}OpenLayers.Util.modifyDOMElement(d,a,i,h,e,c,b,g);return d};OpenLayers.Util.createImage=function(a,h,g,e,d,c,f,i){var b=document.createElement("img");if(!a){a=OpenLayers.Util.createUniqueID("OpenLayersDiv")}if(!d){d="relative"}OpenLayers.Util.modifyDOMElement(b,a,h,g,d,c,null,f);if(i){b.style.display="none";OpenLayers.Event.observe(b,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,b));OpenLayers.Event.observe(b,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,b))}b.style.alt=a;b.galleryImg="no";if(e){b.src=e}return b};OpenLayers.Util.setOpacity=function(b,a){OpenLayers.Util.modifyDOMElement(b,null,null,null,null,null,null,a)};OpenLayers.Util.onImageLoad=function(){if(!this.viewRequestID||(this.map&&this.viewRequestID==this.map.viewRequestID)){this.style.display=""}OpenLayers.Element.removeClass(this,"olImageLoadError")};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;OpenLayers.Util.onImageLoadError=function(){this._attempts=(this._attempts)?(this._attempts+1):1;if(this._attempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS){var d=this.urls;if(d&&d instanceof Array&&d.length>1){var e=this.src.toString();var c,a;for(a=0;c=d[a];a++){if(e.indexOf(c)!=-1){break}}var f=Math.floor(d.length*Math.random());var b=d[f];a=0;while(b==c&&a++<4){f=Math.floor(d.length*Math.random());b=d[f]}this.src=e.replace(c,b)}else{this.src=this.src}}else{OpenLayers.Element.addClass(this,"olImageLoadError")}this.style.display=""};OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(OpenLayers.Util.alphaHackNeeded==null){var d=navigator.appVersion.split("MSIE");var a=parseFloat(d[1]);var b=false;try{b=!!(document.body.filters)}catch(c){}OpenLayers.Util.alphaHackNeeded=(b&&(a>=5.5)&&(a<7))}return OpenLayers.Util.alphaHackNeeded};OpenLayers.Util.modifyAlphaImageDiv=function(a,b,j,i,g,f,c,d,h){OpenLayers.Util.modifyDOMElement(a,b,j,i,f,null,null,h);var e=a.childNodes[0];if(g){e.src=g}OpenLayers.Util.modifyDOMElement(e,a.id+"_innerImage",null,i,"relative",c);if(OpenLayers.Util.alphaHack()){if(a.style.display!="none"){a.style.display="inline-block"}if(d==null){d="scale"}a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+e.src+"', sizingMethod='"+d+"')";if(parseFloat(a.style.opacity)>=0&&parseFloat(a.style.opacity)<1){a.style.filter+=" alpha(opacity="+a.style.opacity*100+")"}e.style.filter="alpha(opacity=0)"}};OpenLayers.Util.createAlphaImageDiv=function(b,j,i,g,f,c,d,h,k){var a=OpenLayers.Util.createDiv();var e=OpenLayers.Util.createImage(null,null,null,null,null,null,null,false);a.appendChild(e);if(k){e.style.display="none";OpenLayers.Event.observe(e,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,a));OpenLayers.Event.observe(e,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,a))}OpenLayers.Util.modifyAlphaImageDiv(a,b,j,i,g,f,c,d,h);return a};OpenLayers.Util.upperCaseObject=function(b){var a={};for(var c in b){a[c.toUpperCase()]=b[c]}return a};OpenLayers.Util.applyDefaults=function(d,c){d=d||{};var b=typeof window.Event=="function"&&c instanceof window.Event;for(var a in c){if(d[a]===undefined||(!b&&c.hasOwnProperty&&c.hasOwnProperty(a)&&!d.hasOwnProperty(a))){d[a]=c[a]}}if(!b&&c&&c.hasOwnProperty&&c.hasOwnProperty("toString")&&!d.hasOwnProperty("toString")){d.toString=c.toString}return d};OpenLayers.Util.getParameterString=function(c){var b=[];for(var h in c){var g=c[h];if((g!=null)&&(typeof g!="function")){var d;if(typeof g=="object"&&g.constructor==Array){var e=[];var i;for(var a=0,f=g.length;a0)){if(!b){b=0}if(a[b].childNodes.length>1){return a.childNodes[1].nodeValue}else{if(a[b].childNodes.length==1){return a[b].firstChild.nodeValue}}}else{return""}};OpenLayers.Util.getXmlNodeValue=function(a){var b=null;OpenLayers.Util.Try(function(){b=a.text;if(!b){b=a.textContent}if(!b){b=a.firstChild.nodeValue}},function(){b=a.textContent});return b};OpenLayers.Util.mouseLeft=function(a,c){var b=(a.relatedTarget)?a.relatedTarget:a.toElement;while(b!=c&&b!=null){b=b.parentNode}return(b!=c)};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(b,a){if(a==null){a=OpenLayers.Util.DEFAULT_PRECISION}var b;if(a==0){b=parseFloat(b)}else{b=parseFloat(parseFloat(b).toPrecision(a))}return b};OpenLayers.Util.rad=function(a){return a*Math.PI/180};OpenLayers.Util.deg=function(a){return a*180/Math.PI};OpenLayers.Util.VincentyConstants={a:6378137,b:6356752.3142,f:1/298.257223563};OpenLayers.Util.distVincenty=function(g,e){var k=OpenLayers.Util.VincentyConstants;var M=k.a,K=k.b,G=k.f;var n=OpenLayers.Util.rad(e.lon-g.lon);var J=Math.atan((1-G)*Math.tan(OpenLayers.Util.rad(g.lat)));var I=Math.atan((1-G)*Math.tan(OpenLayers.Util.rad(e.lat)));var m=Math.sin(J),i=Math.cos(J);var l=Math.sin(I),h=Math.cos(I);var r=n,o=2*Math.PI;var q=20;while(Math.abs(r-o)>1e-12&&--q>0){var z=Math.sin(r),c=Math.cos(r);var N=Math.sqrt((h*z)*(h*z)+(i*l-m*h*c)*(i*l-m*h*c));if(N==0){return 0}var E=m*l+i*h*c;var y=Math.atan2(N,E);var j=Math.asin(i*h*z/N);var F=Math.cos(j)*Math.cos(j);var p=E-2*m*l/F;var v=G/16*F*(4+G*(4-3*F));o=r;r=n+(1-v)*G*Math.sin(j)*(y+v*N*(p+v*E*(-1+2*p*p)))}if(q==0){return NaN}var u=F*(M*M-K*K)/(K*K);var x=1+u/16384*(4096+u*(-768+u*(320-175*u)));var w=u/1024*(256+u*(-128+u*(74-47*u)));var D=w*N*(p+w/4*(E*(-1+2*p*p)-w/6*p*(-3+4*N*N)*(-3+4*p*p)));var t=K*x*(y-D);var H=t.toFixed(3)/1000;return H};OpenLayers.Util.destinationVincenty=function(l,P,E){var o=OpenLayers.Util;var i=o.VincentyConstants;var Q=i.a,O=i.b,J=i.f;var N=l.lon;var g=l.lat;var q=E;var D=o.rad(P);var G=Math.sin(D);var h=Math.cos(D);var F=(1-J)*Math.tan(o.rad(g));var c=1/Math.sqrt((1+F*F)),j=F*c;var p=Math.atan2(F,h);var y=c*G;var I=1-y*y;var t=I*(Q*Q-O*O)/(O*O);var x=1+t/16384*(4096+t*(-768+t*(320-175*t)));var v=t/1024*(256+t*(-128+t*(74-47*t)));var w=q/(O*x),K=2*Math.PI;while(Math.abs(w-K)>1e-12){var m=Math.cos(2*p+w);var R=Math.sin(w);var H=Math.cos(w);var z=v*R*(m+v/4*(H*(-1+2*m*m)-v/6*m*(-3+4*R*R)*(-3+4*m*m)));K=w;w=q/(O*x)+z}var M=j*R-c*H*h;var d=Math.atan2(j*H+c*R*h,(1-J)*Math.sqrt(y*y+M*M));var n=Math.atan2(R*G,c*H-j*R*h);var r=J/16*I*(4+J*(4-3*I));var k=n-(1-r)*J*y*(w+r*R*(m+r*H*(-1+2*m*m)));var e=Math.atan2(y,-M);return new OpenLayers.LonLat(N+o.deg(k),o.deg(d))};OpenLayers.Util.getParameters=function(b){b=b||window.location.href;var a="";if(OpenLayers.String.contains(b,"?")){var c=b.indexOf("?")+1;var e=OpenLayers.String.contains(b,"#")?b.indexOf("#"):b.length;a=b.substring(c,e)}var l={};var d=a.split(/[&;]/);for(var g=0,h=d.length;g1)?(1/b):b;return a};OpenLayers.Util.getResolutionFromScale=function(d,a){var b;if(d){if(a==null){a="degrees"}var c=OpenLayers.Util.normalizeScale(d);b=1/(c*OpenLayers.INCHES_PER_UNIT[a]*OpenLayers.DOTS_PER_INCH)}return b};OpenLayers.Util.getScaleFromResolution=function(b,a){if(a==null){a="degrees"}var c=b*OpenLayers.INCHES_PER_UNIT[a]*OpenLayers.DOTS_PER_INCH;return c};OpenLayers.Util.safeStopPropagation=function(a){OpenLayers.Event.stop(a,true)};OpenLayers.Util.pagePosition=function(f){var a=0,d=0;var b=f;var g=f;while(b){if(b==document.body){if(OpenLayers.Element.getStyle(g,"position")=="absolute"){break}}a+=b.offsetTop||0;d+=b.offsetLeft||0;g=b;try{b=b.offsetParent}catch(c){OpenLayers.Console.error(OpenLayers.i18n("pagePositionFailed",{elemId:b.id}));break}}b=f;while(b){a-=b.scrollTop||0;d-=b.scrollLeft||0;b=b.parentNode}return[d,a]};OpenLayers.Util.isEquivalentUrl=function(f,e,c){c=c||{};OpenLayers.Util.applyDefaults(c,{ignoreCase:true,ignorePort80:true,ignoreHash:true});var b=OpenLayers.Util.createUrlObject(f,c);var a=OpenLayers.Util.createUrlObject(e,c);for(var d in b){if(d!=="args"){if(b[d]!=a[d]){return false}}}for(var d in b.args){if(b.args[d]!=a.args[d]){return false}delete a.args[d]}for(var d in a.args){return false}return true};OpenLayers.Util.createUrlObject=function(c,k){k=k||{};if(!(/^\w+:\/\//).test(c)){var g=window.location;var e=g.port?":"+g.port:"";var h=g.protocol+"//"+g.host.split(":").shift()+e;if(c.indexOf("/")===0){c=h+c}else{var f=g.pathname.split("/");f.pop();c=h+f.join("/")+"/"+c}}if(k.ignoreCase){c=c.toLowerCase()}var i=document.createElement("a");i.href=c;var d={};d.host=i.host.split(":").shift();d.protocol=i.protocol;if(k.ignorePort80){d.port=(i.port=="80"||i.port=="0")?"":i.port}else{d.port=(i.port==""||i.port=="0")?"80":i.port}d.hash=(k.ignoreHash||i.hash==="#")?"":i.hash;var b=i.search;if(!b){var j=c.indexOf("?");b=(j!=-1)?c.substr(j):""}d.args=OpenLayers.Util.getParameters(b);d.pathname=(i.pathname.charAt(0)=="/")?i.pathname:"/"+i.pathname;return d};OpenLayers.Util.removeTail=function(b){var c=null;var a=b.indexOf("?");var d=b.indexOf("#");if(a==-1){c=(d!=-1)?b.substr(0,d):b}else{c=(d!=-1)?b.substr(0,Math.min(a,d)):b.substr(0,a)}return c};OpenLayers.Util.getBrowserName=function(){var b="";var a=navigator.userAgent.toLowerCase();if(a.indexOf("opera")!=-1){b="opera"}else{if(a.indexOf("msie")!=-1){b="msie"}else{if(a.indexOf("safari")!=-1){b="safari"}else{if(a.indexOf("mozilla")!=-1){if(a.indexOf("firefox")!=-1){b="firefox"}else{b="mozilla"}}}}}return b};OpenLayers.Util.getRenderedDimensions=function(b,o,p){var k,e;var a=document.createElement("div");a.style.visibility="hidden";var n=(p&&p.containerElement)?p.containerElement:document.body;if(o){if(o.w){k=o.w;a.style.width=k+"px"}else{if(o.h){e=o.h;a.style.height=e+"px"}}}if(p&&p.displayClass){a.className=p.displayClass}var f=document.createElement("div");f.innerHTML=b;f.style.overflow="visible";if(f.childNodes){for(var d=0,c=f.childNodes.length;d=0){if(a<10){a="0"+a}f+=a+"'";if(e.indexOf("dms")>=0){if(g<10){g="0"+g}f+=g+'"'}}if(b=="lon"){f+=h<0?OpenLayers.i18n("W"):OpenLayers.i18n("E")}else{f+=h<0?OpenLayers.i18n("S"):OpenLayers.i18n("N")}return f};OpenLayers.Element={visible:function(a){return OpenLayers.Util.getElement(a).style.display!="none"},toggle:function(){for(var c=0,a=arguments.length;c"+this.contentDiv.innerHTML+"";var h=(this.map)?this.map.layerContainerDiv:document.body;var i=OpenLayers.Util.getRenderedDimensions(e,null,{displayClass:this.displayClass,containerElement:h});var g=this.getSafeContentSize(i);var f=null;if(g.equals(i)){f=i}else{var b=new OpenLayers.Size();b.w=(g.w(e.w-this.map.paddingForPopups.right)){c.x=e.w-this.map.paddingForPopups.right-this.size.w}}if(d.y(e.h-this.map.paddingForPopups.bottom)){c.y=e.h-this.map.paddingForPopups.bottom-this.size.h}}var b=d.x-c.x;var a=d.y-c.y;this.map.pan(b,a)},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,true);this.events.on({mousedown:this.onmousedown,mousemove:this.onmousemove,mouseup:this.onmouseup,click:this.onclick,mouseout:this.onmouseout,dblclick:this.ondblclick,scope:this})},onmousedown:function(a){this.mousedown=true;OpenLayers.Event.stop(a,true)},onmousemove:function(a){if(this.mousedown){OpenLayers.Event.stop(a,true)}},onmouseup:function(a){if(this.mousedown){this.mousedown=false;OpenLayers.Event.stop(a,true)}},onclick:function(a){OpenLayers.Event.stop(a,true)},onmouseout:function(a){this.mousedown=false},ondblclick:function(a){OpenLayers.Event.stop(a,true)},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(d,a,b,c){if(d!=null){this.left=OpenLayers.Util.toFloat(d)}if(a!=null){this.bottom=OpenLayers.Util.toFloat(a)}if(b!=null){this.right=OpenLayers.Util.toFloat(b)}if(c!=null){this.top=OpenLayers.Util.toFloat(c)}},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top)},equals:function(b){var a=false;if(b!=null){a=((this.left==b.left)&&(this.right==b.right)&&(this.top==b.top)&&(this.bottom==b.bottom))}return a},toString:function(){return("left-bottom=("+this.left+","+this.bottom+") right-top=("+this.right+","+this.top+")")},toArray:function(a){if(a===true){return[this.bottom,this.left,this.top,this.right]}else{return[this.left,this.bottom,this.right,this.top]}},toBBOX:function(b,e){if(b==null){b=6}var g=Math.pow(10,b);var f=Math.round(this.left*g)/g;var d=Math.round(this.bottom*g)/g;var c=Math.round(this.right*g)/g;var a=Math.round(this.top*g)/g;if(e===true){return d+","+f+","+a+","+c}else{return f+","+d+","+c+","+a}},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])])},getWidth:function(){return(this.right-this.left)},getHeight:function(){return(this.top-this.bottom)},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight())},getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2)},getCenterLonLat:function(){if(!this.centerLonLat){this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2)}return this.centerLonLat},scale:function(e,c){if(c==null){c=this.getCenterLonLat()}var a,h;if(c.CLASS_NAME=="OpenLayers.LonLat"){a=c.lon;h=c.lat}else{a=c.x;h=c.y}var g=(this.left-a)*e+a;var b=(this.bottom-h)*e+h;var d=(this.right-a)*e+a;var f=(this.top-h)*e+h;return new OpenLayers.Bounds(g,b,d,f)},add:function(a,c){if((a==null)||(c==null)){var b=OpenLayers.i18n("boundsAddError");OpenLayers.Console.error(b);return null}return new OpenLayers.Bounds(this.left+a,this.bottom+c,this.right+a,this.top+c)},extend:function(a){var b=null;if(a){switch(a.CLASS_NAME){case"OpenLayers.LonLat":b=new OpenLayers.Bounds(a.lon,a.lat,a.lon,a.lat);break;case"OpenLayers.Geometry.Point":b=new OpenLayers.Bounds(a.x,a.y,a.x,a.y);break;case"OpenLayers.Bounds":b=a;break}if(b){this.centerLonLat=null;if((this.left==null)||(b.leftthis.right)){this.right=b.right}if((this.top==null)||(b.top>this.top)){this.top=b.top}}}},containsLonLat:function(b,a){return this.contains(b.lon,b.lat,a)},containsPixel:function(b,a){return this.contains(b.x,b.y,a)},contains:function(b,d,a){if(a==null){a=true}if(b==null||d==null){return false}b=OpenLayers.Util.toFloat(b);d=OpenLayers.Util.toFloat(d);var c=false;if(a){c=((b>=this.left)&&(b<=this.right)&&(d>=this.bottom)&&(d<=this.top))}else{c=((b>this.left)&&(bthis.bottom)&&(d=this.bottom)&&(e.bottom<=this.top))||((this.bottom>=e.bottom)&&(this.bottom<=e.top)));var f=(((e.top>=this.bottom)&&(e.top<=this.top))||((this.top>e.bottom)&&(this.top=this.left)&&(e.left<=this.right))||((this.left>=e.left)&&(this.left<=e.right)));var a=(((e.right>=this.left)&&(e.right<=this.right))||((this.right>=e.left)&&(this.right<=e.right)));d=((g||f)&&(c||a))}return d},containsBounds:function(g,b,a){if(b==null){b=false}if(a==null){a=true}var c=this.contains(g.left,g.bottom,a);var d=this.contains(g.right,g.bottom,a);var f=this.contains(g.left,g.top,a);var e=this.contains(g.right,g.top,a);return(b)?(c||d||f||e):(c&&d&&f&&e)},determineQuadrant:function(c){var b="";var a=this.getCenterLonLat();b+=(c.lat=a.right&&e.right>a.right){e=e.add(-a.getWidth(),0)}}return e},CLASS_NAME:"OpenLayers.Bounds"});OpenLayers.Bounds.fromString=function(b){var a=b.split(",");return OpenLayers.Bounds.fromArray(a)};OpenLayers.Bounds.fromArray=function(a){return new OpenLayers.Bounds(parseFloat(a[0]),parseFloat(a[1]),parseFloat(a[2]),parseFloat(a[3]))};OpenLayers.Bounds.fromSize=function(a){return new OpenLayers.Bounds(0,a.h,a.w,0)};OpenLayers.Bounds.oppositeQuadrant=function(a){var b="";b+=(a.charAt(0)=="t")?"b":"t";b+=(a.charAt(1)=="l")?"r":"l";return b};OpenLayers.LonLat=OpenLayers.Class({lon:0,lat:0,initialize:function(b,a){this.lon=OpenLayers.Util.toFloat(b);this.lat=OpenLayers.Util.toFloat(a)},toString:function(){return("lon="+this.lon+",lat="+this.lat)},toShortString:function(){return(this.lon+", "+this.lat)},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat)},add:function(c,a){if((c==null)||(a==null)){var b=OpenLayers.i18n("lonlatAddError");OpenLayers.Console.error(b);return null}return new OpenLayers.LonLat(this.lon+OpenLayers.Util.toFloat(c),this.lat+OpenLayers.Util.toFloat(a))},equals:function(b){var a=false;if(b!=null){a=((this.lon==b.lon&&this.lat==b.lat)||(isNaN(this.lon)&&isNaN(this.lat)&&isNaN(b.lon)&&isNaN(b.lat)))}return a},transform:function(c,b){var a=OpenLayers.Projection.transform({x:this.lon,y:this.lat},c,b);this.lon=a.x;this.lat=a.y;return this},wrapDateLine:function(a){var b=this.clone();if(a){while(b.lona.right){b.lon-=a.getWidth()}}return b},CLASS_NAME:"OpenLayers.LonLat"});OpenLayers.LonLat.fromString=function(b){var a=b.split(",");return new OpenLayers.LonLat(a[0],a[1])};OpenLayers.Pixel=OpenLayers.Class({x:0,y:0,initialize:function(a,b){this.x=parseFloat(a);this.y=parseFloat(b)},toString:function(){return("x="+this.x+",y="+this.y)},clone:function(){return new OpenLayers.Pixel(this.x,this.y)},equals:function(a){var b=false;if(a!=null){b=((this.x==a.x&&this.y==a.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y)))}return b},add:function(a,c){if((a==null)||(c==null)){var b=OpenLayers.i18n("pixelAddError");OpenLayers.Console.error(b);return null}return new OpenLayers.Pixel(this.x+a,this.y+c)},offset:function(a){var b=this.clone();if(a){b=this.add(a.x,a.y)}return b},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",autoActivate:false,active:null,handler:null,eventListeners:null,events:null,EVENT_TYPES:["activate","deactivate"],initialize:function(a){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,a);this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners)}if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")}},destroy:function(){if(this.events){if(this.eventListeners){this.events.un(this.eventListeners)}this.events.destroy();this.events=null}this.eventListeners=null;if(this.handler){this.handler.destroy();this.handler=null}if(this.handlers){for(var a in this.handlers){if(this.handlers.hasOwnProperty(a)&&typeof this.handlers[a].destroy=="function"){this.handlers[a].destroy()}}this.handlers=null}if(this.map){this.map.removeControl(this);this.map=null}},setMap:function(a){this.map=a;if(this.handler){this.handler.setMap(a)}},draw:function(a){if(this.div==null){this.div=OpenLayers.Util.createDiv(this.id);this.div.className=this.displayClass;if(!this.allowSelection){this.div.className+=" olControlNoSelect";this.div.setAttribute("unselectable","on",0);this.div.onselectstart=OpenLayers.Function.False}if(this.title!=""){this.div.title=this.title}}if(a!=null){this.position=a.clone()}this.moveTo(this.position);return this.div},moveTo:function(a){if((a!=null)&&(this.div!=null)){this.div.style.left=a.x+"px";this.div.style.top=a.y+"px"}},activate:function(){if(this.active){return false}if(this.handler){this.handler.activate()}this.active=true;if(this.map){OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active")}this.events.triggerEvent("activate");return true},deactivate:function(){if(this.active){if(this.handler){this.handler.deactivate()}this.active=false;if(this.map){OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active")}this.events.triggerEvent("deactivate");return true}return false},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){if(!OpenLayers.Lang.code){OpenLayers.Lang.setCode()}return OpenLayers.Lang.code},setCode:function(b){var d;if(!b){b=(OpenLayers.Util.getBrowserName()=="msie")?navigator.userLanguage:navigator.language}var c=b.split("-");c[0]=c[0].toLowerCase();if(typeof OpenLayers.Lang[c[0]]=="object"){d=c[0]}if(c[1]){var a=c[0]+"-"+c[1].toUpperCase();if(typeof OpenLayers.Lang[a]=="object"){d=a}}if(!d){OpenLayers.Console.warn("Failed to find OpenLayers.Lang."+c.join("-")+" dictionary, falling back to default language");d=OpenLayers.Lang.defaultCode}OpenLayers.Lang.code=d},translate:function(b,a){var d=OpenLayers.Lang[OpenLayers.Lang.getCode()];var c=d[b];if(!c){c=b}if(a){c=OpenLayers.String.format(c,a)}return c}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:true,anchor:null,initialize:function(h,d,g,c,b,f,e){var a=[h,d,g,c,f,e];OpenLayers.Popup.prototype.initialize.apply(this,a);this.anchor=(b!=null)?b:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)}},destroy:function(){this.anchor=null;this.relativePosition=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments)},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments)},moveTo:function(c){var b=this.relativePosition;this.relativePosition=this.calculateRelativePosition(c);var d=this.calculateNewPx(c);var a=new Array(d);OpenLayers.Popup.prototype.moveTo.apply(this,a);if(this.relativePosition!=b){this.updateRelativePosition()}},setSize:function(b){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if((this.lonlat)&&(this.map)){var a=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(a)}},calculateRelativePosition:function(b){var d=this.map.getLonLatFromLayerPx(b);var c=this.map.getExtent();var a=c.determineQuadrant(d);return OpenLayers.Bounds.oppositeQuadrant(a)},updateRelativePosition:function(){},calculateNewPx:function(b){var e=b.offset(this.anchor.offset);var a=this.size||this.contentSize;var d=(this.relativePosition.charAt(0)=="t");e.y+=(d)?-(a.h+this.anchor.size.h):this.anchor.size.h;var c=(this.relativePosition.charAt(1)=="l");e.x+=(c)?-(a.w+this.anchor.size.w):this.anchor.size.w;return e},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(a){this.easing=(a)?a:OpenLayers.Easing.Expo.easeOut},start:function(c,b,d,a){this.playing=true;this.begin=c;this.finish=b;this.duration=d;this.callbacks=a.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null}if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin)}this.interval=window.setInterval(OpenLayers.Function.bind(this.play,this),this.INTERVAL)},stop:function(){if(!this.playing){return}if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish)}window.clearInterval(this.interval);this.interval=null;this.playing=false},play:function(){var g={};for(var d in this.begin){var a=this.begin[d];var e=this.finish[d];if(a==null||e==null||isNaN(a)||isNaN(e)){OpenLayers.Console.error("invalid value for Tween")}var h=e-a;g[d]=this.easing.apply(this,[this.time,a,h,this.duration])}this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,g)}if(this.time>this.duration){this.stop()}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(e,a,g,f){return g*e/f+a},easeOut:function(e,a,g,f){return g*e/f+a},easeInOut:function(e,a,g,f){return g*e/f+a},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(e,a,g,f){return(e==0)?a:g*Math.pow(2,10*(e/f-1))+a},easeOut:function(e,a,g,f){return(e==f)?a+g:g*(-Math.pow(2,-10*e/f)+1)+a},easeInOut:function(e,a,g,f){if(e==0){return a}if(e==f){return a+g}if((e/=f/2)<1){return g/2*Math.pow(2,10*(e-1))+a}return g/2*(-Math.pow(2,-10*--e)+2)+a},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(e,a,g,f){return g*(e/=f)*e+a},easeOut:function(e,a,g,f){return -g*(e/=f)*(e-2)+a},easeInOut:function(e,a,g,f){if((e/=f/2)<1){return g/2*e*e+a}return -g/2*((--e)*(e-2)-1)+a},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,arguments)},setMap:function(e){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var c=0,a=this.map.controls.length;c=0;--a){this._removeButton(this.buttons[a])}},doubleClick:function(a){OpenLayers.Event.stop(a);return false},buttonDown:function(a){if(!OpenLayers.Event.isLeftClick(a)){return}switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break}OpenLayers.Event.stop(a)},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Event={observers:false,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(a){return a.target||a.srcElement},isLeftClick:function(a){return(((a.which)&&(a.which==1))||((a.button)&&(a.button==1)))},isRightClick:function(a){return(((a.which)&&(a.which==3))||((a.button)&&(a.button==2)))},stop:function(b,a){if(!a){if(b.preventDefault){b.preventDefault()}else{b.returnValue=false}}if(b.stopPropagation){b.stopPropagation()}else{b.cancelBubble=true}},findElement:function(c,b){var a=OpenLayers.Event.element(c);while(a.parentNode&&(!a.tagName||(a.tagName.toUpperCase()!=b.toUpperCase()))){a=a.parentNode}return a},observe:function(b,d,c,a){var e=OpenLayers.Util.getElement(b);a=a||false;if(d=="keypress"&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||e.attachEvent)){d="keydown"}if(!this.observers){this.observers={}}if(!e._eventCacheID){var f="eventCacheID_";if(e.id){f=e.id+"_"+f}e._eventCacheID=OpenLayers.Util.createUniqueID(f)}var g=e._eventCacheID;if(!this.observers[g]){this.observers[g]=[]}this.observers[g].push({element:e,name:d,observer:c,useCapture:a});if(e.addEventListener){e.addEventListener(d,c,a)}else{if(e.attachEvent){e.attachEvent("on"+d,c)}}},stopObservingElement:function(a){var b=OpenLayers.Util.getElement(a);var c=b._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[c])},_removeElementObservers:function(e){if(e){for(var b=e.length-1;b>=0;b--){var c=e[b];var a=new Array(c.element,c.name,c.observer,c.useCapture);var d=OpenLayers.Event.stopObserving.apply(this,a)}}},stopObserving:function(h,a,g,b){b=b||false;var f=OpenLayers.Util.getElement(h);var d=f._eventCacheID;if(a=="keypress"){if(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||f.detachEvent){a="keydown"}}var k=false;var c=OpenLayers.Event.observers[d];if(c){var e=0;while(!k&&e
To get rid of this message, select a new BaseLayer in the layer switcher in the upper-right corner.",getLayerWarning:"The ${layerType} Layer was unable to load correctly.

To get rid of this message, select a new BaseLayer in the layer switcher in the upper-right corner.

Most likely, this is because the ${layerLib} library script was not correctly included.

Developers: For help getting this working correctly, click here",scale:"Scale = 1 : ${scaleDenom}",W:"W",E:"E",N:"N",S:"S",graticule:"Graticule",layerAlreadyAdded:"You tried to add the layer: ${layerName} to the map, but it has already been added",reprojectDeprecated:"You are using the 'reproject' option on the ${layerName} layer. This option is deprecated: its use was designed to support displaying data over commercial basemaps, but that functionality should now be achieved by using Spherical Mercator support. More information is available from http://trac.openlayers.org/wiki/SphericalMercator.",methodDeprecated:"This method has been deprecated and will be removed in 3.0. Please use ${newMethod} instead.",boundsAddError:"You must pass both x and y values to the add function.",lonlatAddError:"You must pass both lon and lat values to the add function.",pixelAddError:"You must pass both x and y values to the add function.",unsupportedGeometryType:"Unsupported geometry type: ${geomType}",pagePositionFailed:"OpenLayers.Util.pagePosition failed: element with id ${elemId} may be misplaced.",filterEvaluateNotImplemented:"evaluate is not implemented for this filter type.",end:""};OpenLayers.Popup.AnchoredBubble=OpenLayers.Class(OpenLayers.Popup.Anchored,{rounded:false,initialize:function(g,c,f,b,a,e,d){this.padding=new OpenLayers.Bounds(0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE,0,OpenLayers.Popup.AnchoredBubble.CORNER_SIZE);OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments)},draw:function(a){OpenLayers.Popup.Anchored.prototype.draw.apply(this,arguments);this.setContentHTML();this.setBackgroundColor();this.setOpacity();return this.div},updateRelativePosition:function(){this.setRicoCorners()},setSize:function(a){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.setRicoCorners()},setBackgroundColor:function(a){if(a!=undefined){this.backgroundColor=a}if(this.div!=null){if(this.contentDiv!=null){this.div.style.background="transparent";OpenLayers.Rico.Corner.changeColor(this.groupDiv,this.backgroundColor)}}},setOpacity:function(a){OpenLayers.Popup.Anchored.prototype.setOpacity.call(this,a);if(this.div!=null){if(this.groupDiv!=null){OpenLayers.Rico.Corner.changeOpacity(this.groupDiv,this.opacity)}}},setBorder:function(a){this.border=0},setRicoCorners:function(){var a=this.getCornersToRound(this.relativePosition);var b={corners:a,color:this.backgroundColor,bgColor:"transparent",blend:false};if(!this.rounded){OpenLayers.Rico.Corner.round(this.div,b);this.rounded=true}else{OpenLayers.Rico.Corner.reRound(this.groupDiv,b);this.setBackgroundColor();this.setOpacity()}},getCornersToRound:function(){var a=["tl","tr","bl","br"];var b=OpenLayers.Bounds.oppositeQuadrant(this.relativePosition);OpenLayers.Util.removeItem(a,b);return a.join(" ")},CLASS_NAME:"OpenLayers.Popup.AnchoredBubble"});OpenLayers.Popup.AnchoredBubble.CORNER_SIZE=5;OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,initialize:function(b,a){OpenLayers.Util.extend(this,a);this.projCode=b;if(window.Proj4js){this.proj=new Proj4js.Proj(b)}},getCode:function(){return this.proj?this.proj.srsCode:this.projCode},getUnits:function(){return this.proj?this.proj.units:null},toString:function(){return this.getCode()},equals:function(a){if(a&&a.getCode){return this.getCode()==a.getCode()}else{return false}},destroy:function(){delete this.proj;delete this.projCode},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};OpenLayers.Projection.addTransform=function(c,b,a){if(!OpenLayers.Projection.transforms[c]){OpenLayers.Projection.transforms[c]={}}OpenLayers.Projection.transforms[c][b]=a};OpenLayers.Projection.transform=function(a,c,b){if(c.proj&&b.proj){a=Proj4js.transform(c.proj,b.proj,a)}else{if(c&&b&&OpenLayers.Projection.transforms[c.getCode()]&&OpenLayers.Projection.transforms[c.getCode()][b.getCode()]){OpenLayers.Projection.transforms[c.getCode()][b.getCode()](a)}}return a};OpenLayers.Tile=OpenLayers.Class({EVENT_TYPES:["loadstart","loadend","reload","unload"],events:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:false,initialize:function(d,a,e,b,c){this.layer=d;this.position=a.clone();this.bounds=e.clone();this.url=b;this.size=c.clone();this.id=OpenLayers.Util.createUniqueID("Tile_");this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES)},unload:function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("unload")}},destroy:function(){this.layer=null;this.bounds=null;this.size=null;this.position=null;this.events.destroy();this.events=null},clone:function(a){if(a==null){a=new OpenLayers.Tile(this.layer,this.position,this.bounds,this.url,this.size)}OpenLayers.Util.applyDefaults(a,this);return a},draw:function(){var a=this.layer.maxExtent;var b=(a&&this.bounds.intersectsBounds(a,false));this.shouldDraw=(b||this.layer.displayOutsideMaxExtent);this.clear();return this.shouldDraw},moveTo:function(b,a,c){if(c==null){c=true}this.bounds=b.clone();this.position=a.clone();if(c){this.draw()}},clear:function(){},getBoundsFromBaseLayer:function(a){var f=OpenLayers.i18n("reprojectDeprecated",{layerName:this.layer.name});OpenLayers.Console.warn(f);var d=this.layer.map.getLonLatFromLayerPx(a);var c=a.clone();c.x+=this.size.w;c.y+=this.size.h;var b=this.layer.map.getLonLatFromLayerPx(c);if(d.lon>b.lon){if(d.lon<0){d.lon=-180-(d.lon+180)}else{b.lon=180+b.lon+180}}var e=new OpenLayers.Bounds(d.lon,b.lat,b.lon,d.lat);return e},showTile:function(){if(this.shouldDraw){this.show()}},show:function(){},hide:function(){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(d,b,a){OpenLayers.Util.extend(this,a);this.control=d;this.callbacks=b;var c=this.map||d.map;if(c){this.setMap(c)}this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},setMap:function(a){this.map=a},checkModifiers:function(a){if(this.keyMask==null){return true}var b=(a.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(a.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(a.altKey?OpenLayers.Handler.MOD_ALT:0);return(b==this.keyMask)},activate:function(){if(this.active){return false}var c=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var b=0,a=c.length;b=0;--a){this.controls[a].destroy()}this.controls=null}if(this.layers!=null){for(var a=this.layers.length-1;a>=0;--a){this.layers[a].destroy(false)}this.layers=null}if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv)}this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null}this.events.destroy();this.events=null},setOptions:function(a){OpenLayers.Util.extend(this,a)},getTileSize:function(){return this.tileSize},getBy:function(e,c,a){var d=(typeof a.test=="function");var b=OpenLayers.Array.filter(this[e],function(f){return f[c]==a||(d&&a.test(f[c]))});return b},getLayersBy:function(b,a){return this.getBy("layers",b,a)},getLayersByName:function(a){return this.getLayersBy("name",a)},getLayersByClass:function(a){return this.getLayersBy("CLASS_NAME",a)},getControlsBy:function(b,a){return this.getBy("controls",b,a)},getControlsByClass:function(a){return this.getControlsBy("CLASS_NAME",a)},getLayer:function(e){var b=null;for(var d=0,a=this.layers.length;dthis.layers.length){b=this.layers.length}}if(e!=b){this.layers.splice(e,1);this.layers.splice(b,0,d);for(var c=0,a=this.layers.length;c=0;--b){this.removePopup(this.popups[b])}}a.map=this;this.popups.push(a);var c=a.draw();if(c){c.style.zIndex=this.Z_INDEX_BASE.Popup+this.popups.length;this.layerContainerDiv.appendChild(c)}},removePopup:function(a){OpenLayers.Util.removeItem(this.popups,a);if(a.div){try{this.layerContainerDiv.removeChild(a.div)}catch(b){}}a.map=null},getSize:function(){var a=null;if(this.size!=null){a=this.size.clone()}return a},updateSize:function(){var c=this.getCurrentSize();if(c&&!isNaN(c.h)&&!isNaN(c.w)){this.events.clearMouseCache();var f=this.getSize();if(f==null){this.size=f=c}if(!c.equals(f)){this.size=c;for(var d=0,b=this.layers.length;dthis.restrictedExtent.getWidth()){g=new OpenLayers.LonLat(p.lon,g.lat)}else{if(o.leftthis.restrictedExtent.right){g=g.add(this.restrictedExtent.right-o.right,0)}}}if(o.getHeight()>this.restrictedExtent.getHeight()){g=new OpenLayers.LonLat(g.lon,p.lat)}else{if(o.bottomthis.restrictedExtent.top){g=g.add(0,this.restrictedExtent.top-o.top)}}}}}var b=c||((this.isValidZoomLevel(n))&&(n!=this.getZoom()));var e=(this.isValidLonLat(g))&&(!g.equals(this.center));if(b||e||!m){if(!this.dragging&&!h){this.events.triggerEvent("movestart")}if(e){if((!b)&&(this.center)){this.centerLayerContainer(g)}this.center=g.clone()}if((b)||(this.layerContainerOrigin==null)){this.layerContainerOrigin=this.center.clone();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px"}if(b){this.zoom=n;this.resolution=this.getResolutionForZoom(n);this.viewRequestID++}var a=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(a,b,m);if(m){this.baseLayer.events.triggerEvent("move")}else{this.baseLayer.events.triggerEvent("moveend",{zoomChanged:b})}}a=this.baseLayer.getExtent();for(var f=0,k=this.layers.length;f=0)&&(a0){a=this.layers[0].getResolution()}}return a},getUnits:function(){var a=null;if(this.baseLayer!=null){a=this.baseLayer.units}return a},getScale:function(){var c=null;if(this.baseLayer!=null){var b=this.getResolution();var a=this.baseLayer.units;c=OpenLayers.Util.getScaleFromResolution(b,a)}return c},getZoomForExtent:function(c,b){var a=null;if(this.baseLayer!=null){a=this.baseLayer.getZoomForExtent(c,b)}return a},getResolutionForZoom:function(b){var a=null;if(this.baseLayer){a=this.baseLayer.getResolutionForZoom(b)}return a},getZoomForResolution:function(a,c){var b=null;if(this.baseLayer!=null){b=this.baseLayer.getZoomForResolution(a,c)}return b},zoomTo:function(a){if(this.isValidZoomLevel(a)){this.setCenter(null,a)}},zoomIn:function(){this.zoomTo(this.getZoom()+1)},zoomOut:function(){this.zoomTo(this.getZoom()-1)},zoomToExtent:function(d,c){var b=d.getCenterLonLat();if(this.baseLayer.wrapDateLine){var a=this.getMaxExtent();d=d.clone();while(d.rightOpenLayers.IMAGE_RELOAD_ATTEMPTS){c.call(this)}};OpenLayers.Event.observe(this.imgDiv,"error",OpenLayers.Function.bind(a,this))},checkImgURL:function(){if(this.layer){var a=this.layerAlphaHack?this.imgDiv.firstChild.src:this.imgDiv.src;if(!OpenLayers.Util.isEquivalentUrl(a,this.url)){this.hide()}}},startTransition:function(){if(!this.backBufferTile||!this.backBufferTile.imgDiv){return}var d=1;if(this.backBufferTile.resolution){d=this.backBufferTile.resolution/this.layer.getResolution()}if(d!=this.lastRatio){if(this.layer.transitionEffect=="resize"){var c=new OpenLayers.LonLat(this.backBufferTile.bounds.left,this.backBufferTile.bounds.top);var b=new OpenLayers.Size(this.backBufferTile.size.w*d,this.backBufferTile.size.h*d);var a=this.layer.map.getLayerPxFromLonLat(c);OpenLayers.Util.modifyDOMElement(this.backBufferTile.frame,null,a,b);var e=this.backBufferTile.imageSize;e=new OpenLayers.Size(e.w*d,e.h*d);var f=this.backBufferTile.imageOffset;if(f){f=new OpenLayers.Pixel(f.x*d,f.y*d)}OpenLayers.Util.modifyDOMElement(this.backBufferTile.imgDiv,null,f,e);this.backBufferTile.show()}}else{if(this.layer.singleTile){this.backBufferTile.show()}else{this.backBufferTile.hide()}}this.lastRatio=d},show:function(){this.frame.style.display="";if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(navigator.userAgent.toLowerCase().indexOf("gecko")!=-1){this.frame.scrollLeft=this.frame.scrollLeft}}},hide:function(){this.frame.style.display="none"},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Tile.Image.useBlankTile=(OpenLayers.Util.getBrowserName()=="safari"||OpenLayers.Util.getBrowserName()=="opera");OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:OpenLayers.Popup.AnchoredBubble,popup:null,initialize:function(a,c,b){this.layer=a;this.lonlat=c;this.data=(b!=null)?b:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup)}}if(this.layer!=null&&this.marker!=null){this.layer.removeMarker(this.marker)}this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null}if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null}},onScreen:function(){var b=false;if((this.layer!=null)&&(this.layer.map!=null)){var a=this.layer.map.getExtent();b=a.containsLonLat(this.lonlat)}return b},createMarker:function(){if(this.lonlat!=null){this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon)}return this.marker},destroyMarker:function(){this.marker.destroy()},createPopup:function(b){if(this.lonlat!=null){var c=this.id+"_popup";var a=(this.marker)?this.marker.icon:null;if(!this.popup){this.popup=new this.popupClass(c,this.lonlat,this.data.popupSize,this.data.popupContentHTML,a,b)}if(this.data.overflow!=null){this.popup.contentDiv.style.overflow=this.data.overflow}this.popup.feature=this}return this.popup},destroyPopup:function(){if(this.popup){this.popup.feature=null;this.popup.destroy();this.popup=null}},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,"double":false,pixelTolerance:0,stopSingle:false,stopDouble:false,timerId:null,down:null,rightclickTimerId:null,initialize:function(c,b,a){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(this.pixelTolerance!=null){this.mousedown=function(d){this.down=d.xy;return true}}},mousedown:null,mouseup:function(b){var a=true;if(this.checkModifiers(b)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(b)){a=this.rightclick(b)}return a},rightclick:function(b){if(this.passesTolerance(b)){if(this.rightclickTimerId!=null){this.clearTimer();this.callback("dblrightclick",[b]);return !this.stopDouble}else{var a=this["double"]?OpenLayers.Util.extend({},b):this.callback("rightclick",[b]);var c=OpenLayers.Function.bind(this.delayedRightCall,this,a);this.rightclickTimerId=window.setTimeout(c,this.delay)}}return !this.stopSingle},delayedRightCall:function(a){this.rightclickTimerId=null;if(a){this.callback("rightclick",[a])}return !this.stopSingle},dblclick:function(a){if(this.passesTolerance(a)){if(this["double"]){this.callback("dblclick",[a])}this.clearTimer()}return !this.stopDouble},click:function(b){if(this.passesTolerance(b)){if(this.timerId!=null){this.clearTimer()}else{var a=this.single?OpenLayers.Util.extend({},b):null;this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,a),this.delay)}}return !this.stopSingle},passesTolerance:function(b){var c=true;if(this.pixelTolerance!=null&&this.down){var a=Math.sqrt(Math.pow(this.down.x-b.xy.x,2)+Math.pow(this.down.y-b.xy.y,2));if(a>this.pixelTolerance){c=false}}return c},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null}if(this.rightclickTimerId!=null){window.clearTimeout(this.rightclickTimerId);this.rightclickTimerId=null}},delayedCall:function(a){this.timerId=null;if(a){this.callback("click",[a])}},deactivate:function(){var a=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.clearTimer();this.down=null;a=true}return a},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:true,dragging:false,last:null,start:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:false,documentEvents:null,initialize:function(c,b,a){OpenLayers.Handler.prototype.initialize.apply(this,arguments)},down:function(a){},move:function(a){},up:function(a){},out:function(a){},mousedown:function(b){var a=true;this.dragging=false;if(this.checkModifiers(b)&&OpenLayers.Event.isLeftClick(b)){this.started=true;this.start=b.xy;this.last=b.xy;OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown");this.down(b);this.callback("down",[b.xy]);OpenLayers.Event.stop(b);if(!this.oldOnselectstart){this.oldOnselectstart=(document.onselectstart)?document.onselectstart:OpenLayers.Function.True}document.onselectstart=OpenLayers.Function.False;a=!this.stopDown}else{this.started=false;this.start=null;this.last=null}return a},mousemove:function(a){if(this.started&&!this.timeoutId&&(a.xy.x!=this.last.x||a.xy.y!=this.last.y)){if(this.documentDrag===true&&this.documentEvents){if(a.element===document){this.adjustXY(a);this.setEvent(a)}else{this.destroyDocumentEvents()}}if(this.interval>0){this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval)}this.dragging=true;this.move(a);this.callback("move",[a.xy]);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart;document.onselectstart=OpenLayers.Function.False}this.last=this.evt.xy}return true},removeTimeout:function(){this.timeoutId=null},mouseup:function(b){if(this.started){if(this.documentDrag===true&&this.documentEvents){this.adjustXY(b);this.destroyDocumentEvents()}var a=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(b);this.callback("up",[b.xy]);if(a){this.callback("done",[b.xy])}document.onselectstart=this.oldOnselectstart}return true},mouseout:function(b){if(this.started&&OpenLayers.Util.mouseLeft(b,this.map.div)){if(this.documentDrag===true){this.documentEvents=new OpenLayers.Events(this,document,null,null,{includeXY:true});this.documentEvents.on({mousemove:this.mousemove,mouseup:this.mouseup});OpenLayers.Element.addClass(document.body,"olDragDown")}else{var a=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(b);this.callback("out",[]);if(a){this.callback("done",[b.xy])}if(document.onselectstart){document.onselectstart=this.oldOnselectstart}}}return true},click:function(a){return(this.start==this.last)},activate:function(){var a=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;a=true}return a},deactivate:function(){var a=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.started=false;this.dragging=false;this.start=null;this.last=null;a=true;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown")}return a},adjustXY:function(a){var b=OpenLayers.Util.pagePosition(this.map.div);a.xy.x-=b[0];a.xy.y-=b[1]},destroyDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents.destroy();this.documentEvents=null},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,mousePosition:null,interval:0,delta:0,cumulative:true,initialize:function(c,b,a){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this)},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null},onWheelEvent:function(k){if(!this.map||!this.checkModifiers(k)){return}var g=false;var m=false;var f=false;var b=OpenLayers.Event.element(k);while((b!=null)&&!f&&!g){if(!g){try{if(b.currentStyle){c=b.currentStyle.overflow}else{var a=document.defaultView.getComputedStyle(b,null);var c=a.getPropertyValue("overflow")}g=(c&&(c=="auto")||(c=="scroll"))}catch(d){}}if(!m){for(var h=0,j=this.map.layers.length;h=0){this.initResolutions();break}}}},onMapResize:function(){},redraw:function(){var b=false;if(this.map){this.inRange=this.calculateInRange();var c=this.getExtent();if(c&&this.inRange&&this.visibility){var a=true;this.moveTo(c,a,false);this.events.triggerEvent("moveend",{zoomChanged:a});b=true}}return b},moveTo:function(b,a,c){var d=this.visibility;if(!this.isBaseLayer){d=d&&this.inRange}this.display(d)},setMap:function(b){if(this.map==null){this.map=b;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection)}this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var a=((this.visibility)&&(this.inRange));this.div.style.display=a?"":"none"}this.setTileSize()}},afterAdd:function(){},removeMap:function(a){},getImageSize:function(a){return(this.imageSize||this.tileSize)},setTileSize:function(a){var b=(a)?a:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=b;if(this.gutter){this.imageOffset=new OpenLayers.Pixel(-this.gutter,-this.gutter);this.imageSize=new OpenLayers.Size(b.w+(2*this.gutter),b.h+(2*this.gutter))}},getVisibility:function(){return this.visibility},setVisibility:function(a){if(a!=this.visibility){this.visibility=a;this.display(a);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"})}this.events.triggerEvent("visibilitychanged")}},display:function(a){if(a!=(this.div.style.display!="none")){this.div.style.display=(a&&this.calculateInRange())?"block":"none"}},calculateInRange:function(){var b=false;if(this.alwaysInRange){b=true}else{if(this.map){var a=this.map.getResolution();b=((a>=this.minResolution)&&(a<=this.maxResolution))}}return b},setIsBaseLayer:function(a){if(a!=this.isBaseLayer){this.isBaseLayer=a;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this})}}},initResolutions:function(){var e,a;var f={},d=true;for(e=0,a=this.RESOLUTION_PROPERTIES.length;e=e){d=j;k=f}if(j<=e){b=j;c=f;break}}var h=d-b;if(h>0){n=k+((d-e)/h)}else{n=k}}else{var l;var m=Number.POSITIVE_INFINITY;for(var f=0,g=this.resolutions.length;fm){break}m=l}else{if(this.resolutions[f]d){this.zoomBox.style.width=Math.max(1,c-e.xOffset)+"px"}if(f.y>b){this.zoomBox.style.height=Math.max(1,a-e.yOffset)+"px"}}},endBox:function(b){var a;if(Math.abs(this.dragHandler.start.x-b.x)>5||Math.abs(this.dragHandler.start.y-b.y)>5){var g=this.dragHandler.start;var f=Math.min(g.y,b.y);var c=Math.max(g.y,b.y);var e=Math.min(g.x,b.x);var d=Math.max(g.x,b.x);a=new OpenLayers.Bounds(e,c,d,f)}else{a=this.dragHandler.start.clone()}this.removeBox();this.callback("done",[a])},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxCharacteristics=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDrawBox")},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true}else{return false}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.dragHandler.deactivate();return true}else{return false}},getBoxCharacteristics:function(){if(!this.boxCharacteristics){var a=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width"))+parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width"))+1;var c=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width"))+parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"))+1;var b=OpenLayers.Util.getBrowserName()=="msie"?document.compatMode!="BackCompat":true;this.boxCharacteristics={xOffset:a,yOffset:c,newBoxModel:b}}return this.boxCharacteristics},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:false,initialize:function(d,c,e,b){var a=arguments;a=[d,b];OpenLayers.Layer.prototype.initialize.apply(this,a);this.url=c;this.params=OpenLayers.Util.extend({},e)},destroy:function(){this.url=null;this.params=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){if(a==null){a=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions())}a=OpenLayers.Layer.prototype.clone.apply(this,[a]);return a},setUrl:function(a){this.url=a},mergeNewParams:function(b){this.params=OpenLayers.Util.extend(this.params,b);var a=this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"params"})}return a},redraw:function(a){if(a){return this.mergeNewParams({_olSalt:Math.random()})}else{return OpenLayers.Layer.prototype.redraw.apply(this,[])}},selectUrl:function(e,d){var c=1;for(var b=0,a=e.length;b0){this.removeMarker(this.markers[0])}}},drawMarker:function(a){var b=this.map.getLayerPxFromLonLat(a.lonlat);if(b==null){a.display(false)}else{if(!a.isDrawn()){var c=a.draw(b);this.div.appendChild(c)}else{if(a.icon){a.icon.moveTo(b)}}}},getDataExtent:function(){var b=null;if(this.markers&&(this.markers.length>0)){var b=new OpenLayers.Bounds();for(var d=0,a=this.markers.length;d0){c.push(",")}j=f[e].geometry;h=j.CLASS_NAME.split(".")[2].toLowerCase();if(!this.extract[h]){return null}if(this.internalProjection&&this.externalProjection){j=j.clone();j.transform(this.internalProjection,this.externalProjection)}d=this.extract[h].apply(this,[j]);c.push(h.toUpperCase()+"("+d+")")}if(b){c.push(")")}return c.join("")},extract:{point:function(a){return a.x+" "+a.y},multipoint:function(c){var d=[];for(var b=0,a=c.components.length;b=i.bottom-j*this.buffer)||t=0)&&(c=0)){f=this.grid[j][c]}if((f!=null)&&(!f.queued)){b.unshift(f);f.queued=true;l=0;g=j;a=c}else{k=(k+1)%4;l++}}for(var d=0,e=b.length;d-this.tileSize.w*(b-1)){this.shiftColumn(true)}else{if(d.x<-this.tileSize.w*b){this.shiftColumn(false)}else{if(d.y>-this.tileSize.h*(b-1)){this.shiftRow(true)}else{if(d.y<-this.tileSize.h*b){this.shiftRow(false)}else{break}}}}}},shiftRow:function(n){var c=(n)?0:(this.grid.length-1);var b=this.grid;var f=b[c];var e=this.map.getResolution();var h=(n)?-this.tileSize.h:this.tileSize.h;var g=e*-h;var m=(n)?b.pop():b.shift();for(var j=0,l=f.length;je){var f=this.grid.pop();for(var b=0,a=f.length;bc){for(var b=0,a=this.grid.length;b=0&&E<=1&&C>=0&&C<=1){if(!s){f=true}else{var h=a.x1+(E*o);var g=a.y1+(E*w);f=new OpenLayers.Geometry.Point(h,g)}}}if(z){var r;if(f){if(s){var n=[a,H];var A,h,g;outer:for(var v=0;v<2;++v){A=n[v];for(var u=1;u<3;++u){h=A["x"+u];g=A["y"+u];r=Math.sqrt(Math.pow(h-f.x,2)+Math.pow(g-f.y,2));if(r=1){g=a;e=f}else{g=b+h*m;e=i+h*l}}return{distance:Math.sqrt(Math.pow(g-c,2)+Math.pow(e-j,2)),x:g,y:e}};OpenLayers.Layer.TMS=OpenLayers.Class(OpenLayers.Layer.Grid,{serviceVersion:"1.0.0",isBaseLayer:true,tileOrigin:null,serverResolutions:null,zoomOffset:0,initialize:function(d,c,b){var a=[];a.push(d,c,{},b);OpenLayers.Layer.Grid.prototype.initialize.apply(this,a)},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments)},clone:function(a){if(a==null){a=new OpenLayers.Layer.TMS(this.name,this.url,this.getOptions())}a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a]);return a},getURL:function(d){d=this.adjustBounds(d);var c=this.map.getResolution();var a=Math.round((d.left-this.tileOrigin.lon)/(c*this.tileSize.w));var g=Math.round((d.bottom-this.tileOrigin.lat)/(c*this.tileSize.h));var f=this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,c):this.map.getZoom()+this.zoomOffset;var e=this.serviceVersion+"/"+this.layername+"/"+f+"/"+a+"/"+g+"."+this.type;var b=this.url;if(b instanceof Array){b=this.selectUrl(e,b)}return b+e},addTile:function(b,a){return new OpenLayers.Tile.Image(this,a,b,null,this.tileSize)},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.bottom)}},CLASS_NAME:"OpenLayers.Layer.TMS"});OpenLayers.Layer.WMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{service:"WMS",version:"1.1.1",request:"GetMap",styles:"",exceptions:"application/vnd.ogc.se_inimage",format:"image/jpeg"},reproject:false,isBaseLayer:true,encodeBBOX:false,noMagic:false,yx:{"EPSG:4326":true},initialize:function(d,c,e,b){var a=[];e=OpenLayers.Util.upperCaseObject(e);if(parseFloat(e.VERSION)>=1.3&&!e.EXCEPTIONS){e.EXCEPTIONS="INIMAGE"}a.push(d,c,e,b);OpenLayers.Layer.Grid.prototype.initialize.apply(this,a);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));if(!this.noMagic&&this.params.TRANSPARENT&&this.params.TRANSPARENT.toString().toLowerCase()=="true"){if((b==null)||(!b.isBaseLayer)){this.isBaseLayer=false}if(this.params.FORMAT=="image/jpeg"){this.params.FORMAT=OpenLayers.Util.alphaHack()?"image/gif":"image/png"}}},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments)},clone:function(a){if(a==null){a=new OpenLayers.Layer.WMS(this.name,this.url,this.params,this.getOptions())}a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a]);return a},reverseAxisOrder:function(){return(parseFloat(this.params.VERSION)>=1.3&&!!this.yx[this.map.getProjectionObject().getCode()])},getURL:function(c){c=this.adjustBounds(c);var d=this.getImageSize();var e={};var b=this.reverseAxisOrder();e.BBOX=this.encodeBBOX?c.toBBOX(null,b):c.toArray(b);e.WIDTH=d.w;e.HEIGHT=d.h;var a=this.getFullRequestString(e);return a},addTile:function(b,a){return new OpenLayers.Tile.Image(this,a,b,null,this.tileSize)},mergeNewParams:function(c){var b=OpenLayers.Util.upperCaseObject(c);var a=[b];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,a)},getFullRequestString:function(d,b){var a=this.map.getProjection();var c=(a=="none")?null:a;if(parseFloat(this.params.VERSION)>=1.3){this.params.CRS=c}else{this.params.SRS=c}return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,arguments)},CLASS_NAME:"OpenLayers.Layer.WMS"});OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(a){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];if(a!=null){this.addComponents(a)}},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments)},clone:function(){var geometry=eval("new "+this.CLASS_NAME+"()");for(var i=0,len=this.components.length;i0){this.setBounds(this.components[0].getBounds());for(var b=1,a=this.components.length;b-1)){if(a!=null&&(a=0;--a){this.removeComponent(b[a])}},removeComponent:function(a){OpenLayers.Util.removeItem(this.components,a);this.clearBounds()},getLength:function(){var c=0;for(var b=0,a=this.components.length;b0)?e:h;c.push(f)}l=b.length;if(d===0){for(var k=0;k1)){for(var b=1,a=this.components.length;b1)){var h,g;for(var d=1,a=e.components.length;d2)){OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments)}},intersects:function(m){var c=false;var l=m.CLASS_NAME;if(l=="OpenLayers.Geometry.LineString"||l=="OpenLayers.Geometry.LinearRing"||l=="OpenLayers.Geometry.Point"){var p=this.getSortedSegments();var n;if(l=="OpenLayers.Geometry.Point"){n=[{x1:m.x,y1:m.y,x2:m.x,y2:m.y}]}else{n=m.getSortedSegments()}var s,g,e,a,r,q,d,b;outer:for(var h=0,k=p.length;he){break}if(q.x2Math.max(a,r)){continue}if(Math.max(d,b)0){var p=r.x10){a.unshift(r,1);Array.prototype.splice.apply(c,a);r+=a.length-2}if(d){for(var q=0,u=h.points.length;q0&&s.length>0){s.push(f.clone());m.push(new OpenLayers.Geometry.LineString(s))}}else{n=x.splitWith(this,b)}if(c&&c.length>1){e=true}else{c=[]}if(m&&m.length>1){l=true}else{m=[]}if(e||l){if(d){n=[m,c]}else{n=c}}return n},splitWith:function(b,a){return b.split(this,a)},getVertices:function(a){var b;if(a===true){b=[this.components[0],this.components[this.components.length-1]]}else{if(a===false){b=this.components.slice(1,this.components.length-1)}else{b=this.components.slice()}}return b},distanceTo:function(h,g){var k=!(g&&g.edge===false);var B=k&&g&&g.details;var q,e={};var t=Number.POSITIVE_INFINITY;if(h instanceof OpenLayers.Geometry.Point){var r=this.getSortedSegments();var p=h.x;var o=h.y;var z;for(var v=0,w=r.length;vp&&((o>z.y1&&oz.y2))){break}}}if(B){e={distance:e.distance,x0:e.x,y0:e.y,x1:p,y1:o}}else{e=e.distance}}else{if(h instanceof OpenLayers.Geometry.LineString){var d=this.getSortedSegments();var c=h.getSortedSegments();var b,a,n,A,f;var m=c.length;var l={point:true};outer:for(var v=0,w=d.length;v4){this.components.pop();OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);var b=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[b])}},move:function(b,d){for(var c=0,a=this.components.length;c2)){var h=0;var g=0;for(var e=0;e2)){var f=0;for(var e=0,d=this.components.length;e2){var h,g;for(var e=0;e=q&&k<=o)||q>=o&&(k<=q&&k>=o)){h=-1;break}}continue}e=s(r(j,q,d,o,b),l);if(e==k){if(d=d&&j<=b)||d>b&&(j<=d&&j>=b)){h=-1;break}}if(e<=k){continue}if(q!=o&&(eMath.max(q,o))){continue}if(d=d&&jb&&(j=b)){++h}}var p=(h==-1)?1:!!(h&1);return p},intersects:function(d){var b=false;if(d.CLASS_NAME=="OpenLayers.Geometry.Point"){b=this.containsPoint(d)}else{if(d.CLASS_NAME=="OpenLayers.Geometry.LineString"){b=d.intersects(this)}else{if(d.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){b=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[d])}else{for(var c=0,a=d.components.length;c1; i--) { map.controls[i-1].deactivate(); @@ -112,12 +112,12 @@ mxn.register('openlayers', { else if ( args.zoom == 'small' ) { map.addControl(new OpenLayers.Control.ZoomPanel()); if ( args.pan) { - map.addControl(new OpenLayers.Control.PanPanel()); + map.addControl(new OpenLayers.Control.PanPanel()); } } else { if ( args.pan){ - map.addControl(new OpenLayers.Control.PanPanel()); + map.addControl(new OpenLayers.Control.PanPanel()); } } if ( args.overview ) { @@ -131,12 +131,12 @@ mxn.register('openlayers', { addSmallControls: function() { var map = this.maps[this.api]; this.addControlsArgs.pan = false; - this.addControlsArgs.scale = false; + this.addControlsArgs.scale = false; this.addControlsArgs.zoom = 'small'; map.addControl(new OpenLayers.Control.ZoomBox()); map.addControl(new OpenLayers.Control.LayerSwitcher({ 'ascending':false - })); + })); }, addLargeControls: function() { @@ -154,7 +154,7 @@ mxn.register('openlayers', { this.addControlsArgs.map_type = true; }, - setCenterAndZoom: function(point, zoom) { + setCenterAndZoom: function(point, zoom) { var map = this.maps[this.api]; var pt = point.toProprietary(this.api); map.setCenter(point.toProprietary(this.api), zoom); @@ -215,7 +215,7 @@ mxn.register('openlayers', { for(var i = 0, length = this.polylines.length; i < length; i++){ olpolylines.push(this.polylines[i].toProprietary(this.api)); } - if (this.layers['polylines']) this.layers['polylines'].removeFeatures(olpolylines); + if (this.layers['polylines']) this.layers['polylines'].removeFeatures(olpolylines); }, getCenter: function() { @@ -228,7 +228,7 @@ mxn.register('openlayers', { var map = this.maps[this.api]; var pt = point.toProprietary(this.api); map.setCenter(pt); - + }, setZoom: function(zoom) { @@ -250,46 +250,18 @@ mxn.register('openlayers', { setMapType: function(type) { var map = this.maps[this.api]; throw 'Not implemented (setMapType)'; - - // switch(type) { - // case mxn.Mapstraction.ROAD: - // map.setMapTypeId(google.maps.MapTypeId.ROADMAP); - // break; - // case mxn.Mapstraction.SATELLITE: - // map.setMapTypeId(google.maps.MapTypeId.SATELLITE); - // break; - // case mxn.Mapstraction.HYBRID: - // map.setMapTypeId(google.maps.MapTypeId.HYBRID); - // break; - // default: - // map.setMapTypeId(google.maps.MapTypeId.ROADMAP); - // } }, getMapType: function() { var map = this.maps[this.api]; // TODO: implement actual layer support return mxn.Mapstraction.ROAD; - - // var type = map.getMapTypeId(); - // switch(type) { - // case google.maps.MapTypeId.ROADMAP: - // return mxn.Mapstraction.ROAD; - // case google.maps.MapTypeId.SATELLITE: - // return mxn.Mapstraction.SATELLITE; - // case google.maps.MapTypeId.HYBRID: - // return mxn.Mapstraction.HYBRID; - // //case google.maps.MapTypeId.TERRAIN: - // // return something; - // default: - // return null; - // } }, getBounds: function () { var map = this.maps[this.api]; var olbox = map.calculateBounds(); - return new mxn.BoundingBox(olbox.bottom, olbox.left, olbox.top, olbox.right); + return new mxn.BoundingBox(olbox.bottom, olbox.left, olbox.top, olbox.right); }, setBounds: function(bounds){ @@ -302,7 +274,7 @@ mxn.register('openlayers', { } var obounds = new OpenLayers.Bounds(); - + obounds.extend(new mxn.LatLonPoint(sw.lat,sw.lon).toProprietary(this.api)); obounds.extend(new mxn.LatLonPoint(ne.lat,ne.lon).toProprietary(this.api)); map.zoomToExtent(obounds); @@ -348,13 +320,13 @@ mxn.register('openlayers', { getPixelRatio: function() { var map = this.maps[this.api]; - // TODO: Add provider code + // TODO: Add provider code }, mousePosition: function(element) { var map = this.maps[this.api]; - // TODO: Add provider code + // TODO: Add provider code } }, @@ -364,7 +336,7 @@ mxn.register('openlayers', { var ollon = this.lon * 20037508.34 / 180; var ollat = Math.log(Math.tan((90 + this.lat) * Math.PI / 360)) / (Math.PI / 180); ollat = ollat * 20037508.34 / 180; - return new OpenLayers.LonLat(ollon, ollat); + return new OpenLayers.LonLat(ollon, ollat); }, fromProprietary: function(olPoint) { @@ -448,7 +420,7 @@ mxn.register('openlayers', { return marker; }, - openBubble: function() { + openBubble: function() { // TODO: Add provider code }, diff --git a/plugins/Minify/extlib/minify/README.txt b/plugins/Minify/extlib/minify/README.txt index 3899b99536..eeb37c66c4 100644 --- a/plugins/Minify/extlib/minify/README.txt +++ b/plugins/Minify/extlib/minify/README.txt @@ -1,11 +1,10 @@ WELCOME TO MINIFY 2.1! -Minify is an HTTP content server. It compresses sources of content -(usually files), combines the result and serves it with appropriate -HTTP headers. These headers can allow clients to perform conditional -GETs (serving content only when clients do not have a valid cache) -and tell clients to cache the file for a period of time. -More info: http://code.google.com/p/minify/ +Minify is an HTTP content server. It compresses sources of content +(usually files), combines the result and serves it with appropriate +HTTP headers. These headers can allow clients to perform conditional +GETs (serving content only when clients do not have a valid cache) +and tell clients to cache the file for a period of time. UPGRADING @@ -15,7 +14,7 @@ See UPGRADING.txt for instructions. INSTALLATION AND USAGE: -1. Place the /min/ directory as a child of your DOCUMENT_ROOT +1. Place the /min/ directory as a child of your DOCUMENT_ROOT directory: i.e. you will have: /home/user/www/public_html/min 2. Open http://yourdomain/min/ in a web browser. This will forward @@ -25,7 +24,7 @@ quickly start using Minify to serve content on your site. UNIT TESTING: -1. Place the /min_unit_tests/ directory as a child of your DOCUMENT_ROOT +1. Place the /min_unit_tests/ directory as a child of your DOCUMENT_ROOT directory: i.e. you will have: /home/user/www/public_html/min_unit_tests 2. To run unit tests, access: http://yourdomain/min_unit_tests/test_all.php @@ -44,10 +43,9 @@ and a couple single-use tools. DO NOT place this on your production server. FILE ENCODINGS -Minify *should* work fine with files encoded in UTF-8 or other 8-bit +Minify *should* work fine with files encoded in UTF-8 or other 8-bit encodings like ISO 8859/Windows-1252. By default Minify appends -";charset=utf-8" to the Content-Type headers it sends. +";charset=utf-8" to the Content-Type headers it sends. -Leading UTF-8 BOMs are stripped from all sources to prevent +Leading UTF-8 BOMs are stripped from all sources to prevent duplication in output files, and files are converted to Unix newlines. - diff --git a/plugins/Minify/extlib/minify/UPGRADING.txt b/plugins/Minify/extlib/minify/UPGRADING.txt index 5025faf9b7..fa2b495325 100644 --- a/plugins/Minify/extlib/minify/UPGRADING.txt +++ b/plugins/Minify/extlib/minify/UPGRADING.txt @@ -4,7 +4,7 @@ UPGRADING FROM 2.1.* 1. Rename the following files: - /min/config.php --> /min/old_config.php + /min/config.php --> /min/old_config.php /min/groupsConfig.php --> /min/old_groupsConfig.php 2. Overwrite all files in /min (and /min_unit_tests) with those from this zip. @@ -21,15 +21,13 @@ UPGRADING FROM 2.1.* * $min_errorLogger adds the ability to enable FirePHP logging. -6. (optional) Delete /min/old_config.php and the Minify files from your cache +6. (optional) Delete /min/old_config.php and the Minify files from your cache directory (specified in $min_cachePath). INSTALLING FRESH See README.txt for instructions on installing this app for the first time. - -SUPPORT -Send a message to http://groups.google.com/group/minify \ No newline at end of file +SUPPORT diff --git a/plugins/Minify/extlib/minify/min/README.txt b/plugins/Minify/extlib/minify/min/README.txt index a7cf774a18..7c4666e31f 100644 --- a/plugins/Minify/extlib/minify/min/README.txt +++ b/plugins/Minify/extlib/minify/min/README.txt @@ -23,7 +23,7 @@ Let's say you want to serve this file: Here's the "Minify URL" for this file: http://example.com/min/?f=wp-content/themes/default/default.css -In other words, the "f" argument is set to the file path from root without the +In other words, the "f" argument is set to the file path from root without the initial "/". As CSS files may contain relative URIs, Minify will automatically "fix" these by rewriting them as root relative. @@ -59,8 +59,8 @@ In (X)HTML files, don't forget to replace any "&" characters with "&". SPECIFYING ALLOWED DIRECTORIES By default, Minify will serve any *.css/*.js files within the DOCUMENT_ROOT. If -you'd prefer to limit Minify's access to certain directories, set the -$min_serveOptions['minApp']['allowDirs'] array in config.php. E.g. to limit +you'd prefer to limit Minify's access to certain directories, set the +$min_serveOptions['minApp']['allowDirs'] array in config.php. E.g. to limit to the /js and /themes/default directories, use: $min_serveOptions['minApp']['allowDirs'] = array('//js', '//themes/default'); @@ -68,27 +68,27 @@ $min_serveOptions['minApp']['allowDirs'] = array('//js', '//themes/default'); GROUPS: FASTER PERFORMANCE AND BETTER URLS -For the best performance, edit groupsConfig.php to pre-specify groups of files -to be combined under preset keys. E.g., here's an example configuration in +For the best performance, edit groupsConfig.php to pre-specify groups of files +to be combined under preset keys. E.g., here's an example configuration in groupsConfig.php: -return array( - 'js' => array('//js/Class.js', '//js/email.js') +return array( + 'js' => array('//js/Class.js', '//js/email.js') ); This pre-selects the following files to be combined under the key "js": http://example.com/js/Class.js http://example.com/js/email.js - + You can now serve these files with this simple URL: http://example.com/min/?g=js - + GROUPS: SPECIFYING FILES OUTSIDE THE DOC_ROOT In the groupsConfig.php array, the "//" in the file paths is a shortcut for the DOCUMENT_ROOT, but you can also specify paths from the root of the filesystem -or relative to the DOC_ROOT: +or relative to the DOC_ROOT: return array( 'js' => array( @@ -102,8 +102,8 @@ return array( FAR-FUTURE EXPIRES HEADERS Minify can send far-future (one year) Expires headers. To enable this you must -add a number to the querystring (e.g. /min/?g=js&1234 or /min/f=file.js&1234) -and alter it whenever a source file is changed. If you have a build process you +add a number to the querystring (e.g. /min/?g=js&1234 or /min/f=file.js&1234) +and alter it whenever a source file is changed. If you have a build process you can use a build/source control revision number. If you serve files as a group, you can use the utility function Minify_groupUri() @@ -113,7 +113,7 @@ to get a "versioned" Minify URI for use in your HTML. E.g.: // add /min/lib to your include_path first! require $_SERVER['DOCUMENT_ROOT'] . '/min/utils.php'; -$jsUri = Minify_groupUri('js'); +$jsUri = Minify_groupUri('js'); echo ""; @@ -128,5 +128,3 @@ Known issue: files with comment-like strings/regexps can cause problems in this QUESTIONS? - -http://groups.google.com/group/minify \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/builder/index.php b/plugins/Minify/extlib/minify/min/builder/index.php index 1b20982220..d12f278317 100644 --- a/plugins/Minify/extlib/minify/min/builder/index.php +++ b/plugins/Minify/extlib/minify/min/builder/index.php @@ -1,4 +1,4 @@ - -

Note: 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.

Combining CSS files that contain @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";

@@ -110,13 +110,8 @@ by Minify. E.g. @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 Hollins , 2015 msgid "" @@ -28,16 +28,6 @@ msgstr "Sitemap" msgid "Sitemap settings for this StatusNet site" msgstr "Sitemap settings for this StatusNet site" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Google key" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Google Webmaster Tools verification key." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -82,5 +72,5 @@ msgstr "Sitemap" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "This plugin allows creation of sitemaps for Bing and Yahoo!." diff --git a/plugins/Sitemap/locale/eo/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/eo/LC_MESSAGES/Sitemap.po index 7b715a3315..eb4f65a8d2 100644 --- a/plugins/Sitemap/locale/eo/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/eo/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/es/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/es/LC_MESSAGES/Sitemap.po index 9da85dbcd3..20b9ffa6ce 100644 --- a/plugins/Sitemap/locale/es/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/es/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: # Juan Riquelme González , 2015 msgid "" @@ -28,16 +28,6 @@ msgstr "Mapa del sitio" msgid "Sitemap settings for this StatusNet site" msgstr "Configuración del mapa del sitio para esta instancia de GNU social" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Clave Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Clave de verificación de Google Webmaster Tools." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -82,5 +72,5 @@ msgstr "Mapa del sitio" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Este complemento permite la creación de mapas del sitio para Bing, Yahoo! y Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Este complemento permite la creación de mapas del sitio para Bing, Yahoo!." diff --git a/plugins/Sitemap/locale/eu/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/eu/LC_MESSAGES/Sitemap.po index b122b2b4c3..d51294c0c8 100644 --- a/plugins/Sitemap/locale/eu/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/eu/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 "Gunemapa" msgid "Sitemap settings for this StatusNet site" msgstr "Saio-ezarpenak StatusNet gune honetarako" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Google gakoa" - -#. 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 "Gunemapa" #. 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/fa/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fa/LC_MESSAGES/Sitemap.po index a825173837..3d04c451d3 100644 --- a/plugins/Sitemap/locale/fa/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/fa/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/fi/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fi/LC_MESSAGES/Sitemap.po index 9c8bb50963..a4ea17f742 100644 --- a/plugins/Sitemap/locale/fi/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/fi/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/fr/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po index f276a1406b..01d80cf2c8 100644 --- a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/fr/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 "Plan du site" msgid "Sitemap settings for this StatusNet site" msgstr "Paramètres de plan du site pour ce site StatusNet" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Clé Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Clé de vérification pour les outils Google Webmaster." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "Plan du site" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Cette extension permet de créer des plans du site pour Bing, Yahoo! et Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Cette extension permet de créer des plans du site pour Bing et Yahoo!." diff --git a/plugins/Sitemap/locale/fur/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fur/LC_MESSAGES/Sitemap.po index 585d53a2ed..e17d9c9128 100644 --- a/plugins/Sitemap/locale/fur/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/fur/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/gl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/gl/LC_MESSAGES/Sitemap.po index f2353ed354..9631c33f3c 100644 --- a/plugins/Sitemap/locale/gl/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/gl/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 "Mapa do sitio" msgid "Sitemap settings for this StatusNet site" msgstr "Configuración de mapa do sitio para este sitio StatusNet" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Clave Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Clave de verificación para as ferramentas de Google Webmaster." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "Mapa do sitio" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Este complemento permite a creación de mapas do sitio para Bing, Yahoo! e Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Este complemento permite a creación de mapas do sitio para Bing e Yahoo!." diff --git a/plugins/Sitemap/locale/he/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/he/LC_MESSAGES/Sitemap.po index 4f6b227d65..20855ded01 100644 --- a/plugins/Sitemap/locale/he/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/he/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/hsb/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/hsb/LC_MESSAGES/Sitemap.po index 49b898b166..1efbc34ec4 100644 --- a/plugins/Sitemap/locale/hsb/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/hsb/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/hu/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/hu/LC_MESSAGES/Sitemap.po index 39febe203c..29f88cdfc7 100644 --- a/plugins/Sitemap/locale/hu/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/hu/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/hy_AM/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/hy_AM/LC_MESSAGES/Sitemap.po index 1255fcceca..50cfbb4054 100644 --- a/plugins/Sitemap/locale/hy_AM/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/hy_AM/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/ia/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po index 6a6a88e8ac..967ce99d9c 100644 --- a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ia/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 "Mappa del sito" msgid "Sitemap settings for this StatusNet site" msgstr "Configuration de mappa de sito pro iste sito StatusNet" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Clave Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Clave de verification de Google Webmaster Tools." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "Mappa del sito" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Iste plug-in permitte le creation de mappas de sito pro Bing, Yahoo! e Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Iste plug-in permitte le creation de mappas de sito pro Bing e Yahoo!." diff --git a/plugins/Sitemap/locale/id/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/id/LC_MESSAGES/Sitemap.po index fc2ea93ba2..8e57c4078b 100644 --- a/plugins/Sitemap/locale/id/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/id/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/io/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/io/LC_MESSAGES/Sitemap.po index 5670e62d39..6926e215c3 100644 --- a/plugins/Sitemap/locale/io/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/io/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: # Ciencisto Dementa , 2015 msgid "" @@ -28,16 +28,6 @@ msgstr "Situomapo" msgid "Sitemap settings for this StatusNet site" msgstr "Ajusti dil situomapo por ica retosituo GNU social" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Google-klefo" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Verifikado-klefo da Google Webmaster Tools." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -82,5 +72,5 @@ msgstr "Situomapo" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Ca extensigo posibligas la kreo di situomapi por Bing, Yahoo! e Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Ca extensigo posibligas la kreo di situomapi por Bing e Yahoo!." diff --git a/plugins/Sitemap/locale/is/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/is/LC_MESSAGES/Sitemap.po index c493e0788b..030e3a06fb 100644 --- a/plugins/Sitemap/locale/is/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/is/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/it/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/it/LC_MESSAGES/Sitemap.po index 951b34e75c..2d0f87885a 100644 --- a/plugins/Sitemap/locale/it/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/it/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/ja/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ja/LC_MESSAGES/Sitemap.po index cf2c4d59a3..5dfb1f5e3b 100644 --- a/plugins/Sitemap/locale/ja/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ja/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 "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 "サイトマップ" #. 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/ka/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ka/LC_MESSAGES/Sitemap.po index 2d11663781..2c7327f3fd 100644 --- a/plugins/Sitemap/locale/ka/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ka/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/ko/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ko/LC_MESSAGES/Sitemap.po index 99c60519dc..292af45cbd 100644 --- a/plugins/Sitemap/locale/ko/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ko/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/ksh/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ksh/LC_MESSAGES/Sitemap.po index d82863e558..c8e5021bae 100644 --- a/plugins/Sitemap/locale/ksh/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ksh/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/lb/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/lb/LC_MESSAGES/Sitemap.po index a8a9e08698..4009ca63d2 100644 --- a/plugins/Sitemap/locale/lb/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/lb/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/lt/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/lt/LC_MESSAGES/Sitemap.po index f4998a5c39..b632a4577f 100644 --- a/plugins/Sitemap/locale/lt/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/lt/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/lv/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/lv/LC_MESSAGES/Sitemap.po index 43b2b89e7d..c8531c399d 100644 --- a/plugins/Sitemap/locale/lv/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/lv/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/mg/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/mg/LC_MESSAGES/Sitemap.po index 7b30b05608..8b009e6d91 100644 --- a/plugins/Sitemap/locale/mg/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/mg/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/mk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po index 35714794e9..f05eece7fa 100644 --- a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/mk/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 "Нагодувања за планот на ова StatusNet-мрежно место" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Google-клуч" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Потврден клуч за Управните алатки на Google." - #. 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." -msgstr "Овој приклучок овозможува создавање на планови на мреж. места на Bing, Yahoo! и Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Овој приклучок овозможува создавање на планови на мреж. места на Bing и Yahoo!." diff --git a/plugins/Sitemap/locale/ml/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ml/LC_MESSAGES/Sitemap.po index f4306939f2..1984eca0c0 100644 --- a/plugins/Sitemap/locale/ml/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ml/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/ms/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ms/LC_MESSAGES/Sitemap.po index 4bbd10c686..cf508fc2f5 100644 --- a/plugins/Sitemap/locale/ms/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ms/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/my/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/my/LC_MESSAGES/Sitemap.po index 748657b51f..461e6a7faa 100644 --- a/plugins/Sitemap/locale/my/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/my/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/nb/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/nb/LC_MESSAGES/Sitemap.po index 2d8aad31fc..1f8d81ee4e 100644 --- a/plugins/Sitemap/locale/nb/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/nb/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/ne/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ne/LC_MESSAGES/Sitemap.po index c489c811f5..e77aa12a3f 100644 --- a/plugins/Sitemap/locale/ne/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ne/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/nl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po index 189b7ec10d..3d7abf58b3 100644 --- a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/nl/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 "Sitemapinstellingen voor deze StatusNetwebsite" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Googlesleutel" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Verificatiesleutel voor Google Webmaster Tools." - #. 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 "Deze plugin maakt het mogelijk sitemaps aan te maken voor Bing, Yahoo! en Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Deze plugin maakt het mogelijk sitemaps aan te maken voor Bing en Yahoo!." diff --git a/plugins/Sitemap/locale/nn/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/nn/LC_MESSAGES/Sitemap.po index 21c8bd8da0..668095c15b 100644 --- a/plugins/Sitemap/locale/nn/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/nn/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/pl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/pl/LC_MESSAGES/Sitemap.po index 30a850a1d5..c5e3bb9bbf 100644 --- a/plugins/Sitemap/locale/pl/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/pl/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/pt/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/pt/LC_MESSAGES/Sitemap.po index dac7aa5d24..9bc7054497 100644 --- a/plugins/Sitemap/locale/pt/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/pt/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/pt_BR/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/pt_BR/LC_MESSAGES/Sitemap.po index e595bdb0db..06b8a44c81 100644 --- a/plugins/Sitemap/locale/pt_BR/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/pt_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 "" 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/ro_RO/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ro_RO/LC_MESSAGES/Sitemap.po index 2dbcdfab72..6eb274eede 100644 --- a/plugins/Sitemap/locale/ro_RO/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ro_RO/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/ru/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po index b12d65e125..7e782f7690 100644 --- a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ru/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 "Настройки карты этого сайта на движке StatusNet" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Ключ Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Ключ для подтверждения в инструментах вебмастера Google." - #. 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." -msgstr "Этот плагин позволяет создавать карты сайта для Bing, Yahoo! и Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Этот плагин позволяет создавать карты сайта для Bing и Yahoo!." diff --git a/plugins/Sitemap/locale/sl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/sl/LC_MESSAGES/Sitemap.po index 998db04ac7..4e43137639 100644 --- a/plugins/Sitemap/locale/sl/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/sl/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/sr-ec/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/sr-ec/LC_MESSAGES/Sitemap.po index 9f39bd4d9d..b136207ffd 100644 --- a/plugins/Sitemap/locale/sr-ec/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/sr-ec/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/sv/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/sv/LC_MESSAGES/Sitemap.po index 19a019c163..3c3276a9cc 100644 --- a/plugins/Sitemap/locale/sv/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/sv/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: # Kristoffer Grundström , 2015 msgid "" @@ -28,16 +28,6 @@ msgstr "Sidkarta" msgid "Sitemap settings for this StatusNet site" msgstr "" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Google-nyckel" - -#. 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" @@ -82,5 +72,5 @@ msgstr "Sidkarta" #. 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/ta/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ta/LC_MESSAGES/Sitemap.po index bd8d03331e..18edd61c72 100644 --- a/plugins/Sitemap/locale/ta/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ta/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/te/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/te/LC_MESSAGES/Sitemap.po index 12bf23b486..32b9493822 100644 --- a/plugins/Sitemap/locale/te/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/te/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/tl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po index fa4f4d5cec..1c32a6c406 100644 --- a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/tl/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 "Mapa ng sityo" msgid "Sitemap settings for this StatusNet site" msgstr "Mga katakdaan ng mapa ng sityo para sa sityong ito ng StatusNet" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Susi ng Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Susing pantiyak ng mga Kasangkapan ng Maestro ng Web ng Google." - #. TRANS: Field label. #: actions/sitemapadminpanel.php:175 msgid "Yahoo key" @@ -81,5 +71,5 @@ msgstr "Mapa ng sityo" #. TRANS: Plugin description. #: SitemapPlugin.php:187 -msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google." -msgstr "Nagpapahintulot ang pampasak na ito ng paglikha ng mga mapa ng sityo para sa Bing, Yahoo! at Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Nagpapahintulot ang pampasak na ito ng paglikha ng mga mapa ng sityo para sa Bing and Yahoo!." diff --git a/plugins/Sitemap/locale/tr/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/tr/LC_MESSAGES/Sitemap.po index 42badc81f7..39581bf474 100644 --- a/plugins/Sitemap/locale/tr/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/tr/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/uk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po index 77bf772fba..4f56f4e349 100644 --- a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/uk/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 "Налаштування карти сайту на даному сайті StatusNet" -#. TRANS: Field label. -#: actions/sitemapadminpanel.php:167 -msgid "Google key" -msgstr "Ключ Google" - -#. TRANS: Title for field label. -#: actions/sitemapadminpanel.php:169 -msgid "Google Webmaster Tools verification key." -msgstr "Ключ підтвердження Google Webmaster Tools" - #. 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." -msgstr "Цей додаток дозволяє створювати карти сайту для Bing, Yahoo! та Google." +msgid "This plugin allows creation of sitemaps for Bing and Yahoo!." +msgstr "Цей додаток дозволяє створювати карти сайту для Bing та Yahoo!." diff --git a/plugins/Sitemap/locale/ur_PK/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ur_PK/LC_MESSAGES/Sitemap.po index 7e3b7f1284..b490c22f37 100644 --- a/plugins/Sitemap/locale/ur_PK/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/ur_PK/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/vi/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/vi/LC_MESSAGES/Sitemap.po index 04bd33c4d2..5f2652ffb2 100644 --- a/plugins/Sitemap/locale/vi/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/vi/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/zh/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/zh/LC_MESSAGES/Sitemap.po index f2ffe80da3..0ad702b5ab 100644 --- a/plugins/Sitemap/locale/zh/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/zh/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/zh_CN/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/zh_CN/LC_MESSAGES/Sitemap.po index bd26d7c8d2..4ba8770600 100644 --- a/plugins/Sitemap/locale/zh_CN/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/zh_CN/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/zh_TW/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/zh_TW/LC_MESSAGES/Sitemap.po index b23bcfa444..a0e3713f99 100644 --- a/plugins/Sitemap/locale/zh_TW/LC_MESSAGES/Sitemap.po +++ b/plugins/Sitemap/locale/zh_TW/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/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml b/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml index e95662b6fe..76d02a98ed 100644 --- a/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml +++ b/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml @@ -6,30 +6,26 @@ - - - + - + - + - + - + diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php index 27b751b75e..37dbbd61e4 100644 --- a/tests/ActivityParseTests.php +++ b/tests/ActivityParseTests.php @@ -663,11 +663,10 @@ $_example6 = << http://en.blog.wordpress.com/?p=3857 - ]]> - From the tongue twisting name department we welcome PubSubHubbub, or as some people have shortened it to: PuSH. Like rssCloud, PuSH is a way for services that subscribe to updates from your blog (think Google Reader, Bloglines or Netvibes) to get updates even faster. In a nutshell, instead of having to periodically ask your blog if there are any updates they can now register to automatically receive updates each time you publish new content. In most cases these updates are sent out within a second or two of when you hit the publish button.

+ ]]> + From the tongue twisting name department we welcome PubSubHubbub, or as some people have shortened it to: PuSH. Like rssCloud, PuSH is a way for services that subscribe to updates from your blog to get updates even faster. In a nutshell, instead of having to periodically ask your blog if there are any updates they can now register to automatically receive updates each time you publish new content. In most cases these updates are sent out within a second or two of when you hit the publish button.

Today 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 :-)


]]> http://en.blog.wordpress.com/2010/03/03/rub-a-dub-dub-in-the-pubsubhubbub/feed/ @@ -796,22 +795,22 @@ EXAMPLE8; $_example9 = << - + - Google Buzz + Test 2010-03-22T01:55:53.596Z - tag:google.com,2009:buzz-feed/public/posted/117848251937215158042 - Google - Google Buzz + test53725745374 + test Buzz by Zach Copley from Flickr IMG_1366 2010-03-18T04:29:23.000Z 2010-03-18T05:14:03.325Z - tag:google.com,2009:buzz/z12zwdhxowq2d13q204cjr04kzu0cns5gh0 - + + Zach Copley - http://www.google.com/profiles/zcopley + https://mywebsite.net/profiles/zcopley <div>IMG_1366</div> @@ -825,15 +824,7 @@ $_example9 = << http://activitystrea.ms/schema/1.0/post - - http://activitystrea.ms/schema/1.0/photo - tag:google.com,2009:buzz/z12zwdhxowq2d13q204cjr04kzu0cns5gh0 - Buzz by Zach Copley from Flickr - <div>IMG_1366</div> - - - - + 0 diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README index d124671da1..951b2a9c45 100644 --- a/theme/base/images/icons/README +++ b/theme/base/images/icons/README @@ -1,5 +1,5 @@ /** - * @author Paul Jarvis http://code.google.com/p/twotiny/ + * @author Paul Jarvis * @license http://dev.perl.org/licenses/ Artistic License/GPL * @note White left arrow with green background diff --git a/theme/neo-quitter/README.md b/theme/neo-quitter/README.md index a5b3644784..64f84bc306 100644 --- a/theme/neo-quitter/README.md +++ b/theme/neo-quitter/README.md @@ -6,23 +6,23 @@ Neo Quitter * Version: 1 * GitHub: -Neo Quitter is free software: you can redistribute it and / or modify it -under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version three of the License or (at -your option) any later version. - -Neo Quitter is distributed in hope that it will be useful but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILTY or FITNESS -FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for -more details. - -You should have received a copy of the GNU Affero General Public License -along with Neo Quitter. If not, see . - +Neo Quitter is free software: you can redistribute it and / or modify it +under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version three of the License or (at +your option) any later version. + +Neo Quitter is distributed in hope that it will be useful but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILTY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for +more details. + +You should have received a copy of the GNU Affero General Public License +along with Neo Quitter. If not, see . + About ----- -Neo Quitter is based Neo, the standard theme for GNU Social. +Neo Quitter is based Neo, the standard theme for GNU Social. Setup @@ -42,6 +42,6 @@ Some icons by Mark James http://www.famfamfam.com/lab/icons/silk/ http://creativecommons.org/licenses/by/2.5/ Creative Commons Attribution 2.5 License -Lato font by Łukasz Dziedzic (http://www.typoland.com) via Google Web Fonts (http://www.google.com/webfonts) +Lato font by Łukasz Dziedzic (http://www.typoland.com) SIL Open Font License, 1.1 (http://scripts.sil.org/OFL) Prepared for web with Font Squirrel (http://www.fontsquirrel.com/fontface/generator) diff --git a/theme/neo-quitter/css/genericons/example.html b/theme/neo-quitter/css/genericons/example.html deleted file mode 100644 index fdb7cf1177..0000000000 --- a/theme/neo-quitter/css/genericons/example.html +++ /dev/null @@ -1,719 +0,0 @@ - - - -Genericons - - - - - - - - -
- -
-
- -

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.

-
- -
-
- -
-
- - - -
404
- -
activity
- -
anchor
- -
aside
- -
attachment
- -
audio
- -
bold
- -
book
- -
bug
- -
cart
- -
category
- -
chat
- -
checkmark
- -
close
- -
close-alt
- -
cloud
- -
cloud-download
- -
cloud-upload
- -
code
- -
codepen
- -
cog
- -
collapse
- -
comment
- -
day
- -
digg
- -
document
- -
dot
- -
downarrow
- -
download
- -
draggable
- -
dribbble
- -
dropbox
- -
dropdown
- -
dropdown-left
- -
edit
- -
ellipsis
- -
expand
- -
external
- -
facebook
- -
facebook-alt
- -
fastforward
- -
feed
- -
flag
- -
flickr
- -
foursquare
- -
fullscreen
- -
gallery
- -
github
- -
googleplus
- -
googleplus-alt
- -
handset
- -
heart
- -
help
- -
hide
- -
hierarchy
- -
home
- -
image
- -
info
- -
instagram
- -
italic
- -
key
- -
leftarrow
- -
link
- -
linkedin
- -
linkedin-alt
- -
location
- -
lock
- -
mail
- -
maximize
- -
menu
- -
microphone
- -
minimize
- -
minus
- -
month
- -
move
- -
next
- -
notice
- -
paintbrush
- -
path
- -
pause
- -
phone
- -
picture
- -
pinned
- -
pinterest
- -
pinterest-alt
- -
play
- -
plugin
- -
plus
- -
pocket
- -
polldaddy
- -
portfolio
- -
previous
- -
print
- -
quote
- -
rating-empty
- -
rating-full
- -
rating-half
- -
reddit
- -
refresh
- -
reply
- -
reply-alt
- -
reply-single
- -
rewind
- -
rightarrow
- -
search
- -
send-to-phone
- -
send-to-tablet
- -
share
- -
show
- -
shuffle
- -
sitemap
- -
skip-ahead
- -
skip-back
- -
skype
- -
spam
- -
spotify
- -
standard
- -
star
- -
status
- -
stop
- -
stumbleupon
- -
subscribe
- -
subscribed
- -
summary
- -
tablet
- -
tag
- -
time
- -
top
- -
trash
- -
tumblr
- -
twitch
- -
twitter
- -
unapprove
- -
unsubscribe
- -
unzoom
- -
uparrow
- -
user
- -
video
- -
videocamera
- -
vimeo
- -
warning
- -
website
- -
week
- -
wordpress
- -
xpost
- -
youtube
- -
zoom
- - -
- - - -
- - - -
- - - \ No newline at end of file diff --git a/theme/neo-quitter/css/genericons/genericons.css b/theme/neo-quitter/css/genericons/genericons.css index f58f42e8a5..08d127b806 100644 --- a/theme/neo-quitter/css/genericons/genericons.css +++ b/theme/neo-quitter/css/genericons/genericons.css @@ -5,7 +5,7 @@ */ -/* IE8 and below use EOT and allow cross-site embedding. +/* IE8 and below use EOT and allow cross-site embedding. IE9 uses WOFF which is base64 encoded to allow cross-site embedding. So unfortunately, IE9 will throw a console error, but it'll still work. When the font is base64 encoded, cross-site embedding works in Firefox */ @@ -108,8 +108,6 @@ .genericon-fullscreen:before { content: "\f474"; } .genericon-gallery:before { content: "\f103"; } .genericon-github:before { content: "\f200"; } -.genericon-googleplus:before { content: "\f206"; } -.genericon-googleplus-alt:before { content: "\f218"; } .genericon-handset:before { content: "\f50c"; } .genericon-heart:before { content: "\f461"; } .genericon-help:before { content: "\f457"; } @@ -207,7 +205,3 @@ .genericon-xpost:before { content: "\f504"; } .genericon-youtube:before { content: "\f213"; } .genericon-zoom:before { content: "\f402"; } - - - - diff --git a/theme/neo/README b/theme/neo/README index eff8cd6dfa..ecbd52e28d 100644 --- a/theme/neo/README +++ b/theme/neo/README @@ -5,6 +5,6 @@ Some icons by Mark James http://www.famfamfam.com/lab/icons/silk/ http://creativecommons.org/licenses/by/2.5/ Creative Commons Attribution 2.5 License -Lato font by Łukasz Dziedzic (http://www.typoland.com) via Google Web Fonts (http://www.google.com/webfonts) +Lato font by Łukasz Dziedzic (http://www.typoland.com) SIL Open Font License, 1.1 (http://scripts.sil.org/OFL) Prepared for web with Font Squirrel (http://www.fontsquirrel.com/fontface/generator) -- 2.39.5