diff --git a/sources/CHANGELOG b/sources/CHANGELOG index 9e9156fb..d708278b 100644 --- a/sources/CHANGELOG +++ b/sources/CHANGELOG @@ -1,3 +1,36 @@ +Hubzilla 1.4 + [This list may appear brief, but encompasses a huge amount of re-writing and re-factoring + of the internal code structure to gain long-term performance and stability and provide a standard + interface to alternate protocol federation plugins which were made possible by the UNO configuration. + UNO is a configuration of hubzilla introduced in 1.3 with reduced complexity and which provides + improved protocol federation potential to other networks by virtue of removing nomadic identity + (which is not possible to model or work around using other network protocols).] + + Implement channel move operation for UNO configuration + Remove bookmark references in UNO (which has no bookmarks by default) + UI cleanup profiles/chat/manage + Refactor webfinger probes and salmon backend for GNU-social federation + SECURITY: DAV authentication exploit + Context help added + More help pages + Provide 'posts only' feed + Refactor App to remove globals + Refactor Session to remove globals + provide a fullscreen mode for selected modules and functions + Regression: some addon routes broken + fix "remember me" + Autocomplete tool extended to bbcode/comanche + Clone sync of file/photo updates + system rename (e.g. http to https or DNS name change) missing some connection photos + calendar module not blocked to public whhen block_public enabled + Use timeago.js in reshare content so that timestamps will be correct on federated reshares + Rework detection of JavaScript to avoid reload penalty under normal operation + Changed primary directory server to a hubzilla server + Plugins: + Diaspora - switch to alternate XML parser to avoid storing compound objects + GNU-Social - Huge amounts of work, federation somewhat working now, several issues remain + Friendica - Initial federation work (not yet published) + Hubzilla 1.3 Admin Security configuration page created which consolidates several previously hidden settings: Communication white/black lists diff --git a/sources/README.md b/sources/README.md index 64506594..ad7a4a9c 100644 --- a/sources/README.md +++ b/sources/README.md @@ -3,26 +3,26 @@ Hubzilla - Community Server =========================== -Help us redefine the web - using integrated and united community websites. --------------------------------------------------------------------------- +Connected and linked web communities. +-------------------------------------

Installing Hubzilla

-**What are Hubs?** +**What are Hubz?** -Hubs are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other. +Hubz are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other. This allows hub members on any hub to securely and privately share anything; with anybody, on any hub - anywhere; or share stuff publicly with anybody on the internet if desired. -**Hubzilla** is the server software which makes this possible. It is a sophisticated and unique combination of an open source content management system and a decentralised identity, communications, and permissions framework and protocol suite, built using common webserver technology (PHP/MySQL/Apache, although Mariadb or Postgres and Nginx could also be used - we're pretty easy). The end result is a level of systems integration, privacy control, and communications features that you wouldn't think are possible in either a content management system or a decentralised communications network. It also brings a new level of cooperation and privacy to the web and introduces the concept of personally owned "single sign-on" to web services across the entire internet. +**Hubzilla** is the server software which makes this possible. It is a sophisticated and unique combination of an open source content management system and a decentralised identity, communications, and permissions framework and protocol suite, built using common webserver technology (PHP/MySQL/Apache and popular variants). The end result is a level of systems integration, privacy control, and communications features that you wouldn't think are possible in either a content management system or a decentralised communications network. It also brings a new level of cooperation and privacy to the web and introduces the concept of personally owned "single sign-on" to web services across the entire internet. -Hubzilla hubs are +Hubzilla hubz are * decentralised * inherently social -* optionally inter-networked with other hubs -* privacy-enabled (privacy exclusions work across the entire internet to any registered identity on any compatible hubs) +* optionally inter-networked with other hubz +* privacy-enabled (privacy exclusions work across the entire internet to any registered identity on any compatible hubz) Possible website applications include diff --git a/sources/Zotlabs/Project/System.php b/sources/Zotlabs/Project/System.php index ca57c50a..a67742db 100644 --- a/sources/Zotlabs/Project/System.php +++ b/sources/Zotlabs/Project/System.php @@ -5,38 +5,39 @@ namespace Zotlabs\Project; class System { function get_platform_name() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['platform_name']) - return $a->config['system']['platform_name']; + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name']) + return \App::$config['system']['platform_name']; return PLATFORM_NAME; } + function get_site_name() { + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['sitename']) + return \App::$config['system']['sitename']; + return ''; + } + function get_project_version() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version']) + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version']) return ''; return RED_VERSION; } function get_update_version() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version']) + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version']) return ''; return DB_UPDATE_VERSION; } function get_notify_icon() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['email_notify_icon_url']) - return $a->config['system']['email_notify_icon_url']; + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url']) + return \App::$config['system']['email_notify_icon_url']; return z_root() . '/images/hz-white-32.png'; } function get_site_icon() { - $a = get_app(); - if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['site_icon_url']) - return $a->config['system']['site_icon_url']; + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url']) + return \App::$config['system']['site_icon_url']; return z_root() . '/images/hz-32.png'; } diff --git a/sources/Zotlabs/Storage/Browser.php b/sources/Zotlabs/Storage/Browser.php index fde443e6..72094095 100644 --- a/sources/Zotlabs/Storage/Browser.php +++ b/sources/Zotlabs/Storage/Browser.php @@ -243,7 +243,7 @@ class Browser extends DAV\Browser\Plugin { )); $a = get_app(); - $a->page['content'] = $html; + \App::$page['content'] = $html; load_pdl($a); $theme_info_file = "view/theme/" . current_theme() . "/php/theme.php"; diff --git a/sources/Zotlabs/Storage/Directory.php b/sources/Zotlabs/Storage/Directory.php index e38d7691..edbef5a9 100644 --- a/sources/Zotlabs/Storage/Directory.php +++ b/sources/Zotlabs/Storage/Directory.php @@ -53,7 +53,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { logger('directory ' . $ext_path, LOGGER_DATA); $this->ext_path = $ext_path; // remove "/cloud" from the beginning of the path - $modulename = get_app()->module; + $modulename = \App::$module; $this->red_path = ((strpos($ext_path, '/' . $modulename) === 0) ? substr($ext_path, strlen($modulename) + 1) : $ext_path); if (! $this->red_path) { $this->red_path = '/'; @@ -114,7 +114,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { throw new DAV\Exception\Forbidden('Permission denied.'); } - $modulename = get_app()->module; + $modulename = \App::$module; if ($this->red_path === '/' && $name === $modulename) { return new Directory('/' . $modulename, $this->auth); } @@ -168,6 +168,14 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { intval($this->auth->owner_id) ); + + $ch = channelx_by_n($this->auth->owner_id); + if($ch) { + $sync = attach_export_data($ch,$this->folder_hash); + if($sync) + build_sync_packet($ch['channel_id'],array('file' => array($sync))); + } + $this->red_path = $new_path; } @@ -332,9 +340,15 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { require_once('include/photos.php'); $args = array( 'resource_id' => $hash, 'album' => $album, 'os_path' => $f, 'filename' => $name, 'getimagesize' => $x, 'directory' => $direct); - $p = photo_upload($c[0],get_app()->get_observer(),$args); + $p = photo_upload($c[0],\App::get_observer(),$args); } + $sync = attach_export_data($c[0],$hash); + + if($sync) + build_sync_packet($c[0]['channel_id'],array('file' => array($sync))); + + } /** @@ -356,7 +370,14 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { if ($r) { $result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash)); - if (! $result['success']) { + + if($result['success']) { + $sync = attach_export_data($r[0],$ret['data']['hash']); + if($sync) { + build_sync_packet($r[0]['channel_id'],array('file' => array($sync))); + } + } + else { logger('error ' . print_r($result, true), LOGGER_DEBUG); } } @@ -380,6 +401,15 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { } attach_delete($this->auth->owner_id, $this->folder_hash); + + $ch = channelx_by_n($this->auth->owner_id); + if($ch) { + $sync = attach_export_data($ch,$this->folder_hash,true); + if($sync) + build_sync_packet($ch['channel_id'],array('file' => array($sync))); + } + + } @@ -393,7 +423,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { public function childExists($name) { // On /cloud we show a list of available channels. // @todo what happens if no channels are available? - $modulename = get_app()->module; + $modulename = \App::$module; if ($this->red_path === '/' && $name === $modulename) { //logger('We are at ' $modulename . ' show a channel list', LOGGER_DEBUG); return true; @@ -417,7 +447,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { logger('GetDir: ' . $this->ext_path, LOGGER_DEBUG); $this->auth->log(); - $modulename = get_app()->module; + $modulename = \App::$module; $file = $this->ext_path; diff --git a/sources/Zotlabs/Storage/File.php b/sources/Zotlabs/Storage/File.php index 2a2a8b93..897f24ed 100644 --- a/sources/Zotlabs/Storage/File.php +++ b/sources/Zotlabs/Storage/File.php @@ -84,6 +84,20 @@ class File extends DAV\Node implements DAV\IFile { dbesc($this->data['hash']), intval($this->data['id']) ); + + if($this->data->is_photo) { + $r = q("update photo set filename = '%s' where resource_id = '%s' and uid = %d", + dbesc($newName), + dbesc($this->data['hash']), + intval($this->auth->owner_id) + ); + } + $ch = channelx_by_n($this->auth->owner_id); + if($ch) { + $sync = attach_export_data($ch,$this->data['hash']); + if($sync) + build_sync_packet($ch['channel_id'],array('file' => array($sync))); + } } /** @@ -173,7 +187,7 @@ class File extends DAV\Node implements DAV\IFile { if($is_photo) { require_once('include/photos.php'); $args = array( 'resource_id' => $this->data['hash'], 'album' => $album, 'os_path' => $f, 'filename' => $r[0]['filename'], 'getimagesize' => $gis, 'directory' => $direct ); - $p = photo_upload($c[0],get_app()->get_observer(),$args); + $p = photo_upload($c[0],\App::get_observer(),$args); } // update the folder's lastmodified timestamp @@ -205,6 +219,12 @@ class File extends DAV\Node implements DAV\IFile { return; } } + + $sync = attach_export_data($c[0],$this->data['hash']); + + if($sync) + build_sync_packet($c[0]['channel_id'],array('file' => array($sync))); + } /** @@ -318,5 +338,12 @@ class File extends DAV\Node implements DAV\IFile { } attach_delete($this->auth->owner_id, $this->data['hash']); + + $ch = channelx_by_n($this->auth->owner_id); + if($ch) { + $sync = attach_export_data($ch,$this->data['hash'],true); + if($sync) + build_sync_packet($ch['channel_id'],array('file' => array($sync))); + } } } diff --git a/sources/Zotlabs/Web/CheckJS.php b/sources/Zotlabs/Web/CheckJS.php new file mode 100644 index 00000000..3ad5fc1e --- /dev/null +++ b/sources/Zotlabs/Web/CheckJS.php @@ -0,0 +1,36 @@ +jsdisabled = 1; + if(intval($_COOKIE['jsdisabled'])) + $this->jsdisabled = 1; + + if(! $this->jsdisabled) { + $page = urlencode(\App::$query_string); + + if($test) { + \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; + } + else { + \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; + } + } + + } + + function disabled() { + return self::$jsdisabled; + } + + +} + + diff --git a/sources/Zotlabs/Web/Router.php b/sources/Zotlabs/Web/Router.php index af171437..29f2b520 100644 --- a/sources/Zotlabs/Web/Router.php +++ b/sources/Zotlabs/Web/Router.php @@ -9,9 +9,9 @@ class Router { /** * - * We have already parsed the server path into $a->argc and $a->argv + * We have already parsed the server path into App::$argc and App::$argv * - * $a->argv[0] is our module name. We will load the file mod/{$a->argv[0]}.php + * App::$argv[0] is our module name. We will load the file mod/{App::$argv[0]}.php * and use it for handling our URL request. * The module file contains a few functions that we call in various circumstances * and in the following order: @@ -25,7 +25,9 @@ class Router { * further processing. */ - if(strlen($a->module)) { + $module = \App::$module; + + if(strlen($module)) { /** * @@ -34,14 +36,14 @@ class Router { * */ - if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) { - include_once("addon/{$a->module}/{$a->module}.php"); - if(function_exists($a->module . '_module')) - $a->module_loaded = true; + if(is_array(\App::$plugins) && in_array($module,\App::$plugins) && file_exists("addon/{$module}/{$module}.php")) { + include_once("addon/{$module}/{$module}.php"); + if(function_exists($module . '_module')) + \App::$module_loaded = true; } - if((strpos($a->module,'admin') === 0) && (! is_site_admin())) { - $a->module_loaded = false; + if((strpos($module,'admin') === 0) && (! is_site_admin())) { + \App::$module_loaded = false; notice( t('Permission denied.') . EOL); goaway(z_root()); } @@ -51,17 +53,19 @@ class Router { * Otherwise, look for the standard program module in the 'mod' directory */ - if(! $a->module_loaded) { - if(file_exists("mod/site/{$a->module}.php")) { - include_once("mod/site/{$a->module}.php"); - $a->module_loaded = true; + if(! (\App::$module_loaded)) { + if(file_exists("mod/site/{$module}.php")) { + include_once("mod/site/{$module}.php"); + \App::$module_loaded = true; } - elseif(file_exists("mod/{$a->module}.php")) { - include_once("mod/{$a->module}.php"); - $a->module_loaded = true; + elseif(file_exists("mod/{$module}.php")) { + include_once("mod/{$module}.php"); + \App::$module_loaded = true; } + else logger("mod/{$module}.php not found."); } + /** * This provides a place for plugins to register module handlers which don't otherwise exist on the system. * If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if @@ -69,10 +73,10 @@ class Router { * The plugin should catch at least one of the module hooks for this URL. */ - $x = array('module' => $a->module, 'installed' => false); + $x = array('module' => $module, 'installed' => false); call_hooks('module_loaded', $x); if($x['installed']) - $a->module_loaded = true; + \App::$module_loaded = true; /** * The URL provided does not resolve to a valid module. @@ -85,28 +89,28 @@ class Router { * Otherwise we are going to emit a 404 not found. */ - if(! $a->module_loaded) { + if(! (\App::$module_loaded)) { // Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit. if((x($_SERVER, 'QUERY_STRING')) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) { killme(); } - if((x($_SERVER, 'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && $a->config['system']['dreamhost_error_hack']) { + if((x($_SERVER, 'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && \App::$config['system']['dreamhost_error_hack']) { logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']); - goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']); + goaway(z_root() . $_SERVER['REQUEST_URI']); } logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG); header($_SERVER['SERVER_PROTOCOL'] . ' 404 ' . t('Not Found')); $tpl = get_markup_template('404.tpl'); - $a->page['content'] = replace_macros($tpl, array( + \App::$page['content'] = replace_macros($tpl, array( '$message' => t('Page not found.') )); // pretend this is a module so it will initialise the theme - $a->module = '404'; - $a->module_loaded = true; + \App::$module = '404'; + \App::$module_loaded = true; } } } @@ -118,8 +122,8 @@ class Router { * Call module functions */ - if($a->module_loaded) { - $a->page['page_title'] = $a->module; + if(\App::$module_loaded) { + \App::$page['page_title'] = \App::$module; $placeholder = ''; /** @@ -129,11 +133,11 @@ class Router { * to over-ride them. */ - if(function_exists($a->module . '_init')) { + if(function_exists(\App::$module . '_init')) { $arr = array('init' => true, 'replace' => false); - call_hooks($a->module . '_mod_init', $arr); + call_hooks(\App::$module . '_mod_init', $arr); if(! $arr['replace']) { - $func = $a->module . '_init'; + $func = \App::$module . '_init'; $func($a); } } @@ -167,32 +171,32 @@ class Router { $func = str_replace('-', '_', current_theme()) . '_init'; $func($a); } - elseif (x($a->theme_info, 'extends') && file_exists('view/theme/' . $a->theme_info['extends'] . '/php/theme.php')) { - require_once('view/theme/' . $a->theme_info['extends'] . '/php/theme.php'); - if(function_exists(str_replace('-', '_', $a->theme_info['extends']) . '_init')) { - $func = str_replace('-', '_', $a->theme_info['extends']) . '_init'; + elseif (x(\App::$theme_info, 'extends') && file_exists('view/theme/' . \App::$theme_info['extends'] . '/php/theme.php')) { + require_once('view/theme/' . \App::$theme_info['extends'] . '/php/theme.php'); + if(function_exists(str_replace('-', '_', \App::$theme_info['extends']) . '_init')) { + $func = str_replace('-', '_', \App::$theme_info['extends']) . '_init'; $func($a); } } - if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error) - && (function_exists($a->module . '_post')) + if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! \App::$error) + && (function_exists(\App::$module . '_post')) && (! x($_POST, 'auth-params'))) { - call_hooks($a->module . '_mod_post', $_POST); - $func = $a->module . '_post'; + call_hooks(\App::$module . '_mod_post', $_POST); + $func = \App::$module . '_post'; $func($a); } - if((! $a->error) && (function_exists($a->module . '_content'))) { - $arr = array('content' => $a->page['content'], 'replace' => false); - call_hooks($a->module . '_mod_content', $arr); - $a->page['content'] = $arr['content']; + if((! \App::$error) && (function_exists(\App::$module . '_content'))) { + $arr = array('content' => \App::$page['content'], 'replace' => false); + call_hooks(\App::$module . '_mod_content', $arr); + \App::$page['content'] = $arr['content']; if(! $arr['replace']) { - $func = $a->module . '_content'; + $func = \App::$module . '_content'; $arr = array('content' => $func($a)); } - call_hooks($a->module . '_mod_aftercontent', $arr); - $a->page['content'] .= $arr['content']; + call_hooks(\App::$module . '_mod_aftercontent', $arr); + \App::$page['content'] .= $arr['content']; } } } diff --git a/sources/Zotlabs/Web/Session.php b/sources/Zotlabs/Web/Session.php new file mode 100644 index 00000000..f998df39 --- /dev/null +++ b/sources/Zotlabs/Web/Session.php @@ -0,0 +1,160 @@ + $v) { + unset($_SESSION[$k]); + } + } + } + + function new_cookie($xtime) { + + $newxtime = (($xtime> 0) ? (time() + $xtime) : 0); + + $old_sid = session_id(); + + if(self::$handler && self::$session_started) { + session_regenerate_id(true); + + // force SessionHandler record creation with the new session_id + // which occurs as a side effect of read() + + self::$handler->read(session_id()); + } + else + logger('no session handler'); + + if (x($_COOKIE, 'jsdisabled')) { + setcookie('jsdisabled', $_COOKIE['jsdisabled'], $newxtime); + } + setcookie(session_name(),session_id(),$newxtime); + + $arr = array('expire' => $xtime); + call_hooks('new_cookie', $arr); + + } + + function extend_cookie() { + + // if there's a long-term cookie, extend it + + $xtime = (($_SESSION['remember_me']) ? (60 * 60 * 24 * 365) : 0 ); + + if($xtime) + setcookie(session_name(),session_id(),(time() + $xtime)); + $arr = array('expire' => $xtime); + call_hooks('extend_cookie', $arr); + + } + + + function return_check() { + + // check a returning visitor against IP changes. + // If the change results in being blocked from re-entry with the current cookie + // nuke the session and logout. + // Returning at all indicates the session is still valid. + + // first check if we're enforcing that sessions can't change IP address + // @todo what to do with IPv6 addresses + + if($_SESSION['addr'] && $_SESSION['addr'] != $_SERVER['REMOTE_ADDR']) { + logger('SECURITY: Session IP address changed: ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); + + $partial1 = substr($_SESSION['addr'], 0, strrpos($_SESSION['addr'], '.')); + $partial2 = substr($_SERVER['REMOTE_ADDR'], 0, strrpos($_SERVER['REMOTE_ADDR'], '.')); + + $paranoia = intval(get_pconfig($_SESSION['uid'], 'system', 'paranoia')); + + if(! $paranoia) + $paranoia = intval(get_config('system', 'paranoia')); + + switch($paranoia) { + case 0: + // no IP checking + break; + case 2: + // check 2 octets + $partial1 = substr($partial1, 0, strrpos($partial1, '.')); + $partial2 = substr($partial2, 0, strrpos($partial2, '.')); + if($partial1 == $partial2) + break; + case 1: + // check 3 octets + if($partial1 == $partial2) + break; + case 3: + default: + // check any difference at all + logger('Session address changed. Paranoid setting in effect, blocking session. ' + . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); + self::nuke(); + goaway(z_root()); + break; + } + } + return true; + } + +} diff --git a/sources/Zotlabs/Web/SessionHandler.php b/sources/Zotlabs/Web/SessionHandler.php new file mode 100644 index 00000000..6980a640 --- /dev/null +++ b/sources/Zotlabs/Web/SessionHandler.php @@ -0,0 +1,88 @@ +channel['channel_hash'] == $hubloc['xchan_hash']) { + if (\App::$channel['channel_hash'] == $hubloc['xchan_hash']) { return true; } else { @@ -242,9 +242,9 @@ class Auth { $arr = array('xchan' => $hubloc, 'url' => $this->desturl, 'session' => $_SESSION); call_hooks('magic_auth_success',$arr); - get_app()->set_observer($hubloc); + \App::set_observer($hubloc); require_once('include/security.php'); - get_app()->set_groups(init_groups_visitor($_SESSION['visitor_id'])); + \App::set_groups(init_groups_visitor($_SESSION['visitor_id'])); info(sprintf( t('Welcome %s. Remote authentication successful.'),$hubloc['xchan_name'])); logger('mod_zot: auth success from ' . $hubloc['xchan_addr']); $this->success = true; @@ -341,5 +341,5 @@ class Auth { * Service_class can be used by cooperating sites to provide different access rights based on account rights and subscription plans. It is * a string whose contents are not defined by protocol. Example: "basic" or "gold". * - * @param[in,out] App &$a + * @param[in,out] \App &$a */ diff --git a/sources/Zotlabs/Zot/Verify.php b/sources/Zotlabs/Zot/Verify.php new file mode 100644 index 00000000..1192202d --- /dev/null +++ b/sources/Zotlabs/Zot/Verify.php @@ -0,0 +1,42 @@ +theme_info['extends'] == 'redbasic') + if(function_exists('redbasic_init') || App::$theme_info['extends'] == 'redbasic') $bookmarkicon = ''; else $bookmarkicon = '#^'; diff --git a/sources/addons/buglink/lang/ca/strings.php b/sources/addons/buglink/lang/ca/strings.php index 01fc9adb..c3c228b7 100644 --- a/sources/addons/buglink/lang/ca/strings.php +++ b/sources/addons/buglink/lang/ca/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Informar de problema"; +App::$strings["Report Bug"] = "Informar de problema"; diff --git a/sources/addons/buglink/lang/cs/strings.php b/sources/addons/buglink/lang/cs/strings.php index a1cd51f4..b06c4f32 100644 --- a/sources/addons/buglink/lang/cs/strings.php +++ b/sources/addons/buglink/lang/cs/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Nahlásit chybu"; +App::$strings["Report Bug"] = "Nahlásit chybu"; diff --git a/sources/addons/buglink/lang/de/strings.php b/sources/addons/buglink/lang/de/strings.php index cf96a178..6e834fb7 100644 --- a/sources/addons/buglink/lang/de/strings.php +++ b/sources/addons/buglink/lang/de/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Fehlerreport erstellen"; +App::$strings["Report Bug"] = "Fehlerreport erstellen"; diff --git a/sources/addons/buglink/lang/eo/strings.php b/sources/addons/buglink/lang/eo/strings.php index 00d95a40..4588b901 100644 --- a/sources/addons/buglink/lang/eo/strings.php +++ b/sources/addons/buglink/lang/eo/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Skribi cimraporton"; +App::$strings["Report Bug"] = "Skribi cimraporton"; diff --git a/sources/addons/buglink/lang/es/strings.php b/sources/addons/buglink/lang/es/strings.php index fe632488..03d449e9 100644 --- a/sources/addons/buglink/lang/es/strings.php +++ b/sources/addons/buglink/lang/es/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Informe de errores"; +App::$strings["Report Bug"] = "Informe de errores"; diff --git a/sources/addons/buglink/lang/fr/strings.php b/sources/addons/buglink/lang/fr/strings.php index 0075fb0d..20a97f77 100644 --- a/sources/addons/buglink/lang/fr/strings.php +++ b/sources/addons/buglink/lang/fr/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Signaler un bug"; +App::$strings["Report Bug"] = "Signaler un bug"; diff --git a/sources/addons/buglink/lang/is/strings.php b/sources/addons/buglink/lang/is/strings.php index 7b3823a6..58cd61af 100644 --- a/sources/addons/buglink/lang/is/strings.php +++ b/sources/addons/buglink/lang/is/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Tilkynna bilun"; +App::$strings["Report Bug"] = "Tilkynna bilun"; diff --git a/sources/addons/buglink/lang/it/strings.php b/sources/addons/buglink/lang/it/strings.php index 90df28fe..663e3ef7 100644 --- a/sources/addons/buglink/lang/it/strings.php +++ b/sources/addons/buglink/lang/it/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Segnala un Bug"; +App::$strings["Report Bug"] = "Segnala un Bug"; diff --git a/sources/addons/buglink/lang/nb-no/strings.php b/sources/addons/buglink/lang/nb-no/strings.php index ec212e9a..5a04872e 100644 --- a/sources/addons/buglink/lang/nb-no/strings.php +++ b/sources/addons/buglink/lang/nb-no/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = ""; +App::$strings["Report Bug"] = ""; diff --git a/sources/addons/buglink/lang/pl/strings.php b/sources/addons/buglink/lang/pl/strings.php index 8229e7a6..9940481a 100644 --- a/sources/addons/buglink/lang/pl/strings.php +++ b/sources/addons/buglink/lang/pl/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Zgłoś problem"; +App::$strings["Report Bug"] = "Zgłoś problem"; diff --git a/sources/addons/buglink/lang/pt-br/strings.php b/sources/addons/buglink/lang/pt-br/strings.php index 6283d77e..41e1f7eb 100644 --- a/sources/addons/buglink/lang/pt-br/strings.php +++ b/sources/addons/buglink/lang/pt-br/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Relate um Bug"; +App::$strings["Report Bug"] = "Relate um Bug"; diff --git a/sources/addons/buglink/lang/ru/strings.php b/sources/addons/buglink/lang/ru/strings.php index c4223648..21ded4e3 100644 --- a/sources/addons/buglink/lang/ru/strings.php +++ b/sources/addons/buglink/lang/ru/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "Сообщить об ошибке"; +App::$strings["Report Bug"] = "Сообщить об ошибке"; diff --git a/sources/addons/buglink/lang/zh-cn/strings.php b/sources/addons/buglink/lang/zh-cn/strings.php index e70c0223..9129a723 100644 --- a/sources/addons/buglink/lang/zh-cn/strings.php +++ b/sources/addons/buglink/lang/zh-cn/strings.php @@ -1,3 +1,3 @@ strings["Report Bug"] = "报案程序错误"; +App::$strings["Report Bug"] = "报案程序错误"; diff --git a/sources/addons/calc/calc.php b/sources/addons/calc/calc.php index 80d0f460..b28a2159 100755 --- a/sources/addons/calc/calc.php +++ b/sources/addons/calc/calc.php @@ -285,7 +285,7 @@ id.value = "" EOT; -$a->page['htmlhead'] .= $x; +App::$page['htmlhead'] .= $x; } function calc_content($app) { diff --git a/sources/addons/dfedfix/dfedfix.php b/sources/addons/dfedfix/dfedfix.php index f587fad8..d98195d9 100644 --- a/sources/addons/dfedfix/dfedfix.php +++ b/sources/addons/dfedfix/dfedfix.php @@ -24,7 +24,7 @@ logger('dfedfix: ' . print_r($b,true)); $x = str_replace('',' ' . z_root() . '/channel/' . $b['user']['channel_address'] . '',$x); $x = str_replace('.AQAB" />','.AQAB "/> -',$x); +',$x); $b['xml'] = $x; } diff --git a/sources/addons/diaspora/diaspora.php b/sources/addons/diaspora/diaspora.php index d70e65ea..cf8cf1dd 100755 --- a/sources/addons/diaspora/diaspora.php +++ b/sources/addons/diaspora/diaspora.php @@ -142,51 +142,53 @@ function diaspora_dispatch($importer,$msg) { $msg['message']); - $parsed_xml = parse_xml_string($msg['message'],false); +// $parsed_xml = parse_xml_string($msg['message'],false); - $xmlbase = $parsed_xml->post; + $parsed_xml = xml2array($msg['message'],false,0,'tag'); + + $xmlbase = $parsed_xml['post']; // logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DATA); - if($xmlbase->request) { - $ret = diaspora_request($importer,$xmlbase->request); + if($xmlbase['request']) { + $ret = diaspora_request($importer,$xmlbase['request']); } - elseif($xmlbase->status_message) { - $ret = diaspora_post($importer,$xmlbase->status_message,$msg); + elseif($xmlbase['status_message']) { + $ret = diaspora_post($importer,$xmlbase['status_message'],$msg); } - elseif($xmlbase->profile) { - $ret = diaspora_profile($importer,$xmlbase->profile,$msg); + elseif($xmlbase['profile']) { + $ret = diaspora_profile($importer,$xmlbase['profile'],$msg); } - elseif($xmlbase->comment) { - $ret = diaspora_comment($importer,$xmlbase->comment,$msg); + elseif($xmlbase['comment']) { + $ret = diaspora_comment($importer,$xmlbase['comment'],$msg); } - elseif($xmlbase->like) { - $ret = diaspora_like($importer,$xmlbase->like,$msg); + elseif($xmlbase['like']) { + $ret = diaspora_like($importer,$xmlbase['like'],$msg); } - elseif($xmlbase->asphoto) { - $ret = diaspora_asphoto($importer,$xmlbase->asphoto,$msg); + elseif($xmlbase['asphoto']) { + $ret = diaspora_asphoto($importer,$xmlbase['asphoto'],$msg); } - elseif($xmlbase->reshare) { - $ret = diaspora_reshare($importer,$xmlbase->reshare,$msg); + elseif($xmlbase['reshare']) { + $ret = diaspora_reshare($importer,$xmlbase['reshare'],$msg); } - elseif($xmlbase->retraction) { - $ret = diaspora_retraction($importer,$xmlbase->retraction,$msg); + elseif($xmlbase['retraction']) { + $ret = diaspora_retraction($importer,$xmlbase['retraction'],$msg); } - elseif($xmlbase->signed_retraction) { - $ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg); + elseif($xmlbase['signed_retraction']) { + $ret = diaspora_signed_retraction($importer,$xmlbase['signed_retraction'],$msg); } - elseif($xmlbase->relayable_retraction) { - $ret = diaspora_signed_retraction($importer,$xmlbase->relayable_retraction,$msg); + elseif($xmlbase['relayable_retraction']) { + $ret = diaspora_signed_retraction($importer,$xmlbase['relayable_retraction'],$msg); } - elseif($xmlbase->photo) { - $ret = diaspora_photo($importer,$xmlbase->photo,$msg); + elseif($xmlbase['photo']) { + $ret = diaspora_photo($importer,$xmlbase['photo'],$msg); } - elseif($xmlbase->conversation) { - $ret = diaspora_conversation($importer,$xmlbase->conversation,$msg); + elseif($xmlbase['conversation']) { + $ret = diaspora_conversation($importer,$xmlbase['conversation'],$msg); } - elseif($xmlbase->message) { - $ret = diaspora_message($importer,$xmlbase->message,$msg); + elseif($xmlbase['message']) { + $ret = diaspora_message($importer,$xmlbase['message'],$msg); } else { logger('diaspora_dispatch: unknown message type: ' . print_r($xmlbase,true)); @@ -496,7 +498,7 @@ function diaspora_pubmsg_build($msg,$channel,$contact,$prvkey,$pubkey) { logger('diaspora_pubmsg_build: ' . $msg, LOGGER_DATA, LOG_DEBUG); - $handle = $channel['channel_address'] . '@' . get_app()->get_hostname(); + $handle = $channel['channel_address'] . '@' . App::get_hostname(); $b64url_data = base64url_encode($msg,false); @@ -561,7 +563,7 @@ function diaspora_msg_build($msg,$channel,$contact,$prvkey,$pubkey,$public = fal $outer_iv = random_string(16); $b_outer_iv = base64_encode($outer_iv); - $handle = $channel['channel_address'] . '@' . get_app()->get_hostname(); + $handle = $channel['channel_address'] . '@' . App::get_hostname(); $padded_data = pkcs5_pad($msg,16); $inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv); @@ -797,8 +799,8 @@ function diaspora_request($importer,$xml) { $a = get_app(); - $sender_handle = unxmlify($xml->sender_handle); - $recipient_handle = unxmlify($xml->recipient_handle); + $sender_handle = unxmlify($xml['sender_handle']); + $recipient_handle = unxmlify($xml['recipient_handle']); if(! $sender_handle || ! $recipient_handle) return; @@ -845,7 +847,7 @@ function diaspora_request($importer,$xml) { //FIXME /* if(feature_enabled($channel['channel_id'],'premium_channel')) { - $myaddr = $importer['channel_address'] . '@' . get_app()->get_hostname(); + $myaddr = $importer['channel_address'] . '@' . App::get_hostname(); $cnv = random_string(); $mid = random_string(); @@ -996,9 +998,9 @@ function diaspora_request($importer,$xml) { function diaspora_post($importer,$xml,$msg) { $a = get_app(); - $guid = notags(unxmlify($xml->guid)); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); - $app = notags(xmlify($xml->provider_display_name)); + $guid = notags(unxmlify($xml['guid'])); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); + $app = notags(xmlify($xml['provider_display_name'])); if($diaspora_handle != $msg['author']) { @@ -1033,13 +1035,13 @@ function diaspora_post($importer,$xml,$msg) { return; } - $created = unxmlify($xml->created_at); - $private = ((unxmlify($xml->public) == 'false') ? 1 : 0); + $created = unxmlify($xml['created_at']); + $private = ((unxmlify($xml['public']) == 'false') ? 1 : 0); - $body = diaspora2bb($xml->raw_message); + $body = diaspora2bb($xml['raw_message']); - if($xml->photo) { - $body = '[img]' . $xml->photo->remote_photo_path . $xml->photo->remote_photo_name . '[/img]' . "\n\n" . $body; + if($xml['photo']) { + $body = '[img]' . $xml['photo']['remote_photo_path'] . $xml['photo']['remote_photo_name'] . '[/img]' . "\n\n" . $body; $body = scale_external_images($body); } @@ -1164,27 +1166,29 @@ function get_diaspora_reshare_xml($url,$recurse = 0) { } logger('get_diaspora_reshare_xml: source: ' . $x['body'], LOGGER_DEBUG); - $source_xml = parse_xml_string($x['body'],false); +// $source_xml = parse_xml_string($x['body'],false); + + $source_xml = xml2array($x['body'],false,0,'tag'); if(! $source_xml) { logger('get_diaspora_reshare_xml: unparseable result from ' . $url); return ''; } - if($source_xml->post->status_message) { + if($source_xml['post']['status_message']) { return $source_xml; } // see if it's a reshare of a reshare - if($source_xml->post->reshare) - $xml = $source_xml->post->reshare; + if($source_xml['post']['reshare']) + $xml = $source_xml['post']['reshare']; else return false; - if($xml->root_diaspora_id && $xml->root_guid && $recurse < 15) { - $orig_author = notags(unxmlify($xml->root_diaspora_id)); - $orig_guid = notags(unxmlify($xml->root_guid)); + if($xml['root_diaspora_id'] && $xml['root_guid'] && $recurse < 15) { + $orig_author = notags(unxmlify($xml['root_diaspora_id'])); + $orig_guid = notags(unxmlify($xml['root_guid'])); $source_url = 'https://' . substr($orig_author,strpos($orig_author,'@')+1) . '/p/' . $orig_guid . '.xml'; $y = get_diaspora_reshare_xml($source_url,$recurse+1); if($y) @@ -1200,8 +1204,8 @@ function diaspora_reshare($importer,$xml,$msg) { logger('diaspora_reshare: init: ' . print_r($xml,true), LOGGER_DATA); $a = get_app(); - $guid = notags(unxmlify($xml->guid)); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); + $guid = notags(unxmlify($xml['guid'])); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); if($diaspora_handle != $msg['author']) { @@ -1223,27 +1227,27 @@ function diaspora_reshare($importer,$xml,$msg) { return; } - $orig_author = notags(unxmlify($xml->root_diaspora_id)); - $orig_guid = notags(unxmlify($xml->root_guid)); + $orig_author = notags(unxmlify($xml['root_diaspora_id'])); + $orig_guid = notags(unxmlify($xml['root_guid'])); $source_url = 'https://' . substr($orig_author,strpos($orig_author,'@')+1) . '/p/' . $orig_guid . '.xml'; $orig_url = 'https://'.substr($orig_author,strpos($orig_author,'@')+1).'/posts/'.$orig_guid; $source_xml = get_diaspora_reshare_xml($source_url); - if($source_xml->post->status_message) { - $body = diaspora2bb($source_xml->post->status_message->raw_message); + if($source_xml['post']['status_message']) { + $body = diaspora2bb($source_xml['post']['status_message']['raw_message']); - $orig_author = notags(unxmlify($source_xml->post->status_message->diaspora_handle)); - $orig_guid = notags(unxmlify($source_xml->post->status_message->guid)); + $orig_author = notags(unxmlify($source_xml['post']['status_message']['diaspora_handle'])); + $orig_guid = notags(unxmlify($source_xml['post']['status_message']['guid'])); // Checking for embedded pictures - if($source_xml->post->status_message->photo->remote_photo_path && - $source_xml->post->status_message->photo->remote_photo_name) { + if($source_xml['post']['status_message']['photo']['remote_photo_path'] && + $source_xml['post']['status_message']['photo']['remote_photo_name']) { - $remote_photo_path = notags(unxmlify($source_xml->post->status_message->photo->remote_photo_path)); - $remote_photo_name = notags(unxmlify($source_xml->post->status_message->photo->remote_photo_name)); + $remote_photo_path = notags(unxmlify($source_xml['post']['status_message']['photo']['remote_photo_path'])); + $remote_photo_name = notags(unxmlify($source_xml['post']['status_message']['photo']['remote_photo_name'])); $body = '[img]'.$remote_photo_path.$remote_photo_name.'[/img]'."\n".$body; @@ -1278,8 +1282,8 @@ function diaspora_reshare($importer,$xml,$msg) { } - $created = unxmlify($xml->created_at); - $private = ((unxmlify($xml->public) == 'false') ? 1 : 0); + $created = unxmlify($xml['created_at']); + $private = ((unxmlify($xml['public']) == 'false') ? 1 : 0); $datarray = array(); @@ -1339,8 +1343,8 @@ function diaspora_reshare($importer,$xml,$msg) { . "' profile='" . $orig_author_link . "' avatar='" . $orig_author_photo . "' link='" . $orig_url - . "' posted='" . datetime_convert('UTC','UTC',unxmlify($source_xml->post->status_message->created_at)) - . "' message_id='" . unxmlify($source_xml->post->status_message->guid) + . "' posted='" . datetime_convert('UTC','UTC',unxmlify($source_xml['post']['status_message']['created_at'])) + . "' message_id='" . unxmlify($source_xml['post']['status_message']['guid']) . "']" . $body . "[/share]"; @@ -1381,8 +1385,8 @@ function diaspora_asphoto($importer,$xml,$msg) { logger('diaspora_asphoto called'); $a = get_app(); - $guid = notags(unxmlify($xml->guid)); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); + $guid = notags(unxmlify($xml['guid'])); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); if($diaspora_handle != $msg['author']) { logger('diaspora_post: Potential forgery. Message handle is not the same as envelope sender.'); @@ -1421,15 +1425,15 @@ function diaspora_asphoto($importer,$xml,$msg) { ); } - $created = unxmlify($xml->created_at); - $private = ((unxmlify($xml->public) == 'false') ? 1 : 0); + $created = unxmlify($xml['created_at']); + $private = ((unxmlify($xml['public']) == 'false') ? 1 : 0); - if(strlen($xml->objectId) && ($xml->objectId != 0) && ($xml->image_url)) { - $body = '[url=' . notags(unxmlify($xml->image_url)) . '][img]' . notags(unxmlify($xml->objectId)) . '[/img][/url]' . "\n"; + if(strlen($xml['objectId']) && ($xml['objectId'] != 0) && ($xml['image_url'])) { + $body = '[url=' . notags(unxmlify($xml['image_url'])) . '][img]' . notags(unxmlify($xml['objectId'])) . '[/img][/url]' . "\n"; $body = scale_external_images($body,false); } - elseif($xml->image_url) { - $body = '[img]' . notags(unxmlify($xml->image_url)) . '[/img]' . "\n"; + elseif($xml['image_url']) { + $body = '[img]' . notags(unxmlify($xml['image_url'])) . '[/img]' . "\n"; $body = scale_external_images($body); } else { @@ -1466,7 +1470,7 @@ function diaspora_asphoto($importer,$xml,$msg) { //if($message_id) { // q("update item set plink = '%s' where id = %d", - // dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id), + // dbesc(z_root() . '/display/' . $importer['nickname'] . '/' . $message_id), // intval($message_id) // ); //} @@ -1483,14 +1487,14 @@ function diaspora_asphoto($importer,$xml,$msg) { function diaspora_comment($importer,$xml,$msg) { $a = get_app(); - $guid = notags(unxmlify($xml->guid)); - $parent_guid = notags(unxmlify($xml->parent_guid)); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); - $target_type = notags(unxmlify($xml->target_type)); - $text = unxmlify($xml->text); - $author_signature = notags(unxmlify($xml->author_signature)); + $guid = notags(unxmlify($xml['guid'])); + $parent_guid = notags(unxmlify($xml['parent_guid'])); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); + $target_type = notags(unxmlify($xml['target_type'])); + $text = unxmlify($xml['text']); + $author_signature = notags(unxmlify($xml['author_signature'])); - $parent_author_signature = (($xml->parent_author_signature) ? notags(unxmlify($xml->parent_author_signature)) : ''); + $parent_author_signature = (($xml['parent_author_signature']) ? notags(unxmlify($xml['parent_author_signature'])) : ''); $contact = diaspora_get_contact_by_handle($importer['channel_id'],$msg['author']); if(! $contact) { @@ -1748,15 +1752,15 @@ function diaspora_conversation($importer,$xml,$msg) { $a = get_app(); - $guid = notags(unxmlify($xml->guid)); - $subject = notags(unxmlify($xml->subject)); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); - $participant_handles = notags(unxmlify($xml->participant_handles)); - $created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml->created_at))); + $guid = notags(unxmlify($xml['guid'])); + $subject = notags(unxmlify($xml['subject'])); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); + $participant_handles = notags(unxmlify($xml['participant_handles'])); + $created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml['created_at']))); $parent_uri = $guid; - $messages = $xml->message; + $messages = $xml['message']; if(! count($messages)) { logger('diaspora_conversation: empty conversation'); @@ -1815,14 +1819,14 @@ function diaspora_conversation($importer,$xml,$msg) { $reply = 0; - $msg_guid = notags(unxmlify($mesg->guid)); - $msg_parent_guid = notags(unxmlify($mesg->parent_guid)); - $msg_parent_author_signature = notags(unxmlify($mesg->parent_author_signature)); - $msg_author_signature = notags(unxmlify($mesg->author_signature)); - $msg_text = unxmlify($mesg->text); - $msg_created_at = datetime_convert('UTC','UTC',notags(unxmlify($mesg->created_at))); - $msg_diaspora_handle = notags(unxmlify($mesg->diaspora_handle)); - $msg_conversation_guid = notags(unxmlify($mesg->conversation_guid)); + $msg_guid = notags(unxmlify($mesg['guid'])); + $msg_parent_guid = notags(unxmlify($mesg['parent_guid'])); + $msg_parent_author_signature = notags(unxmlify($mesg['parent_author_signature'])); + $msg_author_signature = notags(unxmlify($mesg['author_signature'])); + $msg_text = unxmlify($mesg['text']); + $msg_created_at = datetime_convert('UTC','UTC',notags(unxmlify($mesg['created_at']))); + $msg_diaspora_handle = notags(unxmlify($mesg['diaspora_handle'])); + $msg_conversation_guid = notags(unxmlify($mesg['conversation_guid'])); if($msg_conversation_guid != $guid) { logger('diaspora_conversation: message conversation guid does not belong to the current conversation. ' . $xml); continue; @@ -1839,7 +1843,7 @@ function diaspora_conversation($importer,$xml,$msg) { } - $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; + $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg['created_at']) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; $author_signature = base64_decode($msg_author_signature); @@ -1864,7 +1868,7 @@ function diaspora_conversation($importer,$xml,$msg) { } if($msg_parent_author_signature) { - $owner_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; + $owner_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg['created_at']) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; $parent_author_signature = base64_decode($msg_parent_author_signature); @@ -1934,14 +1938,14 @@ function diaspora_message($importer,$xml,$msg) { $a = get_app(); - $msg_guid = notags(unxmlify($xml->guid)); - $msg_parent_guid = notags(unxmlify($xml->parent_guid)); - $msg_parent_author_signature = notags(unxmlify($xml->parent_author_signature)); - $msg_author_signature = notags(unxmlify($xml->author_signature)); - $msg_text = unxmlify($xml->text); - $msg_created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml->created_at))); - $msg_diaspora_handle = notags(unxmlify($xml->diaspora_handle)); - $msg_conversation_guid = notags(unxmlify($xml->conversation_guid)); + $msg_guid = notags(unxmlify($xml['guid'])); + $msg_parent_guid = notags(unxmlify($xml['parent_guid'])); + $msg_parent_author_signature = notags(unxmlify($xml['parent_author_signature'])); + $msg_author_signature = notags(unxmlify($xml['author_signature'])); + $msg_text = unxmlify($xml['text']); + $msg_created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml['created_at']))); + $msg_diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); + $msg_conversation_guid = notags(unxmlify($xml['conversation_guid'])); $parent_uri = $msg_parent_guid; @@ -1995,7 +1999,7 @@ function diaspora_message($importer,$xml,$msg) { } - $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($xml->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; + $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($xml['created_at']) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; $author_signature = base64_decode($msg_author_signature); @@ -2074,19 +2078,19 @@ function diaspora_photo($importer,$xml,$msg) { logger('diaspora_photo: init',LOGGER_DEBUG); - $remote_photo_path = notags(unxmlify($xml->remote_photo_path)); + $remote_photo_path = notags(unxmlify($xml['remote_photo_path'])); - $remote_photo_name = notags(unxmlify($xml->remote_photo_name)); + $remote_photo_name = notags(unxmlify($xml['remote_photo_name'])); - $status_message_guid = notags(unxmlify($xml->status_message_guid)); + $status_message_guid = notags(unxmlify($xml['status_message_guid'])); - $guid = notags(unxmlify($xml->guid)); + $guid = notags(unxmlify($xml['guid'])); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); - $public = notags(unxmlify($xml->public)); + $public = notags(unxmlify($xml['public'])); - $created_at = notags(unxmlify($xml_created_at)); + $created_at = notags(unxmlify($xml['created_at'])); logger('diaspora_photo: status_message_guid: ' . $status_message_guid, LOGGER_DEBUG); @@ -2134,14 +2138,14 @@ function diaspora_photo($importer,$xml,$msg) { function diaspora_like($importer,$xml,$msg) { $a = get_app(); - $guid = notags(unxmlify($xml->guid)); - $parent_guid = notags(unxmlify($xml->parent_guid)); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); - $target_type = notags(unxmlify($xml->target_type)); - $positive = notags(unxmlify($xml->positive)); - $author_signature = notags(unxmlify($xml->author_signature)); + $guid = notags(unxmlify($xml['guid'])); + $parent_guid = notags(unxmlify($xml['parent_guid'])); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); + $target_type = notags(unxmlify($xml['target_type'])); + $positive = notags(unxmlify($xml['positive'])); + $author_signature = notags(unxmlify($xml['author_signature'])); - $parent_author_signature = (($xml->parent_author_signature) ? notags(unxmlify($xml->parent_author_signature)) : ''); + $parent_author_signature = (($xml['parent_author_signature']) ? notags(unxmlify($xml['parent_author_signature'])) : ''); // likes on comments not supported here and likes on photos not supported by Diaspora @@ -2362,9 +2366,9 @@ function diaspora_like($importer,$xml,$msg) { function diaspora_retraction($importer,$xml) { - $guid = notags(unxmlify($xml->guid)); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); - $type = notags(unxmlify($xml->type)); + $guid = notags(unxmlify($xml['guid'])); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); + $type = notags(unxmlify($xml['type'])); $contact = diaspora_get_contact_by_handle($importer['channel_id'],$diaspora_handle); if(! $contact) @@ -2393,12 +2397,12 @@ function diaspora_retraction($importer,$xml) { function diaspora_signed_retraction($importer,$xml,$msg) { - $guid = notags(unxmlify($xml->target_guid)); - $diaspora_handle = notags(unxmlify($xml->sender_handle)); - $type = notags(unxmlify($xml->target_type)); - $sig = notags(unxmlify($xml->target_author_signature)); + $guid = notags(unxmlify($xml['target_guid'])); + $diaspora_handle = notags(unxmlify($xml['sender_handle'])); + $type = notags(unxmlify($xml['target_type'])); + $sig = notags(unxmlify($xml['target_author_signature'])); - $parent_author_signature = (($xml->parent_author_signature) ? notags(unxmlify($xml->parent_author_signature)) : ''); + $parent_author_signature = (($xml['parent_author_signature']) ? notags(unxmlify($xml['parent_author_signature'])) : ''); $contact = diaspora_get_contact_by_handle($importer['channel_id'],$diaspora_handle); if(! $contact) { @@ -2484,7 +2488,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) { function diaspora_profile($importer,$xml,$msg) { $a = get_app(); - $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); + $diaspora_handle = notags(unxmlify($xml['diaspora_handle'])); if($diaspora_handle != $msg['author']) { @@ -2501,9 +2505,9 @@ function diaspora_profile($importer,$xml,$msg) { return 202; } - $name = unxmlify($xml->first_name) . ((strlen($xml->last_name)) ? ' ' . unxmlify($xml->last_name) : ''); - $image_url = unxmlify($xml->image_url); - $birthday = unxmlify($xml->birthday); + $name = unxmlify($xml['first_name']) . ((strlen($xml['last_name'])) ? ' ' . unxmlify($xml['last_name']) : ''); + $image_url = unxmlify($xml['image_url']); + $birthday = unxmlify($xml['birthday']); $handle_parts = explode("@", $diaspora_handle); @@ -2560,7 +2564,7 @@ function diaspora_share($owner,$contact) { - $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $myaddr = $owner['channel_address'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3); if(! array_key_exists('hubloc_hash',$contact)) { $c = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1", @@ -2588,11 +2592,11 @@ function diaspora_share($owner,$contact) { function diaspora_unshare($owner,$contact) { $a = get_app(); - $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $myaddr = $owner['channel_address'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3); $tpl = get_markup_template('diaspora_retract.tpl','addon/diaspora'); $msg = replace_macros($tpl, array( - '$guid' => $owner['channel_guid'] . str_replace('.','',get_app()->get_hostname()), + '$guid' => $owner['channel_guid'] . str_replace('.','',App::get_hostname()), '$type' => 'Person', '$handle' => $myaddr )); @@ -2606,7 +2610,7 @@ function diaspora_unshare($owner,$contact) { function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $a = get_app(); - $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $myaddr = $owner['channel_address'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3); if(intval($item['id']) != intval($item['parent'])) { logger('attempted to send a comment as a top-level post'); @@ -2769,7 +2773,7 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals $a = get_app(); if(! count($images)) return; - $mysite = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://') + 3) . '/photo'; + $mysite = substr(z_root(),strpos(z_root(),'://') + 3) . '/photo'; $qi = array(); @@ -2810,7 +2814,7 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { $a = get_app(); - $myaddr = $owner['channel_address'] . '@' . get_app()->get_hostname(); + $myaddr = $owner['channel_address'] . '@' . App::get_hostname(); $theiraddr = $contact['xchan_addr']; // Diaspora doesn't support threaded comments, but some @@ -2902,7 +2906,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $a = get_app(); - $myaddr = $owner['channel_address'] . '@' . get_app()->get_hostname(); + $myaddr = $owner['channel_address'] . '@' . App::get_hostname(); $text = bb2diaspora_itembody($item); @@ -2995,7 +2999,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // bug - nomadic identity may/will affect diaspora_handle_from_contact if(! $handle) { if($item['author_xchan'] === $owner['channel_hash']) - $handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $handle = $owner['channel_address'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3); else $handle = diaspora_handle_from_contact($item['author_xchan']); } @@ -3053,7 +3057,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) { $a = get_app(); - $myaddr = $owner['channel_address'] . '@' . get_app()->get_hostname(); + $myaddr = $owner['channel_address'] . '@' . App::get_hostname(); // Check whether the retraction is for a top-level post or whether it's a relayable if( $item['mid'] !== $item['parent_mid'] ) { @@ -3084,7 +3088,7 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) { function diaspora_send_mail($item,$owner,$contact) { $a = get_app(); - $myaddr = $owner['channel_address'] . '@' . get_app()->get_hostname(); + $myaddr = $owner['channel_address'] . '@' . App::get_hostname(); $r = q("select * from conv where guid = '%s' and uid = %d limit 1", dbesc($item['conv_guid']), @@ -3503,7 +3507,7 @@ function diaspora_profile_change($channel,$recip,$public_batch = false) { return; $profile = $r[0]; - $handle = xmlify($channel['channel_address'] . '@' . get_app()->get_hostname()); + $handle = xmlify($channel['channel_address'] . '@' . App::get_hostname()); $first = xmlify(((strpos($profile['channel_name'],' ')) ? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name'])); $last = xmlify((($first === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($first))))); diff --git a/sources/addons/diaspora/lang/nl/strings.php b/sources/addons/diaspora/lang/nl/strings.php index dd9d7e1a..995ed3d4 100644 --- a/sources/addons/diaspora/lang/nl/strings.php +++ b/sources/addons/diaspora/lang/nl/strings.php @@ -1,20 +1,20 @@ strings["\$projectname"] = "\$projectname"; -$a->strings["photo"] = "foto"; -$a->strings["status"] = "status"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %2\$s's %3\$s leuk"; -$a->strings["Please choose"] = "Maak een keuze"; -$a->strings["Agree"] = "Eens"; -$a->strings["Disagree"] = "Oneens"; -$a->strings["Abstain"] = "Onthouding"; -$a->strings["I will attend"] = "Aanwezig"; -$a->strings["I will not attend"] = "Niet aanwezig"; -$a->strings["I may attend"] = "Mogelijk aanwezig"; -$a->strings["Diaspora Protocol Settings updated."] = "Diaspora-protocol-instellingen bijgewerkt."; -$a->strings["Enable the (experimental) Diaspora protocol for this channel"] = "Het (experimentele) Diaspora-protocol voor dit kanaal inschakelen"; -$a->strings["Allow any Diaspora member to comment on your public posts"] = "Geef elk Diaspora-lid toestemming om op jouw openbare berichten te reageren"; -$a->strings["Prevent your hashtags from being redirected to other sites"] = "Voorkom dat jouw hashtags naar andere websites worden doorverwezen"; -$a->strings["Diaspora Protocol Settings"] = "Diaspora-protocol (compatibiliteit, incl Friendica)"; -$a->strings["Submit"] = "Opslaan"; +App::$strings["\$projectname"] = "\$projectname"; +App::$strings["photo"] = "foto"; +App::$strings["status"] = "status"; +App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %2\$s's %3\$s leuk"; +App::$strings["Please choose"] = "Maak een keuze"; +App::$strings["Agree"] = "Eens"; +App::$strings["Disagree"] = "Oneens"; +App::$strings["Abstain"] = "Onthouding"; +App::$strings["I will attend"] = "Aanwezig"; +App::$strings["I will not attend"] = "Niet aanwezig"; +App::$strings["I may attend"] = "Mogelijk aanwezig"; +App::$strings["Diaspora Protocol Settings updated."] = "Diaspora-protocol-instellingen bijgewerkt."; +App::$strings["Enable the (experimental) Diaspora protocol for this channel"] = "Het (experimentele) Diaspora-protocol voor dit kanaal inschakelen"; +App::$strings["Allow any Diaspora member to comment on your public posts"] = "Geef elk Diaspora-lid toestemming om op jouw openbare berichten te reageren"; +App::$strings["Prevent your hashtags from being redirected to other sites"] = "Voorkom dat jouw hashtags naar andere websites worden doorverwezen"; +App::$strings["Diaspora Protocol Settings"] = "Diaspora-protocol (compatibiliteit, incl Friendica)"; +App::$strings["Submit"] = "Opslaan"; diff --git a/sources/addons/diaspora/p.php b/sources/addons/diaspora/p.php index 8855859b..42c2eaa5 100644 --- a/sources/addons/diaspora/p.php +++ b/sources/addons/diaspora/p.php @@ -28,7 +28,7 @@ function p_init(&$a) { if(! $c) http_status_exit(404); - $myaddr = $c[0]['channel_address'] . '@' . $a->get_hostname(); + $myaddr = $c[0]['channel_address'] . '@' . App::get_hostname(); $item = $r[0]; diff --git a/sources/addons/diaspora/receive.php b/sources/addons/diaspora/receive.php index fad4ae71..a802c94b 100644 --- a/sources/addons/diaspora/receive.php +++ b/sources/addons/diaspora/receive.php @@ -12,7 +12,7 @@ function receive_post(&$a) { $public = false; - logger('diaspora_receive: ' . print_r($a->argv, true), LOGGER_DEBUG); + logger('diaspora_receive: ' . print_r(App::$argv, true), LOGGER_DEBUG); if((argc() == 2) && (argv(1) === 'public')) { $public = true; @@ -23,7 +23,7 @@ function receive_post(&$a) { http_status_exit(500); $guid = argv(2); - $hn = str_replace('.','',$a->get_hostname()); + $hn = str_replace('.','',App::get_hostname()); if(($x = strpos($guid,$hn)) > 0) $guid = substr($guid,0,$x); diff --git a/sources/addons/diaspost/diaspost.php b/sources/addons/diaspost/diaspost.php index 81543e51..358acc23 100755 --- a/sources/addons/diaspost/diaspost.php +++ b/sources/addons/diaspost/diaspost.php @@ -40,7 +40,7 @@ function diaspost_jot_nets(&$a,&$b) { } function diaspost_queue_hook(&$a,&$b) { - $hostname = $a->get_hostname(); + $hostname = App::get_hostname(); $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", dbesc(NETWORK_DIASPORA2) @@ -115,7 +115,7 @@ function diaspost_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -228,7 +228,7 @@ function diaspost_post_local(&$a,&$b) { function diaspost_send(&$a,&$b) { - $hostname = 'hubzilla ' . '(' . $a->get_hostname() . ')'; + $hostname = 'hubzilla ' . '(' . App::get_hostname() . ')'; logger('diaspost_send: invoked',LOGGER_DEBUG); @@ -328,11 +328,11 @@ function diaspost_send(&$a,&$b) { // $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']); // if (count($r)) -// $a->contact = $r[0]["id"]; +// App::$contact = $r[0]["id"]; // $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $body)); // require_once('include/queue_fn.php'); -// add_to_queue($a->contact,NETWORK_DIASPORA2,$s); +// add_to_queue(App::$contact,NETWORK_DIASPORA2,$s); // notice(t('Diaspost post failed. Queued for retry.').EOL); } } diff --git a/sources/addons/dirstats/dirstats.php b/sources/addons/dirstats/dirstats.php index 4c958218..98b9afcc 100644 --- a/sources/addons/dirstats/dirstats.php +++ b/sources/addons/dirstats/dirstats.php @@ -46,7 +46,7 @@ function dirstats_content(&$a) { $chatrooms = get_config('dirstats','chatrooms'); $tags = get_config('dirstats','tags'); - $ob = $a->get_observer(); + $ob = App::get_observer(); $observer = $ob['xchan_hash']; // Requested by Martin $fountainofyouth = get_xconfig($observer, 'dirstats', 'averageage'); diff --git a/sources/addons/dwpost/dwpost.php b/sources/addons/dwpost/dwpost.php index 721b9a8d..1a57e0ae 100644 --- a/sources/addons/dwpost/dwpost.php +++ b/sources/addons/dwpost/dwpost.php @@ -51,7 +51,7 @@ function dwpost_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ diff --git a/sources/addons/dwpost/lang/ca/strings.php b/sources/addons/dwpost/lang/ca/strings.php index 6ad56a9b..431f93b1 100644 --- a/sources/addons/dwpost/lang/ca/strings.php +++ b/sources/addons/dwpost/lang/ca/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Missatge a Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Configuració d'enviaments a Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Habilitat el plugin d'enviaments a Dreamwidth"; -$a->strings["dreamwidth username"] = "Nom d'usuari a Dreamwidth"; -$a->strings["dreamwidth password"] = "Contrasenya a Dreamwidth"; -$a->strings["Post to dreamwidth by default"] = "Enviar per defecte a Dreamwidth"; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to Dreamwidth"] = "Missatge a Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Configuració d'enviaments a Dreamwidth"; +App::$strings["Enable dreamwidth Post Plugin"] = "Habilitat el plugin d'enviaments a Dreamwidth"; +App::$strings["dreamwidth username"] = "Nom d'usuari a Dreamwidth"; +App::$strings["dreamwidth password"] = "Contrasenya a Dreamwidth"; +App::$strings["Post to dreamwidth by default"] = "Enviar per defecte a Dreamwidth"; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/dwpost/lang/cs/strings.php b/sources/addons/dwpost/lang/cs/strings.php index e01db0d1..7d279cbe 100644 --- a/sources/addons/dwpost/lang/cs/strings.php +++ b/sources/addons/dwpost/lang/cs/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Poslat na Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Nastavení Dreamwidth příspěvků"; -$a->strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin"; -$a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno"; -$a->strings["dreamwidth password"] = "dreamwidth heslo"; -$a->strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth"; -$a->strings["Submit"] = "Odeslat"; +App::$strings["Post to Dreamwidth"] = "Poslat na Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Nastavení Dreamwidth příspěvků"; +App::$strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin"; +App::$strings["dreamwidth username"] = "dreamwidth uživatelské jméno"; +App::$strings["dreamwidth password"] = "dreamwidth heslo"; +App::$strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth"; +App::$strings["Submit"] = "Odeslat"; diff --git a/sources/addons/dwpost/lang/de/strings.php b/sources/addons/dwpost/lang/de/strings.php index 2e3ba985..b710c23a 100644 --- a/sources/addons/dwpost/lang/de/strings.php +++ b/sources/addons/dwpost/lang/de/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen"; -$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen"; -$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren"; -$a->strings["dreamwidth username"] = "Dreamwidth Benutzername"; -$a->strings["dreamwidth password"] = "Dreamwidth Passwort"; -$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen"; -$a->strings["Submit"] = "Senden"; +App::$strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen"; +App::$strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen"; +App::$strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren"; +App::$strings["dreamwidth username"] = "Dreamwidth Benutzername"; +App::$strings["dreamwidth password"] = "Dreamwidth Passwort"; +App::$strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen"; +App::$strings["Submit"] = "Senden"; diff --git a/sources/addons/dwpost/lang/eo/strings.php b/sources/addons/dwpost/lang/eo/strings.php index 967d4b9b..2fdc1a48 100644 --- a/sources/addons/dwpost/lang/eo/strings.php +++ b/sources/addons/dwpost/lang/eo/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Afiŝi al Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Agordoj por Afiŝoj al Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Ŝalti la Dreamwidth Kromprogramon"; -$a->strings["dreamwidth username"] = "Dreamwidth salutnomo"; -$a->strings["dreamwidth password"] = "Dreamwidth pasvorto"; -$a->strings["Post to dreamwidth by default"] = "Defaŭlte afiŝi al Dreamwidth"; -$a->strings["Submit"] = "Sendi"; +App::$strings["Post to Dreamwidth"] = "Afiŝi al Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Agordoj por Afiŝoj al Dreamwidth"; +App::$strings["Enable dreamwidth Post Plugin"] = "Ŝalti la Dreamwidth Kromprogramon"; +App::$strings["dreamwidth username"] = "Dreamwidth salutnomo"; +App::$strings["dreamwidth password"] = "Dreamwidth pasvorto"; +App::$strings["Post to dreamwidth by default"] = "Defaŭlte afiŝi al Dreamwidth"; +App::$strings["Submit"] = "Sendi"; diff --git a/sources/addons/dwpost/lang/es/strings.php b/sources/addons/dwpost/lang/es/strings.php index 11e6ff59..e1c00095 100644 --- a/sources/addons/dwpost/lang/es/strings.php +++ b/sources/addons/dwpost/lang/es/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Publicar en Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Configuración de las publicaciones en Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Activar el módulo de publicación en Dreamwidth"; -$a->strings["dreamwidth username"] = "Nombre de usuario de Dreamwidth"; -$a->strings["dreamwidth password"] = "Contraseña de Dreamwidth"; -$a->strings["Post to dreamwidth by default"] = "Publicar en Dreamwidth por defecto"; -$a->strings["Submit"] = "Envíar"; +App::$strings["Post to Dreamwidth"] = "Publicar en Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Configuración de las publicaciones en Dreamwidth"; +App::$strings["Enable dreamwidth Post Plugin"] = "Activar el módulo de publicación en Dreamwidth"; +App::$strings["dreamwidth username"] = "Nombre de usuario de Dreamwidth"; +App::$strings["dreamwidth password"] = "Contraseña de Dreamwidth"; +App::$strings["Post to dreamwidth by default"] = "Publicar en Dreamwidth por defecto"; +App::$strings["Submit"] = "Envíar"; diff --git a/sources/addons/dwpost/lang/fr/strings.php b/sources/addons/dwpost/lang/fr/strings.php index 729bb028..cb5b6436 100644 --- a/sources/addons/dwpost/lang/fr/strings.php +++ b/sources/addons/dwpost/lang/fr/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Poster vers Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Réglages Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Activer \"Poster vers Dreamwidth\""; -$a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth"; -$a->strings["dreamwidth password"] = "Mot de passe"; -$a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut"; -$a->strings["Submit"] = "Envoyer"; +App::$strings["Post to Dreamwidth"] = "Poster vers Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Réglages Dreamwidth"; +App::$strings["Enable dreamwidth Post Plugin"] = "Activer \"Poster vers Dreamwidth\""; +App::$strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth"; +App::$strings["dreamwidth password"] = "Mot de passe"; +App::$strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut"; +App::$strings["Submit"] = "Envoyer"; diff --git a/sources/addons/dwpost/lang/is/strings.php b/sources/addons/dwpost/lang/is/strings.php index 96f1f78b..d227e077 100644 --- a/sources/addons/dwpost/lang/is/strings.php +++ b/sources/addons/dwpost/lang/is/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = ""; -$a->strings["Dreamwidth Post Settings"] = ""; -$a->strings["Enable dreamwidth Post Plugin"] = ""; -$a->strings["dreamwidth username"] = ""; -$a->strings["dreamwidth password"] = ""; -$a->strings["Post to dreamwidth by default"] = ""; -$a->strings["Submit"] = "Senda inn"; +App::$strings["Post to Dreamwidth"] = ""; +App::$strings["Dreamwidth Post Settings"] = ""; +App::$strings["Enable dreamwidth Post Plugin"] = ""; +App::$strings["dreamwidth username"] = ""; +App::$strings["dreamwidth password"] = ""; +App::$strings["Post to dreamwidth by default"] = ""; +App::$strings["Submit"] = "Senda inn"; diff --git a/sources/addons/dwpost/lang/it/strings.php b/sources/addons/dwpost/lang/it/strings.php index a47497aa..47226d0c 100644 --- a/sources/addons/dwpost/lang/it/strings.php +++ b/sources/addons/dwpost/lang/it/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Posta su Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Impostazioni post Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Abilita il plugin dreamwidth"; -$a->strings["dreamwidth username"] = "dreamwidth username"; -$a->strings["dreamwidth password"] = "Password dreamwidth"; -$a->strings["Post to dreamwidth by default"] = "Invia a dreamwidth per impostazione predefinita"; -$a->strings["Submit"] = "Invia"; +App::$strings["Post to Dreamwidth"] = "Posta su Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Impostazioni post Dreamwidth"; +App::$strings["Enable dreamwidth Post Plugin"] = "Abilita il plugin dreamwidth"; +App::$strings["dreamwidth username"] = "dreamwidth username"; +App::$strings["dreamwidth password"] = "Password dreamwidth"; +App::$strings["Post to dreamwidth by default"] = "Invia a dreamwidth per impostazione predefinita"; +App::$strings["Submit"] = "Invia"; diff --git a/sources/addons/dwpost/lang/nb-no/strings.php b/sources/addons/dwpost/lang/nb-no/strings.php index 37677e6d..f320b418 100644 --- a/sources/addons/dwpost/lang/nb-no/strings.php +++ b/sources/addons/dwpost/lang/nb-no/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = ""; -$a->strings["Dreamwidth Post Settings"] = ""; -$a->strings["Enable dreamwidth Post Plugin"] = ""; -$a->strings["dreamwidth username"] = ""; -$a->strings["dreamwidth password"] = ""; -$a->strings["Post to dreamwidth by default"] = ""; -$a->strings["Submit"] = "Lagre"; +App::$strings["Post to Dreamwidth"] = ""; +App::$strings["Dreamwidth Post Settings"] = ""; +App::$strings["Enable dreamwidth Post Plugin"] = ""; +App::$strings["dreamwidth username"] = ""; +App::$strings["dreamwidth password"] = ""; +App::$strings["Post to dreamwidth by default"] = ""; +App::$strings["Submit"] = "Lagre"; diff --git a/sources/addons/dwpost/lang/pl/strings.php b/sources/addons/dwpost/lang/pl/strings.php index 237c95d9..2cc1856b 100644 --- a/sources/addons/dwpost/lang/pl/strings.php +++ b/sources/addons/dwpost/lang/pl/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Opublikuj na Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = ""; -$a->strings["Enable dreamwidth Post Plugin"] = ""; -$a->strings["dreamwidth username"] = ""; -$a->strings["dreamwidth password"] = ""; -$a->strings["Post to dreamwidth by default"] = ""; -$a->strings["Submit"] = "Potwierdź"; +App::$strings["Post to Dreamwidth"] = "Opublikuj na Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = ""; +App::$strings["Enable dreamwidth Post Plugin"] = ""; +App::$strings["dreamwidth username"] = ""; +App::$strings["dreamwidth password"] = ""; +App::$strings["Post to dreamwidth by default"] = ""; +App::$strings["Submit"] = "Potwierdź"; diff --git a/sources/addons/dwpost/lang/pt-br/strings.php b/sources/addons/dwpost/lang/pt-br/strings.php index 329cf9e3..d02f6010 100644 --- a/sources/addons/dwpost/lang/pt-br/strings.php +++ b/sources/addons/dwpost/lang/pt-br/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "Publicar no Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Configurações de publicação no Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Habilitar o plugin de publicação no Dreamwidth"; -$a->strings["dreamwidth username"] = "Nome de usuário do Dreamwidth"; -$a->strings["dreamwidth password"] = "Senha do Dreamwidth"; -$a->strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão"; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to Dreamwidth"] = "Publicar no Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Configurações de publicação no Dreamwidth"; +App::$strings["Enable dreamwidth Post Plugin"] = "Habilitar o plugin de publicação no Dreamwidth"; +App::$strings["dreamwidth username"] = "Nome de usuário do Dreamwidth"; +App::$strings["dreamwidth password"] = "Senha do Dreamwidth"; +App::$strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão"; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/dwpost/lang/ru/strings.php b/sources/addons/dwpost/lang/ru/strings.php index 98b08781..f116b004 100644 --- a/sources/addons/dwpost/lang/ru/strings.php +++ b/sources/addons/dwpost/lang/ru/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = ""; -$a->strings["Dreamwidth Post Settings"] = "Dreamwidth настройки сообщений"; -$a->strings["Enable dreamwidth Post Plugin"] = "Включить dreamwidth плагин сообщений"; -$a->strings["dreamwidth username"] = "dreamwidth имя пользователя"; -$a->strings["dreamwidth password"] = "dreamwidth пароль"; -$a->strings["Post to dreamwidth by default"] = ""; -$a->strings["Submit"] = "Подтвердить"; +App::$strings["Post to Dreamwidth"] = ""; +App::$strings["Dreamwidth Post Settings"] = "Dreamwidth настройки сообщений"; +App::$strings["Enable dreamwidth Post Plugin"] = "Включить dreamwidth плагин сообщений"; +App::$strings["dreamwidth username"] = "dreamwidth имя пользователя"; +App::$strings["dreamwidth password"] = "dreamwidth пароль"; +App::$strings["Post to dreamwidth by default"] = ""; +App::$strings["Submit"] = "Подтвердить"; diff --git a/sources/addons/dwpost/lang/sv/strings.php b/sources/addons/dwpost/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/dwpost/lang/sv/strings.php +++ b/sources/addons/dwpost/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/dwpost/lang/zh-cn/strings.php b/sources/addons/dwpost/lang/zh-cn/strings.php index 93e075c6..84faef20 100644 --- a/sources/addons/dwpost/lang/zh-cn/strings.php +++ b/sources/addons/dwpost/lang/zh-cn/strings.php @@ -1,9 +1,9 @@ strings["Post to Dreamwidth"] = "转播到Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Dreamwidth转播设置"; -$a->strings["Enable dreamwidth Post Plugin"] = "使Dreamwidth转播插件可用"; -$a->strings["dreamwidth username"] = "Dreamwidth用户名"; -$a->strings["dreamwidth password"] = "Dreamwidth密码"; -$a->strings["Post to dreamwidth by default"] = "默认地转播到Dreamwidth"; -$a->strings["Submit"] = "提交"; +App::$strings["Post to Dreamwidth"] = "转播到Dreamwidth"; +App::$strings["Dreamwidth Post Settings"] = "Dreamwidth转播设置"; +App::$strings["Enable dreamwidth Post Plugin"] = "使Dreamwidth转播插件可用"; +App::$strings["dreamwidth username"] = "Dreamwidth用户名"; +App::$strings["dreamwidth password"] = "Dreamwidth密码"; +App::$strings["Post to dreamwidth by default"] = "默认地转播到Dreamwidth"; +App::$strings["Submit"] = "提交"; diff --git a/sources/addons/flattrwidget/flattrwidget.php b/sources/addons/flattrwidget/flattrwidget.php index e0c0f87e..b3c982ac 100644 --- a/sources/addons/flattrwidget/flattrwidget.php +++ b/sources/addons/flattrwidget/flattrwidget.php @@ -25,11 +25,11 @@ function flattrwidget_unload() { function flattrwidget_construct_page(&$a,&$b) { if (! $b['module']=='channel') return; - $id = $a->profile['profile_uid']; + $id = App::$profile['profile_uid']; $enable = intval(get_pconfig($id,'flattrwidget','enable')); if (! $enable) return; - $a->page['htmlhead'] .= ''; + App::$page['htmlhead'] .= ''; // get alignment and static/dynamic from the settings // align is either "aside" or "right_aside" // sd is either static or dynamic @@ -47,7 +47,7 @@ function flattrwidget_construct_page(&$a,&$b) { $link = 'https://flattr.com/submit/auto?user_id='.$user.'&url=' . rawurlencode($thing).'&title='.rawurlencode($ftitle); if ($sd == 'static') { // static button graphic from the img folder - $img = $a->get_baseurl() .'/addon/flattrwidget/img/flattr-badge-large.png'; + $img = z_root() .'/addon/flattrwidget/img/flattr-badge-large.png'; $code = ''.$title.''; } else { $code = ''; @@ -65,12 +65,12 @@ function flattrwidget_construct_page(&$a,&$b) { function flattrwidget_settings_post($a,$s) { if(! local_channel() || (! x($_POST,'flattrwidget-submit'))) return; - $c = $a->get_channel(); + $c = App::get_channel(); set_pconfig( local_channel(), 'flattrwidget', 'align', $_POST['flattrwidget-align'] ); set_pconfig( local_channel(), 'flattrwidget', 'sd', $_POST['flattrwidget-static'] ); $thing = $_POST['flattrwidget-thing']; if ($thing == '') { - $thing = $a->get_baseurl().'/channel/'.$c['channel_address']; + $thing = z_root().'/channel/'.$c['channel_address']; } set_pconfig( local_channel(), 'flattrwidget', 'thing', $thing); set_pconfig( local_channel(), 'flattrwidget', 'user', $_POST['flattrwidget-user']); @@ -87,7 +87,7 @@ function flattrwidget_settings(&$a,&$s) { if (! $id) return; - //$a->page['htmlhead'] .= ''; + //App::$page['htmlhead'] .= ''; $lr = get_pconfig( $id, 'flattrwidget', 'align'); $sd = get_pconfig( $id, 'flattrwidget', 'sd'); $thing = get_pconfig( $id, 'flattrwidget', 'thing'); diff --git a/sources/addons/fortunate/fortunate.php b/sources/addons/fortunate/fortunate.php index 03618401..09e21fa2 100644 --- a/sources/addons/fortunate/fortunate.php +++ b/sources/addons/fortunate/fortunate.php @@ -26,8 +26,8 @@ function fortunate_fetch(&$a,&$b) { if(! $fort_server) return; - $a->page['htmlhead'] .= '' . "\r\n"; + App::$page['htmlhead'] .= '' . "\r\n"; $s = z_fetch_url('http://' . $fort_server . '/cookie.php?numlines=4&equal=1&rand=' . mt_rand()); if($s['success']) diff --git a/sources/addons/frphotos/frphotos.php b/sources/addons/frphotos/frphotos.php index 46147911..c27a3b32 100644 --- a/sources/addons/frphotos/frphotos.php +++ b/sources/addons/frphotos/frphotos.php @@ -22,7 +22,7 @@ function frphotos_init(&$a) { if(intval(get_pconfig(local_channel(),'frphotos','complete'))) return; - $channel = $a->get_channel(); + $channel = App::get_channel(); $fr_server = $_REQUEST['fr_server']; $fr_username = $_REQUEST['fr_username']; diff --git a/sources/addons/gnusoc/gnusoc.php b/sources/addons/gnusoc/gnusoc.php index fa969424..6c2719a7 100644 --- a/sources/addons/gnusoc/gnusoc.php +++ b/sources/addons/gnusoc/gnusoc.php @@ -3,7 +3,7 @@ /** * Name: GNU-Social Protocol - * Description: GNU-Social Protocol (Experimental, Not-finished, Unsupported) + * Description: GNU-Social Protocol (Experimental, Unsupported) * Version: 1.0 * Author: Mike Macgirvin * Maintainer: none @@ -16,7 +16,6 @@ require_once('include/items.php'); require_once('include/bb2diaspora.php'); require_once('include/contact_selectors.php'); require_once('include/queue_fn.php'); -require_once('include/salmon.php'); function gnusoc_load() { @@ -26,10 +25,15 @@ function gnusoc_load() { register_hook('follow_allow', 'addon/gnusoc/gnusoc.php', 'gnusoc_follow_allow'); register_hook('feature_settings_post', 'addon/gnusoc/gnusoc.php', 'gnusoc_feature_settings_post'); register_hook('feature_settings', 'addon/gnusoc/gnusoc.php', 'gnusoc_feature_settings'); + register_hook('follow', 'addon/gnusoc/gnusoc.php', 'gnusoc_follow_local'); + register_hook('permissions_create', 'addon/gnusoc/gnusoc.php', 'gnusoc_permissions_create'); + register_hook('queue_deliver', 'addon/gnusoc/gnusoc.php', 'gnusoc_queue_deliver'); + register_hook('notifier_process','addon/gnusoc/gnusoc.php','gnusoc_notifier_process'); + register_hook('follow_from_feed','addon/gnusoc/gnusoc.php','gnusoc_follow_from_feed'); + // register_hook('notifier_hub', 'addon/gnusoc/gnusoc.php', 'gnusoc_process_outbound'); -// register_hook('permissions_create', 'addon/gnusoc/gnusoc.php', 'gnusoc_permissions_create'); // register_hook('permissions_update', 'addon/gnusoc/gnusoc.php', 'gnusoc_permissions_update'); } @@ -41,6 +45,11 @@ function gnusoc_unload() { unregister_hook('follow_allow', 'addon/gnusoc/gnusoc.php', 'gnusoc_follow_allow'); unregister_hook('feature_settings_post', 'addon/gnusoc/gnusoc.php', 'gnusoc_feature_settings_post'); unregister_hook('feature_settings', 'addon/gnusoc/gnusoc.php', 'gnusoc_feature_settings'); + unregister_hook('follow', 'addon/gnusoc/gnusoc.php', 'gnusoc_follow_local'); + unregister_hook('permissions_create', 'addon/gnusoc/gnusoc.php', 'gnusoc_permissions_create'); + unregister_hook('queue_deliver', 'addon/gnusoc/gnusoc.php', 'gnusoc_queue_deliver'); + unregister_hook('notifier_process','addon/gnusoc/gnusoc.php','gnusoc_notifier_process'); + unregister_hook('follow_from_feed','addon/gnusoc/gnusoc.php','gnusoc_follow_from_feed'); } @@ -58,11 +67,13 @@ function gnusoc_load_module(&$a, &$b) { function gnusoc_webfinger(&$a,&$b) { $b['result']['links'][] = array('rel' => 'salmon', 'href' => z_root() . '/salmon/' . $b['channel']['channel_address']); + $b['result']['links'][] = array('rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => z_root() . '/salmon/' . $b['channel']['channel_address']); + $b['result']['links'][] = array('rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => z_root() . '/salmon/' . $b['channel']['channel_address']); } function gnusoc_personal_xrd(&$a,&$b) { $b['xml'] = str_replace('', - '' . "\r\n" . '', $b['xml']); + '' . "\r\n" . '' . "\r\n" . '' . "\r\n" . '', $b['xml']); } @@ -80,6 +91,19 @@ function gnusoc_follow_allow(&$a, &$b) { } +function gnusoc_follow_local(&$a,&$b) { + + require_once('addon/pubsubhubbub/pubsubhubbub.php'); + + if($b['abook']['abook_xchan'] && $b['abook']['xchan_network'] === 'gnusoc') { + $hubs = get_xconfig($b['abook']['abook_xchan'],'system','push_hubs'); + if($hubs) { + foreach($hubs as $hub) { + pubsubhubbub_subscribe($hub,$b['channel'],$b['abook'],'',$hubmode = 'subscribe'); + } + } + } +} function gnusoc_feature_settings_post(&$a,&$b) { @@ -109,3 +133,427 @@ function gnusoc_feature_settings(&$a,&$s) { } +function get_salmon_key($uri,$keyhash) { + $ret = array(); + + logger('Fetching salmon key for ' . $uri, LOGGER_DEBUG, LOG_INFO); + + $x = webfinger_rfc7033($uri,true); + + logger('webfinger returns: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG); + + if($x && array_key_exists('links',$x) && $x['links']) { + foreach($x['links'] as $link) { + if(array_key_exists('rel',$link) && $link['rel'] === 'magic-public-key') { + $ret[] = $link['href']; + } + } + } + + else { + $arr = old_webfinger($uri); + + logger('old webfinger returns: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG); + + if(is_array($arr)) { + foreach($arr as $a) { + if($a['@attributes']['rel'] === 'magic-public-key') { + $ret[] = $a['@attributes']['href']; + } + } + } + else { + return ''; + } + } + + // We have found at least one key URL + // If it's inline, parse it - otherwise get the key + + if(count($ret)) { + for($x = 0; $x < count($ret); $x ++) { + if(substr($ret[$x],0,5) === 'data:') { + $ret[$x] = convert_salmon_key($ret[$x]); + } + } + } + + + logger('Key located: ' . print_r($ret,true), LOGGER_DEBUG, LOG_INFO); + + if(count($ret) == 1) { + + // We only found one one key so we don't care if the hash matches. + // If it's the wrong key we'll find out soon enough because + // message verification will fail. This also covers some older + // software which don't supply a keyhash. As long as they only + // have one key we'll be right. + + return $ret[0]; + } + else { + foreach($ret as $a) { + $hash = base64url_encode(hash('sha256',$a)); + if($hash == $keyhash) + return $a; + } + } + + return ''; +} + + + +function slapper($owner,$url,$slap) { + + // does contact have a salmon endpoint? + + if(! strlen($url)) + return; + + if(! $owner['channel_prvkey']) { + logger(sprintf("channel '%s' (%d) does not have a salmon private key. Send failed.", + $owner['channel_address'],$owner['channel_id'])); + return; + } + + logger('slapper called for ' .$url . '. Data: ' . $slap, LOGGER_DATA, LOG_DEBUG); + + // create a magic envelope + + + $data = base64url_encode($slap, false); // do not strip padding + $data_type = 'application/atom+xml'; + $encoding = 'base64url'; + $algorithm = 'RSA-SHA256'; + $keyhash = base64url_encode(hash('sha256',salmon_key($owner['channel_pubkey'])),true); + + $data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$data); + + // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods + + $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='; + + $signature = base64url_encode(rsa_sign($data . $precomputed,$owner['channel_prvkey'])); + + $salmon_tpl = get_markup_template('magicsig.tpl','addon/gnusoc/'); + + $salmon = replace_macros($salmon_tpl,array( + '$data' => $data, + '$encoding' => $encoding, + '$algorithm' => $algorithm, + '$keyhash' => $keyhash, + '$signature' => $signature + )); + + logger('salmon: ' . $salmon, LOGGER_DATA); + + $hash = random_string(); + + queue_insert(array( + 'hash' => $hash, + 'account_id' => $owner['channel_account_id'], + 'channel_id' => $owner['channel_id'], + 'driver' => 'slap', + 'posturl' => $url, + 'notify' => '', + 'msg' => $salmon, + )); + + return $hash; + +} + + +function gnusoc_queue_deliver(&$a,&$b) { + $outq = $b['outq']; + if($outq['outq_driver'] !== 'slap') + return; + + $b['handled'] = true; + + $headers = array( + 'Content-type: application/magic-envelope+xml', + 'Content-length: ' . strlen($outq['outq_msg'])); + + $counter = 0; + $result = z_post_url($outq['outq_posturl'], $outq['outq_msg'], $counter, array('headers' => $headers, 'novalidate' => true)); + if($result['success'] && $result['return_code'] < 300) { + logger('slap_deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG); + if($b['base']) { + q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ", + dbesc(datetime_convert()), + dbesc($b['base']) + ); + } + q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1", + dbesc('accepted for delivery'), + dbesc(datetime_convert()), + dbesc($outq['outq_hash']) + ); + + remove_queue_item($outq['outq_hash']); + } + else { + logger('slap_deliver: queue post returned ' . $result['return_code'] + . ' from ' . $outq['outq_posturl'],LOGGER_DEBUG); + update_queue_item($outq['outq_hash']); + } + return; + +} + + + +function gnusoc_remote_follow($channel,$xchan) { + + + $slap = replace_macros(get_markup_template('follow_slap.tpl','addon/gnusoc/'),array( + '$name' => xmlify($channel['channel_name']), + '$nick' => xmlify($channel['channel_address']), + '$profile_page' => xmlify(z_root() . '/channel/' . $channel['channel_address']), + '$thumb' => xmlify($channel['xchan_photo_l']), + '$item_id' => z_root() . '/display/' . xmlify(random_string()), + '$title' => xmlify(t('Follow')), + '$published' => datetime_convert('UTC','UTC','now',ATOM_TIME), + '$type' => 'html', + '$content' => xmlify(sprintf( t('%1$s is now following %2$s'),$channel['channel_name'],$xchan['xchan_name'])), + '$remote_profile' => xmlify($xchan['xchan_url']), + '$remote_photo' => xmlify($xchan['xchan_photo_l']), + '$remote_thumb' => xmlify($xchan['xchan_photo_m']), + '$remote_nick' => xmlify(substr($xchan['xchan_addr'],0,strpos($xchan['xchan_addr'],'@'))), + '$remote_name' => xmlify($xchan['xchan_name']), + '$verb' => xmlify(ACTIVITY_FOLLOW), + '$ostat_follow' => '' + )); + + + logger('follow xml: ' . $slap, LOGGER_DATA); + + $deliver = ''; + + $y = q("select * from hubloc where hubloc_hash = '%s'", + dbesc($xchan['xchan_hash']) + ); + + + if($y) { + $deliver = slapper($channel,$y[0]['hubloc_callback'],$slap); + } + + return $deliver; +} + +function gnusoc_permissions_create(&$a,&$b) { + if($b['recipient']['xchan_network'] === 'gnusoc') { + $b['deliveries'] = gnusoc_remote_follow($b['sender'],$b['recipient']); + if($b['deliveries']) + $b['success'] = 1; + } +} + + + + +function gnusoc_notifier_process(&$a,&$b) { + + logger('notifier process gnusoc'); + + if(! ($b['normal_mode'] || $b['relay_to_owner'])) + return; + + if($b['private'] || $b['packet_type'] || $b['mail']) + return; + + if($b['target_item']['public_policy']) { + logger('non-public post'); + return; + } + + if($b['top_level_post']) { + // should have been processed by pubsubhubub + logger('not a comment'); + return; + } + + + $channel = $b['channel']; + + if(! perm_is_allowed($channel['channel_id'],'','view_stream')) + return; + + // find gnusoc subscribers following this $owner + + $r = q("select * from abook left join hubloc on abook_xchan = hubloc_hash where hubloc_network = 'gnusoc' and abook_channel = %d", + intval($channel['channel_id']) + ); + if(! $r) + return; + + $recips = array(); + foreach($r as $rr) { + if(perm_is_allowed($channel['channel_id'],$rr['hubloc_hash'],'view_stream')) + $recips[] = $rr['hubloc_hash']; + + } + + if(! $recips) + return; + + $slap = get_atom_entry($target_item,'html',null,null,false); + + $slap = str_replace('','',$slap); + + + foreach($recips as $recip) { + $h = slapper($channel,$recip['hubloc_callback'],$slap); + $b['queued'][] = $h; + } +} + + + +function gnusoc_follow_from_feed(&$a,&$b) { + + $item = $b['item']; + $importer = $b['channel']; + $xchan = $b['xchan']; + $author = $b['author']; + + $b['caught'] = true; + + logger('follow activity received'); + + if(($author) && (! $xchan)) { + + $r = q("select * from xchan where xchan_guid = '%s' limit 1", + dbesc($author['author_link']) + ); + if(! $r) { + if(discover_by_webbie($author['author_link'])) { + $r = q("select * from xchan where xchan_guid = '%s' limit 1", + dbesc($author['author_link']) + ); + if(! $r) { + logger('discovery failed'); + return; + } + } + $xchan = $r[0]; + } + + $r = q("select * from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + intval($importer['channel_id']), + dbesc($xchan['xchan_hash']) + ); + + if($r) { + $contact = $r[0]; + $newperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; + + $abook_instance = $contact['abook_instance']; + if($abook_instance) + $abook_instance .= ','; + $abook_instance .= z_root(); + + + $r = q("update abook set abook_their_perms = %d, abook_instance = '%s' where abook_id = %d and abook_channel = %d", + intval($newperms), + dbesc($abook_instance), + intval($contact['abook_id']), + intval($importer['channel_id']) + ); + } + else { + $role = get_pconfig($importer['channel_id'],'system','permissions_role'); + if($role) { + $x = get_role_perms($role); + if($x['perms_auto']) + $default_perms = $x['perms_accept']; + } + if(! $default_perms) + $default_perms = intval(get_pconfig($importer['channel_id'],'system','autoperms')); + + $their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; + + + $closeness = get_pconfig($importer['channel_id'],'system','new_abook_closeness'); + if($closeness === false) + $closeness = 80; + + + $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_created, abook_updated, abook_connected, abook_dob, abook_pending, abook_instance ) values ( %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', %d, '%s' )", + intval($importer['channel_account_id']), + intval($importer['channel_id']), + dbesc($xchan['xchan_hash']), + intval($default_perms), + intval($their_perms), + intval($closeness), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(NULL_DATE), + intval(($default_perms) ? 0 : 1), + dbesc(z_root()) + ); + if($r) { + logger("New GNU-Social follower received for {$importer['channel_name']}"); + + $new_connection = q("select * from abook left join xchan on abook_xchan = xchan_hash left join hubloc on hubloc_hash = xchan_hash where abook_channel = %d and abook_xchan = '%s' order by abook_created desc limit 1", + intval($importer['channel_id']), + dbesc($xchan['xchan_hash']) + ); + + if($new_connection) { + require_once('include/enotify.php'); + notification(array( + 'type' => NOTIFY_INTRO, + 'from_xchan' => $xchan['xchan_hash'], + 'to_xchan' => $importer['channel_hash'], + 'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'], + )); + + if($default_perms) { + // Send back a sharing notification to them + $deliver = gnusoc_remote_follow($importer,$new_connection[0]); + if($deliver) + proc_run('php','include/deliver.php',$deliver); + + } + + $clone = array(); + foreach($new_connection[0] as $k => $v) { + if(strpos($k,'abook_') === 0) { + $clone[$k] = $v; + } + } + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + $abconfig = load_abconfig($importer['channel_hash'],$clone['abook_xchan']); + + if($abconfig) + $clone['abconfig'] = $abconfig; + + build_sync_packet($importer['channel_id'], array('abook' => array($clone))); + + } + } + } + + return; + } + +} + diff --git a/sources/addons/gnusoc/salmon.php b/sources/addons/gnusoc/salmon.php index 11bf4184..e5cca8d7 100644 --- a/sources/addons/gnusoc/salmon.php +++ b/sources/addons/gnusoc/salmon.php @@ -1,32 +1,41 @@ = 400) - $err = 'Error'; - if($val >= 200 && $val < 300) - $err = 'OK'; - - logger('mod-salmon returns ' . $val); - header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err); - killme(); - +if(defined('SALMON_TEST')) { + function salmon_init(&$a) { + $testing = ((argc() > 1 && argv(1) === 'test') ? true : false); + if($testing) { + App::$data['salmon_test'] = true; + salmon_post($a); + } + } } function salmon_post(&$a) { - $xml = file_get_contents('php://input'); + $sys_disabled = true; + if(! get_config('system','disable_discover_tab')) { + $sys_disabled = get_config('system','disable_diaspora_discover_tab'); + } + $sys = (($sys_disabled) ? null : get_sys_channel()); + + if(App::$data['salmon_test']) { + $xml = file_get_contents('test.xml'); + App::$argv[1] = 'gnusoc'; + } + else { + $xml = file_get_contents('php://input'); + } + logger('mod-salmon: new salmon ' . $xml, LOGGER_DATA); $nick = ((argc() > 1) ? trim(argv(1)) : ''); -// $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false); +// $mentions = ((App::$argc > 2 && App::$argv[2] === 'mention') ? true : false); $importer = channelx_by_nick($nick); @@ -59,9 +68,13 @@ function salmon_post(&$a) { // Stash the signature away for now. We have to find their key or it won't be good for anything. + logger('sig: ' . $base->sig); $signature = base64url_decode($base->sig); + logger('sig: ' . $base->sig . ' decoded length: ' . strlen($signature)); + + // unpack the data // strip whitespace so our data element will return to one big base64 blob @@ -80,7 +93,7 @@ function salmon_post(&$a) { $stnet_signed_data = $data; - $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); + $signed_data = $data . '.' . base64url_encode($type, false) . '.' . base64url_encode($encoding, false) . '.' . base64url_encode($alg, false); $compliant_format = str_replace('=','',$signed_data); @@ -102,6 +115,7 @@ function salmon_post(&$a) { $datarray = process_salmon_feed($data,$importer); $author_link = $datarray['author']['author_link']; + $item = $datarray['item']; if(! $author_link) { logger('mod-salmon: Could not retrieve author URI.'); @@ -121,30 +135,26 @@ function salmon_post(&$a) { logger('mod-salmon: Fetching key for ' . $author_link); - $key = get_salmon_key($author_link,$keyhash); + $pubkey = get_salmon_key($author_link,$keyhash); - if(! $key) { + if(! $pubkey) { logger('mod-salmon: Could not retrieve author key.'); http_status_exit(400); } - $key_info = explode('.',$key); + logger('mod-salmon: key details: ' . print_r($pubkey,true), LOGGER_DEBUG); - $m = base64url_decode($key_info[1]); - $e = base64url_decode($key_info[2]); - - logger('mod-salmon: key details: ' . print_r($key_info,true), LOGGER_DEBUG); - - $pubkey = metopem($m,$e); } + $pubkey = rtrim($pubkey); + // We should have everything we need now. Let's see if it verifies. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + $verify = rsa_verify($signed_data,$signature,$pubkey); if(! $verify) { logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); - $verify = rsa_verify($signed_data,$signature,$pubkey); + $verify = rsa_verify($compliant_format,$signature,$pubkey); } if(! $verify) { @@ -159,10 +169,9 @@ function salmon_post(&$a) { logger('mod-salmon: Message verified.'); - /* lookup the author */ - if(! $datarray['author']['author_link']) + if(! $datarray['author']['author_link']) { logger('unable to probe - no author identifier'); http_status_exit(400); } @@ -172,12 +181,13 @@ function salmon_post(&$a) { ); if(! $r) { if(discover_by_webbie($datarray['author']['author_link'])) { - $r = q("select xchan_hash from xchan where xchan_guid = '%s' limit 1", - dbesc($datarray['author']['author_link']) - ); - if(! $r) { - logger('discovery failed'); - http_status_exit(400); + $r = q("select * from xchan where xchan_guid = '%s' limit 1", + dbesc($datarray['author']['author_link']) + ); + if(! $r) { + logger('discovery failed'); + http_status_exit(400); + } } } @@ -192,196 +202,135 @@ function salmon_post(&$a) { // First check for and process follow activity - if(activity_match($datarray['verb'],ACTIVITY_FOLLOW) && $datarray['obj_type'] === ACTIVITY_OBJ_PERSON) { - - $r = q("select * from abook where abook_channel = %d and abook_hash = '%s' limit 1", - intval($importer['channel_id']), - dbesc($xchan['xchan_hash']) - ); - - if($r) { - $contact = $r[0]; - $newperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; - - $abook_instance = $contact['abook_instance']; - if($abook_instance) - $abook_instance .= ','; - $abook_instance .= z_root(); - - - $r = q("update abook set abook_their_perms = %d, abook_instance = '%s' where abook_id = %d and abook_channel = %d", - intval($newperms), - dbesc($abook_instance), - intval($contact['abook_id']), - intval($importer['channel_id']) - ); - } - else { - $role = get_pconfig($importer['channel_id'],'system','permissions_role'); - if($role) { - $x = get_role_perms($role); - if($x['perms_auto']) - $default_perms = $x['perms_accept']; - } - if(! $default_perms) - $default_perms = intval(get_pconfig($importer['channel_id'],'system','autoperms')); - - $their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; - - - $closeness = get_pconfig($importer['channel_id'],'system','new_abook_closeness'); - if($closeness === false) - $closeness = 80; - - - $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_created, abook_updated, abook_connected, abook_dob, abook_pending, abook_instance ) values ( %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', %d, '%s' )", - intval($importer['channel_account_id']), - intval($importer['channel_id']), - dbesc($contact['xchan_hash']), - intval($default_perms), - intval($their_perms), - intval($closeness), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(NULL_DATE), - intval(($default_perms) ? 0 : 1), - dbesc(z_root()) - ); - if($r) { - logger("New GNU-Social follower received for {$importer['channel_name']}"); - - $new_connection = q("select * from abook left join xchan on abook_xchan = xchan_hash left join hubloc on hubloc_hash = xchan_hash where abook_channel = %d and abook_xchan = '%s' order by abook_created desc limit 1", - intval($importer['channel_id']), - dbesc($xchan['xchan_hash']) - ); - - if($new_connection) { - require_once('include/enotify.php'); - notification(array( - 'type' => NOTIFY_INTRO, - 'from_xchan' => $xchan['xchan_hash'], - 'to_xchan' => $importer['channel_hash'], - 'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'], - )); - - if($default_perms) { -// @fixme!!! - // Send back a sharing notification to them - $x = gnusoc_follow($importer,$new_connection[0]); - if($x) - proc_run('php','include/deliver.php',$x); - - } - - $clone = array(); - foreach($new_connection[0] as $k => $v) { - if(strpos($k,'abook_') === 0) { - $clone[$k] = $v; - } - } - unset($clone['abook_id']); - unset($clone['abook_account']); - unset($clone['abook_channel']); - - $abconfig = load_abconfig($importer['channel_hash'],$clone['abook_xchan']); - - if($abconfig) - $clone['abconfig'] = $abconfig; - - build_sync_packet($importer['channel_id'], array('abook' => array($clone))); - - } + if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['obj_type'] === ACTIVITY_OBJ_PERSON) { + $cb = array('item' => $item,'channel' => $importer, 'xchan' => $xchan, 'author' => $datarray['author'], 'caught' => false); + call_hooks('follow_from_feed',$cb); + if($cb['caught']) http_status_exit(200); + + } + + + $m = parse_url($xchan['xchan_url']); + if($m) { + $host = $m['scheme'] . '://' . $m['host']; + + q("update site set site_dead = 0, site_update = '%s' where site_type = %d and site_url = '%s'", + dbesc(datetime_convert()), + intval(SITE_TYPE_NOTZOT), + dbesc($url) + ); + if(! check_siteallowed($host)) { + logger('blacklisted site: ' . $host); + http_status_exit(403, 'permission denied.'); } } - } - // - // ... fixme - - // Otherwise check general permissions - - if(! perm_is_allowed($importer['channel_id'],$xchan['xchan_hash'],'send_stream')) { - - // check for and process ostatus autofriend - - - // ... fixme - - - - // otherwise - - logger('mod-salmon: Ignoring this author.'); - http_status_exit(202); - // NOTREACHED + $importer_arr = array($importer); + if(! $sys_disabled) { + $sys['system'] = true; + $importer_arr[] = $sys; } unset($datarray['author']); - $parent_item = null; - if($datarray['parent_mid']) { - $r = q("select * from item where mid = '%s' and uid = %d limit 1", - dbesc($datarray['parent_mid']), - intval($importer['channel_id']) - ); - if(! $r) { - logger('mod-salmon: parent item not found.'); - http_status_exit(202); + // we will only set and return the status code for operations + // on an importer channel and not for the sys channel + + $status = 200; + + foreach($importer_arr as $importer) { + + if(! $importer['system']) { + $allowed = get_pconfig($importer['channel_id'],'system','gnusoc_allowed'); + if(! intval($allowed)) { + logger('mod-salmon: disallowed for channel ' . $importer['channel_name']); + $status = 202; + continue; + } + } + + + // Otherwise check general permissions + + if((! perm_is_allowed($importer['channel_id'],$xchan['xchan_hash'],'send_stream')) && (! $importer['system'])) { + + // check for and process ostatus autofriend + + + // ... fixme + + // otherwise + + logger('mod-salmon: Ignoring this author.'); + $status = 202; + continue; + } + + + $parent_item = null; + if($item['parent_mid']) { + $r = q("select * from item where mid = '%s' and uid = %d limit 1", + dbesc($item['parent_mid']), + intval($importer['channel_id']) + ); + if(! $r) { + logger('mod-salmon: parent item not found.'); + if(! $importer['system']) + $status = 202; + continue; + } + $parent_item = $r[0]; } - $parent_item = $r[0]; - } + if(! $item['author_xchan']) + $item['author_xchan'] = $xchan['xchan_hash']; + + $item['owner_xchan'] = (($parent_item) ? $parent_item['owner_xchan'] : $xchan['xchan_hash']); - if(! $datarray['author_xchan']) - $datarray['author_xchan'] = $xchan['xchan_hash']; - - $datarray['owner_xchan'] = (($parent_item) ? $parent_item['owner_xchan'] : $xchan['xchan_hash']); + $r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", + dbesc($item['mid']), + intval($importer['channel_id']) + ); + // Update content if 'updated' changes + // currently a no-op @fixme - $r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", - dbesc($datarray['mid']), - intval($importer['channel_id']) - ); + if($r) { + if((x($item,'edited') !== false) + && (datetime_convert('UTC','UTC',$item['edited']) !== $r[0]['edited'])) { + // do not accept (ignore) an earlier edit than one we currently have. + if(datetime_convert('UTC','UTC',$item['edited']) > $r[0]['edited']) + update_feed_item($importer['channel_id'],$item); + } + if(! $importer['system']) + $status = 200; + continue; + } + if(! $item['parent_mid']) + $item['parent_mid'] = $item['mid']; + + $item['aid'] = $importer['channel_account_id']; + $item['uid'] = $importer['channel_id']; - // Update content if 'updated' changes - // currently a no-op @fixme + logger('consume_feed: ' . print_r($item,true),LOGGER_DATA); + + $xx = item_store($item); + $r = $xx['item_id']; + + if(! $importer['system']) + $status = 200; + continue; - if($r) { - if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { - // do not accept (ignore) an earlier edit than one we currently have. - if(datetime_convert('UTC','UTC',$datarray['edited']) > $r[0]['edited']) - update_feed_item($importer['channel_id'],$datarray); - } - http_status_exit(200); } - if(! $datarray['parent_mid']) - $datarray['parent_mid'] = $datarray['mid']; - - $datarray['aid'] = $importer['channel_account_id']; - $datarray['uid'] = $importer['channel_id']; - - logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA); - - $xx = item_store($datarray); - $r = $xx['item_id']; - -// if this is a reply, do a relay? - - http_status_exit(200); + http_status_exit($status); + } - -function gnusoc_follow($importer,$xchan) { - - - -} \ No newline at end of file diff --git a/sources/addons/gnusoc/view/tpl/follow_slap.tpl b/sources/addons/gnusoc/view/tpl/follow_slap.tpl new file mode 100644 index 00000000..4acaea06 --- /dev/null +++ b/sources/addons/gnusoc/view/tpl/follow_slap.tpl @@ -0,0 +1,27 @@ + + + + {{$name}} + {{$profile_page}} + + + {{$nick}} + {{$name}} + + + {{$item_id}} + {{$title}} + {{$published}} + {{$content}} + {{$verb}} + + + http://activitystrea.ms/schema/1.0/person + {{$remote_profile}} + {{$remote_name}} + + + {{$remote_nick}} + {{$remote_name}} + + diff --git a/sources/addons/gnusoc/view/tpl/magicsig.tpl b/sources/addons/gnusoc/view/tpl/magicsig.tpl new file mode 100644 index 00000000..78d8bbbd --- /dev/null +++ b/sources/addons/gnusoc/view/tpl/magicsig.tpl @@ -0,0 +1,9 @@ + + + +{{$data}} + +{{$encoding}} +{{$algorithm}} +{{$signature}} + diff --git a/sources/addons/hubwall/hubwall.php b/sources/addons/hubwall/hubwall.php index 6c459436..46f622b9 100644 --- a/sources/addons/hubwall/hubwall.php +++ b/sources/addons/hubwall/hubwall.php @@ -3,18 +3,29 @@ /** * * Name: Hubwall - * Description: Send admin email message to all account holders + * Description: Send admin email message to all account holders. ->send now!<- * Version: 1.0 * Author: Mike Macgirvin * Maintainer: none */ + + + require_once('include/enotify.php'); function hubwall_module() {} +function hubwall_plugin_admin(&$a, &$o) { + + $o = '
    ' . t('Send email to all members') . '
'; + +} + + + function hubwall_post(&$a) { if(! is_site_admin()) return; @@ -24,7 +35,7 @@ function hubwall_post(&$a) { return; $sender_name = t('Hub Administrator'); - $sender_email = 'sys@' . $a->get_hostname(); + $sender_email = 'sys@' . App::get_hostname(); $subject = $_REQUEST['subject']; @@ -44,7 +55,7 @@ function hubwall_post(&$a) { notice( t('No recipients found.') . EOL); return; } - + foreach($recips as $recip) { @@ -77,4 +88,4 @@ function hubwall_content(&$a) { return $o; -} \ No newline at end of file +} diff --git a/sources/addons/ijpost/ijpost.php b/sources/addons/ijpost/ijpost.php index 1499ca18..390ee33c 100644 --- a/sources/addons/ijpost/ijpost.php +++ b/sources/addons/ijpost/ijpost.php @@ -51,7 +51,7 @@ function ijpost_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ diff --git a/sources/addons/ijpost/lang/ca/strings.php b/sources/addons/ijpost/lang/ca/strings.php index b5382615..4b591c37 100644 --- a/sources/addons/ijpost/lang/ca/strings.php +++ b/sources/addons/ijpost/lang/ca/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Enviament a Insanejournal"; -$a->strings["InsaneJournal Post Settings"] = "Ajustos d'Enviament a Insanejournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Habilita el Plugin d'Enviaments a Insanejournal"; -$a->strings["InsaneJournal username"] = "Nom d'usuari de Insanejournal"; -$a->strings["InsaneJournal password"] = "Contrasenya de Insanejournal"; -$a->strings["Post to InsaneJournal by default"] = "Enviar per defecte a Insanejournal"; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to Insanejournal"] = "Enviament a Insanejournal"; +App::$strings["InsaneJournal Post Settings"] = "Ajustos d'Enviament a Insanejournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Habilita el Plugin d'Enviaments a Insanejournal"; +App::$strings["InsaneJournal username"] = "Nom d'usuari de Insanejournal"; +App::$strings["InsaneJournal password"] = "Contrasenya de Insanejournal"; +App::$strings["Post to InsaneJournal by default"] = "Enviar per defecte a Insanejournal"; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/ijpost/lang/cs/strings.php b/sources/addons/ijpost/lang/cs/strings.php index 8e40419a..6e8efd6f 100644 --- a/sources/addons/ijpost/lang/cs/strings.php +++ b/sources/addons/ijpost/lang/cs/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Odeslat na Insanejournal"; -$a->strings["InsaneJournal Post Settings"] = "Nastavení příspěvků pro InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Povolit Insanejournal plugin"; -$a->strings["InsaneJournal username"] = "Insanejournal uživatelské jméno"; -$a->strings["InsaneJournal password"] = "Insanejournal heslo"; -$a->strings["Post to InsaneJournal by default"] = "Defaultně zasílat příspěvky na InsaneJournal"; -$a->strings["Submit"] = "Odeslat"; +App::$strings["Post to Insanejournal"] = "Odeslat na Insanejournal"; +App::$strings["InsaneJournal Post Settings"] = "Nastavení příspěvků pro InsaneJournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Povolit Insanejournal plugin"; +App::$strings["InsaneJournal username"] = "Insanejournal uživatelské jméno"; +App::$strings["InsaneJournal password"] = "Insanejournal heslo"; +App::$strings["Post to InsaneJournal by default"] = "Defaultně zasílat příspěvky na InsaneJournal"; +App::$strings["Submit"] = "Odeslat"; diff --git a/sources/addons/ijpost/lang/de/strings.php b/sources/addons/ijpost/lang/de/strings.php index 319a9743..fae90780 100644 --- a/sources/addons/ijpost/lang/de/strings.php +++ b/sources/addons/ijpost/lang/de/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Auf InsaneJournal posten."; -$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen"; -$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren"; -$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername"; -$a->strings["InsaneJournal password"] = "InsaneJournal Passwort"; -$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten."; -$a->strings["Submit"] = "Senden"; +App::$strings["Post to Insanejournal"] = "Auf InsaneJournal posten."; +App::$strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen"; +App::$strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren"; +App::$strings["InsaneJournal username"] = "InsaneJournal Benutzername"; +App::$strings["InsaneJournal password"] = "InsaneJournal Passwort"; +App::$strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten."; +App::$strings["Submit"] = "Senden"; diff --git a/sources/addons/ijpost/lang/eo/strings.php b/sources/addons/ijpost/lang/eo/strings.php index 11698887..feabb525 100644 --- a/sources/addons/ijpost/lang/eo/strings.php +++ b/sources/addons/ijpost/lang/eo/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Afiŝi al Insanejournal"; -$a->strings["InsaneJournal Post Settings"] = "Agordoj pri Insaenejournal Afiŝoj"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Ŝalti la InsaneJournal afiŝo kromprogramon."; -$a->strings["InsaneJournal username"] = "Salutnomo ĉe InsaneJournal"; -$a->strings["InsaneJournal password"] = "Pasvorto ĉe InsaneJournal"; -$a->strings["Post to InsaneJournal by default"] = "Defaŭlte afiŝi ĉe InsaneJournal"; -$a->strings["Submit"] = "Sendi"; +App::$strings["Post to Insanejournal"] = "Afiŝi al Insanejournal"; +App::$strings["InsaneJournal Post Settings"] = "Agordoj pri Insaenejournal Afiŝoj"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Ŝalti la InsaneJournal afiŝo kromprogramon."; +App::$strings["InsaneJournal username"] = "Salutnomo ĉe InsaneJournal"; +App::$strings["InsaneJournal password"] = "Pasvorto ĉe InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Defaŭlte afiŝi ĉe InsaneJournal"; +App::$strings["Submit"] = "Sendi"; diff --git a/sources/addons/ijpost/lang/es/strings.php b/sources/addons/ijpost/lang/es/strings.php index 4468be83..60db1d7f 100644 --- a/sources/addons/ijpost/lang/es/strings.php +++ b/sources/addons/ijpost/lang/es/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Publicar en Insanejournal"; -$a->strings["InsaneJournal Post Settings"] = "Configuración de publicación en Insanejournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Activar el módulo de publicación en Insanejournal"; -$a->strings["InsaneJournal username"] = "Nombre de usuario de Insanejournal"; -$a->strings["InsaneJournal password"] = "Contraseña de Insanejournal"; -$a->strings["Post to InsaneJournal by default"] = "Publicar en Insanejournal por defecto"; -$a->strings["Submit"] = "Envíar"; +App::$strings["Post to Insanejournal"] = "Publicar en Insanejournal"; +App::$strings["InsaneJournal Post Settings"] = "Configuración de publicación en Insanejournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Activar el módulo de publicación en Insanejournal"; +App::$strings["InsaneJournal username"] = "Nombre de usuario de Insanejournal"; +App::$strings["InsaneJournal password"] = "Contraseña de Insanejournal"; +App::$strings["Post to InsaneJournal by default"] = "Publicar en Insanejournal por defecto"; +App::$strings["Submit"] = "Envíar"; diff --git a/sources/addons/ijpost/lang/fr/strings.php b/sources/addons/ijpost/lang/fr/strings.php index 7db58ccf..0c781790 100644 --- a/sources/addons/ijpost/lang/fr/strings.php +++ b/sources/addons/ijpost/lang/fr/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Publier vers InsaneJournal"; -$a->strings["InsaneJournal Post Settings"] = "Réglages InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Activer le connecteur InsaneJournal"; -$a->strings["InsaneJournal username"] = "Utilisateur InsaneJournal"; -$a->strings["InsaneJournal password"] = "Mot de passe InsaneJournal"; -$a->strings["Post to InsaneJournal by default"] = "Publier sur InsaneJournal par défaut"; -$a->strings["Submit"] = "Envoyer"; +App::$strings["Post to Insanejournal"] = "Publier vers InsaneJournal"; +App::$strings["InsaneJournal Post Settings"] = "Réglages InsaneJournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Activer le connecteur InsaneJournal"; +App::$strings["InsaneJournal username"] = "Utilisateur InsaneJournal"; +App::$strings["InsaneJournal password"] = "Mot de passe InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Publier sur InsaneJournal par défaut"; +App::$strings["Submit"] = "Envoyer"; diff --git a/sources/addons/ijpost/lang/is/strings.php b/sources/addons/ijpost/lang/is/strings.php index b79f347e..7d6eee15 100644 --- a/sources/addons/ijpost/lang/is/strings.php +++ b/sources/addons/ijpost/lang/is/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = ""; -$a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = ""; -$a->strings["InsaneJournal username"] = ""; -$a->strings["InsaneJournal password"] = ""; -$a->strings["Post to InsaneJournal by default"] = ""; -$a->strings["Submit"] = "Senda inn"; +App::$strings["Post to Insanejournal"] = ""; +App::$strings["InsaneJournal Post Settings"] = ""; +App::$strings["Enable InsaneJournal Post Plugin"] = ""; +App::$strings["InsaneJournal username"] = ""; +App::$strings["InsaneJournal password"] = ""; +App::$strings["Post to InsaneJournal by default"] = ""; +App::$strings["Submit"] = "Senda inn"; diff --git a/sources/addons/ijpost/lang/it/strings.php b/sources/addons/ijpost/lang/it/strings.php index f82132ce..ac06ed4c 100644 --- a/sources/addons/ijpost/lang/it/strings.php +++ b/sources/addons/ijpost/lang/it/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Invia a Insanejournal"; -$a->strings["InsaneJournal Post Settings"] = "Impostazioni Invio a InsaneJournal "; -$a->strings["Enable InsaneJournal Post Plugin"] = "Abilita il plugin Invio a InsaneJournal"; -$a->strings["InsaneJournal username"] = "Nome utente InsaneJournal"; -$a->strings["InsaneJournal password"] = "Password InsaneJournal"; -$a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal"; -$a->strings["Submit"] = "Invia"; +App::$strings["Post to Insanejournal"] = "Invia a Insanejournal"; +App::$strings["InsaneJournal Post Settings"] = "Impostazioni Invio a InsaneJournal "; +App::$strings["Enable InsaneJournal Post Plugin"] = "Abilita il plugin Invio a InsaneJournal"; +App::$strings["InsaneJournal username"] = "Nome utente InsaneJournal"; +App::$strings["InsaneJournal password"] = "Password InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal"; +App::$strings["Submit"] = "Invia"; diff --git a/sources/addons/ijpost/lang/nb-no/strings.php b/sources/addons/ijpost/lang/nb-no/strings.php index 2eaa62e3..3d3f959e 100644 --- a/sources/addons/ijpost/lang/nb-no/strings.php +++ b/sources/addons/ijpost/lang/nb-no/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = ""; -$a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = ""; -$a->strings["InsaneJournal username"] = ""; -$a->strings["InsaneJournal password"] = ""; -$a->strings["Post to InsaneJournal by default"] = ""; -$a->strings["Submit"] = "Lagre"; +App::$strings["Post to Insanejournal"] = ""; +App::$strings["InsaneJournal Post Settings"] = ""; +App::$strings["Enable InsaneJournal Post Plugin"] = ""; +App::$strings["InsaneJournal username"] = ""; +App::$strings["InsaneJournal password"] = ""; +App::$strings["Post to InsaneJournal by default"] = ""; +App::$strings["Submit"] = "Lagre"; diff --git a/sources/addons/ijpost/lang/nl/strings.php b/sources/addons/ijpost/lang/nl/strings.php index 65c534b4..216c9646 100644 --- a/sources/addons/ijpost/lang/nl/strings.php +++ b/sources/addons/ijpost/lang/nl/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Doorplaatsen naar InsaneJournal"; -$a->strings["InsaneJournal Post Settings"] = "InsaneJournal (berichten doorplaatsen)"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Doorplaatsen naar InsaneJournal inschakelen"; -$a->strings["InsaneJournal username"] = "Gebruikersnaam InsaneJournal"; -$a->strings["InsaneJournal password"] = "Wachtwoord InsaneJournal"; -$a->strings["Post to InsaneJournal by default"] = "Berichten standaard naar InsaneJournal doorplaatsen"; -$a->strings["Submit"] = "Opslaan"; +App::$strings["Post to Insanejournal"] = "Doorplaatsen naar InsaneJournal"; +App::$strings["InsaneJournal Post Settings"] = "InsaneJournal (berichten doorplaatsen)"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Doorplaatsen naar InsaneJournal inschakelen"; +App::$strings["InsaneJournal username"] = "Gebruikersnaam InsaneJournal"; +App::$strings["InsaneJournal password"] = "Wachtwoord InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Berichten standaard naar InsaneJournal doorplaatsen"; +App::$strings["Submit"] = "Opslaan"; diff --git a/sources/addons/ijpost/lang/pl/strings.php b/sources/addons/ijpost/lang/pl/strings.php index 5b6ec674..c74aa67f 100644 --- a/sources/addons/ijpost/lang/pl/strings.php +++ b/sources/addons/ijpost/lang/pl/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Opublikuj na Insanejournal"; -$a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = ""; -$a->strings["InsaneJournal username"] = ""; -$a->strings["InsaneJournal password"] = ""; -$a->strings["Post to InsaneJournal by default"] = ""; -$a->strings["Submit"] = "Potwierdź"; +App::$strings["Post to Insanejournal"] = "Opublikuj na Insanejournal"; +App::$strings["InsaneJournal Post Settings"] = ""; +App::$strings["Enable InsaneJournal Post Plugin"] = ""; +App::$strings["InsaneJournal username"] = ""; +App::$strings["InsaneJournal password"] = ""; +App::$strings["Post to InsaneJournal by default"] = ""; +App::$strings["Submit"] = "Potwierdź"; diff --git a/sources/addons/ijpost/lang/pt-br/strings.php b/sources/addons/ijpost/lang/pt-br/strings.php index 4dce00fc..9c4091c3 100644 --- a/sources/addons/ijpost/lang/pt-br/strings.php +++ b/sources/addons/ijpost/lang/pt-br/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "Publicar no InsaneJournal"; -$a->strings["InsaneJournal Post Settings"] = "Configurações da publicação no InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Habilitar o plugin de publicação no InsaneJournal"; -$a->strings["InsaneJournal username"] = "Nome de usuário do InsaneJournal"; -$a->strings["InsaneJournal password"] = "Senha do InsaneJournal"; -$a->strings["Post to InsaneJournal by default"] = "Publicar no InsaneJournal por padrão"; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to Insanejournal"] = "Publicar no InsaneJournal"; +App::$strings["InsaneJournal Post Settings"] = "Configurações da publicação no InsaneJournal"; +App::$strings["Enable InsaneJournal Post Plugin"] = "Habilitar o plugin de publicação no InsaneJournal"; +App::$strings["InsaneJournal username"] = "Nome de usuário do InsaneJournal"; +App::$strings["InsaneJournal password"] = "Senha do InsaneJournal"; +App::$strings["Post to InsaneJournal by default"] = "Publicar no InsaneJournal por padrão"; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/ijpost/lang/ru/strings.php b/sources/addons/ijpost/lang/ru/strings.php index 0109f8a6..47167130 100644 --- a/sources/addons/ijpost/lang/ru/strings.php +++ b/sources/addons/ijpost/lang/ru/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = ""; -$a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = "Включить InsaneJournal плагин сообщений"; -$a->strings["InsaneJournal username"] = ""; -$a->strings["InsaneJournal password"] = ""; -$a->strings["Post to InsaneJournal by default"] = ""; -$a->strings["Submit"] = "Подтвердить"; +App::$strings["Post to Insanejournal"] = ""; +App::$strings["InsaneJournal Post Settings"] = ""; +App::$strings["Enable InsaneJournal Post Plugin"] = "Включить InsaneJournal плагин сообщений"; +App::$strings["InsaneJournal username"] = ""; +App::$strings["InsaneJournal password"] = ""; +App::$strings["Post to InsaneJournal by default"] = ""; +App::$strings["Submit"] = "Подтвердить"; diff --git a/sources/addons/ijpost/lang/sv/strings.php b/sources/addons/ijpost/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/ijpost/lang/sv/strings.php +++ b/sources/addons/ijpost/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/ijpost/lang/zh-cn/strings.php b/sources/addons/ijpost/lang/zh-cn/strings.php index f2a04712..594f1cab 100644 --- a/sources/addons/ijpost/lang/zh-cn/strings.php +++ b/sources/addons/ijpost/lang/zh-cn/strings.php @@ -1,9 +1,9 @@ strings["Post to Insanejournal"] = "转播到Insanejournal"; -$a->strings["InsaneJournal Post Settings"] = "Insanejournal转播设置"; -$a->strings["Enable InsaneJournal Post Plugin"] = "使InsaneJournal转播插件可用"; -$a->strings["InsaneJournal username"] = "InsaneJournal用户名"; -$a->strings["InsaneJournal password"] = "InsaneJournal密码"; -$a->strings["Post to InsaneJournal by default"] = "默认地转播到InsaneJournal"; -$a->strings["Submit"] = "提交"; +App::$strings["Post to Insanejournal"] = "转播到Insanejournal"; +App::$strings["InsaneJournal Post Settings"] = "Insanejournal转播设置"; +App::$strings["Enable InsaneJournal Post Plugin"] = "使InsaneJournal转播插件可用"; +App::$strings["InsaneJournal username"] = "InsaneJournal用户名"; +App::$strings["InsaneJournal password"] = "InsaneJournal密码"; +App::$strings["Post to InsaneJournal by default"] = "默认地转播到InsaneJournal"; +App::$strings["Submit"] = "提交"; diff --git a/sources/addons/irc/irc.php b/sources/addons/irc/irc.php index 3aca4a8d..d46c06ff 100644 --- a/sources/addons/irc/irc.php +++ b/sources/addons/irc/irc.php @@ -35,7 +35,7 @@ function irc_addon_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* setting popular channels, auto connect channels */ $sitechats = get_config('irc','sitechats'); /* popular channels */ @@ -82,7 +82,7 @@ return; function irc_content(&$a) { - $baseurl = $a->get_baseurl() . '/addon/irc'; + $baseurl = z_root() . '/addon/irc'; $o = ''; /* set the list of popular channels */ @@ -93,11 +93,11 @@ function irc_content(&$a) { $chats = array('hubzilla','friendica','chat','chatback','hottub','ircbar','dateroom','debian'); - $a->page['aside'] .= '

' . t('Popular Channels') . '

    '; + App::$page['aside'] .= '

    ' . t('Popular Channels') . '

    '; + App::$page['aside'] .= '
'; /* setting the channel(s) to auto connect */ $autochans = get_config('irc','autochans'); diff --git a/sources/addons/jappixmini/jappixmini.php b/sources/addons/jappixmini/jappixmini.php index dade1429..4cdecaad 100644 --- a/sources/addons/jappixmini/jappixmini.php +++ b/sources/addons/jappixmini/jappixmini.php @@ -274,7 +274,7 @@ function jappixmini_settings(&$a, &$s) { $server = get_config("jappixmini", "default_server"); if (($username == "") and get_config("jappixmini", "default_user")) - $username = $a->user["nickname"]; + $username = App::$user["nickname"]; $info_text = get_config("jappixmini", "infotext"); $info_text = htmlentities($info_text); @@ -297,9 +297,9 @@ function jappixmini_settings(&$a, &$s) { if (!$activate) { // load scripts if not yet activated so that password can be saved - $a->page['htmlhead'] .= ''."\r\n"; - $a->page['htmlhead'] .= ''."\r\n"; - $a->page['htmlhead'] .= ''."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; } $sc .= '
'; @@ -373,7 +373,7 @@ function jappixmini_settings(&$a, &$s) { '$content' => $sc )); - $a->page['htmlhead'] .= "'."\r\n"; - $a->page['htmlhead'] .= ''."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; - $a->page['htmlhead'] .= ''."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; $username = get_pconfig(local_channel(),'jappixmini','username'); $username = str_replace("'", "\\'", $username); @@ -514,7 +514,7 @@ function jappixmini_script(&$a,&$s) { // set proxy if necessary $use_proxy = get_config('jappixmini','bosh_proxy'); if ($use_proxy) { - $proxy = $a->get_baseurl().'/addon/jappixmini/proxy.php'; + $proxy = z_root().'/addon/jappixmini/proxy.php'; } else { $proxy = ""; @@ -555,7 +555,7 @@ function jappixmini_script(&$a,&$s) { } // add javascript to start Jappix Mini - $a->page['htmlhead'] .= "'."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; // for jappixmini_addon_set_client_secret - $a->page['htmlhead'] .= ''."\r\n"; + App::$page['htmlhead'] .= ''."\r\n"; // save hash of password $o = str_replace("
get_baseurl().'/addon/jappixmini/jappix/AUTHORS">Jappix authors and is distributed under the terms of the GNU Affero General Public License.

'; - $b .= '

You can download the source code of the addon. The rest of Hubzilla is distributed under compatible licenses and can be retrieved from https://github.com/friendica/red and https://github.com/friendica/red-addons

'; + $b .= '

This site uses the jappixmini addon, which includes Jappix Mini by the Jappix authors and is distributed under the terms of the GNU Affero General Public License.

'; + $b .= '

You can download the source code of the addon. The rest of Hubzilla is distributed under compatible licenses and can be retrieved from https://github.com/friendica/red and https://github.com/friendica/red-addons

'; } diff --git a/sources/addons/jappixmini/lang/ca/strings.php b/sources/addons/jappixmini/lang/ca/strings.php index 0f2924ff..53bd5490 100644 --- a/sources/addons/jappixmini/lang/ca/strings.php +++ b/sources/addons/jappixmini/lang/ca/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = ""; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Enviar"; -$a->strings["Add contact"] = ""; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = ""; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = ""; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Enviar"; +App::$strings["Add contact"] = ""; diff --git a/sources/addons/jappixmini/lang/cs/strings.php b/sources/addons/jappixmini/lang/cs/strings.php index 2be6042a..ddc669a9 100644 --- a/sources/addons/jappixmini/lang/cs/strings.php +++ b/sources/addons/jappixmini/lang/cs/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = "Nastavení rozšíření Jappix Mini"; -$a->strings["Activate addon"] = "Aktivovat rozšíření"; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Nevlkádejte Jappixmini Chat-Widget do webového rozhraní"; -$a->strings["Jabber username"] = "Jabber uživatelské jméno"; -$a->strings["Jabber server"] = "Jabber server"; -$a->strings["Jabber BOSH host"] = "Jabber BOSH host"; -$a->strings["Jabber password"] = "Jabber heslo"; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Zašifrovat Jabber heslo s heslem Friendica (doporučeno)"; -$a->strings["Friendica password"] = "Friendica heslo"; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek na členství od Friedica kontaktů."; -$a->strings["Subscribe to Friendica contacts automatically"] = "Automaticky zaslat požadavek na členství Friedica kontaktům."; -$a->strings["Purge internal list of jabber addresses of contacts"] = "Očistit interní seznam jabber adres kontaktů"; -$a->strings["Submit"] = "Odeslat"; -$a->strings["Add contact"] = "Přidat kontakt"; +App::$strings["Jappix Mini addon settings"] = "Nastavení rozšíření Jappix Mini"; +App::$strings["Activate addon"] = "Aktivovat rozšíření"; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Nevlkádejte Jappixmini Chat-Widget do webového rozhraní"; +App::$strings["Jabber username"] = "Jabber uživatelské jméno"; +App::$strings["Jabber server"] = "Jabber server"; +App::$strings["Jabber BOSH host"] = "Jabber BOSH host"; +App::$strings["Jabber password"] = "Jabber heslo"; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = "Zašifrovat Jabber heslo s heslem Friendica (doporučeno)"; +App::$strings["Friendica password"] = "Friendica heslo"; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek na členství od Friedica kontaktů."; +App::$strings["Subscribe to Friendica contacts automatically"] = "Automaticky zaslat požadavek na členství Friedica kontaktům."; +App::$strings["Purge internal list of jabber addresses of contacts"] = "Očistit interní seznam jabber adres kontaktů"; +App::$strings["Submit"] = "Odeslat"; +App::$strings["Add contact"] = "Přidat kontakt"; diff --git a/sources/addons/jappixmini/lang/de/strings.php b/sources/addons/jappixmini/lang/de/strings.php index 84cca16d..b93bf446 100644 --- a/sources/addons/jappixmini/lang/de/strings.php +++ b/sources/addons/jappixmini/lang/de/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = "Jappix Mini Addon Einstellungen"; -$a->strings["Activate addon"] = "Addon aktivieren"; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Füge das Jappix Mini Chat Widget nicht zum Webinterface hinzu"; -$a->strings["Jabber username"] = "Jabber Nutzername"; -$a->strings["Jabber server"] = "Jabber Server"; -$a->strings["Jabber BOSH host"] = "Jabber BOSH Host"; -$a->strings["Jabber password"] = "Japper Passwort"; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)"; -$a->strings["Friendica password"] = "Friendica Passwort"; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren"; -$a->strings["Subscribe to Friendica contacts automatically"] = "Automatisch Friendica Kontakten bei Jabber folgen"; -$a->strings["Purge internal list of jabber addresses of contacts"] = "Lösche die interne Liste der Jabber Adressen der Kontakte"; -$a->strings["Submit"] = "Senden"; -$a->strings["Add contact"] = "Kontakt hinzufügen"; +App::$strings["Jappix Mini addon settings"] = "Jappix Mini Addon Einstellungen"; +App::$strings["Activate addon"] = "Addon aktivieren"; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Füge das Jappix Mini Chat Widget nicht zum Webinterface hinzu"; +App::$strings["Jabber username"] = "Jabber Nutzername"; +App::$strings["Jabber server"] = "Jabber Server"; +App::$strings["Jabber BOSH host"] = "Jabber BOSH Host"; +App::$strings["Jabber password"] = "Japper Passwort"; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)"; +App::$strings["Friendica password"] = "Friendica Passwort"; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren"; +App::$strings["Subscribe to Friendica contacts automatically"] = "Automatisch Friendica Kontakten bei Jabber folgen"; +App::$strings["Purge internal list of jabber addresses of contacts"] = "Lösche die interne Liste der Jabber Adressen der Kontakte"; +App::$strings["Submit"] = "Senden"; +App::$strings["Add contact"] = "Kontakt hinzufügen"; diff --git a/sources/addons/jappixmini/lang/eo/strings.php b/sources/addons/jappixmini/lang/eo/strings.php index a2118546..0fbf8b7a 100644 --- a/sources/addons/jappixmini/lang/eo/strings.php +++ b/sources/addons/jappixmini/lang/eo/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = ""; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Sendi"; -$a->strings["Add contact"] = ""; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = ""; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = ""; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Sendi"; +App::$strings["Add contact"] = ""; diff --git a/sources/addons/jappixmini/lang/es/strings.php b/sources/addons/jappixmini/lang/es/strings.php index 9cc5b293..c1de0035 100644 --- a/sources/addons/jappixmini/lang/es/strings.php +++ b/sources/addons/jappixmini/lang/es/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = "Ajustes de complemento Jappix Mini"; -$a->strings["Activate addon"] = "Activar complemento"; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "No insertar la aplicación de chat Jappixmini en la interfaz web"; -$a->strings["Jabber username"] = "Nombre de usuario de Jabber"; -$a->strings["Jabber server"] = "Servidor de Jabber"; -$a->strings["Jabber BOSH host"] = "Anfitrión BOSH de Jabber"; -$a->strings["Jabber password"] = "Contraseña de Jabber"; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Encriptar contraseña de Jabber con la contraseña de Friendica (recomendado)"; -$a->strings["Friendica password"] = "Contraseña de Friendica"; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobar peticiones de suscripción de contactos de Friendica automáticamente"; -$a->strings["Subscribe to Friendica contacts automatically"] = "Suscribirse a contactos de Friendica automáticamente"; -$a->strings["Purge internal list of jabber addresses of contacts"] = "Purgar los contactos de la lista interna de direcciones de Jabber"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Add contact"] = "Añadir contacto"; +App::$strings["Jappix Mini addon settings"] = "Ajustes de complemento Jappix Mini"; +App::$strings["Activate addon"] = "Activar complemento"; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "No insertar la aplicación de chat Jappixmini en la interfaz web"; +App::$strings["Jabber username"] = "Nombre de usuario de Jabber"; +App::$strings["Jabber server"] = "Servidor de Jabber"; +App::$strings["Jabber BOSH host"] = "Anfitrión BOSH de Jabber"; +App::$strings["Jabber password"] = "Contraseña de Jabber"; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = "Encriptar contraseña de Jabber con la contraseña de Friendica (recomendado)"; +App::$strings["Friendica password"] = "Contraseña de Friendica"; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobar peticiones de suscripción de contactos de Friendica automáticamente"; +App::$strings["Subscribe to Friendica contacts automatically"] = "Suscribirse a contactos de Friendica automáticamente"; +App::$strings["Purge internal list of jabber addresses of contacts"] = "Purgar los contactos de la lista interna de direcciones de Jabber"; +App::$strings["Submit"] = "Envíar"; +App::$strings["Add contact"] = "Añadir contacto"; diff --git a/sources/addons/jappixmini/lang/fr/strings.php b/sources/addons/jappixmini/lang/fr/strings.php index 16c45bcd..87934042 100644 --- a/sources/addons/jappixmini/lang/fr/strings.php +++ b/sources/addons/jappixmini/lang/fr/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = "Jappix Mini"; -$a->strings["Activate addon"] = "Activer"; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Ne pas insérer le widget JappixMini dans l'interface web"; -$a->strings["Jabber username"] = "Utilisateur Jabber"; -$a->strings["Jabber server"] = "Serveur Jabber"; -$a->strings["Jabber BOSH host"] = "Hôte BOSH (proxy) Jabber"; -$a->strings["Jabber password"] = "Mot de passe Jabber"; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Chiffrer le mot de passe Jabber avec le mot de passe Friendica (recommandé)"; -$a->strings["Friendica password"] = "Mot de passe Friendica"; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Approuver les contacts Friendica automatiquement"; -$a->strings["Subscribe to Friendica contacts automatically"] = "S'inscrire aux contacts Friendica automatiquement"; -$a->strings["Purge internal list of jabber addresses of contacts"] = "Purger la liste interne d'adresses Jabber"; -$a->strings["Submit"] = "Envoyer"; -$a->strings["Add contact"] = "Ajouter un contact"; +App::$strings["Jappix Mini addon settings"] = "Jappix Mini"; +App::$strings["Activate addon"] = "Activer"; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Ne pas insérer le widget JappixMini dans l'interface web"; +App::$strings["Jabber username"] = "Utilisateur Jabber"; +App::$strings["Jabber server"] = "Serveur Jabber"; +App::$strings["Jabber BOSH host"] = "Hôte BOSH (proxy) Jabber"; +App::$strings["Jabber password"] = "Mot de passe Jabber"; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = "Chiffrer le mot de passe Jabber avec le mot de passe Friendica (recommandé)"; +App::$strings["Friendica password"] = "Mot de passe Friendica"; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = "Approuver les contacts Friendica automatiquement"; +App::$strings["Subscribe to Friendica contacts automatically"] = "S'inscrire aux contacts Friendica automatiquement"; +App::$strings["Purge internal list of jabber addresses of contacts"] = "Purger la liste interne d'adresses Jabber"; +App::$strings["Submit"] = "Envoyer"; +App::$strings["Add contact"] = "Ajouter un contact"; diff --git a/sources/addons/jappixmini/lang/is/strings.php b/sources/addons/jappixmini/lang/is/strings.php index 30e8f43e..3761c866 100644 --- a/sources/addons/jappixmini/lang/is/strings.php +++ b/sources/addons/jappixmini/lang/is/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = ""; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Senda inn"; -$a->strings["Add contact"] = ""; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = ""; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = ""; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Senda inn"; +App::$strings["Add contact"] = ""; diff --git a/sources/addons/jappixmini/lang/it/strings.php b/sources/addons/jappixmini/lang/it/strings.php index ed034c4e..82f5fa7f 100644 --- a/sources/addons/jappixmini/lang/it/strings.php +++ b/sources/addons/jappixmini/lang/it/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = ""; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Invia"; -$a->strings["Add contact"] = ""; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = ""; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = ""; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Invia"; +App::$strings["Add contact"] = ""; diff --git a/sources/addons/jappixmini/lang/nb-no/strings.php b/sources/addons/jappixmini/lang/nb-no/strings.php index bced0027..1d2b6a7c 100644 --- a/sources/addons/jappixmini/lang/nb-no/strings.php +++ b/sources/addons/jappixmini/lang/nb-no/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = ""; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Lagre"; -$a->strings["Add contact"] = ""; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = ""; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = ""; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Lagre"; +App::$strings["Add contact"] = ""; diff --git a/sources/addons/jappixmini/lang/pl/strings.php b/sources/addons/jappixmini/lang/pl/strings.php index 35f876d9..9641f53c 100644 --- a/sources/addons/jappixmini/lang/pl/strings.php +++ b/sources/addons/jappixmini/lang/pl/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = "Hasło Jabber"; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = "Hasło Friendica"; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Potwierdź"; -$a->strings["Add contact"] = "Dodaj kontakt"; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = "Hasło Jabber"; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = "Hasło Friendica"; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["Add contact"] = "Dodaj kontakt"; diff --git a/sources/addons/jappixmini/lang/pt-br/strings.php b/sources/addons/jappixmini/lang/pt-br/strings.php index 0f2924ff..53bd5490 100644 --- a/sources/addons/jappixmini/lang/pt-br/strings.php +++ b/sources/addons/jappixmini/lang/pt-br/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = ""; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Enviar"; -$a->strings["Add contact"] = ""; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = ""; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = ""; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Enviar"; +App::$strings["Add contact"] = ""; diff --git a/sources/addons/jappixmini/lang/ru/strings.php b/sources/addons/jappixmini/lang/ru/strings.php index e4d9c600..29d84a37 100644 --- a/sources/addons/jappixmini/lang/ru/strings.php +++ b/sources/addons/jappixmini/lang/ru/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = ""; -$a->strings["Activate addon"] = ""; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; -$a->strings["Jabber username"] = ""; -$a->strings["Jabber server"] = ""; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; -$a->strings["Friendica password"] = ""; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; -$a->strings["Purge internal list of jabber addresses of contacts"] = ""; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["Add contact"] = ""; +App::$strings["Jappix Mini addon settings"] = ""; +App::$strings["Activate addon"] = ""; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = ""; +App::$strings["Jabber username"] = ""; +App::$strings["Jabber server"] = ""; +App::$strings["Jabber BOSH host"] = ""; +App::$strings["Jabber password"] = ""; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +App::$strings["Friendica password"] = ""; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = ""; +App::$strings["Subscribe to Friendica contacts automatically"] = ""; +App::$strings["Purge internal list of jabber addresses of contacts"] = ""; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["Add contact"] = ""; diff --git a/sources/addons/jappixmini/lang/sv/strings.php b/sources/addons/jappixmini/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/jappixmini/lang/sv/strings.php +++ b/sources/addons/jappixmini/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/jappixmini/lang/zh-cn/strings.php b/sources/addons/jappixmini/lang/zh-cn/strings.php index 5b0c81fd..eb0b4103 100644 --- a/sources/addons/jappixmini/lang/zh-cn/strings.php +++ b/sources/addons/jappixmini/lang/zh-cn/strings.php @@ -1,16 +1,16 @@ strings["Jappix Mini addon settings"] = "Jappix Mini加件设置"; -$a->strings["Activate addon"] = "使加件可用"; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "别把Jappixmini聊小窗插入网用户界面"; -$a->strings["Jabber username"] = "Jabber用户名"; -$a->strings["Jabber server"] = "Jabber服务器"; -$a->strings["Jabber BOSH host"] = "Jabber BOSH主机"; -$a->strings["Jabber password"] = "Jabber密码"; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "把Jabber密码跟Friendica密码加密（推荐的）"; -$a->strings["Friendica password"] = "Friendica密码"; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = "自动地批准从Friendica熟人的订阅要求"; -$a->strings["Subscribe to Friendica contacts automatically"] = "自动地订阅Friendica熟人"; -$a->strings["Purge internal list of jabber addresses of contacts"] = "把熟人jabber地址从内部单"; -$a->strings["Submit"] = "提交"; -$a->strings["Add contact"] = "加熟人"; +App::$strings["Jappix Mini addon settings"] = "Jappix Mini加件设置"; +App::$strings["Activate addon"] = "使加件可用"; +App::$strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "别把Jappixmini聊小窗插入网用户界面"; +App::$strings["Jabber username"] = "Jabber用户名"; +App::$strings["Jabber server"] = "Jabber服务器"; +App::$strings["Jabber BOSH host"] = "Jabber BOSH主机"; +App::$strings["Jabber password"] = "Jabber密码"; +App::$strings["Encrypt Jabber password with Friendica password (recommended)"] = "把Jabber密码跟Friendica密码加密（推荐的）"; +App::$strings["Friendica password"] = "Friendica密码"; +App::$strings["Approve subscription requests from Friendica contacts automatically"] = "自动地批准从Friendica熟人的订阅要求"; +App::$strings["Subscribe to Friendica contacts automatically"] = "自动地订阅Friendica熟人"; +App::$strings["Purge internal list of jabber addresses of contacts"] = "把熟人jabber地址从内部单"; +App::$strings["Submit"] = "提交"; +App::$strings["Add contact"] = "加熟人"; diff --git a/sources/addons/js_upload/js_upload.php b/sources/addons/js_upload/js_upload.php index 7035e17a..16cc9a68 100755 --- a/sources/addons/js_upload/js_upload.php +++ b/sources/addons/js_upload/js_upload.php @@ -38,8 +38,8 @@ function js_upload_form(&$a,&$b) { $b['default_upload'] = false; - $b['addon_text'] .= ''; - $b['addon_text'] .= ''; + $b['addon_text'] .= ''; + $b['addon_text'] .= ''; $upload_msg = t('Upload a file'); $drop_msg = t('Drop files here to upload'); @@ -143,7 +143,7 @@ function js_upload_post_init(&$a,&$b) { if((! array_key_exists('source',$_REQUEST)) || ($_REQUEST['source'] != 'photos')) return; -// $a->data['upload_plugin'] = $b['source']; +// App::$data['upload_plugin'] = $b['source']; // list of valid extensions, ex. array("jpeg", "xml", "bmp") @@ -159,7 +159,7 @@ function js_upload_post_init(&$a,&$b) { // to pass data through iframe you will need to encode all html tags - $a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES); + App::$data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES); if(isset($result['error'])) { logger('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , 'LOGGER_DEBUG'); @@ -167,7 +167,7 @@ function js_upload_post_init(&$a,&$b) { killme(); } - $a->data['upload_result'] = $result; + App::$data['upload_result'] = $result; } @@ -176,7 +176,7 @@ function js_upload_post_file(&$a,&$b) { if((! array_key_exists('source',$_REQUEST)) || ($_REQUEST['source'] != 'photos')) return; - $result = $a->data['upload_result']; + $result = App::$data['upload_result']; $b['src'] = $result['path']; $b['filename'] = $result['filename']; @@ -190,8 +190,8 @@ function js_upload_post_end(&$a,&$b) { if((! array_key_exists('source',$_REQUEST)) || ($_REQUEST['source'] != 'photos')) return; - if(x($a->data,'upload_jsonresponse')) { - echo $a->data['upload_jsonresponse']; + if(x(App::$data,'upload_jsonresponse')) { + echo App::$data['upload_jsonresponse']; killme(); } diff --git a/sources/addons/js_upload/lang/ca/strings.php b/sources/addons/js_upload/lang/ca/strings.php index 85b403f9..6feb8b7a 100644 --- a/sources/addons/js_upload/lang/ca/strings.php +++ b/sources/addons/js_upload/lang/ca/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Carrega un arxiu"; -$a->strings["Drop files here to upload"] = "Deixa aquí el arxiu a carregar"; -$a->strings["Cancel"] = "Cancel·lar"; -$a->strings["Failed"] = "Fracassar"; -$a->strings["No files were uploaded."] = "No hi ha arxius carregats."; -$a->strings["Uploaded file is empty"] = "L'arxiu carregat està buit"; -$a->strings["Image exceeds size limit of "] = "La imatge excedeix el límit de "; -$a->strings["File has an invalid extension, it should be one of "] = "Arxiu té una extensió no vàlida, ha de ser una de"; -$a->strings["Upload was cancelled, or server error encountered"] = "La pujada va ser cancel.lada, o es va trobar un error de servidor"; +App::$strings["Upload a file"] = "Carrega un arxiu"; +App::$strings["Drop files here to upload"] = "Deixa aquí el arxiu a carregar"; +App::$strings["Cancel"] = "Cancel·lar"; +App::$strings["Failed"] = "Fracassar"; +App::$strings["No files were uploaded."] = "No hi ha arxius carregats."; +App::$strings["Uploaded file is empty"] = "L'arxiu carregat està buit"; +App::$strings["Image exceeds size limit of "] = "La imatge excedeix el límit de "; +App::$strings["File has an invalid extension, it should be one of "] = "Arxiu té una extensió no vàlida, ha de ser una de"; +App::$strings["Upload was cancelled, or server error encountered"] = "La pujada va ser cancel.lada, o es va trobar un error de servidor"; diff --git a/sources/addons/js_upload/lang/cs/strings.php b/sources/addons/js_upload/lang/cs/strings.php index fa1d67df..ec56b57f 100644 --- a/sources/addons/js_upload/lang/cs/strings.php +++ b/sources/addons/js_upload/lang/cs/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Nahrát soubor"; -$a->strings["Drop files here to upload"] = "Přeneste sem soubory k nahrání"; -$a->strings["Cancel"] = "Zrušit"; -$a->strings["Failed"] = "Neúspěch"; -$a->strings["No files were uploaded."] = "Žádné soubory nebyly nahrány."; -$a->strings["Uploaded file is empty"] = "Nahraný soubor je prázdný"; -$a->strings["Image exceeds size limit of "] = "Velikost obrázku překračuje limit velikosti"; -$a->strings["File has an invalid extension, it should be one of "] = "Soubor má neplatnou příponu, ta by měla být jednou z"; -$a->strings["Upload was cancelled, or server error encountered"] = "Nahrávání bylo zrušeno nebo došlo k chybě na serveru"; +App::$strings["Upload a file"] = "Nahrát soubor"; +App::$strings["Drop files here to upload"] = "Přeneste sem soubory k nahrání"; +App::$strings["Cancel"] = "Zrušit"; +App::$strings["Failed"] = "Neúspěch"; +App::$strings["No files were uploaded."] = "Žádné soubory nebyly nahrány."; +App::$strings["Uploaded file is empty"] = "Nahraný soubor je prázdný"; +App::$strings["Image exceeds size limit of "] = "Velikost obrázku překračuje limit velikosti"; +App::$strings["File has an invalid extension, it should be one of "] = "Soubor má neplatnou příponu, ta by měla být jednou z"; +App::$strings["Upload was cancelled, or server error encountered"] = "Nahrávání bylo zrušeno nebo došlo k chybě na serveru"; diff --git a/sources/addons/js_upload/lang/de/strings.php b/sources/addons/js_upload/lang/de/strings.php index 282ffac7..d7a0539b 100644 --- a/sources/addons/js_upload/lang/de/strings.php +++ b/sources/addons/js_upload/lang/de/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Datei hochladen"; -$a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen"; -$a->strings["Cancel"] = "Abbrechen"; -$a->strings["Failed"] = "Fehlgeschlagen"; -$a->strings["No files were uploaded."] = "Keine Dateien hochgeladen."; -$a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer"; -$a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von "; -$a->strings["File has an invalid extension, it should be one of "] = "Die Dateierweiterung ist nicht erlaubt, sie muss eine der folgenden sein "; -$a->strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten"; +App::$strings["Upload a file"] = "Datei hochladen"; +App::$strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen"; +App::$strings["Cancel"] = "Abbrechen"; +App::$strings["Failed"] = "Fehlgeschlagen"; +App::$strings["No files were uploaded."] = "Keine Dateien hochgeladen."; +App::$strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer"; +App::$strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von "; +App::$strings["File has an invalid extension, it should be one of "] = "Die Dateierweiterung ist nicht erlaubt, sie muss eine der folgenden sein "; +App::$strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten"; diff --git a/sources/addons/js_upload/lang/eo/strings.php b/sources/addons/js_upload/lang/eo/strings.php index fd358ea8..597f32b6 100644 --- a/sources/addons/js_upload/lang/eo/strings.php +++ b/sources/addons/js_upload/lang/eo/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Alŝuti dosieron"; -$a->strings["Drop files here to upload"] = "Ŝovmeti dosierojn ĉi tie por alŝuti ilin."; -$a->strings["Cancel"] = "Nuligi"; -$a->strings["Failed"] = "Malsukcesi"; -$a->strings["No files were uploaded."] = "Neniom da dosieroj alŝutita."; -$a->strings["Uploaded file is empty"] = "Alŝutita dosiero estas malplena."; -$a->strings["Image exceeds size limit of "] = "Bildo estas pli granda ol la limito de"; -$a->strings["File has an invalid extension, it should be one of "] = "Dosiero havas nevalidan sufikson. Ĝi estu unu de "; -$a->strings["Upload was cancelled, or server error encountered"] = "Alŝutado estas nuligita aŭ okazis eraro sur la servilo"; +App::$strings["Upload a file"] = "Alŝuti dosieron"; +App::$strings["Drop files here to upload"] = "Ŝovmeti dosierojn ĉi tie por alŝuti ilin."; +App::$strings["Cancel"] = "Nuligi"; +App::$strings["Failed"] = "Malsukcesi"; +App::$strings["No files were uploaded."] = "Neniom da dosieroj alŝutita."; +App::$strings["Uploaded file is empty"] = "Alŝutita dosiero estas malplena."; +App::$strings["Image exceeds size limit of "] = "Bildo estas pli granda ol la limito de"; +App::$strings["File has an invalid extension, it should be one of "] = "Dosiero havas nevalidan sufikson. Ĝi estu unu de "; +App::$strings["Upload was cancelled, or server error encountered"] = "Alŝutado estas nuligita aŭ okazis eraro sur la servilo"; diff --git a/sources/addons/js_upload/lang/es/strings.php b/sources/addons/js_upload/lang/es/strings.php index 4f0f0ea1..88a55080 100644 --- a/sources/addons/js_upload/lang/es/strings.php +++ b/sources/addons/js_upload/lang/es/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Subir un archivo"; -$a->strings["Drop files here to upload"] = "Arrastra los archivos aquí para subirlos"; -$a->strings["Cancel"] = "Cancelar"; -$a->strings["Failed"] = "Falló"; -$a->strings["No files were uploaded."] = "No se han subido archivos aún."; -$a->strings["Uploaded file is empty"] = "El archivo subido está vacío"; -$a->strings["Image exceeds size limit of "] = "La imagen supera tamaño límite de "; -$a->strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión no válida, debería ser una de "; -$a->strings["Upload was cancelled, or server error encountered"] = "La subida ha sido cancelada, o se encontró un error del servidor"; +App::$strings["Upload a file"] = "Subir un archivo"; +App::$strings["Drop files here to upload"] = "Arrastra los archivos aquí para subirlos"; +App::$strings["Cancel"] = "Cancelar"; +App::$strings["Failed"] = "Falló"; +App::$strings["No files were uploaded."] = "No se han subido archivos aún."; +App::$strings["Uploaded file is empty"] = "El archivo subido está vacío"; +App::$strings["Image exceeds size limit of "] = "La imagen supera tamaño límite de "; +App::$strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión no válida, debería ser una de "; +App::$strings["Upload was cancelled, or server error encountered"] = "La subida ha sido cancelada, o se encontró un error del servidor"; diff --git a/sources/addons/js_upload/lang/fr/strings.php b/sources/addons/js_upload/lang/fr/strings.php index fba7cf36..85472e1a 100644 --- a/sources/addons/js_upload/lang/fr/strings.php +++ b/sources/addons/js_upload/lang/fr/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Téléverser un fichier"; -$a->strings["Drop files here to upload"] = "Déposer des fichiers ici pour les téléverser"; -$a->strings["Cancel"] = "Annuler"; -$a->strings["Failed"] = "Échec"; -$a->strings["No files were uploaded."] = "Aucun fichier n'a été téléversé."; -$a->strings["Uploaded file is empty"] = "Le fichier téléversé est vide"; -$a->strings["Image exceeds size limit of "] = "L'image dépasse la taille maximale de "; -$a->strings["File has an invalid extension, it should be one of "] = "Le fichier a une extension invalide, elle devrait être parmi "; -$a->strings["Upload was cancelled, or server error encountered"] = "Téléversement annulé, ou erreur de serveur"; +App::$strings["Upload a file"] = "Téléverser un fichier"; +App::$strings["Drop files here to upload"] = "Déposer des fichiers ici pour les téléverser"; +App::$strings["Cancel"] = "Annuler"; +App::$strings["Failed"] = "Échec"; +App::$strings["No files were uploaded."] = "Aucun fichier n'a été téléversé."; +App::$strings["Uploaded file is empty"] = "Le fichier téléversé est vide"; +App::$strings["Image exceeds size limit of "] = "L'image dépasse la taille maximale de "; +App::$strings["File has an invalid extension, it should be one of "] = "Le fichier a une extension invalide, elle devrait être parmi "; +App::$strings["Upload was cancelled, or server error encountered"] = "Téléversement annulé, ou erreur de serveur"; diff --git a/sources/addons/js_upload/lang/is/strings.php b/sources/addons/js_upload/lang/is/strings.php index d09928c0..8551e062 100644 --- a/sources/addons/js_upload/lang/is/strings.php +++ b/sources/addons/js_upload/lang/is/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Hlaða upp skrá"; -$a->strings["Drop files here to upload"] = "Slepptu skrám hér til að hala upp"; -$a->strings["Cancel"] = "Hætta við"; -$a->strings["Failed"] = "Mistókst"; -$a->strings["No files were uploaded."] = "Engum skráð hlaðið upp."; -$a->strings["Uploaded file is empty"] = "Skrá sem var hlaðið upp er tóm"; -$a->strings["Image exceeds size limit of "] = "Mynd er yfir stærðamörkum"; -$a->strings["File has an invalid extension, it should be one of "] = "Skrá hefur ógilda skránafnsendingu, ætti að vera eitt af"; -$a->strings["Upload was cancelled, or server error encountered"] = "Hætt var við upphal eða kerfisvilla kom upp"; +App::$strings["Upload a file"] = "Hlaða upp skrá"; +App::$strings["Drop files here to upload"] = "Slepptu skrám hér til að hala upp"; +App::$strings["Cancel"] = "Hætta við"; +App::$strings["Failed"] = "Mistókst"; +App::$strings["No files were uploaded."] = "Engum skráð hlaðið upp."; +App::$strings["Uploaded file is empty"] = "Skrá sem var hlaðið upp er tóm"; +App::$strings["Image exceeds size limit of "] = "Mynd er yfir stærðamörkum"; +App::$strings["File has an invalid extension, it should be one of "] = "Skrá hefur ógilda skránafnsendingu, ætti að vera eitt af"; +App::$strings["Upload was cancelled, or server error encountered"] = "Hætt var við upphal eða kerfisvilla kom upp"; diff --git a/sources/addons/js_upload/lang/it/strings.php b/sources/addons/js_upload/lang/it/strings.php index b4760287..69e98fb0 100644 --- a/sources/addons/js_upload/lang/it/strings.php +++ b/sources/addons/js_upload/lang/it/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Carica un file"; -$a->strings["Drop files here to upload"] = "Trascina un file qui per caricarlo"; -$a->strings["Cancel"] = "Annulla"; -$a->strings["Failed"] = "Caricamento fallito"; -$a->strings["No files were uploaded."] = "Nessun file è stato caricato."; -$a->strings["Uploaded file is empty"] = "Il file caricato è vuoto"; -$a->strings["Image exceeds size limit of "] = "L'immagine supera il limite di"; -$a->strings["File has an invalid extension, it should be one of "] = "Il file ha un'estensione non valida, dovrebbe essere una tra "; -$a->strings["Upload was cancelled, or server error encountered"] = "Il caricamento è stato cancellato, o si è verificato un errore sul server"; +App::$strings["Upload a file"] = "Carica un file"; +App::$strings["Drop files here to upload"] = "Trascina un file qui per caricarlo"; +App::$strings["Cancel"] = "Annulla"; +App::$strings["Failed"] = "Caricamento fallito"; +App::$strings["No files were uploaded."] = "Nessun file è stato caricato."; +App::$strings["Uploaded file is empty"] = "Il file caricato è vuoto"; +App::$strings["Image exceeds size limit of "] = "L'immagine supera il limite di"; +App::$strings["File has an invalid extension, it should be one of "] = "Il file ha un'estensione non valida, dovrebbe essere una tra "; +App::$strings["Upload was cancelled, or server error encountered"] = "Il caricamento è stato cancellato, o si è verificato un errore sul server"; diff --git a/sources/addons/js_upload/lang/nb-no/strings.php b/sources/addons/js_upload/lang/nb-no/strings.php index 09e704e5..c9d7650b 100644 --- a/sources/addons/js_upload/lang/nb-no/strings.php +++ b/sources/addons/js_upload/lang/nb-no/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Last opp en fil"; -$a->strings["Drop files here to upload"] = "Slipp filer her for å laste de opp"; -$a->strings["Cancel"] = "Avbryt"; -$a->strings["Failed"] = "Mislyktes"; -$a->strings["No files were uploaded."] = "Ingen filer ble lastet opp."; -$a->strings["Uploaded file is empty"] = "Opplastet fil er tom"; -$a->strings["Image exceeds size limit of "] = "Bilde overstiger størrelsesbegrensningen på "; -$a->strings["File has an invalid extension, it should be one of "] = "Filen har en ugyldig endelse, den må være en av "; -$a->strings["Upload was cancelled, or server error encountered"] = "Opplasting avbrutt, eller det oppstod en feil på tjeneren"; +App::$strings["Upload a file"] = "Last opp en fil"; +App::$strings["Drop files here to upload"] = "Slipp filer her for å laste de opp"; +App::$strings["Cancel"] = "Avbryt"; +App::$strings["Failed"] = "Mislyktes"; +App::$strings["No files were uploaded."] = "Ingen filer ble lastet opp."; +App::$strings["Uploaded file is empty"] = "Opplastet fil er tom"; +App::$strings["Image exceeds size limit of "] = "Bilde overstiger størrelsesbegrensningen på "; +App::$strings["File has an invalid extension, it should be one of "] = "Filen har en ugyldig endelse, den må være en av "; +App::$strings["Upload was cancelled, or server error encountered"] = "Opplasting avbrutt, eller det oppstod en feil på tjeneren"; diff --git a/sources/addons/js_upload/lang/nl/strings.php b/sources/addons/js_upload/lang/nl/strings.php index 6002d4eb..e44b146f 100644 --- a/sources/addons/js_upload/lang/nl/strings.php +++ b/sources/addons/js_upload/lang/nl/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Bestand uploaden"; -$a->strings["Drop files here to upload"] = "Sleep bestanden hier naartoe om te uploaden"; -$a->strings["Cancel"] = "Annuleren"; -$a->strings["Failed"] = "Mislukt"; -$a->strings["No files were uploaded."] = "Er zijn geen bestanden geüpload."; -$a->strings["Uploaded file is empty"] = "Geüpload bestand is leeg"; -$a->strings["Image exceeds size limit of "] = "Bestandsgrootte afbeelding overschrijdt limiet van "; -$a->strings["File has an invalid extension, it should be one of "] = "Het bestand heeft een ongeldige bestandsextensie, geldig zijn "; -$a->strings["Upload was cancelled, or server error encountered"] = "Uploaden is geannuleerd of er is sprake van een serverfout"; +App::$strings["Upload a file"] = "Bestand uploaden"; +App::$strings["Drop files here to upload"] = "Sleep bestanden hier naartoe om te uploaden"; +App::$strings["Cancel"] = "Annuleren"; +App::$strings["Failed"] = "Mislukt"; +App::$strings["No files were uploaded."] = "Er zijn geen bestanden geüpload."; +App::$strings["Uploaded file is empty"] = "Geüpload bestand is leeg"; +App::$strings["Image exceeds size limit of "] = "Bestandsgrootte afbeelding overschrijdt limiet van "; +App::$strings["File has an invalid extension, it should be one of "] = "Het bestand heeft een ongeldige bestandsextensie, geldig zijn "; +App::$strings["Upload was cancelled, or server error encountered"] = "Uploaden is geannuleerd of er is sprake van een serverfout"; diff --git a/sources/addons/js_upload/lang/pl/strings.php b/sources/addons/js_upload/lang/pl/strings.php index af2d07bc..9c7c641f 100644 --- a/sources/addons/js_upload/lang/pl/strings.php +++ b/sources/addons/js_upload/lang/pl/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Załaduj plik"; -$a->strings["Drop files here to upload"] = "Wrzuć tu pliki by je załadować"; -$a->strings["Cancel"] = "Anuluj"; -$a->strings["Failed"] = "Niepowodzenie"; -$a->strings["No files were uploaded."] = "Nie załadowano żadnych plików."; -$a->strings["Uploaded file is empty"] = "Wysłany plik jest pusty"; -$a->strings["Image exceeds size limit of "] = "obrazek przekracza limit rozmiaru"; -$a->strings["File has an invalid extension, it should be one of "] = "Pilk ma nieprawidłowe rozszerzenie, powinien być jednym z"; -$a->strings["Upload was cancelled, or server error encountered"] = "Przesyłanie zostało anulowane lub wystąpił błąd serwera."; +App::$strings["Upload a file"] = "Załaduj plik"; +App::$strings["Drop files here to upload"] = "Wrzuć tu pliki by je załadować"; +App::$strings["Cancel"] = "Anuluj"; +App::$strings["Failed"] = "Niepowodzenie"; +App::$strings["No files were uploaded."] = "Nie załadowano żadnych plików."; +App::$strings["Uploaded file is empty"] = "Wysłany plik jest pusty"; +App::$strings["Image exceeds size limit of "] = "obrazek przekracza limit rozmiaru"; +App::$strings["File has an invalid extension, it should be one of "] = "Pilk ma nieprawidłowe rozszerzenie, powinien być jednym z"; +App::$strings["Upload was cancelled, or server error encountered"] = "Przesyłanie zostało anulowane lub wystąpił błąd serwera."; diff --git a/sources/addons/js_upload/lang/pt-br/strings.php b/sources/addons/js_upload/lang/pt-br/strings.php index 6e121ca9..8ad8fd55 100644 --- a/sources/addons/js_upload/lang/pt-br/strings.php +++ b/sources/addons/js_upload/lang/pt-br/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Enviar um arquivo"; -$a->strings["Drop files here to upload"] = "Solte os arquivos a serem enviados aqui"; -$a->strings["Cancel"] = "Cancelar"; -$a->strings["Failed"] = "Falhou"; -$a->strings["No files were uploaded."] = "Nenhum arquivo foi enviado."; -$a->strings["Uploaded file is empty"] = "O arquivo enviado está em branco"; -$a->strings["Image exceeds size limit of "] = "A imagem excede o tamanho máximo de "; -$a->strings["File has an invalid extension, it should be one of "] = "O arquivo possui uma extensão inválida, são aceitas somente "; -$a->strings["Upload was cancelled, or server error encountered"] = "O envio foi cancelado ou ocorreu algum erro no servidor"; +App::$strings["Upload a file"] = "Enviar um arquivo"; +App::$strings["Drop files here to upload"] = "Solte os arquivos a serem enviados aqui"; +App::$strings["Cancel"] = "Cancelar"; +App::$strings["Failed"] = "Falhou"; +App::$strings["No files were uploaded."] = "Nenhum arquivo foi enviado."; +App::$strings["Uploaded file is empty"] = "O arquivo enviado está em branco"; +App::$strings["Image exceeds size limit of "] = "A imagem excede o tamanho máximo de "; +App::$strings["File has an invalid extension, it should be one of "] = "O arquivo possui uma extensão inválida, são aceitas somente "; +App::$strings["Upload was cancelled, or server error encountered"] = "O envio foi cancelado ou ocorreu algum erro no servidor"; diff --git a/sources/addons/js_upload/lang/ru/strings.php b/sources/addons/js_upload/lang/ru/strings.php index b30fa7b5..36b2b8af 100644 --- a/sources/addons/js_upload/lang/ru/strings.php +++ b/sources/addons/js_upload/lang/ru/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Загрузить файл"; -$a->strings["Drop files here to upload"] = "Перетащите файлы сюда для загрузки"; -$a->strings["Cancel"] = "Отмена"; -$a->strings["Failed"] = "Ошибка"; -$a->strings["No files were uploaded."] = "Нет загруженных файлов."; -$a->strings["Uploaded file is empty"] = "Загруженный файл пустой"; -$a->strings["Image exceeds size limit of "] = "Размер фото превышает лимит "; -$a->strings["File has an invalid extension, it should be one of "] = "Файл имеет недопустимое расширение, оно должно быть одним из следующих "; -$a->strings["Upload was cancelled, or server error encountered"] = "Загрузка была отменена, или произошла ошибка сервера"; +App::$strings["Upload a file"] = "Загрузить файл"; +App::$strings["Drop files here to upload"] = "Перетащите файлы сюда для загрузки"; +App::$strings["Cancel"] = "Отмена"; +App::$strings["Failed"] = "Ошибка"; +App::$strings["No files were uploaded."] = "Нет загруженных файлов."; +App::$strings["Uploaded file is empty"] = "Загруженный файл пустой"; +App::$strings["Image exceeds size limit of "] = "Размер фото превышает лимит "; +App::$strings["File has an invalid extension, it should be one of "] = "Файл имеет недопустимое расширение, оно должно быть одним из следующих "; +App::$strings["Upload was cancelled, or server error encountered"] = "Загрузка была отменена, или произошла ошибка сервера"; diff --git a/sources/addons/js_upload/lang/sv/strings.php b/sources/addons/js_upload/lang/sv/strings.php index c8a07875..ec30d70e 100644 --- a/sources/addons/js_upload/lang/sv/strings.php +++ b/sources/addons/js_upload/lang/sv/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "Ladda upp en fil"; -$a->strings["Drop files here to upload"] = "Dra filer som ska laddas upp hit"; -$a->strings["Cancel"] = "Avbryt"; -$a->strings["Failed"] = "Misslyckades"; -$a->strings["No files were uploaded."] = "Inga filer laddades upp."; -$a->strings["Uploaded file is empty"] = "Den uppladdade filen är tom"; -$a->strings["Image exceeds size limit of "] = "Bilden överskrider den tillåtna storleken "; -$a->strings["File has an invalid extension, it should be one of "] = "Otillåten filnamnsändelse, det ska vara "; -$a->strings["Upload was cancelled, or server error encountered"] = "Serverfel eller avbruten uppladdning"; +App::$strings["Upload a file"] = "Ladda upp en fil"; +App::$strings["Drop files here to upload"] = "Dra filer som ska laddas upp hit"; +App::$strings["Cancel"] = "Avbryt"; +App::$strings["Failed"] = "Misslyckades"; +App::$strings["No files were uploaded."] = "Inga filer laddades upp."; +App::$strings["Uploaded file is empty"] = "Den uppladdade filen är tom"; +App::$strings["Image exceeds size limit of "] = "Bilden överskrider den tillåtna storleken "; +App::$strings["File has an invalid extension, it should be one of "] = "Otillåten filnamnsändelse, det ska vara "; +App::$strings["Upload was cancelled, or server error encountered"] = "Serverfel eller avbruten uppladdning"; diff --git a/sources/addons/js_upload/lang/zh-cn/strings.php b/sources/addons/js_upload/lang/zh-cn/strings.php index 8e78b7dd..9bb1bbe2 100644 --- a/sources/addons/js_upload/lang/zh-cn/strings.php +++ b/sources/addons/js_upload/lang/zh-cn/strings.php @@ -1,11 +1,11 @@ strings["Upload a file"] = "上传文件"; -$a->strings["Drop files here to upload"] = "在这儿放文件为上传"; -$a->strings["Cancel"] = "退消"; -$a->strings["Failed"] = "失败"; -$a->strings["No files were uploaded."] = "没有文件上传。"; -$a->strings["Uploaded file is empty"] = "上传的文件空的"; -$a->strings["Image exceeds size limit of "] = "图片超出最大尺寸"; -$a->strings["File has an invalid extension, it should be one of "] = "文件扩展名无效的，应该是这些一个："; -$a->strings["Upload was cancelled, or server error encountered"] = "上传注销了，或相遇服务器错误"; +App::$strings["Upload a file"] = "上传文件"; +App::$strings["Drop files here to upload"] = "在这儿放文件为上传"; +App::$strings["Cancel"] = "退消"; +App::$strings["Failed"] = "失败"; +App::$strings["No files were uploaded."] = "没有文件上传。"; +App::$strings["Uploaded file is empty"] = "上传的文件空的"; +App::$strings["Image exceeds size limit of "] = "图片超出最大尺寸"; +App::$strings["File has an invalid extension, it should be one of "] = "文件扩展名无效的，应该是这些一个："; +App::$strings["Upload was cancelled, or server error encountered"] = "上传注销了，或相遇服务器错误"; diff --git a/sources/addons/ldapauth/README b/sources/addons/ldapauth/README index 304bbfab..09b29595 100755 --- a/sources/addons/ldapauth/README +++ b/sources/addons/ldapauth/README @@ -26,7 +26,7 @@ * The required configuration options for this module may be set in the .htconfig.php file * e.g.: * - * $a->config['ldapauth']['ldap_server'] = 'host.example.com'; + * App::$config['ldapauth']['ldap_server'] = 'host.example.com'; * * Parameters: * ldap_server = DNS hostname of LDAP service, or URL e.g. ldaps://example.com diff --git a/sources/addons/ldapauth/ldapauth.php b/sources/addons/ldapauth/ldapauth.php index 3661ff6e..6c8ae173 100755 --- a/sources/addons/ldapauth/ldapauth.php +++ b/sources/addons/ldapauth/ldapauth.php @@ -26,7 +26,7 @@ * The required configuration options for this module may be set in the .htconfig.php file * e.g.: * - * $a->config['ldapauth']['ldap_server'] = 'host.example.com'; + * App::$config['ldapauth']['ldap_server'] = 'host.example.com'; * * Parameters: * ldap_server = DNS hostname of LDAP service, or URL e.g. ldaps://example.com diff --git a/sources/addons/libertree/lang/ca/strings.php b/sources/addons/libertree/lang/ca/strings.php index 28c6b31a..7d4258cf 100644 --- a/sources/addons/libertree/lang/ca/strings.php +++ b/sources/addons/libertree/lang/ca/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = "Enviament a libertree"; -$a->strings["libertree Post Settings"] = "Ajustos d'enviaments a libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Activa el plugin d'enviaments a libertree"; -$a->strings["Libertree API token"] = "Libertree API token"; -$a->strings["Libertree site URL"] = "lloc URL libertree"; -$a->strings["Post to Libertree by default"] = "Enviar a libertree per defecte"; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to libertree"] = "Enviament a libertree"; +App::$strings["libertree Post Settings"] = "Ajustos d'enviaments a libertree"; +App::$strings["Enable Libertree Post Plugin"] = "Activa el plugin d'enviaments a libertree"; +App::$strings["Libertree API token"] = "Libertree API token"; +App::$strings["Libertree site URL"] = "lloc URL libertree"; +App::$strings["Post to Libertree by default"] = "Enviar a libertree per defecte"; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/libertree/lang/cs/strings.php b/sources/addons/libertree/lang/cs/strings.php index 51164954..3abdb7e1 100644 --- a/sources/addons/libertree/lang/cs/strings.php +++ b/sources/addons/libertree/lang/cs/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = "Poslat na Libertree"; -$a->strings["libertree Post Settings"] = "Nastavení Libertree příspěvků"; -$a->strings["Enable Libertree Post Plugin"] = "Povolit Libertree Post rozšíření"; -$a->strings["Libertree API token"] = "Libertree API token"; -$a->strings["Libertree site URL"] = "URL adresa Libertree "; -$a->strings["Post to Libertree by default"] = "Defaultně poslat na Libertree"; -$a->strings["Submit"] = "Odeslat"; +App::$strings["Post to libertree"] = "Poslat na Libertree"; +App::$strings["libertree Post Settings"] = "Nastavení Libertree příspěvků"; +App::$strings["Enable Libertree Post Plugin"] = "Povolit Libertree Post rozšíření"; +App::$strings["Libertree API token"] = "Libertree API token"; +App::$strings["Libertree site URL"] = "URL adresa Libertree "; +App::$strings["Post to Libertree by default"] = "Defaultně poslat na Libertree"; +App::$strings["Submit"] = "Odeslat"; diff --git a/sources/addons/libertree/lang/de/strings.php b/sources/addons/libertree/lang/de/strings.php index 553089fd..0914b90f 100644 --- a/sources/addons/libertree/lang/de/strings.php +++ b/sources/addons/libertree/lang/de/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = "bei libertree veröffentlichen"; -$a->strings["libertree Post Settings"] = "libertree Post Einstellungen"; -$a->strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren"; -$a->strings["Libertree API token"] = "Libertree API Token"; -$a->strings["Libertree site URL"] = "Libertree URL"; -$a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen"; -$a->strings["Submit"] = "Senden"; +App::$strings["Post to libertree"] = "bei libertree veröffentlichen"; +App::$strings["libertree Post Settings"] = "libertree Post Einstellungen"; +App::$strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren"; +App::$strings["Libertree API token"] = "Libertree API Token"; +App::$strings["Libertree site URL"] = "Libertree URL"; +App::$strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen"; +App::$strings["Submit"] = "Senden"; diff --git a/sources/addons/libertree/lang/eo/strings.php b/sources/addons/libertree/lang/eo/strings.php index 11b8496c..9915ccba 100644 --- a/sources/addons/libertree/lang/eo/strings.php +++ b/sources/addons/libertree/lang/eo/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = "Afiŝi al libertree"; -$a->strings["libertree Post Settings"] = "Agordoj por Afiŝoj ĉe libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Aktivigi Kromprogramon por Afiŝoj ĉe libertree"; -$a->strings["Libertree API token"] = "Libertree API ĵetono"; -$a->strings["Libertree site URL"] = "URL adreso de libertree retejo:"; -$a->strings["Post to Libertree by default"] = "Defaŭlte afiŝi ĉe Libertree"; -$a->strings["Submit"] = "Sendi"; +App::$strings["Post to libertree"] = "Afiŝi al libertree"; +App::$strings["libertree Post Settings"] = "Agordoj por Afiŝoj ĉe libertree"; +App::$strings["Enable Libertree Post Plugin"] = "Aktivigi Kromprogramon por Afiŝoj ĉe libertree"; +App::$strings["Libertree API token"] = "Libertree API ĵetono"; +App::$strings["Libertree site URL"] = "URL adreso de libertree retejo:"; +App::$strings["Post to Libertree by default"] = "Defaŭlte afiŝi ĉe Libertree"; +App::$strings["Submit"] = "Sendi"; diff --git a/sources/addons/libertree/lang/es/strings.php b/sources/addons/libertree/lang/es/strings.php index 52d601d7..fc26b7a2 100644 --- a/sources/addons/libertree/lang/es/strings.php +++ b/sources/addons/libertree/lang/es/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = "Publicar en Libertree"; -$a->strings["libertree Post Settings"] = "Configuración de la publicación en Libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Activar el módulo de publicación en Libertree"; -$a->strings["Libertree API token"] = "Ficha API de Libertree"; -$a->strings["Libertree site URL"] = "Dirección de Libertree"; -$a->strings["Post to Libertree by default"] = "Publicar en Libertree por defecto"; -$a->strings["Submit"] = "Envíar"; +App::$strings["Post to libertree"] = "Publicar en Libertree"; +App::$strings["libertree Post Settings"] = "Configuración de la publicación en Libertree"; +App::$strings["Enable Libertree Post Plugin"] = "Activar el módulo de publicación en Libertree"; +App::$strings["Libertree API token"] = "Ficha API de Libertree"; +App::$strings["Libertree site URL"] = "Dirección de Libertree"; +App::$strings["Post to Libertree by default"] = "Publicar en Libertree por defecto"; +App::$strings["Submit"] = "Envíar"; diff --git a/sources/addons/libertree/lang/fr/strings.php b/sources/addons/libertree/lang/fr/strings.php index 7fd2d237..c224b8fb 100644 --- a/sources/addons/libertree/lang/fr/strings.php +++ b/sources/addons/libertree/lang/fr/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = "Publier sur libertree"; -$a->strings["libertree Post Settings"] = "Réglages des messages sur libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Activer le plugin de publication sur libertree"; -$a->strings["Libertree API token"] = "Clé de l'API libertree"; -$a->strings["Libertree site URL"] = "URL du site libertree"; -$a->strings["Post to Libertree by default"] = "Publier sur libertree par défaut"; -$a->strings["Submit"] = "Envoyer"; +App::$strings["Post to libertree"] = "Publier sur libertree"; +App::$strings["libertree Post Settings"] = "Réglages des messages sur libertree"; +App::$strings["Enable Libertree Post Plugin"] = "Activer le plugin de publication sur libertree"; +App::$strings["Libertree API token"] = "Clé de l'API libertree"; +App::$strings["Libertree site URL"] = "URL du site libertree"; +App::$strings["Post to Libertree by default"] = "Publier sur libertree par défaut"; +App::$strings["Submit"] = "Envoyer"; diff --git a/sources/addons/libertree/lang/is/strings.php b/sources/addons/libertree/lang/is/strings.php index 7d5e7f37..23d9c511 100644 --- a/sources/addons/libertree/lang/is/strings.php +++ b/sources/addons/libertree/lang/is/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = ""; -$a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; -$a->strings["Libertree API token"] = ""; -$a->strings["Libertree site URL"] = ""; -$a->strings["Post to Libertree by default"] = ""; -$a->strings["Submit"] = "Senda inn"; +App::$strings["Post to libertree"] = ""; +App::$strings["libertree Post Settings"] = ""; +App::$strings["Enable Libertree Post Plugin"] = ""; +App::$strings["Libertree API token"] = ""; +App::$strings["Libertree site URL"] = ""; +App::$strings["Post to Libertree by default"] = ""; +App::$strings["Submit"] = "Senda inn"; diff --git a/sources/addons/libertree/lang/it/strings.php b/sources/addons/libertree/lang/it/strings.php index cfc3c602..3cd52738 100644 --- a/sources/addons/libertree/lang/it/strings.php +++ b/sources/addons/libertree/lang/it/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = ""; -$a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; -$a->strings["Libertree API token"] = ""; -$a->strings["Libertree site URL"] = ""; -$a->strings["Post to Libertree by default"] = ""; -$a->strings["Submit"] = "Invia"; +App::$strings["Post to libertree"] = ""; +App::$strings["libertree Post Settings"] = ""; +App::$strings["Enable Libertree Post Plugin"] = ""; +App::$strings["Libertree API token"] = ""; +App::$strings["Libertree site URL"] = ""; +App::$strings["Post to Libertree by default"] = ""; +App::$strings["Submit"] = "Invia"; diff --git a/sources/addons/libertree/lang/nb-no/strings.php b/sources/addons/libertree/lang/nb-no/strings.php index 679aefe1..0449dcd9 100644 --- a/sources/addons/libertree/lang/nb-no/strings.php +++ b/sources/addons/libertree/lang/nb-no/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = ""; -$a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; -$a->strings["Libertree API token"] = ""; -$a->strings["Libertree site URL"] = ""; -$a->strings["Post to Libertree by default"] = ""; -$a->strings["Submit"] = "Lagre"; +App::$strings["Post to libertree"] = ""; +App::$strings["libertree Post Settings"] = ""; +App::$strings["Enable Libertree Post Plugin"] = ""; +App::$strings["Libertree API token"] = ""; +App::$strings["Libertree site URL"] = ""; +App::$strings["Post to Libertree by default"] = ""; +App::$strings["Submit"] = "Lagre"; diff --git a/sources/addons/libertree/lang/nl/strings.php b/sources/addons/libertree/lang/nl/strings.php index 6e869a59..cc1768fb 100644 --- a/sources/addons/libertree/lang/nl/strings.php +++ b/sources/addons/libertree/lang/nl/strings.php @@ -1,9 +1,9 @@ strings["Post to Libertree"] = "Doorplaatsen naar Libertree"; -$a->strings["Libertree Post Settings"] = "Libertree (berichten doorplaatsen)"; -$a->strings["Enable Libertree Post Plugin"] = "Doorplaatsen naar Libertree inschakelen"; -$a->strings["Libertree API token"] = "API-token Libertree"; -$a->strings["Libertree site URL"] = "Website-URL Libertree"; -$a->strings["Post to Libertree by default"] = "Berichten standaard naar Libertree doorplaatsen"; -$a->strings["Submit"] = "Opslaan"; +App::$strings["Post to Libertree"] = "Doorplaatsen naar Libertree"; +App::$strings["Libertree Post Settings"] = "Libertree (berichten doorplaatsen)"; +App::$strings["Enable Libertree Post Plugin"] = "Doorplaatsen naar Libertree inschakelen"; +App::$strings["Libertree API token"] = "API-token Libertree"; +App::$strings["Libertree site URL"] = "Website-URL Libertree"; +App::$strings["Post to Libertree by default"] = "Berichten standaard naar Libertree doorplaatsen"; +App::$strings["Submit"] = "Opslaan"; diff --git a/sources/addons/libertree/lang/pl/strings.php b/sources/addons/libertree/lang/pl/strings.php index 217757f2..2b11a260 100644 --- a/sources/addons/libertree/lang/pl/strings.php +++ b/sources/addons/libertree/lang/pl/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = ""; -$a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; -$a->strings["Libertree API token"] = ""; -$a->strings["Libertree site URL"] = ""; -$a->strings["Post to Libertree by default"] = ""; -$a->strings["Submit"] = "Potwierdź"; +App::$strings["Post to libertree"] = ""; +App::$strings["libertree Post Settings"] = ""; +App::$strings["Enable Libertree Post Plugin"] = ""; +App::$strings["Libertree API token"] = ""; +App::$strings["Libertree site URL"] = ""; +App::$strings["Post to Libertree by default"] = ""; +App::$strings["Submit"] = "Potwierdź"; diff --git a/sources/addons/libertree/lang/pt-br/strings.php b/sources/addons/libertree/lang/pt-br/strings.php index 0ff3c15d..eaca8997 100644 --- a/sources/addons/libertree/lang/pt-br/strings.php +++ b/sources/addons/libertree/lang/pt-br/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = ""; -$a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; -$a->strings["Libertree API token"] = ""; -$a->strings["Libertree site URL"] = ""; -$a->strings["Post to Libertree by default"] = ""; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to libertree"] = ""; +App::$strings["libertree Post Settings"] = ""; +App::$strings["Enable Libertree Post Plugin"] = ""; +App::$strings["Libertree API token"] = ""; +App::$strings["Libertree site URL"] = ""; +App::$strings["Post to Libertree by default"] = ""; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/libertree/lang/ru/strings.php b/sources/addons/libertree/lang/ru/strings.php index c6101b70..0c8d903a 100644 --- a/sources/addons/libertree/lang/ru/strings.php +++ b/sources/addons/libertree/lang/ru/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = ""; -$a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; -$a->strings["Libertree API token"] = ""; -$a->strings["Libertree site URL"] = ""; -$a->strings["Post to Libertree by default"] = ""; -$a->strings["Submit"] = "Подтвердить"; +App::$strings["Post to libertree"] = ""; +App::$strings["libertree Post Settings"] = ""; +App::$strings["Enable Libertree Post Plugin"] = ""; +App::$strings["Libertree API token"] = ""; +App::$strings["Libertree site URL"] = ""; +App::$strings["Post to Libertree by default"] = ""; +App::$strings["Submit"] = "Подтвердить"; diff --git a/sources/addons/libertree/lang/sv/strings.php b/sources/addons/libertree/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/libertree/lang/sv/strings.php +++ b/sources/addons/libertree/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/libertree/lang/zh-cn/strings.php b/sources/addons/libertree/lang/zh-cn/strings.php index 2122014c..4d55eddf 100644 --- a/sources/addons/libertree/lang/zh-cn/strings.php +++ b/sources/addons/libertree/lang/zh-cn/strings.php @@ -1,9 +1,9 @@ strings["Post to libertree"] = "转播到libertree"; -$a->strings["libertree Post Settings"] = "libertree转播设置"; -$a->strings["Enable Libertree Post Plugin"] = "使Libertree转播插件可用"; -$a->strings["Libertree API token"] = "Libertree API令牌"; -$a->strings["Libertree site URL"] = "Libertree网站URL"; -$a->strings["Post to Libertree by default"] = "默认地转播到Libertree"; -$a->strings["Submit"] = "提交"; +App::$strings["Post to libertree"] = "转播到libertree"; +App::$strings["libertree Post Settings"] = "libertree转播设置"; +App::$strings["Enable Libertree Post Plugin"] = "使Libertree转播插件可用"; +App::$strings["Libertree API token"] = "Libertree API令牌"; +App::$strings["Libertree site URL"] = "Libertree网站URL"; +App::$strings["Post to Libertree by default"] = "默认地转播到Libertree"; +App::$strings["Submit"] = "提交"; diff --git a/sources/addons/libertree/libertree.php b/sources/addons/libertree/libertree.php index 441a28d9..50754501 100755 --- a/sources/addons/libertree/libertree.php +++ b/sources/addons/libertree/libertree.php @@ -47,7 +47,7 @@ function libertree_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -152,7 +152,7 @@ function libertree_send(&$a,&$b) { $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token'); $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url'); $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; - $ltree_source = "[".$a->config['system']['sitename']."](".$a->get_baseurl().")"; + $ltree_source = "[".App::$config['system']['sitename']."](".z_root().")"; // $ltree_source = "Hubzilla"; logger('sitename: ' . print_r($ltree_source,true)); if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) { diff --git a/sources/addons/likebanner/likebanner.php b/sources/addons/likebanner/likebanner.php index bf933873..862a3e38 100644 --- a/sources/addons/likebanner/likebanner.php +++ b/sources/addons/likebanner/likebanner.php @@ -35,7 +35,7 @@ function likebanner_init(&$a) { function likebanner_content(&$a) { if(local_channel()) { - $channel = $a->get_channel(); + $channel = App::get_channel(); } else $channel = null; diff --git a/sources/addons/ljpost/lang/ca/strings.php b/sources/addons/ljpost/lang/ca/strings.php index 04053fa2..217e82d4 100644 --- a/sources/addons/ljpost/lang/ca/strings.php +++ b/sources/addons/ljpost/lang/ca/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Missatge a Livejournal"; -$a->strings["LiveJournal Post Settings"] = "Configuració d'enviaments a Livejournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Habilitat el plugin d'enviaments a Livejournal"; -$a->strings["LiveJournal username"] = "Nom d'usuari a Livejournal"; -$a->strings["LiveJournal password"] = "Contrasenya a Livejournal"; -$a->strings["Post to LiveJournal by default"] = "Enviar per defecte a Livejournal"; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to LiveJournal"] = "Missatge a Livejournal"; +App::$strings["LiveJournal Post Settings"] = "Configuració d'enviaments a Livejournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Habilitat el plugin d'enviaments a Livejournal"; +App::$strings["LiveJournal username"] = "Nom d'usuari a Livejournal"; +App::$strings["LiveJournal password"] = "Contrasenya a Livejournal"; +App::$strings["Post to LiveJournal by default"] = "Enviar per defecte a Livejournal"; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/ljpost/lang/cs/strings.php b/sources/addons/ljpost/lang/cs/strings.php index c0f39003..71be6a7d 100644 --- a/sources/addons/ljpost/lang/cs/strings.php +++ b/sources/addons/ljpost/lang/cs/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Poslat na LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "Nastavení LiveJournal Post"; -$a->strings["Enable LiveJournal Post Plugin"] = "Povolit LiveJournal Post plugin"; -$a->strings["LiveJournal username"] = "LiveJournal uživatelské jméno"; -$a->strings["LiveJournal password"] = "LiveJournal heslo"; -$a->strings["Post to LiveJournal by default"] = "Defaultně umístit na LiveJournal"; -$a->strings["Submit"] = "Odeslat"; +App::$strings["Post to LiveJournal"] = "Poslat na LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "Nastavení LiveJournal Post"; +App::$strings["Enable LiveJournal Post Plugin"] = "Povolit LiveJournal Post plugin"; +App::$strings["LiveJournal username"] = "LiveJournal uživatelské jméno"; +App::$strings["LiveJournal password"] = "LiveJournal heslo"; +App::$strings["Post to LiveJournal by default"] = "Defaultně umístit na LiveJournal"; +App::$strings["Submit"] = "Odeslat"; diff --git a/sources/addons/ljpost/lang/de/strings.php b/sources/addons/ljpost/lang/de/strings.php index 8ac9e5b2..70526dbf 100644 --- a/sources/addons/ljpost/lang/de/strings.php +++ b/sources/addons/ljpost/lang/de/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen."; -$a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen"; -$a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren"; -$a->strings["LiveJournal username"] = "LiveJournal Benutzername"; -$a->strings["LiveJournal password"] = "LiveJournal Passwort"; -$a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen"; -$a->strings["Submit"] = "Senden"; +App::$strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen."; +App::$strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen"; +App::$strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren"; +App::$strings["LiveJournal username"] = "LiveJournal Benutzername"; +App::$strings["LiveJournal password"] = "LiveJournal Passwort"; +App::$strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen"; +App::$strings["Submit"] = "Senden"; diff --git a/sources/addons/ljpost/lang/eo/strings.php b/sources/addons/ljpost/lang/eo/strings.php index b606e6a6..58339a48 100644 --- a/sources/addons/ljpost/lang/eo/strings.php +++ b/sources/addons/ljpost/lang/eo/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Afiŝi ĉe LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "Agordoj pri afiŝoj ĉe LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Ŝalti la LiveJournal-afiŝo kromprogramon."; -$a->strings["LiveJournal username"] = "LiveJournal Salutnomo"; -$a->strings["LiveJournal password"] = "LiveJournal pasvorto"; -$a->strings["Post to LiveJournal by default"] = "Defaŭlte afiŝi al LiveJournal"; -$a->strings["Submit"] = "Sendi"; +App::$strings["Post to LiveJournal"] = "Afiŝi ĉe LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "Agordoj pri afiŝoj ĉe LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Ŝalti la LiveJournal-afiŝo kromprogramon."; +App::$strings["LiveJournal username"] = "LiveJournal Salutnomo"; +App::$strings["LiveJournal password"] = "LiveJournal pasvorto"; +App::$strings["Post to LiveJournal by default"] = "Defaŭlte afiŝi al LiveJournal"; +App::$strings["Submit"] = "Sendi"; diff --git a/sources/addons/ljpost/lang/es/strings.php b/sources/addons/ljpost/lang/es/strings.php index 8273c471..56c9bda2 100644 --- a/sources/addons/ljpost/lang/es/strings.php +++ b/sources/addons/ljpost/lang/es/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Publicar en Livejournal"; -$a->strings["LiveJournal Post Settings"] = "Configuración de las publicaciones en Livejournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Activar el módulo de publicación en Livejournal"; -$a->strings["LiveJournal username"] = "Nombre de usuario de Livejournal"; -$a->strings["LiveJournal password"] = "Contraseña de Livejournal"; -$a->strings["Post to LiveJournal by default"] = "Publicar en Livejournal por defecto"; -$a->strings["Submit"] = "Envíar"; +App::$strings["Post to LiveJournal"] = "Publicar en Livejournal"; +App::$strings["LiveJournal Post Settings"] = "Configuración de las publicaciones en Livejournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Activar el módulo de publicación en Livejournal"; +App::$strings["LiveJournal username"] = "Nombre de usuario de Livejournal"; +App::$strings["LiveJournal password"] = "Contraseña de Livejournal"; +App::$strings["Post to LiveJournal by default"] = "Publicar en Livejournal por defecto"; +App::$strings["Submit"] = "Envíar"; diff --git a/sources/addons/ljpost/lang/fr/strings.php b/sources/addons/ljpost/lang/fr/strings.php index 615f929a..e3a874d4 100644 --- a/sources/addons/ljpost/lang/fr/strings.php +++ b/sources/addons/ljpost/lang/fr/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Poster vers LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "Réglages LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Activer \"Poster vers LiveJournal\""; -$a->strings["LiveJournal username"] = "Nom d'utilisateur LiveJournal"; -$a->strings["LiveJournal password"] = "Mot de passe"; -$a->strings["Post to LiveJournal by default"] = "Poster vers LiveJournal par défaut"; -$a->strings["Submit"] = "Envoyer"; +App::$strings["Post to LiveJournal"] = "Poster vers LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "Réglages LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Activer \"Poster vers LiveJournal\""; +App::$strings["LiveJournal username"] = "Nom d'utilisateur LiveJournal"; +App::$strings["LiveJournal password"] = "Mot de passe"; +App::$strings["Post to LiveJournal by default"] = "Poster vers LiveJournal par défaut"; +App::$strings["Submit"] = "Envoyer"; diff --git a/sources/addons/ljpost/lang/is/strings.php b/sources/addons/ljpost/lang/is/strings.php index 5edfc631..5621e5cf 100644 --- a/sources/addons/ljpost/lang/is/strings.php +++ b/sources/addons/ljpost/lang/is/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = ""; -$a->strings["LiveJournal Post Settings"] = ""; -$a->strings["Enable LiveJournal Post Plugin"] = ""; -$a->strings["LiveJournal username"] = ""; -$a->strings["LiveJournal password"] = ""; -$a->strings["Post to LiveJournal by default"] = ""; -$a->strings["Submit"] = "Senda inn"; +App::$strings["Post to LiveJournal"] = ""; +App::$strings["LiveJournal Post Settings"] = ""; +App::$strings["Enable LiveJournal Post Plugin"] = ""; +App::$strings["LiveJournal username"] = ""; +App::$strings["LiveJournal password"] = ""; +App::$strings["Post to LiveJournal by default"] = ""; +App::$strings["Submit"] = "Senda inn"; diff --git a/sources/addons/ljpost/lang/it/strings.php b/sources/addons/ljpost/lang/it/strings.php index 8728fe97..7fcdb7ff 100644 --- a/sources/addons/ljpost/lang/it/strings.php +++ b/sources/addons/ljpost/lang/it/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Posta su LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "Impostazioni post LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Abilita il plugin LiveJournal"; -$a->strings["LiveJournal username"] = "LiveJournal username"; -$a->strings["LiveJournal password"] = "LiveJournal password"; -$a->strings["Post to LiveJournal by default"] = "Posta su LiveJournal di default"; -$a->strings["Submit"] = "Invia"; +App::$strings["Post to LiveJournal"] = "Posta su LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "Impostazioni post LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Abilita il plugin LiveJournal"; +App::$strings["LiveJournal username"] = "LiveJournal username"; +App::$strings["LiveJournal password"] = "LiveJournal password"; +App::$strings["Post to LiveJournal by default"] = "Posta su LiveJournal di default"; +App::$strings["Submit"] = "Invia"; diff --git a/sources/addons/ljpost/lang/nb-no/strings.php b/sources/addons/ljpost/lang/nb-no/strings.php index c4e04562..3d4c1b48 100644 --- a/sources/addons/ljpost/lang/nb-no/strings.php +++ b/sources/addons/ljpost/lang/nb-no/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = ""; -$a->strings["LiveJournal Post Settings"] = ""; -$a->strings["Enable LiveJournal Post Plugin"] = ""; -$a->strings["LiveJournal username"] = ""; -$a->strings["LiveJournal password"] = ""; -$a->strings["Post to LiveJournal by default"] = ""; -$a->strings["Submit"] = "Lagre"; +App::$strings["Post to LiveJournal"] = ""; +App::$strings["LiveJournal Post Settings"] = ""; +App::$strings["Enable LiveJournal Post Plugin"] = ""; +App::$strings["LiveJournal username"] = ""; +App::$strings["LiveJournal password"] = ""; +App::$strings["Post to LiveJournal by default"] = ""; +App::$strings["Submit"] = "Lagre"; diff --git a/sources/addons/ljpost/lang/nl/strings.php b/sources/addons/ljpost/lang/nl/strings.php index 52e0be3d..5e478e83 100644 --- a/sources/addons/ljpost/lang/nl/strings.php +++ b/sources/addons/ljpost/lang/nl/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Doorplaatsen naar LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "LiveJournal (berichten doorplaatsen)"; -$a->strings["Enable LiveJournal Post Plugin"] = "Doorplaatsen naar LiveJournal inschakelen"; -$a->strings["LiveJournal username"] = "Gebruikersnaam LiveJournal"; -$a->strings["LiveJournal password"] = "Wachtwoord LiveJournal"; -$a->strings["Post to LiveJournal by default"] = "Berichten standaard naar LiveJournal doorplaatsen"; -$a->strings["Submit"] = "Opslaan"; +App::$strings["Post to LiveJournal"] = "Doorplaatsen naar LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "LiveJournal (berichten doorplaatsen)"; +App::$strings["Enable LiveJournal Post Plugin"] = "Doorplaatsen naar LiveJournal inschakelen"; +App::$strings["LiveJournal username"] = "Gebruikersnaam LiveJournal"; +App::$strings["LiveJournal password"] = "Wachtwoord LiveJournal"; +App::$strings["Post to LiveJournal by default"] = "Berichten standaard naar LiveJournal doorplaatsen"; +App::$strings["Submit"] = "Opslaan"; diff --git a/sources/addons/ljpost/lang/pl/strings.php b/sources/addons/ljpost/lang/pl/strings.php index 3497dc2c..6a733153 100644 --- a/sources/addons/ljpost/lang/pl/strings.php +++ b/sources/addons/ljpost/lang/pl/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Post do LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "Ustawienia postów do LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = ""; -$a->strings["LiveJournal username"] = "Nazwa użytkownika do LiveJournal"; -$a->strings["LiveJournal password"] = "Hasło do LiveJournal"; -$a->strings["Post to LiveJournal by default"] = "automatycznie publikuj na LiveJournal"; -$a->strings["Submit"] = "Potwierdź"; +App::$strings["Post to LiveJournal"] = "Post do LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "Ustawienia postów do LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = ""; +App::$strings["LiveJournal username"] = "Nazwa użytkownika do LiveJournal"; +App::$strings["LiveJournal password"] = "Hasło do LiveJournal"; +App::$strings["Post to LiveJournal by default"] = "automatycznie publikuj na LiveJournal"; +App::$strings["Submit"] = "Potwierdź"; diff --git a/sources/addons/ljpost/lang/pt-br/strings.php b/sources/addons/ljpost/lang/pt-br/strings.php index 3d99fb28..fb1d7cf2 100644 --- a/sources/addons/ljpost/lang/pt-br/strings.php +++ b/sources/addons/ljpost/lang/pt-br/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "Publicar no LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "Configurações de publicação no LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Habilitar o plugin de publicação no LiveJournal"; -$a->strings["LiveJournal username"] = "Nome de usuário do LiveJournal"; -$a->strings["LiveJournal password"] = "Senha do LiveJournal"; -$a->strings["Post to LiveJournal by default"] = "Publicar no LiveJournal por padrão"; -$a->strings["Submit"] = "Enviar"; +App::$strings["Post to LiveJournal"] = "Publicar no LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "Configurações de publicação no LiveJournal"; +App::$strings["Enable LiveJournal Post Plugin"] = "Habilitar o plugin de publicação no LiveJournal"; +App::$strings["LiveJournal username"] = "Nome de usuário do LiveJournal"; +App::$strings["LiveJournal password"] = "Senha do LiveJournal"; +App::$strings["Post to LiveJournal by default"] = "Publicar no LiveJournal por padrão"; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/ljpost/lang/ru/strings.php b/sources/addons/ljpost/lang/ru/strings.php index 8e847437..ea7a52fa 100644 --- a/sources/addons/ljpost/lang/ru/strings.php +++ b/sources/addons/ljpost/lang/ru/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = ""; -$a->strings["LiveJournal Post Settings"] = ""; -$a->strings["Enable LiveJournal Post Plugin"] = "Включить LiveJournal плагин сообщений"; -$a->strings["LiveJournal username"] = ""; -$a->strings["LiveJournal password"] = ""; -$a->strings["Post to LiveJournal by default"] = ""; -$a->strings["Submit"] = "Подтвердить"; +App::$strings["Post to LiveJournal"] = ""; +App::$strings["LiveJournal Post Settings"] = ""; +App::$strings["Enable LiveJournal Post Plugin"] = "Включить LiveJournal плагин сообщений"; +App::$strings["LiveJournal username"] = ""; +App::$strings["LiveJournal password"] = ""; +App::$strings["Post to LiveJournal by default"] = ""; +App::$strings["Submit"] = "Подтвердить"; diff --git a/sources/addons/ljpost/lang/sv/strings.php b/sources/addons/ljpost/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/ljpost/lang/sv/strings.php +++ b/sources/addons/ljpost/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/ljpost/lang/zh-cn/strings.php b/sources/addons/ljpost/lang/zh-cn/strings.php index f34b6365..e65ec52d 100644 --- a/sources/addons/ljpost/lang/zh-cn/strings.php +++ b/sources/addons/ljpost/lang/zh-cn/strings.php @@ -1,9 +1,9 @@ strings["Post to LiveJournal"] = "转播到LiveJournal"; -$a->strings["LiveJournal Post Settings"] = "LiveJournal转播设置"; -$a->strings["Enable LiveJournal Post Plugin"] = "使Livejournal转播插件可用"; -$a->strings["LiveJournal username"] = "LiveJournal用户名"; -$a->strings["LiveJournal password"] = "LiveJournal密码"; -$a->strings["Post to LiveJournal by default"] = "默认地转播到LiveJournal"; -$a->strings["Submit"] = "提交"; +App::$strings["Post to LiveJournal"] = "转播到LiveJournal"; +App::$strings["LiveJournal Post Settings"] = "LiveJournal转播设置"; +App::$strings["Enable LiveJournal Post Plugin"] = "使Livejournal转播插件可用"; +App::$strings["LiveJournal username"] = "LiveJournal用户名"; +App::$strings["LiveJournal password"] = "LiveJournal密码"; +App::$strings["Post to LiveJournal by default"] = "默认地转播到LiveJournal"; +App::$strings["Submit"] = "提交"; diff --git a/sources/addons/ljpost/ljpost.php b/sources/addons/ljpost/ljpost.php index 067daf0a..b8946af0 100755 --- a/sources/addons/ljpost/ljpost.php +++ b/sources/addons/ljpost/ljpost.php @@ -51,7 +51,7 @@ function ljpost_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ diff --git a/sources/addons/mahjongg/mahjongg.php b/sources/addons/mahjongg/mahjongg.php index c3c0ac04..53bbca10 100755 --- a/sources/addons/mahjongg/mahjongg.php +++ b/sources/addons/mahjongg/mahjongg.php @@ -27,7 +27,7 @@ function mahjongg_module() {} function mahjongg_content(&$a) { -$baseurl = $a->get_baseurl() . '/addon/mahjongg'; +$baseurl = z_root() . '/addon/mahjongg'; $o .= <<< EOT

diff --git a/sources/addons/mailhost/mailhost.php b/sources/addons/mailhost/mailhost.php index 045619cd..20a00930 100644 --- a/sources/addons/mailhost/mailhost.php +++ b/sources/addons/mailhost/mailhost.php @@ -30,7 +30,7 @@ function mailhost_addon_settings(&$a,&$s) { $mailhost = get_pconfig(local_channel(),'system','email_notify_host'); if(! $mailhost) - $mailhost = $a->get_hostname(); + $mailhost = App::get_hostname(); $sc .= replace_macros(get_markup_template('field_input.tpl'), array( '$field' => array('mailhost-mailhost', t('Email notification hub'), $mailhost, t('Hostname')) diff --git a/sources/addons/metatag/install.txt b/sources/addons/metatag/install.txt index 4f6287b5..331f4c1f 100644 --- a/sources/addons/metatag/install.txt +++ b/sources/addons/metatag/install.txt @@ -2,21 +2,21 @@ Example of configuration in .htconfig.php Uncomment hreflang and setup your on Language Code if you like to get index in teh search motors by Language ///////////////META TAGS CONFIGURATION HOME BASE//////////////////////////////// -//$a->config['metatag']['hreflang'] = ''; -$a->config['metatag']['description'] = ' +//App::$config['metatag']['hreflang'] = ''; +App::$config['metatag']['description'] = ' '; -$a->config['metatag']['robots'] = ''; -$a->config['metatag']['keywords'] = ''; +App::$config['metatag']['robots'] = ''; +App::$config['metatag']['keywords'] = ''; //////Registration Description -$a->config['metatag']['descriptionR'] = ''; +App::$config['metatag']['descriptionR'] = ''; //////Login Description -$a->config['metatag']['descriptionL'] = ''; +App::$config['metatag']['descriptionL'] = ''; /////Directory Description -$a->config['metatag']['descriptionD'] = ''; +App::$config['metatag']['descriptionD'] = ''; ////Directory PUBLIC -$a->config['metatag']['descriptionP'] = ''; +App::$config['metatag']['descriptionP'] = ''; ///Directory APPS -$a->config['metatag']['descriptionA'] = ''; +App::$config['metatag']['descriptionA'] = ''; ////Latest News Yu can use that for any of your Aplications -$a->config['metatag']['descriptionN'] = ''; +App::$config['metatag']['descriptionN'] = ''; diff --git a/sources/addons/metatag/metatag.php b/sources/addons/metatag/metatag.php index 5fd919ae..ab035c72 100644 --- a/sources/addons/metatag/metatag.php +++ b/sources/addons/metatag/metatag.php @@ -48,95 +48,95 @@ $descriptionN = get_config('metatag','descriptionN'); $url = $_SERVER['REQUEST_URI']; switch($url){ case "/"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; - $a->page['htmlhead'] .= "$description" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; + App::$page['htmlhead'] .= "$description" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/&JS=1"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; - $a->page['htmlhead'] .= "$description" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; + App::$page['htmlhead'] .= "$description" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/register"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionR" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionR" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/register&JS=1"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionR" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionR" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/login&JS=1"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionL" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionL" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/login"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionL" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionL" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/pubsites"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionP" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionP" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/pubsub&JS=1"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionP" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionP" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/apps"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionA" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionA" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/apps&JS=1"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionA" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionA" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/directory"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionD" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionD" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/directory&JS=1"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionD" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionD" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; case "/news"; - $a->page['htmlhead'] .= "$hreflang" . "\r\n"; - $a->page['htmlhead'] .= "$robots" . "\r\n"; -$a->page['htmlhead'] .= "$descriptionN" . "\r\n"; - $a->page['htmlhead'] .= "$keywords" . "\r\n"; + App::$page['htmlhead'] .= "$hreflang" . "\r\n"; + App::$page['htmlhead'] .= "$robots" . "\r\n"; +App::$page['htmlhead'] .= "$descriptionN" . "\r\n"; + App::$page['htmlhead'] .= "$keywords" . "\r\n"; break; } diff --git a/sources/addons/morechoice/morechoice.php b/sources/addons/morechoice/morechoice.php index fa634d9c..d25972d9 100644 --- a/sources/addons/morechoice/morechoice.php +++ b/sources/addons/morechoice/morechoice.php @@ -28,7 +28,7 @@ function morechoice_unload() { // We aren't going to bother translating these to other languages. function morechoice_gender_selector($a,&$b) { - if($a->config['system']['language'] == 'en') { + if(App::$config['system']['language'] == 'en') { $b[] = 'Androgyne'; $b[] = 'Bear'; $b[] = 'Bigender'; @@ -56,7 +56,7 @@ function morechoice_gender_selector($a,&$b) { } function morechoice_sexpref_selector($a,&$b) { - if($a->config['system']['language'] == 'en') { + if(App::$config['system']['language'] == 'en') { $b[] = 'Girls with big tits'; $b[] = 'Millionaires'; $b[] = 'Guys with big schlongs'; @@ -111,7 +111,7 @@ function morechoice_sexpref_selector($a,&$b) { } function morechoice_marital_selector($a,&$b) { - if($a->config['system']['language'] == 'en') { + if(App::$config['system']['language'] == 'en') { $b[] = 'Married to my job'; $b[] = 'Polygamist'; $b[] = 'Half married'; diff --git a/sources/addons/morepokes/lang/ca/strings.php b/sources/addons/morepokes/lang/ca/strings.php index 81afa8a6..8ee4ba0a 100644 --- a/sources/addons/morepokes/lang/ca/strings.php +++ b/sources/addons/morepokes/lang/ca/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = "bufetada"; -$a->strings["bitchslapped"] = "bufetejat"; -$a->strings["shag"] = "fotut"; -$a->strings["shagged"] = "fotre"; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; -$a->strings["declare undying love for"] = "declara amor inmortal a"; -$a->strings["declared undying love for"] = "declarat amor inmortal a"; -$a->strings["patent"] = "patent"; -$a->strings["patented"] = "patentat"; -$a->strings["stroke beard"] = ""; -$a->strings["stroked their beard at"] = ""; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["hug"] = ""; -$a->strings["hugged"] = ""; -$a->strings["kiss"] = "petó"; -$a->strings["kissed"] = "besat"; -$a->strings["raise eyebrows at"] = "sorprès"; -$a->strings["raised their eyebrows at"] = "es van sorprendre"; -$a->strings["insult"] = "insult"; -$a->strings["insulted"] = "insultat"; -$a->strings["praise"] = ""; -$a->strings["praised"] = ""; -$a->strings["be dubious of"] = ""; -$a->strings["was dubious of"] = ""; -$a->strings["eat"] = "menja"; -$a->strings["ate"] = "menjà"; -$a->strings["giggle and fawn at"] = ""; -$a->strings["giggled and fawned at"] = ""; -$a->strings["doubt"] = "dubte"; -$a->strings["doubted"] = "dubitat"; -$a->strings["glare"] = ""; -$a->strings["glared at"] = ""; +App::$strings["bitchslap"] = "bufetada"; +App::$strings["bitchslapped"] = "bufetejat"; +App::$strings["shag"] = "fotut"; +App::$strings["shagged"] = "fotre"; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = ""; +App::$strings["pointed out the poke feature to"] = ""; +App::$strings["declare undying love for"] = "declara amor inmortal a"; +App::$strings["declared undying love for"] = "declarat amor inmortal a"; +App::$strings["patent"] = "patent"; +App::$strings["patented"] = "patentat"; +App::$strings["stroke beard"] = ""; +App::$strings["stroked their beard at"] = ""; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["hug"] = ""; +App::$strings["hugged"] = ""; +App::$strings["kiss"] = "petó"; +App::$strings["kissed"] = "besat"; +App::$strings["raise eyebrows at"] = "sorprès"; +App::$strings["raised their eyebrows at"] = "es van sorprendre"; +App::$strings["insult"] = "insult"; +App::$strings["insulted"] = "insultat"; +App::$strings["praise"] = ""; +App::$strings["praised"] = ""; +App::$strings["be dubious of"] = ""; +App::$strings["was dubious of"] = ""; +App::$strings["eat"] = "menja"; +App::$strings["ate"] = "menjà"; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = "dubte"; +App::$strings["doubted"] = "dubitat"; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; diff --git a/sources/addons/morepokes/lang/cs/strings.php b/sources/addons/morepokes/lang/cs/strings.php index 217c52bb..bcf0cdba 100644 --- a/sources/addons/morepokes/lang/cs/strings.php +++ b/sources/addons/morepokes/lang/cs/strings.php @@ -5,39 +5,39 @@ function string_plural_select_cs($n){ return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;; }} ; -$a->strings["bitchslap"] = "dát facku"; -$a->strings["bitchslapped"] = "dostat facku"; -$a->strings["shag"] = ""; -$a->strings["shagged"] = ""; -$a->strings["do something obscenely biological to"] = "udělat něco obscéně biologického uživateli"; -$a->strings["did something obscenely biological to"] = "udělal něco obscéně biologického uživateli"; -$a->strings["point out the poke feature to"] = "upozornit na poke funkci uživatele"; -$a->strings["pointed out the poke feature to"] = "upozorněn na poke funkci "; -$a->strings["declare undying love for"] = "vyjadřit nehynoucí lásku ke"; -$a->strings["declared undying love for"] = "vyjadřil nehynoucí lásku ke"; -$a->strings["patent"] = "patentovat"; -$a->strings["patented"] = "patentován"; -$a->strings["stroke beard"] = "pohladit plnovous"; -$a->strings["stroked their beard at"] = "pohladit něčí plnovous"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "stěžující si na klesající úroveň moderního sekundárního a terciárního vzdělávání u"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "stěžovat si na klesající úroveň moderního sekundárního a terciárního vzdělávání u"; -$a->strings["hug"] = "obejmout"; -$a->strings["hugged"] = "obejmut "; -$a->strings["kiss"] = "políbit"; -$a->strings["kissed"] = "políben"; -$a->strings["raise eyebrows at"] = "zvednout obočí na"; -$a->strings["raised their eyebrows at"] = "zvednul obočí na"; -$a->strings["insult"] = "urazit"; -$a->strings["insulted"] = "uražen"; -$a->strings["praise"] = "pochválit"; -$a->strings["praised"] = "pochválen"; -$a->strings["be dubious of"] = "mít pochyby o"; -$a->strings["was dubious of"] = "má pochybnosti z"; -$a->strings["eat"] = "sníst"; -$a->strings["ate"] = "snězen"; -$a->strings["giggle and fawn at"] = "hihňat se"; -$a->strings["giggled and fawned at"] = "hihňá se"; -$a->strings["doubt"] = "pochybovat"; -$a->strings["doubted"] = "pochybující"; -$a->strings["glare"] = "zabodáván pohledem"; -$a->strings["glared at"] = "zabodávat pohledem "; +App::$strings["bitchslap"] = "dát facku"; +App::$strings["bitchslapped"] = "dostat facku"; +App::$strings["shag"] = ""; +App::$strings["shagged"] = ""; +App::$strings["do something obscenely biological to"] = "udělat něco obscéně biologického uživateli"; +App::$strings["did something obscenely biological to"] = "udělal něco obscéně biologického uživateli"; +App::$strings["point out the poke feature to"] = "upozornit na poke funkci uživatele"; +App::$strings["pointed out the poke feature to"] = "upozorněn na poke funkci "; +App::$strings["declare undying love for"] = "vyjadřit nehynoucí lásku ke"; +App::$strings["declared undying love for"] = "vyjadřil nehynoucí lásku ke"; +App::$strings["patent"] = "patentovat"; +App::$strings["patented"] = "patentován"; +App::$strings["stroke beard"] = "pohladit plnovous"; +App::$strings["stroked their beard at"] = "pohladit něčí plnovous"; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = "stěžující si na klesající úroveň moderního sekundárního a terciárního vzdělávání u"; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = "stěžovat si na klesající úroveň moderního sekundárního a terciárního vzdělávání u"; +App::$strings["hug"] = "obejmout"; +App::$strings["hugged"] = "obejmut "; +App::$strings["kiss"] = "políbit"; +App::$strings["kissed"] = "políben"; +App::$strings["raise eyebrows at"] = "zvednout obočí na"; +App::$strings["raised their eyebrows at"] = "zvednul obočí na"; +App::$strings["insult"] = "urazit"; +App::$strings["insulted"] = "uražen"; +App::$strings["praise"] = "pochválit"; +App::$strings["praised"] = "pochválen"; +App::$strings["be dubious of"] = "mít pochyby o"; +App::$strings["was dubious of"] = "má pochybnosti z"; +App::$strings["eat"] = "sníst"; +App::$strings["ate"] = "snězen"; +App::$strings["giggle and fawn at"] = "hihňat se"; +App::$strings["giggled and fawned at"] = "hihňá se"; +App::$strings["doubt"] = "pochybovat"; +App::$strings["doubted"] = "pochybující"; +App::$strings["glare"] = "zabodáván pohledem"; +App::$strings["glared at"] = "zabodávat pohledem "; diff --git a/sources/addons/morepokes/lang/de/strings.php b/sources/addons/morepokes/lang/de/strings.php index 1aa17032..ff045df4 100644 --- a/sources/addons/morepokes/lang/de/strings.php +++ b/sources/addons/morepokes/lang/de/strings.php @@ -5,39 +5,39 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["bitchslap"] = "ohrfeigen"; -$a->strings["bitchslapped"] = "ohrfeigte"; -$a->strings["shag"] = "poppen"; -$a->strings["shagged"] = "poppte"; -$a->strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen"; -$a->strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit"; -$a->strings["point out the poke feature to"] = "zeigte die neue Anstups-Funktion"; -$a->strings["pointed out the poke feature to"] = "zeigte die neue Anstups-Funktion"; -$a->strings["declare undying love for"] = "unterbliche Liebe verkünden"; -$a->strings["declared undying love for"] = "verkündete unsterbliche Liebe für"; -$a->strings["patent"] = "patentieren"; -$a->strings["patented"] = "patentierte"; -$a->strings["stroke beard"] = "sich den Bart kratzen"; -$a->strings["stroked their beard at"] = "kratzte sich den Bart in Richtung"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei"; -$a->strings["hug"] = "umarmen"; -$a->strings["hugged"] = "umarmte"; -$a->strings["kiss"] = "küssen"; -$a->strings["kissed"] = "küsste"; -$a->strings["raise eyebrows at"] = "Augenbrauen hochziehen"; -$a->strings["raised their eyebrows at"] = "zog die Augenbrauen hoch in Richtung"; -$a->strings["insult"] = "beleidigen"; -$a->strings["insulted"] = "beleidigte"; -$a->strings["praise"] = "preisen"; -$a->strings["praised"] = "pries"; -$a->strings["be dubious of"] = "ungewiss sein"; -$a->strings["was dubious of"] = "war ungewiss über"; -$a->strings["eat"] = "essen"; -$a->strings["ate"] = "aß"; -$a->strings["giggle and fawn at"] = "kichern und einschleimen"; -$a->strings["giggled and fawned at"] = "kicherte und schleimte sich ein bei"; -$a->strings["doubt"] = "bezweifeln"; -$a->strings["doubted"] = "bezweifelte"; -$a->strings["glare"] = "zornig anstarren"; -$a->strings["glared at"] = "starrte zornig auf"; +App::$strings["bitchslap"] = "ohrfeigen"; +App::$strings["bitchslapped"] = "ohrfeigte"; +App::$strings["shag"] = "poppen"; +App::$strings["shagged"] = "poppte"; +App::$strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen"; +App::$strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit"; +App::$strings["point out the poke feature to"] = "zeigte die neue Anstups-Funktion"; +App::$strings["pointed out the poke feature to"] = "zeigte die neue Anstups-Funktion"; +App::$strings["declare undying love for"] = "unterbliche Liebe verkünden"; +App::$strings["declared undying love for"] = "verkündete unsterbliche Liebe für"; +App::$strings["patent"] = "patentieren"; +App::$strings["patented"] = "patentierte"; +App::$strings["stroke beard"] = "sich den Bart kratzen"; +App::$strings["stroked their beard at"] = "kratzte sich den Bart in Richtung"; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen"; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei"; +App::$strings["hug"] = "umarmen"; +App::$strings["hugged"] = "umarmte"; +App::$strings["kiss"] = "küssen"; +App::$strings["kissed"] = "küsste"; +App::$strings["raise eyebrows at"] = "Augenbrauen hochziehen"; +App::$strings["raised their eyebrows at"] = "zog die Augenbrauen hoch in Richtung"; +App::$strings["insult"] = "beleidigen"; +App::$strings["insulted"] = "beleidigte"; +App::$strings["praise"] = "preisen"; +App::$strings["praised"] = "pries"; +App::$strings["be dubious of"] = "ungewiss sein"; +App::$strings["was dubious of"] = "war ungewiss über"; +App::$strings["eat"] = "essen"; +App::$strings["ate"] = "aß"; +App::$strings["giggle and fawn at"] = "kichern und einschleimen"; +App::$strings["giggled and fawned at"] = "kicherte und schleimte sich ein bei"; +App::$strings["doubt"] = "bezweifeln"; +App::$strings["doubted"] = "bezweifelte"; +App::$strings["glare"] = "zornig anstarren"; +App::$strings["glared at"] = "starrte zornig auf"; diff --git a/sources/addons/morepokes/lang/eo/strings.php b/sources/addons/morepokes/lang/eo/strings.php index 139fa59f..a4b3bbd1 100644 --- a/sources/addons/morepokes/lang/eo/strings.php +++ b/sources/addons/morepokes/lang/eo/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = ""; -$a->strings["bitchslapped"] = ""; -$a->strings["shag"] = ""; -$a->strings["shagged"] = ""; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; -$a->strings["declare undying love for"] = ""; -$a->strings["declared undying love for"] = ""; -$a->strings["patent"] = ""; -$a->strings["patented"] = ""; -$a->strings["stroke beard"] = ""; -$a->strings["stroked their beard at"] = ""; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["hug"] = ""; -$a->strings["hugged"] = ""; -$a->strings["kiss"] = ""; -$a->strings["kissed"] = ""; -$a->strings["raise eyebrows at"] = ""; -$a->strings["raised their eyebrows at"] = ""; -$a->strings["insult"] = ""; -$a->strings["insulted"] = ""; -$a->strings["praise"] = ""; -$a->strings["praised"] = ""; -$a->strings["be dubious of"] = ""; -$a->strings["was dubious of"] = ""; -$a->strings["eat"] = ""; -$a->strings["ate"] = ""; -$a->strings["giggle and fawn at"] = ""; -$a->strings["giggled and fawned at"] = ""; -$a->strings["doubt"] = ""; -$a->strings["doubted"] = ""; -$a->strings["glare"] = ""; -$a->strings["glared at"] = ""; +App::$strings["bitchslap"] = ""; +App::$strings["bitchslapped"] = ""; +App::$strings["shag"] = ""; +App::$strings["shagged"] = ""; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = ""; +App::$strings["pointed out the poke feature to"] = ""; +App::$strings["declare undying love for"] = ""; +App::$strings["declared undying love for"] = ""; +App::$strings["patent"] = ""; +App::$strings["patented"] = ""; +App::$strings["stroke beard"] = ""; +App::$strings["stroked their beard at"] = ""; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["hug"] = ""; +App::$strings["hugged"] = ""; +App::$strings["kiss"] = ""; +App::$strings["kissed"] = ""; +App::$strings["raise eyebrows at"] = ""; +App::$strings["raised their eyebrows at"] = ""; +App::$strings["insult"] = ""; +App::$strings["insulted"] = ""; +App::$strings["praise"] = ""; +App::$strings["praised"] = ""; +App::$strings["be dubious of"] = ""; +App::$strings["was dubious of"] = ""; +App::$strings["eat"] = ""; +App::$strings["ate"] = ""; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = ""; +App::$strings["doubted"] = ""; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; diff --git a/sources/addons/morepokes/lang/es/strings.php b/sources/addons/morepokes/lang/es/strings.php index dc307fc6..a6f724e1 100644 --- a/sources/addons/morepokes/lang/es/strings.php +++ b/sources/addons/morepokes/lang/es/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = "abofetear fuerte"; -$a->strings["bitchslapped"] = "abofeteó fuertemente a"; -$a->strings["shag"] = "picar"; -$a->strings["shagged"] = "picó a"; -$a->strings["do something obscenely biological to"] = "hacer algo obsceno y biológico a"; -$a->strings["did something obscenely biological to"] = "hizo algo obsceno y biológico a"; -$a->strings["point out the poke feature to"] = "señalar la habilidad de toques a"; -$a->strings["pointed out the poke feature to"] = "señaló la habilidad de toques a"; -$a->strings["declare undying love for"] = "declarar amor incondicional a"; -$a->strings["declared undying love for"] = "declaró amor incondicional a"; -$a->strings["patent"] = "patentar"; -$a->strings["patented"] = "patentó"; -$a->strings["stroke beard"] = "acariciar barba"; -$a->strings["stroked their beard at"] = "acarició su barba a"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplorar los bajos estándares de educación secundaria y terciaria moderna a"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplora los bajos estándares de educación secundaria y terciaria moderna a"; -$a->strings["hug"] = "abrazar"; -$a->strings["hugged"] = "abrazó a"; -$a->strings["kiss"] = "besar"; -$a->strings["kissed"] = "besó a"; -$a->strings["raise eyebrows at"] = "alzar las cejas a"; -$a->strings["raised their eyebrows at"] = "alzó sus cejas a"; -$a->strings["insult"] = "insultar"; -$a->strings["insulted"] = "insultó a"; -$a->strings["praise"] = "alabar"; -$a->strings["praised"] = "alabó a"; -$a->strings["be dubious of"] = "dudar de"; -$a->strings["was dubious of"] = "dudó de"; -$a->strings["eat"] = "comer"; -$a->strings["ate"] = "comió"; -$a->strings["giggle and fawn at"] = "reír y carcajearse de"; -$a->strings["giggled and fawned at"] = "rió y se carcajeó de"; -$a->strings["doubt"] = "dudar"; -$a->strings["doubted"] = "dudó"; -$a->strings["glare"] = "mirar fijamente"; -$a->strings["glared at"] = "miró fijamente a"; +App::$strings["bitchslap"] = "abofetear fuerte"; +App::$strings["bitchslapped"] = "abofeteó fuertemente a"; +App::$strings["shag"] = "picar"; +App::$strings["shagged"] = "picó a"; +App::$strings["do something obscenely biological to"] = "hacer algo obsceno y biológico a"; +App::$strings["did something obscenely biological to"] = "hizo algo obsceno y biológico a"; +App::$strings["point out the poke feature to"] = "señalar la habilidad de toques a"; +App::$strings["pointed out the poke feature to"] = "señaló la habilidad de toques a"; +App::$strings["declare undying love for"] = "declarar amor incondicional a"; +App::$strings["declared undying love for"] = "declaró amor incondicional a"; +App::$strings["patent"] = "patentar"; +App::$strings["patented"] = "patentó"; +App::$strings["stroke beard"] = "acariciar barba"; +App::$strings["stroked their beard at"] = "acarició su barba a"; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplorar los bajos estándares de educación secundaria y terciaria moderna a"; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplora los bajos estándares de educación secundaria y terciaria moderna a"; +App::$strings["hug"] = "abrazar"; +App::$strings["hugged"] = "abrazó a"; +App::$strings["kiss"] = "besar"; +App::$strings["kissed"] = "besó a"; +App::$strings["raise eyebrows at"] = "alzar las cejas a"; +App::$strings["raised their eyebrows at"] = "alzó sus cejas a"; +App::$strings["insult"] = "insultar"; +App::$strings["insulted"] = "insultó a"; +App::$strings["praise"] = "alabar"; +App::$strings["praised"] = "alabó a"; +App::$strings["be dubious of"] = "dudar de"; +App::$strings["was dubious of"] = "dudó de"; +App::$strings["eat"] = "comer"; +App::$strings["ate"] = "comió"; +App::$strings["giggle and fawn at"] = "reír y carcajearse de"; +App::$strings["giggled and fawned at"] = "rió y se carcajeó de"; +App::$strings["doubt"] = "dudar"; +App::$strings["doubted"] = "dudó"; +App::$strings["glare"] = "mirar fijamente"; +App::$strings["glared at"] = "miró fijamente a"; diff --git a/sources/addons/morepokes/lang/fr/strings.php b/sources/addons/morepokes/lang/fr/strings.php index 30161647..002949f8 100644 --- a/sources/addons/morepokes/lang/fr/strings.php +++ b/sources/addons/morepokes/lang/fr/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = "faire un coup de pute"; -$a->strings["bitchslapped"] = "a fait un coup de pute à"; -$a->strings["shag"] = "niquer"; -$a->strings["shagged"] = "a niqué"; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = "indiquer les sollicitations"; -$a->strings["pointed out the poke feature to"] = "a indiqué les sollicitations à"; -$a->strings["declare undying love for"] = "déclarer sa flamme"; -$a->strings["declared undying love for"] = "a déclaré sa flamme à"; -$a->strings["patent"] = "faire breveter"; -$a->strings["patented"] = "a fait breveter"; -$a->strings["stroke beard"] = "frotter sa barbe"; -$a->strings["stroked their beard at"] = "a frotté sa barbe sur"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "se lamenter sur les valeurs qui se perdent"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "s'est lamenté du lent déclin des valeurs auprès de"; -$a->strings["hug"] = "faire un calin"; -$a->strings["hugged"] = "a fait un câlin à"; -$a->strings["kiss"] = "embrasser"; -$a->strings["kissed"] = "a embrassé"; -$a->strings["raise eyebrows at"] = "hausser le sourcil"; -$a->strings["raised their eyebrows at"] = "a haussé le sourcil à "; -$a->strings["insult"] = "insulter"; -$a->strings["insulted"] = "a insulté"; -$a->strings["praise"] = "louer"; -$a->strings["praised"] = "a loué"; -$a->strings["be dubious of"] = "trouver douteux"; -$a->strings["was dubious of"] = "a trouvé douteux "; -$a->strings["eat"] = "manger"; -$a->strings["ate"] = "a mangé "; -$a->strings["giggle and fawn at"] = "se payer la tête"; -$a->strings["giggled and fawned at"] = "s'est payé la tête de"; -$a->strings["doubt"] = "mettre en doute"; -$a->strings["doubted"] = "a mis en doute "; -$a->strings["glare"] = "fixer"; -$a->strings["glared at"] = "a fixé"; +App::$strings["bitchslap"] = "faire un coup de pute"; +App::$strings["bitchslapped"] = "a fait un coup de pute à"; +App::$strings["shag"] = "niquer"; +App::$strings["shagged"] = "a niqué"; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = "indiquer les sollicitations"; +App::$strings["pointed out the poke feature to"] = "a indiqué les sollicitations à"; +App::$strings["declare undying love for"] = "déclarer sa flamme"; +App::$strings["declared undying love for"] = "a déclaré sa flamme à"; +App::$strings["patent"] = "faire breveter"; +App::$strings["patented"] = "a fait breveter"; +App::$strings["stroke beard"] = "frotter sa barbe"; +App::$strings["stroked their beard at"] = "a frotté sa barbe sur"; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = "se lamenter sur les valeurs qui se perdent"; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = "s'est lamenté du lent déclin des valeurs auprès de"; +App::$strings["hug"] = "faire un calin"; +App::$strings["hugged"] = "a fait un câlin à"; +App::$strings["kiss"] = "embrasser"; +App::$strings["kissed"] = "a embrassé"; +App::$strings["raise eyebrows at"] = "hausser le sourcil"; +App::$strings["raised their eyebrows at"] = "a haussé le sourcil à "; +App::$strings["insult"] = "insulter"; +App::$strings["insulted"] = "a insulté"; +App::$strings["praise"] = "louer"; +App::$strings["praised"] = "a loué"; +App::$strings["be dubious of"] = "trouver douteux"; +App::$strings["was dubious of"] = "a trouvé douteux "; +App::$strings["eat"] = "manger"; +App::$strings["ate"] = "a mangé "; +App::$strings["giggle and fawn at"] = "se payer la tête"; +App::$strings["giggled and fawned at"] = "s'est payé la tête de"; +App::$strings["doubt"] = "mettre en doute"; +App::$strings["doubted"] = "a mis en doute "; +App::$strings["glare"] = "fixer"; +App::$strings["glared at"] = "a fixé"; diff --git a/sources/addons/morepokes/lang/is/strings.php b/sources/addons/morepokes/lang/is/strings.php index 139fa59f..a4b3bbd1 100644 --- a/sources/addons/morepokes/lang/is/strings.php +++ b/sources/addons/morepokes/lang/is/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = ""; -$a->strings["bitchslapped"] = ""; -$a->strings["shag"] = ""; -$a->strings["shagged"] = ""; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; -$a->strings["declare undying love for"] = ""; -$a->strings["declared undying love for"] = ""; -$a->strings["patent"] = ""; -$a->strings["patented"] = ""; -$a->strings["stroke beard"] = ""; -$a->strings["stroked their beard at"] = ""; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["hug"] = ""; -$a->strings["hugged"] = ""; -$a->strings["kiss"] = ""; -$a->strings["kissed"] = ""; -$a->strings["raise eyebrows at"] = ""; -$a->strings["raised their eyebrows at"] = ""; -$a->strings["insult"] = ""; -$a->strings["insulted"] = ""; -$a->strings["praise"] = ""; -$a->strings["praised"] = ""; -$a->strings["be dubious of"] = ""; -$a->strings["was dubious of"] = ""; -$a->strings["eat"] = ""; -$a->strings["ate"] = ""; -$a->strings["giggle and fawn at"] = ""; -$a->strings["giggled and fawned at"] = ""; -$a->strings["doubt"] = ""; -$a->strings["doubted"] = ""; -$a->strings["glare"] = ""; -$a->strings["glared at"] = ""; +App::$strings["bitchslap"] = ""; +App::$strings["bitchslapped"] = ""; +App::$strings["shag"] = ""; +App::$strings["shagged"] = ""; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = ""; +App::$strings["pointed out the poke feature to"] = ""; +App::$strings["declare undying love for"] = ""; +App::$strings["declared undying love for"] = ""; +App::$strings["patent"] = ""; +App::$strings["patented"] = ""; +App::$strings["stroke beard"] = ""; +App::$strings["stroked their beard at"] = ""; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["hug"] = ""; +App::$strings["hugged"] = ""; +App::$strings["kiss"] = ""; +App::$strings["kissed"] = ""; +App::$strings["raise eyebrows at"] = ""; +App::$strings["raised their eyebrows at"] = ""; +App::$strings["insult"] = ""; +App::$strings["insulted"] = ""; +App::$strings["praise"] = ""; +App::$strings["praised"] = ""; +App::$strings["be dubious of"] = ""; +App::$strings["was dubious of"] = ""; +App::$strings["eat"] = ""; +App::$strings["ate"] = ""; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = ""; +App::$strings["doubted"] = ""; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; diff --git a/sources/addons/morepokes/lang/it/strings.php b/sources/addons/morepokes/lang/it/strings.php index 90d03c91..8a23bfb4 100644 --- a/sources/addons/morepokes/lang/it/strings.php +++ b/sources/addons/morepokes/lang/it/strings.php @@ -5,39 +5,39 @@ function string_plural_select_it($n){ return ($n != 1);; }} ; -$a->strings["bitchslap"] = "schiaffeggia"; -$a->strings["bitchslapped"] = "ha schiaffeggiato"; -$a->strings["shag"] = "scopa"; -$a->strings["shagged"] = "ha scopato"; -$a->strings["do something obscenely biological to"] = "fa qualcosa di biologicamente osceno a"; -$a->strings["did something obscenely biological to"] = "ha fatto qualcosa di biologicamente osceno a"; -$a->strings["point out the poke feature to"] = "fa vedere la funzione \"stuzzica\" a"; -$a->strings["pointed out the poke feature to"] = "ha fatto vedere la funzione \"stuzzica\" a"; -$a->strings["declare undying love for"] = "dichiara eterno amore per"; -$a->strings["declared undying love for"] = "ha dichiarato eterno amore per"; -$a->strings["patent"] = "brevetta"; -$a->strings["patented"] = "ha brevettato"; -$a->strings["stroke beard"] = "tirare la barba"; -$a->strings["stroked their beard at"] = "ha tirato la barba di"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "lamentati del declino degli standard della moderna istruzione secondaria e terziaria con"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "si è lamentato del declino degli standard della moderna istruzione secondaria e terziaria con"; -$a->strings["hug"] = "abbraccia"; -$a->strings["hugged"] = "ha abbracciato"; -$a->strings["kiss"] = "bacia"; -$a->strings["kissed"] = "ha baciato"; -$a->strings["raise eyebrows at"] = "solleva un sopracciglio verso"; -$a->strings["raised their eyebrows at"] = "ha sollevato un sopracciglio verso"; -$a->strings["insult"] = "insulta"; -$a->strings["insulted"] = "ha insultato"; -$a->strings["praise"] = "prega"; -$a->strings["praised"] = "ha pregato"; -$a->strings["be dubious of"] = "dubita di"; -$a->strings["was dubious of"] = "ha dubitato di"; -$a->strings["eat"] = "mangia"; -$a->strings["ate"] = "ha mangiato"; -$a->strings["giggle and fawn at"] = "sorridi e adula"; -$a->strings["giggled and fawned at"] = "ha sorriso e adulato"; -$a->strings["doubt"] = ""; -$a->strings["doubted"] = ""; -$a->strings["glare"] = "guarda con aria feroce"; -$a->strings["glared at"] = "ha guardato con aria feroce"; +App::$strings["bitchslap"] = "schiaffeggia"; +App::$strings["bitchslapped"] = "ha schiaffeggiato"; +App::$strings["shag"] = "scopa"; +App::$strings["shagged"] = "ha scopato"; +App::$strings["do something obscenely biological to"] = "fa qualcosa di biologicamente osceno a"; +App::$strings["did something obscenely biological to"] = "ha fatto qualcosa di biologicamente osceno a"; +App::$strings["point out the poke feature to"] = "fa vedere la funzione \"stuzzica\" a"; +App::$strings["pointed out the poke feature to"] = "ha fatto vedere la funzione \"stuzzica\" a"; +App::$strings["declare undying love for"] = "dichiara eterno amore per"; +App::$strings["declared undying love for"] = "ha dichiarato eterno amore per"; +App::$strings["patent"] = "brevetta"; +App::$strings["patented"] = "ha brevettato"; +App::$strings["stroke beard"] = "tirare la barba"; +App::$strings["stroked their beard at"] = "ha tirato la barba di"; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = "lamentati del declino degli standard della moderna istruzione secondaria e terziaria con"; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = "si è lamentato del declino degli standard della moderna istruzione secondaria e terziaria con"; +App::$strings["hug"] = "abbraccia"; +App::$strings["hugged"] = "ha abbracciato"; +App::$strings["kiss"] = "bacia"; +App::$strings["kissed"] = "ha baciato"; +App::$strings["raise eyebrows at"] = "solleva un sopracciglio verso"; +App::$strings["raised their eyebrows at"] = "ha sollevato un sopracciglio verso"; +App::$strings["insult"] = "insulta"; +App::$strings["insulted"] = "ha insultato"; +App::$strings["praise"] = "prega"; +App::$strings["praised"] = "ha pregato"; +App::$strings["be dubious of"] = "dubita di"; +App::$strings["was dubious of"] = "ha dubitato di"; +App::$strings["eat"] = "mangia"; +App::$strings["ate"] = "ha mangiato"; +App::$strings["giggle and fawn at"] = "sorridi e adula"; +App::$strings["giggled and fawned at"] = "ha sorriso e adulato"; +App::$strings["doubt"] = ""; +App::$strings["doubted"] = ""; +App::$strings["glare"] = "guarda con aria feroce"; +App::$strings["glared at"] = "ha guardato con aria feroce"; diff --git a/sources/addons/morepokes/lang/nb-no/strings.php b/sources/addons/morepokes/lang/nb-no/strings.php index 139fa59f..a4b3bbd1 100644 --- a/sources/addons/morepokes/lang/nb-no/strings.php +++ b/sources/addons/morepokes/lang/nb-no/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = ""; -$a->strings["bitchslapped"] = ""; -$a->strings["shag"] = ""; -$a->strings["shagged"] = ""; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; -$a->strings["declare undying love for"] = ""; -$a->strings["declared undying love for"] = ""; -$a->strings["patent"] = ""; -$a->strings["patented"] = ""; -$a->strings["stroke beard"] = ""; -$a->strings["stroked their beard at"] = ""; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["hug"] = ""; -$a->strings["hugged"] = ""; -$a->strings["kiss"] = ""; -$a->strings["kissed"] = ""; -$a->strings["raise eyebrows at"] = ""; -$a->strings["raised their eyebrows at"] = ""; -$a->strings["insult"] = ""; -$a->strings["insulted"] = ""; -$a->strings["praise"] = ""; -$a->strings["praised"] = ""; -$a->strings["be dubious of"] = ""; -$a->strings["was dubious of"] = ""; -$a->strings["eat"] = ""; -$a->strings["ate"] = ""; -$a->strings["giggle and fawn at"] = ""; -$a->strings["giggled and fawned at"] = ""; -$a->strings["doubt"] = ""; -$a->strings["doubted"] = ""; -$a->strings["glare"] = ""; -$a->strings["glared at"] = ""; +App::$strings["bitchslap"] = ""; +App::$strings["bitchslapped"] = ""; +App::$strings["shag"] = ""; +App::$strings["shagged"] = ""; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = ""; +App::$strings["pointed out the poke feature to"] = ""; +App::$strings["declare undying love for"] = ""; +App::$strings["declared undying love for"] = ""; +App::$strings["patent"] = ""; +App::$strings["patented"] = ""; +App::$strings["stroke beard"] = ""; +App::$strings["stroked their beard at"] = ""; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["hug"] = ""; +App::$strings["hugged"] = ""; +App::$strings["kiss"] = ""; +App::$strings["kissed"] = ""; +App::$strings["raise eyebrows at"] = ""; +App::$strings["raised their eyebrows at"] = ""; +App::$strings["insult"] = ""; +App::$strings["insulted"] = ""; +App::$strings["praise"] = ""; +App::$strings["praised"] = ""; +App::$strings["be dubious of"] = ""; +App::$strings["was dubious of"] = ""; +App::$strings["eat"] = ""; +App::$strings["ate"] = ""; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = ""; +App::$strings["doubted"] = ""; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; diff --git a/sources/addons/morepokes/lang/pl/strings.php b/sources/addons/morepokes/lang/pl/strings.php index dd7b59e3..a145a25a 100644 --- a/sources/addons/morepokes/lang/pl/strings.php +++ b/sources/addons/morepokes/lang/pl/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = ""; -$a->strings["bitchslapped"] = ""; -$a->strings["shag"] = ""; -$a->strings["shagged"] = ""; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; -$a->strings["declare undying love for"] = ""; -$a->strings["declared undying love for"] = ""; -$a->strings["patent"] = ""; -$a->strings["patented"] = ""; -$a->strings["stroke beard"] = ""; -$a->strings["stroked their beard at"] = ""; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["hug"] = "przytul"; -$a->strings["hugged"] = "przytulony"; -$a->strings["kiss"] = "pocałuj"; -$a->strings["kissed"] = "pocałowany"; -$a->strings["raise eyebrows at"] = ""; -$a->strings["raised their eyebrows at"] = ""; -$a->strings["insult"] = ""; -$a->strings["insulted"] = ""; -$a->strings["praise"] = ""; -$a->strings["praised"] = ""; -$a->strings["be dubious of"] = ""; -$a->strings["was dubious of"] = ""; -$a->strings["eat"] = ""; -$a->strings["ate"] = ""; -$a->strings["giggle and fawn at"] = ""; -$a->strings["giggled and fawned at"] = ""; -$a->strings["doubt"] = ""; -$a->strings["doubted"] = ""; -$a->strings["glare"] = ""; -$a->strings["glared at"] = ""; +App::$strings["bitchslap"] = ""; +App::$strings["bitchslapped"] = ""; +App::$strings["shag"] = ""; +App::$strings["shagged"] = ""; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = ""; +App::$strings["pointed out the poke feature to"] = ""; +App::$strings["declare undying love for"] = ""; +App::$strings["declared undying love for"] = ""; +App::$strings["patent"] = ""; +App::$strings["patented"] = ""; +App::$strings["stroke beard"] = ""; +App::$strings["stroked their beard at"] = ""; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["hug"] = "przytul"; +App::$strings["hugged"] = "przytulony"; +App::$strings["kiss"] = "pocałuj"; +App::$strings["kissed"] = "pocałowany"; +App::$strings["raise eyebrows at"] = ""; +App::$strings["raised their eyebrows at"] = ""; +App::$strings["insult"] = ""; +App::$strings["insulted"] = ""; +App::$strings["praise"] = ""; +App::$strings["praised"] = ""; +App::$strings["be dubious of"] = ""; +App::$strings["was dubious of"] = ""; +App::$strings["eat"] = ""; +App::$strings["ate"] = ""; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = ""; +App::$strings["doubted"] = ""; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; diff --git a/sources/addons/morepokes/lang/pt-br/strings.php b/sources/addons/morepokes/lang/pt-br/strings.php index 0e4f8407..4c55a1cc 100644 --- a/sources/addons/morepokes/lang/pt-br/strings.php +++ b/sources/addons/morepokes/lang/pt-br/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = ""; -$a->strings["bitchslapped"] = ""; -$a->strings["shag"] = ""; -$a->strings["shagged"] = ""; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; -$a->strings["declare undying love for"] = ""; -$a->strings["declared undying love for"] = ""; -$a->strings["patent"] = ""; -$a->strings["patented"] = ""; -$a->strings["stroke beard"] = ""; -$a->strings["stroked their beard at"] = ""; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["hug"] = "abraço"; -$a->strings["hugged"] = ""; -$a->strings["kiss"] = "beijo"; -$a->strings["kissed"] = ""; -$a->strings["raise eyebrows at"] = ""; -$a->strings["raised their eyebrows at"] = ""; -$a->strings["insult"] = "insultar"; -$a->strings["insulted"] = ""; -$a->strings["praise"] = ""; -$a->strings["praised"] = ""; -$a->strings["be dubious of"] = ""; -$a->strings["was dubious of"] = ""; -$a->strings["eat"] = "comer"; -$a->strings["ate"] = ""; -$a->strings["giggle and fawn at"] = ""; -$a->strings["giggled and fawned at"] = ""; -$a->strings["doubt"] = ""; -$a->strings["doubted"] = ""; -$a->strings["glare"] = ""; -$a->strings["glared at"] = ""; +App::$strings["bitchslap"] = ""; +App::$strings["bitchslapped"] = ""; +App::$strings["shag"] = ""; +App::$strings["shagged"] = ""; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = ""; +App::$strings["pointed out the poke feature to"] = ""; +App::$strings["declare undying love for"] = ""; +App::$strings["declared undying love for"] = ""; +App::$strings["patent"] = ""; +App::$strings["patented"] = ""; +App::$strings["stroke beard"] = ""; +App::$strings["stroked their beard at"] = ""; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["hug"] = "abraço"; +App::$strings["hugged"] = ""; +App::$strings["kiss"] = "beijo"; +App::$strings["kissed"] = ""; +App::$strings["raise eyebrows at"] = ""; +App::$strings["raised their eyebrows at"] = ""; +App::$strings["insult"] = "insultar"; +App::$strings["insulted"] = ""; +App::$strings["praise"] = ""; +App::$strings["praised"] = ""; +App::$strings["be dubious of"] = ""; +App::$strings["was dubious of"] = ""; +App::$strings["eat"] = "comer"; +App::$strings["ate"] = ""; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = ""; +App::$strings["doubted"] = ""; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; diff --git a/sources/addons/morepokes/lang/ro/strings.php b/sources/addons/morepokes/lang/ro/strings.php index 3af70529..1b02c435 100644 --- a/sources/addons/morepokes/lang/ro/strings.php +++ b/sources/addons/morepokes/lang/ro/strings.php @@ -5,39 +5,39 @@ function string_plural_select_ro($n){ return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));; }} ; -$a->strings["bitchslap"] = "palmuire-javră"; -$a->strings["bitchslapped"] = "javră-pălmuită"; -$a->strings["shag"] = "pune-o"; -$a->strings["shagged"] = "a pus-o"; -$a->strings["do something obscenely biological to"] = "fă-i ceva biologic obscen lui"; -$a->strings["did something obscenely biological to"] = "i s-a făcut ceva biologic obscen lui"; -$a->strings["point out the poke feature to"] = "arată caracteristica de abordare lui"; -$a->strings["pointed out the poke feature to"] = "caracteristică de abordare arătată lui"; -$a->strings["declare undying love for"] = "declară dragoste veșnică pentru"; -$a->strings["declared undying love for"] = "dragoste veșnică declarată lui"; -$a->strings["patent"] = "brevet"; -$a->strings["patented"] = "brevetat"; -$a->strings["stroke beard"] = "lovire în barbă"; -$a->strings["stroked their beard at"] = "loviți în barbă la"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplângerea standardelor decăzute ale educației moderne secundare și terțiare pentru"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplânge standardele decăzute ale educației moderne secundare și terțiare pentru"; -$a->strings["hug"] = "îmbrățișare"; -$a->strings["hugged"] = "îmbrățișat(ă)"; -$a->strings["kiss"] = "sărut"; -$a->strings["kissed"] = "sărutat(ă)"; -$a->strings["raise eyebrows at"] = "ridică sprâncenele către"; -$a->strings["raised their eyebrows at"] = "a ridicat sprâncenele către"; -$a->strings["insult"] = "insultă"; -$a->strings["insulted"] = "insultat(ă)"; -$a->strings["praise"] = "laudă"; -$a->strings["praised"] = "lăudat(ă)"; -$a->strings["be dubious of"] = "arată-ți sceptitudinea față de"; -$a->strings["was dubious of"] = "a fost catalogat(ă) ca ciudat(ă) de către"; -$a->strings["eat"] = "devorează"; -$a->strings["ate"] = "devorat(ă)"; -$a->strings["giggle and fawn at"] = "chicotește și lingușește-l pe"; -$a->strings["giggled and fawned at"] = "a fost chicotit(ă) și lingușit(ă) de către"; -$a->strings["doubt"] = "îndoială"; -$a->strings["doubted"] = "nu a prezentat încredere"; -$a->strings["glare"] = "fixează cu privirea"; -$a->strings["glared at"] = "luat(ă) în colimator"; +App::$strings["bitchslap"] = "palmuire-javră"; +App::$strings["bitchslapped"] = "javră-pălmuită"; +App::$strings["shag"] = "pune-o"; +App::$strings["shagged"] = "a pus-o"; +App::$strings["do something obscenely biological to"] = "fă-i ceva biologic obscen lui"; +App::$strings["did something obscenely biological to"] = "i s-a făcut ceva biologic obscen lui"; +App::$strings["point out the poke feature to"] = "arată caracteristica de abordare lui"; +App::$strings["pointed out the poke feature to"] = "caracteristică de abordare arătată lui"; +App::$strings["declare undying love for"] = "declară dragoste veșnică pentru"; +App::$strings["declared undying love for"] = "dragoste veșnică declarată lui"; +App::$strings["patent"] = "brevet"; +App::$strings["patented"] = "brevetat"; +App::$strings["stroke beard"] = "lovire în barbă"; +App::$strings["stroked their beard at"] = "loviți în barbă la"; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplângerea standardelor decăzute ale educației moderne secundare și terțiare pentru"; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplânge standardele decăzute ale educației moderne secundare și terțiare pentru"; +App::$strings["hug"] = "îmbrățișare"; +App::$strings["hugged"] = "îmbrățișat(ă)"; +App::$strings["kiss"] = "sărut"; +App::$strings["kissed"] = "sărutat(ă)"; +App::$strings["raise eyebrows at"] = "ridică sprâncenele către"; +App::$strings["raised their eyebrows at"] = "a ridicat sprâncenele către"; +App::$strings["insult"] = "insultă"; +App::$strings["insulted"] = "insultat(ă)"; +App::$strings["praise"] = "laudă"; +App::$strings["praised"] = "lăudat(ă)"; +App::$strings["be dubious of"] = "arată-ți sceptitudinea față de"; +App::$strings["was dubious of"] = "a fost catalogat(ă) ca ciudat(ă) de către"; +App::$strings["eat"] = "devorează"; +App::$strings["ate"] = "devorat(ă)"; +App::$strings["giggle and fawn at"] = "chicotește și lingușește-l pe"; +App::$strings["giggled and fawned at"] = "a fost chicotit(ă) și lingușit(ă) de către"; +App::$strings["doubt"] = "îndoială"; +App::$strings["doubted"] = "nu a prezentat încredere"; +App::$strings["glare"] = "fixează cu privirea"; +App::$strings["glared at"] = "luat(ă) în colimator"; diff --git a/sources/addons/morepokes/lang/ru/strings.php b/sources/addons/morepokes/lang/ru/strings.php index 139fa59f..a4b3bbd1 100644 --- a/sources/addons/morepokes/lang/ru/strings.php +++ b/sources/addons/morepokes/lang/ru/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = ""; -$a->strings["bitchslapped"] = ""; -$a->strings["shag"] = ""; -$a->strings["shagged"] = ""; -$a->strings["do something obscenely biological to"] = ""; -$a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; -$a->strings["declare undying love for"] = ""; -$a->strings["declared undying love for"] = ""; -$a->strings["patent"] = ""; -$a->strings["patented"] = ""; -$a->strings["stroke beard"] = ""; -$a->strings["stroked their beard at"] = ""; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; -$a->strings["hug"] = ""; -$a->strings["hugged"] = ""; -$a->strings["kiss"] = ""; -$a->strings["kissed"] = ""; -$a->strings["raise eyebrows at"] = ""; -$a->strings["raised their eyebrows at"] = ""; -$a->strings["insult"] = ""; -$a->strings["insulted"] = ""; -$a->strings["praise"] = ""; -$a->strings["praised"] = ""; -$a->strings["be dubious of"] = ""; -$a->strings["was dubious of"] = ""; -$a->strings["eat"] = ""; -$a->strings["ate"] = ""; -$a->strings["giggle and fawn at"] = ""; -$a->strings["giggled and fawned at"] = ""; -$a->strings["doubt"] = ""; -$a->strings["doubted"] = ""; -$a->strings["glare"] = ""; -$a->strings["glared at"] = ""; +App::$strings["bitchslap"] = ""; +App::$strings["bitchslapped"] = ""; +App::$strings["shag"] = ""; +App::$strings["shagged"] = ""; +App::$strings["do something obscenely biological to"] = ""; +App::$strings["did something obscenely biological to"] = ""; +App::$strings["point out the poke feature to"] = ""; +App::$strings["pointed out the poke feature to"] = ""; +App::$strings["declare undying love for"] = ""; +App::$strings["declared undying love for"] = ""; +App::$strings["patent"] = ""; +App::$strings["patented"] = ""; +App::$strings["stroke beard"] = ""; +App::$strings["stroked their beard at"] = ""; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = ""; +App::$strings["hug"] = ""; +App::$strings["hugged"] = ""; +App::$strings["kiss"] = ""; +App::$strings["kissed"] = ""; +App::$strings["raise eyebrows at"] = ""; +App::$strings["raised their eyebrows at"] = ""; +App::$strings["insult"] = ""; +App::$strings["insulted"] = ""; +App::$strings["praise"] = ""; +App::$strings["praised"] = ""; +App::$strings["be dubious of"] = ""; +App::$strings["was dubious of"] = ""; +App::$strings["eat"] = ""; +App::$strings["ate"] = ""; +App::$strings["giggle and fawn at"] = ""; +App::$strings["giggled and fawned at"] = ""; +App::$strings["doubt"] = ""; +App::$strings["doubted"] = ""; +App::$strings["glare"] = ""; +App::$strings["glared at"] = ""; diff --git a/sources/addons/morepokes/lang/zh-cn/strings.php b/sources/addons/morepokes/lang/zh-cn/strings.php index fef2ed9f..fa1bb724 100644 --- a/sources/addons/morepokes/lang/zh-cn/strings.php +++ b/sources/addons/morepokes/lang/zh-cn/strings.php @@ -1,38 +1,38 @@ strings["bitchslap"] = "恶毒掌击"; -$a->strings["bitchslapped"] = "恶毒掌击了"; -$a->strings["shag"] = "肏"; -$a->strings["shagged"] = "肏了"; -$a->strings["do something obscenely biological to"] = "做什么淫秽生物的于"; -$a->strings["did something obscenely biological to"] = "做了什么淫秽生物的于"; -$a->strings["point out the poke feature to"] = "把戳特点指给"; -$a->strings["pointed out the poke feature to"] = "把了戳特点指给"; -$a->strings["declare undying love for"] = "表明永远的爱情为"; -$a->strings["declared undying love for"] = "表明了永远的爱情为"; -$a->strings["patent"] = "专利"; -$a->strings["patented"] = "专利了"; -$a->strings["stroke beard"] = "摸胡子"; -$a->strings["stroked their beard at"] = "摸胡子了"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给"; -$a->strings["hug"] = "拥抱"; -$a->strings["hugged"] = "拥抱了"; -$a->strings["kiss"] = "亲吻"; -$a->strings["kissed"] = "亲吻了"; -$a->strings["raise eyebrows at"] = "举起眉毛于"; -$a->strings["raised their eyebrows at"] = "举起了眉毛于"; -$a->strings["insult"] = "侮辱"; -$a->strings["insulted"] = "侮辱"; -$a->strings["praise"] = "赞扬"; -$a->strings["praised"] = "赞扬了"; -$a->strings["be dubious of"] = "怀疑"; -$a->strings["was dubious of"] = "怀疑了"; -$a->strings["eat"] = "吃"; -$a->strings["ate"] = "吃了"; -$a->strings["giggle and fawn at"] = "咯咯地笑和巴结为"; -$a->strings["giggled and fawned at"] = "咯咯地笑和巴结为了"; -$a->strings["doubt"] = "怀疑"; -$a->strings["doubted"] = "怀疑了"; -$a->strings["glare"] = "瞪"; -$a->strings["glared at"] = "瞪了"; +App::$strings["bitchslap"] = "恶毒掌击"; +App::$strings["bitchslapped"] = "恶毒掌击了"; +App::$strings["shag"] = "肏"; +App::$strings["shagged"] = "肏了"; +App::$strings["do something obscenely biological to"] = "做什么淫秽生物的于"; +App::$strings["did something obscenely biological to"] = "做了什么淫秽生物的于"; +App::$strings["point out the poke feature to"] = "把戳特点指给"; +App::$strings["pointed out the poke feature to"] = "把了戳特点指给"; +App::$strings["declare undying love for"] = "表明永远的爱情为"; +App::$strings["declared undying love for"] = "表明了永远的爱情为"; +App::$strings["patent"] = "专利"; +App::$strings["patented"] = "专利了"; +App::$strings["stroke beard"] = "摸胡子"; +App::$strings["stroked their beard at"] = "摸胡子了"; +App::$strings["bemoan the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给"; +App::$strings["bemoans the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给"; +App::$strings["hug"] = "拥抱"; +App::$strings["hugged"] = "拥抱了"; +App::$strings["kiss"] = "亲吻"; +App::$strings["kissed"] = "亲吻了"; +App::$strings["raise eyebrows at"] = "举起眉毛于"; +App::$strings["raised their eyebrows at"] = "举起了眉毛于"; +App::$strings["insult"] = "侮辱"; +App::$strings["insulted"] = "侮辱"; +App::$strings["praise"] = "赞扬"; +App::$strings["praised"] = "赞扬了"; +App::$strings["be dubious of"] = "怀疑"; +App::$strings["was dubious of"] = "怀疑了"; +App::$strings["eat"] = "吃"; +App::$strings["ate"] = "吃了"; +App::$strings["giggle and fawn at"] = "咯咯地笑和巴结为"; +App::$strings["giggled and fawned at"] = "咯咯地笑和巴结为了"; +App::$strings["doubt"] = "怀疑"; +App::$strings["doubted"] = "怀疑了"; +App::$strings["glare"] = "瞪"; +App::$strings["glared at"] = "瞪了"; diff --git a/sources/addons/nsabait/nsabait.php b/sources/addons/nsabait/nsabait.php index e3d98d38..ba36e0da 100755 --- a/sources/addons/nsabait/nsabait.php +++ b/sources/addons/nsabait/nsabait.php @@ -143,7 +143,7 @@ function nsabait_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variable */ diff --git a/sources/addons/nsfw/lang/ca/strings.php b/sources/addons/nsfw/lang/ca/strings.php index 36607e47..fd7ef36a 100644 --- a/sources/addons/nsfw/lang/ca/strings.php +++ b/sources/addons/nsfw/lang/ca/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Ajustos, Not Safe For Work (Filtre de Contingut de Propòsit General)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Aquest plugin es veu en enviaments amb les paraules/text que s'especifiquen a continuació , i amagarà qualsevol contingut que contingui les paraules clau de manera que no apareguin en moments inapropiats, com ara insinuacions sexuals que poden ser inadequades en un entorn de treball. És de bona educació i es recomana etiquetar qualsevol contingut que contingui nus amb #NSFW. Aquest filtre també es pot fer coincidir amb qualsevol paraula/text que especifiqueu, i per tant pot ser utilitzat com un filtre general de contingut."; -$a->strings["Enable Content filter"] = "Activat el filtre de Contingut"; -$a->strings["Comma separated list of keywords to hide"] = "Llista separada per comes de paraules clau per ocultar"; -$a->strings["Submit"] = "Enviar"; -$a->strings["Use /expression/ to provide regular expressions"] = "Emprar /expressió/ per a proporcionar expressions regulars"; -$a->strings["NSFW Settings saved."] = "Configuració NSFW guardada."; -$a->strings["%s - Click to open/close"] = "%s - Clicar per obrir/tancar"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Ajustos, Not Safe For Work (Filtre de Contingut de Propòsit General)"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Aquest plugin es veu en enviaments amb les paraules/text que s'especifiquen a continuació , i amagarà qualsevol contingut que contingui les paraules clau de manera que no apareguin en moments inapropiats, com ara insinuacions sexuals que poden ser inadequades en un entorn de treball. És de bona educació i es recomana etiquetar qualsevol contingut que contingui nus amb #NSFW. Aquest filtre també es pot fer coincidir amb qualsevol paraula/text que especifiqueu, i per tant pot ser utilitzat com un filtre general de contingut."; +App::$strings["Enable Content filter"] = "Activat el filtre de Contingut"; +App::$strings["Comma separated list of keywords to hide"] = "Llista separada per comes de paraules clau per ocultar"; +App::$strings["Submit"] = "Enviar"; +App::$strings["Use /expression/ to provide regular expressions"] = "Emprar /expressió/ per a proporcionar expressions regulars"; +App::$strings["NSFW Settings saved."] = "Configuració NSFW guardada."; +App::$strings["%s - Click to open/close"] = "%s - Clicar per obrir/tancar"; diff --git a/sources/addons/nsfw/lang/cs/strings.php b/sources/addons/nsfw/lang/cs/strings.php index 8f32b9c3..3593afa1 100644 --- a/sources/addons/nsfw/lang/cs/strings.php +++ b/sources/addons/nsfw/lang/cs/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (General Purpose Content Filter) nastavení"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tento plugin hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW. Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr."; -$a->strings["Enable Content filter"] = "Povolit Kontextový filtr"; -$a->strings["Comma separated list of keywords to hide"] = "Čárkou oddělený seznam klíčových slov ke skrytí"; -$a->strings["Submit"] = "Odeslat"; -$a->strings["Use /expression/ to provide regular expressions"] = "Použít /výraz/ pro použití regulárních výrazů"; -$a->strings["NSFW Settings saved."] = "NSFW nastavení uloženo"; -$a->strings["%s - Click to open/close"] = "%s - Klikněte pro otevření/zavření"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (General Purpose Content Filter) nastavení"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tento plugin hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW. Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr."; +App::$strings["Enable Content filter"] = "Povolit Kontextový filtr"; +App::$strings["Comma separated list of keywords to hide"] = "Čárkou oddělený seznam klíčových slov ke skrytí"; +App::$strings["Submit"] = "Odeslat"; +App::$strings["Use /expression/ to provide regular expressions"] = "Použít /výraz/ pro použití regulárních výrazů"; +App::$strings["NSFW Settings saved."] = "NSFW nastavení uloženo"; +App::$strings["%s - Click to open/close"] = "%s - Klikněte pro otevření/zavření"; diff --git a/sources/addons/nsfw/lang/de/strings.php b/sources/addons/nsfw/lang/de/strings.php index 9bc36366..86722cc1 100644 --- a/sources/addons/nsfw/lang/de/strings.php +++ b/sources/addons/nsfw/lang/de/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; -$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter"; -$a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen"; -$a->strings["Submit"] = "Senden"; -$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden"; -$a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert"; -$a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; +App::$strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter"; +App::$strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen"; +App::$strings["Submit"] = "Senden"; +App::$strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden"; +App::$strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert"; +App::$strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken"; diff --git a/sources/addons/nsfw/lang/eo/strings.php b/sources/addons/nsfw/lang/eo/strings.php index d3f39d08..203dcb56 100644 --- a/sources/addons/nsfw/lang/eo/strings.php +++ b/sources/addons/nsfw/lang/eo/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (ĝenerala filtrilo por enhavoj) agordoj"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tiu kromprogramo serĉas la malsupre agordatajn vortojn en afiŝoj kaj malvidebligis ilin se ili enhavas iun vorton. Tiel, afiŝoj ne montriĝis kiuj enhavas maladekvatan enhavon, ekzemple seksumaj aferoj, kiuj ne estas adekvata, ekzemple en la laborejo. En la reto, oni kutime markas tiajn afiŝojn #NSFW - Not Safe For Work - ne adekvata por la laborejo. La filtrilo ankaŭ serĉas ĉiujn vortojn kiujn vi agordas kaj tial funkcias kiel ĝenerala filtrilo."; -$a->strings["Enable Content filter"] = "Ŝalti la filtrilo por la enhavo"; -$a->strings["Comma separated list of keywords to hide"] = "Perkome disigita listo da kaŝontaj ŝlosilvortoj"; -$a->strings["Submit"] = "Sendi"; -$a->strings["Use /expression/ to provide regular expressions"] = "Uzu /expr/ por provizi regulajn esprimojn."; -$a->strings["NSFW Settings saved."] = "NSFW agordoj konservitaj."; -$a->strings["%s - Click to open/close"] = "%s - Klaku por malfermi/fermi"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (ĝenerala filtrilo por enhavoj) agordoj"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tiu kromprogramo serĉas la malsupre agordatajn vortojn en afiŝoj kaj malvidebligis ilin se ili enhavas iun vorton. Tiel, afiŝoj ne montriĝis kiuj enhavas maladekvatan enhavon, ekzemple seksumaj aferoj, kiuj ne estas adekvata, ekzemple en la laborejo. En la reto, oni kutime markas tiajn afiŝojn #NSFW - Not Safe For Work - ne adekvata por la laborejo. La filtrilo ankaŭ serĉas ĉiujn vortojn kiujn vi agordas kaj tial funkcias kiel ĝenerala filtrilo."; +App::$strings["Enable Content filter"] = "Ŝalti la filtrilo por la enhavo"; +App::$strings["Comma separated list of keywords to hide"] = "Perkome disigita listo da kaŝontaj ŝlosilvortoj"; +App::$strings["Submit"] = "Sendi"; +App::$strings["Use /expression/ to provide regular expressions"] = "Uzu /expr/ por provizi regulajn esprimojn."; +App::$strings["NSFW Settings saved."] = "NSFW agordoj konservitaj."; +App::$strings["%s - Click to open/close"] = "%s - Klaku por malfermi/fermi"; diff --git a/sources/addons/nsfw/lang/es/strings.php b/sources/addons/nsfw/lang/es/strings.php index a2f7cae0..11dab6d2 100644 --- a/sources/addons/nsfw/lang/es/strings.php +++ b/sources/addons/nsfw/lang/es/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"Not Safe For Work\" (Filtro de contenido de carácter general)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Este complemento busca las palabras clave que especifiques y oculta cualquier comentario que contenga dichas claves, para que no aparezcan en momentos inoportunos, como por ejemplo, material sexual. Se considera de buena educación y correcto etiquetar los desnudos con #NSFW. Este filtro puede servir para filtrar otro contenido, así que te puede servir como un filtro de carácter general, escogiendo las palabras clave adecuadas."; -$a->strings["Enable Content filter"] = "Activar el filtro de contenido"; -$a->strings["Comma separated list of keywords to hide"] = "Palabras clave para ocultar, lista separada por comas"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Use /expression/ to provide regular expressions"] = "Usa /expresión/ para proporcionar expresiones regulares"; -$a->strings["NSFW Settings saved."] = "Configuración NSFW guardada."; -$a->strings["%s - Click to open/close"] = "%s - Pulsa aquí para abrir/cerrar"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"Not Safe For Work\" (Filtro de contenido de carácter general)"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Este complemento busca las palabras clave que especifiques y oculta cualquier comentario que contenga dichas claves, para que no aparezcan en momentos inoportunos, como por ejemplo, material sexual. Se considera de buena educación y correcto etiquetar los desnudos con #NSFW. Este filtro puede servir para filtrar otro contenido, así que te puede servir como un filtro de carácter general, escogiendo las palabras clave adecuadas."; +App::$strings["Enable Content filter"] = "Activar el filtro de contenido"; +App::$strings["Comma separated list of keywords to hide"] = "Palabras clave para ocultar, lista separada por comas"; +App::$strings["Submit"] = "Envíar"; +App::$strings["Use /expression/ to provide regular expressions"] = "Usa /expresión/ para proporcionar expresiones regulares"; +App::$strings["NSFW Settings saved."] = "Configuración NSFW guardada."; +App::$strings["%s - Click to open/close"] = "%s - Pulsa aquí para abrir/cerrar"; diff --git a/sources/addons/nsfw/lang/fr/strings.php b/sources/addons/nsfw/lang/fr/strings.php index 1bfbfdfa..28993500 100644 --- a/sources/addons/nsfw/lang/fr/strings.php +++ b/sources/addons/nsfw/lang/fr/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Réglages de \"NSFW\" (filtrage de contenu)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Cette extension va parcourir les publications à la recherche des mots (ou phrases) que vous spécifierez ci-dessous, et repliera automatiquement tout contenu qui les contiendrait, afin de ne pas risquer de les afficher à un moment inopportun. Comme par exemple des messages à caractère sexuel dans un contexte professionnel. Il est globalement considéré comme correct et poli de \"tagguer\" toute publication contenant de la nudité avec #NSFW (Not Safe For Work - pas pour le boulot). Ce filtre peut également fonctionner pour tout autre texte que vous spécifierez, et pourra ainsi être utilisé comme filtre de contenu générique."; -$a->strings["Enable Content filter"] = "Activer le filtrage de contenu"; -$a->strings["Comma separated list of keywords to hide"] = "Liste de mots-clés - séparés par des virgules - à cacher"; -$a->strings["Submit"] = "Envoyer"; -$a->strings["Use /expression/ to provide regular expressions"] = "Utilisez /expression/ pour les expressions rationnelles"; -$a->strings["NSFW Settings saved."] = "Réglages NSFW sauvegardés."; -$a->strings["%s - Click to open/close"] = "%s - cliquer pour ouvrir/fermer"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Réglages de \"NSFW\" (filtrage de contenu)"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Cette extension va parcourir les publications à la recherche des mots (ou phrases) que vous spécifierez ci-dessous, et repliera automatiquement tout contenu qui les contiendrait, afin de ne pas risquer de les afficher à un moment inopportun. Comme par exemple des messages à caractère sexuel dans un contexte professionnel. Il est globalement considéré comme correct et poli de \"tagguer\" toute publication contenant de la nudité avec #NSFW (Not Safe For Work - pas pour le boulot). Ce filtre peut également fonctionner pour tout autre texte que vous spécifierez, et pourra ainsi être utilisé comme filtre de contenu générique."; +App::$strings["Enable Content filter"] = "Activer le filtrage de contenu"; +App::$strings["Comma separated list of keywords to hide"] = "Liste de mots-clés - séparés par des virgules - à cacher"; +App::$strings["Submit"] = "Envoyer"; +App::$strings["Use /expression/ to provide regular expressions"] = "Utilisez /expression/ pour les expressions rationnelles"; +App::$strings["NSFW Settings saved."] = "Réglages NSFW sauvegardés."; +App::$strings["%s - Click to open/close"] = "%s - cliquer pour ouvrir/fermer"; diff --git a/sources/addons/nsfw/lang/is/strings.php b/sources/addons/nsfw/lang/is/strings.php index f4bcb824..c113be6f 100644 --- a/sources/addons/nsfw/lang/is/strings.php +++ b/sources/addons/nsfw/lang/is/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; -$a->strings["Enable Content filter"] = ""; -$a->strings["Comma separated list of keywords to hide"] = ""; -$a->strings["Submit"] = "Senda inn"; -$a->strings["Use /expression/ to provide regular expressions"] = ""; -$a->strings["NSFW Settings saved."] = "NSFW stillingar vistað."; -$a->strings["%s - Click to open/close"] = "%s - Smelltu til að opna/loka"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +App::$strings["Enable Content filter"] = ""; +App::$strings["Comma separated list of keywords to hide"] = ""; +App::$strings["Submit"] = "Senda inn"; +App::$strings["Use /expression/ to provide regular expressions"] = ""; +App::$strings["NSFW Settings saved."] = "NSFW stillingar vistað."; +App::$strings["%s - Click to open/close"] = "%s - Smelltu til að opna/loka"; diff --git a/sources/addons/nsfw/lang/it/strings.php b/sources/addons/nsfw/lang/it/strings.php index 690ef6c1..a1c325c0 100644 --- a/sources/addons/nsfw/lang/it/strings.php +++ b/sources/addons/nsfw/lang/it/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Impostazioni per NSWF (Filtro Contenuti Generico)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Questo plugin cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che puo' essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro puo' cercare anche qualsiasi parola che inserisci, quindi puo' essere usato come filtro di contenuti generico."; -$a->strings["Enable Content filter"] = "Abilita il Filtro Contenuti"; -$a->strings["Comma separated list of keywords to hide"] = "Elenco separato da virgole di parole da nascondere"; -$a->strings["Submit"] = "Invia"; -$a->strings["Use /expression/ to provide regular expressions"] = "Utilizza /espressione/ per inserire espressioni regolari"; -$a->strings["NSFW Settings saved."] = "Impostazioni NSFW salvate."; -$a->strings["%s - Click to open/close"] = "%s - Clicca per aprire / chiudere"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Impostazioni per NSWF (Filtro Contenuti Generico)"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Questo plugin cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che puo' essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro puo' cercare anche qualsiasi parola che inserisci, quindi puo' essere usato come filtro di contenuti generico."; +App::$strings["Enable Content filter"] = "Abilita il Filtro Contenuti"; +App::$strings["Comma separated list of keywords to hide"] = "Elenco separato da virgole di parole da nascondere"; +App::$strings["Submit"] = "Invia"; +App::$strings["Use /expression/ to provide regular expressions"] = "Utilizza /espressione/ per inserire espressioni regolari"; +App::$strings["NSFW Settings saved."] = "Impostazioni NSFW salvate."; +App::$strings["%s - Click to open/close"] = "%s - Clicca per aprire / chiudere"; diff --git a/sources/addons/nsfw/lang/nb-no/strings.php b/sources/addons/nsfw/lang/nb-no/strings.php index 7836003f..70978b5c 100644 --- a/sources/addons/nsfw/lang/nb-no/strings.php +++ b/sources/addons/nsfw/lang/nb-no/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; -$a->strings["Enable Content filter"] = ""; -$a->strings["Comma separated list of keywords to hide"] = ""; -$a->strings["Submit"] = "Lagre"; -$a->strings["Use /expression/ to provide regular expressions"] = ""; -$a->strings["NSFW Settings saved."] = ""; -$a->strings["%s - Click to open/close"] = ""; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +App::$strings["Enable Content filter"] = ""; +App::$strings["Comma separated list of keywords to hide"] = ""; +App::$strings["Submit"] = "Lagre"; +App::$strings["Use /expression/ to provide regular expressions"] = ""; +App::$strings["NSFW Settings saved."] = ""; +App::$strings["%s - Click to open/close"] = ""; diff --git a/sources/addons/nsfw/lang/nl/strings.php b/sources/addons/nsfw/lang/nl/strings.php index 4e406f51..e2271c5f 100644 --- a/sources/addons/nsfw/lang/nl/strings.php +++ b/sources/addons/nsfw/lang/nl/strings.php @@ -1,11 +1,11 @@ strings["Not Safe For Work Settings"] = "Not Safe For Work (inhoudsfilter)"; -$a->strings["General Purpose Content Filter"] = "Voor alles te gebruiken inhoudsfilter"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Deze plug-in controleert berichten op woorden die je hieronder kunt opgeven en klapt berichten in die deze woorden bevatten, zodat die berichten niet worden weergegeven op ongeschikte momenten. Denk hierbij aan berichten met erotische afbeeldingen, die waarschijnlijk niet geschikt zijn binnen (bijvoorbeeld) een werkomgeving. Het is beleefd en het wordt aangeraden om zulke berichten met #NSFW te taggen. Dit filter kan ook gebruikt worden met andere woorden en is dus voor alles inzetbaar."; -$a->strings["Enable Content filter"] = "Inhoudsfilter inschakelen"; -$a->strings["Comma separated list of keywords to hide"] = "Door komma's gescheiden lijst met woorden die gefilterd moeten worden."; -$a->strings["Submit"] = "Opslaan"; -$a->strings["Use /expression/ to provide regular expressions"] = "Gebruik /expressie/ voor reguliere expressies"; -$a->strings["NSFW Settings saved."] = "NSFW-instellingen opgeslagen."; -$a->strings["%s - Click to open/close"] = "%s - Klik om te openen of te sluiten"; +App::$strings["Not Safe For Work Settings"] = "Not Safe For Work (inhoudsfilter)"; +App::$strings["General Purpose Content Filter"] = "Voor alles te gebruiken inhoudsfilter"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Deze plug-in controleert berichten op woorden die je hieronder kunt opgeven en klapt berichten in die deze woorden bevatten, zodat die berichten niet worden weergegeven op ongeschikte momenten. Denk hierbij aan berichten met erotische afbeeldingen, die waarschijnlijk niet geschikt zijn binnen (bijvoorbeeld) een werkomgeving. Het is beleefd en het wordt aangeraden om zulke berichten met #NSFW te taggen. Dit filter kan ook gebruikt worden met andere woorden en is dus voor alles inzetbaar."; +App::$strings["Enable Content filter"] = "Inhoudsfilter inschakelen"; +App::$strings["Comma separated list of keywords to hide"] = "Door komma's gescheiden lijst met woorden die gefilterd moeten worden."; +App::$strings["Submit"] = "Opslaan"; +App::$strings["Use /expression/ to provide regular expressions"] = "Gebruik /expressie/ voor reguliere expressies"; +App::$strings["NSFW Settings saved."] = "NSFW-instellingen opgeslagen."; +App::$strings["%s - Click to open/close"] = "%s - Klik om te openen of te sluiten"; diff --git a/sources/addons/nsfw/lang/pl/strings.php b/sources/addons/nsfw/lang/pl/strings.php index b99d9ec2..cc288ea8 100644 --- a/sources/addons/nsfw/lang/pl/strings.php +++ b/sources/addons/nsfw/lang/pl/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; -$a->strings["Enable Content filter"] = ""; -$a->strings["Comma separated list of keywords to hide"] = ""; -$a->strings["Submit"] = "Potwierdź"; -$a->strings["Use /expression/ to provide regular expressions"] = ""; -$a->strings["NSFW Settings saved."] = "NSFW Ustawienia zapisane."; -$a->strings["%s - Click to open/close"] = "%s - kliknij by otworzyć/zamknąć"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +App::$strings["Enable Content filter"] = ""; +App::$strings["Comma separated list of keywords to hide"] = ""; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["Use /expression/ to provide regular expressions"] = ""; +App::$strings["NSFW Settings saved."] = "NSFW Ustawienia zapisane."; +App::$strings["%s - Click to open/close"] = "%s - kliknij by otworzyć/zamknąć"; diff --git a/sources/addons/nsfw/lang/pt-br/strings.php b/sources/addons/nsfw/lang/pt-br/strings.php index 59f0de7e..5d5e7ec5 100644 --- a/sources/addons/nsfw/lang/pt-br/strings.php +++ b/sources/addons/nsfw/lang/pt-br/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configurações do filtro de conteúdo impróprio para o local de trabalho (Not Safe For Work)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; -$a->strings["Enable Content filter"] = "Habilitar o filtro de conteúdo"; -$a->strings["Comma separated list of keywords to hide"] = "Lista de palavras-chave a serem ocultadas, separadas por vírgula"; -$a->strings["Submit"] = "Enviar"; -$a->strings["Use /expression/ to provide regular expressions"] = "Use /expressão/ para fornecer a expressão regular"; -$a->strings["NSFW Settings saved."] = "Configurações NSFW armazenadas."; -$a->strings["%s - Click to open/close"] = "%s "; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configurações do filtro de conteúdo impróprio para o local de trabalho (Not Safe For Work)"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +App::$strings["Enable Content filter"] = "Habilitar o filtro de conteúdo"; +App::$strings["Comma separated list of keywords to hide"] = "Lista de palavras-chave a serem ocultadas, separadas por vírgula"; +App::$strings["Submit"] = "Enviar"; +App::$strings["Use /expression/ to provide regular expressions"] = "Use /expressão/ para fornecer a expressão regular"; +App::$strings["NSFW Settings saved."] = "Configurações NSFW armazenadas."; +App::$strings["%s - Click to open/close"] = "%s "; diff --git a/sources/addons/nsfw/lang/ru/strings.php b/sources/addons/nsfw/lang/ru/strings.php index 2ccb5ad1..74b834ca 100644 --- a/sources/addons/nsfw/lang/ru/strings.php +++ b/sources/addons/nsfw/lang/ru/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; -$a->strings["Enable Content filter"] = "Включить фильтр содержимого"; -$a->strings["Comma separated list of keywords to hide"] = "ключевые слова, которые скрыть (список через запятую)"; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["Use /expression/ to provide regular expressions"] = ""; -$a->strings["NSFW Settings saved."] = "NSFW Настройки сохранены."; -$a->strings["%s - Click to open/close"] = "%s - Нажмите для открытия / закрытия"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +App::$strings["Enable Content filter"] = "Включить фильтр содержимого"; +App::$strings["Comma separated list of keywords to hide"] = "ключевые слова, которые скрыть (список через запятую)"; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["Use /expression/ to provide regular expressions"] = ""; +App::$strings["NSFW Settings saved."] = "NSFW Настройки сохранены."; +App::$strings["%s - Click to open/close"] = "%s - Нажмите для открытия / закрытия"; diff --git a/sources/addons/nsfw/lang/sv/strings.php b/sources/addons/nsfw/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/nsfw/lang/sv/strings.php +++ b/sources/addons/nsfw/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/nsfw/lang/zh-cn/strings.php b/sources/addons/nsfw/lang/zh-cn/strings.php index 0669361a..4bf27bc5 100644 --- a/sources/addons/nsfw/lang/zh-cn/strings.php +++ b/sources/addons/nsfw/lang/zh-cn/strings.php @@ -1,10 +1,10 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "工作不安全（通用内容过滤）设置"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "这个插件找您下面输入的词在所有的文章里，和把包括那些词的内容隐藏，省得不妥当的时候表示，比如性的影射在办公室里。是礼貌和建议的把什么包括裸体的内容跟#NSFW标签。这个过滤也会符合设么别的您输入的词，从而能当通用内容过滤有用的。"; -$a->strings["Enable Content filter"] = "使内容过滤可用"; -$a->strings["Comma separated list of keywords to hide"] = "逗号分隔单词要隐藏"; -$a->strings["Submit"] = "提交"; -$a->strings["Use /expression/ to provide regular expressions"] = "用/表达式/为输入正则表达式"; -$a->strings["NSFW Settings saved."] = "NSFW设置保持了。"; -$a->strings["%s - Click to open/close"] = "%s - 点击为打开／关闭"; +App::$strings["Not Safe For Work (General Purpose Content Filter) settings"] = "工作不安全（通用内容过滤）设置"; +App::$strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "这个插件找您下面输入的词在所有的文章里，和把包括那些词的内容隐藏，省得不妥当的时候表示，比如性的影射在办公室里。是礼貌和建议的把什么包括裸体的内容跟#NSFW标签。这个过滤也会符合设么别的您输入的词，从而能当通用内容过滤有用的。"; +App::$strings["Enable Content filter"] = "使内容过滤可用"; +App::$strings["Comma separated list of keywords to hide"] = "逗号分隔单词要隐藏"; +App::$strings["Submit"] = "提交"; +App::$strings["Use /expression/ to provide regular expressions"] = "用/表达式/为输入正则表达式"; +App::$strings["NSFW Settings saved."] = "NSFW设置保持了。"; +App::$strings["%s - Click to open/close"] = "%s - 点击为打开／关闭"; diff --git a/sources/addons/openclipatar/openclipatar.php b/sources/addons/openclipatar/openclipatar.php index efc7c164..4ab85088 100644 --- a/sources/addons/openclipatar/openclipatar.php +++ b/sources/addons/openclipatar/openclipatar.php @@ -160,7 +160,7 @@ function openclipatar_profile_photo_content_end(&$a, &$o) { } } } - $x = z_fetch_url('https://openclipart.org/search/json/?sort=' . $sortids . '&amount=20&query=' . urlencode($search) . '&page=' . $a->pager['page']); + $x = z_fetch_url('https://openclipart.org/search/json/?sort=' . $sortids . '&amount=20&query=' . urlencode($search) . '&page=' . App::$pager['page']); if($x['success']) { $j = json_decode($x['body'], true); @@ -205,7 +205,7 @@ function openclipatar_content(&$a) { $o = ''; if(argc() == 3 && argv(1) == 'use') { $id = argv(2); - $chan = $a->get_channel(); + $chan = App::get_channel(); $x = z_fetch_url('https://openclipart.org/image/250px/svg_to_png/' .$id . '/' . $id . '.png',true); if($x['success']) @@ -277,8 +277,8 @@ function openclipatar_content(&$a) { else { // not the default profile, set the path in the correct entry in the profile DB $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d", - dbesc(get_app()->get_baseurl() . '/photo/' . $hash . '-4'), - dbesc(get_app()->get_baseurl() . '/photo/' . $hash . '-5'), + dbesc(z_root() . '/photo/' . $hash . '-4'), + dbesc(z_root() . '/photo/' . $hash . '-5'), intval($_REQUEST['profile']), intval(local_channel()) ); @@ -294,9 +294,9 @@ function openclipatar_content(&$a) { $returnafter = get_config('openclipatar', 'returnafter'); $returnafter_urls = array( - 0 => $a->get_baseurl() . '/profile/' . ($_REQUEST['profile'] ? $_REQUEST['profile'].'/view' : $chan['channel_address']), - 1 => $a->get_baseurl() . '/profiles/' . ($_REQUEST['profile'] ? $_REQUEST['profile'] : $a->profile_uid), - 2 => $a->get_baseurl() . '/profiles' + 0 => z_root() . '/profile/' . ($_REQUEST['profile'] ? $_REQUEST['profile'].'/view' : $chan['channel_address']), + 1 => z_root() . '/profiles/' . ($_REQUEST['profile'] ? $_REQUEST['profile'] : App::$profile_uid), + 2 => z_root() . '/profiles' ); goaway($returnafter_urls[$returnafter]); diff --git a/sources/addons/openstreetmap/README.md b/sources/addons/openstreetmap/README.md index 754f290d..0e2d7da0 100644 --- a/sources/addons/openstreetmap/README.md +++ b/sources/addons/openstreetmap/README.md @@ -49,14 +49,14 @@ If you prefer to use a configuration file instead of the admin panel or the CLI open the .htconfig.php file and add "openstreetmap" to the list of activated addons. - $a->config['system']['addon'] = "openstreetmap, ..." + App::$config['system']['addon'] = "openstreetmap, ..." You can configure the addon with these variables: - $a->config['openstreetmap']['tmsserver'] = 'http://www.openstreetmap.org/'; - $a->config['openstreetmap']['nomserver'] = 'http://nominatim.openstreetmap.org/search.php'; - $a->config['openstreetmap']['zoom'] = '16'; - $a->config['openstreetmap']['marker'] = '0'; + App::$config['openstreetmap']['tmsserver'] = 'http://www.openstreetmap.org/'; + App::$config['openstreetmap']['nomserver'] = 'http://nominatim.openstreetmap.org/search.php'; + App::$config['openstreetmap']['zoom'] = '16'; + App::$config['openstreetmap']['marker'] = '0'; The *tmsserver* points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash. You can configure the default zoom diff --git a/sources/addons/openstreetmap/lang/ca/strings.php b/sources/addons/openstreetmap/lang/ca/strings.php index 3c7eeee2..a7ff025d 100644 --- a/sources/addons/openstreetmap/lang/ca/strings.php +++ b/sources/addons/openstreetmap/lang/ca/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Enviar"; -$a->strings["Tile Server URL"] = "URL del servidor, del mosaico de servidores"; -$a->strings["A list of public tile servers"] = "Una llista de un mosaic de servidors públics"; -$a->strings["Default zoom"] = "Zoom per defecte"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivell de zoom per defecte. (1: el món, 18: el més alt)"; -$a->strings["Settings updated."] = "Ajustos actualitzats."; +App::$strings["Submit"] = "Enviar"; +App::$strings["Tile Server URL"] = "URL del servidor, del mosaico de servidores"; +App::$strings["A list of public tile servers"] = "Una llista de un mosaic de servidors públics"; +App::$strings["Default zoom"] = "Zoom per defecte"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "Nivell de zoom per defecte. (1: el món, 18: el més alt)"; +App::$strings["Settings updated."] = "Ajustos actualitzats."; diff --git a/sources/addons/openstreetmap/lang/cs/strings.php b/sources/addons/openstreetmap/lang/cs/strings.php index 3db39101..55b653b5 100644 --- a/sources/addons/openstreetmap/lang/cs/strings.php +++ b/sources/addons/openstreetmap/lang/cs/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Odeslat"; -$a->strings["Tile Server URL"] = "URL adresa Tile serveru"; -$a->strings["A list of public tile servers"] = "Seznam veřejných tile serverů"; -$a->strings["Default zoom"] = "Defaultní přiblížení"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Defaultní úroveň přiblížení (1:svět, 18:nejvyšší)"; -$a->strings["Settings updated."] = "Nastavení aktualizováno."; +App::$strings["Submit"] = "Odeslat"; +App::$strings["Tile Server URL"] = "URL adresa Tile serveru"; +App::$strings["A list of public tile servers"] = "Seznam veřejných tile serverů"; +App::$strings["Default zoom"] = "Defaultní přiblížení"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "Defaultní úroveň přiblížení (1:svět, 18:nejvyšší)"; +App::$strings["Settings updated."] = "Nastavení aktualizováno."; diff --git a/sources/addons/openstreetmap/lang/de/strings.php b/sources/addons/openstreetmap/lang/de/strings.php index ff6e58b6..dbc02b87 100644 --- a/sources/addons/openstreetmap/lang/de/strings.php +++ b/sources/addons/openstreetmap/lang/de/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Senden"; -$a->strings["Tile Server URL"] = "Tile Server URL"; -$a->strings["A list of public tile servers"] = "Eine Liste öffentlicher Tile Server"; -$a->strings["Default zoom"] = "Standard Zoom"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)"; -$a->strings["Settings updated."] = "Einstellungen aktualisiert."; +App::$strings["Submit"] = "Senden"; +App::$strings["Tile Server URL"] = "Tile Server URL"; +App::$strings["A list of public tile servers"] = "Eine Liste öffentlicher Tile Server"; +App::$strings["Default zoom"] = "Standard Zoom"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)"; +App::$strings["Settings updated."] = "Einstellungen aktualisiert."; diff --git a/sources/addons/openstreetmap/lang/eo/strings.php b/sources/addons/openstreetmap/lang/eo/strings.php index 5f256dd6..3a57ed7b 100644 --- a/sources/addons/openstreetmap/lang/eo/strings.php +++ b/sources/addons/openstreetmap/lang/eo/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Sendi"; -$a->strings["Tile Server URL"] = "Adreso de Kahelservilo"; -$a->strings["A list of public tile servers"] = "Listo de publikaj kahelserviloj"; -$a->strings["Default zoom"] = "Defaŭlta zoma faktoro"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "La defaŭlta zoma faktoro. (1:tutmonda, 18:plej proksima)"; -$a->strings["Settings updated."] = "Agordoj ĝisdatigita."; +App::$strings["Submit"] = "Sendi"; +App::$strings["Tile Server URL"] = "Adreso de Kahelservilo"; +App::$strings["A list of public tile servers"] = "Listo de publikaj kahelserviloj"; +App::$strings["Default zoom"] = "Defaŭlta zoma faktoro"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "La defaŭlta zoma faktoro. (1:tutmonda, 18:plej proksima)"; +App::$strings["Settings updated."] = "Agordoj ĝisdatigita."; diff --git a/sources/addons/openstreetmap/lang/es/strings.php b/sources/addons/openstreetmap/lang/es/strings.php index 0c40375e..2202ec27 100644 --- a/sources/addons/openstreetmap/lang/es/strings.php +++ b/sources/addons/openstreetmap/lang/es/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Envíar"; -$a->strings["Tile Server URL"] = "Dirección del servidor"; -$a->strings["A list of public tile servers"] = "Un listado de servidores públicos"; -$a->strings["Default zoom"] = "Zoom por defecto"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivel de zoom predeterminado. (1:mínimo, 18:máximo)"; -$a->strings["Settings updated."] = "Configuración actualizada."; +App::$strings["Submit"] = "Envíar"; +App::$strings["Tile Server URL"] = "Dirección del servidor"; +App::$strings["A list of public tile servers"] = "Un listado de servidores públicos"; +App::$strings["Default zoom"] = "Zoom por defecto"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "Nivel de zoom predeterminado. (1:mínimo, 18:máximo)"; +App::$strings["Settings updated."] = "Configuración actualizada."; diff --git a/sources/addons/openstreetmap/lang/fr/strings.php b/sources/addons/openstreetmap/lang/fr/strings.php index a7b79e75..205dcc7d 100644 --- a/sources/addons/openstreetmap/lang/fr/strings.php +++ b/sources/addons/openstreetmap/lang/fr/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Envoyer"; -$a->strings["Tile Server URL"] = "URL du serveur de tuiles"; -$a->strings["A list of public tile servers"] = "Une liste de serveurs de tuiles publics"; -$a->strings["Default zoom"] = "Zoom par défaut"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)"; -$a->strings["Settings updated."] = "Réglages mis à jour."; +App::$strings["Submit"] = "Envoyer"; +App::$strings["Tile Server URL"] = "URL du serveur de tuiles"; +App::$strings["A list of public tile servers"] = "Une liste de serveurs de tuiles publics"; +App::$strings["Default zoom"] = "Zoom par défaut"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)"; +App::$strings["Settings updated."] = "Réglages mis à jour."; diff --git a/sources/addons/openstreetmap/lang/is/strings.php b/sources/addons/openstreetmap/lang/is/strings.php index dc717efb..1c9c6f67 100644 --- a/sources/addons/openstreetmap/lang/is/strings.php +++ b/sources/addons/openstreetmap/lang/is/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Senda inn"; -$a->strings["Tile Server URL"] = ""; -$a->strings["A list of public tile servers"] = ""; -$a->strings["Default zoom"] = "Sjálfgefin þysjun"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Sjálfgefna þysjunar sig. (1:heimur, 18:mest)"; -$a->strings["Settings updated."] = "Stillingar uppfærðar"; +App::$strings["Submit"] = "Senda inn"; +App::$strings["Tile Server URL"] = ""; +App::$strings["A list of public tile servers"] = ""; +App::$strings["Default zoom"] = "Sjálfgefin þysjun"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "Sjálfgefna þysjunar sig. (1:heimur, 18:mest)"; +App::$strings["Settings updated."] = "Stillingar uppfærðar"; diff --git a/sources/addons/openstreetmap/lang/it/strings.php b/sources/addons/openstreetmap/lang/it/strings.php index 551b599a..45eb0912 100644 --- a/sources/addons/openstreetmap/lang/it/strings.php +++ b/sources/addons/openstreetmap/lang/it/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Invia"; -$a->strings["Tile Server URL"] = ""; -$a->strings["A list of public tile servers"] = ""; -$a->strings["Default zoom"] = "Default zoom"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = ""; -$a->strings["Settings updated."] = "Impostazioni aggiornate."; +App::$strings["Submit"] = "Invia"; +App::$strings["Tile Server URL"] = ""; +App::$strings["A list of public tile servers"] = ""; +App::$strings["Default zoom"] = "Default zoom"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = ""; +App::$strings["Settings updated."] = "Impostazioni aggiornate."; diff --git a/sources/addons/openstreetmap/lang/nb-no/strings.php b/sources/addons/openstreetmap/lang/nb-no/strings.php index b4d7a7f6..605cbce6 100644 --- a/sources/addons/openstreetmap/lang/nb-no/strings.php +++ b/sources/addons/openstreetmap/lang/nb-no/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Lagre"; -$a->strings["Tile Server URL"] = ""; -$a->strings["A list of public tile servers"] = ""; -$a->strings["Default zoom"] = ""; -$a->strings["The default zoom level. (1:world, 18:highest)"] = ""; -$a->strings["Settings updated."] = "Innstillinger oppdatert."; +App::$strings["Submit"] = "Lagre"; +App::$strings["Tile Server URL"] = ""; +App::$strings["A list of public tile servers"] = ""; +App::$strings["Default zoom"] = ""; +App::$strings["The default zoom level. (1:world, 18:highest)"] = ""; +App::$strings["Settings updated."] = "Innstillinger oppdatert."; diff --git a/sources/addons/openstreetmap/lang/nl/strings.php b/sources/addons/openstreetmap/lang/nl/strings.php index 73ad3594..db27872d 100644 --- a/sources/addons/openstreetmap/lang/nl/strings.php +++ b/sources/addons/openstreetmap/lang/nl/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Opslaan"; -$a->strings["Tile Server URL"] = "URL tile-server"; -$a->strings["A list of public tile servers"] = "Een lijst met openbare tile-servers"; -$a->strings["Default zoom"] = "Standaard zoomniveau"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Het standaard zoomniveau. Van 1 (wereld) t/m 18 (maximaal)."; -$a->strings["Settings updated."] = "Instellingen bijgewerkt."; +App::$strings["Submit"] = "Opslaan"; +App::$strings["Tile Server URL"] = "URL tile-server"; +App::$strings["A list of public tile servers"] = "Een lijst met openbare tile-servers"; +App::$strings["Default zoom"] = "Standaard zoomniveau"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "Het standaard zoomniveau. Van 1 (wereld) t/m 18 (maximaal)."; +App::$strings["Settings updated."] = "Instellingen bijgewerkt."; diff --git a/sources/addons/openstreetmap/lang/pl/strings.php b/sources/addons/openstreetmap/lang/pl/strings.php index 3bc33e58..25a99c6b 100644 --- a/sources/addons/openstreetmap/lang/pl/strings.php +++ b/sources/addons/openstreetmap/lang/pl/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Potwierdź"; -$a->strings["Tile Server URL"] = ""; -$a->strings["A list of public tile servers"] = ""; -$a->strings["Default zoom"] = "Domyślne przybliżenie"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = ""; -$a->strings["Settings updated."] = "Zaktualizowano ustawienia."; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["Tile Server URL"] = ""; +App::$strings["A list of public tile servers"] = ""; +App::$strings["Default zoom"] = "Domyślne przybliżenie"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = ""; +App::$strings["Settings updated."] = "Zaktualizowano ustawienia."; diff --git a/sources/addons/openstreetmap/lang/pt-br/strings.php b/sources/addons/openstreetmap/lang/pt-br/strings.php index 5a9c4d28..e4e99251 100644 --- a/sources/addons/openstreetmap/lang/pt-br/strings.php +++ b/sources/addons/openstreetmap/lang/pt-br/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Enviar"; -$a->strings["Tile Server URL"] = ""; -$a->strings["A list of public tile servers"] = ""; -$a->strings["Default zoom"] = "Zoom padrão"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "O nível padrão de zoom. (1:mundo, 18:máximo) "; -$a->strings["Settings updated."] = "As configurações foram atualizadas."; +App::$strings["Submit"] = "Enviar"; +App::$strings["Tile Server URL"] = ""; +App::$strings["A list of public tile servers"] = ""; +App::$strings["Default zoom"] = "Zoom padrão"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "O nível padrão de zoom. (1:mundo, 18:máximo) "; +App::$strings["Settings updated."] = "As configurações foram atualizadas."; diff --git a/sources/addons/openstreetmap/lang/ru/strings.php b/sources/addons/openstreetmap/lang/ru/strings.php index e249d2dc..d567f472 100644 --- a/sources/addons/openstreetmap/lang/ru/strings.php +++ b/sources/addons/openstreetmap/lang/ru/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "Подтвердить"; -$a->strings["Tile Server URL"] = ""; -$a->strings["A list of public tile servers"] = "Список общедоступных серверов"; -$a->strings["Default zoom"] = "zoom по умолчанию"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = ""; -$a->strings["Settings updated."] = "Настройки обновлены."; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["Tile Server URL"] = ""; +App::$strings["A list of public tile servers"] = "Список общедоступных серверов"; +App::$strings["Default zoom"] = "zoom по умолчанию"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = ""; +App::$strings["Settings updated."] = "Настройки обновлены."; diff --git a/sources/addons/openstreetmap/lang/sv/strings.php b/sources/addons/openstreetmap/lang/sv/strings.php index dcd4e821..0b10dc35 100644 --- a/sources/addons/openstreetmap/lang/sv/strings.php +++ b/sources/addons/openstreetmap/lang/sv/strings.php @@ -1,4 +1,4 @@ strings["Submit"] = "Spara"; -$a->strings["Settings updated."] = "Inställningarna har uppdaterats."; +App::$strings["Submit"] = "Spara"; +App::$strings["Settings updated."] = "Inställningarna har uppdaterats."; diff --git a/sources/addons/openstreetmap/lang/zh-cn/strings.php b/sources/addons/openstreetmap/lang/zh-cn/strings.php index 85a19ec3..b7459614 100644 --- a/sources/addons/openstreetmap/lang/zh-cn/strings.php +++ b/sources/addons/openstreetmap/lang/zh-cn/strings.php @@ -1,8 +1,8 @@ strings["Submit"] = "提交"; -$a->strings["Tile Server URL"] = "砖服务器URL"; -$a->strings["A list of public tile servers"] = "一单公共砖服务器"; -$a->strings["Default zoom"] = "默认变焦距"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "默认变焦距。(1:世界, 18:最高)"; -$a->strings["Settings updated."] = "设置跟新了"; +App::$strings["Submit"] = "提交"; +App::$strings["Tile Server URL"] = "砖服务器URL"; +App::$strings["A list of public tile servers"] = "一单公共砖服务器"; +App::$strings["Default zoom"] = "默认变焦距"; +App::$strings["The default zoom level. (1:world, 18:highest)"] = "默认变焦距。(1:世界, 18:最高)"; +App::$strings["Settings updated."] = "设置跟新了"; diff --git a/sources/addons/openstreetmap/openstreetmap.php b/sources/addons/openstreetmap/openstreetmap.php index 713afa90..49a1ce66 100755 --- a/sources/addons/openstreetmap/openstreetmap.php +++ b/sources/addons/openstreetmap/openstreetmap.php @@ -27,8 +27,8 @@ function openstreetmap_unload() { } function openstreetmap_alterheader($a, &$navHtml) { - $addScriptTag = '' . "\r\n"; - $a->page['htmlhead'] .= $addScriptTag; + $addScriptTag = '' . "\r\n"; + App::$page['htmlhead'] .= $addScriptTag; } /** diff --git a/sources/addons/pageheader/lang/ca/strings.php b/sources/addons/pageheader/lang/ca/strings.php index 389bdc27..557cb823 100644 --- a/sources/addons/pageheader/lang/ca/strings.php +++ b/sources/addons/pageheader/lang/ca/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = "Configuració de la capçalera de pàgina."; -$a->strings["Submit"] = "Enviar"; -$a->strings["pageheader Settings saved."] = "guardada la configuració de la capçalera de pàgina."; +App::$strings["\"pageheader\" Settings"] = "Configuració de la capçalera de pàgina."; +App::$strings["Submit"] = "Enviar"; +App::$strings["pageheader Settings saved."] = "guardada la configuració de la capçalera de pàgina."; diff --git a/sources/addons/pageheader/lang/cs/strings.php b/sources/addons/pageheader/lang/cs/strings.php index d49f4efe..7b2421df 100644 --- a/sources/addons/pageheader/lang/cs/strings.php +++ b/sources/addons/pageheader/lang/cs/strings.php @@ -5,6 +5,6 @@ function string_plural_select_cs($n){ return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;; }} ; -$a->strings["\"pageheader\" Settings"] = "Nastavení záhlaví stránky"; -$a->strings["Submit"] = "Odeslat"; -$a->strings["pageheader Settings saved."] = "Nastavení záhlaví stránky uloženo."; +App::$strings["\"pageheader\" Settings"] = "Nastavení záhlaví stránky"; +App::$strings["Submit"] = "Odeslat"; +App::$strings["pageheader Settings saved."] = "Nastavení záhlaví stránky uloženo."; diff --git a/sources/addons/pageheader/lang/de/strings.php b/sources/addons/pageheader/lang/de/strings.php index 45f16940..af85ea22 100644 --- a/sources/addons/pageheader/lang/de/strings.php +++ b/sources/addons/pageheader/lang/de/strings.php @@ -5,6 +5,6 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen"; -$a->strings["Submit"] = "Senden"; -$a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert."; +App::$strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen"; +App::$strings["Submit"] = "Senden"; +App::$strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert."; diff --git a/sources/addons/pageheader/lang/eo/strings.php b/sources/addons/pageheader/lang/eo/strings.php index 5a23c2af..36d3361a 100644 --- a/sources/addons/pageheader/lang/eo/strings.php +++ b/sources/addons/pageheader/lang/eo/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = "\"pageheader\" Agordoj"; -$a->strings["Submit"] = "Sendi"; -$a->strings["pageheader Settings saved."] = "Konservis Agordojn de pageheader."; +App::$strings["\"pageheader\" Settings"] = "\"pageheader\" Agordoj"; +App::$strings["Submit"] = "Sendi"; +App::$strings["pageheader Settings saved."] = "Konservis Agordojn de pageheader."; diff --git a/sources/addons/pageheader/lang/es/strings.php b/sources/addons/pageheader/lang/es/strings.php index f8a07aac..6cd341d1 100644 --- a/sources/addons/pageheader/lang/es/strings.php +++ b/sources/addons/pageheader/lang/es/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = "Configuración de cabecera"; -$a->strings["Submit"] = "Envíar"; -$a->strings["pageheader Settings saved."] = "Configuración de cabecera de página guardada."; +App::$strings["\"pageheader\" Settings"] = "Configuración de cabecera"; +App::$strings["Submit"] = "Envíar"; +App::$strings["pageheader Settings saved."] = "Configuración de cabecera de página guardada."; diff --git a/sources/addons/pageheader/lang/fr/strings.php b/sources/addons/pageheader/lang/fr/strings.php index 78702a55..486b86d9 100644 --- a/sources/addons/pageheader/lang/fr/strings.php +++ b/sources/addons/pageheader/lang/fr/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = "Réglages de pageheader"; -$a->strings["Submit"] = "Envoyer"; -$a->strings["pageheader Settings saved."] = "Réglages pageheader sauvés."; +App::$strings["\"pageheader\" Settings"] = "Réglages de pageheader"; +App::$strings["Submit"] = "Envoyer"; +App::$strings["pageheader Settings saved."] = "Réglages pageheader sauvés."; diff --git a/sources/addons/pageheader/lang/is/strings.php b/sources/addons/pageheader/lang/is/strings.php index 86c571ee..ecad2914 100644 --- a/sources/addons/pageheader/lang/is/strings.php +++ b/sources/addons/pageheader/lang/is/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = "Stillingar \"pageheader\""; -$a->strings["Submit"] = "Senda inn"; -$a->strings["pageheader Settings saved."] = "Stillingar pageheader vistaðar."; +App::$strings["\"pageheader\" Settings"] = "Stillingar \"pageheader\""; +App::$strings["Submit"] = "Senda inn"; +App::$strings["pageheader Settings saved."] = "Stillingar pageheader vistaðar."; diff --git a/sources/addons/pageheader/lang/it/strings.php b/sources/addons/pageheader/lang/it/strings.php index c7088fa7..e7770142 100644 --- a/sources/addons/pageheader/lang/it/strings.php +++ b/sources/addons/pageheader/lang/it/strings.php @@ -5,6 +5,6 @@ function string_plural_select_it($n){ return ($n != 1);; }} ; -$a->strings["\"pageheader\" Settings"] = "Impostazioni \"Intestazione pagina\""; -$a->strings["Submit"] = ""; -$a->strings["pageheader Settings saved."] = "Impostazioni \"Intestazione pagina\" salvate."; +App::$strings["\"pageheader\" Settings"] = "Impostazioni \"Intestazione pagina\""; +App::$strings["Submit"] = ""; +App::$strings["pageheader Settings saved."] = "Impostazioni \"Intestazione pagina\" salvate."; diff --git a/sources/addons/pageheader/lang/nb-no/strings.php b/sources/addons/pageheader/lang/nb-no/strings.php index 6555a83c..667b3e28 100644 --- a/sources/addons/pageheader/lang/nb-no/strings.php +++ b/sources/addons/pageheader/lang/nb-no/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = ""; -$a->strings["Submit"] = "Lagre"; -$a->strings["pageheader Settings saved."] = ""; +App::$strings["\"pageheader\" Settings"] = ""; +App::$strings["Submit"] = "Lagre"; +App::$strings["pageheader Settings saved."] = ""; diff --git a/sources/addons/pageheader/lang/nl/strings.php b/sources/addons/pageheader/lang/nl/strings.php index 05e9007b..6e48d30e 100644 --- a/sources/addons/pageheader/lang/nl/strings.php +++ b/sources/addons/pageheader/lang/nl/strings.php @@ -5,7 +5,7 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Pageheader Settings"] = "Pageheader-instellingen"; -$a->strings["Message to display on every page on this server"] = "Bericht om weer te geven op elke pagina van deze hub"; -$a->strings["Submit"] = "Opslaan"; -$a->strings["pageheader Settings saved."] = "Pageheader-instellingen opgeslagen."; +App::$strings["Pageheader Settings"] = "Pageheader-instellingen"; +App::$strings["Message to display on every page on this server"] = "Bericht om weer te geven op elke pagina van deze hub"; +App::$strings["Submit"] = "Opslaan"; +App::$strings["pageheader Settings saved."] = "Pageheader-instellingen opgeslagen."; diff --git a/sources/addons/pageheader/lang/pl/strings.php b/sources/addons/pageheader/lang/pl/strings.php index 620839a9..8dffe102 100644 --- a/sources/addons/pageheader/lang/pl/strings.php +++ b/sources/addons/pageheader/lang/pl/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = ""; -$a->strings["Submit"] = "Potwierdź"; -$a->strings["pageheader Settings saved."] = ""; +App::$strings["\"pageheader\" Settings"] = ""; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["pageheader Settings saved."] = ""; diff --git a/sources/addons/pageheader/lang/pt-br/strings.php b/sources/addons/pageheader/lang/pt-br/strings.php index 9dd22e1d..1da41317 100644 --- a/sources/addons/pageheader/lang/pt-br/strings.php +++ b/sources/addons/pageheader/lang/pt-br/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = "Configurações do \"pageheader\""; -$a->strings["Submit"] = "Enviar"; -$a->strings["pageheader Settings saved."] = "Configurações do pageheader armazenadas."; +App::$strings["\"pageheader\" Settings"] = "Configurações do \"pageheader\""; +App::$strings["Submit"] = "Enviar"; +App::$strings["pageheader Settings saved."] = "Configurações do pageheader armazenadas."; diff --git a/sources/addons/pageheader/lang/ro/strings.php b/sources/addons/pageheader/lang/ro/strings.php index cdcce616..a138b36d 100644 --- a/sources/addons/pageheader/lang/ro/strings.php +++ b/sources/addons/pageheader/lang/ro/strings.php @@ -5,6 +5,6 @@ function string_plural_select_ro($n){ return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));; }} ; -$a->strings["\"pageheader\" Settings"] = "Configurări \"Pageheader\""; -$a->strings["Submit"] = "Trimite"; -$a->strings["pageheader Settings saved."] = "Configurările antetului de pagină au fost salvate."; +App::$strings["\"pageheader\" Settings"] = "Configurări \"Pageheader\""; +App::$strings["Submit"] = "Trimite"; +App::$strings["pageheader Settings saved."] = "Configurările antetului de pagină au fost salvate."; diff --git a/sources/addons/pageheader/lang/ru/strings.php b/sources/addons/pageheader/lang/ru/strings.php index edf7ea45..84a51533 100644 --- a/sources/addons/pageheader/lang/ru/strings.php +++ b/sources/addons/pageheader/lang/ru/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = ""; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["pageheader Settings saved."] = ""; +App::$strings["\"pageheader\" Settings"] = ""; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["pageheader Settings saved."] = ""; diff --git a/sources/addons/pageheader/lang/sv/strings.php b/sources/addons/pageheader/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/pageheader/lang/sv/strings.php +++ b/sources/addons/pageheader/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/pageheader/lang/zh-cn/strings.php b/sources/addons/pageheader/lang/zh-cn/strings.php index 5cc7af17..51611beb 100644 --- a/sources/addons/pageheader/lang/zh-cn/strings.php +++ b/sources/addons/pageheader/lang/zh-cn/strings.php @@ -1,5 +1,5 @@ strings["\"pageheader\" Settings"] = "\"pageheader"; -$a->strings["Submit"] = "提交"; -$a->strings["pageheader Settings saved."] = "pageHeader配置保存了。"; +App::$strings["\"pageheader\" Settings"] = "\"pageheader"; +App::$strings["Submit"] = "提交"; +App::$strings["pageheader Settings saved."] = "pageHeader配置保存了。"; diff --git a/sources/addons/pageheader/pageheader.php b/sources/addons/pageheader/pageheader.php index 140f491f..121a12b7 100755 --- a/sources/addons/pageheader/pageheader.php +++ b/sources/addons/pageheader/pageheader.php @@ -75,7 +75,7 @@ function pageheader_fetch($a,&$b) { $s = file_get_contents('pageheader.html'); } else { $s = get_config('pageheader', 'text'); - $a->page['htmlhead'] .= '' . "\r\n"; + App::$page['htmlhead'] .= '' . "\r\n"; } if($s) diff --git a/sources/addons/piwik/README.md b/sources/addons/piwik/README.md index 9350c10f..7f3d99ff 100755 --- a/sources/addons/piwik/README.md +++ b/sources/addons/piwik/README.md @@ -23,11 +23,11 @@ Configuration Activate the analytics addon in your admin panel and then open the .htconfig.php file in you fav editor to add the following lines: - $a->config['piwik']['baseurl'] = 'example.com/piwik/'; - $a->config['piwik']['sideid'] = '1'; - $a->config['piwik']['optout'] = true; - $a->config['piwik']['async'] = false; - $a->config['piwik']['trackjserror'] = false; + App::$config['piwik']['baseurl'] = 'example.com/piwik/'; + App::$config['piwik']['sideid'] = '1'; + App::$config['piwik']['optout'] = true; + App::$config['piwik']['async'] = false; + App::$config['piwik']['trackjserror'] = false; You can also use the CLI config utility: `$ ./util/config piwik baseurl "www.example.com/piwik/"` diff --git a/sources/addons/piwik/lang/ca/strings.php b/sources/addons/piwik/lang/ca/strings.php index 119bd57c..612551ae 100644 --- a/sources/addons/piwik/lang/ca/strings.php +++ b/sources/addons/piwik/lang/ca/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi Piwik."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si no vol que les seves visites es registrin d'aquesta manera vostè pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web (opt-out)."; -$a->strings["Submit"] = "Enviar"; -$a->strings["Piwik Base URL"] = "URL Piwik Base"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )"; -$a->strings["Site ID"] = "Lloc ID"; -$a->strings["Show opt-out cookie link?"] = "Mostra l'enllaç cookie opt-out?"; -$a->strings["Asynchronous tracking"] = "Seguiment asíncrono"; -$a->strings["Settings updated."] = "Ajustos actualitzats."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si no vol que les seves visites es registrin d'aquesta manera vostè pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web (opt-out)."; +App::$strings["Submit"] = "Enviar"; +App::$strings["Piwik Base URL"] = "URL Piwik Base"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )"; +App::$strings["Site ID"] = "Lloc ID"; +App::$strings["Show opt-out cookie link?"] = "Mostra l'enllaç cookie opt-out?"; +App::$strings["Asynchronous tracking"] = "Seguiment asíncrono"; +App::$strings["Settings updated."] = "Ajustos actualitzats."; diff --git a/sources/addons/piwik/lang/cs/strings.php b/sources/addons/piwik/lang/cs/strings.php index 0ba58f12..19484c3d 100644 --- a/sources/addons/piwik/lang/cs/strings.php +++ b/sources/addons/piwik/lang/cs/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Tato webová stránka je sledována pomocí nástroje pro analýzu Piwik."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Pokud si nepřejete, aby Vaše návštěvy byly takto sledovány, můžete si nastavit cookie, které zastaví sledování dalších návštěv na tomto webu (opt-out)."; -$a->strings["Submit"] = "Odeslat"; -$a->strings["Piwik Base URL"] = "Piwik Base adresa URL"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absolutní cesta k Vaší instalaci Piwik. (bez protokolu (http/s), s koncovým lomítkem)"; -$a->strings["Site ID"] = "ID webu"; -$a->strings["Show opt-out cookie link?"] = "Zobrazit odkaz opt-out cookie?"; -$a->strings["Asynchronous tracking"] = "Asynchronní sledování"; -$a->strings["Settings updated."] = "Nastavení aktualizováno."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Tato webová stránka je sledována pomocí nástroje pro analýzu Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Pokud si nepřejete, aby Vaše návštěvy byly takto sledovány, můžete si nastavit cookie, které zastaví sledování dalších návštěv na tomto webu (opt-out)."; +App::$strings["Submit"] = "Odeslat"; +App::$strings["Piwik Base URL"] = "Piwik Base adresa URL"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absolutní cesta k Vaší instalaci Piwik. (bez protokolu (http/s), s koncovým lomítkem)"; +App::$strings["Site ID"] = "ID webu"; +App::$strings["Show opt-out cookie link?"] = "Zobrazit odkaz opt-out cookie?"; +App::$strings["Asynchronous tracking"] = "Asynchronní sledování"; +App::$strings["Settings updated."] = "Nastavení aktualizováno."; diff --git a/sources/addons/piwik/lang/de/strings.php b/sources/addons/piwik/lang/de/strings.php index cb4d10bb..5d5a9d09 100644 --- a/sources/addons/piwik/lang/de/strings.php +++ b/sources/addons/piwik/lang/de/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Diese Website benutzt Piwik, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wenn du nicht willst, dass deine Besuche auf diese Weise gespeichert werden, kannst du ein Cookie setzen. Dann wird Piwik dich auf dieser Website nicht mehr verfolgen (opt-out)."; -$a->strings["Submit"] = "Senden"; -$a->strings["Piwik Base URL"] = "Piwik Basis URL"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)"; -$a->strings["Site ID"] = "Seiten ID"; -$a->strings["Show opt-out cookie link?"] = "Link zum Setzen des Opt-Out Cookies anzeigen?"; -$a->strings["Asynchronous tracking"] = "Asynchrones Tracken"; -$a->strings["Settings updated."] = "Einstellungen aktualisiert."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Diese Website benutzt Piwik, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wenn du nicht willst, dass deine Besuche auf diese Weise gespeichert werden, kannst du ein Cookie setzen. Dann wird Piwik dich auf dieser Website nicht mehr verfolgen (opt-out)."; +App::$strings["Submit"] = "Senden"; +App::$strings["Piwik Base URL"] = "Piwik Basis URL"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)"; +App::$strings["Site ID"] = "Seiten ID"; +App::$strings["Show opt-out cookie link?"] = "Link zum Setzen des Opt-Out Cookies anzeigen?"; +App::$strings["Asynchronous tracking"] = "Asynchrones Tracken"; +App::$strings["Settings updated."] = "Einstellungen aktualisiert."; diff --git a/sources/addons/piwik/lang/eo/strings.php b/sources/addons/piwik/lang/eo/strings.php index e38127cc..1900cdd0 100644 --- a/sources/addons/piwik/lang/eo/strings.php +++ b/sources/addons/piwik/lang/eo/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Ĉi retejo uzas Piwik kiel retuma analizilo."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Se ni ne protokolu viajn vizitojn tiel, vi povas agordi kuketon por malpermesi Piwik al plu protokoli pliajn vizitojn (mem-for-elekti / opt-out)."; -$a->strings["Submit"] = "Sendi"; -$a->strings["Piwik Base URL"] = "Piwik baza URL adreso"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluta vojo al via Piwik instalo. (sen protokolo (http/s), inkluzive vosta oblikva streketo)"; -$a->strings["Site ID"] = "Reteja idento"; -$a->strings["Show opt-out cookie link?"] = "Montru ligilon al kuketo por mem-for-elekti (opt-out)?"; -$a->strings["Asynchronous tracking"] = "Nesinkrona spurado."; -$a->strings["Settings updated."] = "Agordoj ĝisdatigita."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Ĉi retejo uzas Piwik kiel retuma analizilo."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Se ni ne protokolu viajn vizitojn tiel, vi povas agordi kuketon por malpermesi Piwik al plu protokoli pliajn vizitojn (mem-for-elekti / opt-out)."; +App::$strings["Submit"] = "Sendi"; +App::$strings["Piwik Base URL"] = "Piwik baza URL adreso"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluta vojo al via Piwik instalo. (sen protokolo (http/s), inkluzive vosta oblikva streketo)"; +App::$strings["Site ID"] = "Reteja idento"; +App::$strings["Show opt-out cookie link?"] = "Montru ligilon al kuketo por mem-for-elekti (opt-out)?"; +App::$strings["Asynchronous tracking"] = "Nesinkrona spurado."; +App::$strings["Settings updated."] = "Agordoj ĝisdatigita."; diff --git a/sources/addons/piwik/lang/es/strings.php b/sources/addons/piwik/lang/es/strings.php index 59e264ae..5fb188d4 100644 --- a/sources/addons/piwik/lang/es/strings.php +++ b/sources/addons/piwik/lang/es/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Este sitio realiza un seguimiento mediante la herramienta de análisis Piwik."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si no quieres que tus visitas sean registradas de esta manera puedes establecer una cookie para evitar que Piwik realice un seguimiento de las visitas del sitio (opt-out)."; -$a->strings["Submit"] = "Envíar"; -$a->strings["Piwik Base URL"] = "Dirección base Piwik"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Ruta absoluta a tu instalación de Piwik (sin el protocolo (http/s) pero con la barra)."; -$a->strings["Site ID"] = "ID del sitio"; -$a->strings["Show opt-out cookie link?"] = "¿Mostrar enlace a las cookies?"; -$a->strings["Asynchronous tracking"] = "Seguimiento asíncrono"; -$a->strings["Settings updated."] = "Configuración actualizada."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Este sitio realiza un seguimiento mediante la herramienta de análisis Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si no quieres que tus visitas sean registradas de esta manera puedes establecer una cookie para evitar que Piwik realice un seguimiento de las visitas del sitio (opt-out)."; +App::$strings["Submit"] = "Envíar"; +App::$strings["Piwik Base URL"] = "Dirección base Piwik"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Ruta absoluta a tu instalación de Piwik (sin el protocolo (http/s) pero con la barra)."; +App::$strings["Site ID"] = "ID del sitio"; +App::$strings["Show opt-out cookie link?"] = "¿Mostrar enlace a las cookies?"; +App::$strings["Asynchronous tracking"] = "Seguimiento asíncrono"; +App::$strings["Settings updated."] = "Configuración actualizada."; diff --git a/sources/addons/piwik/lang/fr/strings.php b/sources/addons/piwik/lang/fr/strings.php index dacafc1d..b259b430 100644 --- a/sources/addons/piwik/lang/fr/strings.php +++ b/sources/addons/piwik/lang/fr/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Ce site collecte ses statistiques grâce à Piwik."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si vous ne voulez pas que vos visites soient collectées par ce biais, vous pouvez activer un cookie qui empêchera Piwik de tenir compte de vos visites ultérieures (opt-out)."; -$a->strings["Submit"] = "Envoyer"; -$a->strings["Piwik Base URL"] = "URL de base de Piwik"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Chemin absolu vers votre installation Piwik. (sans protocole (http/s), avec un / terminal)"; -$a->strings["Site ID"] = "ID du site"; -$a->strings["Show opt-out cookie link?"] = "Montrer le lien d'opt-out?"; -$a->strings["Asynchronous tracking"] = "Suivi asynchrone"; -$a->strings["Settings updated."] = "Réglages mis à jour."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Ce site collecte ses statistiques grâce à Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si vous ne voulez pas que vos visites soient collectées par ce biais, vous pouvez activer un cookie qui empêchera Piwik de tenir compte de vos visites ultérieures (opt-out)."; +App::$strings["Submit"] = "Envoyer"; +App::$strings["Piwik Base URL"] = "URL de base de Piwik"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Chemin absolu vers votre installation Piwik. (sans protocole (http/s), avec un / terminal)"; +App::$strings["Site ID"] = "ID du site"; +App::$strings["Show opt-out cookie link?"] = "Montrer le lien d'opt-out?"; +App::$strings["Asynchronous tracking"] = "Suivi asynchrone"; +App::$strings["Settings updated."] = "Réglages mis à jour."; diff --git a/sources/addons/piwik/lang/is/strings.php b/sources/addons/piwik/lang/is/strings.php index 283b0013..7e34f276 100644 --- a/sources/addons/piwik/lang/is/strings.php +++ b/sources/addons/piwik/lang/is/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Þessi vefur er í Piwik vefmælingu."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Ef þú villt ekki vera í vefmælingu smelltu hér til að sækja köku sem afskráir þig úr mælingu."; -$a->strings["Submit"] = "Senda inn"; -$a->strings["Piwik Base URL"] = "Slóð á Piwik grunn"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; -$a->strings["Site ID"] = "Auðkenni vefs"; -$a->strings["Show opt-out cookie link?"] = "Sýna ekki taka við kökum "; -$a->strings["Asynchronous tracking"] = ""; -$a->strings["Settings updated."] = "Stillingar uppfærðar"; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Þessi vefur er í Piwik vefmælingu."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Ef þú villt ekki vera í vefmælingu smelltu hér til að sækja köku sem afskráir þig úr mælingu."; +App::$strings["Submit"] = "Senda inn"; +App::$strings["Piwik Base URL"] = "Slóð á Piwik grunn"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; +App::$strings["Site ID"] = "Auðkenni vefs"; +App::$strings["Show opt-out cookie link?"] = "Sýna ekki taka við kökum "; +App::$strings["Asynchronous tracking"] = ""; +App::$strings["Settings updated."] = "Stillingar uppfærðar"; diff --git a/sources/addons/piwik/lang/it/strings.php b/sources/addons/piwik/lang/it/strings.php index a715f5b2..30b6368b 100644 --- a/sources/addons/piwik/lang/it/strings.php +++ b/sources/addons/piwik/lang/it/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Questo sito è monitorato con lo strumento di analisi Piwik."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Se non vuoi che le tue visite vengono registrate in questo modo è possibile impostare un cookie per evitare che Piwik rintracci ulteriori visite del sito (opt-out)."; -$a->strings["Submit"] = "Invia"; -$a->strings["Piwik Base URL"] = "Piwik Base URL"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Percorso assoluto alla tua installazione di Piwik, senza il protocollo (http/https), con la barra alla fine"; -$a->strings["Site ID"] = "Site ID"; -$a->strings["Show opt-out cookie link?"] = "Mostra il link per il cookie opt-out?"; -$a->strings["Asynchronous tracking"] = "Tracciamento asincrono"; -$a->strings["Settings updated."] = "Impostazioni aggiornate."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Questo sito è monitorato con lo strumento di analisi Piwik."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Se non vuoi che le tue visite vengono registrate in questo modo è possibile impostare un cookie per evitare che Piwik rintracci ulteriori visite del sito (opt-out)."; +App::$strings["Submit"] = "Invia"; +App::$strings["Piwik Base URL"] = "Piwik Base URL"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Percorso assoluto alla tua installazione di Piwik, senza il protocollo (http/https), con la barra alla fine"; +App::$strings["Site ID"] = "Site ID"; +App::$strings["Show opt-out cookie link?"] = "Mostra il link per il cookie opt-out?"; +App::$strings["Asynchronous tracking"] = "Tracciamento asincrono"; +App::$strings["Settings updated."] = "Impostazioni aggiornate."; diff --git a/sources/addons/piwik/lang/nb-no/strings.php b/sources/addons/piwik/lang/nb-no/strings.php index 38f24bb4..2751a6a6 100644 --- a/sources/addons/piwik/lang/nb-no/strings.php +++ b/sources/addons/piwik/lang/nb-no/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = ""; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = ""; -$a->strings["Submit"] = "Lagre"; -$a->strings["Piwik Base URL"] = "Piwik Base URL"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; -$a->strings["Site ID"] = "Nettstedets ID"; -$a->strings["Show opt-out cookie link?"] = "Vis lenke for å velge bort cookie?"; -$a->strings["Asynchronous tracking"] = ""; -$a->strings["Settings updated."] = "Innstillinger oppdatert."; +App::$strings["This website is tracked using the Piwik analytics tool."] = ""; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = ""; +App::$strings["Submit"] = "Lagre"; +App::$strings["Piwik Base URL"] = "Piwik Base URL"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; +App::$strings["Site ID"] = "Nettstedets ID"; +App::$strings["Show opt-out cookie link?"] = "Vis lenke for å velge bort cookie?"; +App::$strings["Asynchronous tracking"] = ""; +App::$strings["Settings updated."] = "Innstillinger oppdatert."; diff --git a/sources/addons/piwik/lang/pl/strings.php b/sources/addons/piwik/lang/pl/strings.php index 23950050..b41efff3 100644 --- a/sources/addons/piwik/lang/pl/strings.php +++ b/sources/addons/piwik/lang/pl/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = ""; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = ""; -$a->strings["Submit"] = "Potwierdź"; -$a->strings["Piwik Base URL"] = ""; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; -$a->strings["Site ID"] = "ID strony"; -$a->strings["Show opt-out cookie link?"] = ""; -$a->strings["Asynchronous tracking"] = ""; -$a->strings["Settings updated."] = "Zaktualizowano ustawienia."; +App::$strings["This website is tracked using the Piwik analytics tool."] = ""; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = ""; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["Piwik Base URL"] = ""; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; +App::$strings["Site ID"] = "ID strony"; +App::$strings["Show opt-out cookie link?"] = ""; +App::$strings["Asynchronous tracking"] = ""; +App::$strings["Settings updated."] = "Zaktualizowano ustawienia."; diff --git a/sources/addons/piwik/lang/pt-br/strings.php b/sources/addons/piwik/lang/pt-br/strings.php index 14778dba..970cf7da 100644 --- a/sources/addons/piwik/lang/pt-br/strings.php +++ b/sources/addons/piwik/lang/pt-br/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Este site é acompanhado usando a ferramenta de análises Piwik "; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Se você não deseja essa forma de registro das suas visitas pode configurar um cookie para evitar que o Piwik registre suas próximas visitas ao site (opt-out)."; -$a->strings["Submit"] = "Enviar"; -$a->strings["Piwik Base URL"] = "URL base do Piwik"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Caminho absoluto para sua instalação Piwik. (sem protocolo (http/s), com barra à direita)"; -$a->strings["Site ID"] = "ID do site"; -$a->strings["Show opt-out cookie link?"] = "Exibir o link para o cookie de opt-out?"; -$a->strings["Asynchronous tracking"] = "Rastreamento assíncrono"; -$a->strings["Settings updated."] = "As configurações foram atualizadas."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Este site é acompanhado usando a ferramenta de análises Piwik "; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Se você não deseja essa forma de registro das suas visitas pode configurar um cookie para evitar que o Piwik registre suas próximas visitas ao site (opt-out)."; +App::$strings["Submit"] = "Enviar"; +App::$strings["Piwik Base URL"] = "URL base do Piwik"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Caminho absoluto para sua instalação Piwik. (sem protocolo (http/s), com barra à direita)"; +App::$strings["Site ID"] = "ID do site"; +App::$strings["Show opt-out cookie link?"] = "Exibir o link para o cookie de opt-out?"; +App::$strings["Asynchronous tracking"] = "Rastreamento assíncrono"; +App::$strings["Settings updated."] = "As configurações foram atualizadas."; diff --git a/sources/addons/piwik/lang/ru/strings.php b/sources/addons/piwik/lang/ru/strings.php index 8f58ef45..fc64a29e 100644 --- a/sources/addons/piwik/lang/ru/strings.php +++ b/sources/addons/piwik/lang/ru/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "Этот веб-сайт отслеживается с помощью Piwik инструмент аналитики."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Если вы не хотите, чтобы ваши посещения записывались таким образом, вы можете установить куки для предотвращения отслеживания Piwik от дальнейших посещений сайта (opt-out)."; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["Piwik Base URL"] = "Piwik основной URL"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; -$a->strings["Site ID"] = "ID сайта"; -$a->strings["Show opt-out cookie link?"] = "Показать ссылку opt-out cookie?"; -$a->strings["Asynchronous tracking"] = "Асинхронное отслеживание"; -$a->strings["Settings updated."] = "Настройки обновлены."; +App::$strings["This website is tracked using the Piwik analytics tool."] = "Этот веб-сайт отслеживается с помощью Piwik инструмент аналитики."; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Если вы не хотите, чтобы ваши посещения записывались таким образом, вы можете установить куки для предотвращения отслеживания Piwik от дальнейших посещений сайта (opt-out)."; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["Piwik Base URL"] = "Piwik основной URL"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; +App::$strings["Site ID"] = "ID сайта"; +App::$strings["Show opt-out cookie link?"] = "Показать ссылку opt-out cookie?"; +App::$strings["Asynchronous tracking"] = "Асинхронное отслеживание"; +App::$strings["Settings updated."] = "Настройки обновлены."; diff --git a/sources/addons/piwik/lang/sv/strings.php b/sources/addons/piwik/lang/sv/strings.php index dcd4e821..0b10dc35 100644 --- a/sources/addons/piwik/lang/sv/strings.php +++ b/sources/addons/piwik/lang/sv/strings.php @@ -1,4 +1,4 @@ strings["Submit"] = "Spara"; -$a->strings["Settings updated."] = "Inställningarna har uppdaterats."; +App::$strings["Submit"] = "Spara"; +App::$strings["Settings updated."] = "Inställningarna har uppdaterats."; diff --git a/sources/addons/piwik/lang/zh-cn/strings.php b/sources/addons/piwik/lang/zh-cn/strings.php index 21ce8b6f..a64d53cd 100644 --- a/sources/addons/piwik/lang/zh-cn/strings.php +++ b/sources/addons/piwik/lang/zh-cn/strings.php @@ -1,11 +1,11 @@ strings["This website is tracked using the Piwik analytics tool."] = "这个网站用Piwik分析工具追踪 。"; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "如果您不想您访问这样记录您可以用一个cookie防Piwik追踪未来的访问(选择性退出)。"; -$a->strings["Submit"] = "提交"; -$a->strings["Piwik Base URL"] = "Piwik基础URL"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "绝对道路到Piwik安装。（没有协议（http/s）跟斜线后缀）"; -$a->strings["Site ID"] = "网站ID"; -$a->strings["Show opt-out cookie link?"] = " 显示选择性退出cookie按钮？"; -$a->strings["Asynchronous tracking"] = "异步追踪"; -$a->strings["Settings updated."] = "设置跟新了"; +App::$strings["This website is tracked using the Piwik analytics tool."] = "这个网站用Piwik分析工具追踪 。"; +App::$strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "如果您不想您访问这样记录您可以用一个cookie防Piwik追踪未来的访问(选择性退出)。"; +App::$strings["Submit"] = "提交"; +App::$strings["Piwik Base URL"] = "Piwik基础URL"; +App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "绝对道路到Piwik安装。（没有协议（http/s）跟斜线后缀）"; +App::$strings["Site ID"] = "网站ID"; +App::$strings["Show opt-out cookie link?"] = " 显示选择性退出cookie按钮？"; +App::$strings["Asynchronous tracking"] = "异步追踪"; +App::$strings["Settings updated."] = "设置跟新了"; diff --git a/sources/addons/piwik/piwik.php b/sources/addons/piwik/piwik.php index 2c1fa8e6..e66bb89a 100644 --- a/sources/addons/piwik/piwik.php +++ b/sources/addons/piwik/piwik.php @@ -21,11 +21,11 @@ * * $ ./util/config piwik baseurl "www.example.com/piwik/" * - * $a->config['piwik']['baseurl'] = 'www.example.com/piwik/'; - * $a->config['piwik']['siteid'] = '1'; - * $a->config['piwik']['optout'] = true; // set to false to disable - * $a->config['piwik']['async'] = false; // set to true to enable - * $a->config['piwik']['trackjserror'] = false; // set to true to enable + * App::$config['piwik']['baseurl'] = 'www.example.com/piwik/'; + * App::$config['piwik']['siteid'] = '1'; + * App::$config['piwik']['optout'] = true; // set to false to disable + * App::$config['piwik']['async'] = false; // set to true to enable + * App::$config['piwik']['trackjserror'] = false; // set to true to enable * * Change the siteid to the ID that the Piwik tracker for your Friendica * installation has. Alter the baseurl to fit your needs, don't care @@ -52,7 +52,7 @@ function piwik_analytics($a,&$b) { * associated CSS file. We just have to tell Hubzilla to get it * into the page header. */ - $a->page['htmlhead'] .= ''; + App::$page['htmlhead'] .= ''; /* * Get the configuration variables from the .htconfig file. @@ -68,9 +68,9 @@ function piwik_analytics($a,&$b) { * If async is set to true use asynchronous tracking */ if ($async) { - $a->page['htmlhead'] .= " \r\n\r\n"; + App::$page['htmlhead'] .= " \r\n\r\n"; $b .= "
\r\n\r\n
"; } else { $b .= "
\r\n \r\n\r\n\r\n
"; diff --git a/sources/addons/planets/planets.php b/sources/addons/planets/planets.php index 3b20e53f..fbf8214d 100755 --- a/sources/addons/planets/planets.php +++ b/sources/addons/planets/planets.php @@ -139,7 +139,7 @@ function planets_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variable */ diff --git a/sources/addons/pubsubhubbub/pubsub.php b/sources/addons/pubsubhubbub/pubsub.php index cd20b647..95479a22 100644 --- a/sources/addons/pubsubhubbub/pubsub.php +++ b/sources/addons/pubsubhubbub/pubsub.php @@ -5,6 +5,7 @@ require_once('include/Contact.php'); function pubsub_init(&$a) { + $nick = ((argc() > 1) ? escape_tags(trim(argv(1))) : ''); $contact_id = ((argc() > 2) ? intval(argv(2)) : 0 ); @@ -19,6 +20,8 @@ function pubsub_init(&$a) { logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR']); logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA); + + $subscribe = (($hub_mode === 'subscribe') ? 1 : 0); $channel = channelx_by_nick($nick); @@ -75,9 +78,20 @@ function pubsub_init(&$a) { function pubsub_post(&$a) { + $sys_disabled = true; + + if(! get_config('system','disable_discover_tab')) { + $sys_disabled = get_config('system','disable_diaspora_discover_tab'); + } + $sys = (($sys_disabled) ? null : get_sys_channel()); + if($sys) + $sys['system'] = true; + + + $xml = file_get_contents('php://input'); - logger('pubsub: feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd ); + logger('pubsub: feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . App::$cmd ); logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] ); logger('pubsub: data: ' . $xml, LOGGER_DATA); @@ -89,21 +103,38 @@ function pubsub_post(&$a) { if(! $channel) http_status_exit(200,'OK'); - $connections = abook_connections($channel['channel_id'], ' and abook_id = ' . $contact_id); - if($connections) - $xchan = $connections[0]; - else { - logger('connection ' . $contact_id . ' not found.'); - http_status_exit(200,'OK'); - } - if(! perm_is_allowed($channel['channel_id'],$xchan['xchan_hash'],'send_stream')) { - logger('permission denied.'); - http_status_exit(200,'OK'); - } + $importer_arr = array($channel); + if($sys) + $importer_arr[] = $sys; - consume_feed($xml,$channel,$xchan,1); - consume_feed($xml,$channel,$xchan,2); + + + foreach($importer_arr as $channel) { + if(! $channel['system']) { + $connections = abook_connections($channel['channel_id'], ' and abook_id = ' . $contact_id); + } + else { + $connections = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d", + intval($contact_id) + ); + } + if($connections) + $xchan = $connections[0]; + else { + logger('connection ' . $contact_id . ' not found.'); + continue; + } + + if((! perm_is_allowed($channel['channel_id'],$xchan['xchan_hash'],'send_stream')) && (! $channel['system'])) { + logger('permission denied.'); + continue; + } + + consume_feed($xml,$channel,$xchan,1); + consume_feed($xml,$channel,$xchan,2); + + } http_status_exit(200,'OK'); diff --git a/sources/addons/pubsubhubbub/pubsubhubbub.php b/sources/addons/pubsubhubbub/pubsubhubbub.php index 22b1a39b..c11fabfe 100644 --- a/sources/addons/pubsubhubbub/pubsubhubbub.php +++ b/sources/addons/pubsubhubbub/pubsubhubbub.php @@ -67,7 +67,10 @@ function push_notifier_process(&$a,&$b) { if(! $b['normal_mode']) return; - if($b['private']) + if($b['private'] || $b['packet_type'] || $b['mail']) + return; + + if(! $b['top_level_post']) return; // find push_subscribers following this $owner @@ -148,7 +151,7 @@ function push_queue_deliver(&$a,&$b) { else { logger('push_deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'],LOGGER_DEBUG); - update_queue_item($outq['outq_posturl']); + update_queue_item($outq['outq_hash']); } return; } @@ -295,15 +298,20 @@ function pubsubhubbub_init(&$a) { } -function pubsubhubbub_subscribe($url,$channel,$xchan,$hubmode = 'subscribe') { +function pubsubhubbub_subscribe($url,$channel,$xchan,$feed,$hubmode = 'subscribe') { $push_url = z_root() . '/pubsub/' . $channel['channel_address'] . '/' . $xchan['abook_id']; $verify = get_abconfig($channel['channel_hash'],$xchan['xchan_hash'],'pubsubhubbub','verify_token'); if(! $verify) $verify = set_abconfig($channel['channel_hash'],$xchan['xchan_hash'],'pubsubhubbub','verify_token',random_string(16)); + if($feed) + set_xconfig($xchan['xchan_hash'],'system','feed_url',$feed); + else + $feed = get_xconfig($xchan['xchan_hash'],'system','feed_url'); - $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify; + + $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($feed) . '&hub.verify=async&hub.verify_token=' . $verify; logger('subscribe_to_hub: ' . $hubmode . ' ' . $xchan['xchan_name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify); diff --git a/sources/addons/pumpio/pumpio.php b/sources/addons/pumpio/pumpio.php index cfa52a70..67020ef3 100755 --- a/sources/addons/pumpio/pumpio.php +++ b/sources/addons/pumpio/pumpio.php @@ -47,7 +47,7 @@ function pumpio_content(&$a) { $o = pumpio_connect($a); break; default: - $o = print_r($a->argv, true); + $o = print_r(App::$argv, true); break; } } @@ -66,7 +66,7 @@ function pumpio_registerclient($a, $host) { $application_name = get_config('pumpio', 'application_name'); if (! $application_name) - $application_name = $a->get_hostname(); + $application_name = App::get_hostname(); $params['type'] = 'client_associate'; $params['contacts'] = get_config('system','admin_email'); @@ -173,7 +173,7 @@ function pumpio_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -212,7 +212,7 @@ function pumpio_settings(&$a,&$s) { $sc .= '
'; $sc .= '' . t("You are not authenticated to pumpio") . ''; $sc .= '
'; - $sc .= ''.t("(Re-)Authenticate your pump.io connection").''; + $sc .= ''.t("(Re-)Authenticate your pump.io connection").''; } $sc .= replace_macros(get_markup_template('field_checkbox.tpl'), array( @@ -418,7 +418,7 @@ function pumpio_fetchtimeline($a, $uid) { $application_name = get_config('pumpio', 'application_name'); if ($application_name == "") - $application_name = $a->get_hostname(); + $application_name = App::get_hostname(); $first_time = ($lastdate == ""); diff --git a/sources/addons/rainbowtag/rainbowtag.php b/sources/addons/rainbowtag/rainbowtag.php index 9403d75f..2599b5e9 100644 --- a/sources/addons/rainbowtag/rainbowtag.php +++ b/sources/addons/rainbowtag/rainbowtag.php @@ -29,12 +29,12 @@ function rainbowtag_unload() { function rainbowtag_construct_page(&$a,&$b) { - if(! $a->profile_uid) + if(! App::$profile_uid) return; - if(! intval(get_pconfig($a->profile_uid,'rainbowtag','enable'))) + if(! intval(get_pconfig(App::$profile_uid,'rainbowtag','enable'))) return; - $c = get_pconfig($a->profile_uid,'rainbowtag','colors'); + $c = get_pconfig(App::$profile_uid,'rainbowtag','colors'); $color1 = ((is_array($c) && $c[0]) ? $c[0] : 'DarkGray'); $color2 = ((is_array($c) && $c[1]) ? $c[1] : 'LawnGreen'); $color3 = ((is_array($c) && $c[2]) ? $c[2] : 'DarkOrange'); @@ -61,7 +61,7 @@ function rainbowtag_construct_page(&$a,&$b) { $o .= '.tag10 { color: ' . $color10 . ' !important; }' . "\r\n"; $o .= ''; - $a->page['htmlhead'] .= $o; + App::$page['htmlhead'] .= $o; } diff --git a/sources/addons/randpost/randpost.php b/sources/addons/randpost/randpost.php index 6f65a11c..9c095510 100644 --- a/sources/addons/randpost/randpost.php +++ b/sources/addons/randpost/randpost.php @@ -61,7 +61,7 @@ function randpost_enotify_store(&$a,&$b) { $my_conversation = true; elseif($p[0]['term']) { $v = get_terms_oftype($p[0]['term'],TERM_MENTION); - $link = normalise_link($a->get_baseurl() . '/channel/' . $c[0]['channel_address']); + $link = normalise_link(z_root() . '/channel/' . $c[0]['channel_address']); if($v) { foreach($v as $vv) { if(link_compare($vv['url'],$link)) { diff --git a/sources/addons/redfiles/redfiles.php b/sources/addons/redfiles/redfiles.php index 7ddca50a..a30bb15b 100644 --- a/sources/addons/redfiles/redfiles.php +++ b/sources/addons/redfiles/redfiles.php @@ -22,7 +22,7 @@ function redfiles_init(&$a) { // if(intval(get_pconfig(local_channel(),'redfiles','complete'))) // return; - $channel = $a->get_channel(); + $channel = App::get_channel(); $fr_server = $_REQUEST['fr_server']; $fr_username = $_REQUEST['fr_username']; diff --git a/sources/addons/redphotos/redphotos.php b/sources/addons/redphotos/redphotos.php index 565c9e12..a41d2c8f 100644 --- a/sources/addons/redphotos/redphotos.php +++ b/sources/addons/redphotos/redphotos.php @@ -22,7 +22,7 @@ function redphotos_init(&$a) { // if(intval(get_pconfig(local_channel(),'redphotos','complete'))) // return; - $channel = $a->get_channel(); + $channel = App::get_channel(); $fr_server = $_REQUEST['fr_server']; $fr_username = $_REQUEST['fr_username']; diff --git a/sources/addons/redred/redred.php b/sources/addons/redred/redred.php index 32f15d9c..b128a7aa 100755 --- a/sources/addons/redred/redred.php +++ b/sources/addons/redred/redred.php @@ -53,7 +53,7 @@ function redred_settings_post ($a,$post) { if (! x($_POST,'redred-submit')) return; - $channel = $a->get_channel(); + $channel = App::get_channel(); // Don't let somebody post to their self channel. Since we aren't passing message-id this would be very very bad. if(! trim($_POST['redred_channel'])) { diff --git a/sources/addons/smileybutton/smileybutton.php b/sources/addons/smileybutton/smileybutton.php index ba1a02f0..4f3f929b 100755 --- a/sources/addons/smileybutton/smileybutton.php +++ b/sources/addons/smileybutton/smileybutton.php @@ -95,28 +95,28 @@ function show_button($a, &$b) { ); $icons = array( - '<3', - '</3', - ':-)', - ';-)', - ':-(', - ':-P', - ':-X', - ':-D', - ':-O', - '\\o/', - 'O_o', - ':\'(', - ':-!', - ':-/', - ':-[', - '8-)', - ':beer', - ':coffee', - ':facepalm', - ':like', - ':dislike', - 'red' + '<3', + '</3', + ':-)', + ';-)', + ':-(', + ':-P', + ':-X', + ':-D', + ':-O', + '\\o/', + 'O_o', + ':\'(', + ':-!', + ':-/', + ':-[', + '8-)', + ':beer', + ':coffee', + ':facepalm', + ':like', + ':dislike', + 'red' ); /** @@ -152,7 +152,7 @@ function show_button($a, &$b) { * */ - $a->page['htmlhead'] .= '' . "\r\n"; + App::$page['htmlhead'] .= '' . "\r\n"; /** * @@ -161,7 +161,7 @@ function show_button($a, &$b) { */ if (! $nobutton and ! $deactivated) { $b .= "
\n"; - //$b .= "\tget_baseurl() . "/addon/smileybutton/icon.gif\" onclick=\"toggle_smileybutton(); return false;\" alt=\"smiley\">\n"; + //$b .= "\t\"smiley\"\n"; $b .= "\t\n"; $b .= "\t
\n"; } @@ -262,7 +262,7 @@ function smileybutton_settings(&$a,&$s) { /* Add our stylesheet to the page so we can make our settings look nice */ - //$a->page['htmlhead'] .= '' . "\r\n"; + //App::$page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variable */ diff --git a/sources/addons/startpage/lang/ca/strings.php b/sources/addons/startpage/lang/ca/strings.php index f7e2048e..ab2755d5 100644 --- a/sources/addons/startpage/lang/ca/strings.php +++ b/sources/addons/startpage/lang/ca/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Ajustos de la pàgina d'inici"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Pàgina personal a carregar després d'accedir - deixar buit pel perfil del mur"; -$a->strings["Examples: "network" or "notifications/system""] = "Exemples: \"xarxa\" o \"notificacions/sistema\""; -$a->strings["Submit"] = "Enviar"; +App::$strings["Startpage Settings"] = "Ajustos de la pàgina d'inici"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "Pàgina personal a carregar després d'accedir - deixar buit pel perfil del mur"; +App::$strings["Examples: "network" or "notifications/system""] = "Exemples: \"xarxa\" o \"notificacions/sistema\""; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/startpage/lang/cs/strings.php b/sources/addons/startpage/lang/cs/strings.php index d48262c9..b7672d83 100644 --- a/sources/addons/startpage/lang/cs/strings.php +++ b/sources/addons/startpage/lang/cs/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Nastavení úvodní stránky"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Domácí stránka k načtení po přihlášení - pro profilovou zeď ponechejte prázdné"; -$a->strings["Examples: "network" or "notifications/system""] = "Příklady: \"síť\" nebo \"notifikace systému\""; -$a->strings["Submit"] = "Odeslat"; +App::$strings["Startpage Settings"] = "Nastavení úvodní stránky"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "Domácí stránka k načtení po přihlášení - pro profilovou zeď ponechejte prázdné"; +App::$strings["Examples: "network" or "notifications/system""] = "Příklady: \"síť\" nebo \"notifikace systému\""; +App::$strings["Submit"] = "Odeslat"; diff --git a/sources/addons/startpage/lang/de/strings.php b/sources/addons/startpage/lang/de/strings.php index 0a1ed34e..5848ed30 100644 --- a/sources/addons/startpage/lang/de/strings.php +++ b/sources/addons/startpage/lang/de/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Startseiten-Einstellungen"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand"; -$a->strings["Examples: "network" or "notifications/system""] = "Beispiele: network, notifications/system"; -$a->strings["Submit"] = "Senden"; +App::$strings["Startpage Settings"] = "Startseiten-Einstellungen"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand"; +App::$strings["Examples: "network" or "notifications/system""] = "Beispiele: network, notifications/system"; +App::$strings["Submit"] = "Senden"; diff --git a/sources/addons/startpage/lang/eo/strings.php b/sources/addons/startpage/lang/eo/strings.php index 0152ac95..3618e13d 100644 --- a/sources/addons/startpage/lang/eo/strings.php +++ b/sources/addons/startpage/lang/eo/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Startpaĝaj Agordoj"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Hejmpaĝo ŝargonta post la ensaluto - Lasu malplena por profilmuro."; -$a->strings["Examples: "network" or "notifications/system""] = "Ekzemple: "network" aŭ "notifications/system""; -$a->strings["Submit"] = "Sendi"; +App::$strings["Startpage Settings"] = "Startpaĝaj Agordoj"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "Hejmpaĝo ŝargonta post la ensaluto - Lasu malplena por profilmuro."; +App::$strings["Examples: "network" or "notifications/system""] = "Ekzemple: "network" aŭ "notifications/system""; +App::$strings["Submit"] = "Sendi"; diff --git a/sources/addons/startpage/lang/es/strings.php b/sources/addons/startpage/lang/es/strings.php index d901e740..20d21276 100644 --- a/sources/addons/startpage/lang/es/strings.php +++ b/sources/addons/startpage/lang/es/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Configuración de página inicial"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Página por defecto, dejálo en blanco para cargar tu perfil"; -$a->strings["Examples: "network" or "notifications/system""] = "Ejemplos: "red" o "notificaciones/sistema""; -$a->strings["Submit"] = "Envíar"; +App::$strings["Startpage Settings"] = "Configuración de página inicial"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "Página por defecto, dejálo en blanco para cargar tu perfil"; +App::$strings["Examples: "network" or "notifications/system""] = "Ejemplos: "red" o "notificaciones/sistema""; +App::$strings["Submit"] = "Envíar"; diff --git a/sources/addons/startpage/lang/fr/strings.php b/sources/addons/startpage/lang/fr/strings.php index c2ecf5ec..b8b61ec4 100644 --- a/sources/addons/startpage/lang/fr/strings.php +++ b/sources/addons/startpage/lang/fr/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Paramètres de la page d'accueil"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Page d'accueil à charger après authentification - laisser ce champ vide pour charger votre mur"; -$a->strings["Examples: "network" or "notifications/system""] = "Exemples : "network" ou "notifications/system""; -$a->strings["Submit"] = "Envoyer"; +App::$strings["Startpage Settings"] = "Paramètres de la page d'accueil"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "Page d'accueil à charger après authentification - laisser ce champ vide pour charger votre mur"; +App::$strings["Examples: "network" or "notifications/system""] = "Exemples : "network" ou "notifications/system""; +App::$strings["Submit"] = "Envoyer"; diff --git a/sources/addons/startpage/lang/is/strings.php b/sources/addons/startpage/lang/is/strings.php index 134d5726..9c8c7f2f 100644 --- a/sources/addons/startpage/lang/is/strings.php +++ b/sources/addons/startpage/lang/is/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = ""; -$a->strings["Home page to load after login - leave blank for profile wall"] = ""; -$a->strings["Examples: "network" or "notifications/system""] = ""; -$a->strings["Submit"] = "Senda inn"; +App::$strings["Startpage Settings"] = ""; +App::$strings["Home page to load after login - leave blank for profile wall"] = ""; +App::$strings["Examples: "network" or "notifications/system""] = ""; +App::$strings["Submit"] = "Senda inn"; diff --git a/sources/addons/startpage/lang/it/strings.php b/sources/addons/startpage/lang/it/strings.php index a80dc5ae..cdd9ce76 100644 --- a/sources/addons/startpage/lang/it/strings.php +++ b/sources/addons/startpage/lang/it/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = ""; -$a->strings["Home page to load after login - leave blank for profile wall"] = ""; -$a->strings["Examples: "network" or "notifications/system""] = ""; -$a->strings["Submit"] = "Invia"; +App::$strings["Startpage Settings"] = ""; +App::$strings["Home page to load after login - leave blank for profile wall"] = ""; +App::$strings["Examples: "network" or "notifications/system""] = ""; +App::$strings["Submit"] = "Invia"; diff --git a/sources/addons/startpage/lang/nb-no/strings.php b/sources/addons/startpage/lang/nb-no/strings.php index b58f8fe3..27c5007c 100644 --- a/sources/addons/startpage/lang/nb-no/strings.php +++ b/sources/addons/startpage/lang/nb-no/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = ""; -$a->strings["Home page to load after login - leave blank for profile wall"] = ""; -$a->strings["Examples: "network" or "notifications/system""] = ""; -$a->strings["Submit"] = "Lagre"; +App::$strings["Startpage Settings"] = ""; +App::$strings["Home page to load after login - leave blank for profile wall"] = ""; +App::$strings["Examples: "network" or "notifications/system""] = ""; +App::$strings["Submit"] = "Lagre"; diff --git a/sources/addons/startpage/lang/pl/strings.php b/sources/addons/startpage/lang/pl/strings.php index 487e2535..5cff3416 100644 --- a/sources/addons/startpage/lang/pl/strings.php +++ b/sources/addons/startpage/lang/pl/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Ustawienia strony startowej"; -$a->strings["Home page to load after login - leave blank for profile wall"] = ""; -$a->strings["Examples: "network" or "notifications/system""] = ""; -$a->strings["Submit"] = "Potwierdź"; +App::$strings["Startpage Settings"] = "Ustawienia strony startowej"; +App::$strings["Home page to load after login - leave blank for profile wall"] = ""; +App::$strings["Examples: "network" or "notifications/system""] = ""; +App::$strings["Submit"] = "Potwierdź"; diff --git a/sources/addons/startpage/lang/pt-br/strings.php b/sources/addons/startpage/lang/pt-br/strings.php index 0c22e3b5..43cb4de4 100644 --- a/sources/addons/startpage/lang/pt-br/strings.php +++ b/sources/addons/startpage/lang/pt-br/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "Configurações da página inicial"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Página a ser carregada após a autenticação - deixe em branco para o mural do perfil"; -$a->strings["Examples: "network" or "notifications/system""] = "Exemplos: "network" or "notifications/system""; -$a->strings["Submit"] = "Enviar"; +App::$strings["Startpage Settings"] = "Configurações da página inicial"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "Página a ser carregada após a autenticação - deixe em branco para o mural do perfil"; +App::$strings["Examples: "network" or "notifications/system""] = "Exemplos: "network" or "notifications/system""; +App::$strings["Submit"] = "Enviar"; diff --git a/sources/addons/startpage/lang/ru/strings.php b/sources/addons/startpage/lang/ru/strings.php index 361b40b3..e027ae82 100644 --- a/sources/addons/startpage/lang/ru/strings.php +++ b/sources/addons/startpage/lang/ru/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = ""; -$a->strings["Home page to load after login - leave blank for profile wall"] = ""; -$a->strings["Examples: "network" or "notifications/system""] = ""; -$a->strings["Submit"] = "Подтвердить"; +App::$strings["Startpage Settings"] = ""; +App::$strings["Home page to load after login - leave blank for profile wall"] = ""; +App::$strings["Examples: "network" or "notifications/system""] = ""; +App::$strings["Submit"] = "Подтвердить"; diff --git a/sources/addons/startpage/lang/sv/strings.php b/sources/addons/startpage/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/startpage/lang/sv/strings.php +++ b/sources/addons/startpage/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/startpage/lang/zh-cn/strings.php b/sources/addons/startpage/lang/zh-cn/strings.php index f8c02e4a..c0cc20ae 100644 --- a/sources/addons/startpage/lang/zh-cn/strings.php +++ b/sources/addons/startpage/lang/zh-cn/strings.php @@ -1,6 +1,6 @@ strings["Startpage Settings"] = "开始页设置"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "主页登录后表示－留空白为简介墙"; -$a->strings["Examples: "network" or "notifications/system""] = "例如："网络"或"通知／系统""; -$a->strings["Submit"] = "提交"; +App::$strings["Startpage Settings"] = "开始页设置"; +App::$strings["Home page to load after login - leave blank for profile wall"] = "主页登录后表示－留空白为简介墙"; +App::$strings["Examples: "network" or "notifications/system""] = "例如："网络"或"通知／系统""; +App::$strings["Submit"] = "提交"; diff --git a/sources/addons/startpage/startpage.php b/sources/addons/startpage/startpage.php index 8e7d411f..a4c685db 100644 --- a/sources/addons/startpage/startpage.php +++ b/sources/addons/startpage/startpage.php @@ -29,7 +29,7 @@ function startpage_home_init($a, $b) { if(! local_channel()) return; - $channel = $a->get_channel(); + $channel = App::get_channel(); $page = $channel['channel_startpage']; if(! $page) $page = get_pconfig(local_channel(),'system','startpage'); @@ -42,7 +42,7 @@ function startpage_home_init($a, $b) { if(stristr($page,'://')) goaway(z_root() . '/' . $page); - goaway($a->get_baseurl() . (($slash) ? '' : '/') . $page); + goaway(z_root() . (($slash) ? '' : '/') . $page); } return; } @@ -59,7 +59,7 @@ function startpage_home_init($a, $b) { function startpage_settings_post($a,$post) { if(! local_channel()) return; - $channel = $a->get_channel(); + $channel = App::get_channel(); if($_POST['startpage-submit']) { $page = strip_tags(trim($_POST['startpage'])); @@ -106,7 +106,7 @@ function startpage_settings(&$a,&$s) { $page = get_pconfig(local_channel(),'system','startpage'); $sc .= replace_macros(get_markup_template('field_input.tpl'), array( - '$field' => array('startpage', t('Page to load after login'), $page, t('Examples: "network" or "channel" or "notifications/system" (leave blank for default apps page).')) + '$field' => array('startpage', t('Page to load after login'), $page, t('Examples: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (leave blank for default network page (grid).')) )); $s .= replace_macros(get_markup_template('generic_addon_settings.tpl'), array( diff --git a/sources/addons/statistics_json/statistics_json.php b/sources/addons/statistics_json/statistics_json.php index 32db6512..fbc40f3a 100644 --- a/sources/addons/statistics_json/statistics_json.php +++ b/sources/addons/statistics_json/statistics_json.php @@ -121,7 +121,7 @@ function statistics_json_cron($a,$b) { set_config('statistics_json','twitter', intval($twitter)); // Now trying to register - $url = "http://the-federation.info/register/" . $a->get_hostname(); + $url = "http://the-federation.info/register/" . App::get_hostname(); $ret = z_fetch_url($url); logger('statistics_json_cron: registering answer: '. print_r($ret,true), LOGGER_DEBUG); diff --git a/sources/addons/statusnet/README b/sources/addons/statusnet/README index 98239fa3..c4a2e882 100755 --- a/sources/addons/statusnet/README +++ b/sources/addons/statusnet/README @@ -63,7 +63,7 @@ __ Alternative Configuration __ If you want to provide preconfigured GNU social instances for your user add the credentials for them by adding this to .htconfig.php: -$a->config['statusnet']['sites'] = array ( +App::$config['statusnet']['sites'] = array ( array ('sitename' => 'identi.ca', 'apiurl' => 'https://identi.ca/api/', 'consumersecret' => 'OAuth Consumer Secret here', 'consumerkey' => 'OAuth Consumer Key here'), diff --git a/sources/addons/statusnet/lang/ca/strings.php b/sources/addons/statusnet/lang/ca/strings.php index 4bb899e0..a15636b1 100644 --- a/sources/addons/statusnet/lang/ca/strings.php +++ b/sources/addons/statusnet/lang/ca/strings.php @@ -1,34 +1,34 @@ strings["Post to StatusNet"] = "Publica-ho a StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Si us plau, poseu-vos en contacte amb l'administrador del lloc.
L'adreça URL de l'API proporcionada no és vàlida."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït."; -$a->strings["StatusNet settings updated."] = "La configuració StatusNet actualitzada."; -$a->strings["StatusNet Posting Settings"] = "Configuració d'Enviaments per a StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys de StatusNet Globalment Disponible"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix)."; -$a->strings["Submit"] = "Enviar"; -$a->strings["Provide your own OAuth Credentials"] = "Proporcioneu les vostres credencials de OAuth"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API.
Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet."; -$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; -$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; -$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (recorda deixar / al final)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges públics es publicaran en StatusNet."; -$a->strings["Log in with StatusNet"] = "Accedeixi com en StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Copieu el codi de seguretat StatusNet aquí"; -$a->strings["Cancel Connection Process"] = "Cancel·lar el procés de connexió"; -$a->strings["Current StatusNet API is"] = "L'Actual StatusNet API és"; -$a->strings["Cancel StatusNet Connection"] = "Cancel·lar la connexió amb StatusNet"; -$a->strings["Currently connected to: "] = "Actualment connectat a: "; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis públics poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa de les seves opcions de privacitat (Amaga els detalls del teu perfil dels espectadors desconeguts? ) el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit."; -$a->strings["Allow posting to StatusNet"] = "Permetre enviaments a StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Enviar missatges públics a StatusNet per defecte"; -$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = ""; -$a->strings["Shortening method that optimizes the post"] = ""; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "Enviar enllaços #-etiquetes i @-noms a StatusNet"; -$a->strings["Clear OAuth configuration"] = "Esborrar configuració de OAuth"; -$a->strings["Site name"] = "Nom del lloc"; -$a->strings["API URL"] = "API URL"; -$a->strings["Consumer Secret"] = "Consumer Secret"; -$a->strings["Consumer Key"] = "Consumer Key"; +App::$strings["Post to StatusNet"] = "Publica-ho a StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Si us plau, poseu-vos en contacte amb l'administrador del lloc.
L'adreça URL de l'API proporcionada no és vàlida."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït."; +App::$strings["StatusNet settings updated."] = "La configuració StatusNet actualitzada."; +App::$strings["StatusNet Posting Settings"] = "Configuració d'Enviaments per a StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys de StatusNet Globalment Disponible"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix)."; +App::$strings["Submit"] = "Enviar"; +App::$strings["Provide your own OAuth Credentials"] = "Proporcioneu les vostres credencials de OAuth"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API.
Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet."; +App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; +App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; +App::$strings["Base API Path (remember the trailing /)"] = "Base API Path (recorda deixar / al final)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges públics es publicaran en StatusNet."; +App::$strings["Log in with StatusNet"] = "Accedeixi com en StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Copieu el codi de seguretat StatusNet aquí"; +App::$strings["Cancel Connection Process"] = "Cancel·lar el procés de connexió"; +App::$strings["Current StatusNet API is"] = "L'Actual StatusNet API és"; +App::$strings["Cancel StatusNet Connection"] = "Cancel·lar la connexió amb StatusNet"; +App::$strings["Currently connected to: "] = "Actualment connectat a: "; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis públics poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa de les seves opcions de privacitat (Amaga els detalls del teu perfil dels espectadors desconeguts? ) el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit."; +App::$strings["Allow posting to StatusNet"] = "Permetre enviaments a StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Enviar missatges públics a StatusNet per defecte"; +App::$strings["Mirror all posts from statusnet that are no replies or repeated messages"] = ""; +App::$strings["Shortening method that optimizes the post"] = ""; +App::$strings["Send linked #-tags and @-names to StatusNet"] = "Enviar enllaços #-etiquetes i @-noms a StatusNet"; +App::$strings["Clear OAuth configuration"] = "Esborrar configuració de OAuth"; +App::$strings["Site name"] = "Nom del lloc"; +App::$strings["API URL"] = "API URL"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Consumer Key"] = "Consumer Key"; diff --git a/sources/addons/statusnet/lang/cs/strings.php b/sources/addons/statusnet/lang/cs/strings.php index 74e31eeb..51f0076a 100644 --- a/sources/addons/statusnet/lang/cs/strings.php +++ b/sources/addons/statusnet/lang/cs/strings.php @@ -1,33 +1,33 @@ strings["Post to StatusNet"] = "Poslat příspěvek na StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Obraťte se na administratora webu.
Poskytnutý odkaz na API není platný."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "S cestou, kterou jste zadali, se nebylo možné spojit s API StatusNetu."; -$a->strings["StatusNet settings updated."] = "Nastavení StatusNetu aktualizováno."; -$a->strings["StatusNet Posting Settings"] = "Nastavení zasílání příspěvků na StatusNet "; -$a->strings["Globally Available StatusNet OAuthKeys"] = "Globálně dostupné StatusNet OAuth klíče"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Jsou dostupné přednastavené OAuth páry klíčů pro některé servery StatusNetu. Pokud používáte některý z nich, použijte toto přihlášení. Pokud ne, neváhejte se připojit k jiné instanci StatusNet (viz níže)."; -$a->strings["Submit"] = "Odeslat"; -$a->strings["Provide your own OAuth Credentials"] = "Uveďte své vlastní OAuth přihlašovací údaje"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nenalezen žádný spotřebitelský páru klíčů pro StatusNet. Zaregistrujte si svůj účet Friendica jako desktopový klient ve Vašem účtu StatusNet, zkopírujte si sem spotřebitelský páru klíčů a vložte API base root.
Předtím, než si zaregistrujete Váš vlastní pár klíčů OAuth, zjistěte si od Friendica administrátora, zda-li již existuje pár klíčů pro tuto instalaci Friendica pro Vaši oblíbenou StatusNet instalaci."; -$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; -$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; -$a->strings["Base API Path (remember the trailing /)"] = "Cesta k Base API (nezapomeňte na koncový /)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Chcete-li připojit k vašemu účtu StatusNet klikněte na tlačítko níže, abyste dostati bezpečnostní kód ze StatusNetu, který musíte zkopírovat do vstupního pole níže a odelat formulář. Pouze Vaše veřejné příspěvky budou zveřejněny na StatusNetu."; -$a->strings["Log in with StatusNet"] = "Přihlásit se s StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Zkopírujte sem bezpečnostní kód ze StatusNet"; -$a->strings["Cancel Connection Process"] = "Zrušit připojování"; -$a->strings["Current StatusNet API is"] = "Aktuální StatusNet API je"; -$a->strings["Cancel StatusNet Connection"] = "Zrušit StatusNet připojení"; -$a->strings["Currently connected to: "] = "V současné době připojen k:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše veřejné příspěvky mohou být zaslány na související StatusNet účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Upozornění: Z důvodů Vašeho nastavení ochrany soukromí ( Skrýt Vaše profilové detaily před neznámými čtenáři?) +App::$strings["Post to StatusNet"] = "Poslat příspěvek na StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Obraťte se na administratora webu.
Poskytnutý odkaz na API není platný."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "S cestou, kterou jste zadali, se nebylo možné spojit s API StatusNetu."; +App::$strings["StatusNet settings updated."] = "Nastavení StatusNetu aktualizováno."; +App::$strings["StatusNet Posting Settings"] = "Nastavení zasílání příspěvků na StatusNet "; +App::$strings["Globally Available StatusNet OAuthKeys"] = "Globálně dostupné StatusNet OAuth klíče"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Jsou dostupné přednastavené OAuth páry klíčů pro některé servery StatusNetu. Pokud používáte některý z nich, použijte toto přihlášení. Pokud ne, neváhejte se připojit k jiné instanci StatusNet (viz níže)."; +App::$strings["Submit"] = "Odeslat"; +App::$strings["Provide your own OAuth Credentials"] = "Uveďte své vlastní OAuth přihlašovací údaje"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nenalezen žádný spotřebitelský páru klíčů pro StatusNet. Zaregistrujte si svůj účet Friendica jako desktopový klient ve Vašem účtu StatusNet, zkopírujte si sem spotřebitelský páru klíčů a vložte API base root.
Předtím, než si zaregistrujete Váš vlastní pár klíčů OAuth, zjistěte si od Friendica administrátora, zda-li již existuje pár klíčů pro tuto instalaci Friendica pro Vaši oblíbenou StatusNet instalaci."; +App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; +App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; +App::$strings["Base API Path (remember the trailing /)"] = "Cesta k Base API (nezapomeňte na koncový /)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Chcete-li připojit k vašemu účtu StatusNet klikněte na tlačítko níže, abyste dostati bezpečnostní kód ze StatusNetu, který musíte zkopírovat do vstupního pole níže a odelat formulář. Pouze Vaše veřejné příspěvky budou zveřejněny na StatusNetu."; +App::$strings["Log in with StatusNet"] = "Přihlásit se s StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Zkopírujte sem bezpečnostní kód ze StatusNet"; +App::$strings["Cancel Connection Process"] = "Zrušit připojování"; +App::$strings["Current StatusNet API is"] = "Aktuální StatusNet API je"; +App::$strings["Cancel StatusNet Connection"] = "Zrušit StatusNet připojení"; +App::$strings["Currently connected to: "] = "V současné době připojen k:"; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše veřejné příspěvky mohou být zaslány na související StatusNet účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Upozornění: Z důvodů Vašeho nastavení ochrany soukromí ( Skrýt Vaše profilové detaily před neznámými čtenáři?) odkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě StatusNet přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen."; -$a->strings["Allow posting to StatusNet"] = "Povolit zasílání příspěvků na StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Standardně poslílat veřejné příspěvky na StatusNet"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "Poslat propojené #-tagy a @-jména na StatusNet"; -$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth"; -$a->strings["Site name"] = "Název webu"; -$a->strings["API URL"] = "API URL"; -$a->strings["Consumer Secret"] = "Consumer Secret"; -$a->strings["Consumer Key"] = "Consumer Key"; +App::$strings["Allow posting to StatusNet"] = "Povolit zasílání příspěvků na StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Standardně poslílat veřejné příspěvky na StatusNet"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = "Poslat propojené #-tagy a @-jména na StatusNet"; +App::$strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth"; +App::$strings["Site name"] = "Název webu"; +App::$strings["API URL"] = "API URL"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Consumer Key"] = "Consumer Key"; diff --git a/sources/addons/statusnet/lang/de/strings.php b/sources/addons/statusnet/lang/de/strings.php index 5b0c707f..b9cebde2 100644 --- a/sources/addons/statusnet/lang/de/strings.php +++ b/sources/addons/statusnet/lang/de/strings.php @@ -1,34 +1,34 @@ strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.
Die angegebene API-URL ist nicht gültig."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Die StatusNet-API konnte mit dem angegebenen Pfad nicht erreicht werden."; -$a->strings["StatusNet settings updated."] = "StatusNet Einstellungen aktualisiert."; -$a->strings["StatusNet Posting Settings"] = "StatusNet-Beitragseinstellungen"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "Verfügbare OAuth Schlüssel für StatusNet"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."; -$a->strings["Submit"] = "Senden"; -$a->strings["Provide your own OAuth Credentials"] = "Eigene OAuth Schlüssel eintragen"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert."; -$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; -$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; -$a->strings["Base API Path (remember the trailing /)"] = "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Um dein Konto mit einem StatusNet-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine öffentlichen Nachrichten an StatusNet gesendet."; -$a->strings["Log in with StatusNet"] = "Bei StatusNet anmelden"; -$a->strings["Copy the security code from StatusNet here"] = "Kopiere den Sicherheitscode von StatusNet hier hin"; -$a->strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen"; -$a->strings["Current StatusNet API is"] = "Derzeitige StatusNet-API-URL lautet"; -$a->strings["Cancel StatusNet Connection"] = "Verbindung zum StatusNet Server abbrechen"; -$a->strings["Currently connected to: "] = "Momentan verbunden mit: "; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen StatusNet-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; -$a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; -$a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; -$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "Spiegle alle Beiträge von StatusNet die keine Antworten oder wiederholten Nachrichten sind"; -$a->strings["Shortening method that optimizes the post"] = "Kürzungsverfahren, das den Beitrag optimiert"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet"; -$a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; -$a->strings["Site name"] = "Seitenname"; -$a->strings["API URL"] = "API-URL"; -$a->strings["Consumer Secret"] = "Consumer Secret"; -$a->strings["Consumer Key"] = "Consumer Key"; +App::$strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.
Die angegebene API-URL ist nicht gültig."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Die StatusNet-API konnte mit dem angegebenen Pfad nicht erreicht werden."; +App::$strings["StatusNet settings updated."] = "StatusNet Einstellungen aktualisiert."; +App::$strings["StatusNet Posting Settings"] = "StatusNet-Beitragseinstellungen"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "Verfügbare OAuth Schlüssel für StatusNet"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."; +App::$strings["Submit"] = "Senden"; +App::$strings["Provide your own OAuth Credentials"] = "Eigene OAuth Schlüssel eintragen"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert."; +App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; +App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; +App::$strings["Base API Path (remember the trailing /)"] = "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Um dein Konto mit einem StatusNet-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine öffentlichen Nachrichten an StatusNet gesendet."; +App::$strings["Log in with StatusNet"] = "Bei StatusNet anmelden"; +App::$strings["Copy the security code from StatusNet here"] = "Kopiere den Sicherheitscode von StatusNet hier hin"; +App::$strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen"; +App::$strings["Current StatusNet API is"] = "Derzeitige StatusNet-API-URL lautet"; +App::$strings["Cancel StatusNet Connection"] = "Verbindung zum StatusNet Server abbrechen"; +App::$strings["Currently connected to: "] = "Momentan verbunden mit: "; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen StatusNet-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; +App::$strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; +App::$strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; +App::$strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "Spiegle alle Beiträge von StatusNet die keine Antworten oder wiederholten Nachrichten sind"; +App::$strings["Shortening method that optimizes the post"] = "Kürzungsverfahren, das den Beitrag optimiert"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet"; +App::$strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; +App::$strings["Site name"] = "Seitenname"; +App::$strings["API URL"] = "API-URL"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Consumer Key"] = "Consumer Key"; diff --git a/sources/addons/statusnet/lang/eo/strings.php b/sources/addons/statusnet/lang/eo/strings.php index b0bbf349..2482fee6 100644 --- a/sources/addons/statusnet/lang/eo/strings.php +++ b/sources/addons/statusnet/lang/eo/strings.php @@ -1,32 +1,32 @@ strings["Post to StatusNet"] = "Afiŝi ĉe StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Bonvolu kontaki vian retejan administranton.
La API URL adreso ne validas."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Ni ne povis trovi la StatusNet API kun la vojo kiun vi entajpis."; -$a->strings["StatusNet settings updated."] = "StatusNet agordoj ĝisdatigita."; -$a->strings["StatusNet Posting Settings"] = "Agordoj por StausNet afiŝoj"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "Ĝeneralaj disponeblaj StatusNet OAuth ŝlosiloj"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Disponeblas antaŭagorditaj ŝlosilparoj por kelkaj StatusNet serviloj. Se via uzas iun de iu, bonvolu uzi unun de tiuj legitimaĵojn. Se ne, bonvolu konekti al iu alia StatusNet servilo (vidu malsupre)."; -$a->strings["Submit"] = "Sendi"; -$a->strings["Provide your own OAuth Credentials"] = "Provizi viajn proprajn OAuth legitimaĵojn"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Ne trovis klientajn ŝlosilojn por StatusNet. Registru vian Friendica konton kiel klientkomputilo/desktop client en via StausNet konto. Kopiu la klientajn ŝlosilojn ĉi tien kaj entajpu la baza API radiko.
Antaŭ vi registros viajn proprajn OAuth ŝlosilojn, demandu al la administranto ĉu jam ekzistas ŝlosiloj por ĉi-tiu Friendia retejo je via StatusNet retejo."; -$a->strings["OAuth Consumer Key"] = "OAuth Ŝlosilo de Kliento"; -$a->strings["OAuth Consumer Secret"] = "OAuth Sekreto de Kliento"; -$a->strings["Base API Path (remember the trailing /)"] = "Baza vojo al la API (ne forgesu la finan /)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Por konekti al vian konton ĉe StatusNet, klaku la malsupran butonon por atingi sekurecan kodon de StatusNet, kiun vi devas alglui en la malsupra kampo kaj sendi la formon. Nur viaj publikaj afiŝoj estos afiŝota al StatusNet."; -$a->strings["Log in with StatusNet"] = "Ensaluti kun StatusNet."; -$a->strings["Copy the security code from StatusNet here"] = "Alglui la kodon de StatusNet ĉi tie:"; -$a->strings["Cancel Connection Process"] = "Nuligi Konektadon"; -$a->strings["Current StatusNet API is"] = "La nuna StatusNet API estas"; -$a->strings["Cancel StatusNet Connection"] = "Nuligi Konekton al StatusNet"; -$a->strings["Currently connected to: "] = "Konektita al:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Kiam ŝaltita, ĉiuj publikaj afiŝoj de vi ankaŭ eblas esti afiŝota al la asociigita StatusNet konto. Vi povas elekti ĝin defaŭlte (ĉi tie) au unuope por ĉiuj afiŝoj kiam vi skribos ilin."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Averto: Laŭ viaj privatecaj agordoj (Kaŝi viajn profilajn detalojn al nekonataj spektantoj?), la ligilo en publikaj afiŝoj plusendata al StatusNet gvidas vizitontojn al malplena paĝo sciigante ilin ke atingo al via profilo estas lmitigita."; -$a->strings["Allow posting to StatusNet"] = "Permesi afiŝojn al StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Defaŭlte sendi publikajn afiŝojn al StatusNet"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "Sendi ligitajn #-etikedojn kaj @-nomon al StatusNet"; -$a->strings["Clear OAuth configuration"] = "Forviŝi OAuth agordojn"; -$a->strings["Site name"] = "Nomo de retejo"; -$a->strings["API URL"] = "API URL adreso"; -$a->strings["Consumer Secret"] = "Sekreto de kliento"; -$a->strings["Consumer Key"] = "Ŝlosilo de kliento"; +App::$strings["Post to StatusNet"] = "Afiŝi ĉe StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Bonvolu kontaki vian retejan administranton.
La API URL adreso ne validas."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Ni ne povis trovi la StatusNet API kun la vojo kiun vi entajpis."; +App::$strings["StatusNet settings updated."] = "StatusNet agordoj ĝisdatigita."; +App::$strings["StatusNet Posting Settings"] = "Agordoj por StausNet afiŝoj"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "Ĝeneralaj disponeblaj StatusNet OAuth ŝlosiloj"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Disponeblas antaŭagorditaj ŝlosilparoj por kelkaj StatusNet serviloj. Se via uzas iun de iu, bonvolu uzi unun de tiuj legitimaĵojn. Se ne, bonvolu konekti al iu alia StatusNet servilo (vidu malsupre)."; +App::$strings["Submit"] = "Sendi"; +App::$strings["Provide your own OAuth Credentials"] = "Provizi viajn proprajn OAuth legitimaĵojn"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Ne trovis klientajn ŝlosilojn por StatusNet. Registru vian Friendica konton kiel klientkomputilo/desktop client en via StausNet konto. Kopiu la klientajn ŝlosilojn ĉi tien kaj entajpu la baza API radiko.
Antaŭ vi registros viajn proprajn OAuth ŝlosilojn, demandu al la administranto ĉu jam ekzistas ŝlosiloj por ĉi-tiu Friendia retejo je via StatusNet retejo."; +App::$strings["OAuth Consumer Key"] = "OAuth Ŝlosilo de Kliento"; +App::$strings["OAuth Consumer Secret"] = "OAuth Sekreto de Kliento"; +App::$strings["Base API Path (remember the trailing /)"] = "Baza vojo al la API (ne forgesu la finan /)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Por konekti al vian konton ĉe StatusNet, klaku la malsupran butonon por atingi sekurecan kodon de StatusNet, kiun vi devas alglui en la malsupra kampo kaj sendi la formon. Nur viaj publikaj afiŝoj estos afiŝota al StatusNet."; +App::$strings["Log in with StatusNet"] = "Ensaluti kun StatusNet."; +App::$strings["Copy the security code from StatusNet here"] = "Alglui la kodon de StatusNet ĉi tie:"; +App::$strings["Cancel Connection Process"] = "Nuligi Konektadon"; +App::$strings["Current StatusNet API is"] = "La nuna StatusNet API estas"; +App::$strings["Cancel StatusNet Connection"] = "Nuligi Konekton al StatusNet"; +App::$strings["Currently connected to: "] = "Konektita al:"; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Kiam ŝaltita, ĉiuj publikaj afiŝoj de vi ankaŭ eblas esti afiŝota al la asociigita StatusNet konto. Vi povas elekti ĝin defaŭlte (ĉi tie) au unuope por ĉiuj afiŝoj kiam vi skribos ilin."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Averto: Laŭ viaj privatecaj agordoj (Kaŝi viajn profilajn detalojn al nekonataj spektantoj?), la ligilo en publikaj afiŝoj plusendata al StatusNet gvidas vizitontojn al malplena paĝo sciigante ilin ke atingo al via profilo estas lmitigita."; +App::$strings["Allow posting to StatusNet"] = "Permesi afiŝojn al StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Defaŭlte sendi publikajn afiŝojn al StatusNet"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = "Sendi ligitajn #-etikedojn kaj @-nomon al StatusNet"; +App::$strings["Clear OAuth configuration"] = "Forviŝi OAuth agordojn"; +App::$strings["Site name"] = "Nomo de retejo"; +App::$strings["API URL"] = "API URL adreso"; +App::$strings["Consumer Secret"] = "Sekreto de kliento"; +App::$strings["Consumer Key"] = "Ŝlosilo de kliento"; diff --git a/sources/addons/statusnet/lang/es/strings.php b/sources/addons/statusnet/lang/es/strings.php index c60fb374..6a856f32 100644 --- a/sources/addons/statusnet/lang/es/strings.php +++ b/sources/addons/statusnet/lang/es/strings.php @@ -1,32 +1,32 @@ strings["Post to StatusNet"] = "Publicar en StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Por favor, contacta con el administrador de tu web.
La dirección API suministrada no es válida."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No podemos contantar con StatusNet en la ruta que has especificado."; -$a->strings["StatusNet settings updated."] = "Actualición de la configuración de StatusNet."; -$a->strings["StatusNet Posting Settings"] = "Configuración de envío a StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "StatusNet OAuthKeys disponibles para todos"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Existen pares de valores OAuthKey preconfigurados para algunos servidores. Si usas uno de ellos, por favor usa estas credenciales. De los contrario no dudes en conectar con cualquiera otra instancia de StatusNet (ver a continuación)."; -$a->strings["Submit"] = "Envíar"; -$a->strings["Provide your own OAuth Credentials"] = "Proporciona tus propias credenciales OAuth"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "No se ha encontrado ningún par de claves consumer para StatusNet. Registra tu cuenta de Friendica como un cliente de escritorio en tu cuenta de StatusNet, copia el par de claves consumer aquí e introduce la dirección de la API.
Antes de registrar tu propio par de claves OAuth pregunta a tu administrador si ya existe un par de claves para esa instalación de Friendica en tu instalación StatusNet favorita."; -$a->strings["OAuth Consumer Key"] = "Clave OAuth del usuario"; -$a->strings["OAuth Consumer Secret"] = "Secreto OAuth del usuario"; -$a->strings["Base API Path (remember the trailing /)"] = "Dirección de la API (recordar el / al final)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Para conectarte a tu cuenta de StatusNet haz clic en el botón abajo para obtener un PIN de StatusNet, que tienes que copiar en el cuadro de entrada y enviar el formulario. Solo tus publicaciones públicas se publicarán en StatusNet."; -$a->strings["Log in with StatusNet"] = "Inicia sesión en StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Copia el código de seguridad de StatusNet aquí"; -$a->strings["Cancel Connection Process"] = "Cancelar la conexión en proceso"; -$a->strings["Current StatusNet API is"] = "El estado actual de la API de StatusNet es"; -$a->strings["Cancel StatusNet Connection"] = "Cancelar conexión con StatusNet"; -$a->strings["Currently connected to: "] = "Actualmente conectado a:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si lo habilitas todas tus publicaciones públicas podrán ser publicadas en la cuenta asociada de StatusNet. Pudes elegir hacerlo por defecto (aquí) o para cada publicación individualmente en las opciones de publicacion cuando las escribes."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a tus opciones de privacidad (¿Ocultar los detalles de tu perfil de espectadores desconocidos?) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a StatusNet conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."; -$a->strings["Allow posting to StatusNet"] = "Permitir publicaciones en StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Enviar publicaciones públicas a StatusNet por defecto"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "Enviar a StatusNet las #-etiquetas y @-nombres"; -$a->strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth"; -$a->strings["Site name"] = "Nombre del sitio"; -$a->strings["API URL"] = "Dirección de la API"; -$a->strings["Consumer Secret"] = "Secreto del consumidor"; -$a->strings["Consumer Key"] = "Clave del consumidor"; +App::$strings["Post to StatusNet"] = "Publicar en StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Por favor, contacta con el administrador de tu web.
La dirección API suministrada no es válida."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "No podemos contantar con StatusNet en la ruta que has especificado."; +App::$strings["StatusNet settings updated."] = "Actualición de la configuración de StatusNet."; +App::$strings["StatusNet Posting Settings"] = "Configuración de envío a StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "StatusNet OAuthKeys disponibles para todos"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Existen pares de valores OAuthKey preconfigurados para algunos servidores. Si usas uno de ellos, por favor usa estas credenciales. De los contrario no dudes en conectar con cualquiera otra instancia de StatusNet (ver a continuación)."; +App::$strings["Submit"] = "Envíar"; +App::$strings["Provide your own OAuth Credentials"] = "Proporciona tus propias credenciales OAuth"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "No se ha encontrado ningún par de claves consumer para StatusNet. Registra tu cuenta de Friendica como un cliente de escritorio en tu cuenta de StatusNet, copia el par de claves consumer aquí e introduce la dirección de la API.
Antes de registrar tu propio par de claves OAuth pregunta a tu administrador si ya existe un par de claves para esa instalación de Friendica en tu instalación StatusNet favorita."; +App::$strings["OAuth Consumer Key"] = "Clave OAuth del usuario"; +App::$strings["OAuth Consumer Secret"] = "Secreto OAuth del usuario"; +App::$strings["Base API Path (remember the trailing /)"] = "Dirección de la API (recordar el / al final)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Para conectarte a tu cuenta de StatusNet haz clic en el botón abajo para obtener un PIN de StatusNet, que tienes que copiar en el cuadro de entrada y enviar el formulario. Solo tus publicaciones públicas se publicarán en StatusNet."; +App::$strings["Log in with StatusNet"] = "Inicia sesión en StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Copia el código de seguridad de StatusNet aquí"; +App::$strings["Cancel Connection Process"] = "Cancelar la conexión en proceso"; +App::$strings["Current StatusNet API is"] = "El estado actual de la API de StatusNet es"; +App::$strings["Cancel StatusNet Connection"] = "Cancelar conexión con StatusNet"; +App::$strings["Currently connected to: "] = "Actualmente conectado a:"; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si lo habilitas todas tus publicaciones públicas podrán ser publicadas en la cuenta asociada de StatusNet. Pudes elegir hacerlo por defecto (aquí) o para cada publicación individualmente en las opciones de publicacion cuando las escribes."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a tus opciones de privacidad (¿Ocultar los detalles de tu perfil de espectadores desconocidos?) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a StatusNet conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."; +App::$strings["Allow posting to StatusNet"] = "Permitir publicaciones en StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Enviar publicaciones públicas a StatusNet por defecto"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = "Enviar a StatusNet las #-etiquetas y @-nombres"; +App::$strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth"; +App::$strings["Site name"] = "Nombre del sitio"; +App::$strings["API URL"] = "Dirección de la API"; +App::$strings["Consumer Secret"] = "Secreto del consumidor"; +App::$strings["Consumer Key"] = "Clave del consumidor"; diff --git a/sources/addons/statusnet/lang/fr/strings.php b/sources/addons/statusnet/lang/fr/strings.php index 7118173e..73a03557 100644 --- a/sources/addons/statusnet/lang/fr/strings.php +++ b/sources/addons/statusnet/lang/fr/strings.php @@ -1,32 +1,32 @@ strings["Post to StatusNet"] = "Poster sur StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Merci de contacter l'administrateur du site.
L'URL d'API fournie est invalide."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Nous n'avons pas pu contacter l'API StatusNet avec le chemin saisi."; -$a->strings["StatusNet settings updated."] = "Réglages StatusNet mis-à-jour."; -$a->strings["StatusNet Posting Settings"] = "Réglages du connecteur StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "Clés OAuth StatusNet universelles"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Ce sont des paires de clés OAuth préconfigurées pour certains serveurs StatusNet courants. Si vous utilisez l'un d'entre eux, merci de vous servir de ces clés. Autrement, vous pouvez vous connecter à n'importer quelle autre instance de StatusNet (voir ci-dessous)."; -$a->strings["Submit"] = "Envoyer"; -$a->strings["Provide your own OAuth Credentials"] = "Fournissez vos propres paramètres OAuth"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Pas de paire de clé trouvée pour StatusNet. Enregistrez votre compte Friendica comme un client \"desktop\" sur votre compte StatusNet, copiez la paire de clé ici et entrez la racine de l'API.
Avant d'enregistrer votre propre paire de clé, assurez-vous auprès de l'administrateur qu'il n'y a pas déjà une paire de clé pour cette instance de Friendica chez votre fournisseur StatusNet préféré."; -$a->strings["OAuth Consumer Key"] = "Clé de consommateur OAuth"; -$a->strings["OAuth Consumer Secret"] = "Secret d'utilisateur OAuth"; -$a->strings["Base API Path (remember the trailing /)"] = "Chemin de base de l'API (n'oubliez pas le / final)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Pour vous connecter à votre compte StatusNet, cliquez sur le bouton ci-dessous pour obtenir un code de sécurité de StatusNet, que vous aurez à coller dans la boîte ci-dessous. Ensuite, validez le formulaire. Seuls vos articles <strong>publics</strong> seront postés sur StatusNet."; -$a->strings["Log in with StatusNet"] = "Se connecter à StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Coller le code de sécurité de StatusNet ici"; -$a->strings["Cancel Connection Process"] = "Annuler le processus de connexion"; -$a->strings["Current StatusNet API is"] = "L'API StatusNet courante est"; -$a->strings["Cancel StatusNet Connection"] = "Annuler la connexion à StatusNet"; -$a->strings["Currently connected to: "] = "Actuellement connecté à: "; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "En cas d'activation, toutes vos notices publiques seront transmises au compte StatusNet associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Note: Du fait de vos réglages de vie privée (Cacher les détails de votre profil des visiteurs inconnus?), le lien potentiellement inclus dans les messages publics relayés vers StatusNet conduira les visiteurs vers une page blanche les informant que leur accès à votre profil a été restreint."; -$a->strings["Allow posting to StatusNet"] = "Autoriser la publication sur StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Par défaut, envoyer les notices publiques à StatusNet"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "Envoyer les liens vers les #-tags et les @-noms sur StatusNet"; -$a->strings["Clear OAuth configuration"] = "Effacer la configuration OAuth"; -$a->strings["Site name"] = "Nom du site"; -$a->strings["API URL"] = "URL de l'API"; -$a->strings["Consumer Secret"] = "Secret utilisateur"; -$a->strings["Consumer Key"] = "Clé utilisateur"; +App::$strings["Post to StatusNet"] = "Poster sur StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Merci de contacter l'administrateur du site.
L'URL d'API fournie est invalide."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Nous n'avons pas pu contacter l'API StatusNet avec le chemin saisi."; +App::$strings["StatusNet settings updated."] = "Réglages StatusNet mis-à-jour."; +App::$strings["StatusNet Posting Settings"] = "Réglages du connecteur StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "Clés OAuth StatusNet universelles"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Ce sont des paires de clés OAuth préconfigurées pour certains serveurs StatusNet courants. Si vous utilisez l'un d'entre eux, merci de vous servir de ces clés. Autrement, vous pouvez vous connecter à n'importer quelle autre instance de StatusNet (voir ci-dessous)."; +App::$strings["Submit"] = "Envoyer"; +App::$strings["Provide your own OAuth Credentials"] = "Fournissez vos propres paramètres OAuth"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Pas de paire de clé trouvée pour StatusNet. Enregistrez votre compte Friendica comme un client \"desktop\" sur votre compte StatusNet, copiez la paire de clé ici et entrez la racine de l'API.
Avant d'enregistrer votre propre paire de clé, assurez-vous auprès de l'administrateur qu'il n'y a pas déjà une paire de clé pour cette instance de Friendica chez votre fournisseur StatusNet préféré."; +App::$strings["OAuth Consumer Key"] = "Clé de consommateur OAuth"; +App::$strings["OAuth Consumer Secret"] = "Secret d'utilisateur OAuth"; +App::$strings["Base API Path (remember the trailing /)"] = "Chemin de base de l'API (n'oubliez pas le / final)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Pour vous connecter à votre compte StatusNet, cliquez sur le bouton ci-dessous pour obtenir un code de sécurité de StatusNet, que vous aurez à coller dans la boîte ci-dessous. Ensuite, validez le formulaire. Seuls vos articles <strong>publics</strong> seront postés sur StatusNet."; +App::$strings["Log in with StatusNet"] = "Se connecter à StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Coller le code de sécurité de StatusNet ici"; +App::$strings["Cancel Connection Process"] = "Annuler le processus de connexion"; +App::$strings["Current StatusNet API is"] = "L'API StatusNet courante est"; +App::$strings["Cancel StatusNet Connection"] = "Annuler la connexion à StatusNet"; +App::$strings["Currently connected to: "] = "Actuellement connecté à: "; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "En cas d'activation, toutes vos notices publiques seront transmises au compte StatusNet associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Note: Du fait de vos réglages de vie privée (Cacher les détails de votre profil des visiteurs inconnus?), le lien potentiellement inclus dans les messages publics relayés vers StatusNet conduira les visiteurs vers une page blanche les informant que leur accès à votre profil a été restreint."; +App::$strings["Allow posting to StatusNet"] = "Autoriser la publication sur StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Par défaut, envoyer les notices publiques à StatusNet"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = "Envoyer les liens vers les #-tags et les @-noms sur StatusNet"; +App::$strings["Clear OAuth configuration"] = "Effacer la configuration OAuth"; +App::$strings["Site name"] = "Nom du site"; +App::$strings["API URL"] = "URL de l'API"; +App::$strings["Consumer Secret"] = "Secret utilisateur"; +App::$strings["Consumer Key"] = "Clé utilisateur"; diff --git a/sources/addons/statusnet/lang/is/strings.php b/sources/addons/statusnet/lang/is/strings.php index 8a682499..f19eb256 100644 --- a/sources/addons/statusnet/lang/is/strings.php +++ b/sources/addons/statusnet/lang/is/strings.php @@ -1,32 +1,32 @@ strings["Post to StatusNet"] = "Senda færslu á StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Hafðu samband við kerfisstjóra.
Uppgefin API slóð er ógild."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Ekki náðist í StatusNet API með slóð sem þú gafst upp."; -$a->strings["StatusNet settings updated."] = "StatusNet stillingar uppfærðar."; -$a->strings["StatusNet Posting Settings"] = "StatusNet færslu stillingar"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "StatusNet OAuthKey í boði á heimsvísu"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Það eru forstillt OAuth lykla pör í sumum StatusNet þjónum. Ef þú ert að nota slíkt par, notaðu þá þau auðkenni. Ef ekki þá er þér frjálst að tengjast hvaða öðrum StatusNet þjón (sjá fyrir neðan)."; -$a->strings["Submit"] = "Senda inn"; -$a->strings["Provide your own OAuth Credentials"] = "Gefðu upp eigin OAuth auðkenni"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; -$a->strings["OAuth Consumer Key"] = "OAuth notenda lykill"; -$a->strings["OAuth Consumer Secret"] = "OAuth notenda leyndarmál"; -$a->strings["Base API Path (remember the trailing /)"] = "Grunn API slóð (muna eftir / í endann)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Til að tengjast StatusNet notandanum ýttu á takkann fyrir neðan, þá fæst öryggis lykill frá StatusNet sem þarf að afrita í svæðið fyrir neðan og senda inn. Aðeins opinberar færslur munu flæða yfir á StatusNet."; -$a->strings["Log in with StatusNet"] = "Innskrá með StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Afrita öryggis lykil frá StatusNet hingað"; -$a->strings["Cancel Connection Process"] = "Hætta við tengi ferli"; -$a->strings["Current StatusNet API is"] = "Núverandi StatusNet API er"; -$a->strings["Cancel StatusNet Connection"] = "Hætta við StatusNet tengingu"; -$a->strings["Currently connected to: "] = "Núna tengdur við:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Ef virkt þá geta allar opinberu stöðu meldingarnar þínar verið birtar á tengdri StatusNet síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to StatusNet"] = "Leyfa sendingu færslna til StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Sjálfgefið senda opinberar færslur á StatusNet"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = ""; -$a->strings["Clear OAuth configuration"] = "Hreinsa OAuth stillingar"; -$a->strings["Site name"] = "Nafn síðu"; -$a->strings["API URL"] = "API slóð"; -$a->strings["Consumer Secret"] = "Notenda leyndarmál"; -$a->strings["Consumer Key"] = "Notenda lykill"; +App::$strings["Post to StatusNet"] = "Senda færslu á StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Hafðu samband við kerfisstjóra.
Uppgefin API slóð er ógild."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Ekki náðist í StatusNet API með slóð sem þú gafst upp."; +App::$strings["StatusNet settings updated."] = "StatusNet stillingar uppfærðar."; +App::$strings["StatusNet Posting Settings"] = "StatusNet færslu stillingar"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "StatusNet OAuthKey í boði á heimsvísu"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Það eru forstillt OAuth lykla pör í sumum StatusNet þjónum. Ef þú ert að nota slíkt par, notaðu þá þau auðkenni. Ef ekki þá er þér frjálst að tengjast hvaða öðrum StatusNet þjón (sjá fyrir neðan)."; +App::$strings["Submit"] = "Senda inn"; +App::$strings["Provide your own OAuth Credentials"] = "Gefðu upp eigin OAuth auðkenni"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; +App::$strings["OAuth Consumer Key"] = "OAuth notenda lykill"; +App::$strings["OAuth Consumer Secret"] = "OAuth notenda leyndarmál"; +App::$strings["Base API Path (remember the trailing /)"] = "Grunn API slóð (muna eftir / í endann)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Til að tengjast StatusNet notandanum ýttu á takkann fyrir neðan, þá fæst öryggis lykill frá StatusNet sem þarf að afrita í svæðið fyrir neðan og senda inn. Aðeins opinberar færslur munu flæða yfir á StatusNet."; +App::$strings["Log in with StatusNet"] = "Innskrá með StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Afrita öryggis lykil frá StatusNet hingað"; +App::$strings["Cancel Connection Process"] = "Hætta við tengi ferli"; +App::$strings["Current StatusNet API is"] = "Núverandi StatusNet API er"; +App::$strings["Cancel StatusNet Connection"] = "Hætta við StatusNet tengingu"; +App::$strings["Currently connected to: "] = "Núna tengdur við:"; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Ef virkt þá geta allar opinberu stöðu meldingarnar þínar verið birtar á tengdri StatusNet síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to StatusNet"] = "Leyfa sendingu færslna til StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Sjálfgefið senda opinberar færslur á StatusNet"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = ""; +App::$strings["Clear OAuth configuration"] = "Hreinsa OAuth stillingar"; +App::$strings["Site name"] = "Nafn síðu"; +App::$strings["API URL"] = "API slóð"; +App::$strings["Consumer Secret"] = "Notenda leyndarmál"; +App::$strings["Consumer Key"] = "Notenda lykill"; diff --git a/sources/addons/statusnet/lang/it/strings.php b/sources/addons/statusnet/lang/it/strings.php index e440885c..1b1b773f 100644 --- a/sources/addons/statusnet/lang/it/strings.php +++ b/sources/addons/statusnet/lang/it/strings.php @@ -1,34 +1,34 @@ strings["Post to StatusNet"] = "Invia a StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Contatta l'amministratore del sito.
L'URL delle API fornito non è valido."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Non possiamo conttattare le API di StatusNet con il percorso che hai inserito."; -$a->strings["StatusNet settings updated."] = "Impostazioni StatusNet aggiornate."; -$a->strings["StatusNet Posting Settings"] = "Impostazioni di invio a StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys globali di StatusNet"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Esistono coppie di chiavi OAuth precofigurate per alcuni server StatusNet. Se usi uno di questi server, per favore scegli queste credenziali. Altrimenti sei libero di collegarti a un'altra installazione di StatusNet (vedi sotto)."; -$a->strings["Submit"] = "Invia"; -$a->strings["Provide your own OAuth Credentials"] = "Fornisci le tue credenziali OAuth"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nessuna coppia di chiavi consumer trovate per StatusNet. Registra il tuo account Friendica come un client desktop nel tuo account StatusNet, copia la coppia di chiavi consumer qui e inserisci l'url base delle API.
Prima di registrare la tua coppia di chiavi OAuth, chiedi all'amministratore se esiste già una coppia di chiavi per questo sito Friendica presso la tua installazione StatusNet preferita."; -$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; -$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; -$a->strings["Base API Path (remember the trailing /)"] = "Indirizzo di base per le API (ricorda la / alla fine)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Per collegare il tuo account StatusNet, clicca sul bottone per ottenere un codice di sicurezza da StatusNet, che dovrai copiare nel box sottostante e poi inviare la form. Solo i tuoi messaggi pubblici saranno inviati a StatusNet."; -$a->strings["Log in with StatusNet"] = "Accedi con StatuNet"; -$a->strings["Copy the security code from StatusNet here"] = "Copia il codice di sicurezza da StatusNet qui"; -$a->strings["Cancel Connection Process"] = "Annulla il processo di connessione"; -$a->strings["Current StatusNet API is"] = "Le API StatusNet correnti sono"; -$a->strings["Cancel StatusNet Connection"] = "Annulla la connessione a StatusNet"; -$a->strings["Currently connected to: "] = "Al momento connesso con:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi pubblici possono essere inviati all'account StatusNet associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluse nei messaggi pubblici inviati a StatusNet porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; -$a->strings["Allow posting to StatusNet"] = "Permetti l'invio a StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Invia sempre i messaggi pubblici a StatusNet"; -$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = ""; -$a->strings["Shortening method that optimizes the post"] = ""; -$a->strings["Send linked #-tags and @-names to StatusNet"] = ""; -$a->strings["Clear OAuth configuration"] = "Rimuovi la configurazione OAuth"; -$a->strings["Site name"] = "Nome del sito"; -$a->strings["API URL"] = "API URL"; -$a->strings["Consumer Secret"] = "Consumer Secret"; -$a->strings["Consumer Key"] = "Consumer Key"; +App::$strings["Post to StatusNet"] = "Invia a StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Contatta l'amministratore del sito.
L'URL delle API fornito non è valido."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Non possiamo conttattare le API di StatusNet con il percorso che hai inserito."; +App::$strings["StatusNet settings updated."] = "Impostazioni StatusNet aggiornate."; +App::$strings["StatusNet Posting Settings"] = "Impostazioni di invio a StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys globali di StatusNet"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Esistono coppie di chiavi OAuth precofigurate per alcuni server StatusNet. Se usi uno di questi server, per favore scegli queste credenziali. Altrimenti sei libero di collegarti a un'altra installazione di StatusNet (vedi sotto)."; +App::$strings["Submit"] = "Invia"; +App::$strings["Provide your own OAuth Credentials"] = "Fornisci le tue credenziali OAuth"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nessuna coppia di chiavi consumer trovate per StatusNet. Registra il tuo account Friendica come un client desktop nel tuo account StatusNet, copia la coppia di chiavi consumer qui e inserisci l'url base delle API.
Prima di registrare la tua coppia di chiavi OAuth, chiedi all'amministratore se esiste già una coppia di chiavi per questo sito Friendica presso la tua installazione StatusNet preferita."; +App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; +App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; +App::$strings["Base API Path (remember the trailing /)"] = "Indirizzo di base per le API (ricorda la / alla fine)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Per collegare il tuo account StatusNet, clicca sul bottone per ottenere un codice di sicurezza da StatusNet, che dovrai copiare nel box sottostante e poi inviare la form. Solo i tuoi messaggi pubblici saranno inviati a StatusNet."; +App::$strings["Log in with StatusNet"] = "Accedi con StatuNet"; +App::$strings["Copy the security code from StatusNet here"] = "Copia il codice di sicurezza da StatusNet qui"; +App::$strings["Cancel Connection Process"] = "Annulla il processo di connessione"; +App::$strings["Current StatusNet API is"] = "Le API StatusNet correnti sono"; +App::$strings["Cancel StatusNet Connection"] = "Annulla la connessione a StatusNet"; +App::$strings["Currently connected to: "] = "Al momento connesso con:"; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi pubblici possono essere inviati all'account StatusNet associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluse nei messaggi pubblici inviati a StatusNet porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; +App::$strings["Allow posting to StatusNet"] = "Permetti l'invio a StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Invia sempre i messaggi pubblici a StatusNet"; +App::$strings["Mirror all posts from statusnet that are no replies or repeated messages"] = ""; +App::$strings["Shortening method that optimizes the post"] = ""; +App::$strings["Send linked #-tags and @-names to StatusNet"] = ""; +App::$strings["Clear OAuth configuration"] = "Rimuovi la configurazione OAuth"; +App::$strings["Site name"] = "Nome del sito"; +App::$strings["API URL"] = "API URL"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Consumer Key"] = "Consumer Key"; diff --git a/sources/addons/statusnet/lang/nb-no/strings.php b/sources/addons/statusnet/lang/nb-no/strings.php index 91ad44e7..829fe5d7 100644 --- a/sources/addons/statusnet/lang/nb-no/strings.php +++ b/sources/addons/statusnet/lang/nb-no/strings.php @@ -1,32 +1,32 @@ strings["Post to StatusNet"] = "Post til StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Vennligst kontakt administratoren på nettstedet ditt.
Den oppgitter API URL-en er ikke gyldig."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Vi kunne ikke kontakte StatusNet API-en med den banen du oppgav."; -$a->strings["StatusNet settings updated."] = "StatusNet-innstillinger er oppdatert."; -$a->strings["StatusNet Posting Settings"] = "Innstillinger for posting til StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "Globalt tilgjengelige StatusNet OAuthKeys"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Det finnes ferdig konfigurerte OAuth nøkkelpar tilgjengelig for noen StatusNet-tjenere. Hvis du bruker en av disse, vennligst bruk disse som legitimasjon. Hvis ikke, så er du fri til å opprette en forbindelse til enhver annen StatusNet-forekomst (se nedenfor)."; -$a->strings["Submit"] = "Lagre"; -$a->strings["Provide your own OAuth Credentials"] = "Oppgi din egen OAuth-legitimasjon"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; -$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; -$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; -$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (husk / på slutten)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "For å koble din StatusNet-konto, klikk knappen under for å få en sikkerhetskode fra StatusNet som du må kopiere inn i tekstfeltet under, og send inn skjemaet. Det er bare dine offentlige meldinger som blir postet til StatusNet."; -$a->strings["Log in with StatusNet"] = "Logg inn med StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Kopier sikkerhetskoden fra StatusNet hit"; -$a->strings["Cancel Connection Process"] = "Avbryt forbindelsesprosessen"; -$a->strings["Current StatusNet API is"] = "Gjeldende StatusNet API er"; -$a->strings["Cancel StatusNet Connection"] = "Avbryt StatusNet-forbindelsen"; -$a->strings["Currently connected to: "] = "For øyeblikket tilkoblet til:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Aktivering gjør at alle dine offentlige innlegg kan postes til den tilknyttede StatusNet-kontoen. Du kan velge å gjøre dette som standard (her), eller for hvert enkelt innlegg separat i valgmulighetene for posting når du skriver et innlegg."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to StatusNet"] = "Tillat innlegg til StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Send offentlige innlegg til StatusNet som standard"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = ""; -$a->strings["Clear OAuth configuration"] = "Fjern OAuth-konfigurasjon"; -$a->strings["Site name"] = "Nettstedets navn"; -$a->strings["API URL"] = "API URL"; -$a->strings["Consumer Secret"] = "Consumer Secret"; -$a->strings["Consumer Key"] = "Consumer Key"; +App::$strings["Post to StatusNet"] = "Post til StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Vennligst kontakt administratoren på nettstedet ditt.
Den oppgitter API URL-en er ikke gyldig."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Vi kunne ikke kontakte StatusNet API-en med den banen du oppgav."; +App::$strings["StatusNet settings updated."] = "StatusNet-innstillinger er oppdatert."; +App::$strings["StatusNet Posting Settings"] = "Innstillinger for posting til StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "Globalt tilgjengelige StatusNet OAuthKeys"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Det finnes ferdig konfigurerte OAuth nøkkelpar tilgjengelig for noen StatusNet-tjenere. Hvis du bruker en av disse, vennligst bruk disse som legitimasjon. Hvis ikke, så er du fri til å opprette en forbindelse til enhver annen StatusNet-forekomst (se nedenfor)."; +App::$strings["Submit"] = "Lagre"; +App::$strings["Provide your own OAuth Credentials"] = "Oppgi din egen OAuth-legitimasjon"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; +App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; +App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; +App::$strings["Base API Path (remember the trailing /)"] = "Base API Path (husk / på slutten)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "For å koble din StatusNet-konto, klikk knappen under for å få en sikkerhetskode fra StatusNet som du må kopiere inn i tekstfeltet under, og send inn skjemaet. Det er bare dine offentlige meldinger som blir postet til StatusNet."; +App::$strings["Log in with StatusNet"] = "Logg inn med StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Kopier sikkerhetskoden fra StatusNet hit"; +App::$strings["Cancel Connection Process"] = "Avbryt forbindelsesprosessen"; +App::$strings["Current StatusNet API is"] = "Gjeldende StatusNet API er"; +App::$strings["Cancel StatusNet Connection"] = "Avbryt StatusNet-forbindelsen"; +App::$strings["Currently connected to: "] = "For øyeblikket tilkoblet til:"; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Aktivering gjør at alle dine offentlige innlegg kan postes til den tilknyttede StatusNet-kontoen. Du kan velge å gjøre dette som standard (her), eller for hvert enkelt innlegg separat i valgmulighetene for posting når du skriver et innlegg."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to StatusNet"] = "Tillat innlegg til StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Send offentlige innlegg til StatusNet som standard"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = ""; +App::$strings["Clear OAuth configuration"] = "Fjern OAuth-konfigurasjon"; +App::$strings["Site name"] = "Nettstedets navn"; +App::$strings["API URL"] = "API URL"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Consumer Key"] = "Consumer Key"; diff --git a/sources/addons/statusnet/lang/nl/strings.php b/sources/addons/statusnet/lang/nl/strings.php index 81929da8..0c693453 100644 --- a/sources/addons/statusnet/lang/nl/strings.php +++ b/sources/addons/statusnet/lang/nl/strings.php @@ -1,36 +1,36 @@ strings["Post to GNU social"] = "Doorplaatsen naar GNU social"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Neem contact op met jouw hubbeheerder.
De verstrekte API-URL is ongeldig."; -$a->strings["We could not contact the GNU social API with the Path you entered."] = "Wij konden de GNU social-API niet bereiken door middel van het ingevulde pad."; -$a->strings["GNU social settings updated."] = "GNU social-instellingen bijgewerkt."; -$a->strings["Globally Available GNU social OAuthKeys"] = "Voor de hele hub te gebruiken GNU social OAuthkeys."; -$a->strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)."; -$a->strings["Submit"] = "Opslaan"; -$a->strings["Provide your own OAuth Credentials"] = "Verstrek jouw eigen OAuth-gegevens"; -$a->strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat."; -$a->strings["OAuth Consumer Key"] = "OAuth-consumerkey"; -$a->strings["OAuth Consumer Secret"] = "Oauth-consumersecret"; -$a->strings["Base API Path"] = "Base API-pad"; -$a->strings["Remember the trailing /"] = "Vergeet niet de afsluitende /"; -$a->strings["GNU social application name"] = "Naam GNU social-applicatie"; -$a->strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = "Om jouw GNU social-account te koppelen klik je op de knop hieronder. Je krijgt dan een veiligheidscode van GNU social die je kan kopiëren en dan hieronder in het invulveld kan plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen worden doorgeplaatst naar GNU social."; -$a->strings["Log in with GNU social"] = "Op GNU social inloggen"; -$a->strings["Copy the security code from GNU social here"] = "Plak de veiligheidscode van GNU social hier"; -$a->strings["Cancel Connection Process"] = "Annuleer het koppelingsproces"; -$a->strings["Current GNU social API is"] = "De huidige GNU social-API is"; -$a->strings["Cancel GNU social Connection"] = "Annuleer de GNU social-koppeling"; -$a->strings["No"] = "Nee"; -$a->strings["Yes"] = "Ja"; -$a->strings["Currently connected to: "] = "Momenteel gekoppeld aan: "; -$a->strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten op het gekoppelde Twitter-account worden geplaatst"; -$a->strings["Post to GNU social by default"] = "Berichten standaard naar GNU social doorplaatsen"; -$a->strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard op het gekoppelde GNU social-account geplaatst"; -$a->strings["Clear OAuth configuration"] = "OAuth-configuratie wissen"; -$a->strings["GNU social Post Settings"] = "GNU social (berichten doorplaatsen)"; -$a->strings["Site name"] = "Naam server"; -$a->strings["API URL"] = "API-URL"; -$a->strings["Consumer Secret"] = "Consumersecret"; -$a->strings["Consumer Key"] = "Consumerkey"; -$a->strings["Application name"] = "Naam applicatie"; +App::$strings["Post to GNU social"] = "Doorplaatsen naar GNU social"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Neem contact op met jouw hubbeheerder.
De verstrekte API-URL is ongeldig."; +App::$strings["We could not contact the GNU social API with the Path you entered."] = "Wij konden de GNU social-API niet bereiken door middel van het ingevulde pad."; +App::$strings["GNU social settings updated."] = "GNU social-instellingen bijgewerkt."; +App::$strings["Globally Available GNU social OAuthKeys"] = "Voor de hele hub te gebruiken GNU social OAuthkeys."; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)."; +App::$strings["Submit"] = "Opslaan"; +App::$strings["Provide your own OAuth Credentials"] = "Verstrek jouw eigen OAuth-gegevens"; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat."; +App::$strings["OAuth Consumer Key"] = "OAuth-consumerkey"; +App::$strings["OAuth Consumer Secret"] = "Oauth-consumersecret"; +App::$strings["Base API Path"] = "Base API-pad"; +App::$strings["Remember the trailing /"] = "Vergeet niet de afsluitende /"; +App::$strings["GNU social application name"] = "Naam GNU social-applicatie"; +App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU social."] = "Om jouw GNU social-account te koppelen klik je op de knop hieronder. Je krijgt dan een veiligheidscode van GNU social die je kan kopiëren en dan hieronder in het invulveld kan plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen worden doorgeplaatst naar GNU social."; +App::$strings["Log in with GNU social"] = "Op GNU social inloggen"; +App::$strings["Copy the security code from GNU social here"] = "Plak de veiligheidscode van GNU social hier"; +App::$strings["Cancel Connection Process"] = "Annuleer het koppelingsproces"; +App::$strings["Current GNU social API is"] = "De huidige GNU social-API is"; +App::$strings["Cancel GNU social Connection"] = "Annuleer de GNU social-koppeling"; +App::$strings["No"] = "Nee"; +App::$strings["Yes"] = "Ja"; +App::$strings["Currently connected to: "] = "Momenteel gekoppeld aan: "; +App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten op het gekoppelde Twitter-account worden geplaatst"; +App::$strings["Post to GNU social by default"] = "Berichten standaard naar GNU social doorplaatsen"; +App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard op het gekoppelde GNU social-account geplaatst"; +App::$strings["Clear OAuth configuration"] = "OAuth-configuratie wissen"; +App::$strings["GNU social Post Settings"] = "GNU social (berichten doorplaatsen)"; +App::$strings["Site name"] = "Naam server"; +App::$strings["API URL"] = "API-URL"; +App::$strings["Consumer Secret"] = "Consumersecret"; +App::$strings["Consumer Key"] = "Consumerkey"; +App::$strings["Application name"] = "Naam applicatie"; diff --git a/sources/addons/statusnet/lang/pl/strings.php b/sources/addons/statusnet/lang/pl/strings.php index ef41e39d..1a5e16af 100644 --- a/sources/addons/statusnet/lang/pl/strings.php +++ b/sources/addons/statusnet/lang/pl/strings.php @@ -1,34 +1,34 @@ strings["Post to StatusNet"] = "Wyślij do sieci StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Proszę się skontaktować z administratorem strony.
API URL nie jest poprawne"; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = ""; -$a->strings["StatusNet settings updated."] = "Ustawienia StatusNet zaktualizowane"; -$a->strings["StatusNet Posting Settings"] = "Ustawienia StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = ""; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = ""; -$a->strings["Submit"] = "Potwierdź"; -$a->strings["Provide your own OAuth Credentials"] = ""; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; -$a->strings["OAuth Consumer Key"] = ""; -$a->strings["OAuth Consumer Secret"] = ""; -$a->strings["Base API Path (remember the trailing /)"] = ""; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Aby uzyskać połączenie z kontem w serwisie StatusNet naciśnij przycisk poniżej aby otrzymać kod bezpieczeństwa od StatusNet, który musisz skopiować do pola poniżej i wysłać formularz. Tylko twoje publiczne posty będą publikowane na StatusNet."; -$a->strings["Log in with StatusNet"] = "Zaloguj się przez StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Tutaj skopiuj kod bezpieczeństwa z StatusNet"; -$a->strings["Cancel Connection Process"] = "Anuluj proces łączenia"; -$a->strings["Current StatusNet API is"] = "Aktualnym StatusNet API jest"; -$a->strings["Cancel StatusNet Connection"] = "Anuluj połączenie StatusNet"; -$a->strings["Currently connected to: "] = "Obecnie połączone z:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = ""; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to StatusNet"] = "Pozwól zamieszczać posty na StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = ""; -$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = ""; -$a->strings["Shortening method that optimizes the post"] = ""; -$a->strings["Send linked #-tags and @-names to StatusNet"] = ""; -$a->strings["Clear OAuth configuration"] = ""; -$a->strings["Site name"] = "Nazwa strony"; -$a->strings["API URL"] = "Adres API"; -$a->strings["Consumer Secret"] = "Sekret konsumenta"; -$a->strings["Consumer Key"] = "Klucz konsumenta"; +App::$strings["Post to StatusNet"] = "Wyślij do sieci StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Proszę się skontaktować z administratorem strony.
API URL nie jest poprawne"; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = ""; +App::$strings["StatusNet settings updated."] = "Ustawienia StatusNet zaktualizowane"; +App::$strings["StatusNet Posting Settings"] = "Ustawienia StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = ""; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = ""; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["Provide your own OAuth Credentials"] = ""; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; +App::$strings["OAuth Consumer Key"] = ""; +App::$strings["OAuth Consumer Secret"] = ""; +App::$strings["Base API Path (remember the trailing /)"] = ""; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Aby uzyskać połączenie z kontem w serwisie StatusNet naciśnij przycisk poniżej aby otrzymać kod bezpieczeństwa od StatusNet, który musisz skopiować do pola poniżej i wysłać formularz. Tylko twoje publiczne posty będą publikowane na StatusNet."; +App::$strings["Log in with StatusNet"] = "Zaloguj się przez StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Tutaj skopiuj kod bezpieczeństwa z StatusNet"; +App::$strings["Cancel Connection Process"] = "Anuluj proces łączenia"; +App::$strings["Current StatusNet API is"] = "Aktualnym StatusNet API jest"; +App::$strings["Cancel StatusNet Connection"] = "Anuluj połączenie StatusNet"; +App::$strings["Currently connected to: "] = "Obecnie połączone z:"; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = ""; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to StatusNet"] = "Pozwól zamieszczać posty na StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = ""; +App::$strings["Mirror all posts from statusnet that are no replies or repeated messages"] = ""; +App::$strings["Shortening method that optimizes the post"] = ""; +App::$strings["Send linked #-tags and @-names to StatusNet"] = ""; +App::$strings["Clear OAuth configuration"] = ""; +App::$strings["Site name"] = "Nazwa strony"; +App::$strings["API URL"] = "Adres API"; +App::$strings["Consumer Secret"] = "Sekret konsumenta"; +App::$strings["Consumer Key"] = "Klucz konsumenta"; diff --git a/sources/addons/statusnet/lang/pt-br/strings.php b/sources/addons/statusnet/lang/pt-br/strings.php index f360e69b..bc0f8082 100644 --- a/sources/addons/statusnet/lang/pt-br/strings.php +++ b/sources/addons/statusnet/lang/pt-br/strings.php @@ -1,32 +1,32 @@ strings["Post to StatusNet"] = "Publicar no StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Por favor, entre em contato com o administrados do seu site.
A URL da API fornecida não é válida."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Não foi possível contactar a API do StatusNet a partir do caminho que você informou."; -$a->strings["StatusNet settings updated."] = "As configurações do StatusNet foram atualizadas."; -$a->strings["StatusNet Posting Settings"] = "Configurações de publicação no StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys do StatusNet disponíveis globalmente"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Existem pares de chaves OAuth para alguns servidores StatusNet disponíveis. Se você estiver usando algum desses servidores, por favor utilize essas credenciais. Caso contrário, sinta-se à vontade para conectar-se a qualquer outra instância do StatusNet (veja abaixo)."; -$a->strings["Submit"] = "Enviar"; -$a->strings["Provide your own OAuth Credentials"] = "Forneça suas próprias credenciais OAuth"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nenhum par de chaves para StatusNet encontrado. Registre sua conta Friendica como um cliente de mesa (desktop) na sua conta StatusNet, copie o par de chaves aqui e forneça a raíz base da API.
Antes de registra seu próprio par de chaves OAuth pergunte ao administrador se já existe um par de chaves para essa instalação do Friendica na sua instalação favorita do StatusNet."; -$a->strings["OAuth Consumer Key"] = "Chave de consumidor OAuth"; -$a->strings["OAuth Consumer Secret"] = "Segredo de consumidor OAuth"; -$a->strings["Base API Path (remember the trailing /)"] = "Caminho base da API (lembre-se da / final)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Para conectar à sua conta StatusNet, clique no botão abaixo para obter um código de segurança do StatusNet, o qual você deve copiar na caixa de texto abaixo e clicar no botão para enviar o formulário. Somente suas publicações públicas serão enviadas para o StatusNet."; -$a->strings["Log in with StatusNet"] = "Autenticar-se no StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Copie o código de segurança do StatusNet aqui"; -$a->strings["Cancel Connection Process"] = "Cancelar o processo de conexão"; -$a->strings["Current StatusNet API is"] = "A API atual do StatusNet é"; -$a->strings["Cancel StatusNet Connection"] = "Cancelar a conexão com o StatusNet"; -$a->strings["Currently connected to: "] = "Atualmente conectado como: "; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se habilitado, todas as suas publicações públicas podem ser publicadas na sua conta StatusNet associada. Você pode escolher entre publicar tudo automaticamente (marcando aqui) ou selecionar o que será enviado individualmente (nas opções de publicação, durante o processo de escrita da mensagem)."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Aviso: Devido às suas configurações de privacidade (Ocultar os detalhes do seu perfil para pessoas desconhecidas?) o link potencialmente incluído nas publicações públicas encaminhadas para o StatusNet levarão o visitante a uma página contendo a informação de que o acesso ao seu perfil é restrito."; -$a->strings["Allow posting to StatusNet"] = "Permitir a publicação no StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Enviar as publicações públicas para o StatusNet por padrão"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = ""; -$a->strings["Clear OAuth configuration"] = "Limpar a configuração OAuth"; -$a->strings["Site name"] = "Nome do site"; -$a->strings["API URL"] = "URL da API"; -$a->strings["Consumer Secret"] = "Segredo do consumidor"; -$a->strings["Consumer Key"] = "Chave do consumidor"; +App::$strings["Post to StatusNet"] = "Publicar no StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Por favor, entre em contato com o administrados do seu site.
A URL da API fornecida não é válida."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Não foi possível contactar a API do StatusNet a partir do caminho que você informou."; +App::$strings["StatusNet settings updated."] = "As configurações do StatusNet foram atualizadas."; +App::$strings["StatusNet Posting Settings"] = "Configurações de publicação no StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys do StatusNet disponíveis globalmente"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Existem pares de chaves OAuth para alguns servidores StatusNet disponíveis. Se você estiver usando algum desses servidores, por favor utilize essas credenciais. Caso contrário, sinta-se à vontade para conectar-se a qualquer outra instância do StatusNet (veja abaixo)."; +App::$strings["Submit"] = "Enviar"; +App::$strings["Provide your own OAuth Credentials"] = "Forneça suas próprias credenciais OAuth"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nenhum par de chaves para StatusNet encontrado. Registre sua conta Friendica como um cliente de mesa (desktop) na sua conta StatusNet, copie o par de chaves aqui e forneça a raíz base da API.
Antes de registra seu próprio par de chaves OAuth pergunte ao administrador se já existe um par de chaves para essa instalação do Friendica na sua instalação favorita do StatusNet."; +App::$strings["OAuth Consumer Key"] = "Chave de consumidor OAuth"; +App::$strings["OAuth Consumer Secret"] = "Segredo de consumidor OAuth"; +App::$strings["Base API Path (remember the trailing /)"] = "Caminho base da API (lembre-se da / final)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Para conectar à sua conta StatusNet, clique no botão abaixo para obter um código de segurança do StatusNet, o qual você deve copiar na caixa de texto abaixo e clicar no botão para enviar o formulário. Somente suas publicações públicas serão enviadas para o StatusNet."; +App::$strings["Log in with StatusNet"] = "Autenticar-se no StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Copie o código de segurança do StatusNet aqui"; +App::$strings["Cancel Connection Process"] = "Cancelar o processo de conexão"; +App::$strings["Current StatusNet API is"] = "A API atual do StatusNet é"; +App::$strings["Cancel StatusNet Connection"] = "Cancelar a conexão com o StatusNet"; +App::$strings["Currently connected to: "] = "Atualmente conectado como: "; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se habilitado, todas as suas publicações públicas podem ser publicadas na sua conta StatusNet associada. Você pode escolher entre publicar tudo automaticamente (marcando aqui) ou selecionar o que será enviado individualmente (nas opções de publicação, durante o processo de escrita da mensagem)."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Aviso: Devido às suas configurações de privacidade (Ocultar os detalhes do seu perfil para pessoas desconhecidas?) o link potencialmente incluído nas publicações públicas encaminhadas para o StatusNet levarão o visitante a uma página contendo a informação de que o acesso ao seu perfil é restrito."; +App::$strings["Allow posting to StatusNet"] = "Permitir a publicação no StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Enviar as publicações públicas para o StatusNet por padrão"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = ""; +App::$strings["Clear OAuth configuration"] = "Limpar a configuração OAuth"; +App::$strings["Site name"] = "Nome do site"; +App::$strings["API URL"] = "URL da API"; +App::$strings["Consumer Secret"] = "Segredo do consumidor"; +App::$strings["Consumer Key"] = "Chave do consumidor"; diff --git a/sources/addons/statusnet/lang/ru/strings.php b/sources/addons/statusnet/lang/ru/strings.php index 810d2583..21726dba 100644 --- a/sources/addons/statusnet/lang/ru/strings.php +++ b/sources/addons/statusnet/lang/ru/strings.php @@ -1,32 +1,32 @@ strings["Post to StatusNet"] = "Отправить на StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Пожалуйста, обратитесь к администратору сайта.
Предложенный URL API недействителен."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Мы не смогли связаться с API StatusNet с маршрутом, который вы ввели."; -$a->strings["StatusNet settings updated."] = "Настройки StatusNet обновлены."; -$a->strings["StatusNet Posting Settings"] = "Настройка отправки сообщений на StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "Глобально доступные StatusNet OAuthKeys"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Доступны предварительно сконфигурированные OAuth пары ключей для некоторых серверов StatusNet. Если вы используете один из них, пожалуйста, используйте эти учетные данные. Если нет, не стесняйтесь подключиться к любому другому экземпляру StatusNet (см. ниже)."; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["Provide your own OAuth Credentials"] = "Укажите свои собственные полномочия OAuth"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; -$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; -$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; -$a->strings["Base API Path (remember the trailing /)"] = "Путь базы API (помните о слеше /)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Чтобы подключиться к StatusNet аккаунту, нажмите на кнопку ниже, чтобы получить код безопасности от StatusNet, который нужно скопировать в поле ввода ниже, и отправить форму. Только ваши публичные сообщения будут отправляться на StatusNet."; -$a->strings["Log in with StatusNet"] = "Войдите со StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Скопируйте код безопасности от StatusNet здесь"; -$a->strings["Cancel Connection Process"] = "Отмена процесса подключения"; -$a->strings["Current StatusNet API is"] = "Текущим StatusNet API является"; -$a->strings["Cancel StatusNet Connection"] = "Отмена StatusNet подключения"; -$a->strings["Currently connected to: "] = "В настоящее время соединены с: "; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Если включено, то все ваши общественные сообщения могут быть отправлены на соответствующий аккаунт StatusNet. Вы можете сделать это по умолчанию (здесь) или для каждого сообщения отдельно при написании записи."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to StatusNet"] = "Разрешить отправку на StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Отправлять публичные сообщения на StatusNet по умолчанию"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = ""; -$a->strings["Clear OAuth configuration"] = "Очистить конфигурацию OAuth"; -$a->strings["Site name"] = "Название сайта"; -$a->strings["API URL"] = "API URL"; -$a->strings["Consumer Secret"] = "Consumer Secret"; -$a->strings["Consumer Key"] = "Consumer Key"; +App::$strings["Post to StatusNet"] = "Отправить на StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Пожалуйста, обратитесь к администратору сайта.
Предложенный URL API недействителен."; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "Мы не смогли связаться с API StatusNet с маршрутом, который вы ввели."; +App::$strings["StatusNet settings updated."] = "Настройки StatusNet обновлены."; +App::$strings["StatusNet Posting Settings"] = "Настройка отправки сообщений на StatusNet"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "Глобально доступные StatusNet OAuthKeys"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Доступны предварительно сконфигурированные OAuth пары ключей для некоторых серверов StatusNet. Если вы используете один из них, пожалуйста, используйте эти учетные данные. Если нет, не стесняйтесь подключиться к любому другому экземпляру StatusNet (см. ниже)."; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["Provide your own OAuth Credentials"] = "Укажите свои собственные полномочия OAuth"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; +App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; +App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; +App::$strings["Base API Path (remember the trailing /)"] = "Путь базы API (помните о слеше /)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Чтобы подключиться к StatusNet аккаунту, нажмите на кнопку ниже, чтобы получить код безопасности от StatusNet, который нужно скопировать в поле ввода ниже, и отправить форму. Только ваши публичные сообщения будут отправляться на StatusNet."; +App::$strings["Log in with StatusNet"] = "Войдите со StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Скопируйте код безопасности от StatusNet здесь"; +App::$strings["Cancel Connection Process"] = "Отмена процесса подключения"; +App::$strings["Current StatusNet API is"] = "Текущим StatusNet API является"; +App::$strings["Cancel StatusNet Connection"] = "Отмена StatusNet подключения"; +App::$strings["Currently connected to: "] = "В настоящее время соединены с: "; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Если включено, то все ваши общественные сообщения могут быть отправлены на соответствующий аккаунт StatusNet. Вы можете сделать это по умолчанию (здесь) или для каждого сообщения отдельно при написании записи."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to StatusNet"] = "Разрешить отправку на StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "Отправлять публичные сообщения на StatusNet по умолчанию"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = ""; +App::$strings["Clear OAuth configuration"] = "Очистить конфигурацию OAuth"; +App::$strings["Site name"] = "Название сайта"; +App::$strings["API URL"] = "API URL"; +App::$strings["Consumer Secret"] = "Consumer Secret"; +App::$strings["Consumer Key"] = "Consumer Key"; diff --git a/sources/addons/statusnet/lang/sv/strings.php b/sources/addons/statusnet/lang/sv/strings.php index 9b3fac7f..74f2bc27 100644 --- a/sources/addons/statusnet/lang/sv/strings.php +++ b/sources/addons/statusnet/lang/sv/strings.php @@ -1,14 +1,14 @@ strings["Post to StatusNet"] = "Lägg in på StatusNet"; -$a->strings["StatusNet Posting Settings"] = "Inställningar för inlägg på StatusNet"; -$a->strings["Submit"] = "Spara"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."; -$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; -$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; -$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (remember the trailing /)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."; -$a->strings["Log in with StatusNet"] = "Logga in med StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Ange säkerhetskoden från StatusNet här"; -$a->strings["Currently connected to: "] = "Ansluten till: "; -$a->strings["Clear OAuth configuration"] = "Clear OAuth configuration"; +App::$strings["Post to StatusNet"] = "Lägg in på StatusNet"; +App::$strings["StatusNet Posting Settings"] = "Inställningar för inlägg på StatusNet"; +App::$strings["Submit"] = "Spara"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."; +App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; +App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; +App::$strings["Base API Path (remember the trailing /)"] = "Base API Path (remember the trailing /)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."; +App::$strings["Log in with StatusNet"] = "Logga in med StatusNet"; +App::$strings["Copy the security code from StatusNet here"] = "Ange säkerhetskoden från StatusNet här"; +App::$strings["Currently connected to: "] = "Ansluten till: "; +App::$strings["Clear OAuth configuration"] = "Clear OAuth configuration"; diff --git a/sources/addons/statusnet/lang/zh-cn/strings.php b/sources/addons/statusnet/lang/zh-cn/strings.php index 3c7b76d4..ec5835f9 100644 --- a/sources/addons/statusnet/lang/zh-cn/strings.php +++ b/sources/addons/statusnet/lang/zh-cn/strings.php @@ -1,34 +1,34 @@ strings["Post to StatusNet"] = "发送到StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "请联系您的网站行政人员。
提供的API URL无效。"; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "我们不能联系StatusNet API在您输入的路径。"; -$a->strings["StatusNet settings updated."] = "StatusNet设置更新了。"; -$a->strings["StatusNet Posting Settings"] = "StatusNet发送设置"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "综合可用的StatusNet OAuthKeys"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "有已经装配的OAuth钥匙双于有的StatusNet服务器可用。如果您用那些之一，请用那个。否则随便连接任何别的StatusNet（看下）。"; -$a->strings["Submit"] = "提交"; -$a->strings["Provide your own OAuth Credentials"] = "提供您自己的OAuth证件"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户，粘贴「consumer key」双这儿和输入API基础根。
您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。"; -$a->strings["OAuth Consumer Key"] = "Oauth消费者钥匙"; -$a->strings["OAuth Consumer Secret"] = "Oauth消费者密码"; -$a->strings["Base API Path (remember the trailing /)"] = "基础API地址(注意最后的／)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "为连接您的StatusNet账户点击下按钮得到安全密码从StatusNet您要在输入在下个栏和提交表单。只您的公开文章被送到StatusNet。"; -$a->strings["Log in with StatusNet"] = "用StatusNet登记"; -$a->strings["Copy the security code from StatusNet here"] = "复制安全密码从StatusNet这儿"; -$a->strings["Cancel Connection Process"] = "注销连接过程 "; -$a->strings["Current StatusNet API is"] = "现在StatusNet API是"; -$a->strings["Cancel StatusNet Connection"] = "注销StatusNet连接"; -$a->strings["Currently connected to: "] = "现在连接到："; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您公开的文章会被发送到有关的StatusNet账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。"; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "注意: 由于您的隐私设置(隐藏您的简介内容为生看者？)超链接可能包括在公文章转播到StatusNets会带领来客到空白页讲他看您的简介被限制。"; -$a->strings["Allow posting to StatusNet"] = "许放在StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "默认发送公开文章在StatusNet"; -$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "复制所有文章从statusnet除了回答或重复的通知以外"; -$a->strings["Shortening method that optimizes the post"] = "缩短方法优化文章"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "转播连接的#标签盒@名到StatusNet"; -$a->strings["Clear OAuth configuration"] = "清理出OAuth设置"; -$a->strings["Site name"] = "网页名字"; -$a->strings["API URL"] = "API URL"; -$a->strings["Consumer Secret"] = "密码(Consumer Secret)"; -$a->strings["Consumer Key"] = "钥匙(Consumer Key)"; +App::$strings["Post to StatusNet"] = "发送到StatusNet"; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "请联系您的网站行政人员。
提供的API URL无效。"; +App::$strings["We could not contact the StatusNet API with the Path you entered."] = "我们不能联系StatusNet API在您输入的路径。"; +App::$strings["StatusNet settings updated."] = "StatusNet设置更新了。"; +App::$strings["StatusNet Posting Settings"] = "StatusNet发送设置"; +App::$strings["Globally Available StatusNet OAuthKeys"] = "综合可用的StatusNet OAuthKeys"; +App::$strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "有已经装配的OAuth钥匙双于有的StatusNet服务器可用。如果您用那些之一，请用那个。否则随便连接任何别的StatusNet（看下）。"; +App::$strings["Submit"] = "提交"; +App::$strings["Provide your own OAuth Credentials"] = "提供您自己的OAuth证件"; +App::$strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户，粘贴「consumer key」双这儿和输入API基础根。
您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。"; +App::$strings["OAuth Consumer Key"] = "Oauth消费者钥匙"; +App::$strings["OAuth Consumer Secret"] = "Oauth消费者密码"; +App::$strings["Base API Path (remember the trailing /)"] = "基础API地址(注意最后的／)"; +App::$strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "为连接您的StatusNet账户点击下按钮得到安全密码从StatusNet您要在输入在下个栏和提交表单。只您的公开文章被送到StatusNet。"; +App::$strings["Log in with StatusNet"] = "用StatusNet登记"; +App::$strings["Copy the security code from StatusNet here"] = "复制安全密码从StatusNet这儿"; +App::$strings["Cancel Connection Process"] = "注销连接过程 "; +App::$strings["Current StatusNet API is"] = "现在StatusNet API是"; +App::$strings["Cancel StatusNet Connection"] = "注销StatusNet连接"; +App::$strings["Currently connected to: "] = "现在连接到："; +App::$strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您公开的文章会被发送到有关的StatusNet账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。"; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "注意: 由于您的隐私设置(隐藏您的简介内容为生看者？)超链接可能包括在公文章转播到StatusNets会带领来客到空白页讲他看您的简介被限制。"; +App::$strings["Allow posting to StatusNet"] = "许放在StatusNet"; +App::$strings["Send public postings to StatusNet by default"] = "默认发送公开文章在StatusNet"; +App::$strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "复制所有文章从statusnet除了回答或重复的通知以外"; +App::$strings["Shortening method that optimizes the post"] = "缩短方法优化文章"; +App::$strings["Send linked #-tags and @-names to StatusNet"] = "转播连接的#标签盒@名到StatusNet"; +App::$strings["Clear OAuth configuration"] = "清理出OAuth设置"; +App::$strings["Site name"] = "网页名字"; +App::$strings["API URL"] = "API URL"; +App::$strings["Consumer Secret"] = "密码(Consumer Secret)"; +App::$strings["Consumer Key"] = "钥匙(Consumer Key)"; diff --git a/sources/addons/statusnet/statusnet.php b/sources/addons/statusnet/statusnet.php index d1d0c7d2..073bed84 100755 --- a/sources/addons/statusnet/statusnet.php +++ b/sources/addons/statusnet/statusnet.php @@ -196,7 +196,7 @@ function statusnet_settings_post ($a,$post) { } } } - goaway($a->get_baseurl().'/settings/featured'); + goaway(z_root().'/settings/featured'); } else { @@ -232,7 +232,7 @@ function statusnet_settings_post ($a,$post) { notice( t('We could not contact the GNU social API with the Path you entered.').EOL ); } } - goaway($a->get_baseurl().'/settings/featured'); + goaway(z_root().'/settings/featured'); } else { @@ -253,7 +253,7 @@ function statusnet_settings_post ($a,$post) { set_pconfig(local_channel(),'statusnet', 'post', 1); set_pconfig(local_channel(),'statusnet', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Bug #42 - goaway($a->get_baseurl().'/settings/featured'); + goaway(z_root().'/settings/featured'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting @@ -274,7 +274,7 @@ function statusnet_settings(&$a,&$s) { if(! local_channel()) return; - $a->page['htmlhead'] .= '' . "\r\n"; + App::$page['htmlhead'] .= '' . "\r\n"; /*** * 1) Check that we have a base api url and a consumer key & secret @@ -401,7 +401,7 @@ function statusnet_settings(&$a,&$s) { $sc .= '

'. t('Currently connected to: ') .''.$details->screen_name.'
'.$details->description.'

'; $sc .= '
'; - if ($a->user['hidewall']) { + if (App::$user['hidewall']) { $sc .= '
'; $sc .= t('Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'); $sc .= '
'; @@ -947,7 +947,7 @@ function statusnet_fetchtimeline($a, $uid) { if ($application_name == "") $application_name = get_config('statusnet', 'application_name'); if ($application_name == "") - $application_name = $a->get_hostname(); + $application_name = App::get_hostname(); $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret); diff --git a/sources/addons/superblock/lang/ca/strings.php b/sources/addons/superblock/lang/ca/strings.php index 22d74ed3..94498452 100644 --- a/sources/addons/superblock/lang/ca/strings.php +++ b/sources/addons/superblock/lang/ca/strings.php @@ -5,9 +5,9 @@ function string_plural_select_ca($n){ return ($n != 1);; }} ; -$a->strings["\"Superblock\" Settings"] = "Configuració de \"Superblock\""; -$a->strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes"; -$a->strings["Submit"] = "Enviar"; -$a->strings["SUPERBLOCK Settings saved."] = "Guardada la configuració de SUPERBLOCK."; -$a->strings["Block Completely"] = "Bloquejar completament"; -$a->strings["superblock settings updated"] = "Actualitzar la configuració de Superblock"; +App::$strings["\"Superblock\" Settings"] = "Configuració de \"Superblock\""; +App::$strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes"; +App::$strings["Submit"] = "Enviar"; +App::$strings["SUPERBLOCK Settings saved."] = "Guardada la configuració de SUPERBLOCK."; +App::$strings["Block Completely"] = "Bloquejar completament"; +App::$strings["superblock settings updated"] = "Actualitzar la configuració de Superblock"; diff --git a/sources/addons/superblock/lang/de/strings.php b/sources/addons/superblock/lang/de/strings.php index 34a573f0..b609c5fb 100644 --- a/sources/addons/superblock/lang/de/strings.php +++ b/sources/addons/superblock/lang/de/strings.php @@ -5,9 +5,9 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["\"Superblock\" Settings"] = "\"Superblock\" Einstellungen"; -$a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die geblockt werden sollen (durch Kommas getrennt)"; -$a->strings["Submit"] = "Bestätigen"; -$a->strings["SUPERBLOCK Settings saved."] = "SUPERBLOCK Einstellungen gespeichert"; -$a->strings["Block Completely"] = "Komplett blockieren"; -$a->strings["superblock settings updated"] = "Superblock Einstellungen wurden aktualisiert"; +App::$strings["\"Superblock\" Settings"] = "\"Superblock\" Einstellungen"; +App::$strings["Comma separated profile URLS to block"] = "Profil-URLs, die geblockt werden sollen (durch Kommas getrennt)"; +App::$strings["Submit"] = "Bestätigen"; +App::$strings["SUPERBLOCK Settings saved."] = "SUPERBLOCK Einstellungen gespeichert"; +App::$strings["Block Completely"] = "Komplett blockieren"; +App::$strings["superblock settings updated"] = "Superblock Einstellungen wurden aktualisiert"; diff --git a/sources/addons/superblock/lang/es/strings.php b/sources/addons/superblock/lang/es/strings.php index f8e3c1ee..91769e47 100644 --- a/sources/addons/superblock/lang/es/strings.php +++ b/sources/addons/superblock/lang/es/strings.php @@ -5,9 +5,9 @@ function string_plural_select_es($n){ return ($n != 1);; }} ; -$a->strings["\"Superblock\" Settings"] = "Configuración de \"Superblock\""; -$a->strings["Comma separated profile URLS to block"] = "Direcciones separadas por coma de los perfiles a bloquear"; -$a->strings["Submit"] = "Envíar"; -$a->strings["SUPERBLOCK Settings saved."] = "Configuracion Superblock guardada."; -$a->strings["Block Completely"] = "Bloquear completamente"; -$a->strings["superblock settings updated"] = "Configuración de Superblock actualizada"; +App::$strings["\"Superblock\" Settings"] = "Configuración de \"Superblock\""; +App::$strings["Comma separated profile URLS to block"] = "Direcciones separadas por coma de los perfiles a bloquear"; +App::$strings["Submit"] = "Envíar"; +App::$strings["SUPERBLOCK Settings saved."] = "Configuracion Superblock guardada."; +App::$strings["Block Completely"] = "Bloquear completamente"; +App::$strings["superblock settings updated"] = "Configuración de Superblock actualizada"; diff --git a/sources/addons/superblock/lang/fr/strings.php b/sources/addons/superblock/lang/fr/strings.php index 9c6633f4..efd0beb6 100644 --- a/sources/addons/superblock/lang/fr/strings.php +++ b/sources/addons/superblock/lang/fr/strings.php @@ -5,10 +5,10 @@ function string_plural_select_fr($n){ return ($n != 1);; }} ; -$a->strings["\"Superblock\" Settings"] = "Réglages de Superblock"; -$a->strings["Comma separated profile URLS to block"] = "Liste d'URLS de profils à bloquer, séparés par des virgules"; -$a->strings["Submit"] = "Envoyer"; -$a->strings["SUPERBLOCK Settings saved."] = "Réglages Superblock sauvés."; -$a->strings["Block Completely"] = "Bloquer complètement"; -$a->strings["superblock settings updated"] = "Réglages Superblock sauvés"; +App::$strings["\"Superblock\" Settings"] = "Réglages de Superblock"; +App::$strings["Comma separated profile URLS to block"] = "Liste d'URLS de profils à bloquer, séparés par des virgules"; +App::$strings["Submit"] = "Envoyer"; +App::$strings["SUPERBLOCK Settings saved."] = "Réglages Superblock sauvés."; +App::$strings["Block Completely"] = "Bloquer complètement"; +App::$strings["superblock settings updated"] = "Réglages Superblock sauvés"; diff --git a/sources/addons/superblock/lang/it/strings.php b/sources/addons/superblock/lang/it/strings.php index f713c5e0..45b86754 100644 --- a/sources/addons/superblock/lang/it/strings.php +++ b/sources/addons/superblock/lang/it/strings.php @@ -5,10 +5,10 @@ function string_plural_select_it($n){ return ($n != 1);; }} ; -$a->strings["\"Superblock\" Settings"] = "Impostazioni \"Superblock\""; -$a->strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi di profili da bloccare"; -$a->strings["Submit"] = "Invia"; -$a->strings["SUPERBLOCK Settings saved."] = "Impostazioni \"Superblock\" salvate."; -$a->strings["Block Completely"] = "Completamente blocca"; -$a->strings["Superblock settings updated"] = "Impostazioni 'Superblock' aggiornate."; +App::$strings["\"Superblock\" Settings"] = "Impostazioni \"Superblock\""; +App::$strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi di profili da bloccare"; +App::$strings["Submit"] = "Invia"; +App::$strings["SUPERBLOCK Settings saved."] = "Impostazioni \"Superblock\" salvate."; +App::$strings["Block Completely"] = "Completamente blocca"; +App::$strings["Superblock settings updated"] = "Impostazioni 'Superblock' aggiornate."; diff --git a/sources/addons/superblock/lang/nl/strings.php b/sources/addons/superblock/lang/nl/strings.php index d9c8af0f..56869305 100644 --- a/sources/addons/superblock/lang/nl/strings.php +++ b/sources/addons/superblock/lang/nl/strings.php @@ -5,10 +5,10 @@ function string_plural_select_nl($n){ return ($n != 1);; }} ; -$a->strings["Comma separated profile URLS to block"] = "Door komma's gescheiden profiel-URL's die geblokkeerd moeten worden"; -$a->strings["\"Superblock\" Settings"] = "Superblock (kanalen volledig blokkeren)"; -$a->strings["Submit"] = "Opslaan"; -$a->strings["SUPERBLOCK Settings saved."] = "Superblock-instellingen opgeslagen."; -$a->strings["Block Completely"] = "Volledig blokkeren"; -$a->strings["superblock settings updated"] = "Superblock-instellingen bijgewerkt"; +App::$strings["Comma separated profile URLS to block"] = "Door komma's gescheiden profiel-URL's die geblokkeerd moeten worden"; +App::$strings["\"Superblock\" Settings"] = "Superblock (kanalen volledig blokkeren)"; +App::$strings["Submit"] = "Opslaan"; +App::$strings["SUPERBLOCK Settings saved."] = "Superblock-instellingen opgeslagen."; +App::$strings["Block Completely"] = "Volledig blokkeren"; +App::$strings["superblock settings updated"] = "Superblock-instellingen bijgewerkt"; diff --git a/sources/addons/superblock/lang/pt-br/strings.php b/sources/addons/superblock/lang/pt-br/strings.php index 657ad55d..27e928b8 100644 --- a/sources/addons/superblock/lang/pt-br/strings.php +++ b/sources/addons/superblock/lang/pt-br/strings.php @@ -5,10 +5,10 @@ function string_plural_select_pt_br($n){ return ($n != 1);; }} ; -$a->strings["\"Superblock\" Settings"] = "Configurações \"Superblock\""; -$a->strings["Comma separated profile URLS to block"] = "URLS de perfis separados por vírgulas a serem bloqueados"; -$a->strings["Submit"] = "Enviar"; -$a->strings["SUPERBLOCK Settings saved."] = "Configurações Superblock armazenadas."; -$a->strings["Block Completely"] = "Bloqueie completamente"; -$a->strings["superblock settings updated"] = "configurações Superblock atualizadas"; +App::$strings["\"Superblock\" Settings"] = "Configurações \"Superblock\""; +App::$strings["Comma separated profile URLS to block"] = "URLS de perfis separados por vírgulas a serem bloqueados"; +App::$strings["Submit"] = "Enviar"; +App::$strings["SUPERBLOCK Settings saved."] = "Configurações Superblock armazenadas."; +App::$strings["Block Completely"] = "Bloqueie completamente"; +App::$strings["superblock settings updated"] = "configurações Superblock atualizadas"; diff --git a/sources/addons/superblock/lang/ru/strings.php b/sources/addons/superblock/lang/ru/strings.php index 81bce2fa..27e46824 100644 --- a/sources/addons/superblock/lang/ru/strings.php +++ b/sources/addons/superblock/lang/ru/strings.php @@ -5,10 +5,10 @@ function string_plural_select_ru($n){ return ($n != 1);; }} ; -$a->strings["\"Superblock\" Settings"] = "\"Superblock\" настройки"; -$a->strings["Comma separated profile URLS to block"] = "URLS, которые заблокировать (список через запятую)"; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["SUPERBLOCK Settings saved."] = "Superblock-Настройки сохранены."; -$a->strings["Block Completely"] = "Полностью блокировать"; -$a->strings["superblock settings updated"] = "\"Superblock\" настройки обновлены"; +App::$strings["\"Superblock\" Settings"] = "\"Superblock\" настройки"; +App::$strings["Comma separated profile URLS to block"] = "URLS, которые заблокировать (список через запятую)"; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["SUPERBLOCK Settings saved."] = "Superblock-Настройки сохранены."; +App::$strings["Block Completely"] = "Полностью блокировать"; +App::$strings["superblock settings updated"] = "\"Superblock\" настройки обновлены"; diff --git a/sources/addons/superblock/superblock.php b/sources/addons/superblock/superblock.php index f6a1b6a7..9211d5b7 100644 --- a/sources/addons/superblock/superblock.php +++ b/sources/addons/superblock/superblock.php @@ -43,9 +43,9 @@ function superblock_addon_settings(&$a,&$s) { return; /* Add our stylesheet to the page so we can make our settings look nice */ - //if(! array_key_exists('htmlhead',$a->page)) - //$a->page['htmlhead'] = ''; - //$a->page['htmlhead'] .= '' . "\r\n"; + //if(! array_key_exists('htmlhead',App::$page)) + //App::$page['htmlhead'] = ''; + //App::$page['htmlhead'] .= '' . "\r\n"; $words = get_pconfig(local_channel(),'system','blocked'); if(! $words) @@ -159,13 +159,13 @@ function superblock_conversation_start(&$a,&$b) { $words = get_pconfig(local_channel(),'system','blocked'); if($words) { - $a->data['superblock'] = explode(',',$words); + App::$data['superblock'] = explode(',',$words); } - if(! array_key_exists('htmlhead',$a->page)) - $a->page['htmlhead'] = ''; + if(! array_key_exists('htmlhead',App::$page)) + App::$page['htmlhead'] = ''; - $a->page['htmlhead'] .= <<< EOT + App::$page['htmlhead'] .= <<< EOT ' . "\r\n"; - $content .= '' . "\r\n"; + $content = '' . "\r\n"; + $content .= '' . "\r\n"; $seen = explode(',',get_pconfig(local_channel(),'tour','seen')); diff --git a/sources/addons/twitter/lang/ca/strings.php b/sources/addons/twitter/lang/ca/strings.php index 203c9a1f..ba00146a 100644 --- a/sources/addons/twitter/lang/ca/strings.php +++ b/sources/addons/twitter/lang/ca/strings.php @@ -1,24 +1,24 @@ strings["Post to Twitter"] = "Publica-ho al Twitter"; -$a->strings["Twitter settings updated."] = "La configuració de Twitter actualitzada."; -$a->strings["Twitter Posting Settings"] = "Configuració d'Enviaments per a Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges públics es publicaran a Twitter."; -$a->strings["Log in with Twitter"] = "Accedeixi com en Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Copieu el codi PIN de Twitter aquí"; -$a->strings["Submit"] = "Enviar"; -$a->strings["Currently connected to: "] = "Actualment connectat a: "; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis públics poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: donada la seva configuració de privacitat ( Amaga els detalls del teu perfil dels espectadors desconeguts? ) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit."; -$a->strings["Allow posting to Twitter"] = "Permetre anunci a Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Enviar anuncis públics a Twitter per defecte"; -$a->strings["Mirror all posts from twitter that are no replies or retweets"] = ""; -$a->strings["Shortening method that optimizes the tweet"] = ""; -$a->strings["Send linked #-tags and @-names to Twitter"] = "Enviar enllaços #-etiquetes i @-noms a Twitter"; -$a->strings["Clear OAuth configuration"] = "Esborrar configuració de OAuth"; -$a->strings["Settings updated."] = "Ajustos actualitzats."; -$a->strings["Consumer key"] = "Consumer key"; -$a->strings["Consumer secret"] = "Consumer secret"; -$a->strings["Name of the Twitter Application"] = ""; -$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = ""; +App::$strings["Post to Twitter"] = "Publica-ho al Twitter"; +App::$strings["Twitter settings updated."] = "La configuració de Twitter actualitzada."; +App::$strings["Twitter Posting Settings"] = "Configuració d'Enviaments per a Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges públics es publicaran a Twitter."; +App::$strings["Log in with Twitter"] = "Accedeixi com en Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Copieu el codi PIN de Twitter aquí"; +App::$strings["Submit"] = "Enviar"; +App::$strings["Currently connected to: "] = "Actualment connectat a: "; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis públics poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: donada la seva configuració de privacitat ( Amaga els detalls del teu perfil dels espectadors desconeguts? ) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit."; +App::$strings["Allow posting to Twitter"] = "Permetre anunci a Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Enviar anuncis públics a Twitter per defecte"; +App::$strings["Mirror all posts from twitter that are no replies or retweets"] = ""; +App::$strings["Shortening method that optimizes the tweet"] = ""; +App::$strings["Send linked #-tags and @-names to Twitter"] = "Enviar enllaços #-etiquetes i @-noms a Twitter"; +App::$strings["Clear OAuth configuration"] = "Esborrar configuració de OAuth"; +App::$strings["Settings updated."] = "Ajustos actualitzats."; +App::$strings["Consumer key"] = "Consumer key"; +App::$strings["Consumer secret"] = "Consumer secret"; +App::$strings["Name of the Twitter Application"] = ""; +App::$strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = ""; diff --git a/sources/addons/twitter/lang/cs/strings.php b/sources/addons/twitter/lang/cs/strings.php index 1e4f927c..64e17b0e 100644 --- a/sources/addons/twitter/lang/cs/strings.php +++ b/sources/addons/twitter/lang/cs/strings.php @@ -1,21 +1,21 @@ strings["Post to Twitter"] = "Poslat příspěvek na Twitter"; -$a->strings["Twitter settings updated."] = "Nastavení Twitteru aktualizováno."; -$a->strings["Twitter Posting Settings"] = "Nastavení zasílání příspěvků na Twitter "; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Na této Friendica instanci je sice povolen Twitter plugin, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše veřejné příspěvky budou zaslány na Twitter."; -$a->strings["Log in with Twitter"] = "Přihlásit se s Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Zkopírujte sem PIN z Twitteru"; -$a->strings["Submit"] = "Odeslat"; -$a->strings["Currently connected to: "] = "V současné době připojen k:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše veřejné příspěvky mohou být zaslány na související Twitter účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Upozornění: Z důvodů Vašeho nastavení ochrany soukromí ( Skrýt Vaše profilové detaily před neznámými čtenáři?) +App::$strings["Post to Twitter"] = "Poslat příspěvek na Twitter"; +App::$strings["Twitter settings updated."] = "Nastavení Twitteru aktualizováno."; +App::$strings["Twitter Posting Settings"] = "Nastavení zasílání příspěvků na Twitter "; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Na této Friendica instanci je sice povolen Twitter plugin, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše veřejné příspěvky budou zaslány na Twitter."; +App::$strings["Log in with Twitter"] = "Přihlásit se s Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Zkopírujte sem PIN z Twitteru"; +App::$strings["Submit"] = "Odeslat"; +App::$strings["Currently connected to: "] = "V současné době připojen k:"; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše veřejné příspěvky mohou být zaslány na související Twitter účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Upozornění: Z důvodů Vašeho nastavení ochrany soukromí ( Skrýt Vaše profilové detaily před neznámými čtenáři?) odkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě Twitter přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen."; -$a->strings["Allow posting to Twitter"] = "Povolit odesílání na Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Defaultně zasílat veřejné komentáře na Twitter"; -$a->strings["Send linked #-tags and @-names to Twitter"] = "Poslat propojené #-tagy a @-jména na Twitter"; -$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth"; -$a->strings["Settings updated."] = "Nastavení aktualizováno."; -$a->strings["Consumer key"] = "Consumer key"; -$a->strings["Consumer secret"] = "Consumer secret"; +App::$strings["Allow posting to Twitter"] = "Povolit odesílání na Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Defaultně zasílat veřejné komentáře na Twitter"; +App::$strings["Send linked #-tags and @-names to Twitter"] = "Poslat propojené #-tagy a @-jména na Twitter"; +App::$strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth"; +App::$strings["Settings updated."] = "Nastavení aktualizováno."; +App::$strings["Consumer key"] = "Consumer key"; +App::$strings["Consumer secret"] = "Consumer secret"; diff --git a/sources/addons/twitter/lang/de/strings.php b/sources/addons/twitter/lang/de/strings.php index 29d0fde9..dada9fc8 100644 --- a/sources/addons/twitter/lang/de/strings.php +++ b/sources/addons/twitter/lang/de/strings.php @@ -1,24 +1,24 @@ strings["Post to Twitter"] = "Bei Twitter veröffentlichen"; -$a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert."; -$a->strings["Twitter Posting Settings"] = "Twitter-Beitragseinstellungen"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht."; -$a->strings["Log in with Twitter"] = "bei Twitter anmelden"; -$a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her"; -$a->strings["Submit"] = "Senden"; -$a->strings["Currently connected to: "] = "Momentan verbunden mit: "; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; -$a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; -$a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; -$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind"; -$a->strings["Shortening method that optimizes the tweet"] = "Kürzungsverfahren, das den Tweet optimiert"; -$a->strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter"; -$a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; -$a->strings["Settings updated."] = "Einstellungen aktualisiert."; -$a->strings["Consumer key"] = "Consumer Key"; -$a->strings["Consumer secret"] = "Consumer Secret"; -$a->strings["Name of the Twitter Application"] = "Name der Twitter Anwendung"; -$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "Setze dies um eine Spiegelung von ~friendica zu ~friendica zu vermeiden"; +App::$strings["Post to Twitter"] = "Bei Twitter veröffentlichen"; +App::$strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert."; +App::$strings["Twitter Posting Settings"] = "Twitter-Beitragseinstellungen"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht."; +App::$strings["Log in with Twitter"] = "bei Twitter anmelden"; +App::$strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her"; +App::$strings["Submit"] = "Senden"; +App::$strings["Currently connected to: "] = "Momentan verbunden mit: "; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; +App::$strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; +App::$strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; +App::$strings["Mirror all posts from twitter that are no replies or retweets"] = "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind"; +App::$strings["Shortening method that optimizes the tweet"] = "Kürzungsverfahren, das den Tweet optimiert"; +App::$strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter"; +App::$strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; +App::$strings["Settings updated."] = "Einstellungen aktualisiert."; +App::$strings["Consumer key"] = "Consumer Key"; +App::$strings["Consumer secret"] = "Consumer Secret"; +App::$strings["Name of the Twitter Application"] = "Name der Twitter Anwendung"; +App::$strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "Setze dies um eine Spiegelung von ~friendica zu ~friendica zu vermeiden"; diff --git a/sources/addons/twitter/lang/eo/strings.php b/sources/addons/twitter/lang/eo/strings.php index cce714e7..c7d47cc1 100644 --- a/sources/addons/twitter/lang/eo/strings.php +++ b/sources/addons/twitter/lang/eo/strings.php @@ -1,20 +1,20 @@ strings["Post to Twitter"] = "Afiŝi ĉe Twitter"; -$a->strings["Twitter settings updated."] = "Ĝisdatigis Twitter agordojn."; -$a->strings["Twitter Posting Settings"] = "Agordoj por afiŝi ĉe Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ne trovis klientajn ŝlosilojn por Twitter. Bonvolu kontakti vian retejan administranton."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Je ĉi tiu Friendica retejo, la Twitter kromprogramo jam estas ŝaltita, sed via konto anokoraŭ ne estas konektita kun via Twitter konto. Por fari tion, klaku la supran butonon por atingi nombrokodon de Twitter, kion vi kopiu en la supran eniga ĉelo, kaj sendu la formularon. Nur viaj publikaj afiŝoj estas plusendota al Twitter. "; -$a->strings["Log in with Twitter"] = "Ensaluti kun Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Alglui la PIN de Twitter ĉi tie"; -$a->strings["Submit"] = "Sendi"; -$a->strings["Currently connected to: "] = "Konektita al:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Kiam ŝaltita, ĉiuj publikaj afiŝoj de vi ankaŭ eblas esti afiŝota al la asociigita Twitter konto. Vi povas elekti ĝin defaŭlte (ĉi tie) au unuope por ĉiuj afiŝoj kiam vi skribos ilin."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Averto: Laŭ viaj privatecaj agordoj (Kaŝi viajn profilajn detalojn al nekonataj spektantoj?), la ligilo en publikaj afiŝoj plusendata al Twitter gvidas vizitontojn al malplena paĝo sciigante ilin ke atingo al via profilo estas lmitigita."; -$a->strings["Allow posting to Twitter"] = "Permesi afiŝojn al Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Defaŭlte sendi publikajn afiŝojn al Twitter"; -$a->strings["Send linked #-tags and @-names to Twitter"] = "Sendi ligitajn #-etikedojn kaj @-nomon al Twitter"; -$a->strings["Clear OAuth configuration"] = "Forviŝi OAuth agordojn"; -$a->strings["Settings updated."] = "Agordoj ĝisdatigita."; -$a->strings["Consumer key"] = "Ŝlosilo de Kliento"; -$a->strings["Consumer secret"] = "Sekreto de Kliento"; +App::$strings["Post to Twitter"] = "Afiŝi ĉe Twitter"; +App::$strings["Twitter settings updated."] = "Ĝisdatigis Twitter agordojn."; +App::$strings["Twitter Posting Settings"] = "Agordoj por afiŝi ĉe Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ne trovis klientajn ŝlosilojn por Twitter. Bonvolu kontakti vian retejan administranton."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Je ĉi tiu Friendica retejo, la Twitter kromprogramo jam estas ŝaltita, sed via konto anokoraŭ ne estas konektita kun via Twitter konto. Por fari tion, klaku la supran butonon por atingi nombrokodon de Twitter, kion vi kopiu en la supran eniga ĉelo, kaj sendu la formularon. Nur viaj publikaj afiŝoj estas plusendota al Twitter. "; +App::$strings["Log in with Twitter"] = "Ensaluti kun Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Alglui la PIN de Twitter ĉi tie"; +App::$strings["Submit"] = "Sendi"; +App::$strings["Currently connected to: "] = "Konektita al:"; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Kiam ŝaltita, ĉiuj publikaj afiŝoj de vi ankaŭ eblas esti afiŝota al la asociigita Twitter konto. Vi povas elekti ĝin defaŭlte (ĉi tie) au unuope por ĉiuj afiŝoj kiam vi skribos ilin."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Averto: Laŭ viaj privatecaj agordoj (Kaŝi viajn profilajn detalojn al nekonataj spektantoj?), la ligilo en publikaj afiŝoj plusendata al Twitter gvidas vizitontojn al malplena paĝo sciigante ilin ke atingo al via profilo estas lmitigita."; +App::$strings["Allow posting to Twitter"] = "Permesi afiŝojn al Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Defaŭlte sendi publikajn afiŝojn al Twitter"; +App::$strings["Send linked #-tags and @-names to Twitter"] = "Sendi ligitajn #-etikedojn kaj @-nomon al Twitter"; +App::$strings["Clear OAuth configuration"] = "Forviŝi OAuth agordojn"; +App::$strings["Settings updated."] = "Agordoj ĝisdatigita."; +App::$strings["Consumer key"] = "Ŝlosilo de Kliento"; +App::$strings["Consumer secret"] = "Sekreto de Kliento"; diff --git a/sources/addons/twitter/lang/es/strings.php b/sources/addons/twitter/lang/es/strings.php index 2169f393..51ff49c7 100644 --- a/sources/addons/twitter/lang/es/strings.php +++ b/sources/addons/twitter/lang/es/strings.php @@ -1,20 +1,20 @@ strings["Post to Twitter"] = "Publicar en Twitter"; -$a->strings["Twitter settings updated."] = "Actualización de la configuración de Twitter"; -$a->strings["Twitter Posting Settings"] = "Configuración de publicaciones en Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No se ha encontrado ningún par de claves para Twitter. Póngase en contacto con el administrador del sitio."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En esta instalación de Friendica el módulo de Twitter está activo pero aún no has conectado tu cuenta con la de Twitter. Para hacerlo, pulsa en el siguiente botón para obtener un PIN de Twitter, que deberás introducir en la casilla de abajo y enviar el formulario. Unicamente el contenido público que publiques será publicado en Twitter."; -$a->strings["Log in with Twitter"] = "Acceder con Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Copia el PIN de Twitter aquí"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Currently connected to: "] = "Actualmente conectado a:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si lo habilitas todas tus publicaciones públicas serán publicadas en la cuenta de Twitter asociada. Puedes elegir hacerlo por defecto (aquí) o individualmente para cada publicación usando las opciones cuando escribas."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a tus opciones de privacidad (¿Ocultar los detalles de tu perfil de espectadores desconocidos?) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a Twitter conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."; -$a->strings["Allow posting to Twitter"] = "Permitir publicar en Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Enviar publicaciones públicas a Twitter por defecto"; -$a->strings["Send linked #-tags and @-names to Twitter"] = "Enviar a Twitter las #-etiquetas y @-nombres"; -$a->strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth"; -$a->strings["Settings updated."] = "Configuración actualizada."; -$a->strings["Consumer key"] = "Clave del usuario"; -$a->strings["Consumer secret"] = "Secreto del usuario"; +App::$strings["Post to Twitter"] = "Publicar en Twitter"; +App::$strings["Twitter settings updated."] = "Actualización de la configuración de Twitter"; +App::$strings["Twitter Posting Settings"] = "Configuración de publicaciones en Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No se ha encontrado ningún par de claves para Twitter. Póngase en contacto con el administrador del sitio."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En esta instalación de Friendica el módulo de Twitter está activo pero aún no has conectado tu cuenta con la de Twitter. Para hacerlo, pulsa en el siguiente botón para obtener un PIN de Twitter, que deberás introducir en la casilla de abajo y enviar el formulario. Unicamente el contenido público que publiques será publicado en Twitter."; +App::$strings["Log in with Twitter"] = "Acceder con Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Copia el PIN de Twitter aquí"; +App::$strings["Submit"] = "Envíar"; +App::$strings["Currently connected to: "] = "Actualmente conectado a:"; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si lo habilitas todas tus publicaciones públicas serán publicadas en la cuenta de Twitter asociada. Puedes elegir hacerlo por defecto (aquí) o individualmente para cada publicación usando las opciones cuando escribas."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a tus opciones de privacidad (¿Ocultar los detalles de tu perfil de espectadores desconocidos?) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a Twitter conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."; +App::$strings["Allow posting to Twitter"] = "Permitir publicar en Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Enviar publicaciones públicas a Twitter por defecto"; +App::$strings["Send linked #-tags and @-names to Twitter"] = "Enviar a Twitter las #-etiquetas y @-nombres"; +App::$strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth"; +App::$strings["Settings updated."] = "Configuración actualizada."; +App::$strings["Consumer key"] = "Clave del usuario"; +App::$strings["Consumer secret"] = "Secreto del usuario"; diff --git a/sources/addons/twitter/lang/fr/strings.php b/sources/addons/twitter/lang/fr/strings.php index 46cb2970..79e86602 100644 --- a/sources/addons/twitter/lang/fr/strings.php +++ b/sources/addons/twitter/lang/fr/strings.php @@ -1,20 +1,20 @@ strings["Post to Twitter"] = "Poster sur Twitter"; -$a->strings["Twitter settings updated."] = "Réglages de Twitter mis-à-jour."; -$a->strings["Twitter Posting Settings"] = "Réglages du connecteur Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Pas de paire de clés pour Twitter. Merci de contacter l'administrateur du site."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Sur cette instance de Friendica, le connecteur Twitter a été activé, mais vous n'avez pas encore connecté votre compte local à votre compte Twitter. Pour ce faire, cliquer sur le bouton ci-dessous. Vous obtiendrez alors un 'PIN' de Twitter, que vous devrez copier dans le champ ci-dessous, puis soumettre le formulaire. Seuls vos messages publics seront transmis à Twitter."; -$a->strings["Log in with Twitter"] = "Se connecter à Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Copier le PIN de Twitter ici"; -$a->strings["Submit"] = "Envoyer"; -$a->strings["Currently connected to: "] = "Actuellement connecté à: "; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "En cas d'activation, toutes vos notices publiques seront transmises au compte Twitter associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Note: Du fait de vos réglages de vie privée (Cacher les détails de votre profil des visiteurs inconnus?), le lien potentiellement inclus dans les messages publics relayés vers Twitter conduira les visiteurs vers une page blanche les informant que leur accès à votre profil a été restreint."; -$a->strings["Allow posting to Twitter"] = "Autoriser la publication sur Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Envoyer les éléments publics sur Twitter par défaut"; -$a->strings["Send linked #-tags and @-names to Twitter"] = "Envoyer les liens vers les #-tags et les @-noms sur Twitter"; -$a->strings["Clear OAuth configuration"] = "Effacer la configuration OAuth"; -$a->strings["Settings updated."] = "Réglages mis à jour."; -$a->strings["Consumer key"] = "Clé utilisateur"; -$a->strings["Consumer secret"] = "Secret utilisateur"; +App::$strings["Post to Twitter"] = "Poster sur Twitter"; +App::$strings["Twitter settings updated."] = "Réglages de Twitter mis-à-jour."; +App::$strings["Twitter Posting Settings"] = "Réglages du connecteur Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Pas de paire de clés pour Twitter. Merci de contacter l'administrateur du site."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Sur cette instance de Friendica, le connecteur Twitter a été activé, mais vous n'avez pas encore connecté votre compte local à votre compte Twitter. Pour ce faire, cliquer sur le bouton ci-dessous. Vous obtiendrez alors un 'PIN' de Twitter, que vous devrez copier dans le champ ci-dessous, puis soumettre le formulaire. Seuls vos messages publics seront transmis à Twitter."; +App::$strings["Log in with Twitter"] = "Se connecter à Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Copier le PIN de Twitter ici"; +App::$strings["Submit"] = "Envoyer"; +App::$strings["Currently connected to: "] = "Actuellement connecté à: "; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "En cas d'activation, toutes vos notices publiques seront transmises au compte Twitter associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Note: Du fait de vos réglages de vie privée (Cacher les détails de votre profil des visiteurs inconnus?), le lien potentiellement inclus dans les messages publics relayés vers Twitter conduira les visiteurs vers une page blanche les informant que leur accès à votre profil a été restreint."; +App::$strings["Allow posting to Twitter"] = "Autoriser la publication sur Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Envoyer les éléments publics sur Twitter par défaut"; +App::$strings["Send linked #-tags and @-names to Twitter"] = "Envoyer les liens vers les #-tags et les @-noms sur Twitter"; +App::$strings["Clear OAuth configuration"] = "Effacer la configuration OAuth"; +App::$strings["Settings updated."] = "Réglages mis à jour."; +App::$strings["Consumer key"] = "Clé utilisateur"; +App::$strings["Consumer secret"] = "Secret utilisateur"; diff --git a/sources/addons/twitter/lang/is/strings.php b/sources/addons/twitter/lang/is/strings.php index edd7809b..bac4e25e 100644 --- a/sources/addons/twitter/lang/is/strings.php +++ b/sources/addons/twitter/lang/is/strings.php @@ -1,20 +1,20 @@ strings["Post to Twitter"] = "Senda færslu á Twitter"; -$a->strings["Twitter settings updated."] = "Stillingar Twitter uppfærðar."; -$a->strings["Twitter Posting Settings"] = "Twitter færslu stillingar"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ekkert notenda lykils par fyrir Twitter fundið. Hafðu samband við kerfisstjórann."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; -$a->strings["Log in with Twitter"] = "Innskrá með Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Afrita PIN frá Twitter hingað"; -$a->strings["Submit"] = "Senda inn"; -$a->strings["Currently connected to: "] = "Núna tengdur við:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Ef virkt þá geta allar opinberu stöðu meldingarnar þínar verið birtar á tengdri StatusNet síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to Twitter"] = "Leyfa færslum að flæða á Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Senda sjálfgefið opinberar færslur á Twitter"; -$a->strings["Send linked #-tags and @-names to Twitter"] = ""; -$a->strings["Clear OAuth configuration"] = "Hreinsa OAuth stillingar"; -$a->strings["Settings updated."] = "Stillingar uppfærðar"; -$a->strings["Consumer key"] = "Lykill neytanda"; -$a->strings["Consumer secret"] = "Leyndarmál neytanda"; +App::$strings["Post to Twitter"] = "Senda færslu á Twitter"; +App::$strings["Twitter settings updated."] = "Stillingar Twitter uppfærðar."; +App::$strings["Twitter Posting Settings"] = "Twitter færslu stillingar"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ekkert notenda lykils par fyrir Twitter fundið. Hafðu samband við kerfisstjórann."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; +App::$strings["Log in with Twitter"] = "Innskrá með Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Afrita PIN frá Twitter hingað"; +App::$strings["Submit"] = "Senda inn"; +App::$strings["Currently connected to: "] = "Núna tengdur við:"; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Ef virkt þá geta allar opinberu stöðu meldingarnar þínar verið birtar á tengdri StatusNet síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to Twitter"] = "Leyfa færslum að flæða á Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Senda sjálfgefið opinberar færslur á Twitter"; +App::$strings["Send linked #-tags and @-names to Twitter"] = ""; +App::$strings["Clear OAuth configuration"] = "Hreinsa OAuth stillingar"; +App::$strings["Settings updated."] = "Stillingar uppfærðar"; +App::$strings["Consumer key"] = "Lykill neytanda"; +App::$strings["Consumer secret"] = "Leyndarmál neytanda"; diff --git a/sources/addons/twitter/lang/it/strings.php b/sources/addons/twitter/lang/it/strings.php index a67a4c1d..16ca7d51 100644 --- a/sources/addons/twitter/lang/it/strings.php +++ b/sources/addons/twitter/lang/it/strings.php @@ -1,24 +1,24 @@ strings["Post to Twitter"] = "Invia a Twitter"; -$a->strings["Twitter settings updated."] = "Impostazioni di Twitter aggiornate."; -$a->strings["Twitter Posting Settings"] = "Impostazioni di invio a Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nessuna coppia di chiavi per Twitter trovata. Contatta l'amministratore del sito."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Il plugin Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter."; -$a->strings["Log in with Twitter"] = "Accedi con Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Copia il PIN da Twitter qui"; -$a->strings["Submit"] = "Invia"; -$a->strings["Currently connected to: "] = "Al momento connesso con:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi pubblici possono essere inviati all'account Twitter associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluse nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; -$a->strings["Allow posting to Twitter"] = "Permetti l'invio a Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Invia sempre i messaggi pubblici a Twitter"; -$a->strings["Mirror all posts from twitter that are no replies or retweets"] = ""; -$a->strings["Shortening method that optimizes the tweet"] = ""; -$a->strings["Send linked #-tags and @-names to Twitter"] = ""; -$a->strings["Clear OAuth configuration"] = "Rimuovi la configurazione OAuth"; -$a->strings["Settings updated."] = "Impostazioni aggiornate."; -$a->strings["Consumer key"] = "Consumer key"; -$a->strings["Consumer secret"] = "Consumer secret"; -$a->strings["Name of the Twitter Application"] = ""; -$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = ""; +App::$strings["Post to Twitter"] = "Invia a Twitter"; +App::$strings["Twitter settings updated."] = "Impostazioni di Twitter aggiornate."; +App::$strings["Twitter Posting Settings"] = "Impostazioni di invio a Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nessuna coppia di chiavi per Twitter trovata. Contatta l'amministratore del sito."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Il plugin Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter."; +App::$strings["Log in with Twitter"] = "Accedi con Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Copia il PIN da Twitter qui"; +App::$strings["Submit"] = "Invia"; +App::$strings["Currently connected to: "] = "Al momento connesso con:"; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi pubblici possono essere inviati all'account Twitter associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluse nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; +App::$strings["Allow posting to Twitter"] = "Permetti l'invio a Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Invia sempre i messaggi pubblici a Twitter"; +App::$strings["Mirror all posts from twitter that are no replies or retweets"] = ""; +App::$strings["Shortening method that optimizes the tweet"] = ""; +App::$strings["Send linked #-tags and @-names to Twitter"] = ""; +App::$strings["Clear OAuth configuration"] = "Rimuovi la configurazione OAuth"; +App::$strings["Settings updated."] = "Impostazioni aggiornate."; +App::$strings["Consumer key"] = "Consumer key"; +App::$strings["Consumer secret"] = "Consumer secret"; +App::$strings["Name of the Twitter Application"] = ""; +App::$strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = ""; diff --git a/sources/addons/twitter/lang/nb-no/strings.php b/sources/addons/twitter/lang/nb-no/strings.php index 00a0f111..83186d28 100644 --- a/sources/addons/twitter/lang/nb-no/strings.php +++ b/sources/addons/twitter/lang/nb-no/strings.php @@ -1,20 +1,20 @@ strings["Post to Twitter"] = "Post til Twitter"; -$a->strings["Twitter settings updated."] = "Twitter-innstilinger oppdatert."; -$a->strings["Twitter Posting Settings"] = "Innstillinger for posting til Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ingen \"consumer key pair\" for Twitter funnet. Vennligst kontakt stedets administrator."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Ved denne Friendica-forekomsten er Twitter-tillegget aktivert, men du har ennå ikke tilkoblet din konto til din Twitter-konto. For å gjøre det, klikk på knappen nedenfor for å få en PIN-kode fra Twitter som du må kopiere inn i feltet nedenfor og sende inn skjemaet. Bare dine offentlige innlegg vil bli lagt inn på Twitter. "; -$a->strings["Log in with Twitter"] = "Logg inn via Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Kopier PIN-kode fra Twitter hit"; -$a->strings["Submit"] = "Lagre"; -$a->strings["Currently connected to: "] = "For øyeblikket tilkoblet til:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Aktivering gjør at alle dine offentlige innlegg kan postes til den tilknyttede Twitter-kontoen. Du kan velge å gjøre dette som standard (her), eller for hvert enkelt innlegg separat i valgmulighetene for posting når du skriver et innlegg."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to Twitter"] = "Tillat posting til Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Send offentlige innlegg til Twitter som standard"; -$a->strings["Send linked #-tags and @-names to Twitter"] = ""; -$a->strings["Clear OAuth configuration"] = "Fjern OAuth-konfigurasjon"; -$a->strings["Settings updated."] = "Innstillinger oppdatert."; -$a->strings["Consumer key"] = "Consumer key"; -$a->strings["Consumer secret"] = "Consumer secret"; +App::$strings["Post to Twitter"] = "Post til Twitter"; +App::$strings["Twitter settings updated."] = "Twitter-innstilinger oppdatert."; +App::$strings["Twitter Posting Settings"] = "Innstillinger for posting til Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ingen \"consumer key pair\" for Twitter funnet. Vennligst kontakt stedets administrator."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Ved denne Friendica-forekomsten er Twitter-tillegget aktivert, men du har ennå ikke tilkoblet din konto til din Twitter-konto. For å gjøre det, klikk på knappen nedenfor for å få en PIN-kode fra Twitter som du må kopiere inn i feltet nedenfor og sende inn skjemaet. Bare dine offentlige innlegg vil bli lagt inn på Twitter. "; +App::$strings["Log in with Twitter"] = "Logg inn via Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Kopier PIN-kode fra Twitter hit"; +App::$strings["Submit"] = "Lagre"; +App::$strings["Currently connected to: "] = "For øyeblikket tilkoblet til:"; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Aktivering gjør at alle dine offentlige innlegg kan postes til den tilknyttede Twitter-kontoen. Du kan velge å gjøre dette som standard (her), eller for hvert enkelt innlegg separat i valgmulighetene for posting når du skriver et innlegg."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to Twitter"] = "Tillat posting til Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Send offentlige innlegg til Twitter som standard"; +App::$strings["Send linked #-tags and @-names to Twitter"] = ""; +App::$strings["Clear OAuth configuration"] = "Fjern OAuth-konfigurasjon"; +App::$strings["Settings updated."] = "Innstillinger oppdatert."; +App::$strings["Consumer key"] = "Consumer key"; +App::$strings["Consumer secret"] = "Consumer secret"; diff --git a/sources/addons/twitter/lang/nl/strings.php b/sources/addons/twitter/lang/nl/strings.php index 697027f2..42b50d95 100644 --- a/sources/addons/twitter/lang/nl/strings.php +++ b/sources/addons/twitter/lang/nl/strings.php @@ -1,23 +1,23 @@ strings["Post to Twitter"] = "Doorplaatsen naar Twitter"; -$a->strings["Twitter settings updated."] = "Twitter-instellingen bijgewerkt."; -$a->strings["Twitter Post Settings"] = "Twitter (berichten doorplaatsen)"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Geen consumerkeys voor Twitter gevonden. Neem contact op met jouw hubbeheerder."; -$a->strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "De Twitter-plugin is op deze Hubzilla-hub ingeschakeld, maar je hebt nog niet jouw Hubzilla-kanaal met jouw Twitter-account gekoppeld. Om dit te doen klik je op de knop hieronder om een PIN-code van Twitter te krijgen. Deze dien je te kopiëren en in het invoegveld beneden te plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen op Twitter worden geplaatst."; -$a->strings["Log in with Twitter"] = "Op Twitter inloggen"; -$a->strings["Copy the PIN from Twitter here"] = "Plak of type de PIN-code hier"; -$a->strings["Submit"] = "Opslaan"; -$a->strings["Currently connected to: "] = "Momenteel gekoppeld aan: "; -$a->strings["Allow posting to Twitter"] = "Berichten op Twitter plaatsen"; -$a->strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten op het gekoppelde Twitter-account worden geplaatst"; -$a->strings["No"] = "Nee"; -$a->strings["Yes"] = "Ja"; -$a->strings["Send public postings to Twitter by default"] = "Plaats berichten standaard op Twitter"; -$a->strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard op het gekoppelde Twitter-account geplaatst"; -$a->strings["Clear OAuth configuration"] = "OAuth-configuratie wissen"; -$a->strings["Settings updated."] = "Instellingen bijgewerkt."; -$a->strings["Submit Settings"] = "Instellingen opslaan"; -$a->strings["Consumer Key"] = "Consumerkey"; -$a->strings["Consumer Secret"] = "Consumersecret"; -$a->strings["Name of the Twitter Application"] = "Naam van Twitter-applicatie"; +App::$strings["Post to Twitter"] = "Doorplaatsen naar Twitter"; +App::$strings["Twitter settings updated."] = "Twitter-instellingen bijgewerkt."; +App::$strings["Twitter Post Settings"] = "Twitter (berichten doorplaatsen)"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Geen consumerkeys voor Twitter gevonden. Neem contact op met jouw hubbeheerder."; +App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "De Twitter-plugin is op deze Hubzilla-hub ingeschakeld, maar je hebt nog niet jouw Hubzilla-kanaal met jouw Twitter-account gekoppeld. Om dit te doen klik je op de knop hieronder om een PIN-code van Twitter te krijgen. Deze dien je te kopiëren en in het invoegveld beneden te plakken. Vervolgens klik je op Opslaan. Alleen jouw openbare berichten kunnen op Twitter worden geplaatst."; +App::$strings["Log in with Twitter"] = "Op Twitter inloggen"; +App::$strings["Copy the PIN from Twitter here"] = "Plak of type de PIN-code hier"; +App::$strings["Submit"] = "Opslaan"; +App::$strings["Currently connected to: "] = "Momenteel gekoppeld aan: "; +App::$strings["Allow posting to Twitter"] = "Berichten op Twitter plaatsen"; +App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wanneer dit is ingeschakeld kunnen jouw openbare berichten op het gekoppelde Twitter-account worden geplaatst"; +App::$strings["No"] = "Nee"; +App::$strings["Yes"] = "Ja"; +App::$strings["Send public postings to Twitter by default"] = "Plaats berichten standaard op Twitter"; +App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wanneer dit is ingeschakeld worden al jouw openbare berichten standaard op het gekoppelde Twitter-account geplaatst"; +App::$strings["Clear OAuth configuration"] = "OAuth-configuratie wissen"; +App::$strings["Settings updated."] = "Instellingen bijgewerkt."; +App::$strings["Submit Settings"] = "Instellingen opslaan"; +App::$strings["Consumer Key"] = "Consumerkey"; +App::$strings["Consumer Secret"] = "Consumersecret"; +App::$strings["Name of the Twitter Application"] = "Naam van Twitter-applicatie"; diff --git a/sources/addons/twitter/lang/pl/strings.php b/sources/addons/twitter/lang/pl/strings.php index 54d3acae..d4e0b86f 100644 --- a/sources/addons/twitter/lang/pl/strings.php +++ b/sources/addons/twitter/lang/pl/strings.php @@ -1,24 +1,24 @@ strings["Post to Twitter"] = "Post na Twitter"; -$a->strings["Twitter settings updated."] = "Zaktualizowano ustawienia Twittera."; -$a->strings["Twitter Posting Settings"] = "Ustawienia wpisów z Twittera"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nie znaleziono pary dla Twittera. Proszę skontaktować się z admininstratorem strony."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; -$a->strings["Log in with Twitter"] = "Zaloguj się przez Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Skopiuj tutaj PIN z Twittera"; -$a->strings["Submit"] = "Potwierdź"; -$a->strings["Currently connected to: "] = "Obecnie połączone z:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = ""; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to Twitter"] = "Zezwól na opublikowanie w serwisie Twitter"; -$a->strings["Send public postings to Twitter by default"] = ""; -$a->strings["Mirror all posts from twitter that are no replies or retweets"] = ""; -$a->strings["Shortening method that optimizes the tweet"] = ""; -$a->strings["Send linked #-tags and @-names to Twitter"] = ""; -$a->strings["Clear OAuth configuration"] = ""; -$a->strings["Settings updated."] = "Zaktualizowano ustawienia."; -$a->strings["Consumer key"] = "Klucz konsumenta"; -$a->strings["Consumer secret"] = "Sekret konsumenta"; -$a->strings["Name of the Twitter Application"] = ""; -$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = ""; +App::$strings["Post to Twitter"] = "Post na Twitter"; +App::$strings["Twitter settings updated."] = "Zaktualizowano ustawienia Twittera."; +App::$strings["Twitter Posting Settings"] = "Ustawienia wpisów z Twittera"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nie znaleziono pary dla Twittera. Proszę skontaktować się z admininstratorem strony."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; +App::$strings["Log in with Twitter"] = "Zaloguj się przez Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Skopiuj tutaj PIN z Twittera"; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["Currently connected to: "] = "Obecnie połączone z:"; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = ""; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to Twitter"] = "Zezwól na opublikowanie w serwisie Twitter"; +App::$strings["Send public postings to Twitter by default"] = ""; +App::$strings["Mirror all posts from twitter that are no replies or retweets"] = ""; +App::$strings["Shortening method that optimizes the tweet"] = ""; +App::$strings["Send linked #-tags and @-names to Twitter"] = ""; +App::$strings["Clear OAuth configuration"] = ""; +App::$strings["Settings updated."] = "Zaktualizowano ustawienia."; +App::$strings["Consumer key"] = "Klucz konsumenta"; +App::$strings["Consumer secret"] = "Sekret konsumenta"; +App::$strings["Name of the Twitter Application"] = ""; +App::$strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = ""; diff --git a/sources/addons/twitter/lang/pt-br/strings.php b/sources/addons/twitter/lang/pt-br/strings.php index 8ef9edeb..47597a47 100644 --- a/sources/addons/twitter/lang/pt-br/strings.php +++ b/sources/addons/twitter/lang/pt-br/strings.php @@ -1,20 +1,20 @@ strings["Post to Twitter"] = "Publicar no Twitter"; -$a->strings["Twitter settings updated."] = "As atualizações do Twitter foram atualizadas."; -$a->strings["Twitter Posting Settings"] = "Configurações de publicação no Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Não foi encontrado nenhum par de chaves de consumidor para o Twitter. Por favor, entre em contato com o administrador do site."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Nessa instância do Friendica o plugin Twitter foi habilitado mas você ainda não conectou sua conta à conta do Twitter. Para assim o fazer clique no botão abaixo para pegar o PIN do Twitter que você deverar copiar na caixa de entrada abaixo e enviar o formulário. Somente suas postagens públicas serão repostadas no Twitter."; -$a->strings["Log in with Twitter"] = "Autenticar-se no Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Copie o PIN do Twitter aqui"; -$a->strings["Submit"] = "Enviar"; -$a->strings["Currently connected to: "] = "Atualmente conectado como: "; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se habilitado, todas as suas publicações públicas podem ser publicadas na sua conta Twitter associada. Você pode escolher entre publicar tudo automaticamente (marcando aqui) ou selecionar o que será enviado individualmente (nas opções de publicação, durante o processo de escrita da mensagem)."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Aviso: Devido às suas configurações de privacidade (Ocultar os detalhes do seu perfil para pessoas desconhecidas?) o link potencialmente incluído nas publicações públicas encaminhadas para o Twitter levarão o visitante a uma página contendo a informação de que o acesso ao seu perfil é restrito."; -$a->strings["Allow posting to Twitter"] = "Permitir a publicação no Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Enviar as publicações públicas automaticamente para o Twitter"; -$a->strings["Send linked #-tags and @-names to Twitter"] = ""; -$a->strings["Clear OAuth configuration"] = "Limpar a configuração OAuth"; -$a->strings["Settings updated."] = "As configurações foram atualizadas."; -$a->strings["Consumer key"] = "Chave de consumidor"; -$a->strings["Consumer secret"] = "Segredo de consumidor"; +App::$strings["Post to Twitter"] = "Publicar no Twitter"; +App::$strings["Twitter settings updated."] = "As atualizações do Twitter foram atualizadas."; +App::$strings["Twitter Posting Settings"] = "Configurações de publicação no Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Não foi encontrado nenhum par de chaves de consumidor para o Twitter. Por favor, entre em contato com o administrador do site."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Nessa instância do Friendica o plugin Twitter foi habilitado mas você ainda não conectou sua conta à conta do Twitter. Para assim o fazer clique no botão abaixo para pegar o PIN do Twitter que você deverar copiar na caixa de entrada abaixo e enviar o formulário. Somente suas postagens públicas serão repostadas no Twitter."; +App::$strings["Log in with Twitter"] = "Autenticar-se no Twitter"; +App::$strings["Copy the PIN from Twitter here"] = "Copie o PIN do Twitter aqui"; +App::$strings["Submit"] = "Enviar"; +App::$strings["Currently connected to: "] = "Atualmente conectado como: "; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se habilitado, todas as suas publicações públicas podem ser publicadas na sua conta Twitter associada. Você pode escolher entre publicar tudo automaticamente (marcando aqui) ou selecionar o que será enviado individualmente (nas opções de publicação, durante o processo de escrita da mensagem)."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Aviso: Devido às suas configurações de privacidade (Ocultar os detalhes do seu perfil para pessoas desconhecidas?) o link potencialmente incluído nas publicações públicas encaminhadas para o Twitter levarão o visitante a uma página contendo a informação de que o acesso ao seu perfil é restrito."; +App::$strings["Allow posting to Twitter"] = "Permitir a publicação no Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Enviar as publicações públicas automaticamente para o Twitter"; +App::$strings["Send linked #-tags and @-names to Twitter"] = ""; +App::$strings["Clear OAuth configuration"] = "Limpar a configuração OAuth"; +App::$strings["Settings updated."] = "As configurações foram atualizadas."; +App::$strings["Consumer key"] = "Chave de consumidor"; +App::$strings["Consumer secret"] = "Segredo de consumidor"; diff --git a/sources/addons/twitter/lang/ru/strings.php b/sources/addons/twitter/lang/ru/strings.php index 98112c88..63deeb22 100644 --- a/sources/addons/twitter/lang/ru/strings.php +++ b/sources/addons/twitter/lang/ru/strings.php @@ -1,20 +1,20 @@ strings["Post to Twitter"] = "Отправить в Твиттер"; -$a->strings["Twitter settings updated."] = "Настройки Твиттера обновлены."; -$a->strings["Twitter Posting Settings"] = "Настройка отправки сообщений в Твиттер"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Не найдено пары потребительских ключей для Твиттера. Пожалуйста, обратитесь к администратору сайта."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; -$a->strings["Log in with Twitter"] = "Войдите с Твиттером"; -$a->strings["Copy the PIN from Twitter here"] = "Скопируйте PIN с Twitter здесь"; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["Currently connected to: "] = "В настоящее время соединены с: "; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Если включено, то все ваши общественные сообщения могут быть отправлены на связанный аккаунт Твиттер. Вы можете сделать это по умолчанию (здесь) или для каждого сообщения отдельно при написании записи."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; -$a->strings["Allow posting to Twitter"] = "Разрешить отправку сообщений на Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Отправлять сообщения для всех на Твиттер по умолчанию"; -$a->strings["Send linked #-tags and @-names to Twitter"] = ""; -$a->strings["Clear OAuth configuration"] = "Очистить конфигурацию OAuth"; -$a->strings["Settings updated."] = "Настройки обновлены."; -$a->strings["Consumer key"] = "Consumer key"; -$a->strings["Consumer secret"] = "Consumer secret"; +App::$strings["Post to Twitter"] = "Отправить в Твиттер"; +App::$strings["Twitter settings updated."] = "Настройки Твиттера обновлены."; +App::$strings["Twitter Posting Settings"] = "Настройка отправки сообщений в Твиттер"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Не найдено пары потребительских ключей для Твиттера. Пожалуйста, обратитесь к администратору сайта."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; +App::$strings["Log in with Twitter"] = "Войдите с Твиттером"; +App::$strings["Copy the PIN from Twitter here"] = "Скопируйте PIN с Twitter здесь"; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["Currently connected to: "] = "В настоящее время соединены с: "; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Если включено, то все ваши общественные сообщения могут быть отправлены на связанный аккаунт Твиттер. Вы можете сделать это по умолчанию (здесь) или для каждого сообщения отдельно при написании записи."; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; +App::$strings["Allow posting to Twitter"] = "Разрешить отправку сообщений на Twitter"; +App::$strings["Send public postings to Twitter by default"] = "Отправлять сообщения для всех на Твиттер по умолчанию"; +App::$strings["Send linked #-tags and @-names to Twitter"] = ""; +App::$strings["Clear OAuth configuration"] = "Очистить конфигурацию OAuth"; +App::$strings["Settings updated."] = "Настройки обновлены."; +App::$strings["Consumer key"] = "Consumer key"; +App::$strings["Consumer secret"] = "Consumer secret"; diff --git a/sources/addons/twitter/lang/sv/strings.php b/sources/addons/twitter/lang/sv/strings.php index 02cb3fdd..bafea65f 100644 --- a/sources/addons/twitter/lang/sv/strings.php +++ b/sources/addons/twitter/lang/sv/strings.php @@ -1,11 +1,11 @@ strings["Post to Twitter"] = "Lägg in på Twitter"; -$a->strings["Twitter Posting Settings"] = "Inställningar för inlägg på Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No consumer key pair for Twitter found. Please contact your site administrator."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."; -$a->strings["Copy the PIN from Twitter here"] = "Ange PIN-koden från Twitter här"; -$a->strings["Submit"] = "Spara"; -$a->strings["Currently connected to: "] = "Ansluten till: "; -$a->strings["Clear OAuth configuration"] = "Clear OAuth configuration"; -$a->strings["Settings updated."] = "Inställningarna har uppdaterats."; +App::$strings["Post to Twitter"] = "Lägg in på Twitter"; +App::$strings["Twitter Posting Settings"] = "Inställningar för inlägg på Twitter"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No consumer key pair for Twitter found. Please contact your site administrator."; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."; +App::$strings["Copy the PIN from Twitter here"] = "Ange PIN-koden från Twitter här"; +App::$strings["Submit"] = "Spara"; +App::$strings["Currently connected to: "] = "Ansluten till: "; +App::$strings["Clear OAuth configuration"] = "Clear OAuth configuration"; +App::$strings["Settings updated."] = "Inställningarna har uppdaterats."; diff --git a/sources/addons/twitter/lang/zh-cn/strings.php b/sources/addons/twitter/lang/zh-cn/strings.php index 9f8f7058..2144c582 100644 --- a/sources/addons/twitter/lang/zh-cn/strings.php +++ b/sources/addons/twitter/lang/zh-cn/strings.php @@ -1,24 +1,24 @@ strings["Post to Twitter"] = "发送到在Twitter"; -$a->strings["Twitter settings updated."] = "Twitter设置更新了。"; -$a->strings["Twitter Posting Settings"] = "Twitter发送设置"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的消费钥匙双。请联系您的网页行政人员。"; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的公开文章被发送到Twitter。"; -$a->strings["Log in with Twitter"] = "用Twitter登记"; -$a->strings["Copy the PIN from Twitter here"] = "复制Twitter密码这儿"; -$a->strings["Submit"] = "提交"; -$a->strings["Currently connected to: "] = "现在连接到："; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您公开的文章会被发送到有关的Twitter账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。"; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "注意：由于您的隐私设置（隐藏您的简介内容为生人？）环节包括在转播到Twitter的条文可能通空白页通知看者看您的简介有限。"; -$a->strings["Allow posting to Twitter"] = "允许发送到Twitter"; -$a->strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter"; -$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "复制所有文章从twitter除了回答或复准文以外"; -$a->strings["Shortening method that optimizes the tweet"] = "缩短方法优化缩短方法优化准文"; -$a->strings["Send linked #-tags and @-names to Twitter"] = "转播连接的#标签盒@名到Twitter"; -$a->strings["Clear OAuth configuration"] = "清理出OAuth设置"; -$a->strings["Settings updated."] = "设置跟新了"; -$a->strings["Consumer key"] = "钥匙(Consumer key)"; -$a->strings["Consumer secret"] = "密码(Consumer secret)"; -$a->strings["Name of the Twitter Application"] = "Twitter应用名"; -$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "选择这个为避免复制文章从~friendica回归~friendica"; +App::$strings["Post to Twitter"] = "发送到在Twitter"; +App::$strings["Twitter settings updated."] = "Twitter设置更新了。"; +App::$strings["Twitter Posting Settings"] = "Twitter发送设置"; +App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的消费钥匙双。请联系您的网页行政人员。"; +App::$strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的公开文章被发送到Twitter。"; +App::$strings["Log in with Twitter"] = "用Twitter登记"; +App::$strings["Copy the PIN from Twitter here"] = "复制Twitter密码这儿"; +App::$strings["Submit"] = "提交"; +App::$strings["Currently connected to: "] = "现在连接到："; +App::$strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您公开的文章会被发送到有关的Twitter账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。"; +App::$strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "注意：由于您的隐私设置（隐藏您的简介内容为生人？）环节包括在转播到Twitter的条文可能通空白页通知看者看您的简介有限。"; +App::$strings["Allow posting to Twitter"] = "允许发送到Twitter"; +App::$strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter"; +App::$strings["Mirror all posts from twitter that are no replies or retweets"] = "复制所有文章从twitter除了回答或复准文以外"; +App::$strings["Shortening method that optimizes the tweet"] = "缩短方法优化缩短方法优化准文"; +App::$strings["Send linked #-tags and @-names to Twitter"] = "转播连接的#标签盒@名到Twitter"; +App::$strings["Clear OAuth configuration"] = "清理出OAuth设置"; +App::$strings["Settings updated."] = "设置跟新了"; +App::$strings["Consumer key"] = "钥匙(Consumer key)"; +App::$strings["Consumer secret"] = "密码(Consumer secret)"; +App::$strings["Name of the Twitter Application"] = "Twitter应用名"; +App::$strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "选择这个为避免复制文章从~friendica回归~friendica"; diff --git a/sources/addons/twitter/twitter.php b/sources/addons/twitter/twitter.php index 32991192..581225b0 100755 --- a/sources/addons/twitter/twitter.php +++ b/sources/addons/twitter/twitter.php @@ -58,8 +58,8 @@ * Alternatively: (old way - may not work any more) * Add this key pair to your global .htconfig.php or use the admin panel. * - * $a->config['twitter']['consumerkey'] = 'your consumer_key here'; - * $a->config['twitter']['consumersecret'] = 'your consumer_secret here'; + * App::$config['twitter']['consumerkey'] = 'your consumer_key here'; + * App::$config['twitter']['consumersecret'] = 'your consumer_secret here'; * * Requirements: PHP5, curl [Slinky library] */ @@ -140,7 +140,7 @@ function twitter_settings_post ($a,$post) { set_pconfig(local_channel(),'twitter', 'post', 1); set_pconfig(local_channel(),'twitter', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Friendica Bug #42 - goaway($a->get_baseurl().'/settings/featured'); + goaway(z_root().'/settings/featured'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a tweet for every new __public__ posting to the wall @@ -157,7 +157,7 @@ function twitter_settings_post ($a,$post) { function twitter_settings(&$a,&$s) { if(! local_channel()) return; - $a->page['htmlhead'] .= '' . "\r\n"; + App::$page['htmlhead'] .= '' . "\r\n"; /*** * 1) Check that we have global consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some @@ -232,7 +232,7 @@ function twitter_settings(&$a,&$s) { $sc .= '

'. t('Currently connected to: ') .''.$details->screen_name.'
'.$details->description.'

'; $sc .= '
'; //FIXME no hidewall in Red - if ($a->user['hidewall']) { + if (App::$user['hidewall']) { $sc .= '
'; $sc .= t('Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'); $sc .= '
'; @@ -860,7 +860,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud $tags_arr = array(); foreach ($item->entities->hashtags AS $hashtag) { - $url = "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag->text)."]".$hashtag->text."[/url]"; + $url = "#[url=".z_root()."/search?tag=".rawurlencode($hashtag->text)."]".$hashtag->text."[/url]"; $tags_arr["#".$hashtag->text] = $url; $body = str_replace("#".$hashtag->text, $url, $body); } @@ -891,7 +891,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontinclud continue; $basetag = str_replace('_',' ',substr($tag,1)); - $url = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]'; + $url = '#[url='.z_root().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]'; $body = str_replace($tag,$url,$body); $tags_arr["#".$basetag] = $url; continue; diff --git a/sources/addons/wholikesme/wholikesme.php b/sources/addons/wholikesme/wholikesme.php index 42beefde..528c0775 100644 --- a/sources/addons/wholikesme/wholikesme.php +++ b/sources/addons/wholikesme/wholikesme.php @@ -17,7 +17,7 @@ function wholikesme_content(&$a) { if(! local_channel()) return; - $channel = $a->get_channel(); + $channel = App::get_channel(); $r = q("select count(mid) as total, author_xchan, xchan_name from item left join xchan on author_xchan = xchan_hash where uid = %d and verb = '%s' and owner_xchan = '%s' group by author_xchan order by total desc", intval(local_channel()), diff --git a/sources/addons/wppost/lang/ca/strings.php b/sources/addons/wppost/lang/ca/strings.php index 2856b55c..097f6136 100644 --- a/sources/addons/wppost/lang/ca/strings.php +++ b/sources/addons/wppost/lang/ca/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Publica-ho al Wordpress"; -$a->strings["WordPress Post Settings"] = "Configuració d'enviaments a WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Habilitar Configuració d'Enviaments a WordPress"; -$a->strings["WordPress username"] = "Nom d'usuari de WordPress"; -$a->strings["WordPress password"] = "Contrasenya de WordPress"; -$a->strings["WordPress API URL"] = "WordPress API URL"; -$a->strings["Post to WordPress by default"] = "Enviar a WordPress per defecte"; -$a->strings["Provide a backlink to the Friendica post"] = "Proveeix un retroenllaç al missatge de Friendica"; -$a->strings["Submit"] = "Enviar"; -$a->strings["Post from Friendica"] = "Enviament des de Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Llegeix el missatge original i el flux de comentaris en Friendica"; +App::$strings["Post to Wordpress"] = "Publica-ho al Wordpress"; +App::$strings["WordPress Post Settings"] = "Configuració d'enviaments a WordPress"; +App::$strings["Enable WordPress Post Plugin"] = "Habilitar Configuració d'Enviaments a WordPress"; +App::$strings["WordPress username"] = "Nom d'usuari de WordPress"; +App::$strings["WordPress password"] = "Contrasenya de WordPress"; +App::$strings["WordPress API URL"] = "WordPress API URL"; +App::$strings["Post to WordPress by default"] = "Enviar a WordPress per defecte"; +App::$strings["Provide a backlink to the Friendica post"] = "Proveeix un retroenllaç al missatge de Friendica"; +App::$strings["Submit"] = "Enviar"; +App::$strings["Post from Friendica"] = "Enviament des de Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "Llegeix el missatge original i el flux de comentaris en Friendica"; diff --git a/sources/addons/wppost/lang/cs/strings.php b/sources/addons/wppost/lang/cs/strings.php index 0fea0e0b..4a9ed0f6 100644 --- a/sources/addons/wppost/lang/cs/strings.php +++ b/sources/addons/wppost/lang/cs/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Příspěvky do WordPress"; -$a->strings["WordPress Post Settings"] = "WordPress Post nastavení"; -$a->strings["Enable WordPress Post Plugin"] = "Povolit rozšíření na WordPress"; -$a->strings["WordPress username"] = "WordPress uživatelské jméno"; -$a->strings["WordPress password"] = "WordPress heslo"; -$a->strings["WordPress API URL"] = "URL adresa API WordPress"; -$a->strings["Post to WordPress by default"] = "standardně posílat příspěvky na WordPress"; -$a->strings["Provide a backlink to the Friendica post"] = "Poskytuje zpětný link na Friendica příspěvek"; -$a->strings["Submit"] = "Odeslat"; -$a->strings["Post from Friendica"] = "Příspěvek z Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Přečíst si originální příspěvek a komentáře na Friendica"; +App::$strings["Post to Wordpress"] = "Příspěvky do WordPress"; +App::$strings["WordPress Post Settings"] = "WordPress Post nastavení"; +App::$strings["Enable WordPress Post Plugin"] = "Povolit rozšíření na WordPress"; +App::$strings["WordPress username"] = "WordPress uživatelské jméno"; +App::$strings["WordPress password"] = "WordPress heslo"; +App::$strings["WordPress API URL"] = "URL adresa API WordPress"; +App::$strings["Post to WordPress by default"] = "standardně posílat příspěvky na WordPress"; +App::$strings["Provide a backlink to the Friendica post"] = "Poskytuje zpětný link na Friendica příspěvek"; +App::$strings["Submit"] = "Odeslat"; +App::$strings["Post from Friendica"] = "Příspěvek z Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "Přečíst si originální příspěvek a komentáře na Friendica"; diff --git a/sources/addons/wppost/lang/de/strings.php b/sources/addons/wppost/lang/de/strings.php index 75f53382..1a616f77 100644 --- a/sources/addons/wppost/lang/de/strings.php +++ b/sources/addons/wppost/lang/de/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Bei WordPress veröffentlichen"; -$a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen"; -$a->strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren."; -$a->strings["WordPress username"] = "WordPress-Benutzername"; -$a->strings["WordPress password"] = "WordPress-Passwort"; -$a->strings["WordPress API URL"] = "WordPress-API-URL"; -$a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; -$a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen"; -$a->strings["Submit"] = "Senden"; -$a->strings["Post from Friendica"] = "Beitrag via Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Den Originalbeitrag samt Kommentaren bei Friendica lesen"; +App::$strings["Post to Wordpress"] = "Bei WordPress veröffentlichen"; +App::$strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen"; +App::$strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren."; +App::$strings["WordPress username"] = "WordPress-Benutzername"; +App::$strings["WordPress password"] = "WordPress-Passwort"; +App::$strings["WordPress API URL"] = "WordPress-API-URL"; +App::$strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; +App::$strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen"; +App::$strings["Submit"] = "Senden"; +App::$strings["Post from Friendica"] = "Beitrag via Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "Den Originalbeitrag samt Kommentaren bei Friendica lesen"; diff --git a/sources/addons/wppost/lang/eo/strings.php b/sources/addons/wppost/lang/eo/strings.php index 7c786666..0cd90e4b 100644 --- a/sources/addons/wppost/lang/eo/strings.php +++ b/sources/addons/wppost/lang/eo/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Afiŝi al Wordpress"; -$a->strings["WordPress Post Settings"] = "Agordoj por WordPress afiŝojn"; -$a->strings["Enable WordPress Post Plugin"] = "Ŝalti la Wordpress-afiŝo kromprogramon"; -$a->strings["WordPress username"] = "WordPress salutnomo"; -$a->strings["WordPress password"] = "WordPress pasvorto"; -$a->strings["WordPress API URL"] = "Wordpress API URL adreso"; -$a->strings["Post to WordPress by default"] = "Defaŭlte afiŝi al WordPress"; -$a->strings["Provide a backlink to the Friendica post"] = "Provizi re-ligilon al la Friendica afiŝo"; -$a->strings["Submit"] = "Sendi"; -$a->strings["Post from Friendica"] = "Afiŝo de Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Legi la originalan afiŝon kaj komentfluo ĉe Friendica"; +App::$strings["Post to Wordpress"] = "Afiŝi al Wordpress"; +App::$strings["WordPress Post Settings"] = "Agordoj por WordPress afiŝojn"; +App::$strings["Enable WordPress Post Plugin"] = "Ŝalti la Wordpress-afiŝo kromprogramon"; +App::$strings["WordPress username"] = "WordPress salutnomo"; +App::$strings["WordPress password"] = "WordPress pasvorto"; +App::$strings["WordPress API URL"] = "Wordpress API URL adreso"; +App::$strings["Post to WordPress by default"] = "Defaŭlte afiŝi al WordPress"; +App::$strings["Provide a backlink to the Friendica post"] = "Provizi re-ligilon al la Friendica afiŝo"; +App::$strings["Submit"] = "Sendi"; +App::$strings["Post from Friendica"] = "Afiŝo de Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "Legi la originalan afiŝon kaj komentfluo ĉe Friendica"; diff --git a/sources/addons/wppost/lang/es/strings.php b/sources/addons/wppost/lang/es/strings.php index 1e01a2f4..a4c56613 100644 --- a/sources/addons/wppost/lang/es/strings.php +++ b/sources/addons/wppost/lang/es/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Publicar en Wordpress"; -$a->strings["WordPress Post Settings"] = "Configuración de publicación en Wordpres"; -$a->strings["Enable WordPress Post Plugin"] = "Habilitar el módulo de publicación en Wordpress"; -$a->strings["WordPress username"] = "WordPress - nombre de usuario"; -$a->strings["WordPress password"] = "WordPress - contraseña"; -$a->strings["WordPress API URL"] = "WordPress - dirección API"; -$a->strings["Post to WordPress by default"] = "Publicar a WordPress por defecto"; -$a->strings["Provide a backlink to the Friendica post"] = "Añade un enlace de vuelta a la publicación de Friendica"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Post from Friendica"] = "Publicado desde Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Leer la publicación original y los comentarios en Friendica"; +App::$strings["Post to Wordpress"] = "Publicar en Wordpress"; +App::$strings["WordPress Post Settings"] = "Configuración de publicación en Wordpres"; +App::$strings["Enable WordPress Post Plugin"] = "Habilitar el módulo de publicación en Wordpress"; +App::$strings["WordPress username"] = "WordPress - nombre de usuario"; +App::$strings["WordPress password"] = "WordPress - contraseña"; +App::$strings["WordPress API URL"] = "WordPress - dirección API"; +App::$strings["Post to WordPress by default"] = "Publicar a WordPress por defecto"; +App::$strings["Provide a backlink to the Friendica post"] = "Añade un enlace de vuelta a la publicación de Friendica"; +App::$strings["Submit"] = "Envíar"; +App::$strings["Post from Friendica"] = "Publicado desde Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "Leer la publicación original y los comentarios en Friendica"; diff --git a/sources/addons/wppost/lang/fr/strings.php b/sources/addons/wppost/lang/fr/strings.php index 9cd4456f..709d98bd 100644 --- a/sources/addons/wppost/lang/fr/strings.php +++ b/sources/addons/wppost/lang/fr/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Poster sur WordPress"; -$a->strings["WordPress Post Settings"] = "Réglages WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Activer l'extension WordPress"; -$a->strings["WordPress username"] = "Utilisateur WordPress"; -$a->strings["WordPress password"] = "Mot de passe WordPress"; -$a->strings["WordPress API URL"] = "URL de l'API WordPress"; -$a->strings["Post to WordPress by default"] = "Publier sur WordPress par défaut"; -$a->strings["Provide a backlink to the Friendica post"] = "Fournir un rétrolien vers le message sur Friendica"; -$a->strings["Submit"] = "Envoyer"; -$a->strings["Post from Friendica"] = "Publier depuis Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Lire le message d'origine et le flux des commentaires sur Friendica"; +App::$strings["Post to Wordpress"] = "Poster sur WordPress"; +App::$strings["WordPress Post Settings"] = "Réglages WordPress"; +App::$strings["Enable WordPress Post Plugin"] = "Activer l'extension WordPress"; +App::$strings["WordPress username"] = "Utilisateur WordPress"; +App::$strings["WordPress password"] = "Mot de passe WordPress"; +App::$strings["WordPress API URL"] = "URL de l'API WordPress"; +App::$strings["Post to WordPress by default"] = "Publier sur WordPress par défaut"; +App::$strings["Provide a backlink to the Friendica post"] = "Fournir un rétrolien vers le message sur Friendica"; +App::$strings["Submit"] = "Envoyer"; +App::$strings["Post from Friendica"] = "Publier depuis Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "Lire le message d'origine et le flux des commentaires sur Friendica"; diff --git a/sources/addons/wppost/lang/is/strings.php b/sources/addons/wppost/lang/is/strings.php index 0b7f3fe7..b8e395bf 100644 --- a/sources/addons/wppost/lang/is/strings.php +++ b/sources/addons/wppost/lang/is/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Senda færslu á Wordpress"; -$a->strings["WordPress Post Settings"] = "Wordpress Post stillingar"; -$a->strings["Enable WordPress Post Plugin"] = "Kveikja á WordPress Post viðbót"; -$a->strings["WordPress username"] = "Wordpress aðgangsorð"; -$a->strings["WordPress password"] = "Wordpress aðgagnsorð"; -$a->strings["WordPress API URL"] = "Slóð á Wordpress API"; -$a->strings["Post to WordPress by default"] = "Leyfa færslum að flæða yfir á Wordpress sjálfgefið"; -$a->strings["Provide a backlink to the Friendica post"] = ""; -$a->strings["Submit"] = "Senda inn"; -$a->strings["Post from Friendica"] = "Færslur frá Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = ""; +App::$strings["Post to Wordpress"] = "Senda færslu á Wordpress"; +App::$strings["WordPress Post Settings"] = "Wordpress Post stillingar"; +App::$strings["Enable WordPress Post Plugin"] = "Kveikja á WordPress Post viðbót"; +App::$strings["WordPress username"] = "Wordpress aðgangsorð"; +App::$strings["WordPress password"] = "Wordpress aðgagnsorð"; +App::$strings["WordPress API URL"] = "Slóð á Wordpress API"; +App::$strings["Post to WordPress by default"] = "Leyfa færslum að flæða yfir á Wordpress sjálfgefið"; +App::$strings["Provide a backlink to the Friendica post"] = ""; +App::$strings["Submit"] = "Senda inn"; +App::$strings["Post from Friendica"] = "Færslur frá Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = ""; diff --git a/sources/addons/wppost/lang/it/strings.php b/sources/addons/wppost/lang/it/strings.php index afde8920..c6eaa037 100644 --- a/sources/addons/wppost/lang/it/strings.php +++ b/sources/addons/wppost/lang/it/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Pubblica su Wordpress"; -$a->strings["WordPress Post Settings"] = "Impostazioni invio a WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Abilita plugin \"invia a WordPress\""; -$a->strings["WordPress username"] = "nome utente WordPress"; -$a->strings["WordPress password"] = "password WordPress"; -$a->strings["WordPress API URL"] = "WordPress API URL"; -$a->strings["Post to WordPress by default"] = "Pubblica su WordPress di default"; -$a->strings["Provide a backlink to the Friendica post"] = ""; -$a->strings["Submit"] = "Invia"; -$a->strings["Post from Friendica"] = "Messaggio da Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Leggi il messaggio originale e i commenti su Friendica"; +App::$strings["Post to Wordpress"] = "Pubblica su Wordpress"; +App::$strings["WordPress Post Settings"] = "Impostazioni invio a WordPress"; +App::$strings["Enable WordPress Post Plugin"] = "Abilita plugin \"invia a WordPress\""; +App::$strings["WordPress username"] = "nome utente WordPress"; +App::$strings["WordPress password"] = "password WordPress"; +App::$strings["WordPress API URL"] = "WordPress API URL"; +App::$strings["Post to WordPress by default"] = "Pubblica su WordPress di default"; +App::$strings["Provide a backlink to the Friendica post"] = ""; +App::$strings["Submit"] = "Invia"; +App::$strings["Post from Friendica"] = "Messaggio da Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "Leggi il messaggio originale e i commenti su Friendica"; diff --git a/sources/addons/wppost/lang/nb-no/strings.php b/sources/addons/wppost/lang/nb-no/strings.php index 5c840e67..3cd62802 100644 --- a/sources/addons/wppost/lang/nb-no/strings.php +++ b/sources/addons/wppost/lang/nb-no/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = ""; -$a->strings["WordPress Post Settings"] = ""; -$a->strings["Enable WordPress Post Plugin"] = ""; -$a->strings["WordPress username"] = ""; -$a->strings["WordPress password"] = ""; -$a->strings["WordPress API URL"] = ""; -$a->strings["Post to WordPress by default"] = ""; -$a->strings["Provide a backlink to the Friendica post"] = ""; -$a->strings["Submit"] = "Lagre"; -$a->strings["Post from Friendica"] = ""; -$a->strings["Read the original post and comment stream on Friendica"] = ""; +App::$strings["Post to Wordpress"] = ""; +App::$strings["WordPress Post Settings"] = ""; +App::$strings["Enable WordPress Post Plugin"] = ""; +App::$strings["WordPress username"] = ""; +App::$strings["WordPress password"] = ""; +App::$strings["WordPress API URL"] = ""; +App::$strings["Post to WordPress by default"] = ""; +App::$strings["Provide a backlink to the Friendica post"] = ""; +App::$strings["Submit"] = "Lagre"; +App::$strings["Post from Friendica"] = ""; +App::$strings["Read the original post and comment stream on Friendica"] = ""; diff --git a/sources/addons/wppost/lang/nl/hstrings.php b/sources/addons/wppost/lang/nl/hstrings.php index 73e8dc8b..b87b9c78 100644 --- a/sources/addons/wppost/lang/nl/hstrings.php +++ b/sources/addons/wppost/lang/nl/hstrings.php @@ -1,16 +1,16 @@ strings["Post to WordPress"] = "Doorplaatsen naar WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Doorplaatsen naar WordPress inschakelen"; -$a->strings["No"] = "Nee"; -$a->strings["Yes"] = "Ja"; -$a->strings["WordPress username"] = "Gebruikersnaam WordPress"; -$a->strings["WordPress password"] = "Wachtwoord WordPress"; -$a->strings["WordPress API URL"] = "API-URL WordPress"; -$a->strings["Typically https://your-blog.tld/xmlrpc.php"] = "Meestal https://jouw-blog.tld/xmlrpc.php"; -$a->strings["Post to WordPress by default"] = "Berichten standaard naar WordPress doorplaatsen"; -$a->strings["Forward comments (requires hubzilla_wp plugin)"] = "Reacties doorplaatsen (Hubzilla/Redmatrix WP-plugin vereist)"; -$a->strings["WordPress Post Settings"] = "WordPress (berichten doorplaatsen)"; -$a->strings["Submit"] = "Opslaan"; -$a->strings["Wordpress Settings saved."] = "WordPress-instellingen opgeslagen."; +App::$strings["Post to WordPress"] = "Doorplaatsen naar WordPress"; +App::$strings["Enable WordPress Post Plugin"] = "Doorplaatsen naar WordPress inschakelen"; +App::$strings["No"] = "Nee"; +App::$strings["Yes"] = "Ja"; +App::$strings["WordPress username"] = "Gebruikersnaam WordPress"; +App::$strings["WordPress password"] = "Wachtwoord WordPress"; +App::$strings["WordPress API URL"] = "API-URL WordPress"; +App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Meestal https://jouw-blog.tld/xmlrpc.php"; +App::$strings["Post to WordPress by default"] = "Berichten standaard naar WordPress doorplaatsen"; +App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Reacties doorplaatsen (Hubzilla/Redmatrix WP-plugin vereist)"; +App::$strings["WordPress Post Settings"] = "WordPress (berichten doorplaatsen)"; +App::$strings["Submit"] = "Opslaan"; +App::$strings["Wordpress Settings saved."] = "WordPress-instellingen opgeslagen."; diff --git a/sources/addons/wppost/lang/pl/strings.php b/sources/addons/wppost/lang/pl/strings.php index 201ead1d..557b73c9 100644 --- a/sources/addons/wppost/lang/pl/strings.php +++ b/sources/addons/wppost/lang/pl/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Opublikuj na Wordpress"; -$a->strings["WordPress Post Settings"] = "Ustawienia wpisów WorldPress"; -$a->strings["Enable WordPress Post Plugin"] = "Włącz plugin wpisów WorldPress"; -$a->strings["WordPress username"] = "nazwa użytkownika WordPress"; -$a->strings["WordPress password"] = "hasło WordPress"; -$a->strings["WordPress API URL"] = "WordPress API URL"; -$a->strings["Post to WordPress by default"] = ""; -$a->strings["Provide a backlink to the Friendica post"] = ""; -$a->strings["Submit"] = "Potwierdź"; -$a->strings["Post from Friendica"] = "Post z Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = ""; +App::$strings["Post to Wordpress"] = "Opublikuj na Wordpress"; +App::$strings["WordPress Post Settings"] = "Ustawienia wpisów WorldPress"; +App::$strings["Enable WordPress Post Plugin"] = "Włącz plugin wpisów WorldPress"; +App::$strings["WordPress username"] = "nazwa użytkownika WordPress"; +App::$strings["WordPress password"] = "hasło WordPress"; +App::$strings["WordPress API URL"] = "WordPress API URL"; +App::$strings["Post to WordPress by default"] = ""; +App::$strings["Provide a backlink to the Friendica post"] = ""; +App::$strings["Submit"] = "Potwierdź"; +App::$strings["Post from Friendica"] = "Post z Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = ""; diff --git a/sources/addons/wppost/lang/pt-br/strings.php b/sources/addons/wppost/lang/pt-br/strings.php index f614e7ad..c3ec143c 100644 --- a/sources/addons/wppost/lang/pt-br/strings.php +++ b/sources/addons/wppost/lang/pt-br/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Postar no WordPress"; -$a->strings["WordPress Post Settings"] = "Configurações de postagem do WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Habilitar plugin de postagem do WordPress"; -$a->strings["WordPress username"] = "Usuário WordPress"; -$a->strings["WordPress password"] = "Senha WordPress"; -$a->strings["WordPress API URL"] = "URL da API do WordPress"; -$a->strings["Post to WordPress by default"] = "Postar para o WordPress como padrão"; -$a->strings["Provide a backlink to the Friendica post"] = ""; -$a->strings["Submit"] = "Enviar"; -$a->strings["Post from Friendica"] = "Postar do Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = ""; +App::$strings["Post to Wordpress"] = "Postar no WordPress"; +App::$strings["WordPress Post Settings"] = "Configurações de postagem do WordPress"; +App::$strings["Enable WordPress Post Plugin"] = "Habilitar plugin de postagem do WordPress"; +App::$strings["WordPress username"] = "Usuário WordPress"; +App::$strings["WordPress password"] = "Senha WordPress"; +App::$strings["WordPress API URL"] = "URL da API do WordPress"; +App::$strings["Post to WordPress by default"] = "Postar para o WordPress como padrão"; +App::$strings["Provide a backlink to the Friendica post"] = ""; +App::$strings["Submit"] = "Enviar"; +App::$strings["Post from Friendica"] = "Postar do Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = ""; diff --git a/sources/addons/wppost/lang/ru/strings.php b/sources/addons/wppost/lang/ru/strings.php index f193addc..f4f2f9d7 100644 --- a/sources/addons/wppost/lang/ru/strings.php +++ b/sources/addons/wppost/lang/ru/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "Сообщение для Wordpress"; -$a->strings["WordPress Post Settings"] = "Настройки сообщений для Wordpress"; -$a->strings["Enable WordPress Post Plugin"] = "Включить WordPress плагин сообщений"; -$a->strings["WordPress username"] = "WordPress Имя пользователя"; -$a->strings["WordPress password"] = "WordPress паролъ"; -$a->strings["WordPress API URL"] = "WordPress API URL"; -$a->strings["Post to WordPress by default"] = "Сообщение WordPress по умолчанию"; -$a->strings["Provide a backlink to the Friendica post"] = ""; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["Post from Friendica"] = "Сообщение от Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = ""; +App::$strings["Post to Wordpress"] = "Сообщение для Wordpress"; +App::$strings["WordPress Post Settings"] = "Настройки сообщений для Wordpress"; +App::$strings["Enable WordPress Post Plugin"] = "Включить WordPress плагин сообщений"; +App::$strings["WordPress username"] = "WordPress Имя пользователя"; +App::$strings["WordPress password"] = "WordPress паролъ"; +App::$strings["WordPress API URL"] = "WordPress API URL"; +App::$strings["Post to WordPress by default"] = "Сообщение WordPress по умолчанию"; +App::$strings["Provide a backlink to the Friendica post"] = ""; +App::$strings["Submit"] = "Подтвердить"; +App::$strings["Post from Friendica"] = "Сообщение от Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = ""; diff --git a/sources/addons/wppost/lang/sv/strings.php b/sources/addons/wppost/lang/sv/strings.php index 3ec569a7..92093e80 100644 --- a/sources/addons/wppost/lang/sv/strings.php +++ b/sources/addons/wppost/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Submit"] = "Spara"; +App::$strings["Submit"] = "Spara"; diff --git a/sources/addons/wppost/lang/zh-cn/strings.php b/sources/addons/wppost/lang/zh-cn/strings.php index 74db6306..4ac3211f 100644 --- a/sources/addons/wppost/lang/zh-cn/strings.php +++ b/sources/addons/wppost/lang/zh-cn/strings.php @@ -1,13 +1,13 @@ strings["Post to Wordpress"] = "发送到Wordpress"; -$a->strings["WordPress Post Settings"] = "Wordpress发送设置"; -$a->strings["Enable WordPress Post Plugin"] = "使Wordpress发送插件可用"; -$a->strings["WordPress username"] = "Wordpress用户名"; -$a->strings["WordPress password"] = "Wordpress密码"; -$a->strings["WordPress API URL"] = "WordPress API URL"; -$a->strings["Post to WordPress by default"] = "默认地发送到Wordpress"; -$a->strings["Provide a backlink to the Friendica post"] = "输入反向链接到Friendica文章"; -$a->strings["Submit"] = "提交"; -$a->strings["Post from Friendica"] = "文章从Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "看原来文章和评论溪流在Friendica"; +App::$strings["Post to Wordpress"] = "发送到Wordpress"; +App::$strings["WordPress Post Settings"] = "Wordpress发送设置"; +App::$strings["Enable WordPress Post Plugin"] = "使Wordpress发送插件可用"; +App::$strings["WordPress username"] = "Wordpress用户名"; +App::$strings["WordPress password"] = "Wordpress密码"; +App::$strings["WordPress API URL"] = "WordPress API URL"; +App::$strings["Post to WordPress by default"] = "默认地发送到Wordpress"; +App::$strings["Provide a backlink to the Friendica post"] = "输入反向链接到Friendica文章"; +App::$strings["Submit"] = "提交"; +App::$strings["Post from Friendica"] = "文章从Friendica"; +App::$strings["Read the original post and comment stream on Friendica"] = "看原来文章和评论溪流在Friendica"; diff --git a/sources/addons/xmpp/xmpp.php b/sources/addons/xmpp/xmpp.php index 624a56dc..1f0b33f7 100644 --- a/sources/addons/xmpp/xmpp.php +++ b/sources/addons/xmpp/xmpp.php @@ -108,14 +108,14 @@ function xmpp_converse(&$a,&$s) { if ($_GET["mode"] == "minimal") return; - if ($a->is_mobile || $a->is_tablet) + if (App::$is_mobile || App::$is_tablet) return; if (!get_pconfig(local_channel(),"xmpp","enabled")) return; - $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; + App::$page['htmlhead'] .= ''."\n"; + App::$page['htmlhead'] .= ''."\n"; if (get_config("xmpp", "central_userbase") && !get_pconfig(local_channel(),"xmpp","individual")) { $bosh_proxy = get_config("xmpp", "bosh_proxy"); @@ -126,9 +126,9 @@ function xmpp_converse(&$a,&$s) { $password = substr(random_string(),0,16); set_pconfig(local_channel(), "xmpp", "password", $password); } - $channel = $a->get_channel(); + $channel = App::get_channel(); - $jid = $channel["channel_address"]."@".$a->get_hostname()."/converse-".substr(random_string(),0,5);; + $jid = $channel["channel_address"]."@".App::get_hostname()."/converse-".substr(random_string(),0,5);; $auto_login = "auto_login: true, authentication: 'login', @@ -174,7 +174,7 @@ function xmpp_converse(&$a,&$s) { xhr_user_search: false });\n"; - $a->page['htmlhead'] .= " + diff --git a/sources/doc/DerivedTheme1.md b/sources/doc/DerivedTheme1.md index 3db86b6e..b120c628 100644 --- a/sources/doc/DerivedTheme1.md +++ b/sources/doc/DerivedTheme1.md @@ -38,7 +38,7 @@ Inside it, put the following information - edit as needed function mytheme_init(&$a) { - $a->theme_info['extends'] = 'redbasic'; + App::$theme_info['extends'] = 'redbasic'; } @@ -79,7 +79,7 @@ If you want to use the redbasic schemas for your derived theme, you have to do a Do everything as above, but don't create view/theme/mytheme/php/style.php, but copy instead view/theme/redbasic/php/style.php to view/theme/mytheme/php/style.php. Modify that file and remove (or comment out) these two lines: - if(local_channel() && $a->channel && $a->channel['channel_theme'] != 'redbasic') + if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') set_pconfig(local_channel(), 'redbasic', 'schema', '---'); Also add this line at the bottom: diff --git a/sources/doc/Primary-Directory.md b/sources/doc/Primary-Directory.md index 37b0c043..92460c34 100644 --- a/sources/doc/Primary-Directory.md +++ b/sources/doc/Primary-Directory.md @@ -12,7 +12,7 @@ There are certain scenarios where you might want your own directory-server that * On the hub that will be the Directory Server, open the .htconfig.php file and set: - `$a->config['system']['directory_mode'] = DIRECTORY_MODE_PRIMARY;` + `App::$config['system']['directory_mode'] = DIRECTORY_MODE_PRIMARY;` By default it should already be set as **DIRECTORY_MODE_NORMAL**, so just edit that line to say **DIRECTORY_MODE_PRIMARY** diff --git a/sources/doc/context/admin/security/help.html b/sources/doc/context/admin/security/help.html new file mode 100644 index 00000000..e9a741a5 --- /dev/null +++ b/sources/doc/context/admin/security/help.html @@ -0,0 +1,3 @@ +

Security Settings

+

This page contains various administrator settings related to security.

+

To save any changes you make to these settings, you must press the Submit button.

\ No newline at end of file diff --git a/sources/doc/context/channel/help.html b/sources/doc/context/channel/help.html new file mode 100644 index 00000000..810913ff --- /dev/null +++ b/sources/doc/context/channel/help.html @@ -0,0 +1,24 @@ + +
+
General
+
This is the home page of a channel. It is similar to someone's profile "wall" in a social network context. Posts created by the channel are displayed according to the observer's viewing permissions.
+
Create a Post
+
If you have permission to create posts on the channel page, then you will see the post editor at the top.
+
Channel Content Tabs
+
The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file diff --git a/sources/doc/context/cloud/help.html b/sources/doc/context/cloud/help.html new file mode 100644 index 00000000..10594751 --- /dev/null +++ b/sources/doc/context/cloud/help.html @@ -0,0 +1,22 @@ + +
+
General
+
This page displays a channel's "cloud" files. The files visible to the observer depend on the individual file permissions set by the channel owner. If you have permission to create/upload files you will see control buttons above the file list.
+
Channel Content Tabs
+
The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file diff --git a/sources/doc/context/mail/help.html b/sources/doc/context/mail/help.html new file mode 100644 index 00000000..a2361a13 --- /dev/null +++ b/sources/doc/context/mail/help.html @@ -0,0 +1,10 @@ +
+
General
+
The messages displayed in private mail are visible only to you and the single recipient.
+
Combined View
+
Complete conversations can be viewed in a continuous thread by selecting Combined View. Available conversations are displayed beneath the menu in the side panel.
+
Inbox/Outbox
+
Individual sent messages are viewed by selecting Outbox, and incoming messages are viewed using the Inbox filter.
+
New Message
+
Individual messages have delivery reports that can be viewed using the drop-down menu. Messages can also be recalled from the same menu, which can prevent the recipient from viewing the message if they have not already read it.
+
\ No newline at end of file diff --git a/sources/doc/context/network/help.html b/sources/doc/context/network/help.html new file mode 100644 index 00000000..956af738 --- /dev/null +++ b/sources/doc/context/network/help.html @@ -0,0 +1,26 @@ + +
+
General
+
The network page displays a stream of posts and conversations, typically ordered by the most recently updated. This page is highly customizable.
+
Create a Post
+
At the top of the page there is a text box that says "Share". Clicking this box opens a new post editor. The post editor is customizable, but the basic editor provides fields for a post body and an optional post Title. Buttons below the text area to the left provide shortcuts to text formatting and inserting links, images, and other data into the post. The buttons to the right provide a post preview, the post permissions setting, and a Submit button to send the post.
+
Privacy Groups
+
The privacy groups you have created are displayed in the side panel. Selecting them filters posts to those created by channels in the chosen group.
+
Post Permissions
+
The access control list (ACL) is what you use to set who can see your new post. Pressing the ACL button beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your Friends group except the friend you are surprising. In this case you "show" the Friends group but "don't show" that one person.
+
\ No newline at end of file diff --git a/sources/doc/context/photos/help.html b/sources/doc/context/photos/help.html new file mode 100644 index 00000000..f41611f8 --- /dev/null +++ b/sources/doc/context/photos/help.html @@ -0,0 +1,22 @@ + +
+
General
+
This page displays a channel's photo albums. The images visible to the observer depend on the individual image permissions.
+
Channel Content Tabs
+
The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file diff --git a/sources/doc/context/profile/help.html b/sources/doc/context/profile/help.html new file mode 100644 index 00000000..0d4abb8c --- /dev/null +++ b/sources/doc/context/profile/help.html @@ -0,0 +1,22 @@ + +
+
General
+
This is the profile page of a channel. It typically displays information describing the channel. If the channel represents a person in a social network, for example, then the profile might provide contact information and other personal details about the person. Channels can have multiple profiles, where the displayed profile depends on the observer.
+
Channel Content Tabs
+
The channel content tabs are links to other content published by the channel. The About tab links to the channel profile. The Photos tab links to the channel photo galleries. The Files tab links to the general shared files published by the channel.
+
\ No newline at end of file diff --git a/sources/doc/dev-function-overview.md b/sources/doc/dev-function-overview.md index e228268d..1ef80d34 100644 --- a/sources/doc/dev-function-overview.md +++ b/sources/doc/dev-function-overview.md @@ -21,7 +21,7 @@ Returns the global app structure ($a). * App::get_observer() -(App:: is usually assigned to the global $a), so $a->get_observer() or get_app()->get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely). +(App:: is usually assigned to the global $a), so App::get_observer() or App::get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely). * get_config($family,$key), get_pconfig($uid,$family,$key) diff --git a/sources/doc/dev_beginner.bb b/sources/doc/dev_beginner.bb index 72962571..4cf1ca59 100644 --- a/sources/doc/dev_beginner.bb +++ b/sources/doc/dev_beginner.bb @@ -242,7 +242,7 @@ Befor you register a first user switch off the registration mails. Open /var/www/.htconfig.php and make sure "0" is set in this line [code] -$a->config['system']['verify_email'] = 0; +App::$config['system']['verify_email'] = 0; [/code] You should be able to change the file as "yourself" (instead of using root or www-data). diff --git a/sources/doc/directories.bb b/sources/doc/directories.bb index d81dd84c..60a0b624 100644 --- a/sources/doc/directories.bb +++ b/sources/doc/directories.bb @@ -30,7 +30,7 @@ To configure this, please look in your .htconfig.php file for the following text // DIRECTORY_MODE_PRIMARY = main directory server // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services -$a->config['system']['directory_mode'] = DIRECTORY_MODE_STANDALONE; +App::$config['system']['directory_mode'] = DIRECTORY_MODE_STANDALONE; [/code] diff --git a/sources/doc/faq_developers.bb b/sources/doc/faq_developers.bb index 603cf238..5da2c19f 100644 --- a/sources/doc/faq_developers.bb +++ b/sources/doc/faq_developers.bb @@ -8,22 +8,22 @@ $a is a class defined in boot.php and passed all around $Projectname as a global We don't ever create more than one instance and always modify the elements of the single instance. The mechanics of this are somewhat tricky. If you have a function that is passed $a and needs to modify $a you need to declare it as a reference with '&' e.g. -[code]function foo(&$a) { $a->something = 'x'; // whatever }; +[code]function foo(&$a) { App::$something = 'x'; // whatever }; *or* access it within your function as a global variable via get_app() function foo() { $a = get_app(); - $a->something = 'x'; + App::$something = 'x'; } -function foo($a) { $a->something = 'x'; }; +function foo($a) { App::$something = 'x'; }; will *not* change the global app state. function foo() { - get_app()->something = 'x'; + App::$something = 'x'; } [/code] diff --git a/sources/doc/federate.bb b/sources/doc/federate.bb index 5d253913..9137ec16 100644 --- a/sources/doc/federate.bb +++ b/sources/doc/federate.bb @@ -8,7 +8,7 @@ There are three main components to writing federation plugins. These are: In addition, federation drivers must handle -[4] differences in privacy policies +[4] differences in privacy policies (and content formats) [h3]Making connections[/h3] @@ -36,8 +36,11 @@ Additional information that your plugin requires for communication can be stored When a connection is made, we generally call the notifier (include/notifier.php) to send a message to the remote channel. This is bound to the hook 'permissions_create'. Your plugin will need to handle this in order to send a "follow" or "make friends" message to the other network. -Note: The first stage zot lookup will be replaced with a webfinger lookup. This work is in progress. A separate lookup was required initially as webfinger does not allow non-SSL connections. We will provide non-SSL zot lookups (usually test and development sites) via the "old" XRD based webfinger to avoid this limitation. +Notes: The first stage zot lookup will be replaced with a webfinger lookup. This work is in progress. A separate lookup was required initially as webfinger does not allow non-SSL connections. We will provide non-SSL zot lookups (usually test and development sites) via the "old" XRD based webfinger to avoid this limitation. +The core application will attempt to create xchan records for projects identified as members of the "open web"; currently Hubzilla, Friendica, Diaspora, GNU-Social and Pump.io. This is so that comments can be passed amongst project sites and the network correctly identified. A federation plugin is required to fully federate with other networks, but comments may be passed to sites without such a plugin installed so that there are no unexplained holes in conversations. + +The core application must also provide signing ability for Diaspora comments since they require a special signing format and must be signed by the comment author regardless of whether that channel federates with Diaspora. The owner of the conversation may federate with Diaspora so the comments must be signed. This is unfortunate but necessary. [h3]Sending Messages[/h3] diff --git a/sources/doc/filesync.md b/sources/doc/filesync.md new file mode 100644 index 00000000..4c64bdb0 --- /dev/null +++ b/sources/doc/filesync.md @@ -0,0 +1,61 @@ +File Sync and Clone +=================== + + + +File cloning across multiple instances of a channel is a very hard problem, due to the nature of PHP memory allocation. This needs to be handled dramatically differently than cloning or syncing of other information. (Processing one large video file or 40-50 photos could exhaust memory). Therefore we can't easily just dump all the data to a dump file and sequentially process it. Loading the dump file itself is likely to exhaust memory. + +There are also two primary operations we are considering. The first is the hardest - saving and then importing all your channel information into a new channel clone. The second is synchronising file changes as they occur across two or more "active" clones. + +For the first cut at this tool we will concentrate on the second case, while trying to maintain some measure of compatibility with the first case so that we can re-use the same tools. + +Meta Data +========= + + +First we need the metadata for the file in order to precisely re-construct its structure on another site. This requires the following information: + +'attach' structure (without file contents - which is the default) for the file itself **and** its parent directories so that we can re-create its precise place in the file system, since we do not know if the parent directory has been imported previously or ever. + +'photo' structure for any photo elements which were created as a result of uploading this file into the system. This typically contains several different 'scales' or thumbnail images, some of which may be cropped for profile photo use or cover photo use. We need to retain the cropping information which is not present in the metadata, but only in the stored data. The actual thumbnail image data may or may not be included in the metadata. A cover photo of large scale (scale #7) could potentially cause memory issues. Not as bad as a 100M video, but if you have several of these they could add up. + +'item' entries which are linked to this file. These can be file share activities, the "parent item" linked to photos, and any attached conversation items (photo likes, comments, etc.) + +All of these items will require URL replacement and re-signing of the item as they are relocated to another site. + + +File Data +========= + +Then we have the actual file data we need to reconstruct the file. This needs to be stored separately from the meta-data to avoid memory exhaustion when processing. The actual file data can be used to reconstruct the attach structure and the first four photo scales. If this is a photo, we need access to the "#4 scale" (profile photo) and the #7 scale (cover photo) as they were originally cropped. All other thumbnails can be generated from these. + + + +File Sync +========= + + +We will consider this operation first because it is probably the most straightforward to implement. When a photo is added to or removed or changed from the source system, we will send a clone sync packet to all known clones containing the metadata - but **no file data** . We can only send one sync packet per file operation that needs to be synced. + +The receiving end will create and perform URL translation on all the metadata structures and store them. Then it will need to fetch the actual data. Assuming CURL supports streaming, an authenticated request is sent to the original site and the original file is requested and streamed directly to disk (bypassing all processing). If photo scale #4 or scale #7 is required, these are requested and stored into their respective structures. We're assuming in this case that the cover photo large scale will not exhaust memory. If CURL cannot be made to support streaming, request packets need to be queued and sent to the origination site to obtain "chunks" of the file and re-assembled once all chunks have been retrieved. + +The authenticated request depends on the mechanism. For CURL streaming, some signed secret with a timestamp will probably need to be generated and posted to the file origination site. Then the data can be retrieved with minimal internal processing and dumped directly to disk using stdio buffering. In the case of a zot request, the zot request packet will be validated, however scheduling chunk batches and re-assembling them could be tricky. + + +File Backup/Restore +=================== + +This is much more complicated as we do not have an authenticate web server to request data from. The metadata can be mostly the same, but we need some form of signalling that we will not be fetching the file via the web. This will likely require a client side process to parse each metadata file and locate a file on disk which it is associated with. Then the data would need to be streamed to the destination server with a special endpoint designed for this task. A java app might be the best option here to retain platform neutrality. + +Another option would be to use WebDAV for this step. The metadata files would be uploaded first, and then the data files. If a data file corresponded to an existing metadata file, the metadata would be processed; the file stored appropriately, and the metadata file then removed. In this case, photos of scales 4 and 7 would need to be provided in the metadata. + + +Optionally, this step could also be performed with a filesystem local to the destination server. This would be the highest performance, and a suite of shell-based tools (in the case of Linux) could perform the "client-side" of the task. + +The complexity of this task mandates careful planning into how the data is organised and stored and if necessary backed up remotely or transmitted for backup by the source website. + + +Backward Compatibility +====================== + +There are some obvious issues with making data available for backup or cloning which existed on the system prior to the existence of restore/sync tools. To keep the tools themselves relatively uncomplicated (to the extent possible given the constraints) backward compatibility may have to be preformed by dedicated plugin or addon. \ No newline at end of file diff --git a/sources/doc/hook/module_mod_aftercontent.bb b/sources/doc/hook/module_mod_aftercontent.bb index 5d48435b..04e3c8d8 100644 --- a/sources/doc/hook/module_mod_aftercontent.bb +++ b/sources/doc/hook/module_mod_aftercontent.bb @@ -8,5 +8,5 @@ The hook data for this call consists of an array This element contains the HTML content which was prepared for this page by calling the module_content() function. It is invoked after the content has been created. It does not contain the result of AJAX or asynchronous page load calls. - The current module may be determined by lookin at $a->module + The current module may be determined by lookin at App::$module diff --git a/sources/doc/hook/module_mod_content.bb b/sources/doc/hook/module_mod_content.bb index 39f5743b..eef5b7ba 100644 --- a/sources/doc/hook/module_mod_content.bb +++ b/sources/doc/hook/module_mod_content.bb @@ -6,5 +6,5 @@ The hook data for this call consists of an array This element contains the HTML content before calling the module_content() function. It is invoked before the content region has been populated. This may or may not be empty as there may be other processes or addons generating content prior to your hook handler is run. Be certain to preserve any current content. Typically anything you add here will be placed at the top of the content region of the page, but in any event prior to the main content region being generated. - The current module may be determined by lookin at $a->module + The current module may be determined by lookin at App::$module diff --git a/sources/include/Contact.php b/sources/include/Contact.php index 1c61470e..e011c60c 100644 --- a/sources/include/Contact.php +++ b/sources/include/Contact.php @@ -75,12 +75,12 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { $a = get_app(); if(! $xchan) { - if($a->poi) { - $xchan = $a->poi; + if(App::$poi) { + $xchan = App::$poi; } - elseif(is_array($a->profile) && $a->profile['channel_hash']) { + elseif(is_array(App::$profile) && App::$profile['channel_hash']) { $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($a->profile['channel_hash']) + dbesc(App::$profile['channel_hash']) ); if($r) $xchan = $r[0]; @@ -102,7 +102,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { } if(array_key_exists('channel_id',$xchan)) - $a->profile_uid = $xchan['channel_id']; + App::$profile_uid = $xchan['channel_id']; $url = (($observer) ? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] @@ -111,7 +111,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { return replace_macros(get_markup_template('xchan_vcard.tpl'),array( '$name' => $xchan['xchan_name'], - '$photo' => ((is_array($a->profile) && array_key_exists('photo',$a->profile)) ? $a->profile['photo'] : $xchan['xchan_photo_l']), + '$photo' => ((is_array(App::$profile) && array_key_exists('photo',App::$profile)) ? App::$profile['photo'] : $xchan['xchan_photo_l']), '$follow' => $xchan['xchan_addr'], '$link' => zid($xchan['xchan_url']), '$connect' => $connect, @@ -235,7 +235,7 @@ function account_remove($account_id,$local = true,$unset_session=true) { unset($_SESSION['authenticated']); unset($_SESSION['uid']); notice( sprintf(t("User '%s' deleted"),$account_email) . EOL); - goaway(get_app()->get_baseurl()); + goaway(z_root()); } return $r; @@ -333,19 +333,19 @@ function channel_remove($channel_id, $local = true, $unset_session=false) { ); // if this was the default channel, set another one as default - if($a->account['account_default_channel'] == $channel_id) { + if(App::$account['account_default_channel'] == $channel_id) { $r = q("select channel_id from channel where channel_account_id = %d and channel_removed = 0 limit 1", - intval($a->account['account_id']), + intval(App::$account['account_id']), intval(PAGE_REMOVED)); if ($r) { $rr = q("update account set account_default_channel = %d where account_id = %d", intval($r[0]['channel_id']), - intval($a->account['account_id'])); + intval(App::$account['account_id'])); logger("Default channel deleted, changing default to channel_id " . $r[0]['channel_id']); } else { $rr = q("update account set account_default_channel = 0 where account_id = %d", - intval($a->account['account_id']) + intval(App::$account['account_id']) ); } } @@ -389,8 +389,8 @@ function channel_remove($channel_id, $local = true, $unset_session=false) { proc_run('php','include/directory.php',$channel_id); if($channel_id == local_channel() && $unset_session) { - nuke_session(); - goaway($a->get_baseurl()); + \Zotlabs\Web\Session::nuke(); + goaway(z_root()); } } diff --git a/sources/include/ConversationObject.php b/sources/include/ConversationObject.php index 66f6cca0..82f381b0 100644 --- a/sources/include/ConversationObject.php +++ b/sources/include/ConversationObject.php @@ -48,7 +48,7 @@ class Conversation extends BaseObject { $a = $this->get_app(); - $this->observer = $a->get_observer(); + $this->observer = App::get_observer(); $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : ''); switch($mode) { @@ -57,7 +57,7 @@ class Conversation extends BaseObject { $this->writable = true; break; case 'channel': - $this->profile_owner = $a->profile['profile_uid']; + $this->profile_owner = App::$profile['profile_uid']; $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); break; case 'display': @@ -67,7 +67,7 @@ class Conversation extends BaseObject { $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); break; case 'page': - $this->profile_owner = $a->profile['uid']; + $this->profile_owner = App::$profile['uid']; $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); break; default: diff --git a/sources/include/Import/import_diaspora.php b/sources/include/Import/import_diaspora.php index a0f473b5..a94e7339 100644 --- a/sources/include/Import/import_diaspora.php +++ b/sources/include/Import/import_diaspora.php @@ -8,7 +8,7 @@ require_once('include/photo/photo_driver.php'); function import_diaspora($data) { $a = get_app(); - $account = $a->get_account(); + $account = App::get_account(); if(! $account) return false; diff --git a/sources/include/ItemObject.php b/sources/include/ItemObject.php index d42e993e..9d5acd95 100644 --- a/sources/include/ItemObject.php +++ b/sources/include/ItemObject.php @@ -97,7 +97,7 @@ class Item extends BaseObject { $mode = $conv->get_mode(); if(local_channel() && $observer['xchan_hash'] === $item['author_xchan']) - $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); + $edpost = array(z_root()."/editpost/".$item['id'], t("Edit")); else $edpost = false; @@ -714,7 +714,7 @@ class Item extends BaseObject { '$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false), '$encrypt' => t('Encrypt text'), '$cipher' => $conv->get_cipher(), - '$sourceapp' => get_app()->sourcename + '$sourceapp' => App::$sourcename )); diff --git a/sources/include/account.php b/sources/include/account.php index 4c828003..c64197b4 100644 --- a/sources/include/account.php +++ b/sources/include/account.php @@ -248,7 +248,7 @@ function verify_email_address($arr) { $res = mail($arr['email'], email_header_encode(sprintf( t('Registration confirmation for %s'), get_config('system','sitename'))), $email_msg, - 'From: ' . 'Administrator' . '@' . get_app()->get_hostname() . "\n" + 'From: ' . 'Administrator' . '@' . App::get_hostname() . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); @@ -314,7 +314,7 @@ function send_reg_approval_email($arr) { $res = mail($admin['email'], sprintf( t('Registration request at %s'), get_config('system','sitename')), $email_msg, - 'From: ' . t('Administrator') . '@' . get_app()->get_hostname() . "\n" + 'From: ' . t('Administrator') . '@' . App::get_hostname() . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); @@ -341,7 +341,7 @@ function send_register_success_email($email,$password) { $res = mail($email, sprintf( t('Registration details for %s'), get_config('system','sitename')), $email_msg, - 'From: ' . t('Administrator') . '@' . get_app()->get_hostname() . "\n" + 'From: ' . t('Administrator') . '@' . App::get_hostname() . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); @@ -655,7 +655,7 @@ function account_service_class_allows($aid, $property, $usage = false) { function service_class_fetch($uid, $property) { $a = get_app(); if($uid == local_channel()) { - $service_class = $a->account['account_service_class']; + $service_class = App::$account['account_service_class']; } else { $r = q("select account_service_class as service_class diff --git a/sources/include/acl_selectors.php b/sources/include/acl_selectors.php index 3c8f3432..92f9436a 100644 --- a/sources/include/acl_selectors.php +++ b/sources/include/acl_selectors.php @@ -23,7 +23,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { // e.g. 'network_pre_group_deny', 'profile_pre_group_allow' - call_hooks($a->module . '_pre_' . $selname, $arr); + call_hooks(App::$module . '_pre_' . $selname, $arr); if($r) { foreach($r as $rr) { @@ -39,7 +39,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { } $o .= "\r\n"; - call_hooks($a->module . '_post_' . $selname, $o); + call_hooks(App::$module . '_post_' . $selname, $o); return $o; @@ -127,7 +127,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow' - call_hooks($a->module . '_pre_' . $selname, $arr); + call_hooks(App::$module . '_pre_' . $selname, $arr); if(count($r)) { foreach($r as $rr) { @@ -145,7 +145,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $o .= "\r\n"; - call_hooks($a->module . '_post_' . $selname, $o); + call_hooks(App::$module . '_post_' . $selname, $o); return $o; }*/ @@ -182,7 +182,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow' - call_hooks($a->module . '_pre_' . $selname, $arr); + call_hooks(App::$module . '_pre_' . $selname, $arr); if($r) { foreach($r as $rr) { @@ -200,7 +200,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= "\r\n"; - call_hooks($a->module . '_post_' . $selname, $o); + call_hooks(App::$module . '_post_' . $selname, $o); return $o; } diff --git a/sources/include/activities.php b/sources/include/activities.php index df43f1f6..9ba19139 100644 --- a/sources/include/activities.php +++ b/sources/include/activities.php @@ -11,7 +11,7 @@ function profile_activity($changed, $value) { require_once('include/items.php'); - $self = $a->get_channel(); + $self = App::get_channel(); if(! count($self)) return; diff --git a/sources/include/api.php b/sources/include/api.php index e78e6cc3..fd644947 100644 --- a/sources/include/api.php +++ b/sources/include/api.php @@ -34,7 +34,7 @@ require_once('include/api_auth.php'); function api_user() { $aid = get_account_id(); - $channel = get_app()->get_channel(); + $channel = App::get_channel(); if(($aid) && (x($_REQUEST,'channel'))) { @@ -79,7 +79,7 @@ require_once('include/api_auth.php'); $type="json"; foreach ($API as $p=>$info){ - if (strpos($a->query_string, $p)===0){ + if (strpos(App::$query_string, $p)===0){ $called_api= explode("/",$p); //unset($_SERVER['PHP_AUTH_USER']); if ($info['auth'] === true && api_user() === false) { @@ -88,18 +88,18 @@ require_once('include/api_auth.php'); load_contact_links(api_user()); - $channel = $a->get_channel(); + $channel = App::get_channel(); - logger('API call for ' . $channel['channel_name'] . ': ' . $a->query_string); + logger('API call for ' . $channel['channel_name'] . ': ' . App::$query_string); logger('API parameters: ' . print_r($_REQUEST,true)); $type="json"; - if (strpos($a->query_string, ".xml")>0) $type="xml"; - if (strpos($a->query_string, ".json")>0) $type="json"; - if (strpos($a->query_string, ".rss")>0) $type="rss"; - if (strpos($a->query_string, ".atom")>0) $type="atom"; - if (strpos($a->query_string, ".as")>0) $type="as"; + if (strpos(App::$query_string, ".xml")>0) $type="xml"; + if (strpos(App::$query_string, ".json")>0) $type="json"; + if (strpos(App::$query_string, ".rss")>0) $type="rss"; + if (strpos(App::$query_string, ".atom")>0) $type="atom"; + if (strpos(App::$query_string, ".as")>0) $type="as"; $r = call_user_func($info['func'], $a, $type); if ($r===false) return; @@ -141,7 +141,7 @@ require_once('include/api_auth.php'); } } header("HTTP/1.1 404 Not Found"); - logger('API call not implemented: '.$a->query_string." - ".print_r($_REQUEST,true)); + logger('API call not implemented: '.App::$query_string." - ".print_r($_REQUEST,true)); $r = 'not implemented'; switch($type){ case "xml": @@ -171,12 +171,12 @@ require_once('include/api_auth.php'); $arr['$user'] = $user_info; $arr['$rss'] = array( 'alternate' => $user_info['url'], - 'self' => $a->get_baseurl(). "/". $a->query_string, - 'base' => $a->get_baseurl(), + 'self' => z_root(). "/". App::$query_string, + 'base' => z_root(), 'updated' => api_date(null), 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), 'language' => $user_info['language'], - 'logo' => $a->get_baseurl()."/images/rm-64.png", + 'logo' => z_root()."/images/rm-64.png", ); return $arr; @@ -213,7 +213,7 @@ require_once('include/api_auth.php'); $extra_query .= " AND abook_channel = ".intval(api_user()); } - if (is_null($user) && argc() > (count($called_api)-1) && (strstr($a->cmd,'/users'))){ + if (is_null($user) && argc() > (count($called_api)-1) && (strstr(App::$cmd,'/users'))){ $argid = count($called_api); list($xx, $null) = explode(".",argv($argid)); if(is_numeric($xx)){ @@ -318,7 +318,7 @@ require_once('include/api_auth.php'); 'location' => ($usr) ? $usr[0]['channel_location'] : '', 'profile_image_url' => $uinfo[0]['xchan_photo_l'], 'url' => $uinfo[0]['xchan_url'], - 'contact_url' => $a->get_baseurl() . "/connections/".$uinfo[0]['abook_id'], + 'contact_url' => z_root() . "/connections/".$uinfo[0]['abook_id'], 'protected' => false, 'friends_count' => intval($countfriends), 'created_at' => api_date($uinfo[0]['abook_created']), @@ -326,7 +326,7 @@ require_once('include/api_auth.php'); 'time_zone' => 'UTC', //$uinfo[0]['timezone'], 'geo_enabled' => false, 'statuses_count' => intval($countitms), //#XXX: fix me - 'lang' => get_app()->language, + 'lang' => App::$language, 'description' => (($profile) ? $profile[0]['pdesc'] : ''), 'followers_count' => intval($countfollowers), 'favourites_count' => intval($starred), @@ -486,7 +486,7 @@ require_once('include/api_auth.php'); function api_account_logout(&$a, $type){ require_once('include/auth.php'); - nuke_session(); + \Zotlabs\Web\Session::nuke(); return api_apply_template("user", $type, array('$user' => null)); } @@ -635,13 +635,13 @@ require_once('include/api_auth.php'); function api_albums(&$a,$type) { - json_return_and_die(photos_albums_list($a->get_channel(),$a->get_observer())); + json_return_and_die(photos_albums_list(App::get_channel(),App::get_observer())); } api_register_func('api/red/albums','api_albums', true); function api_photos(&$a,$type) { $album = $_REQUEST['album']; - json_return_and_die(photos_list_photos($a->get_channel(),$a->get_observer(),$album)); + json_return_and_die(photos_list_photos(App::get_channel(),App::get_observer(),$album)); } api_register_func('api/red/photos','api_photos', true); @@ -768,7 +768,7 @@ require_once('include/api_auth.php'); } $txt = html2bbcode($txt); - $a->argv[1] = $user_info['screen_name']; + App::$argv[1] = $user_info['screen_name']; $_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo $_FILES['userfile'] = $_FILES['media']; @@ -872,7 +872,7 @@ require_once('include/api_auth.php'); // upload each image if we have any $_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo require_once('mod/wall_attach.php'); - $a->data['api_info'] = $user_info; + App::$data['api_info'] = $user_info; $media = wall_attach_post($a); if(strlen($media)>0) @@ -885,7 +885,7 @@ require_once('include/api_auth.php'); // upload each image if we have any $_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo require_once('mod/wall_attach.php'); - $a->data['api_info'] = $user_info; + App::$data['api_info'] = $user_info; $media = wall_attach_post($a); if(strlen($media)>0) @@ -960,7 +960,7 @@ require_once('include/api_auth.php'); $arr['records'] = 999999; $arr['item_type'] = '*'; - $i = items_fetch($arr,$a->get_channel(),get_observer_hash()); + $i = items_fetch($arr,App::get_channel(),get_observer_hash()); if(! $i) json_return_and_die(array()); @@ -1230,7 +1230,7 @@ require_once('include/api_auth.php'); $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; if (api_user() != $user_info['uid']) { - $observer = get_app()->get_observer(); + $observer = App::get_observer(); require_once('include/permissions.php'); if(! perm_is_allowed($user_info['uid'],(($observer) ? $observer['xchan_hash'] : ''),'view_stream')) return ''; @@ -1272,8 +1272,8 @@ require_once('include/api_auth.php'); break; case "as": $as = api_format_as($a, $ret, $user_info); - $as['title'] = $a->config['sitename']." Home Timeline"; - $as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all"; + $as['title'] = App::$config['sitename']." Home Timeline"; + $as['link']['url'] = z_root()."/".$user_info["screen_name"]."/all"; return($as); break; } @@ -1333,8 +1333,8 @@ require_once('include/api_auth.php'); break; case "as": $as = api_format_as($a, $ret, $user_info); - $as['title'] = $a->config['sitename']. " " . t('Public Timeline'); - $as['link']['url'] = $a->get_baseurl()."/"; + $as['title'] = App::$config['sitename']. " " . t('Public Timeline'); + $as['link']['url'] = z_root()."/"; return($as); break; } @@ -1409,7 +1409,7 @@ require_once('include/api_auth.php'); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); - $observer = get_app()->get_observer(); + $observer = App::get_observer(); $item_normal = item_normal(); @@ -1526,7 +1526,7 @@ require_once('include/api_auth.php'); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); - $myurl = $a->get_baseurl() . '/channel/'. $a->user['nickname']; + $myurl = z_root() . '/channel/'. App::$user['nickname']; $myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $diasp_url = str_replace('/channel/','/u/',$myurl); @@ -1561,8 +1561,8 @@ require_once('include/api_auth.php'); break; case "as": $as = api_format_as($a, $ret, $user_info); - $as["title"] = $a->config['sitename']." Mentions"; - $as['link']['url'] = $a->get_baseurl()."/"; + $as["title"] = App::$config['sitename']." Mentions"; + $as['link']['url'] = z_root()."/"; return($as); break; } @@ -1633,7 +1633,7 @@ require_once('include/api_auth.php'); $arr['cid'] = $user_info['id']; - $r = items_fetch($arr,get_app()->get_channel(),get_observer_hash()); + $r = items_fetch($arr,App::get_channel(),get_observer_hash()); $ret = api_format_items($r,$user_info); @@ -1752,7 +1752,7 @@ require_once('include/api_auth.php'); $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; if (api_user() != $user_info['uid']) { - $observer = get_app()->get_observer(); + $observer = App::get_observer(); require_once('include/permissions.php'); if(! perm_is_allowed($user_info['uid'],(($observer) ? $observer['xchan_hash'] : ''),'view_stream')) return ''; @@ -1783,8 +1783,8 @@ require_once('include/api_auth.php'); break; case "as": $as = api_format_as($a, $ret, $user_info); - $as['title'] = $a->config['sitename']." Home Timeline"; - $as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all"; + $as['title'] = App::$config['sitename']." Home Timeline"; + $as['link']['url'] = z_root()."/".$user_info["screen_name"]."/all"; return($as); break; } @@ -1801,7 +1801,7 @@ require_once('include/api_auth.php'); function api_format_as($a, $ret, $user_info) { $as = array(); - $as['title'] = $a->config['sitename']." Public Timeline"; + $as['title'] = App::$config['sitename']." Public Timeline"; $items = array(); foreach ($ret as $item) { $singleitem["actor"]["displayName"] = $item["user"]["name"]; @@ -1857,7 +1857,7 @@ require_once('include/api_auth.php'); $items[] = $singleitem; } $as['items'] = $items; - $as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all"; + $as['link']['url'] = z_root()."/".$user_info["screen_name"]."/all"; $as['link']['rel'] = "alternate"; $as['link']['type'] = "text/html"; return($as); @@ -1978,8 +1978,8 @@ require_once('include/api_auth.php'); 'entities' => '', 'objecttype' => (($item['obj_type']) ? $item['obj_type'] : ACTIVITY_OBJ_NOTE), 'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST), - 'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type, - 'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type, + 'self' => z_root()."/api/statuses/show/".$item['id'].".".$type, + 'edit' => z_root()."/api/statuses/show/".$item['id'].".".$type, ); $status = array_merge($status, $status2); @@ -2088,8 +2088,8 @@ require_once('include/api_auth.php'); load_config('system'); $name = get_config('system','sitename'); - $server = $a->get_hostname(); - $logo = $a->get_baseurl() . '/images/rm-64.png'; + $server = App::get_hostname(); + $logo = z_root() . '/images/rm-64.png'; $email = get_config('system','admin_email'); $closed = ((get_config('system','register_policy') == REGISTER_CLOSED) ? 'true' : 'false'); $private = ((get_config('system','block_public')) ? 'true' : 'false'); @@ -2097,7 +2097,7 @@ require_once('include/api_auth.php'); if(get_config('system','api_import_size')) $texlimit = string(get_config('system','api_import_size')); $ssl = ((get_config('system','have_ssl')) ? 'true' : 'false'); - $sslserver = (($ssl === 'true') ? str_replace('http:','https:',$a->get_baseurl()) : ''); + $sslserver = (($ssl === 'true') ? str_replace('http:','https:',z_root()) : ''); $config = array( 'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '', @@ -2270,9 +2270,9 @@ require_once('include/api_auth.php'); if ($page<0) $page=0; $start = $page*$count; - $channel = $a->get_channel(); + $channel = App::get_channel(); - $profile_url = $a->get_baseurl() . '/channel/' . $channel['channel_address']; + $profile_url = z_root() . '/channel/' . $channel['channel_address']; if ($box=="sentbox") { $sql_extra = "`from_xchan`='".dbesc( $channel['channel_hash'] )."'"; } diff --git a/sources/include/api_auth.php b/sources/include/api_auth.php index 26a9df8d..dc8492b2 100644 --- a/sources/include/api_auth.php +++ b/sources/include/api_auth.php @@ -20,9 +20,9 @@ function api_login(&$a){ if (!is_null($token)){ $oauth->loginUser($token->uid); - $a->set_oauth_key($consumer->key); + App::set_oauth_key($consumer->key); - call_hooks('logged_in', $a->user); + call_hooks('logged_in', App::$user); return; } killme(); diff --git a/sources/include/apps.php b/sources/include/apps.php index 0a62dc5a..fac58b85 100644 --- a/sources/include/apps.php +++ b/sources/include/apps.php @@ -48,12 +48,12 @@ function parse_app_description($f) { $ret = array(); $baseurl = z_root(); - $channel = get_app()->get_channel(); + $channel = App::get_channel(); $address = (($channel) ? $channel['channel_address'] : ''); //future expansion - $observer = get_app()->get_observer(); + $observer = App::get_observer(); $lines = @file($f); @@ -217,7 +217,7 @@ function app_render($papp,$mode = 'view') { return ''; break; case 'observer': - $observer = get_app()->get_observer(); + $observer = App::get_observer(); if(! $observer) return ''; break; @@ -239,7 +239,7 @@ function app_render($papp,$mode = 'view') { $hosturl = z_root() . '/'; } elseif(remote_channel()) { - $observer = get_app()->get_observer(); + $observer = App::get_observer(); if($observer && $observer['xchan_network'] === 'zot') { // some folks might have xchan_url redirected offsite, use the connurl $x = parse_url($observer['xchan_connurl']); @@ -354,7 +354,7 @@ function app_store($arr) { } - $darray['app_id'] = ((x($arr,'guid')) ? $arr['guid'] : random_string(). '.' . get_app()->get_hostname()); + $darray['app_id'] = ((x($arr,'guid')) ? $arr['guid'] : random_string(). '.' . App::get_hostname()); $darray['app_sig'] = ((x($arr,'sig')) ? $arr['sig'] : ''); $darray['app_author'] = ((x($arr,'author')) ? $arr['author'] : get_observer_hash()); $darray['app_name'] = ((x($arr,'name')) ? escape_tags($arr['name']) : t('Unknown')); diff --git a/sources/include/attach.php b/sources/include/attach.php index 343922a5..ae468199 100644 --- a/sources/include/attach.php +++ b/sources/include/attach.php @@ -864,6 +864,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { // This would've been called already with a success result in photos_upload() if it was a photo. call_hooks('photo_upload_end',$ret); } + + $sync = attach_export_data($channel,$hash); + + if($sync) + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + return $ret; } @@ -1477,7 +1483,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, require_once('include/items.php'); - $poster = get_app()->get_observer(); + $poster = App::get_observer(); //if we got no object something went wrong if(!$object) @@ -1696,7 +1702,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny $ret = array(); $parent_arr = array(); $count_values = array(); - $poster = get_app()->get_observer(); + $poster = App::get_observer(); //turn allow_gid into allow_cid's foreach($arr_allow_gid as $gid) { @@ -1814,3 +1820,89 @@ function filepath_macro($s) { } +function attach_export_data($channel, $resource_id, $deleted = false) { + + $ret = array(); + + $paths = array(); + + $hash_ptr = $resource_id; + + $ret['fetch_url'] = z_root() . '/getfile'; + $ret['original_channel'] = $channel['channel_address']; + + + if($deleted) { + $ret['attach'] = array(array('hash' => $resource_id, 'deleted' => 1)); + return $ret; + } + + do { + $r = q("select * from attach where hash = '%s' and uid = %d limit 1", + dbesc($hash_ptr), + intval($channel['channel_id']) + ); + if(! $r) + break; + + if($hash_ptr === $resource_id) { + $attach_ptr = $r[0]; + } + + $hash_ptr = $r[0]['folder']; + $paths[] = $r[0]; + } while($hash_ptr); + + + + + $paths = array_reverse($paths); + + $ret['attach'] = $paths; + + + if($attach_ptr['is_photo']) { + $r = q("select * from photo where resource_id = '%s' and uid = %d order by scale asc", + dbesc($resource_id), + intval($channel['channel_id']) + ); + if($r) { + for($x = 0; $x < count($r); $x ++) { + $r[$x]['data'] = base64_encode($r[$x]['data']); + } + $ret['photo'] = $r; + } + + $r = q("select * from item where resource_id = '%s' and resource_type = 'photo' and uid = %d ", + dbesc($resource_id), + intval($channel['channel_id']) + ); + if($r) { + $ret['item'] = array(); + $items = q("select item.*, item.id as item_id from item where item.parent = %d ", + intval($r[0]['id']) + ); + if($items) { + xchan_query($items); + $items = fetch_post_tags($items,true); + foreach($items as $rr) + $ret['item'][] = encode_item($rr,true); + } + } + } + + return $ret; + +} + + +/* strip off 'store/nickname/' from the provided path */ + +function get_attach_binname($s) { + $p = $s; + if(strpos($s,'store/') === 0) { + $p = substr($s,6); + $p = substr($p,strpos($p,'/')+1); + } + return $p; +} \ No newline at end of file diff --git a/sources/include/auth.php b/sources/include/auth.php index 1a7110c2..9643da8e 100644 --- a/sources/include/auth.php +++ b/sources/include/auth.php @@ -97,11 +97,11 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && // process a logout request - if(((x($_POST, 'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) { + if(((x($_POST, 'auth-params')) && ($_POST['auth-params'] === 'logout')) || (App::$module === 'logout')) { // process logout request $args = array('channel_id' => local_channel()); call_hooks('logging_out', $args); - nuke_session(); + \Zotlabs\Web\Session::nuke(); info( t('Logged out.') . EOL); goaway(z_root()); } @@ -117,7 +117,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && intval(ACCOUNT_ROLE_ADMIN) ); if($x) { - new_cookie(60 * 60 * 24); // one day + \Zotlabs\Web\Session::new_cookie(60 * 60 * 24); // one day $_SESSION['last_login_date'] = datetime_convert(); unset($_SESSION['visitor_id']); // no longer a visitor authenticate_success($x[0], true, true); @@ -128,75 +128,41 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && dbesc($_SESSION['visitor_id']) ); if($r) { - get_app()->set_observer($r[0]); + App::set_observer($r[0]); } else { unset($_SESSION['visitor_id']); unset($_SESSION['authenticated']); } - $a->set_groups(init_groups_visitor($_SESSION['visitor_id'])); + App::set_groups(init_groups_visitor($_SESSION['visitor_id'])); } // already logged in user returning if(x($_SESSION, 'uid') || x($_SESSION, 'account_id')) { - // first check if we're enforcing that sessions can't change IP address - // @todo what to do with IPv6 addresses - if($_SESSION['addr'] && $_SESSION['addr'] != $_SERVER['REMOTE_ADDR']) { - logger('SECURITY: Session IP address changed: ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); - - $partial1 = substr($_SESSION['addr'], 0, strrpos($_SESSION['addr'], '.')); - $partial2 = substr($_SERVER['REMOTE_ADDR'], 0, strrpos($_SERVER['REMOTE_ADDR'], '.')); - - $paranoia = intval(get_pconfig($_SESSION['uid'], 'system', 'paranoia')); - if(! $paranoia) - $paranoia = intval(get_config('system', 'paranoia')); - - switch($paranoia) { - case 0: - // no IP checking - break; - case 2: - // check 2 octets - $partial1 = substr($partial1, 0, strrpos($partial1, '.')); - $partial2 = substr($partial2, 0, strrpos($partial2, '.')); - if($partial1 == $partial2) - break; - case 1: - // check 3 octets - if($partial1 == $partial2) - break; - case 3: - default: - // check any difference at all - logger('Session address changed. Paranoid setting in effect, blocking session. ' - . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); - nuke_session(); - goaway(z_root()); - break; - } - } + Zotlabs\Web\Session::return_check(); $r = q("select * from account where account_id = %d limit 1", intval($_SESSION['account_id']) ); if(($r) && (($r[0]['account_flags'] == ACCOUNT_OK) || ($r[0]['account_flags'] == ACCOUNT_UNVERIFIED))) { - get_app()->account = $r[0]; + App::$account = $r[0]; $login_refresh = false; if(! x($_SESSION,'last_login_date')) { $_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); } if(strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) { $_SESSION['last_login_date'] = datetime_convert(); + Zotlabs\Web\Session::extend_cookie(); $login_refresh = true; } authenticate_success($r[0], false, false, false, $login_refresh); } else { $_SESSION['account_id'] = 0; - nuke_session(); + \Zotlabs\Web\Session::nuke(); goaway(z_root()); } } // end logged in user returning @@ -204,7 +170,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && else { if(isset($_SESSION)) { - nuke_session(); + \Zotlabs\Web\Session::nuke(); } // handle a fresh login request @@ -237,16 +203,16 @@ else { $record = $addon_auth['user_record']; } else { - $record = get_app()->account = account_verify_password($_POST['username'], $_POST['password']); + $record = App::$account = account_verify_password($_POST['username'], $_POST['password']); - if(get_app()->account) { - $_SESSION['account_id'] = get_app()->account['account_id']; + if(App::$account) { + $_SESSION['account_id'] = App::$account['account_id']; } else { notice( t('Failed authentication') . EOL); } - logger('authenticate: ' . print_r(get_app()->account, true), LOGGER_DEBUG); + logger('authenticate: ' . print_r(App::$account, true), LOGGER_ALL); } if((! $record) || (! count($record))) { @@ -274,11 +240,13 @@ else { // (i.e. expire when the browser is closed), even when there's a time expiration // on the cookie - if($_POST['remember']) { - new_cookie(31449600); // one year + if($_POST['remember_me']) { + $_SESSION['remember_me'] = 1; + \Zotlabs\Web\Session::new_cookie(31449600); // one year } else { - new_cookie(0); // 0 means delete on browser exit + $_SESSION['remember_me'] = 0; + \Zotlabs\Web\Session::new_cookie(0); // 0 means delete on browser exit } // if we haven't failed up this point, log them in. diff --git a/sources/include/bb2diaspora.php b/sources/include/bb2diaspora.php index 81b95b30..1ed57bfd 100644 --- a/sources/include/bb2diaspora.php +++ b/sources/include/bb2diaspora.php @@ -473,7 +473,7 @@ function format_event_diaspora($ev) { $ev['start'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $ev['start'] , $bd_format))) - . '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; + . '](' . z_root() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; if(! $ev['nofinish']) $o .= t('Finishes:') . ' ' . '[' @@ -481,7 +481,7 @@ function format_event_diaspora($ev) { $ev['finish'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format ))) - . '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; + . '](' . z_root() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; if(strlen($ev['location'])) $o .= t('Location:') . bb2diaspora($ev['location']) diff --git a/sources/include/bbcode.php b/sources/include/bbcode.php index eefe7fe9..78a2759c 100644 --- a/sources/include/bbcode.php +++ b/sources/include/bbcode.php @@ -37,7 +37,7 @@ function tryzrlvideo($match) { if($zrl) $link = zid($link); - return ''; + return ''; } // [noparse][i]italic[/i][/noparse] turns into @@ -243,9 +243,7 @@ function bb_ShareAttributes($match) { if ($matches[1] != "") $message_id = $matches[1]; - - /** @FIXME - this should really be a wall-item-ago so it will get updated on the client */ - $reldate = (($posted) ? relative_date($posted) : ''); + $reldate = '' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'r') . ''; $headline = '
'; @@ -280,9 +278,9 @@ function bb_location($match) { function bb_iframe($match) { $a = get_app(); - $sandbox = ((strpos($match[1], $a->get_hostname())) ? ' sandbox="allow-scripts" ' : ''); + $sandbox = ((strpos($match[1], App::get_hostname())) ? ' sandbox="allow-scripts" ' : ''); - return ''; + return ''; } function bb_ShareAttributesSimple($match) { @@ -315,9 +313,9 @@ function bb_ShareAttributesSimple($match) { function rpost_callback($match) { if ($match[2]) { - return str_replace($match[0], get_rpost_path(get_app()->get_observer()) . '&title=' . urlencode($match[2]) . '&body=' . urlencode($match[3]), $match[0]); + return str_replace($match[0], get_rpost_path(App::get_observer()) . '&title=' . urlencode($match[2]) . '&body=' . urlencode($match[3]), $match[0]); } else { - return str_replace($match[0], get_rpost_path(get_app()->get_observer()) . '&body=' . urlencode($match[3]), $match[0]); + return str_replace($match[0], get_rpost_path(App::get_observer()) . '&body=' . urlencode($match[3]), $match[0]); } } @@ -401,7 +399,7 @@ function bb_observer($Text) { $a = get_app(); - $observer = $a->get_observer(); + $observer = App::get_observer(); if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) { if ($observer) { @@ -415,7 +413,7 @@ function bb_observer($Text) { } } - $channel = $a->get_channel(); + $channel = App::get_channel(); if (strpos($Text,'[/channel]') !== false) { if ($channel) { @@ -477,7 +475,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) if($cache) $observer = false; else - $observer = $a->get_observer(); + $observer = App::get_observer(); if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) { if ($observer) { @@ -494,7 +492,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) if($cache) $channel = false; else - $channel = $a->get_channel(); + $channel = App::get_channel(); if (strpos($Text,'[/channel]') !== false) { if ($channel) { @@ -850,7 +848,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) // crypt if (strpos($Text,'[/crypt]') !== false) { $x = random_string(); - $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
' . t('Encrypted content') . '
', $Text); + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
' . t('Encrypted content') . '
', $Text); $Text = preg_replace_callback("/\[crypt (.*?)\](.*?)\[\/crypt\]/ism", 'bb_parse_crypt', $Text); } @@ -930,7 +928,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) // $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text); // if ($tryoembed) -// $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); +// $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); // else // $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text); // } @@ -944,7 +942,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) // $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text); // if ($tryoembed) -// $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text); +// $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text); // else // $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text); // } diff --git a/sources/include/chat.php b/sources/include/chat.php index 81c5c5d6..60440204 100644 --- a/sources/include/chat.php +++ b/sources/include/chat.php @@ -202,7 +202,7 @@ function chatroom_list($uid) { require_once('include/security.php'); $sql_extra = permissions_sql($uid); - $r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d $sql_extra group by cr_name, cr_id order by cr_name", + $r = q("select allow_cid, allow_gid, deny_cid, deny_gid, cr_name, cr_expire, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d $sql_extra group by cr_name, cr_id order by cr_name", intval($uid) ); diff --git a/sources/include/cli_startup.php b/sources/include/cli_startup.php index 70ab1a24..a99164d4 100644 --- a/sources/include/cli_startup.php +++ b/sources/include/cli_startup.php @@ -9,28 +9,32 @@ function cli_startup() { global $a, $db, $default_timezone; if(is_null($a)) { - $a = new App; + $a = new miniApp; } + + App::init(); if(is_null($db)) { @include(".htconfig.php"); + $a->convert(); + if(! defined('UNO')) define('UNO', 0); - $a->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); - date_default_timezone_set($a->timezone); + App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); + date_default_timezone_set(App::$timezone); require_once('include/dba/dba_driver.php'); $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); }; - require_once('include/session.php'); + \Zotlabs\Web\Session::init(); load_config('system'); - $a->set_baseurl(get_config('system','baseurl')); + App::set_baseurl(get_config('system','baseurl')); load_hooks(); diff --git a/sources/include/comanche.php b/sources/include/comanche.php index ddf33132..4d55aee1 100644 --- a/sources/include/comanche.php +++ b/sources/include/comanche.php @@ -56,34 +56,34 @@ function comanche_parser(&$a, $s, $pass = 0) { if($pass == 0) { $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches); if($cnt) - $a->page['template'] = trim($matches[1]); + App::$page['template'] = trim($matches[1]); $cnt = preg_match("/\[template=(.*?)\](.*?)\[\/template\]/ism", $s, $matches); if($cnt) { - $a->page['template'] = trim($matches[2]); - $a->page['template_style'] = trim($matches[2]) . '_' . $matches[1]; + App::$page['template'] = trim($matches[2]); + App::$page['template_style'] = trim($matches[2]) . '_' . $matches[1]; } $cnt = preg_match("/\[template\](.*?)\[\/template\]/ism", $s, $matches); if($cnt) { - $a->page['template'] = trim($matches[1]); + App::$page['template'] = trim($matches[1]); } $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches); if($cnt) { - $a->layout['schema'] = trim($matches[1]); - $a->layout['theme'] = trim($matches[2]); + App::$layout['schema'] = trim($matches[1]); + App::$layout['theme'] = trim($matches[2]); } $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches); if($cnt) - $a->layout['theme'] = trim($matches[1]); + App::$layout['theme'] = trim($matches[1]); $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { // only the last webpage definition is used if there is more than one foreach($matches as $mtch) { - $a->layout['webpage'] = comanche_webpage($a,$mtch[1]); + App::$layout['webpage'] = comanche_webpage($a,$mtch[1]); } } @@ -92,7 +92,7 @@ function comanche_parser(&$a, $s, $pass = 0) { $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - $a->layout['region_' . $mtch[1]] = comanche_region($a,$mtch[2]); + App::$layout['region_' . $mtch[1]] = comanche_region($a,$mtch[2]); } } @@ -122,8 +122,8 @@ function comanche_menu($s, $class = '') { function comanche_replace_region($match) { $a = get_app(); - if (array_key_exists($match[1], $a->page)) { - return $a->page[$match[1]]; + if (array_key_exists($match[1], App::$page)) { + return App::$page[$match[1]]; } } @@ -136,7 +136,7 @@ function comanche_replace_region($match) { * @return channel_id */ function comanche_get_channel_id() { - $channel_id = ((is_array(get_app()->profile)) ? get_app()->profile['profile_uid'] : 0); + $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0); if ((! $channel_id) && (local_channel())) $channel_id = local_channel(); @@ -190,7 +190,7 @@ function comanche_block($s, $class = '') { } if(trim($r[0]['body']) === '$content') { - $o .= get_app()->page['content']; + $o .= App::$page['content']; } else { $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); @@ -378,6 +378,6 @@ function comanche_region(&$a, $s) { function register_page_template($arr) { - get_app()->page_layouts[$arr['template']] = array($arr['variant']); + App::$page_layouts[$arr['template']] = array($arr['variant']); return; } diff --git a/sources/include/config.php b/sources/include/config.php index 51d4e99a..712b4ca1 100644 --- a/sources/include/config.php +++ b/sources/include/config.php @@ -22,7 +22,7 @@ * an identifier. This is for example for people who do not have a local account. * The storage is of size MEDIUMTEXT. * @code{.php} - * $observer = $a->get_observer_hash(); + * $observer = App::get_observer_hash(); * if ($observer) { * $var = get_xconfig($observer, 'category', 'key'); * }@endcode @@ -38,7 +38,7 @@ * @brief Loads the hub's configuration from database to a cached storage. * * Retrieve a category ($family) of config variables from database to a cached - * storage in the global $a->config[$family]. + * storage in the global App::$config[$family]. * * @param string $family * The category of the configuration value @@ -46,19 +46,19 @@ function load_config($family) { global $a; - if(! array_key_exists($family, $a->config)) - $a->config[$family] = array(); + if(! array_key_exists($family, App::$config)) + App::$config[$family] = array(); - if(! array_key_exists('config_loaded', $a->config[$family])) { + if(! array_key_exists('config_loaded', App::$config[$family])) { $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family)); if($r !== false) { if($r) { foreach($r as $rr) { $k = $rr['k']; - $a->config[$family][$k] = $rr['v']; + App::$config[$family][$k] = $rr['v']; } } - $a->config[$family]['config_loaded'] = true; + App::$config[$family]['config_loaded'] = true; } } } @@ -68,7 +68,7 @@ function load_config($family) { * and a key. * * Get a particular config variable from the given category ($family) and the - * $key from a cached storage in $a->config[$family]. If a key is found in the + * $key from a cached storage in App::$config[$family]. If a key is found in the * DB but does not exist in local config cache, pull it into the cache so we * do not have to hit the DB again for this item. * @@ -83,16 +83,16 @@ function load_config($family) { function get_config($family, $key) { global $a; - if((! array_key_exists($family, $a->config)) || (! array_key_exists('config_loaded', $a->config[$family]))) + if((! array_key_exists($family, App::$config)) || (! array_key_exists('config_loaded', App::$config[$family]))) load_config($family); - if(array_key_exists('config_loaded', $a->config[$family])) { - if(! array_key_exists($key, $a->config[$family])) { + if(array_key_exists('config_loaded', App::$config[$family])) { + if(! array_key_exists($key, App::$config[$family])) { return false; } - return ((! is_array($a->config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) - ? unserialize($a->config[$family][$key]) - : $a->config[$family][$key] + return ((! is_array(App::$config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', App::$config[$family][$key])) + ? unserialize(App::$config[$family][$key]) + : App::$config[$family][$key] ); } return false; @@ -148,7 +148,7 @@ function set_config($family, $key, $value) { dbesc($dbvalue) ); if($ret) { - $a->config[$family][$key] = $value; + App::$config[$family][$key] = $value; $ret = $value; } return $ret; @@ -161,7 +161,7 @@ function set_config($family, $key, $value) { ); if($ret) { - $a->config[$family][$key] = $value; + App::$config[$family][$key] = $value; $ret = $value; } return $ret; @@ -170,7 +170,7 @@ function set_config($family, $key, $value) { /** * @brief Deletes the given key from the hub's configuration database. * - * Removes the configured value from the stored cache in $a->config[$family] + * Removes the configured value from the stored cache in App::$config[$family] * and removes it from the database. * * @param string $family @@ -183,8 +183,8 @@ function del_config($family, $key) { global $a; $ret = false; - if(array_key_exists($family, $a->config) && array_key_exists($key, $a->config[$family])) - unset($a->config[$family][$key]); + if(array_key_exists($family, App::$config) && array_key_exists($key, App::$config[$family])) + unset(App::$config[$family][$key]); $ret = q("DELETE FROM config WHERE cat = '%s' AND k = '%s'", dbesc($family), dbesc($key) @@ -197,7 +197,7 @@ function del_config($family, $key) { * @brief Loads all configuration values of a channel into a cached storage. * * All configuration values of the given channel are stored in global cache - * which is available under the global variable $a->config[$uid]. + * which is available under the global variable App::$config[$uid]. * * @param string $uid * The channel_id @@ -209,8 +209,8 @@ function load_pconfig($uid) { if($uid === false) return false; - if(! array_key_exists($uid, $a->config)) - $a->config[$uid] = array(); + if(! array_key_exists($uid, App::$config)) + App::$config[$uid] = array(); $r = q("SELECT * FROM pconfig WHERE uid = %d", intval($uid) @@ -220,11 +220,11 @@ function load_pconfig($uid) { foreach($r as $rr) { $k = $rr['k']; $c = $rr['cat']; - if(! array_key_exists($c, $a->config[$uid])) { - $a->config[$uid][$c] = array(); - $a->config[$uid][$c]['config_loaded'] = true; + if(! array_key_exists($c, App::$config[$uid])) { + App::$config[$uid][$c] = array(); + App::$config[$uid][$c]['config_loaded'] = true; } - $a->config[$uid][$c][$k] = $rr['v']; + App::$config[$uid][$c][$k] = $rr['v']; } } } @@ -234,7 +234,7 @@ function load_pconfig($uid) { * ($family) and a key. * * Get a particular channel's config value from the given category ($family) - * and the $key from a cached storage in $a->config[$uid]. + * and the $key from a cached storage in App::$config[$uid]. * * Returns false if not set. * @@ -254,15 +254,15 @@ function get_pconfig($uid, $family, $key, $instore = false) { if($uid === false) return false; - if(! array_key_exists($uid, $a->config)) + if(! array_key_exists($uid, App::$config)) load_pconfig($uid); - if((! array_key_exists($family, $a->config[$uid])) || (! array_key_exists($key, $a->config[$uid][$family]))) + if((! array_key_exists($family, App::$config[$uid])) || (! array_key_exists($key, App::$config[$uid][$family]))) return false; - return ((! is_array($a->config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) - ? unserialize($a->config[$uid][$family][$key]) - : $a->config[$uid][$family][$key] + return ((! is_array(App::$config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', App::$config[$uid][$family][$key])) + ? unserialize(App::$config[$uid][$family][$key]) + : App::$config[$uid][$family][$key] ); } @@ -287,27 +287,38 @@ function get_pconfig($uid, $family, $key, $instore = false) { function set_pconfig($uid, $family, $key, $value) { global $a; + // this catches subtle errors where this function has been called + // with local_channel() when not logged in (which returns false) + // and throws an error in array_key_exists below. + // we provide a function backtrace in the logs so that we can find + // and fix the calling function. + + if($uid === false) { + btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR); + return; + } + // manage array value $dbvalue = ((is_array($value)) ? serialize($value) : $value); $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); if(get_pconfig($uid, $family, $key) === false) { - if(! array_key_exists($uid, $a->config)) - $a->config[$uid] = array(); - if(! array_key_exists($family, $a->config[$uid])) - $a->config[$uid][$family] = array(); + if(! array_key_exists($uid, App::$config)) + App::$config[$uid] = array(); + if(! array_key_exists($family, App::$config[$uid])) + App::$config[$uid][$family] = array(); // keep a separate copy for all variables which were // set in the life of this page. We need this to // synchronise channel clones. - if(! array_key_exists('transient', $a->config[$uid])) - $a->config[$uid]['transient'] = array(); - if(! array_key_exists($family, $a->config[$uid]['transient'])) - $a->config[$uid]['transient'][$family] = array(); + if(! array_key_exists('transient', App::$config[$uid])) + App::$config[$uid]['transient'] = array(); + if(! array_key_exists($family, App::$config[$uid]['transient'])) + App::$config[$uid]['transient'][$family] = array(); - $a->config[$uid][$family][$key] = $value; - $a->config[$uid]['transient'][$family][$key] = $value; + App::$config[$uid][$family][$key] = $value; + App::$config[$uid]['transient'][$family][$key] = $value; $ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ", intval($uid), @@ -332,13 +343,13 @@ function set_pconfig($uid, $family, $key, $value) { // set in the life of this page. We need this to // synchronise channel clones. - if(! array_key_exists('transient', $a->config[$uid])) - $a->config[$uid]['transient'] = array(); - if(! array_key_exists($family, $a->config[$uid]['transient'])) - $a->config[$uid]['transient'][$family] = array(); + if(! array_key_exists('transient', App::$config[$uid])) + App::$config[$uid]['transient'] = array(); + if(! array_key_exists($family, App::$config[$uid]['transient'])) + App::$config[$uid]['transient'][$family] = array(); - $a->config[$uid][$family][$key] = $value; - $a->config[$uid]['transient'][$family][$key] = $value; + App::$config[$uid][$family][$key] = $value; + App::$config[$uid]['transient'][$family][$key] = $value; if($ret) return $value; @@ -349,7 +360,7 @@ function set_pconfig($uid, $family, $key, $value) { /** * @brief Deletes the given key from the channel's configuration. * - * Removes the configured value from the stored cache in $a->config[$uid] + * Removes the configured value from the stored cache in App::$config[$uid] * and removes it from the database. * * @param string $uid @@ -364,8 +375,8 @@ function del_pconfig($uid, $family, $key) { global $a; $ret = false; - if (x($a->config[$uid][$family], $key)) - unset($a->config[$uid][$family][$key]); + if (x(App::$config[$uid][$family], $key)) + unset(App::$config[$uid][$family][$key]); $ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'", intval($uid), dbesc($family), @@ -380,7 +391,7 @@ function del_pconfig($uid, $family, $key) { * @brief Loads a full xchan's configuration into a cached storage. * * All configuration values of the given observer hash are stored in global - * cache which is available under the global variable $a->config[$xchan]. + * cache which is available under the global variable App::$config[$xchan]. * * @param string $xchan * The observer's hash @@ -392,8 +403,8 @@ function load_xconfig($xchan) { if(! $xchan) return false; - if(! array_key_exists($xchan, $a->config)) - $a->config[$xchan] = array(); + if(! array_key_exists($xchan, App::$config)) + App::$config[$xchan] = array(); $r = q("SELECT * FROM xconfig WHERE xchan = '%s'", dbesc($xchan) @@ -403,11 +414,11 @@ function load_xconfig($xchan) { foreach($r as $rr) { $k = $rr['k']; $c = $rr['cat']; - if(! array_key_exists($c, $a->config[$xchan])) { - $a->config[$xchan][$c] = array(); - $a->config[$xchan][$c]['config_loaded'] = true; + if(! array_key_exists($c, App::$config[$xchan])) { + App::$config[$xchan][$c] = array(); + App::$config[$xchan][$c]['config_loaded'] = true; } - $a->config[$xchan][$c][$k] = $rr['v']; + App::$config[$xchan][$c][$k] = $rr['v']; } } } @@ -417,7 +428,7 @@ function load_xconfig($xchan) { * name ($family) and a key. * * Get a particular observer's config value from the given category ($family) - * and the $key from a cached storage in $a->config[$xchan]. + * and the $key from a cached storage in App::$config[$xchan]. * * Returns false if not set. * @@ -435,15 +446,15 @@ function get_xconfig($xchan, $family, $key) { if(! $xchan) return false; - if(! array_key_exists($xchan, $a->config)) + if(! array_key_exists($xchan, App::$config)) load_xconfig($xchan); - if((! array_key_exists($family, $a->config[$xchan])) || (! array_key_exists($key, $a->config[$xchan][$family]))) + if((! array_key_exists($family, App::$config[$xchan])) || (! array_key_exists($key, App::$config[$xchan][$family]))) return false; - return ((! is_array($a->config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) - ? unserialize($a->config[$xchan][$family][$key]) - : $a->config[$xchan][$family][$key] + return ((! is_array(App::$config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', App::$config[$xchan][$family][$key])) + ? unserialize(App::$config[$xchan][$family][$key]) + : App::$config[$xchan][$family][$key] ); } @@ -473,12 +484,12 @@ function set_xconfig($xchan, $family, $key, $value) { $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); if(get_xconfig($xchan, $family, $key) === false) { - if(! array_key_exists($xchan, $a->config)) - $a->config[$xchan] = array(); - if(! array_key_exists($family, $a->config[$xchan])) - $a->config[$xchan][$family] = array(); + if(! array_key_exists($xchan, App::$config)) + App::$config[$xchan] = array(); + if(! array_key_exists($family, App::$config[$xchan])) + App::$config[$xchan][$family] = array(); - $a->config[$xchan][$family][$key] = $value; + App::$config[$xchan][$family][$key] = $value; $ret = q("INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' ) ", dbesc($xchan), dbesc($family), @@ -497,7 +508,7 @@ function set_xconfig($xchan, $family, $key, $value) { dbesc($key) ); - $a->config[$xchan][$family][$key] = $value; + App::$config[$xchan][$family][$key] = $value; if($ret) return $value; @@ -507,7 +518,7 @@ function set_xconfig($xchan, $family, $key, $value) { /** * @brief Deletes the given key from the observer's config. * - * Removes the configured value from the stored cache in $a->config[$xchan] + * Removes the configured value from the stored cache in App::$config[$xchan] * and removes it from the database. * * @param string $xchan @@ -522,8 +533,8 @@ function del_xconfig($xchan, $family, $key) { global $a; $ret = false; - if(x($a->config[$xchan][$family], $key)) - unset($a->config[$xchan][$family][$key]); + if(x(App::$config[$xchan][$family], $key)) + unset(App::$config[$xchan][$family][$key]); $ret = q("DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'", dbesc($xchan), dbesc($family), diff --git a/sources/include/contact_selectors.php b/sources/include/contact_selectors.php index d44bee78..0de4ece0 100644 --- a/sources/include/contact_selectors.php +++ b/sources/include/contact_selectors.php @@ -73,16 +73,18 @@ function contact_poll_interval($current, $disabled = false) { function network_to_name($s) { $nets = array( - NETWORK_DFRN => t('Friendica'), - NETWORK_OSTATUS => t('OStatus'), - NETWORK_FEED => t('RSS/Atom'), - NETWORK_MAIL => t('Email'), - NETWORK_DIASPORA => t('Diaspora'), - NETWORK_FACEBOOK => t('Facebook'), - NETWORK_ZOT => t('Zot'), - NETWORK_LINKEDIN => t('LinkedIn'), - NETWORK_XMPP => t('XMPP/IM'), - NETWORK_MYSPACE => t('MySpace'), + NETWORK_DFRN => t('Friendica'), + NETWORK_FRND => t('Friendica'), + NETWORK_OSTATUS => t('OStatus'), + NETWORK_GNUSOCIAL => t('GNU-Social'), + NETWORK_FEED => t('RSS/Atom'), + NETWORK_MAIL => t('Email'), + NETWORK_DIASPORA => t('Diaspora'), + NETWORK_FACEBOOK => t('Facebook'), + NETWORK_ZOT => t('Zot'), + NETWORK_LINKEDIN => t('LinkedIn'), + NETWORK_XMPP => t('XMPP/IM'), + NETWORK_MYSPACE => t('MySpace'), ); call_hooks('network_to_name', $nets); diff --git a/sources/include/contact_widgets.php b/sources/include/contact_widgets.php index a60b8b1c..ba1241fc 100644 --- a/sources/include/contact_widgets.php +++ b/sources/include/contact_widgets.php @@ -10,7 +10,7 @@ function findpeople_widget() { if(get_config('system','invitation_only')) { $x = get_pconfig(local_channel(),'system','invites_remaining'); if($x || is_site_admin()) { - $a->page['aside'] .= '