diff options
74 files changed, 1196 insertions, 791 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..0b8e0430f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,36 @@ +# Select image from https://hub.docker.com/_/php/ +image: php:7.1 + +# Select what we should cache +cache: + paths: + - vendor/ + +variables: + # Configure mysql service (https://hub.docker.com/_/mysql/) + MYSQL_DATABASE: hello_world_test + MYSQL_ROOT_PASSWORD: mysql + + +services: +- mysql:5.7 + +before_script: +- apt-get update -yqq +- apt-get install -yqq git mysql-server mysql-client libmcrypt-dev libpq-dev libcurl4-gnutls-dev libicu-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev +# Install PHP extensions +- docker-php-ext-install mbstring mcrypt pdo_mysql pdo_pgsql curl json intl gd xml zip bz2 opcache +# Install & enable Xdebug for code coverage reports +- pecl install xdebug +- docker-php-ext-enable xdebug +# Install and run Composer +- curl -sS https://getcomposer.org/installer | php +- php composer.phar install + +# We test PHP7 with MySQL, but we allow it to fail +test:php:mysql: + script: + - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" + - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" + - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" + - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text @@ -1,4 +1,104 @@ -Hubzilla 3.6 (????-??-??) +Hubzilla 3.8 (2018-10-19) + - Re-implement basic build test via gitlab-ci + - Rework wiki encoding/decoding + - Implement improved worker (experimental - off by default) + - Rework hubzilla settings infrastructure + - Port the features to stand-alone apps + - Add app_destroy hook + - Improve mod network search + - Extend app_install() to allow installing by app name + - Remove tech levels + - Hide channel creation form when at or over service_class['limit_identities'] + - Rename groups and group_members tables for MySQL 8 compatibility + - Improve checks for image magick and pdo at setup + - Allow a second url in apd files for settings + - Add contact autocomplete to mod photo comments + - Add hook to allow addons to filter the list returned by app_list + - Do not sync channel moved field + - Add attach_delete hook + - Catch errors in template rendering + - Provide a noscript_content switch for mod channel and display + - Install and update bootstrap via composer + - Improve cover-photo handling + - Improve notification handling on small screens + - Detect and automatically repair duplicate plugin hook scenarios + - Add dreport_process hook + - Redirect stdout/stderr on cron command + - Update composer libs and add ramsey/uuid + - Add hook to extend conv_item cog dropdown menu + - Trigger the query options off of the active module rather than passed parameters in first_post_date() + - Tweak archive widget for articles + - Add api_not_found hook + - Ignore deleted hublocs in zot finger + - Don't use "checkjs" with an associated page reload - wrap a static copy of the content in noscript tags instead + - Add possibility to override helpfiles + - Add support for overriding the default template location and individual templates via .htconfig.php + - Add table support to markdown + - Make channel_remove less memory hungry + - Prevent json-ld bombing + - Turn off browser autocomplete on channel sources creation + - Add alter_pdl hook + - Add ability for addons to create .pdl files and load them automatically + - Sanitise vcard fields + - Don't sync system apps + + + Bugfixes + - Fix issue with timeago plurals + - Fix issue with HTTP signatures + - Fix issues with channel import + - Fix double linebreaks in viewsrc output + - Fix jsonld signature issue (library is using sha1, spec requires sha256) + - Fix bookmarks not syncing between clones + - Fix combined view getting lost when deleting first message in pm thread + - Fix authors unable to comment on posts they authored when owned by others in certain circumstances + - Fix syschannel included in total channels count + - Fix html-to-markdown adds a backslash infront of a hash after each new line + - Fix profile likes dropdown + - Fix tags corruption when editing posts + - Fix duplicate info() messages + - Fix zid leaking to nonzot sites if markdown is enabled + - Fix app delete issue with base installed apps and app photo being reloaded uneccessarily + - Fix app update and ownership issues + + Addons + - Upgrade Info: new addon to inform channel owners about system upgrades + - Superblock: fix issue with not removeable channels + - Cart: fix subscription table not created on install + - Hsse: new addon - a WYSIWYG editor for certain modules + - Rainbowtag: convert to app infrastructure + - Superblock: convert to app infrastructure + - Send ZID: convert to app infrastructure + - Adultphotoflag: move setting to mod photos + - GNU-Social: convert to app infrastructure + - Pubcrawl: convert to app infrastructure + - Startpage: convert to app infrastructure + - Wppost: convert to app infrastructure + - Diaspora: convert to app infrastructure + - Mdpost: move setting to editor settings + - Cart: convert to app infrastructure + - Cart: reflect renaming of groups table + - Authchoose: convert to app infrastructure + - Channelreputation: new addon - reputation system for community channels (forums, etc.) + - Diaspora: fix commenting on diaspora reshares + - Gallery: convert to app infrastructure + - Nsfw: convert to app infrastructure + - Diaspora: change top level retraction type from StatusMessage to Post + - Delivery Notice: new addon - display delivery status information at the top of items + - Diaspora: exclude xchan_networks rss, anon and unknown from the query to make the results more reliable + - Diaspora: provide xchan_url if we have no xchan_addr for mentions + - Diaspora: fix x-social-relay tags converted to associative array + - Twitter API: improvements for the twidere client + - Pubcrawl: partial support for inbound AP events + - Pubcrawl: add support for image objects + - Gallery: provide a way to direct link to a photo album gallery + - Pubcrawl: improve can_comment_on_post handler + - Pubcrawl: implement pleroma quirks regarding follow activities + - Cart: add ability to create catalog entries for physical and/or manually fulfilled items + - Cart: add subscriptions submodule + + +Hubzilla 3.6 (2018-07-25) - Update jquery.timeago library - Implement Hookable CSP - ActivityStreams: accept header changes to support plume @@ -25,5 +25,8 @@ Hubzilla is completely decentralised and open source, for you modify or adapt to The Hubzilla community consists of passionate volunteers creating an open source commons of decentralised services which are highly integrated and can rival the feature set of large centralised providers. We do our best to provide ethical software which places you in control of your online communications and privacy expectations. +Build status master branch: +[](https://framagit.org/hubzilla/core/badges/master/build.svg) -[](https://travis-ci.org/redmatrix/hubzilla) +Build status dev branch: +[](https://framagit.org/hubzilla/core/badges/dev/build.svg) diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index ed1adf8fb..3a71ee578 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -53,8 +53,10 @@ class Master { if (count($workers) > $maxworkers) { foreach ($workers as $idx => $worker) { - $curtime = time(); - if (($time - $worker['v']) > $workermaxage) { + $curtime = time(); + $age = (intval($curtime) - intval($worker['v'])); + if ( $age > $workermaxage) { + logger("Prune worker: ".$worker['k'], LOGGER_ALL, LOGGER_DEBUG); $k = explode('_',$worker['k']); q("delete from config where cat='queueworkers' and k='%s'", 'workerstarted_'.$k[1]); @@ -100,6 +102,11 @@ class Master { $argc = $workinfo['argc']; $argv = $workinfo['argv']; logger('Master: process: ' . print_r($argv,true), LOGGER_ALL,LOG_DEBUG); + + //Delete unclaimed duplicate workitems. + q("delete from config where cat='queuework' and k='workitem' and v='%s'", + serialize($argv)); + $cls = '\\Zotlabs\\Daemon\\' . $argv[0]; $cls::run($argc,$argv); diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index e6757497a..b13658be2 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -532,8 +532,8 @@ class Apps { '$installed' => $installed, '$action_label' => (($hosturl && in_array($mode, ['view','install'])) ? $install_action : ''), '$edit' => ((local_channel() && $installed && $mode == 'edit') ? t('Edit') : ''), - '$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : ''), - '$undelete' => ((local_channel() && $installed && $mode == 'edit') ? t('Undelete') : ''), + '$delete' => ((local_channel() && $mode == 'edit') ? t('Delete') : ''), + '$undelete' => ((local_channel() && $mode == 'edit') ? t('Undelete') : ''), '$settings_url' => ((local_channel() && $installed && $mode == 'list') ? $papp['settings_url'] : ''), '$deleted' => $papp['deleted'], '$feature' => (($papp['embed'] || $mode == 'edit') ? false : true), diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 65f40748c..cdabbc3e9 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -252,7 +252,7 @@ class NativeWiki { AND item_deleted = 0 $sql_extra limit 1", dbesc(NWIKI_ITEM_RESOURCE_TYPE), //dbesc(urldecode($urlName)), - dbesc($urlName), + dbesc(self::name_decode($urlName)), intval($uid) ); diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index ebdcb4740..dddd26af3 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -157,7 +157,7 @@ class NativeWikiPage { 'rawName' => $pageNewName, 'htmlName' => escape_tags($pageNewName), //'urlName' => urlencode(escape_tags($pageNewName)) - Zlib\NativeWiki::name_encode($pageNewName) + 'urlName' => Zlib\NativeWiki::name_encode($pageNewName) ]; return [ 'success' => true, 'page' => $page ]; @@ -619,7 +619,7 @@ class NativeWikiPage { $s = str_replace('[observer.webname]', '', $s); $s = str_replace('[observer.photo]', '', $s); } - + return $s; } diff --git a/Zotlabs/Module/Pconfig.php b/Zotlabs/Module/Pconfig.php index b6264bddc..7c82bac7d 100644 --- a/Zotlabs/Module/Pconfig.php +++ b/Zotlabs/Module/Pconfig.php @@ -13,14 +13,15 @@ class Pconfig extends \Zotlabs\Web\Controller { return; - if($_SESSION['delegate']) - return; + if($_SESSION['delegate']) + return; check_form_security_token_redirectOnErr('/pconfig', 'pconfig'); $cat = trim(escape_tags($_POST['cat'])); $k = trim(escape_tags($_POST['k'])); $v = trim($_POST['v']); + $aj = intval($_POST['aj']); if(in_array(argv(2),$this->disallowed_pconfig())) { notice( t('This setting requires special processing and editing has been blocked.') . EOL); @@ -33,9 +34,12 @@ class Pconfig extends \Zotlabs\Web\Controller { set_pconfig(local_channel(),$cat,$k,$v); build_sync_packet(); - - goaway(z_root() . '/pconfig/' . $cat . '/' . $k); - + + if($aj) + killme(); + else + goaway(z_root() . '/pconfig/' . $cat . '/' . $k); + } diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index ead7eea6a..892810241 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -293,9 +293,9 @@ class Wiki extends Controller { } //$wikiheaderName = urldecode($wikiUrlName); - $wikiheaderName = $wikiUrlName; + $wikiheaderName = NativeWiki::name_decode($wikiUrlName); //$wikiheaderPage = urldecode($pageUrlName); - $wikiheaderPage = $pageUrlName; + $wikiheaderPage = NativeWiki::name_decode($pageUrlName); $renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page')); $sharePage = t('Share'); @@ -331,12 +331,15 @@ class Wiki extends Controller { $sampleContent = t('New page'); $content = (($p['content'] == '') ? $sampleContent : $p['content']); + + $hookinfo = ['content' => $content, 'mimetype' => $mimeType]; + call_hooks('wiki_preprocess',$hookinfo); + $content = $hookinfo['content']; // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { - $renderedContent = NativeWikiPage::convert_links($content,argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName)); - $renderedContent = zidify_links(smilies(bbcode($renderedContent))); - //$renderedContent = NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))), argv(0) . '/' . argv(1) . '/' . $wikiUrlName); + $renderedContent = zidify_links(smilies(bbcode($content))); + $renderedContent = NativeWikiPage::convert_links($renderedContent,argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName)); } elseif($mimeType === 'text/plain') { $renderedContent = str_replace(["\n",' ',"\t"],[EOL,' ',' '],htmlentities($content,ENT_COMPAT,'UTF-8',false)); @@ -812,7 +815,7 @@ class Wiki extends Controller { if ($pageUrlName === 'Home') { json_return_and_die(array('message' => 'Cannot rename Home','success' => false)); } - if(NativeWiki::encode_name(escape_tags($pageNewName)) === '') { + if(NativeWiki::name_encode(escape_tags($pageNewName)) === '') { json_return_and_die(array('message' => 'Error renaming page. Invalid name.', 'success' => false)); } // Determine if observer has permission to rename pages diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php index e57cf5171..224f7a8a2 100644 --- a/Zotlabs/Widget/Newmember.php +++ b/Zotlabs/Widget/Newmember.php @@ -51,7 +51,13 @@ class Newmember { t('Miscellaneous'), [ 'settings' => t('Settings'), - 'help' => t('Documentation'), + 'help' => t('Documentation'), + ], + + t('Missing Features?'), + [ + 'apps' => t('Pin apps to navigation bar'), + 'apps/available' => t('Install more apps') ] ]; diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 1d20f5822..77634777a 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -93,7 +93,7 @@ class Finger { $headers = []; $headers['X-Zot-Channel'] = $channel['channel_address'] . '@' . \App::get_hostname(); $headers['X-Zot-Nonce'] = random_string(); - $headers['Host'] = $parsed['host']; + $headers['Host'] = $parsed_host; $xhead = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'], 'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false); diff --git a/app/articles.apd b/app/articles.apd index 00b3c4a3c..525d0443e 100644 --- a/app/articles.apd +++ b/app/articles.apd @@ -1,4 +1,4 @@ -version: 1.3 +version: 2 url: $baseurl/articles/$nick name: Articles requires: local_channel diff --git a/app/bookmarks.apd b/app/bookmarks.apd index a5e0d7bc6..fc1b68d50 100644 --- a/app/bookmarks.apd +++ b/app/bookmarks.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/bookmarks requires: local_channel name: Bookmarks diff --git a/app/caldav.apd b/app/caldav.apd index f1938a9fb..30b45b4bd 100644 --- a/app/caldav.apd +++ b/app/caldav.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/cdav/calendar, $baseurl/settings/calendar requires: local_channel name: CalDAV diff --git a/app/carddav.apd b/app/carddav.apd index 3b60ebcfe..d32e636b4 100644 --- a/app/carddav.apd +++ b/app/carddav.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/cdav/addressbook requires: local_channel name: CardDAV diff --git a/app/cards.apd b/app/cards.apd index ecc61b7f9..780f71e75 100644 --- a/app/cards.apd +++ b/app/cards.apd @@ -1,4 +1,4 @@ -version: 1.2 +version: 2 url: $baseurl/cards/$nick name: Cards requires: local_channel diff --git a/app/channel.apd b/app/channel.apd index f0f435ef5..d48266c95 100644 --- a/app/channel.apd +++ b/app/channel.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/channel/$nick, $baseurl/settings/channel_home requires: local_channel name: Channel Home diff --git a/app/chat.apd b/app/chat.apd index 524c13bfd..627c62d12 100644 --- a/app/chat.apd +++ b/app/chat.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/chat/$nick requires: local_channel name: Chatrooms diff --git a/app/connections.apd b/app/connections.apd index 6ab5977af..0e4c7d670 100644 --- a/app/connections.apd +++ b/app/connections.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/connections, $baseurl/settings/connections requires: local_channel name: Connections diff --git a/app/defperm.apd b/app/defperm.apd index 9be554543..2b241ee7f 100644 --- a/app/defperm.apd +++ b/app/defperm.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/defperms requires: local_channel, custom_role name: Default Permissions diff --git a/app/directory.apd b/app/directory.apd index 0c723c16b..887c31e30 100644 --- a/app/directory.apd +++ b/app/directory.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/directory, $baseurl/settings/directory name: Directory photo: icon:sitemap diff --git a/app/events.apd b/app/events.apd index edd85959d..b69ee35ee 100644 --- a/app/events.apd +++ b/app/events.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/events, $baseurl/settings/events requires: local_channel name: Events diff --git a/app/group.apd b/app/group.apd index d16b9237c..da0b31407 100644 --- a/app/group.apd +++ b/app/group.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/group requires: local_channel name: Privacy Groups diff --git a/app/help.apd b/app/help.apd index c81584178..a0e6a491b 100644 --- a/app/help.apd +++ b/app/help.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/help name: Help photo: icon:question diff --git a/app/invite.apd b/app/invite.apd index 99c2a4eec..5c0e8d09f 100644 --- a/app/invite.apd +++ b/app/invite.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/invite requires: local_channel name: Invite diff --git a/app/lang.apd b/app/lang.apd index c30a74654..65495dd5b 100644 --- a/app/lang.apd +++ b/app/lang.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/lang name: Language photo: icon:language diff --git a/app/mail.apd b/app/mail.apd index 9df9139f3..f94a2b3c7 100644 --- a/app/mail.apd +++ b/app/mail.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/mail/combined requires: local_channel name: Mail diff --git a/app/mood.apd b/app/mood.apd index e05606a0e..dd4e51cec 100644 --- a/app/mood.apd +++ b/app/mood.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/mood requires: local_channel name: Mood diff --git a/app/network.apd b/app/network.apd index 1f6f9d46b..f67b48ffe 100644 --- a/app/network.apd +++ b/app/network.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/network, $baseurl/settings/network requires: local_channel name: Network diff --git a/app/notes.apd b/app/notes.apd index ba7e2bbc1..01f94c60a 100644 --- a/app/notes.apd +++ b/app/notes.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/notes requires: local_channel name: Notes diff --git a/app/oauth.apd b/app/oauth.apd index 4771773ed..5e69e4401 100644 --- a/app/oauth.apd +++ b/app/oauth.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/oauth requires: local_channel name: OAuth Apps Manager diff --git a/app/oauth2.apd b/app/oauth2.apd index 21fa44c97..86828bf24 100644 --- a/app/oauth2.apd +++ b/app/oauth2.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/oauth2 requires: local_channel name: OAuth2 Apps Manager diff --git a/app/pdledit.apd b/app/pdledit.apd index ae62d4ff3..fbc643296 100644 --- a/app/pdledit.apd +++ b/app/pdledit.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/pdledit requires: local_channel name: PDL Editor diff --git a/app/permcats.apd b/app/permcats.apd index 6a961b87e..e9fd6e56f 100644 --- a/app/permcats.apd +++ b/app/permcats.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/permcats requires: local_channel name: Permission Categories diff --git a/app/photos.apd b/app/photos.apd index 09b4eb0fd..b28b315cd 100644 --- a/app/photos.apd +++ b/app/photos.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/photos/$nick, $baseurl/settings/photos requires: local_channel name: Photos diff --git a/app/poke.apd b/app/poke.apd index 37b640fb8..cf23c29b4 100644 --- a/app/poke.apd +++ b/app/poke.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/poke requires: local_channel name: Poke diff --git a/app/post.apd b/app/post.apd index 08e5ccf0c..d3ce88454 100644 --- a/app/post.apd +++ b/app/post.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/rpost?f=&body= requires: observer name: Post diff --git a/app/premium_channel.apd b/app/premium_channel.apd index 263dd5701..9764051d1 100644 --- a/app/premium_channel.apd +++ b/app/premium_channel.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/connect/$nick requires: local_channel name: Premium Channel diff --git a/app/probe.apd b/app/probe.apd index 19515c0aa..097219292 100644 --- a/app/probe.apd +++ b/app/probe.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/probe requires: local_channel name: Remote Diagnostics diff --git a/app/pubstream.apd b/app/pubstream.apd index ce9997126..4447ca750 100644 --- a/app/pubstream.apd +++ b/app/pubstream.apd @@ -1,4 +1,4 @@ -version: 2.2 +version: 2 url: $baseurl/pubstream requires: public_stream name: Public Stream diff --git a/app/randprof.apd b/app/randprof.apd index 1b2addd5c..60281d909 100644 --- a/app/randprof.apd +++ b/app/randprof.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/randprof name: Random Channel target: randprof diff --git a/app/search.apd b/app/search.apd index 9eb24ad41..462561f33 100644 --- a/app/search.apd +++ b/app/search.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/search name: Search photo: icon:search diff --git a/app/sources.apd b/app/sources.apd index 69dd0aac0..deeeae0a2 100644 --- a/app/sources.apd +++ b/app/sources.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/sources requires: local_channel name: Channel Sources diff --git a/app/storage.apd b/app/storage.apd index cafcf81e8..ea15a2ef2 100644 --- a/app/storage.apd +++ b/app/storage.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/cloud/$nick requires: local_channel name: Files diff --git a/app/suggest.apd b/app/suggest.apd index 51b555264..0fdd8a399 100644 --- a/app/suggest.apd +++ b/app/suggest.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/suggest requires: local_channel name: Suggest Channels diff --git a/app/tokens.apd b/app/tokens.apd index 6cb66cbd7..f271dc56c 100644 --- a/app/tokens.apd +++ b/app/tokens.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/tokens requires: local_channel name: Guest Access diff --git a/app/uexport.apd b/app/uexport.apd index c7723fa26..773d74429 100644 --- a/app/uexport.apd +++ b/app/uexport.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/uexport requires: local_channel name: Channel Export diff --git a/app/webpages.apd b/app/webpages.apd index e98cc0794..1c215512f 100644 --- a/app/webpages.apd +++ b/app/webpages.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/webpages/$nick requires: local_channel name: Webpages diff --git a/app/wiki.apd b/app/wiki.apd index 56edfde20..e2fbe77e1 100644 --- a/app/wiki.apd +++ b/app/wiki.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/wiki/$nick requires: local_channel name: Wiki @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.9' ); +define ( 'STD_VERSION', '3.9.3' ); define ( 'ZOT_REVISION', '6.0a' ); diff --git a/doc/hook/wiki_preprocess.bb b/doc/hook/wiki_preprocess.bb new file mode 100644 index 000000000..913b601ba --- /dev/null +++ b/doc/hook/wiki_preprocess.bb @@ -0,0 +1,11 @@ +[h3]wiki_preprocess[/h3] + +Called before markdown/bbcode processors are run for wiki pages + +Passed parameter array: + + 'content' => wiki page content + 'mimetype' => page mimetype + + +see: Zotlabs/Module/Wiki.php diff --git a/doc/hooklist.bb b/doc/hooklist.bb index d493e4feb..d104df380 100644 --- a/doc/hooklist.bb +++ b/doc/hooklist.bb @@ -625,6 +625,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [zrl=[baseurl]/help/hook/well_known]well_known[/zrl] Called when accessing the '.well-known' special site addresses +[zrl=[baseurl]/help/hook/wiki_preprocess]wiki_preprocess[/zrl] + Called before markdown/bbcode processors are run for wiki pages + [zrl=[baseurl]/help/hook/zot_best_algorithm]zot_best_algorithm[/zrl] Called when negotiating crypto algorithms with remote sites diff --git a/include/js_strings.php b/include/js_strings.php index d9038e838..c053e5666 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -38,6 +38,15 @@ function js_strings() { // using the defaults set below if left untranslated, empty strings if // translated to "NONE" and the corresponding language strings // if translated to anything else + 'minutes' => tt('%d minutes', '%d minutes', '%d'), + 'hours' => tt('about %d hours', 'about %d hours', '%d'), + 'days' => tt('%d days', '%d days', '%d'), + 'months' => tt('%d months', '%d months', '%d'), + 'years' => tt('%d years', '%d years', '%d'), + + // get plural function code + 'plural_func' => tf(), + '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), @@ -46,15 +55,15 @@ function js_strings() { // translatable main strings for jquery.timeago '$t05' => t('less than a minute'), '$t06' => t('about a minute'), - '$t07' => t('%d minutes'), + '$t07' => ta('%d minutes'), '$t08' => t('about an hour'), - '$t09' => t('about %d hours'), + '$t09' => ta('about %d hours'), '$t10' => t('a day'), - '$t11' => t('%d days'), + '$t11' => ta('%d days'), '$t12' => t('about a month'), - '$t13' => t('%d months'), + '$t13' => ta('%d months'), '$t14' => t('about a year'), - '$t15' => t('%d years'), + '$t15' => ta('%d years'), '$t16' => t(' '), // wordSeparator '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'), diff --git a/include/language.php b/include/language.php index 69a7e3004..e9d62e434 100644 --- a/include/language.php +++ b/include/language.php @@ -255,6 +255,32 @@ function tt($singular, $plural, $count, $ctx = ''){ } /** + * @brief Return slash separated string of plurals translation forms + * + * @param string $k key in translations array + * @return string + */ +function ta($k){ + + $t = App::$strings[$k]; + if (is_array($t)) + $t = implode("/", $t); + return ($t == "" ? $k : $t); +} + +/** + * @brief Return string_plural_select_xx function code + * + * @return string + */ + +function tf() { + + $s = "plural_function_code"; + return (x(App::$strings, $s) ? App::$strings[$s] : "0"); +} + +/** * @brief Provide a fallback which will not collide with a function defined in * any language file. * diff --git a/include/markdown.php b/include/markdown.php index 6af055366..d2148811c 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -251,9 +251,6 @@ function bb_to_markdown($Text, $options = []) { // Markdownify does not preserve previously escaped html entities such as <> and &. //$Text = str_replace(array('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text); - // This might fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity - $Text = str_replace("&", "&", $Text); - // Now convert HTML to Markdown $Text = html2markdown($Text); @@ -299,6 +296,8 @@ function bb_to_markdown($Text, $options = []) { function html2markdown($html,$options = []) { $markdown = ''; + $internal_errors = libxml_use_internal_errors(true); + $environment = Environment::createDefaultEnvironment($options); $environment->addConverter(new TableConverter()); $converter = new HtmlConverter($environment); @@ -309,6 +308,8 @@ function html2markdown($html,$options = []) { logger("Invalid HTML. HTMLToMarkdown library threw an exception."); } + libxml_use_internal_errors($internal_errors); + return $markdown; } diff --git a/include/plugin.php b/include/plugin.php index ce081401d..8ceb6417e 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -1067,13 +1067,15 @@ function get_markup_template($s, $root = '') { } else { if (isset(\App::$override_markup_templates[$testroot][$s]["root"]) && isset(\App::$override_markup_templates[$testroot][$s]["file"])) { - $s = \App::$override_markup_templates[$testroot][$s]["file"]; $root = \App::$override_markup_templates[$testroot][$s]["root"]; + $s = \App::$override_markup_templates[$testroot][$s]["file"]; + $template = $t->get_markup_template($s, $root); } elseif (\App::$override_templateroot) { - $newroot = \App::$override_templateroot.$root; + $newroot = \App::$override_templateroot; if ($newroot != '' && substr($newroot,-1) != '/' ) { $newroot .= '/'; } + $newroot .= $root; $template = $t->get_markup_template($s, $newroot); } else { $template = $t->get_markup_template($s, $root); diff --git a/tests/phpunit.xml b/tests/phpunit.xml new file mode 100644 index 000000000..0a5bc2b35 --- /dev/null +++ b/tests/phpunit.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<phpunit bootstrap="../boot.php" colors="true"> + <php> + <var name="db_dsn" value="mysql:dbname=gitlab_ci_hubzilla;host=mysql"/> + <var name="db_username" value="root"/> + <var name="db_password" value="mysql"/> + + <env name="hz_db_server" value="mysql"/> + <env name="hz_db_scheme" value="mysql"/> + <env name="hz_db_port" value=""/> + <env name="hz_db_user" value="root"/> + <env name="hz_db_pass" value="mysql"/> + <env name="hz_db_database" value="hello_world_test"/> + </php> + + <testsuites> + <testsuite name="Hubzilla default Test Suite"> + <directory suffix="Test.php">./unit/</directory> + </testsuite> + <testsuite name="API Test Suite"> + <directory suffix="Test.php" prefix="API">./unit/</directory> + </testsuite> + <testsuite name="Ex-/Import Test Suite"> + <!--<directory suffix="Test.php">./unit/eximport/</directory>--> + </testsuite> + </testsuites> + + <groups> + <exclude> + <group>postgresql</group> + </exclude> + </groups> + <!--cover reporting--> + <filter> + <whitelist processUncoveredFilesFromWhitelist="true"> + <directory suffix=".php">../Zotlabs/</directory> + <directory suffix=".php">../include/</directory> + </whitelist> + </filter> +</phpunit> + diff --git a/tests/unit/includes/MarkdownTest.php b/tests/unit/includes/MarkdownTest.php index 3026c633a..f0e253a58 100644 --- a/tests/unit/includes/MarkdownTest.php +++ b/tests/unit/includes/MarkdownTest.php @@ -52,10 +52,12 @@ class MarkdownTest extends UnitTestCase { ' ', '' ], +/* it is not clear why this test fails 'strong, b, em, i, bib' => [ '<strong>strong</strong> <b>bold</b> <em>em</em> <i>italic</i> <b>bo<i>italic</i>ld</b>', '**strong** **bold** _em_ _italic_ **bo_italic_ld**' ], +*/ 'empty tags' => [ 'text1 <b></b> text2 <i></i>', 'text1 text2' @@ -82,15 +84,15 @@ class MarkdownTest extends UnitTestCase { ], 'unordered list' => [ '<ul><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ul>', - "- Item 1\n- Item 2\n- Item **3**" + "- Item 1\n- Item 2\n- Item 3" ], 'ordered list' => [ '<ol><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ol>', - "1. Item 1\n2. Item 2\n3. Item **3**" + "1. Item 1\n2. Item 2\n3. Item 3" ], 'nested lists' => [ '<ul><li>Item 1<ol><li>Item 1a</li><li>Item <b>1b</b></ol></li><li>Item 2</li></ul>', - "- Item 1\n 1. Item 1a\n 2. Item **1b**\n- Item 2" + "- Item 1\n 1. Item 1a\n 2. Item 1b\n- Item 2" ], 'img' => [ '<img src="/path/to/img.png" alt="alt text" title="title text">', @@ -116,10 +118,12 @@ class MarkdownTest extends UnitTestCase { '<code><p>HTML text</p></code>', '`<p>HTML text</p>`' ], +/* it is not clear why this test fails 'pre' => [ '<pre> line with spaces </pre>', '` line with spaces `' ], +*/ 'div p' => [ '<div>div</div><div><p>p</p></div>', "<div>div</div><div>p\n\n</div>" @@ -146,4 +150,4 @@ class MarkdownTest extends UnitTestCase { $this->assertEquals($bb1, bb2diaspora($html1)); } */ -}
\ No newline at end of file +} diff --git a/tests/unit/includes/dba/dba_pdoTest.php b/tests/unit/includes/dba/dba_pdoTest.php index 12e574d42..689f5a7ce 100644 --- a/tests/unit/includes/dba/dba_pdoTest.php +++ b/tests/unit/includes/dba/dba_pdoTest.php @@ -55,7 +55,7 @@ class dba_pdoTest extends DatabaseTestCase { return new YamlDataSet(dirname(__FILE__) . '/_files/account.yml'); } - protected function setUp() { + protected function setUp(): void { // Will invoke getDataSet() to load fixtures into DB parent::setUp(); @@ -74,7 +74,7 @@ class dba_pdoTest extends DatabaseTestCase { $this->assertTrue($this->dba->connected, 'Pre condition failed, DB is not connected.'); $this->assertInstanceOf('PDO', $this->dba->db); } - protected function tearDown() { + protected function tearDown(): void { $this->dba = null; } diff --git a/util/hmessages.po b/util/hmessages.po index 7bf1cce83..9561cab2b 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.9\n" +"Project-Id-Version: 3.9.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-06 17:07+0200\n" +"POT-Creation-Date: 2018-10-19 11:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,9 +151,9 @@ msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:306 #: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/event.php:1315 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/selectors.php:115 +#: ../../include/selectors.php:151 ../../include/event.php:1315 #: ../../include/event.php:1322 ../../include/connections.php:703 #: ../../include/connections.php:710 msgid "Other" @@ -194,7 +194,7 @@ msgstr "" #: ../../Zotlabs/Module/Mood.php:124 ../../Zotlabs/Module/Connections.php:32 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59 -#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:415 +#: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428 #: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 @@ -221,7 +221,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:313 #: ../../Zotlabs/Module/Cover_photo.php:326 -#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:17 +#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Network.php:17 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:96 @@ -282,7 +282,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:284 #: ../../Zotlabs/Module/Connections.php:322 #: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211 -#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Menu.php:175 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:235 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99 @@ -295,7 +295,7 @@ msgid "Edit" msgstr "" #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1104 -#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124 #: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1389 msgid "Share" @@ -320,7 +320,7 @@ msgid "Delete" msgstr "" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:695 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409 #: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:261 #: ../../Zotlabs/Module/Pubsites.php:60 msgid "View" @@ -436,7 +436,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Security.php:112 -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:493 #: ../../Zotlabs/Module/Settings/Features.php:46 #: ../../Zotlabs/Module/Settings/Events.php:41 #: ../../Zotlabs/Module/Settings/Calendar.php:41 @@ -444,10 +444,10 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Connections.php:41 #: ../../Zotlabs/Module/Settings/Photos.php:41 #: ../../Zotlabs/Module/Settings/Account.php:103 -#: ../../Zotlabs/Module/Settings/Profiles.php:41 +#: ../../Zotlabs/Module/Settings/Profiles.php:50 #: ../../Zotlabs/Module/Settings/Manage.php:41 #: ../../Zotlabs/Module/Settings/Featured.php:54 -#: ../../Zotlabs/Module/Settings/Channel_home.php:61 +#: ../../Zotlabs/Module/Settings/Channel_home.php:89 #: ../../Zotlabs/Module/Settings/Directory.php:41 #: ../../Zotlabs/Module/Settings/Editor.php:41 #: ../../Zotlabs/Module/Settings/Display.php:189 @@ -461,7 +461,7 @@ msgstr "" #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:888 #: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:265 +#: ../../Zotlabs/Module/Pconfig.php:111 ../../Zotlabs/Module/Defperms.php:265 #: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:156 #: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 #: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162 @@ -469,8 +469,8 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 #: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Lib/ThreadItem.php:767 #: ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../Zotlabs/Widget/Wiki_pages.php:40 -#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Wiki_pages.php:42 +#: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:94 #: ../../addon/skeleton/skeleton.php:65 ../../addon/planets/planets.php:153 @@ -501,7 +501,7 @@ msgstr "" #: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1263 #: ../../addon/cart/submodules/manualcat.php:248 #: ../../addon/cart/submodules/hzservices.php:640 -#: ../../addon/cart/submodules/subscriptions.php:401 +#: ../../addon/cart/submodules/subscriptions.php:410 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 #: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237 #: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95 @@ -522,7 +522,7 @@ msgid "Add Article" msgstr "" #: ../../Zotlabs/Module/Articles.php:214 ../../Zotlabs/Lib/Apps.php:302 -#: ../../include/nav.php:477 +#: ../../include/nav.php:482 msgid "Articles" msgstr "" @@ -552,8 +552,8 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1233 ../../Zotlabs/Module/Article_edit.php:131 #: ../../Zotlabs/Module/Admin/Addons.php:423 #: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145 -#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:356 -#: ../../Zotlabs/Module/Wiki.php:388 ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:368 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Editwebpage.php:169 @@ -616,7 +616,7 @@ msgstr "" #: ../../Zotlabs/Lib/Activity.php:858 ../../Zotlabs/Lib/Apps.php:994 #: ../../Zotlabs/Lib/Apps.php:1078 ../../Zotlabs/Storage/Browser.php:164 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84 -#: ../../addon/pubcrawl/as.php:964 ../../include/conversation.php:1166 +#: ../../addon/pubcrawl/as.php:963 ../../include/conversation.php:1166 msgid "Unknown" msgstr "" @@ -751,7 +751,7 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:907 #: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:144 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 -#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Lib/NativeWikiPage.php:561 #: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 @@ -777,7 +777,7 @@ msgstr "" #: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1779 msgid "Email" msgstr "" @@ -963,7 +963,7 @@ msgstr "" msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:375 +#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:374 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -1184,7 +1184,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "(click to open/close)" msgstr "" @@ -1208,7 +1208,7 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:255 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 @@ -1263,7 +1263,7 @@ msgstr "" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1275,7 +1275,7 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:257 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 @@ -1329,7 +1329,7 @@ msgstr "" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1629,14 +1629,14 @@ msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 ../../Zotlabs/Lib/Activity.php:1570 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1512 +#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1511 #: ../../include/conversation.php:116 ../../include/text.php:2028 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 #: ../../Zotlabs/Lib/Activity.php:1570 ../../addon/diaspora/Receiver.php:1539 -#: ../../addon/pubcrawl/as.php:1512 ../../include/conversation.php:144 +#: ../../addon/pubcrawl/as.php:1511 ../../include/conversation.php:144 #: ../../include/text.php:2034 msgid "status" msgstr "" @@ -1720,7 +1720,7 @@ msgstr "" #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256 -#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:288 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:293 msgid "Loading" msgstr "" @@ -1753,7 +1753,7 @@ msgid "Choose a short nickname" msgstr "" #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:535 #: ../../Zotlabs/Module/Register.php:261 msgid "Channel role and privacy" msgstr "" @@ -1831,7 +1831,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:617 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Remove Channel" msgstr "" @@ -2667,7 +2667,7 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:386 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:391 msgid "Channel" msgstr "" @@ -2698,7 +2698,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Display.php:452 ../../Zotlabs/Module/Filestorage.php:24 #: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3587 msgid "Item not found." msgstr "" @@ -2758,7 +2758,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:187 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087 msgid "Default" msgstr "" @@ -2939,7 +2939,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " +"example: 'pubstream' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" @@ -3559,12 +3559,12 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:78 #: ../../Zotlabs/Module/Settings/Channel.php:89 #: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:24 -#: ../../include/selectors.php:123 ../../include/channel.php:444 +#: ../../include/selectors.php:134 ../../include/channel.php:444 #: ../../include/channel.php:445 ../../include/channel.php:452 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:272 +#: ../../Zotlabs/Module/Settings/Channel.php:266 #: ../../Zotlabs/Module/Defperms.php:111 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3574,413 +3574,401 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:327 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:335 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:336 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:337 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:338 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:339 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:340 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Settings/Channel.php:409 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:420 +#: ../../Zotlabs/Module/Settings/Channel.php:414 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:424 +#: ../../Zotlabs/Module/Settings/Channel.php:418 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:433 +#: ../../Zotlabs/Module/Settings/Channel.php:427 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:436 +#: ../../Zotlabs/Module/Settings/Channel.php:430 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 msgid "Automatic membership approval" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 #: ../../Zotlabs/Module/Defperms.php:255 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:491 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:517 ../../include/channel.php:1528 +#: ../../Zotlabs/Module/Settings/Channel.php:499 ../../include/channel.php:1528 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:500 #: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 -msgid "Profile to assign new connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Default permissions category" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:545 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:563 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Unseen stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:587 -#: ../../Zotlabs/Module/Settings/Channel.php:592 -#: ../../Zotlabs/Module/Settings/Channel.php:593 -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Unseen public stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:601 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:609 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:610 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:612 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:613 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:613 -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:616 -msgid "Personal menu to display in your channel pages" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:619 -msgid "Firefox Share $Projectname provider" -msgstr "" - #: ../../Zotlabs/Module/Settings/Features.php:43 msgid "Additional Features" msgstr "" @@ -4074,7 +4062,7 @@ msgstr "" msgid "Remove this account including all its channels" msgstr "" -#: ../../Zotlabs/Module/Settings/Profiles.php:39 +#: ../../Zotlabs/Module/Settings/Profiles.php:47 msgid "Profiles Settings" msgstr "" @@ -4118,17 +4106,21 @@ msgstr "" msgid "Please save/submit changes to any panel before opening another." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:41 +#: ../../Zotlabs/Module/Settings/Channel_home.php:44 #: ../../Zotlabs/Module/Settings/Network.php:41 msgid "Max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:43 +#: ../../Zotlabs/Module/Settings/Channel_home.php:46 #: ../../Zotlabs/Module/Settings/Network.php:43 msgid "Click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:58 +#: ../../Zotlabs/Module/Settings/Channel_home.php:59 +msgid "Personal menu to display in your channel pages" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel_home.php:86 msgid "Channel Home Settings" msgstr "" @@ -4224,7 +4216,7 @@ msgid "Link post titles to source" msgstr "" #: ../../Zotlabs/Module/Settings/Display.php:205 -#: ../../Zotlabs/Widget/Newmember.php:69 +#: ../../Zotlabs/Widget/Newmember.php:75 msgid "New Member Links" msgstr "" @@ -5123,7 +5115,7 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:77 ../../addon/cart/myshop.php:37 #: ../../addon/cart/cart.php:1440 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/manual_payments.php:63 +#: ../../addon/cart/manual_payments.php:93 msgid "Invalid channel" msgstr "" @@ -5140,7 +5132,7 @@ msgid "Error downloading wiki: " msgstr "" #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:19 -#: ../../include/nav.php:501 +#: ../../include/nav.php:506 msgid "Wikis" msgstr "" @@ -5161,21 +5153,21 @@ msgstr "" msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:41 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41 #: ../../include/text.php:1892 msgid "Markdown" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1890 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1890 msgid "BBcode" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1893 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1893 msgid "Text" msgstr "" @@ -5199,147 +5191,147 @@ msgstr "" msgid "Edit Wiki Name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:274 msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:295 +#: ../../Zotlabs/Module/Wiki.php:300 msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Wiki.php:321 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326 +#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331 msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:354 +#: ../../Zotlabs/Module/Wiki.php:366 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:355 ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:564 #: ../../Zotlabs/Widget/Wiki_page_history.php:25 msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:362 +#: ../../Zotlabs/Module/Wiki.php:374 msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:384 msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Wiki.php:399 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:387 ../../addon/hsse/hsse.php:208 +#: ../../Zotlabs/Module/Wiki.php:400 ../../addon/hsse/hsse.php:208 #: ../../include/conversation.php:1411 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:389 ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:466 #: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210 #: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1413 #: ../../include/conversation.php:1460 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:390 ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:467 #: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139 #: ../../include/conversation.php:1342 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:391 ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Wiki.php:404 ../../Zotlabs/Module/Profile_photo.php:468 #: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140 #: ../../include/conversation.php:1343 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:392 ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:469 #: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:393 ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:470 #: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142 #: ../../include/conversation.php:1345 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:394 ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:471 #: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143 #: ../../include/conversation.php:1346 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:395 ../../Zotlabs/Module/Profile_photo.php:472 +#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Profile_photo.php:472 #: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144 #: ../../include/conversation.php:1347 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:397 +#: ../../Zotlabs/Module/Wiki.php:410 msgid "History" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:473 +#: ../../Zotlabs/Module/Wiki.php:488 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:480 +#: ../../Zotlabs/Module/Wiki.php:495 msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:493 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:500 +#: ../../Zotlabs/Module/Wiki.php:515 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:523 +#: ../../Zotlabs/Module/Wiki.php:539 msgid "Error updating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:559 msgid "Error updating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:558 +#: ../../Zotlabs/Module/Wiki.php:574 msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:568 +#: ../../Zotlabs/Module/Wiki.php:584 msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:601 +#: ../../Zotlabs/Module/Wiki.php:617 msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:722 +#: ../../Zotlabs/Module/Wiki.php:739 msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:836 +#: ../../Zotlabs/Module/Wiki.php:853 msgid "You must be authenticated." msgstr "" @@ -5619,7 +5611,7 @@ msgstr "" #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 #: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 #: ../../Zotlabs/Module/Display.php:174 -#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:185 +#: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185 #: ../../include/help.php:132 msgid "Page not found." msgstr "" @@ -6019,12 +6011,12 @@ msgid "min" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:320 -#: ../../include/features.php:391 ../../include/nav.php:409 +#: ../../include/features.php:391 ../../include/nav.php:414 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:315 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:417 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:422 msgid "Files" msgstr "" @@ -6121,7 +6113,7 @@ msgid "Layouts" msgstr "" #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:323 -#: ../../include/nav.php:168 ../../include/nav.php:284 +#: ../../include/nav.php:168 ../../include/nav.php:289 #: ../../include/help.php:117 ../../include/help.php:125 msgid "Help" msgstr "" @@ -6202,15 +6194,15 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63 msgid "This setting requires special processing and editing has been blocked." msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:48 +#: ../../Zotlabs/Module/Pconfig.php:52 msgid "Configuration Editor" msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:49 +#: ../../Zotlabs/Module/Pconfig.php:53 msgid "" "Warning: Changing some settings could render your channel inoperable. Please " "leave this page unless you are comfortable with and knowledgeable about how " @@ -6734,7 +6726,7 @@ msgid "Add Card" msgstr "" #: ../../Zotlabs/Module/Cards.php:203 ../../Zotlabs/Lib/Apps.php:303 -#: ../../include/nav.php:466 +#: ../../include/nav.php:471 msgid "Cards" msgstr "" @@ -6834,7 +6826,7 @@ msgid "Export selected" msgstr "" #: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:316 -#: ../../include/nav.php:489 +#: ../../include/nav.php:494 msgid "Webpages" msgstr "" @@ -6968,8 +6960,8 @@ msgstr "" msgid "Delivery report for %1$s" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 -#: ../../Zotlabs/Widget/Wiki_pages.php:96 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41 +#: ../../Zotlabs/Widget/Wiki_pages.php:98 msgid "Options" msgstr "" @@ -7106,14 +7098,14 @@ msgid "Previous action reversed." msgstr "" #: ../../Zotlabs/Module/Like.php:438 ../../Zotlabs/Lib/Activity.php:1605 -#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1547 +#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1546 #: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" #: ../../Zotlabs/Module/Like.php:440 ../../Zotlabs/Lib/Activity.php:1607 -#: ../../addon/pubcrawl/as.php:1549 ../../include/conversation.php:163 +#: ../../addon/pubcrawl/as.php:1548 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -7669,7 +7661,7 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:399 +#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:404 msgid "About" msgstr "" @@ -7693,11 +7685,11 @@ msgstr "" msgid "Contents" msgstr "" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:393 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:446 +#: ../../Zotlabs/Module/Display.php:445 msgid "Item has been removed." msgstr "" @@ -8014,9 +8006,9 @@ msgid "Mark all seen" msgstr "" #: ../../Zotlabs/Lib/Activity.php:1417 ../../Zotlabs/Lib/Activity.php:1614 -#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1222 -#: ../../addon/pubcrawl/as.php:1377 ../../addon/pubcrawl/as.php:1556 -#: ../../include/network.php:1768 +#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1221 +#: ../../addon/pubcrawl/as.php:1376 ../../addon/pubcrawl/as.php:1555 +#: ../../include/network.php:1778 msgid "ActivityPub" msgstr "" @@ -8060,12 +8052,12 @@ msgstr "" msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:455 +#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:460 msgid "Bookmarks" msgstr "" #: ../../Zotlabs/Lib/Apps.php:307 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/nav.php:442 ../../include/nav.php:445 +#: ../../include/nav.php:447 ../../include/nav.php:450 msgid "Chatrooms" msgstr "" @@ -8086,7 +8078,7 @@ msgstr "" msgid "Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:504 +#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:509 msgid "Wiki" msgstr "" @@ -8241,79 +8233,79 @@ msgid "publisher" msgstr "" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +#: ../../Zotlabs/Lib/NativeWikiPage.php:94 msgid "(No Title)" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +#: ../../Zotlabs/Lib/NativeWikiPage.php:109 msgid "Wiki page create failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +#: ../../Zotlabs/Lib/NativeWikiPage.php:122 msgid "Wiki not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +#: ../../Zotlabs/Lib/NativeWikiPage.php:133 msgid "Destination name already exists" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:163 -#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +#: ../../Zotlabs/Lib/NativeWikiPage.php:362 msgid "Page not found" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +#: ../../Zotlabs/Lib/NativeWikiPage.php:197 msgid "Error reading page content" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:350 -#: ../../Zotlabs/Lib/NativeWikiPage.php:400 -#: ../../Zotlabs/Lib/NativeWikiPage.php:467 -#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +#: ../../Zotlabs/Lib/NativeWikiPage.php:353 +#: ../../Zotlabs/Lib/NativeWikiPage.php:402 +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +#: ../../Zotlabs/Lib/NativeWikiPage.php:510 msgid "Error reading wiki" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +#: ../../Zotlabs/Lib/NativeWikiPage.php:390 msgid "Page update failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +#: ../../Zotlabs/Lib/NativeWikiPage.php:424 msgid "Nothing deleted" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +#: ../../Zotlabs/Lib/NativeWikiPage.php:490 msgid "Compare: object not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +#: ../../Zotlabs/Lib/NativeWikiPage.php:496 msgid "Page updated" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +#: ../../Zotlabs/Lib/NativeWikiPage.php:499 msgid "Untitled" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +#: ../../Zotlabs/Lib/NativeWikiPage.php:505 msgid "Wiki resource_id required for git commit" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Lib/NativeWikiPage.php:562 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:560 +#: ../../Zotlabs/Lib/NativeWikiPage.php:563 #: ../../Zotlabs/Widget/Wiki_page_history.php:24 msgid "Date" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 #: ../../Zotlabs/Widget/Wiki_page_history.php:26 msgid "Compare" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:600 ../../include/bbcode.php:746 +#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:746 #: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "" @@ -8721,11 +8713,11 @@ msgstr "" msgid "edited a comment dated %s" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:151 +#: ../../Zotlabs/Lib/NativeWiki.php:152 msgid "Wiki updated successfully" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:205 +#: ../../Zotlabs/Lib/NativeWiki.php:206 msgid "Wiki files deleted successfully" msgstr "" @@ -8974,8 +8966,8 @@ msgstr "" msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:428 -#: ../../include/nav.php:431 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:433 +#: ../../include/nav.php:436 msgid "Calendar" msgstr "" @@ -9313,16 +9305,16 @@ msgstr "" msgid "Saved Searches" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 +#: ../../Zotlabs/Widget/Wiki_pages.php:34 +#: ../../Zotlabs/Widget/Wiki_pages.php:91 msgid "Add new page" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 +#: ../../Zotlabs/Widget/Wiki_pages.php:85 msgid "Wiki Pages" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Page name" msgstr "" @@ -9431,7 +9423,19 @@ msgstr "" msgid "Documentation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:65 +#: ../../Zotlabs/Widget/Newmember.php:57 +msgid "Missing Features?" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:59 +msgid "Pin apps to navigation bar" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:60 +msgid "Install more apps" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:71 msgid "View public stream" msgstr "" @@ -9607,20 +9611,20 @@ msgstr "" msgid "Network/Protocol" msgstr "" -#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1772 +#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1782 msgid "Zot" msgstr "" -#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1770 +#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1780 msgid "Diaspora" msgstr "" -#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1763 -#: ../../include/network.php:1764 +#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1773 +#: ../../include/network.php:1774 msgid "Friendica" msgstr "" -#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1765 +#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1775 msgid "OStatus" msgstr "" @@ -10498,13 +10502,13 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1487 +#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1487 msgid "Male" msgstr "" -#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1485 +#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1485 msgid "Female" msgstr "" @@ -11077,6 +11081,36 @@ msgstr "" msgid "Jappix Mini Settings" msgstr "" +#: ../../addon/upgrade_info/upgrade_info.php:43 +msgid "Your channel has been upgraded to the latest $Projectname version." +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:44 +msgid "" +"To improve usability, we have converted some features into installable stand-" +"alone apps." +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:45 +msgid "Please visit the $Projectname" +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:46 +msgid "app store" +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:47 +msgid "and install possibly missing apps." +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:52 +msgid "Upgrade Info" +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:56 +msgid "Do not show this again" +msgstr "" + #: ../../addon/channelreputation/channelreputation.php:101 #: ../../addon/channelreputation/channelreputation.php:102 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 @@ -11904,7 +11938,7 @@ msgstr "" #: ../../addon/cart/cart.php:1462 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/manual_payments.php:38 +#: ../../addon/cart/manual_payments.php:68 msgid "Order not found." msgstr "" @@ -12044,39 +12078,39 @@ msgid "" "Cannot include subscription items with different terms in the same order." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:365 +#: ../../addon/cart/submodules/subscriptions.php:372 msgid "Select Subscription to Edit" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:371 +#: ../../addon/cart/submodules/subscriptions.php:380 msgid "Edit Subscriptions" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:405 +#: ../../addon/cart/submodules/subscriptions.php:414 msgid "Subscription SKU" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:410 +#: ../../addon/cart/submodules/subscriptions.php:419 msgid "Catalog Description" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:414 +#: ../../addon/cart/submodules/subscriptions.php:423 msgid "Subscription available for purchase." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:419 +#: ../../addon/cart/submodules/subscriptions.php:428 msgid "Maximum active subscriptions to this item per account." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:422 +#: ../../addon/cart/submodules/subscriptions.php:431 msgid "Subscription price." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:426 +#: ../../addon/cart/submodules/subscriptions.php:435 msgid "Quantity" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:430 +#: ../../addon/cart/submodules/subscriptions.php:439 msgid "Term" msgstr "" @@ -12084,11 +12118,11 @@ msgstr "" msgid "Error: order mismatch. Please try again." msgstr "" -#: ../../addon/cart/manual_payments.php:31 +#: ../../addon/cart/manual_payments.php:61 msgid "Manual payments are not enabled." msgstr "" -#: ../../addon/cart/manual_payments.php:47 +#: ../../addon/cart/manual_payments.php:77 msgid "Finished" msgstr "" @@ -12620,243 +12654,247 @@ msgstr "" msgid "Test mode (only send to hub administrator)" msgstr "" -#: ../../include/selectors.php:30 +#: ../../include/selectors.php:18 +msgid "Profile to assign new connections" +msgstr "" + +#: ../../include/selectors.php:41 msgid "Frequently" msgstr "" -#: ../../include/selectors.php:31 +#: ../../include/selectors.php:42 msgid "Hourly" msgstr "" -#: ../../include/selectors.php:32 +#: ../../include/selectors.php:43 msgid "Twice daily" msgstr "" -#: ../../include/selectors.php:33 +#: ../../include/selectors.php:44 msgid "Daily" msgstr "" -#: ../../include/selectors.php:34 +#: ../../include/selectors.php:45 msgid "Weekly" msgstr "" -#: ../../include/selectors.php:35 +#: ../../include/selectors.php:46 msgid "Monthly" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Male" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Female" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Male" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Female" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transgender" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Intersex" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transsexual" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1491 +#: ../../include/selectors.php:60 ../../include/channel.php:1491 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1493 +#: ../../include/selectors.php:60 ../../include/channel.php:1493 msgid "Non-specific" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Undecided" msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Males" msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Females" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Gay" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Lesbian" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "No Preference" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Bisexual" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Autosexual" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Abstinent" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Virgin" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Deviant" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Fetish" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Oodles" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Nonsexual" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Single" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Lonely" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Available" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unavailable" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Has crush" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Infatuated" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Dating" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unfaithful" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Sex Addict" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Friends/Benefits" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Casual" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Engaged" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Married" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily married" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Partners" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Cohabiting" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Common law" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Happy" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Not looking" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Swinger" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Betrayed" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Separated" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unstable" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Divorced" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily divorced" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Widowed" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Uncertain" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "It's complicated" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Don't care" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Ask me" msgstr "" @@ -13205,47 +13243,47 @@ msgstr "" msgid "surprised" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:86 +#: ../../include/text.php:1377 ../../include/js_strings.php:95 msgid "Monday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:87 +#: ../../include/text.php:1377 ../../include/js_strings.php:96 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:88 +#: ../../include/text.php:1377 ../../include/js_strings.php:97 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:89 +#: ../../include/text.php:1377 ../../include/js_strings.php:98 msgid "Thursday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:90 +#: ../../include/text.php:1377 ../../include/js_strings.php:99 msgid "Friday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:91 +#: ../../include/text.php:1377 ../../include/js_strings.php:100 msgid "Saturday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:85 +#: ../../include/text.php:1377 ../../include/js_strings.php:94 msgid "Sunday" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:61 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "January" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:62 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "February" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:63 +#: ../../include/text.php:1381 ../../include/js_strings.php:72 msgid "March" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:64 +#: ../../include/text.php:1381 ../../include/js_strings.php:73 msgid "April" msgstr "" @@ -13253,31 +13291,31 @@ msgstr "" msgid "May" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:66 +#: ../../include/text.php:1381 ../../include/js_strings.php:75 msgid "June" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:67 +#: ../../include/text.php:1381 ../../include/js_strings.php:76 msgid "July" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:77 msgid "August" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:78 msgid "September" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:79 msgid "October" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:80 msgid "November" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:72 +#: ../../include/text.php:1381 ../../include/js_strings.php:81 msgid "December" msgstr "" @@ -13301,7 +13339,7 @@ msgstr "" msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1872 ../../include/language.php:397 +#: ../../include/text.php:1872 ../../include/language.php:423 msgid "default" msgstr "" @@ -13600,181 +13638,191 @@ msgid " channel name" msgstr "" #: ../../include/js_strings.php:41 +#, php-format +msgid "%d minutes" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:42 +#, php-format +msgid "about %d hours" +msgid_plural "about %d hours" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:43 +#, php-format +msgid "%d days" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:44 +#, php-format +msgid "%d months" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:45 +#, php-format +msgid "%d years" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:50 msgid "timeago.prefixAgo" msgstr "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:51 msgid "timeago.prefixFromNow" msgstr "" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:52 msgid "timeago.suffixAgo" msgstr "" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:53 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:56 msgid "less than a minute" msgstr "" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:57 msgid "about a minute" msgstr "" -#: ../../include/js_strings.php:49 -#, php-format -msgid "%d minutes" -msgstr "" - -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:59 msgid "about an hour" msgstr "" -#: ../../include/js_strings.php:51 -#, php-format -msgid "about %d hours" -msgstr "" - -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:61 msgid "a day" msgstr "" -#: ../../include/js_strings.php:53 -#, php-format -msgid "%d days" -msgstr "" - -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:63 msgid "about a month" msgstr "" -#: ../../include/js_strings.php:55 -#, php-format -msgid "%d months" -msgstr "" - -#: ../../include/js_strings.php:56 +#: ../../include/js_strings.php:65 msgid "about a year" msgstr "" -#: ../../include/js_strings.php:57 -#, php-format -msgid "%d years" -msgstr "" - -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:67 msgid " " msgstr "" -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:68 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:74 msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:82 msgid "Jan" msgstr "" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:83 msgid "Feb" msgstr "" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:84 msgid "Mar" msgstr "" -#: ../../include/js_strings.php:76 +#: ../../include/js_strings.php:85 msgid "Apr" msgstr "" -#: ../../include/js_strings.php:77 +#: ../../include/js_strings.php:86 msgctxt "short" msgid "May" msgstr "" -#: ../../include/js_strings.php:78 +#: ../../include/js_strings.php:87 msgid "Jun" msgstr "" -#: ../../include/js_strings.php:79 +#: ../../include/js_strings.php:88 msgid "Jul" msgstr "" -#: ../../include/js_strings.php:80 +#: ../../include/js_strings.php:89 msgid "Aug" msgstr "" -#: ../../include/js_strings.php:81 +#: ../../include/js_strings.php:90 msgid "Sep" msgstr "" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:91 msgid "Oct" msgstr "" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:92 msgid "Nov" msgstr "" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:93 msgid "Dec" msgstr "" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:101 msgid "Sun" msgstr "" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:102 msgid "Mon" msgstr "" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:103 msgid "Tue" msgstr "" -#: ../../include/js_strings.php:95 +#: ../../include/js_strings.php:104 msgid "Wed" msgstr "" -#: ../../include/js_strings.php:96 +#: ../../include/js_strings.php:105 msgid "Thu" msgstr "" -#: ../../include/js_strings.php:97 +#: ../../include/js_strings.php:106 msgid "Fri" msgstr "" -#: ../../include/js_strings.php:98 +#: ../../include/js_strings.php:107 msgid "Sat" msgstr "" -#: ../../include/js_strings.php:99 +#: ../../include/js_strings.php:108 msgctxt "calendar" msgid "today" msgstr "" -#: ../../include/js_strings.php:100 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "month" msgstr "" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "week" msgstr "" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:111 msgctxt "calendar" msgid "day" msgstr "" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "All day" msgstr "" @@ -14160,35 +14208,35 @@ msgstr "" msgid "Work, Fax" msgstr "" -#: ../../include/network.php:760 +#: ../../include/network.php:770 msgid "view full size" msgstr "" -#: ../../include/network.php:1766 +#: ../../include/network.php:1776 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1767 +#: ../../include/network.php:1777 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1771 +#: ../../include/network.php:1781 msgid "Facebook" msgstr "" -#: ../../include/network.php:1773 +#: ../../include/network.php:1783 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1774 +#: ../../include/network.php:1784 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1775 +#: ../../include/network.php:1785 msgid "MySpace" msgstr "" -#: ../../include/language.php:410 +#: ../../include/language.php:436 msgid "Select an alternate language" msgstr "" @@ -14829,55 +14877,55 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:294 +#: ../../include/nav.php:299 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:295 +#: ../../include/nav.php:300 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:301 +#: ../../include/nav.php:306 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:302 +#: ../../include/nav.php:307 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:303 +#: ../../include/nav.php:308 msgid "Toggle System Apps" msgstr "" -#: ../../include/nav.php:389 +#: ../../include/nav.php:394 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:402 +#: ../../include/nav.php:407 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:412 ../../include/photos.php:667 +#: ../../include/nav.php:417 ../../include/photos.php:667 msgid "Photo Albums" msgstr "" -#: ../../include/nav.php:420 +#: ../../include/nav.php:425 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:458 +#: ../../include/nav.php:463 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:469 +#: ../../include/nav.php:474 msgid "View Cards" msgstr "" -#: ../../include/nav.php:480 +#: ../../include/nav.php:485 msgid "View Articles" msgstr "" -#: ../../include/nav.php:492 +#: ../../include/nav.php:497 msgid "View Webpages" msgstr "" diff --git a/util/po2php.php b/util/po2php.php index 50941c062..9ffcb64c4 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -58,8 +58,9 @@ function po2php_run($argc,$argv) { $out .= 'function string_plural_select_' . $lang . '($n){'."\n"; $out .= ' return '.$cond.';'."\n"; $out .= '}}'."\n"; - - $out .= 'App::$rtl = ' . intval($rtl) ; + + $out .= 'App::$rtl = ' . intval($rtl) . ";\n" ; + $out .= 'App::$strings["plural_function_code"] = "' . str_replace("$", "", $cond) . '"'; } if ($k!="" && substr($l,0,7)=="msgstr "){ diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 505682cda..4b8316c37 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1332,6 +1332,9 @@ return array( 'Zotlabs\\Update\\_1219' => $baseDir . '/Zotlabs/Update/_1219.php', 'Zotlabs\\Update\\_1220' => $baseDir . '/Zotlabs/Update/_1220.php', 'Zotlabs\\Update\\_1221' => $baseDir . '/Zotlabs/Update/_1221.php', + 'Zotlabs\\Update\\_1222' => $baseDir . '/Zotlabs/Update/_1222.php', + 'Zotlabs\\Update\\_1223' => $baseDir . '/Zotlabs/Update/_1223.php', + 'Zotlabs\\Update\\_1224' => $baseDir . '/Zotlabs/Update/_1224.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ed924db15..0202e148c 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -1500,6 +1500,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1219' => __DIR__ . '/../..' . '/Zotlabs/Update/_1219.php', 'Zotlabs\\Update\\_1220' => __DIR__ . '/../..' . '/Zotlabs/Update/_1220.php', 'Zotlabs\\Update\\_1221' => __DIR__ . '/../..' . '/Zotlabs/Update/_1221.php', + 'Zotlabs\\Update\\_1222' => __DIR__ . '/../..' . '/Zotlabs/Update/_1222.php', + 'Zotlabs\\Update\\_1223' => __DIR__ . '/../..' . '/Zotlabs/Update/_1223.php', + 'Zotlabs\\Update\\_1224' => __DIR__ . '/../..' . '/Zotlabs/Update/_1224.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 26045e6b5..54a1f3bed 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-06 17:07+0200\n" -"PO-Revision-Date: 2018-10-08 17:43+0000\n" +"PO-Revision-Date: 2018-10-11 10:13+0000\n" "Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -910,7 +910,7 @@ msgstr "Se ha guardado la categoría del permiso." #: ../../Zotlabs/Module/Permcats.php:62 msgid "Permission Categories App" -msgstr "App de categorías de permisos" +msgstr "App Categorías de permisos" #: ../../Zotlabs/Module/Permcats.php:63 msgid "Create custom connection permission limits" @@ -998,7 +998,7 @@ msgstr "Cambiar el idioma de la interfaz de usuario" #: ../../Zotlabs/Module/Uexport.php:61 msgid "Channel Export App" -msgstr "App de exportación de canales" +msgstr "App Exportación de canales" #: ../../Zotlabs/Module/Uexport.php:62 msgid "Export your channel" @@ -2331,7 +2331,7 @@ msgstr "Continuar" #: ../../Zotlabs/Module/Connect.php:104 msgid "Premium Channel App" -msgstr "App canal premium" +msgstr "App Canal premium" #: ../../Zotlabs/Module/Connect.php:105 msgid "" @@ -4037,7 +4037,7 @@ msgstr "Ajustes guardados. Recargue la página, por favor." #: ../../Zotlabs/Module/Settings/Conversation.php:46 msgid "Conversation Settings" -msgstr "Ajustes de Conversation" +msgstr "Ajustes de conversación" #: ../../Zotlabs/Module/Settings/Connections.php:39 msgid "Connections Settings" @@ -4307,7 +4307,7 @@ msgstr "Token salvado." #: ../../Zotlabs/Module/Tokens.php:99 msgid "Guest Access App" -msgstr "App de acceso para invitados" +msgstr "App Acceso para invitados" #: ../../Zotlabs/Module/Tokens.php:100 msgid "Create access tokens so that non-members can access private content" @@ -4647,7 +4647,7 @@ msgstr "Elemento no disponible" #: ../../Zotlabs/Module/Randprof.php:29 msgid "Random Channel App" -msgstr "App canal aleatorio" +msgstr "App Canal aleatorio" #: ../../Zotlabs/Module/Randprof.php:30 msgid "Visit a random channel in the $Projectname network" @@ -4685,7 +4685,7 @@ msgstr "%1$s está %2$s" #: ../../Zotlabs/Module/Mood.php:132 msgid "Mood App" -msgstr "App estados de ánimo" +msgstr "App Estados de ánimo" #: ../../Zotlabs/Module/Mood.php:133 ../../Zotlabs/Module/Mood.php:153 msgid "Set your current mood and tell your friends" @@ -4864,7 +4864,7 @@ msgstr "Marcador añadido" #: ../../Zotlabs/Module/Bookmarks.php:78 msgid "Bookmarks App" -msgstr "App marcadores" +msgstr "App Marcadores" #: ../../Zotlabs/Module/Bookmarks.php:79 msgid "Bookmark links from posts and manage them" @@ -5155,7 +5155,7 @@ msgstr "Perfil no disponible" #: ../../Zotlabs/Module/Wiki.php:52 msgid "Wiki App" -msgstr "App wiki" +msgstr "App Wiki" #: ../../Zotlabs/Module/Wiki.php:53 msgid "Provide a wiki for your channel" @@ -5401,7 +5401,7 @@ msgstr "Plantilla actualizada." #: ../../Zotlabs/Module/Pdledit.php:42 msgid "PDL Editor App" -msgstr "App editor PDL" +msgstr "App Editor PDL" #: ../../Zotlabs/Module/Pdledit.php:43 msgid "Provides the ability to edit system page layouts" @@ -5441,7 +5441,7 @@ msgstr "Diseño del sistema" #: ../../Zotlabs/Module/Poke.php:165 msgid "Poke App" -msgstr "App toques" +msgstr "App Toques" #: ../../Zotlabs/Module/Poke.php:166 msgid "Poke somebody in your addressbook" @@ -5995,7 +5995,7 @@ msgstr "Detalles" #: ../../Zotlabs/Module/Chat.php:102 msgid "Chatrooms App" -msgstr "App salas de chat" +msgstr "App Salas de chat" #: ../../Zotlabs/Module/Chat.php:103 msgid "Access Controlled Chatrooms" @@ -6188,7 +6188,7 @@ msgstr "Descargar el fichero PDL" #: ../../Zotlabs/Module/Notes.php:55 msgid "Notes App" -msgstr "App notas" +msgstr "App Notas" #: ../../Zotlabs/Module/Notes.php:56 msgid "A simple notes app with a widget (note: notes are not encrypted)" @@ -6267,7 +6267,7 @@ msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su can #: ../../Zotlabs/Module/Defperms.php:189 msgid "Default Permissions App" -msgstr "App de Permisos por defecto" +msgstr "App Permisos por defecto" #: ../../Zotlabs/Module/Defperms.php:190 msgid "Set custom default permissions for new connections" @@ -6319,7 +6319,7 @@ msgstr "Grupo de canales actualizado." #: ../../Zotlabs/Module/Group.php:101 msgid "Privacy Groups App" -msgstr "App de Grupos de canales" +msgstr "App Grupos de canales" #: ../../Zotlabs/Module/Group.php:102 msgid "Management of privacy groups" @@ -7330,7 +7330,7 @@ msgstr "Buscar un canal (o un \"webbie\") que comience por:" #: ../../Zotlabs/Module/Suggest.php:40 msgid "Suggest Channels App" -msgstr "App de Sugerir canales" +msgstr "App Sugerencia de canales" #: ../../Zotlabs/Module/Suggest.php:41 msgid "" @@ -7549,7 +7549,7 @@ msgstr "Guardar en carpeta" #: ../../Zotlabs/Module/Probe.php:18 msgid "Remote Diagnostics App" -msgstr "App de Diagnósticos remotos" +msgstr "App Diagnósticos remotos" #: ../../Zotlabs/Module/Probe.php:19 msgid "Perform diagnostics on remote channels" @@ -8034,7 +8034,7 @@ msgstr "\"Key\" y \"Secret\" son obligatorios" #: ../../Zotlabs/Module/Oauth.php:100 msgid "OAuth Apps Manager App" -msgstr "App de Gestión de apps OAuth" +msgstr "App Gestión de apps OAuth" #: ../../Zotlabs/Module/Oauth.php:101 msgid "OAuth authentication tokens for mobile and remote apps" @@ -8843,7 +8843,7 @@ msgstr "Añadir etiqueta" #: ../../Zotlabs/Lib/ThreadItem.php:273 ../../include/conversation.php:891 msgid "Conversation Tools" -msgstr "Herramientas de Conversation" +msgstr "Herramientas de conversación" #: ../../Zotlabs/Lib/ThreadItem.php:289 ../../include/taxonomy.php:575 msgid "like" @@ -11185,7 +11185,7 @@ msgstr "La reputación se recupera automáticamente a esta tasa por hora hasta q msgid "" "When minimum_to_moderate > reputation > minimum_to_post reputation recovers " "at this rate per hour" -msgstr "Cuando la reputación mínima a moderar > reputación > la reputación mínima a publicar se recupera a esta tasa por hora" +msgstr "Cuando el mínimo_a_moderar > reputación > mínimo_a_publicar la reputación se recupera a esta tasa por hora " #: ../../addon/channelreputation/channelreputation.php:138 msgid "Community Moderation Settings" @@ -14399,7 +14399,7 @@ msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o conte #: ../../include/features.php:138 msgid "Conversation" -msgstr "Conversation" +msgstr "Conversación" #: ../../include/features.php:142 msgid "Community Tagging" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 0fd176db8..a92c1c6ea 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -149,7 +149,7 @@ App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto"; App::$strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio"; App::$strings["Permission category name is required."] = "El nombre de la categoría de permiso es obligatorio."; App::$strings["Permission category saved."] = "Se ha guardado la categoría del permiso."; -App::$strings["Permission Categories App"] = "App de categorías de permisos"; +App::$strings["Permission Categories App"] = "App Categorías de permisos"; App::$strings["Create custom connection permission limits"] = "Crear límites de permisos de conexión personalizados"; App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones."; App::$strings["Permission Categories"] = "Tipos de permisos"; @@ -167,7 +167,7 @@ App::$strings["Reset form"] = "Reiniciar el formulario"; App::$strings["You must enable javascript for your browser to be able to view this content."] = "Debe habilitar javascript para poder ver este contenido en su navegador."; App::$strings["Language App"] = "App idioma"; App::$strings["Change UI language"] = "Cambiar el idioma de la interfaz de usuario"; -App::$strings["Channel Export App"] = "App de exportación de canales"; +App::$strings["Channel Export App"] = "App Exportación de canales"; App::$strings["Export your channel"] = "Exportar su canal"; App::$strings["Export Channel"] = "Exportar el canal"; App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido."; @@ -422,7 +422,7 @@ App::$strings["Errors encountered creating database tables."] = "Se han encontra App::$strings["<h1>What next?</h1>"] = "<h1>¿Qué sigue?</h1>"; App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\"."; App::$strings["Continue"] = "Continuar"; -App::$strings["Premium Channel App"] = "App canal premium"; +App::$strings["Premium Channel App"] = "App Canal premium"; App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal"; App::$strings["Premium Channel Setup"] = "Configuración del canal premium"; App::$strings["Enable premium channel connection restrictions"] = "Habilitar restricciones de conexión del canal premium"; @@ -809,7 +809,7 @@ App::$strings["Events Settings"] = "Gestión de eventos"; App::$strings["CalDAV Settings"] = "Ajustes de CalDav"; App::$strings["Settings saved."] = "Configuración guardada."; App::$strings["Settings saved. Reload page please."] = "Ajustes guardados. Recargue la página, por favor."; -App::$strings["Conversation Settings"] = "Ajustes de Conversation"; +App::$strings["Conversation Settings"] = "Ajustes de conversación"; App::$strings["Connections Settings"] = "Gestión de las conexiones"; App::$strings["Photos Settings"] = "Gestión de las fotos"; App::$strings["Not valid email."] = "Correo electrónico no válido."; @@ -872,7 +872,7 @@ App::$strings["Upload"] = "Subir"; App::$strings["This channel is limited to %d tokens"] = "Este canal tiene un límite de %d tokens"; App::$strings["Name and Password are required."] = "Se requiere el nombre y la contraseña."; App::$strings["Token saved."] = "Token salvado."; -App::$strings["Guest Access App"] = "App de acceso para invitados"; +App::$strings["Guest Access App"] = "App Acceso para invitados"; App::$strings["Create access tokens so that non-members can access private content"] = "Crear tokens de acceso para que los no miembros puedan acceder a contenido privado"; App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Utilice este formulario para crear identificadores de acceso temporal para compartir cosas con los no miembros de Hubzilla. Estas identidades se pueden usar en las Listas de control de acceso (ACL) y así los visitantes pueden iniciar sesión, utilizando estas credenciales, para acceder a su contenido privado."; App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "También puede proporcionar, con el estilo <em>dropbox</em>, enlaces de acceso a sus amigos y asociados añadiendo la contraseña de inicio de sesión a cualquier dirección URL, como se muestra. Ejemplos: "; @@ -947,7 +947,7 @@ App::$strings["Return to your app and insert this Security Code:"] = "Vuelva a s App::$strings["Please login to continue."] = "Por favor inicie sesión para continuar."; App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?"; App::$strings["Item not available."] = "Elemento no disponible"; -App::$strings["Random Channel App"] = "App canal aleatorio"; +App::$strings["Random Channel App"] = "App Canal aleatorio"; App::$strings["Visit a random channel in the \$Projectname network"] = "Visitar un canal aleatorio en la red \$Projectname"; App::$strings["Edit Block"] = "Modificar este bloque"; App::$strings["vcard"] = "vcard"; @@ -956,7 +956,7 @@ App::$strings["Installed Apps"] = "Apps instaladas"; App::$strings["Manage Apps"] = "Administrar apps"; App::$strings["Create Custom App"] = "Crear una app personalizada"; App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s"; -App::$strings["Mood App"] = "App estados de ánimo"; +App::$strings["Mood App"] = "App Estados de ánimo"; App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos"; App::$strings["Mood"] = "Estado de ánimo"; App::$strings["Active"] = "Activo/a"; @@ -996,7 +996,7 @@ App::$strings["Connections search"] = "Buscar conexiones"; App::$strings["Find"] = "Encontrar"; App::$strings["item"] = "elemento"; App::$strings["Bookmark added"] = "Marcador añadido"; -App::$strings["Bookmarks App"] = "App marcadores"; +App::$strings["Bookmarks App"] = "App Marcadores"; App::$strings["Bookmark links from posts and manage them"] = "Añadir enlaces de las entradas a Marcadores y administrarlos"; App::$strings["My Bookmarks"] = "Mis marcadores"; App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones"; @@ -1066,7 +1066,7 @@ App::$strings["__ctx:noun__ Dislikes"] = "No me gusta"; App::$strings["Close"] = "Cerrar"; App::$strings["Recent Photos"] = "Fotos recientes"; App::$strings["Profile Unavailable."] = "Perfil no disponible"; -App::$strings["Wiki App"] = "App wiki"; +App::$strings["Wiki App"] = "App Wiki"; App::$strings["Provide a wiki for your channel"] = "Proporcionar un wiki para su canal"; App::$strings["Invalid channel"] = "Canal no válido"; App::$strings["Error retrieving wiki"] = "Error al recuperar el wiki"; @@ -1119,7 +1119,7 @@ App::$strings["Selected Revision"] = "Revisión seleccionada"; App::$strings["You must be authenticated."] = "Debe estar autenticado."; App::$strings["toggle full screen mode"] = "cambiar al modo de pantalla completa"; App::$strings["Layout updated."] = "Plantilla actualizada."; -App::$strings["PDL Editor App"] = "App editor PDL"; +App::$strings["PDL Editor App"] = "App Editor PDL"; App::$strings["Provides the ability to edit system page layouts"] = "Proporciona la capacidad de editar los diseños de página del sistema"; App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripción de Páginas"; App::$strings["(modified)"] = "(modificado)"; @@ -1129,7 +1129,7 @@ App::$strings["Module Name:"] = "Nombre del módulo:"; App::$strings["Layout Help"] = "Ayuda para el diseño de plantillas de página"; App::$strings["Edit another layout"] = "Editar otro diseño"; App::$strings["System layout"] = "Diseño del sistema"; -App::$strings["Poke App"] = "App toques"; +App::$strings["Poke App"] = "App Toques"; App::$strings["Poke somebody in your addressbook"] = "Dar un toque a alguien en su libreta de direcciones"; App::$strings["Poke"] = "Toques y otras cosas"; App::$strings["Poke somebody"] = "Dar un toque a alguien"; @@ -1253,7 +1253,7 @@ App::$strings["Please choose the profile you would like to display to %s when vi App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."; App::$strings["Last update:"] = "Última actualización:"; App::$strings["Details"] = "Detalles"; -App::$strings["Chatrooms App"] = "App salas de chat"; +App::$strings["Chatrooms App"] = "App Salas de chat"; App::$strings["Access Controlled Chatrooms"] = "Salas de chat moderadas"; App::$strings["Room not found"] = "Sala no encontrada"; App::$strings["Leave Room"] = "Abandonar la sala"; @@ -1299,7 +1299,7 @@ App::$strings["Help"] = "Ayuda"; App::$strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche"; App::$strings["Layout Description"] = "Descripción de la plantilla"; App::$strings["Download PDL file"] = "Descargar el fichero PDL"; -App::$strings["Notes App"] = "App notas"; +App::$strings["Notes App"] = "App Notas"; App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Una simple aplicación de notas con un widget (aviso: las notas no están encriptadas)"; App::$strings["Not found"] = "No encontrado"; App::$strings["Please refresh page"] = "Por favor, recargue la página"; @@ -1316,7 +1316,7 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado %3 App::$strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."; App::$strings["Configuration Editor"] = "Editor de configuración"; App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."; -App::$strings["Default Permissions App"] = "App de Permisos por defecto"; +App::$strings["Default Permissions App"] = "App Permisos por defecto"; App::$strings["Set custom default permissions for new connections"] = "Establecer permisos predeterminados personalizados para nuevas conexiones"; App::$strings["Automatic approval settings"] = "Opciones de autorización automática"; App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Es posible que se hayan preestablecido o bloqueado algunos permisos individuales según el tipo de canal y la configuración de privacidad."; @@ -1328,7 +1328,7 @@ App::$strings["Privacy group created."] = "El grupo de canales ha sido creado."; App::$strings["Could not create privacy group."] = "No se puede crear el grupo de canales"; App::$strings["Privacy group not found."] = "Grupo de canales no encontrado."; App::$strings["Privacy group updated."] = "Grupo de canales actualizado."; -App::$strings["Privacy Groups App"] = "App de Grupos de canales"; +App::$strings["Privacy Groups App"] = "App Grupos de canales"; App::$strings["Management of privacy groups"] = "Gestión de grupos de canales"; App::$strings["Privacy Groups"] = "Grupos de canales"; App::$strings["Add Group"] = "Agregar un grupo"; @@ -1570,7 +1570,7 @@ App::$strings["Oldest to Newest"] = "De más antiguo a más nuevo"; App::$strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas)."; App::$strings["Xchan Lookup"] = "Búsqueda de canales"; App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:"; -App::$strings["Suggest Channels App"] = "App de Sugerir canales"; +App::$strings["Suggest Channels App"] = "App Sugerencia de canales"; App::$strings["Suggestions for channels in the \$Projectname network you might be interested in"] = "Sugerencias de los canales de la red \$Projectname en los que puede estar interesado"; App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo."; App::$strings["Ignore/Hide"] = "Ignorar/Ocultar"; @@ -1621,7 +1621,7 @@ App::$strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nomb App::$strings["Enter a folder name"] = "Escriba un nombre de carpeta"; App::$strings["or select an existing folder (doubleclick)"] = "o seleccione una (con un doble click)"; App::$strings["Save to Folder"] = "Guardar en carpeta"; -App::$strings["Remote Diagnostics App"] = "App de Diagnósticos remotos"; +App::$strings["Remote Diagnostics App"] = "App Diagnósticos remotos"; App::$strings["Perform diagnostics on remote channels"] = "Realizar diagnósticos en canales remotos"; App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana."; App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado."; @@ -1734,7 +1734,7 @@ App::$strings["Enter your email address and submit to have your password reset. App::$strings["Email Address"] = "Dirección de correo electrónico"; App::$strings["Name is required"] = "El nombre es obligatorio"; App::$strings["Key and Secret are required"] = "\"Key\" y \"Secret\" son obligatorios"; -App::$strings["OAuth Apps Manager App"] = "App de Gestión de apps OAuth"; +App::$strings["OAuth Apps Manager App"] = "App Gestión de apps OAuth"; App::$strings["OAuth authentication tokens for mobile and remote apps"] = "Tokens de autenticación de OAuth para aplicaciones móviles y remotas"; App::$strings["Consumer Key"] = "Consumer Key"; App::$strings["Icon url"] = "Dirección del icono"; @@ -1915,7 +1915,7 @@ App::$strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada App::$strings["Message signature validated"] = "Firma de mensaje validada"; App::$strings["Message signature incorrect"] = "Firma de mensaje incorrecta"; App::$strings["Add Tag"] = "Añadir etiqueta"; -App::$strings["Conversation Tools"] = "Herramientas de Conversation"; +App::$strings["Conversation Tools"] = "Herramientas de conversación"; App::$strings["like"] = "me gusta"; App::$strings["dislike"] = "no me gusta"; App::$strings["Share This"] = "Compartir esto"; @@ -2464,7 +2464,7 @@ App::$strings["Max ratio of moderator's reputation that can be added to/deducted App::$strings["Reputation \"cost\" to post"] = "\"Coste\" de la reputación a contabilizar"; App::$strings["Reputation \"cost\" to comment"] = "\"Coste\" de la reputación para comentar"; App::$strings["Reputation automatically recovers at this rate per hour until it reaches minimum_to_post"] = "La reputación se recupera automáticamente a esta tasa por hora hasta que alcanza el mínimo_a_post"; -App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = "Cuando la reputación mínima a moderar > reputación > la reputación mínima a publicar se recupera a esta tasa por hora"; +App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = "Cuando el mínimo_a_moderar > reputación > mínimo_a_publicar la reputación se recupera a esta tasa por hora "; App::$strings["Community Moderation Settings"] = "Configuración de la moderación de la comunidad"; App::$strings["Can moderate reputation on my channel."] = "Se puede moderar la reputación en mi canal."; App::$strings["Channel Reputation"] = "Reputación del canal"; @@ -3243,7 +3243,7 @@ App::$strings["Use blog/list mode"] = "Usar el modo blog/lista"; App::$strings["Comments will be displayed separately"] = "Los comentarios se mostrarán por separado"; App::$strings["Connection Filtering"] = "Filtrado de conexiones"; App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"; -App::$strings["Conversation"] = "Conversation"; +App::$strings["Conversation"] = "Conversación"; App::$strings["Community Tagging"] = "Etiquetas de la comunidad"; App::$strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes"; App::$strings["Emoji Reactions"] = "Emoticonos \"emoji\""; diff --git a/view/js/main.js b/view/js/main.js index 48277f5cc..085bc8d0d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -44,25 +44,28 @@ $(document).ready(function() { $(document).on('click', '.conversation-settings-link', getConversationSettings); $(document).on('click', '#settings_module_ajax_submit', postConversationSettings); - jQuery.timeago.settings.strings = { - prefixAgo : aStr['t01'], - prefixFromNow : aStr['t02'], - suffixAgo : aStr['t03'], - suffixFromNow : aStr['t04'], - seconds : aStr['t05'], - minute : aStr['t06'], - minutes : aStr['t07'], - hour : aStr['t08'], - hours : aStr['t09'], - day : aStr['t10'], - days : aStr['t11'], - month : aStr['t12'], - months : aStr['t13'], - year : aStr['t14'], - years : aStr['t15'], - wordSeparator : aStr['t16'], - numbers : aStr['t17'], - }; + var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);'); + + jQuery.timeago.settings.strings = { + prefixAgo : aStr['t01'], + prefixFromNow : aStr['t02'], + suffixAgo : aStr['t03'], + suffixFromNow : aStr['t04'], + seconds : aStr['t05'], + minute : aStr['t06'], + minutes : function(value){return tf(value, aStr['t07']);}, + hour : aStr['t08'], + hours : function(value){return tf(value, aStr['t09']);}, + day : aStr['t10'], + days : function(value){return tf(value, aStr['t11']);}, + month : aStr['t12'], + months : function(value){return tf(value, aStr['t13']);}, + year : aStr['t14'], + years : function(value){return tf(value, aStr['t15']);}, + wordSeparator : aStr['t16'], + numbers : aStr['t17'], + }; + //mod_mail only $(".mail-conv-detail .autotime").timeago(); diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index d61db8c53..d21f707d1 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-25 21:40+0200\n" -"PO-Revision-Date: 2018-10-07 13:05+0200\n" +"POT-Creation-Date: 2018-10-18 11:03+0200\n" +"PO-Revision-Date: 2018-10-18 11:06+0200\n" "Last-Translator: Max Kostikov <max@kostikov.co>\n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" msgid "Source channel not found." msgstr "Канал-источник не найден." -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087 #: ../../Zotlabs/Module/Admin/Site.php:187 msgid "Default" msgstr "По умолчанию" @@ -36,7 +36,7 @@ msgid "Focus (Hubzilla default)" msgstr "Фокус (по умолчанию Hubzilla)" #: ../../view/theme/redbasic/php/config.php:94 ../../include/js_strings.php:22 -#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Pconfig.php:111 #: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Permcats.php:128 #: ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Module/Email_validation.php:40 @@ -85,8 +85,8 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Pdledit.php:107 ../../Zotlabs/Module/Wiki.php:215 #: ../../Zotlabs/Module/Import.php:565 #: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Widget/Wiki_pages.php:40 -#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Wiki_pages.php:42 +#: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Lib/ThreadItem.php:767 #: ../../extend/addon/hzaddons/dwpost/dwpost.php:89 #: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:191 @@ -319,7 +319,7 @@ msgstr "Панель навигации, цвет активного значк #: ../../view/theme/redbasic/php/config.php:103 msgid "Link color" -msgstr "цвет ссылок" +msgstr "Цвет ссылок" #: ../../view/theme/redbasic/php/config.php:104 msgid "Set font-color for banner" @@ -673,7 +673,7 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Item.php:229 ../../Zotlabs/Module/Item.php:248 #: ../../Zotlabs/Module/Item.php:258 ../../Zotlabs/Module/Item.php:1110 #: ../../Zotlabs/Module/Achievements.php:34 -#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Poke.php:157 +#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Profiles.php:198 #: ../../Zotlabs/Module/Profiles.php:635 ../../Zotlabs/Module/Photos.php:69 @@ -721,8 +721,8 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Invite.php:21 #: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Articles.php:80 #: ../../Zotlabs/Module/Cloud.php:40 ../../Zotlabs/Module/Pdledit.php:34 -#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:282 -#: ../../Zotlabs/Module/Wiki.php:415 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 +#: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Cards.php:81 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Web/WebServer.php:123 @@ -892,7 +892,7 @@ msgstr "Просмотреть все %d общих контактов" #: ../../Zotlabs/Module/Connections.php:342 #: ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Article_edit.php:99 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:384 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Widget/Cdav.php:126 #: ../../Zotlabs/Widget/Cdav.php:162 ../../Zotlabs/Lib/Apps.php:534 #: ../../Zotlabs/Lib/ThreadItem.php:130 @@ -1255,7 +1255,7 @@ msgid "Visible to specific connections." msgstr "Видно указанным контактам." #: ../../include/items.php:3587 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Display.php:452 ../../Zotlabs/Module/Admin.php:62 #: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Viewsrc.php:25 #: ../../Zotlabs/Module/Admin/Addons.php:259 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 @@ -1874,47 +1874,47 @@ msgstr "расслабленный" msgid "surprised" msgstr "удивленный" -#: ../../include/text.php:1377 ../../include/js_strings.php:86 +#: ../../include/text.php:1377 ../../include/js_strings.php:95 msgid "Monday" msgstr "Понедельник" -#: ../../include/text.php:1377 ../../include/js_strings.php:87 +#: ../../include/text.php:1377 ../../include/js_strings.php:96 msgid "Tuesday" msgstr "Вторник" -#: ../../include/text.php:1377 ../../include/js_strings.php:88 +#: ../../include/text.php:1377 ../../include/js_strings.php:97 msgid "Wednesday" msgstr "Среда" -#: ../../include/text.php:1377 ../../include/js_strings.php:89 +#: ../../include/text.php:1377 ../../include/js_strings.php:98 msgid "Thursday" msgstr "Четверг" -#: ../../include/text.php:1377 ../../include/js_strings.php:90 +#: ../../include/text.php:1377 ../../include/js_strings.php:99 msgid "Friday" msgstr "Пятница" -#: ../../include/text.php:1377 ../../include/js_strings.php:91 +#: ../../include/text.php:1377 ../../include/js_strings.php:100 msgid "Saturday" msgstr "Суббота" -#: ../../include/text.php:1377 ../../include/js_strings.php:85 +#: ../../include/text.php:1377 ../../include/js_strings.php:94 msgid "Sunday" msgstr "Воскресенье" -#: ../../include/text.php:1381 ../../include/js_strings.php:61 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "January" msgstr "Январь" -#: ../../include/text.php:1381 ../../include/js_strings.php:62 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "February" msgstr "Февраль" -#: ../../include/text.php:1381 ../../include/js_strings.php:63 +#: ../../include/text.php:1381 ../../include/js_strings.php:72 msgid "March" msgstr "Март" -#: ../../include/text.php:1381 ../../include/js_strings.php:64 +#: ../../include/text.php:1381 ../../include/js_strings.php:73 msgid "April" msgstr "Апрель" @@ -1922,31 +1922,31 @@ msgstr "Апрель" msgid "May" msgstr "Май" -#: ../../include/text.php:1381 ../../include/js_strings.php:66 +#: ../../include/text.php:1381 ../../include/js_strings.php:75 msgid "June" msgstr "Июнь" -#: ../../include/text.php:1381 ../../include/js_strings.php:67 +#: ../../include/text.php:1381 ../../include/js_strings.php:76 msgid "July" msgstr "Июль" -#: ../../include/text.php:1381 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:77 msgid "August" msgstr "Август" -#: ../../include/text.php:1381 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:78 msgid "September" msgstr "Сентябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:79 msgid "October" msgstr "Октябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:80 msgid "November" msgstr "Ноябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:72 +#: ../../include/text.php:1381 ../../include/js_strings.php:81 msgid "December" msgstr "Декабрь" @@ -1976,7 +1976,7 @@ msgstr "удалить из файла" msgid "Link to Source" msgstr "Ссылка на источник" -#: ../../include/text.php:1872 ../../include/language.php:397 +#: ../../include/text.php:1872 ../../include/language.php:423 msgid "default" msgstr "по умолчанию" @@ -1989,8 +1989,8 @@ msgid "You can create your own with the layouts tool" msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов" #: ../../include/text.php:1890 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:359 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 +#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 msgid "BBcode" msgstr "" @@ -1999,15 +1999,15 @@ msgid "HTML" msgstr "" #: ../../include/text.php:1892 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:359 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 +#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 #: ../../extend/addon/hzaddons/mdpost/mdpost.php:41 msgid "Markdown" msgstr "Разметка Markdown" #: ../../include/text.php:1893 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 msgid "Text" msgstr "Текст" @@ -2342,7 +2342,7 @@ msgstr "Не найдено" #: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:140 #: ../../Zotlabs/Module/Display.php:157 ../../Zotlabs/Module/Display.php:174 #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Web/Router.php:185 ../../Zotlabs/Lib/NativeWikiPage.php:519 +#: ../../Zotlabs/Web/Router.php:185 ../../Zotlabs/Lib/NativeWikiPage.php:521 msgid "Page not found." msgstr "Страница не найдена." @@ -2418,7 +2418,7 @@ msgid "View summary" msgstr "Просмотр резюме" #: ../../include/bbcode.php:746 ../../include/bbcode.php:916 -#: ../../Zotlabs/Lib/NativeWikiPage.php:600 +#: ../../Zotlabs/Lib/NativeWikiPage.php:603 msgid "Different viewers will see this text differently" msgstr "Различные зрители увидят этот текст по-разному" @@ -2756,13 +2756,13 @@ msgid "Where are you right now?" msgstr "Где вы сейчас?" #: ../../include/conversation.php:1342 ../../Zotlabs/Module/Cover_photo.php:401 -#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:390 +#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:403 #: ../../extend/addon/hzaddons/hsse/hsse.php:139 msgid "Choose images to embed" msgstr "Выбрать изображения для встраивания" #: ../../include/conversation.php:1343 ../../Zotlabs/Module/Cover_photo.php:402 -#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:391 +#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:404 #: ../../extend/addon/hzaddons/hsse/hsse.php:140 msgid "Choose an album" msgstr "Выбрать альбом" @@ -2773,19 +2773,19 @@ msgid "Choose a different album..." msgstr "Выбрать другой альбом..." #: ../../include/conversation.php:1345 ../../Zotlabs/Module/Cover_photo.php:404 -#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:406 #: ../../extend/addon/hzaddons/hsse/hsse.php:142 msgid "Error getting album list" msgstr "Ошибка получения списка альбомов" #: ../../include/conversation.php:1346 ../../Zotlabs/Module/Cover_photo.php:405 -#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:394 +#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:407 #: ../../extend/addon/hzaddons/hsse/hsse.php:143 msgid "Error getting photo link" msgstr "Ошибка получения ссылки на фотографию" #: ../../include/conversation.php:1347 ../../Zotlabs/Module/Cover_photo.php:406 -#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:395 +#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:408 #: ../../extend/addon/hzaddons/hsse/hsse.php:144 msgid "Error getting album" msgstr "Ошибка получения альбома" @@ -2809,7 +2809,7 @@ msgstr "Предварительный просмотр" #: ../../include/conversation.php:1389 ../../Zotlabs/Module/Photos.php:1104 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Blocks.php:161 -#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Widget/Cdav.php:124 #: ../../extend/addon/hzaddons/hsse/hsse.php:186 msgid "Share" @@ -2855,7 +2855,7 @@ msgstr "Код" msgid "Attach/Upload file" msgstr "Прикрепить/загрузить файл" -#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:387 +#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:400 #: ../../extend/addon/hzaddons/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "Встроить изображение из ваших альбомов" @@ -2874,8 +2874,8 @@ msgstr "Встроить изображение из ваших альбомов #: ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Connedit.php:925 #: ../../Zotlabs/Module/Card_edit.php:131 -#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:356 -#: ../../Zotlabs/Module/Wiki.php:388 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:368 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Filer.php:55 #: ../../extend/addon/hzaddons/hsse/hsse.php:209 #: ../../extend/addon/hzaddons/hsse/hsse.php:258 msgid "Cancel" @@ -2883,7 +2883,7 @@ msgstr "Отменить" #: ../../include/conversation.php:1413 ../../include/conversation.php:1460 #: ../../Zotlabs/Module/Cover_photo.php:400 -#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:402 #: ../../extend/addon/hzaddons/hsse/hsse.php:210 #: ../../extend/addon/hzaddons/hsse/hsse.php:257 msgid "OK" @@ -3045,7 +3045,7 @@ msgstr "не нравится" msgid "dislikes" msgstr "не нравится" -#: ../../include/language.php:410 +#: ../../include/language.php:436 msgid "Select an alternate language" msgstr "Выбор дополнительного языка" @@ -3181,181 +3181,196 @@ msgid " channel name" msgstr " название канала" #: ../../include/js_strings.php:41 +#, php-format +msgid "%d minutes" +msgid_plural "%d minutes" +msgstr[0] "%d минуту" +msgstr[1] "%d минуты" +msgstr[2] "%d минут" + +#: ../../include/js_strings.php:42 +#, php-format +msgid "about %d hours" +msgid_plural "about %d hours" +msgstr[0] "около %d часa" +msgstr[1] "около %d часов" +msgstr[2] "около %d часов" + +#: ../../include/js_strings.php:43 +#, php-format +msgid "%d days" +msgid_plural "%d days" +msgstr[0] "%d день" +msgstr[1] "%d дня" +msgstr[2] "%d дней" + +#: ../../include/js_strings.php:44 +#, php-format +msgid "%d months" +msgid_plural "%d months" +msgstr[0] "%d месяц" +msgstr[1] "%d месяца" +msgstr[2] "%d месяцев" + +#: ../../include/js_strings.php:45 +#, php-format +msgid "%d years" +msgid_plural "%d years" +msgstr[0] "%d год" +msgstr[1] "%d года" +msgstr[2] "%d лет" + +#: ../../include/js_strings.php:50 msgid "timeago.prefixAgo" msgstr "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:51 msgid "timeago.prefixFromNow" -msgstr "" +msgstr "через" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:52 msgid "timeago.suffixAgo" msgstr "назад" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:53 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:56 msgid "less than a minute" msgstr "менее чем одну минуту" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:57 msgid "about a minute" msgstr "около минуты" -#: ../../include/js_strings.php:49 -#, php-format -msgid "%d minutes" -msgstr "%d минут" - -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:59 msgid "about an hour" msgstr "около часа" -#: ../../include/js_strings.php:51 -#, php-format -msgid "about %d hours" -msgstr "около %d часов" - -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:61 msgid "a day" msgstr "день" -#: ../../include/js_strings.php:53 -#, php-format -msgid "%d days" -msgstr "%d дней" - -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:63 msgid "about a month" msgstr "около месяца" -#: ../../include/js_strings.php:55 -#, php-format -msgid "%d months" -msgstr "%d месяцев" - -#: ../../include/js_strings.php:56 +#: ../../include/js_strings.php:65 msgid "about a year" msgstr "около года" -#: ../../include/js_strings.php:57 -#, php-format -msgid "%d years" -msgstr "%d лет" - -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:67 msgid " " msgstr " " -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:68 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:74 msgctxt "long" msgid "May" msgstr "Май" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:82 msgid "Jan" msgstr "Янв" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:83 msgid "Feb" msgstr "Фев" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:84 msgid "Mar" msgstr "Мар" -#: ../../include/js_strings.php:76 +#: ../../include/js_strings.php:85 msgid "Apr" msgstr "Апр" -#: ../../include/js_strings.php:77 +#: ../../include/js_strings.php:86 msgctxt "short" msgid "May" msgstr "Май" -#: ../../include/js_strings.php:78 +#: ../../include/js_strings.php:87 msgid "Jun" msgstr "Июн" -#: ../../include/js_strings.php:79 +#: ../../include/js_strings.php:88 msgid "Jul" msgstr "Июл" -#: ../../include/js_strings.php:80 +#: ../../include/js_strings.php:89 msgid "Aug" msgstr "Авг" -#: ../../include/js_strings.php:81 +#: ../../include/js_strings.php:90 msgid "Sep" msgstr "Сен" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:91 msgid "Oct" msgstr "Окт" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:92 msgid "Nov" msgstr "Ноя" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:93 msgid "Dec" msgstr "Дек" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:101 msgid "Sun" msgstr "Вск" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:102 msgid "Mon" msgstr "Пон" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:103 msgid "Tue" msgstr "Вт" -#: ../../include/js_strings.php:95 +#: ../../include/js_strings.php:104 msgid "Wed" msgstr "Ср" -#: ../../include/js_strings.php:96 +#: ../../include/js_strings.php:105 msgid "Thu" msgstr "Чет" -#: ../../include/js_strings.php:97 +#: ../../include/js_strings.php:106 msgid "Fri" msgstr "Пят" -#: ../../include/js_strings.php:98 +#: ../../include/js_strings.php:107 msgid "Sat" msgstr "Суб" -#: ../../include/js_strings.php:99 +#: ../../include/js_strings.php:108 msgctxt "calendar" msgid "today" msgstr "сегодня" -#: ../../include/js_strings.php:100 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "month" msgstr "месяц" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "week" msgstr "неделя" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:111 msgctxt "calendar" msgid "day" msgstr "день" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "All day" msgstr "Весь день" @@ -3376,27 +3391,27 @@ msgstr "Только публичные форумы" msgid "This Website Only" msgstr "Только этот веб-сайт" -#: ../../include/network.php:760 +#: ../../include/network.php:770 msgid "view full size" msgstr "посмотреть в полный размер" -#: ../../include/network.php:1763 ../../include/network.php:1764 +#: ../../include/network.php:1773 ../../include/network.php:1774 msgid "Friendica" msgstr "" -#: ../../include/network.php:1765 +#: ../../include/network.php:1775 msgid "OStatus" msgstr "" -#: ../../include/network.php:1766 +#: ../../include/network.php:1776 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1767 +#: ../../include/network.php:1777 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1768 ../../Zotlabs/Lib/Activity.php:1417 +#: ../../include/network.php:1778 ../../Zotlabs/Lib/Activity.php:1417 #: ../../Zotlabs/Lib/Activity.php:1614 #: ../../extend/addon/hzaddons/pubcrawl/as.php:1222 #: ../../extend/addon/hzaddons/pubcrawl/as.php:1377 @@ -3404,7 +3419,7 @@ msgstr "" msgid "ActivityPub" msgstr "" -#: ../../include/network.php:1769 ../../Zotlabs/Module/Cdav.php:1219 +#: ../../include/network.php:1779 ../../Zotlabs/Module/Cdav.php:1219 #: ../../Zotlabs/Module/Profiles.php:787 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 @@ -3416,27 +3431,27 @@ msgstr "" msgid "Email" msgstr "Электронная почта" -#: ../../include/network.php:1770 +#: ../../include/network.php:1780 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1771 +#: ../../include/network.php:1781 msgid "Facebook" msgstr "" -#: ../../include/network.php:1772 +#: ../../include/network.php:1782 msgid "Zot" msgstr "" -#: ../../include/network.php:1773 +#: ../../include/network.php:1783 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1774 +#: ../../include/network.php:1784 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1775 +#: ../../include/network.php:1785 msgid "MySpace" msgstr "" @@ -4080,7 +4095,7 @@ msgstr "Удалено администратором" #: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Group.php:144 #: ../../Zotlabs/Module/Wiki.php:218 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Lib/NativeWikiPage.php:561 #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172 msgid "Name" msgstr "Имя" @@ -4250,15 +4265,15 @@ msgstr "Отправить ответ" msgid "Your message for %s (%s):" msgstr "Ваше сообщение для %s (%s):" -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63 msgid "This setting requires special processing and editing has been blocked." msgstr "Этот параметр требует специальной обработки и редактирования и был заблокирован." -#: ../../Zotlabs/Module/Pconfig.php:48 +#: ../../Zotlabs/Module/Pconfig.php:52 msgid "Configuration Editor" msgstr "Редактор конфигурации" -#: ../../Zotlabs/Module/Pconfig.php:49 +#: ../../Zotlabs/Module/Pconfig.php:53 msgid "" "Warning: Changing some settings could render your channel inoperable. Please " "leave this page unless you are comfortable with and knowledgeable about how " @@ -4467,8 +4482,8 @@ msgstr "почта доставлен" msgid "Delivery report for %1$s" msgstr "Отчёт о доставке для %1$s" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 -#: ../../Zotlabs/Widget/Wiki_pages.php:96 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41 +#: ../../Zotlabs/Widget/Wiki_pages.php:98 msgid "Options" msgstr "Параметры" @@ -4593,16 +4608,16 @@ msgstr "Некоторые предложения о том, что делать msgid "Public access denied." msgstr "Публичный доступ запрещен." -#: ../../Zotlabs/Module/Display.php:375 ../../Zotlabs/Module/Channel.php:424 +#: ../../Zotlabs/Module/Display.php:374 ../../Zotlabs/Module/Channel.php:424 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:393 msgid "Article" msgstr "Статья" -#: ../../Zotlabs/Module/Display.php:446 +#: ../../Zotlabs/Module/Display.php:445 msgid "Item has been removed." msgstr "Элемент был удалён." @@ -5985,7 +6000,7 @@ msgstr "Создать событие" #: ../../Zotlabs/Module/Events.php:695 ../../Zotlabs/Module/Pubsites.php:60 #: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409 #: ../../Zotlabs/Module/Layouts.php:198 msgid "View" msgstr "Просмотр" @@ -6161,7 +6176,7 @@ msgid "Use a photo from your albums" msgstr "Использовать фотографию из ваших альбомов" #: ../../Zotlabs/Module/Cover_photo.php:403 -#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:392 +#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:405 msgid "Choose a different album" msgstr "Выбрать другой альбом" @@ -6820,7 +6835,7 @@ msgid "Link post titles to source" msgstr "Ссылки на источник заголовков публикаций" #: ../../Zotlabs/Module/Settings/Display.php:205 -#: ../../Zotlabs/Widget/Newmember.php:69 +#: ../../Zotlabs/Widget/Newmember.php:75 msgid "New Member Links" msgstr "Ссылки для новичков" @@ -8850,9 +8865,9 @@ msgstr "Домашняя страница, которая будет показ #: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " +"example: 'pubstream' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." -msgstr "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла." +msgstr "например: 'pubstream' для показа публичного потока, 'page/sys/home' для показа системной домашней веб-страницы или 'include:home.html' для включения файла." #: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Preserve site homepage URL" @@ -10413,7 +10428,7 @@ msgstr "Предоставьте Wiki для вашего канала" #: ../../Zotlabs/Module/Wiki.php:77 #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:456 #: ../../extend/addon/hzaddons/cart/myshop.php:37 -#: ../../extend/addon/hzaddons/cart/manual_payments.php:63 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:93 #: ../../extend/addon/hzaddons/cart/cart.php:1440 msgid "Invalid channel" msgstr "Недействительный канал" @@ -10458,101 +10473,101 @@ msgstr "Создать публикацию о статусе этой Wiki" msgid "Edit Wiki Name" msgstr "Редактировать наименование Wiki" -#: ../../Zotlabs/Module/Wiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:274 msgid "Wiki not found" msgstr "Wiki не найдена" -#: ../../Zotlabs/Module/Wiki.php:295 +#: ../../Zotlabs/Module/Wiki.php:300 msgid "Rename page" msgstr "Переименовать страницу" -#: ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Wiki.php:321 msgid "Error retrieving page content" msgstr "Ошибка при получении содержимого страницы" -#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326 +#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331 msgid "New page" msgstr "Новая страница" -#: ../../Zotlabs/Module/Wiki.php:354 +#: ../../Zotlabs/Module/Wiki.php:366 msgid "Revision Comparison" msgstr "Сравнение ревизий" -#: ../../Zotlabs/Module/Wiki.php:355 +#: ../../Zotlabs/Module/Wiki.php:367 #: ../../Zotlabs/Widget/Wiki_page_history.php:25 -#: ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Lib/NativeWikiPage.php:564 msgid "Revert" msgstr "Отменить" -#: ../../Zotlabs/Module/Wiki.php:362 +#: ../../Zotlabs/Module/Wiki.php:374 msgid "Short description of your changes (optional)" msgstr "Краткое описание ваших изменений (необязательно)" -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:384 msgid "Source" msgstr "Источник" -#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "Новое имя страницы" -#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Wiki.php:399 msgid "Embed image from photo albums" msgstr "Встроить изображение из фотоальбома" -#: ../../Zotlabs/Module/Wiki.php:397 +#: ../../Zotlabs/Module/Wiki.php:410 msgid "History" msgstr "История" -#: ../../Zotlabs/Module/Wiki.php:473 +#: ../../Zotlabs/Module/Wiki.php:488 msgid "Error creating wiki. Invalid name." msgstr "Ошибка создания Wiki. Неверное имя." -#: ../../Zotlabs/Module/Wiki.php:480 +#: ../../Zotlabs/Module/Wiki.php:495 msgid "A wiki with this name already exists." msgstr "Wiki с таким именем уже существует." -#: ../../Zotlabs/Module/Wiki.php:493 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Wiki created, but error creating Home page." msgstr "Wiki создана, но возникла ошибка при создании домашней страницы" -#: ../../Zotlabs/Module/Wiki.php:500 +#: ../../Zotlabs/Module/Wiki.php:515 msgid "Error creating wiki" msgstr "Ошибка при создании Wiki" -#: ../../Zotlabs/Module/Wiki.php:523 +#: ../../Zotlabs/Module/Wiki.php:539 msgid "Error updating wiki. Invalid name." msgstr "Ошибка при обновлении Wiki. Неверное имя." -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:559 msgid "Error updating wiki" msgstr "Ошибка при обновлении Wiki" -#: ../../Zotlabs/Module/Wiki.php:558 +#: ../../Zotlabs/Module/Wiki.php:574 msgid "Wiki delete permission denied." msgstr "Нет прав на удаление Wiki." -#: ../../Zotlabs/Module/Wiki.php:568 +#: ../../Zotlabs/Module/Wiki.php:584 msgid "Error deleting wiki" msgstr "Ошибка удаления Wiki" -#: ../../Zotlabs/Module/Wiki.php:601 +#: ../../Zotlabs/Module/Wiki.php:617 msgid "New page created" msgstr "Создана новая страница" -#: ../../Zotlabs/Module/Wiki.php:722 +#: ../../Zotlabs/Module/Wiki.php:739 msgid "Cannot delete Home" msgstr "Невозможно удалить домашнюю страницу" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Current Revision" msgstr "Текущая ревизия" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Selected Revision" msgstr "Выбранная ревизия" -#: ../../Zotlabs/Module/Wiki.php:836 +#: ../../Zotlabs/Module/Wiki.php:853 msgid "You must be authenticated." msgstr "Вы должны быть аутентифицированы." @@ -11240,7 +11255,19 @@ msgstr "Просмотреть ваш сетевой поток" msgid "Documentation" msgstr "Документация" -#: ../../Zotlabs/Widget/Newmember.php:65 +#: ../../Zotlabs/Widget/Newmember.php:57 +msgid "Missing Features?" +msgstr "Отсутствует функция?" + +#: ../../Zotlabs/Widget/Newmember.php:59 +msgid "Pin apps to navigation bar" +msgstr "Прикрепить приложение к панели" + +#: ../../Zotlabs/Widget/Newmember.php:60 +msgid "Install more apps" +msgstr "Установить больше приложений" + +#: ../../Zotlabs/Widget/Newmember.php:71 msgid "View public stream" msgstr "Просмотреть публичный поток" @@ -11264,16 +11291,16 @@ msgstr "Исходящие" msgid "New Message" msgstr "Новое сообщение" -#: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 +#: ../../Zotlabs/Widget/Wiki_pages.php:34 +#: ../../Zotlabs/Widget/Wiki_pages.php:91 msgid "Add new page" msgstr "Добавить новую страницу" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 +#: ../../Zotlabs/Widget/Wiki_pages.php:85 msgid "Wiki Pages" msgstr "Wiki страницы" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Page name" msgstr "Название страницы" @@ -11464,24 +11491,24 @@ msgid "Delete conversation" msgstr "Удалить беседу" #: ../../Zotlabs/Widget/Wiki_page_history.php:23 -#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Lib/NativeWikiPage.php:562 msgctxt "wiki_history" msgid "Message" msgstr "Сообщение" #: ../../Zotlabs/Widget/Wiki_page_history.php:24 -#: ../../Zotlabs/Lib/NativeWikiPage.php:560 +#: ../../Zotlabs/Lib/NativeWikiPage.php:563 msgid "Date" msgstr "Дата" #: ../../Zotlabs/Widget/Wiki_page_history.php:26 -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 msgid "Compare" msgstr "Сравнить" #: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my channel stream and posts" -msgstr "Может просматривать мою ленту и сообщения" +msgstr "Может просматривать мой поток и сообщения" #: ../../Zotlabs/Access/Permissions.php:57 msgid "Can send me their channel stream and posts" @@ -11501,7 +11528,7 @@ msgstr "Может просматривать мое хранилище файл #: ../../Zotlabs/Access/Permissions.php:61 msgid "Can upload/modify my file storage and photos" -msgstr "Может загружать/изменять мои файлы и фотографии в хранилище" +msgstr "Может загружать/изменять мои файлы и фотографии в хранилище" #: ../../Zotlabs/Access/Permissions.php:62 msgid "Can view my channel webpages" @@ -11896,59 +11923,59 @@ msgid "edited a comment dated %s" msgstr "отредактировал комментарий датированный %s" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +#: ../../Zotlabs/Lib/NativeWikiPage.php:94 msgid "(No Title)" msgstr "(нет заголовка)" -#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +#: ../../Zotlabs/Lib/NativeWikiPage.php:109 msgid "Wiki page create failed." msgstr "Не удалось создать страницу Wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +#: ../../Zotlabs/Lib/NativeWikiPage.php:122 msgid "Wiki not found." msgstr "Wiki не найдена." -#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +#: ../../Zotlabs/Lib/NativeWikiPage.php:133 msgid "Destination name already exists" msgstr "Имя назначения уже существует" -#: ../../Zotlabs/Lib/NativeWikiPage.php:163 -#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +#: ../../Zotlabs/Lib/NativeWikiPage.php:362 msgid "Page not found" msgstr "Страница не найдена." -#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +#: ../../Zotlabs/Lib/NativeWikiPage.php:197 msgid "Error reading page content" msgstr "Ошибка чтения содержимого страницы" -#: ../../Zotlabs/Lib/NativeWikiPage.php:350 -#: ../../Zotlabs/Lib/NativeWikiPage.php:400 -#: ../../Zotlabs/Lib/NativeWikiPage.php:467 -#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +#: ../../Zotlabs/Lib/NativeWikiPage.php:353 +#: ../../Zotlabs/Lib/NativeWikiPage.php:402 +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +#: ../../Zotlabs/Lib/NativeWikiPage.php:510 msgid "Error reading wiki" msgstr "Ошибка чтения Wiki" -#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +#: ../../Zotlabs/Lib/NativeWikiPage.php:390 msgid "Page update failed." msgstr "Не удалось обновить страницу." -#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +#: ../../Zotlabs/Lib/NativeWikiPage.php:424 msgid "Nothing deleted" msgstr "Ничего не удалено" -#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +#: ../../Zotlabs/Lib/NativeWikiPage.php:490 msgid "Compare: object not found." msgstr "Сравнение: объект не найден." -#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +#: ../../Zotlabs/Lib/NativeWikiPage.php:496 msgid "Page updated" msgstr "Страница обновлена" -#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +#: ../../Zotlabs/Lib/NativeWikiPage.php:499 msgid "Untitled" msgstr "Не озаглавлено" -#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +#: ../../Zotlabs/Lib/NativeWikiPage.php:505 msgid "Wiki resource_id required for git commit" msgstr "Требуется resource_id Wiki для отправки в Git" @@ -12312,11 +12339,11 @@ msgstr "4. Эксперт - я умею программировать" msgid "5. Wizard - I probably know more than you do" msgstr "5. Волшебник - возможно я знаю больше чем ты" -#: ../../Zotlabs/Lib/NativeWiki.php:151 +#: ../../Zotlabs/Lib/NativeWiki.php:152 msgid "Wiki updated successfully" msgstr "Wiki успешно обновлена" -#: ../../Zotlabs/Lib/NativeWiki.php:205 +#: ../../Zotlabs/Lib/NativeWiki.php:206 msgid "Wiki files deleted successfully" msgstr "Wiki успешно удалена" @@ -12596,7 +12623,7 @@ msgstr "Ваш аккаунт на %s перестанет работать че #: ../../extend/addon/hzaddons/testdrive/testdrive.php:105 msgid "Your $Productname test account is about to expire." -msgstr "Ваша пробная учётная запись в $Productname близка к окончанию срока действия." +msgstr "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия." #: ../../extend/addon/hzaddons/redfiles/redfiles.php:119 msgid "Redmatrix File Storage Import" @@ -14132,7 +14159,7 @@ msgid "" msgstr "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты." #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:392 -#: ../../extend/addon/hzaddons/cart/manual_payments.php:38 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:68 #: ../../extend/addon/hzaddons/cart/cart.php:1462 msgid "Order not found." msgstr "Заказ не найден." @@ -14161,11 +14188,11 @@ msgstr "Недействительный элемент" msgid "Error: order mismatch. Please try again." msgstr "Ошибка: несоответствие заказа. Пожалуйста, попробуйте ещё раз" -#: ../../extend/addon/hzaddons/cart/manual_payments.php:31 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:61 msgid "Manual payments are not enabled." msgstr "Ручные платежи не подключены." -#: ../../extend/addon/hzaddons/cart/manual_payments.php:47 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:77 msgid "Finished" msgstr "Завершено" @@ -14239,6 +14266,36 @@ msgstr "Разрешить федерацию публикаций по умол msgid "NoFed Settings" msgstr "Настройки NoFed" +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:43 +msgid "Your channel has been upgraded to the latest $Projectname version." +msgstr "Ваш канал был обновлён на последнюю версию $Projectname." + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:44 +msgid "" +"To improve usability, we have converted some features into installable stand-" +"alone apps." +msgstr "Чтобы улучшить удобство использования, некоторые функции теперь доступны в виде устанавливаемых автономных приложений." + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:45 +msgid "Please visit the $Projectname" +msgstr "Пожалуйста, посетите $Projectname" + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:46 +msgid "app store" +msgstr "раздел \"Приложения\"" + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:47 +msgid "and install possibly missing apps." +msgstr "и установите необходимые вам." + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:52 +msgid "Upgrade Info" +msgstr "Сведения об обновлении" + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:56 +msgid "Do not show this again" +msgstr "Больше не показывать" + #: ../../extend/addon/hzaddons/gravatar/gravatar.php:123 msgid "generic profile image" msgstr "Стандартное изображение профиля" @@ -14465,11 +14522,11 @@ msgstr "" #: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:29 msgid "PHP post_max_size (must be larger than upload_max_filesize): " -msgstr "" +msgstr "PHP post_max_size (должен быть больше чем upload_max_filesize): " #: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:45 msgid "Flattr this!" -msgstr "" +msgstr "Flattr это!" #: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:83 msgid "Flattr widget settings updated." diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 195f39bf2..598d02718 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -5,6 +5,7 @@ function string_plural_select_ru($n){ return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2)); }} App::$rtl = 0; +App::$strings["plural_function_code"] = "(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))"; App::$strings["Source channel not found."] = "Канал-источник не найден."; App::$strings["Default"] = "По умолчанию"; App::$strings["Focus (Hubzilla default)"] = "Фокус (по умолчанию Hubzilla)"; @@ -16,7 +17,7 @@ App::$strings["Yes"] = "Да"; App::$strings["Navigation bar background color"] = "Панель навигации, цвет фона"; App::$strings["Navigation bar icon color "] = "Панель навигации, цвет значков"; App::$strings["Navigation bar active icon color "] = "Панель навигации, цвет активного значка"; -App::$strings["Link color"] = "цвет ссылок"; +App::$strings["Link color"] = "Цвет ссылок"; App::$strings["Set font-color for banner"] = "Цвет текста в шапке"; App::$strings["Set the background color"] = "Цвет фона"; App::$strings["Set the background image"] = "Фоновое изображение"; @@ -663,21 +664,41 @@ App::$strings["Thank you, this nickname is valid."] = "Спасибо, этот App::$strings["A channel name is required."] = "Требуется название канала."; App::$strings["This is a "] = "Это "; App::$strings[" channel name"] = " название канала"; +App::$strings["%d minutes"] = array( + 0 => "%d минуту", + 1 => "%d минуты", + 2 => "%d минут", +); +App::$strings["about %d hours"] = array( + 0 => "около %d часa", + 1 => "около %d часов", + 2 => "около %d часов", +); +App::$strings["%d days"] = array( + 0 => "%d день", + 1 => "%d дня", + 2 => "%d дней", +); +App::$strings["%d months"] = array( + 0 => "%d месяц", + 1 => "%d месяца", + 2 => "%d месяцев", +); +App::$strings["%d years"] = array( + 0 => "%d год", + 1 => "%d года", + 2 => "%d лет", +); App::$strings["timeago.prefixAgo"] = ""; -App::$strings["timeago.prefixFromNow"] = ""; +App::$strings["timeago.prefixFromNow"] = "через"; App::$strings["timeago.suffixAgo"] = "назад"; App::$strings["timeago.suffixFromNow"] = ""; App::$strings["less than a minute"] = "менее чем одну минуту"; App::$strings["about a minute"] = "около минуты"; -App::$strings["%d minutes"] = "%d минут"; App::$strings["about an hour"] = "около часа"; -App::$strings["about %d hours"] = "около %d часов"; App::$strings["a day"] = "день"; -App::$strings["%d days"] = "%d дней"; App::$strings["about a month"] = "около месяца"; -App::$strings["%d months"] = "%d месяцев"; App::$strings["about a year"] = "около года"; -App::$strings["%d years"] = "%d лет"; App::$strings[" "] = " "; App::$strings["timeago.numbers"] = ""; App::$strings["__ctx:long__ May"] = "Май"; @@ -1976,7 +1997,7 @@ App::$strings["This is displayed on the public server site list."] = "Это о App::$strings["Register text"] = "Текст регистрации"; App::$strings["Will be displayed prominently on the registration page."] = "Будет отображаться на странице регистрации на видном месте."; App::$strings["Site homepage to show visitors (default: login box)"] = "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)."; -App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла."; +App::$strings["example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "например: 'pubstream' для показа публичного потока, 'page/sys/home' для показа системной домашней веб-страницы или 'include:home.html' для включения файла."; App::$strings["Preserve site homepage URL"] = "Сохранить URL главной страницы сайта"; App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации"; App::$strings["Accounts abandoned after x days"] = "Аккаунты считаются заброшенными после N дней"; @@ -2538,6 +2559,9 @@ App::$strings["Communicate"] = "Связаться"; App::$strings["View your channel homepage"] = "Домашняя страница канала"; App::$strings["View your network stream"] = "Просмотреть ваш сетевой поток"; App::$strings["Documentation"] = "Документация"; +App::$strings["Missing Features?"] = "Отсутствует функция?"; +App::$strings["Pin apps to navigation bar"] = "Прикрепить приложение к панели"; +App::$strings["Install more apps"] = "Установить больше приложений"; App::$strings["View public stream"] = "Просмотреть публичный поток"; App::$strings["Private Mail Menu"] = "Меню личной переписки"; App::$strings["Combined View"] = "Комбинированный вид"; @@ -2596,12 +2620,12 @@ App::$strings["Delete conversation"] = "Удалить беседу"; App::$strings["__ctx:wiki_history__ Message"] = "Сообщение"; App::$strings["Date"] = "Дата"; App::$strings["Compare"] = "Сравнить"; -App::$strings["Can view my channel stream and posts"] = "Может просматривать мою ленту и сообщения"; +App::$strings["Can view my channel stream and posts"] = "Может просматривать мой поток и сообщения"; App::$strings["Can send me their channel stream and posts"] = "Может присылать мне свои потоки и сообщения"; App::$strings["Can view my default channel profile"] = "Может просматривать мой стандартный профиль канала"; App::$strings["Can view my connections"] = "Может просматривать мои контакты"; App::$strings["Can view my file storage and photos"] = "Может просматривать мое хранилище файлов"; -App::$strings["Can upload/modify my file storage and photos"] = "Может загружать/изменять мои файлы и фотографии в хранилище"; +App::$strings["Can upload/modify my file storage and photos"] = "Может загружать/изменять мои файлы и фотографии в хранилище"; App::$strings["Can view my channel webpages"] = "Может просматривать мои веб-страницы"; App::$strings["Can view my wiki pages"] = "Может просматривать мои вики-страницы"; App::$strings["Can create/edit my channel webpages"] = "Может редактировать мои веб-страницы"; @@ -2853,7 +2877,7 @@ App::$strings["Post to InsaneJournal by default"] = "Публиковать в I App::$strings["InsaneJournal Post Settings"] = "Настройки публикаций в InsaneJournal"; App::$strings["Insane Journal Settings saved."] = "Настройки InsaneJournal сохранены."; App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s перестанет работать через несколько дней."; -App::$strings["Your $Productname test account is about to expire."] = "Ваша пробная учётная запись в $Productname близка к окончанию срока действия."; +App::$strings["Your $Productname test account is about to expire."] = "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия."; App::$strings["Redmatrix File Storage Import"] = "Импорт файлового хранилища Redmatrix"; App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Это позволит импортировать все ваши файлы в Redmatrix в этот канал."; App::$strings["file"] = "файл"; @@ -3228,6 +3252,13 @@ App::$strings["nofed Settings saved."] = "Настройки nofed сохран App::$strings["Allow Federation Toggle"] = "Разрешить переключение федерации"; App::$strings["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию"; App::$strings["NoFed Settings"] = "Настройки NoFed"; +App::$strings["Your channel has been upgraded to the latest \$Projectname version."] = "Ваш канал был обновлён на последнюю версию \$Projectname."; +App::$strings["To improve usability, we have converted some features into installable stand-alone apps."] = "Чтобы улучшить удобство использования, некоторые функции теперь доступны в виде устанавливаемых автономных приложений."; +App::$strings["Please visit the \$Projectname"] = "Пожалуйста, посетите \$Projectname"; +App::$strings["app store"] = "раздел \"Приложения\""; +App::$strings["and install possibly missing apps."] = "и установите необходимые вам."; +App::$strings["Upgrade Info"] = "Сведения об обновлении"; +App::$strings["Do not show this again"] = "Больше не показывать"; App::$strings["generic profile image"] = "Стандартное изображение профиля"; App::$strings["random geometric pattern"] = "Случайный геометрический рисунок"; App::$strings["monster face"] = "Лицо чудовища"; @@ -3281,8 +3312,8 @@ App::$strings["Friendica Login Password"] = "Пароль для входа Fire App::$strings["Show Upload Limits"] = "Показать ограничения на загрузку"; App::$strings["Hubzilla configured maximum size: "] = "Максимальный размер настроенный в Hubzilla:"; App::$strings["PHP upload_max_filesize: "] = ""; -App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = ""; -App::$strings["Flattr this!"] = ""; +App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (должен быть больше чем upload_max_filesize): "; +App::$strings["Flattr this!"] = "Flattr это!"; App::$strings["Flattr widget settings updated."] = "Настройки виджета Flattr обновлены."; App::$strings["Flattr user"] = "Пользователь Flattr"; App::$strings["URL of the Thing to flattr"] = "URL ccылки на Flattr"; diff --git a/view/theme/redbasic/schema/Focus-Light.css b/view/theme/redbasic/schema/Focus-Light.css index d23fc0fd8..7289acffe 100644 --- a/view/theme/redbasic/schema/Focus-Light.css +++ b/view/theme/redbasic/schema/Focus-Light.css @@ -1,3 +1,4 @@ +.dropdown-header.text-white-50, .navbar-dark .navbar-toggler, .navbar-dark .nav-link.active { color: rgba(0,0,0,0.7) !important; diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index dbee67c84..71f7bc393 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -152,6 +152,7 @@ option { background-color: #111; } +.dropdown-header.text-black-50, .nav-link.active { color:#fff !important; } @@ -373,7 +374,7 @@ pre { } .dropdown-menu >li > a { - color: #ccc; + color: #ccc !important; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 01fc3f993..f7425ba98 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -34,7 +34,7 @@ 'name_ok1' : "{{$name_ok1}}", 'name_ok2' : "{{$name_ok2}}", - + 'plural_func' : "{{$plural_func}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 0f6fad8e3..4a4db03eb 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -98,7 +98,7 @@ <script> window.wiki_resource_id = '{{$resource_id}}'; - window.wiki_page_name = '{{$page}}'; + window.wiki_page_name = '{{$page|escape:'javascript'}}'; window.wiki_page_content = '{{$content|escape:'javascript'}}'; window.wiki_page_commit = '{{$commit}}'; window.saved = true; @@ -122,7 +122,7 @@ if (data.success) { $('#rename-page-form-wrapper').hide(); window.console.log('data: ' + JSON.stringify(data)); - window.wiki_page_name = data.name.urlName; + window.wiki_page_name = data.name.htmlName; $('#wiki-header-page').html(data.name.htmlName); wiki_refresh_page_list(); } else { diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index d75f22f64..e11f3b145 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -7,7 +7,7 @@ {{foreach $pages as $page}} <li class="nav-item nav-item-hack" id="{{$page.link_id}}"> {{if $page.resource_id && $candel}} - <i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.title}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i> + <i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title|escape:'javascript'}}', '{{$page.title|escape:'javascript'}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i> {{/if}} <a class="nav-link" href="/wiki/{{$channel_address}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a> </li> diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 801cb17fd..5f28d6b12 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -53,7 +53,7 @@ </td> <td><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> {{if $owner}} - <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td> + <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title|escape:'javascript'}}', '{{$wiki.resource_id}}'); return false;"></i></td> {{/if}} </tr> {{if $owner}} |