diff options
| -rw-r--r-- | Zotlabs/Lib/MarkdownSoap.php | 14 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 31 | ||||
| -rw-r--r-- | Zotlabs/Module/Editblock.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Module/Editlayout.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Editwebpage.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Hcard.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Module/Layouts.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Permcats.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 23 | ||||
| -rw-r--r-- | Zotlabs/Widget/Wiki_pages.php | 7 | ||||
| -rw-r--r-- | include/event.php | 6 | ||||
| -rw-r--r-- | util/hmessages.po | 3931 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 3 |
13 files changed, 1861 insertions, 2183 deletions
diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php index 2dcaaec9a..8cc18d513 100644 --- a/Zotlabs/Lib/MarkdownSoap.php +++ b/Zotlabs/Lib/MarkdownSoap.php @@ -34,9 +34,13 @@ class MarkdownSoap { function clean() { + $x = $this->extract_code($this->str); + $x = $this->purify($x); + $x = $this->putback_code($x); + $x = $this->escape($x); return $x; @@ -60,7 +64,7 @@ class MarkdownSoap { } function encode_code($matches) { - return $this->token . ';' . base64_encode($matches[1]) . ';' ; + return $this->token . ';' . base64_encode($matches[0]) . ';' ; } function decode_code($matches) { @@ -73,7 +77,13 @@ class MarkdownSoap { } function purify($s) { - return purify_html($s); + $s = str_replace("\n",'<br>',$s); + $s = str_replace("\t",' ',$s); + $s = str_replace(' ',' ',$s); + $s = purify_html($s); + $s = str_replace(' '," ",$s); + $s = str_replace(['<br>','<br />'],["\n","\n"],$s); + return $s; } function escape($s) { diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index 9f54081a1..3d6da7779 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -323,13 +323,6 @@ class NativeWikiPage { } $mimetype = $w['mimeType']; - if($mimetype === 'text/markdown') { - $x = new Zlib\MarkdownSoap($content); - $content = $x->clean(); - } - else { - $content = escape_tags($content); - } // fetch the most recently saved revision. @@ -348,6 +341,7 @@ class NativeWikiPage { $item['author_xchan'] = $observer_hash; $item['revision'] = (($arr['revision']) ? intval($arr['revision']) + 1 : intval($item['revision']) + 1); $item['edited'] = datetime_convert(); + $item['mimetype'] = $mimetype; if($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) { for($x = 0; $x < count($item['iconfig']); $x ++) { @@ -515,6 +509,29 @@ class NativeWikiPage { } return $s; } + + static public function render_page_history($arr) { + + $pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : ''); + $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); + + $pageHistory = self::page_history([ + 'channel_id' => \App::$profile_uid, + 'observer_hash' => get_observer_hash(), + 'resource_id' => $resource_id, + 'pageUrlName' => $pageUrlName + ]); + + return replace_macros(get_markup_template('nwiki_page_history.tpl'), array( + '$pageHistory' => $pageHistory['history'], + '$permsWrite' => $arr['permsWrite'], + '$name_lbl' => t('Name'), + '$msg_label' => t('Message','wiki_history') + )); + + } + + /** * Replace the instances of the string [toc] with a list element that will be populated by diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php index 654e2251d..8a7e87a09 100644 --- a/Zotlabs/Module/Editblock.php +++ b/Zotlabs/Module/Editblock.php @@ -98,6 +98,11 @@ class Editblock extends \Zotlabs\Web\Controller { $mimetype = $itm[0]['mimetype']; + $content = $itm[0]['body']; + if($itm[0]['mimetype'] === 'text/markdown') + $content = \Zotlabs\Lib\MarkdownSoap::unescape($itm[0]['body']); + + $rp = 'blocks/' . $channel['channel_address']; $x = array( @@ -117,7 +122,7 @@ class Editblock extends \Zotlabs\Web\Controller { 'ptyp' => $itm[0]['type'], 'mimeselect' => true, 'mimetype' => $itm[0]['mimetype'], - 'body' => undo_post_tagging($itm[0]['body']), + 'body' => undo_post_tagging($content), 'post_id' => $post_id, 'visitor' => true, 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php index ea637fcba..3d6a79507 100644 --- a/Zotlabs/Module/Editlayout.php +++ b/Zotlabs/Module/Editlayout.php @@ -119,6 +119,7 @@ class Editlayout extends \Zotlabs\Web\Controller { 'hide_weblink' => true, 'hide_attach' => true, 'hide_preview' => true, + 'disable_comments' => true, 'ptyp' => $itm[0]['obj_type'], 'body' => undo_post_tagging($itm[0]['body']), 'post_id' => $post_id, diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index 97f4a32ff..03b2aeab9 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -129,6 +129,10 @@ class Editwebpage extends \Zotlabs\Web\Controller { } $layout = $itm[0]['layout_mid']; + + $content = $itm[0]['body']; + if($itm[0]['mimetype'] === 'text/markdown') + $content = \Zotlabs\Lib\MarkdownSoap::unescape($itm[0]['body']); $rp = 'webpages/' . $which; @@ -145,7 +149,7 @@ class Editwebpage extends \Zotlabs\Web\Controller { 'hide_location' => true, 'hide_voting' => true, 'ptyp' => $itm[0]['type'], - 'body' => undo_post_tagging($itm[0]['body']), + 'body' => undo_post_tagging($content), 'post_id' => $post_id, 'visitor' => ($is_owner) ? true : false, 'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')), diff --git a/Zotlabs/Module/Hcard.php b/Zotlabs/Module/Hcard.php index ec9181f6a..13097939e 100644 --- a/Zotlabs/Module/Hcard.php +++ b/Zotlabs/Module/Hcard.php @@ -59,12 +59,10 @@ class Hcard extends \Zotlabs\Web\Controller { } - function get() { - - require_once('include/widgets.php'); - return widget_profile(array()); - - + function get() { + + $x = new \Zotlabs\Widget\Profile(); + return $x->widget(array()); } diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php index c07f65ce1..34d754029 100644 --- a/Zotlabs/Module/Layouts.php +++ b/Zotlabs/Module/Layouts.php @@ -125,6 +125,7 @@ class Layouts extends \Zotlabs\Web\Controller { 'hide_weblink' => true, 'hide_attach' => true, 'hide_preview' => true, + 'disable_comments' => true, 'ptlabel' => t('Layout Name'), 'profile_uid' => intval($owner), 'expanded' => true, diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php index 35d533196..771e76cbd 100644 --- a/Zotlabs/Module/Settings/Permcats.php +++ b/Zotlabs/Module/Settings/Permcats.php @@ -42,8 +42,6 @@ class Permcats { function get() { -logger('cmd: ' . \App::$cmd); - if(! local_channel()) return; @@ -85,7 +83,7 @@ logger('cmd: ' . \App::$cmd); if($existing[$k]) $thisperm = "1"; - $perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); + $perms[] = array('perms_' . $k, $v, '',$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); } diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 79ec5ba25..d24d3f6c3 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -237,6 +237,8 @@ class Wiki extends \Zotlabs\Web\Controller { $rawContent = htmlspecialchars_decode(json_decode($p['content']),ENT_COMPAT); + $rawContent = $p['content']; + $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"'); // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { @@ -244,7 +246,7 @@ class Wiki extends \Zotlabs\Web\Controller { } else { $content = Zlib\MarkdownSoap::unescape($content); - $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(MarkdownExtra::defaultTransform(Zlib\NativeWikiPage::bbcode($content))))); + $html = Zlib\NativeWikiPage::generate_toc(zidify_text(MarkdownExtra::defaultTransform(Zlib\NativeWikiPage::bbcode($content)))); $renderedContent = Zlib\NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); } $showPageControls = $wiki_editor; @@ -328,9 +330,12 @@ class Wiki extends \Zotlabs\Web\Controller { $html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL); } else { - require_once('library/markdown.php'); - $content = Zlib\NativeWikiPage::bbcode($content); - $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown($content)))); + $bb = Zlib\NativeWikiPage::bbcode($content); + $x = new ZLib\MarkdownSoap($bb); + $md = $x->clean(); + $md = ZLib\MarkdownSoap::unescape($md); + $html = MarkdownExtra::defaultTransform($md); + $html = Zlib\NativeWikiPage::generate_toc(zidify_text($html)); $html = Zlib\NativeWikiPage::convert_links($html,$wikiURL); } json_return_and_die(array('html' => $html, 'success' => true)); @@ -455,7 +460,11 @@ class Wiki extends \Zotlabs\Web\Controller { json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false)); } - $page_list_html = widget_wiki_pages(array( + // @FIXME - we shouldn't invoke this if it isn't in the PDL or has been over-ridden + + $x = new \Zotlabs\Widget\Wiki_pages(); + + $page_list_html = $x->widget(array( 'resource_id' => $resource_id, 'refresh' => true, 'channel' => argv(1))); @@ -513,7 +522,6 @@ class Wiki extends \Zotlabs\Web\Controller { $resource_id = $_POST['resource_id']; $pageUrlName = $_POST['name']; - // Determine if observer has permission to read content $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); @@ -522,11 +530,12 @@ class Wiki extends \Zotlabs\Web\Controller { json_return_and_die(array('historyHTML' => '', 'message' => 'Permission denied.', 'success' => false)); } - $historyHTML = widget_wiki_page_history(array( + $historyHTML = \Zotlabs\Lib\NativeWikiPage::render_page_history(array( 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'permsWrite' => $perms['write'] )); + json_return_and_die(array('historyHTML' => $historyHTML, 'message' => '', 'success' => true)); } diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php index bad451475..f992b3f93 100644 --- a/Zotlabs/Widget/Wiki_pages.php +++ b/Zotlabs/Widget/Wiki_pages.php @@ -10,6 +10,12 @@ class Wiki_pages { $channelname = ((array_key_exists('channel',$arr)) ? $arr['channel'] : ''); $c = channelx_by_nick($channelname); + if(! $c) + $c = \App::get_channel(); + + if(! $c) + return ''; + $wikiname = ''; if(array_key_exists('refresh', $arr)) { $not_refresh = (($arr['refresh']=== true) ? false : true); @@ -36,6 +42,7 @@ class Wiki_pages { } } + $can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki'); $can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false); diff --git a/include/event.php b/include/event.php index 726eb667c..001bd7dd3 100644 --- a/include/event.php +++ b/include/event.php @@ -614,7 +614,7 @@ function parse_vobject($ical, $type) { $ev['etype'] = $type; $dtstart = $ical->DTSTART->getDateTime(); - $ev['adjust'] = (($ical->DTSTART->isFloating()) ? 1 : 0); + $ev['adjust'] = (($ical->DTSTART->isFloating()) ? 0 : 1); $ev['dtstart'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC', $dtstart->format(\DateTime::W3C)); @@ -755,7 +755,7 @@ function event_import_ical($ical, $uid) { } $dtstart = $ical->DTSTART->getDateTime(); - $ev['adjust'] = (($ical->DTSTART->isFloating()) ? 1 : 0); + $ev['adjust'] = (($ical->DTSTART->isFloating()) ? 0 : 1); // logger('dtstart: ' . var_export($dtstart,true)); @@ -858,7 +858,7 @@ function event_import_ical_task($ical, $uid) { $dtstart = $ical->DTSTART->getDateTime(); - $ev['adjust'] = (($ical->DTSTART->isFloating()) ? 1 : 0); + $ev['adjust'] = (($ical->DTSTART->isFloating()) ? 0 : 1); // logger('dtstart: ' . var_export($dtstart,true)); diff --git a/util/hmessages.po b/util/hmessages.po index 796a53de2..b2f18043c 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3\n" +"Project-Id-Version: 5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-10 00:05-0800\n" +"POT-Creation-Date: 2017-03-17 00:04-0700\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" @@ -89,7 +89,7 @@ msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:270 #: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Connedit.php:922 #: ../../Zotlabs/Module/New_channel.php:132 #: ../../Zotlabs/Module/Settings/Channel.php:463 #: ../../extend/addon/addon/cdav/cdav.php:277 @@ -183,7 +183,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2684 +#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2670 msgid "Collection" msgstr "" @@ -210,11 +210,11 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:784 #: ../../Zotlabs/Module/Photos.php:1244 #: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:561 -#: ../../Zotlabs/Lib/Apps.php:639 +#: ../../Zotlabs/Lib/Apps.php:639 ../../Zotlabs/Widget/Album.php:84 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753 -#: ../../include/conversation.php:1177 ../../include/widgets.php:1757 +#: ../../include/conversation.php:1177 msgid "Unknown" msgstr "" @@ -233,9 +233,9 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:330 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Webpages.php:243 -#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:925 #: ../../Zotlabs/Module/New_channel.php:147 -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:185 #: ../../extend/addon/addon/cdav/include/widgets.php:127 #: ../../extend/addon/addon/cdav/include/widgets.php:164 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151 @@ -243,26 +243,25 @@ msgid "Create" msgstr "" #: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:332 -#: ../../Zotlabs/Module/Cover_photo.php:357 -#: ../../Zotlabs/Module/Profile_photo.php:421 +#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Profile_photo.php:423 #: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368 -#: ../../Zotlabs/Module/Embedphotos.php:157 +#: ../../Zotlabs/Module/Embedphotos.php:157 ../../Zotlabs/Widget/Album.php:97 #: ../../extend/addon/addon/cdav/include/widgets.php:132 #: ../../extend/addon/addon/cdav/include/widgets.php:168 -#: ../../include/widgets.php:1770 msgid "Upload" msgstr "" #: ../../Zotlabs/Storage/Browser.php:233 ../../Zotlabs/Module/Chat.php:248 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Wiki.php:171 +#: ../../Zotlabs/Module/Wiki.php:171 ../../Zotlabs/Module/Connedit.php:910 #: ../../Zotlabs/Module/Sharedwithme.php:99 #: ../../Zotlabs/Module/Settings/Oauth.php:89 #: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136 #: ../../extend/addon/addon/rendezvous/rendezvous.php:172 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156 -#: ../../include/widgets.php:976 msgid "Name" msgstr "" @@ -272,7 +271,7 @@ msgid "Type" msgstr "" #: ../../Zotlabs/Storage/Browser.php:235 -#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1398 +#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1397 msgid "Size" msgstr "" @@ -282,16 +281,16 @@ msgid "Last Modified" msgstr "" #: ../../Zotlabs/Storage/Browser.php:238 -#: ../../Zotlabs/Module/Editblock.php:109 -#: ../../Zotlabs/Module/Connections.php:300 -#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Editblock.php:114 +#: ../../Zotlabs/Module/Connections.php:296 +#: ../../Zotlabs/Module/Connections.php:316 #: ../../Zotlabs/Module/Admin/Profs.php:154 #: ../../Zotlabs/Module/Webpages.php:244 #: ../../Zotlabs/Module/Editlayout.php:114 -#: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Wiki.php:164 -#: ../../Zotlabs/Module/Wiki.php:271 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Layouts.php:192 +#: ../../Zotlabs/Module/Wiki.php:280 ../../Zotlabs/Module/Blocks.php:160 +#: ../../Zotlabs/Module/Layouts.php:193 #: ../../Zotlabs/Module/Settings/Oauth.php:149 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106 #: ../../Zotlabs/Lib/Apps.php:357 @@ -300,21 +299,21 @@ msgstr "" #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 -#: ../../include/channel.php:1044 ../../include/channel.php:1048 -#: ../../include/menu.php:113 +#: ../../include/menu.php:113 ../../include/channel.php:1044 +#: ../../include/channel.php:1048 msgid "Edit" msgstr "" #: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Profiles.php:803 -#: ../../Zotlabs/Module/Editblock.php:134 -#: ../../Zotlabs/Module/Connections.php:271 +#: ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Connections.php:267 #: ../../Zotlabs/Module/Admin/Profs.php:155 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Webpages.php:246 -#: ../../Zotlabs/Module/Editlayout.php:137 -#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Editlayout.php:138 +#: ../../Zotlabs/Module/Editwebpage.php:172 ../../Zotlabs/Module/Group.php:177 +#: ../../Zotlabs/Module/Connedit.php:658 ../../Zotlabs/Module/Connedit.php:927 #: ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Settings/Oauth.php:150 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1174 @@ -372,13 +371,14 @@ msgstr "" #: ../../Zotlabs/Web/WebServer.php:128 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Chat.php:98 #: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Message.php:18 +#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230 +#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Message.php:18 #: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Page.php:35 -#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:33 -#: ../../Zotlabs/Module/Cover_photo.php:277 -#: ../../Zotlabs/Module/Cover_photo.php:290 +#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:29 +#: ../../Zotlabs/Module/Cover_photo.php:281 +#: ../../Zotlabs/Module/Cover_photo.php:294 #: ../../Zotlabs/Module/Webpages.php:116 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 @@ -388,27 +388,26 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:126 #: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Filestorage.php:23 +#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Filestorage.php:23 #: ../../Zotlabs/Module/Filestorage.php:78 #: ../../Zotlabs/Module/Filestorage.php:93 #: ../../Zotlabs/Module/Filestorage.php:120 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 -#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Connedit.php:388 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Item.php:220 -#: ../../Zotlabs/Module/Item.php:230 ../../Zotlabs/Module/Item.php:1067 +#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215 +#: ../../Zotlabs/Module/Wiki.php:320 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Mitem.php:115 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17 #: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137 -#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215 -#: ../../Zotlabs/Module/Wiki.php:311 ../../Zotlabs/Module/Like.php:181 -#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Mail.php:164 -#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113 -#: ../../Zotlabs/Module/Profile_photo.php:278 -#: ../../Zotlabs/Module/Profile_photo.php:291 +#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mood.php:116 +#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Blocks.php:73 +#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 +#: ../../Zotlabs/Module/Rate.php:113 +#: ../../Zotlabs/Module/Profile_photo.php:280 +#: ../../Zotlabs/Module/Profile_photo.php:293 #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39 #: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29 #: ../../Zotlabs/Module/Events.php:271 @@ -416,33 +415,31 @@ msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:11 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Sources.php:74 #: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245 -#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Suggest.php:30 +#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Suggest.php:28 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294 #: ../../Zotlabs/Module/Thing.php:335 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Profile.php:83 #: ../../Zotlabs/Module/Profile.php:100 ../../Zotlabs/Lib/Chatroom.php:137 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:55 #: ../../extend/addon/addon/keepout/keepout.php:36 #: ../../extend/addon/addon/pumpio/pumpio.php:40 #: ../../extend/addon/addon/openid/Mod_Id.php:53 -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291 -#: ../../include/items.php:3350 ../../include/attach.php:144 -#: ../../include/attach.php:191 ../../include/attach.php:255 -#: ../../include/attach.php:269 ../../include/attach.php:276 -#: ../../include/attach.php:343 ../../include/attach.php:357 -#: ../../include/attach.php:364 ../../include/attach.php:441 -#: ../../include/attach.php:908 ../../include/attach.php:979 -#: ../../include/attach.php:1137 ../../include/photos.php:27 +#: ../../include/photos.php:28 ../../include/items.php:3360 +#: ../../include/attach.php:144 ../../include/attach.php:191 +#: ../../include/attach.php:255 ../../include/attach.php:269 +#: ../../include/attach.php:276 ../../include/attach.php:343 +#: ../../include/attach.php:357 ../../include/attach.php:364 +#: ../../include/attach.php:441 ../../include/attach.php:908 +#: ../../include/attach.php:979 ../../include/attach.php:1137 msgid "Permission denied." msgstr "" #: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94 #: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:122 -#: ../../Zotlabs/Lib/NativeWikiPage.php:522 ../../include/help.php:68 +#: ../../Zotlabs/Lib/NativeWikiPage.php:489 ../../include/help.php:68 msgid "Page not found." msgstr "" @@ -484,7 +481,6 @@ msgid "Room not found" msgstr "" #: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:239 -#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350 #: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Logs.php:84 @@ -496,15 +492,17 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:268 #: ../../Zotlabs/Module/Admin/Plugins.php:438 #: ../../Zotlabs/Module/Admin/Themes.php:158 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350 #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85 -#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Import_items.php:122 -#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Mitem.php:243 +#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Wiki.php:168 +#: ../../Zotlabs/Module/Import_items.php:122 +#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Mitem.php:243 #: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186 -#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Pconfig.php:107 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Mail.php:413 -#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134 -#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 +#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139 +#: ../../Zotlabs/Module/Mail.php:413 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Module/Appman.php:134 ../../Zotlabs/Module/Pdledit.php:74 +#: ../../Zotlabs/Module/Events.php:493 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 #: ../../Zotlabs/Module/Settings/Features.php:47 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Settings/Account.php:118 @@ -518,11 +516,10 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Photos.php:1093 #: ../../Zotlabs/Module/Photos.php:1211 ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Lib/ThreadItem.php:731 +#: ../../Zotlabs/Widget/Eventstools.php:16 #: ../../extend/addon/addon/chords/Mod_Chords.php:60 -#: ../../extend/addon/addon/diaspora/diaspora.php:714 #: ../../extend/addon/addon/dwpost/dwpost.php:89 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124 -#: ../../extend/addon/addon/friendica/friendica.php:128 #: ../../extend/addon/addon/frphotos/frphotos.php:96 #: ../../extend/addon/addon/hubwall/hubwall.php:95 #: ../../extend/addon/addon/ijpost/ijpost.php:89 @@ -563,8 +560,7 @@ msgstr "" #: ../../extend/addon/addon/likebanner/likebanner.php:57 #: ../../extend/addon/addon/mailtest/mailtest.php:100 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:133 -#: ../../include/widgets.php:801 ../../include/js_strings.php:22 +#: ../../include/js_strings.php:22 #: ../../view/theme/redbasic/php/config.php:106 msgid "Submit" msgstr "" @@ -600,8 +596,8 @@ msgstr "" msgid "Encrypt text" msgstr "" -#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:111 -#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287 +#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:116 +#: ../../Zotlabs/Module/Editwebpage.php:148 ../../Zotlabs/Module/Mail.php:287 #: ../../Zotlabs/Module/Mail.php:412 ../../include/conversation.php:1295 msgid "Insert web link" msgstr "" @@ -623,7 +619,7 @@ msgid "Expiration of chats (minutes)" msgstr "" #: ../../Zotlabs/Module/Chat.php:232 ../../Zotlabs/Module/Filestorage.php:152 -#: ../../Zotlabs/Module/Connedit.php:683 ../../Zotlabs/Module/Thing.php:313 +#: ../../Zotlabs/Module/Connedit.php:680 ../../Zotlabs/Module/Thing.php:313 #: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:657 #: ../../Zotlabs/Module/Photos.php:1042 ../../include/acl_selectors.php:218 msgid "Permissions" @@ -639,7 +635,7 @@ msgid "No chatrooms available" msgstr "" #: ../../Zotlabs/Module/Chat.php:253 ../../Zotlabs/Module/Profiles.php:834 -#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Wiki.php:167 +#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Manage.php:143 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152 msgid "Create New" msgstr "" @@ -784,7 +780,7 @@ msgid "Membership on this site is by invitation only." msgstr "" #: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162 -#: ../../boot.php:1687 +#: ../../boot.php:1671 msgid "Register" msgstr "" @@ -799,449 +795,38 @@ msgstr "" msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:176 -msgid "$Projectname Server - Setup" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:180 -msgid "Could not connect to database." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:184 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:191 -msgid "Could not create table." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:196 -msgid "Your site database has been installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:200 -msgid "" -"You may need to import the file \"install/schema_xxx.sql\" manually using a " -"database client." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263 -#: ../../Zotlabs/Module/Setup.php:743 -msgid "Please see the file \"install/INSTALL.txt\"." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:260 -msgid "System check" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:337 -#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:690 -#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:944 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847 -msgid "Next" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:265 -msgid "Check again" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:287 -msgid "Database connection" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:288 -msgid "" -"In order to install $Projectname we need to know how to connect to your " -"database." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:289 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:290 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:294 -msgid "Database Server Name" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:294 -msgid "Default is 127.0.0.1" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:295 -msgid "Database Port" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:295 -msgid "Communication port number - use 0 for default" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:296 -msgid "Database Login Name" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:297 -msgid "Database Login Password" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:298 -msgid "Database Name" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:299 -msgid "Database Type" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342 -msgid "Site administrator email address" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344 -msgid "Website URL" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344 -msgid "Please use SSL (https) URL if available." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346 -msgid "Please select a default timezone for your website" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:331 -msgid "Site settings" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:385 -msgid "PHP version 5.5 or greater is required." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:386 -msgid "PHP version" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:402 -msgid "Could not find a command line version of PHP in the web server PATH." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:403 -msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:407 -msgid "PHP executable path" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:407 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:412 -msgid "Command line PHP" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:422 -msgid "" -"Unable to check command line PHP, as shell_exec() is disabled. This is " -"required." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:425 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:426 -msgid "This is required for message delivery to work." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:429 -msgid "PHP register_argc_argv" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:447 -#, php-format -msgid "" -"Your max allowed total upload size is set to %s. Maximum size of one file to " -"upload is set to %s. You are allowed to upload up to %d files at once." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:452 -msgid "You can adjust these settings in the server php.ini file." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:454 -msgid "PHP upload limits" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:477 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:478 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:481 -msgid "Generate encryption keys" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:498 -msgid "libCurl PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:499 -msgid "GD graphics PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:500 -msgid "OpenSSL PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:501 -msgid "PDO database PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:502 -msgid "mb_string PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:503 -msgid "xml PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509 -msgid "Apache mod_rewrite module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:507 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516 -msgid "exec" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:513 -msgid "" -"Error: exec is required but is either not installed or has been disabled in " -"php.ini" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522 -msgid "shell_exec" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:519 -msgid "" -"Error: shell_exec is required but is either not installed or has been " -"disabled in php.ini" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:527 -msgid "Error: libCURL PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:531 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:535 -msgid "Error: openssl PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:539 -msgid "Error: PDO database PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:543 -msgid "Error: mb_string PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:547 -msgid "Error: xml PHP module required for DAV but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:565 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\" " -"in the top folder of your web server and it is unable to do so." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:566 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:567 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:568 -msgid "" -"You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"install/INSTALL.txt\" for instructions." +#: ../../Zotlabs/Module/Item.php:184 +msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Setup.php:571 -msgid ".htconfig.php is writable" +#: ../../Zotlabs/Module/Item.php:450 +msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Setup.php:585 -msgid "" -"This software uses the Smarty3 template engine to render its web views. " -"Smarty3 compiles templates to PHP to speed up rendering." +#: ../../Zotlabs/Module/Item.php:824 +msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:586 -#, php-format -msgid "" -"In order to store these compiled templates, the web server needs to have " -"write access to the directory %s under the top level web folder." +#: ../../Zotlabs/Module/Item.php:954 +msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has " -"write access to this folder." +#: ../../Zotlabs/Module/Item.php:1084 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:588 +#: ../../Zotlabs/Module/Item.php:1091 #, php-format -msgid "" -"Note: as a security measure, you should give the web server write access to " -"%s only--not the template files (.tpl) that it contains." +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Setup.php:591 +#: ../../Zotlabs/Module/Item.php:1098 #, php-format -msgid "%s is writable" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:607 -msgid "" -"This software uses the store directory to save uploaded files. The web " -"server needs to have write access to the store directory under the top level " -"web folder" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:611 -msgid "store is writable" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:644 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access " -"to this site." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:645 -msgid "" -"If you have https access to your website or allow connections to TCP port " -"443 (the https: port), you MUST use a browser-valid certificate. You MUST " -"NOT use self-signed certificates!" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:646 -msgid "" -"This restriction is incorporated because public posts from you may for " -"example contain references to images on your own hub." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:647 -msgid "" -"If your certificate is not recognized, members of other sites (who may " -"themselves have valid certificates) will get a warning message on their own " -"site complaining about security issues." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:648 -msgid "" -"This can cause usability issues elsewhere (not just on your own site) so we " -"must insist on this requirement." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:649 -msgid "" -"Providers are available that issue free certificates which are browser-valid." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:651 -msgid "" -"If you are confident that the certificate is valid and signed by a trusted " -"authority, check to see if you have failed to install an intermediate cert. " -"These are not normally required by browsers, but are required for server-to-" -"server communications." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:653 -msgid "SSL certificate validation" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:659 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -"Test: " -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:662 -msgid "Url rewrite is working" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:676 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:700 -#: ../../extend/addon/addon/cdav/cdav.php:41 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:401 -msgid "Errors encountered creating database tables." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:741 -msgid "<h1>What next</h1>" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:742 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +msgid "You have reached your limit of %1$.0f webpages." msgstr "" #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 #: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -1316,7 +901,7 @@ msgstr "" #: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:920 +#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:917 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143 msgid "Address" msgstr "" @@ -1340,20 +925,18 @@ msgstr "" #: ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Admin/Site.php:226 ../../Zotlabs/Module/Menu.php:100 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Connedit.php:786 +#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Wiki.php:179 +#: ../../Zotlabs/Module/Connedit.php:399 ../../Zotlabs/Module/Connedit.php:783 #: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 -#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Wiki.php:179 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Events.php:470 +#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../Zotlabs/Module/Settings/Channel.php:294 #: ../../Zotlabs/Module/Photos.php:652 #: ../../extend/addon/addon/dwpost/dwpost.php:73 #: ../../extend/addon/addon/dwpost/dwpost.php:85 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -#: ../../extend/addon/addon/friendica/dfrn_request.php:865 #: ../../extend/addon/addon/ijpost/ijpost.php:73 #: ../../extend/addon/addon/ijpost/ijpost.php:85 #: ../../extend/addon/addon/jappixmini/jappixmini.php:309 @@ -1398,26 +981,25 @@ msgstr "" #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111 -#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1710 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1694 msgid "No" msgstr "" #: ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Admin/Site.php:228 ../../Zotlabs/Module/Menu.php:100 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Mitem.php:162 +#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Wiki.php:179 +#: ../../Zotlabs/Module/Connedit.php:399 ../../Zotlabs/Module/Mitem.php:162 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 #: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96 -#: ../../Zotlabs/Module/Wiki.php:179 ../../Zotlabs/Module/Events.php:470 -#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 +#: ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../Zotlabs/Module/Settings/Channel.php:294 #: ../../Zotlabs/Module/Photos.php:652 #: ../../extend/addon/addon/dwpost/dwpost.php:73 #: ../../extend/addon/addon/dwpost/dwpost.php:85 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -#: ../../extend/addon/addon/friendica/dfrn_request.php:865 #: ../../extend/addon/addon/ijpost/ijpost.php:73 #: ../../extend/addon/addon/ijpost/ijpost.php:85 #: ../../extend/addon/addon/jappixmini/jappixmini.php:309 @@ -1462,7 +1044,7 @@ msgstr "" #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111 -#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1710 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1694 msgid "Yes" msgstr "" @@ -1578,7 +1160,7 @@ msgstr "" msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:938 +#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:935 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161 msgid "Country" msgstr "" @@ -1664,7 +1246,7 @@ msgstr "" msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:913 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139 msgid "Phone" msgstr "" @@ -1672,7 +1254,7 @@ msgstr "" #: ../../Zotlabs/Module/Profiles.php:790 #: ../../Zotlabs/Module/Admin/Accounts.php:169 #: ../../Zotlabs/Module/Admin/Accounts.php:181 -#: ../../Zotlabs/Module/Connedit.php:917 +#: ../../Zotlabs/Module/Connedit.php:914 #: ../../extend/addon/addon/redred/redred.php:107 #: ../../extend/addon/addon/rtof/rtof.php:93 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140 @@ -1682,56 +1264,56 @@ msgstr "" msgid "Email" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:918 +#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:915 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:919 +#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:916 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:921 +#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:918 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:922 +#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:919 #: ../../extend/addon/addon/cdav/cdav.php:270 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145 #: ../../include/connections.php:668 msgid "Mobile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:923 +#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:920 #: ../../extend/addon/addon/cdav/cdav.php:271 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146 #: ../../include/connections.php:669 msgid "Home" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:921 #: ../../extend/addon/addon/cdav/cdav.php:274 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147 #: ../../include/connections.php:672 msgid "Work" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:923 #: ../../extend/addon/addon/jappixmini/jappixmini.php:368 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:924 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150 msgid "Add Field" msgstr "" #: ../../Zotlabs/Module/Profiles.php:802 #: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Connedit.php:926 #: ../../Zotlabs/Module/Settings/Oauth.php:42 #: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152 @@ -1741,12 +1323,11 @@ msgstr "" #: ../../Zotlabs/Module/Profiles.php:804 #: ../../Zotlabs/Module/Admin/Plugins.php:423 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Wiki.php:261 -#: ../../Zotlabs/Module/Wiki.php:286 +#: ../../Zotlabs/Module/Wiki.php:270 ../../Zotlabs/Module/Wiki.php:295 +#: ../../Zotlabs/Module/Connedit.php:928 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Settings/Oauth.php:114 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../extend/addon/addon/friendica/dfrn_request.php:879 #: ../../extend/addon/addon/js_upload/js_upload.php:46 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:866 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154 @@ -1760,8 +1341,8 @@ msgstr "" msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044 -#: ../../include/nav.php:105 +#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105 +#: ../../include/channel.php:1044 msgid "Edit Profiles" msgstr "" @@ -1857,7 +1438,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35 #: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89 -#: ../../include/items.php:3271 +#: ../../include/items.php:3281 msgid "Item not found." msgstr "" @@ -1948,16 +1529,16 @@ msgstr "" msgid "Item not found" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97 +#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97 #: ../../Zotlabs/Module/Blocks.php:155 msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406 +#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1406 msgid "Title (optional)" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:133 +#: ../../Zotlabs/Module/Editblock.php:138 msgid "Edit Block" msgstr "" @@ -1991,8 +1572,8 @@ msgstr "" #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:188 -#: ../../include/text.php:1011 ../../include/text.php:1023 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Widget/Notes.php:18 +#: ../../include/text.php:1010 ../../include/text.php:1022 msgid "Save" msgstr "" @@ -2016,266 +1597,266 @@ msgstr "" msgid "posted an event" msgstr "" -#: ../../Zotlabs/Module/Connections.php:56 -#: ../../Zotlabs/Module/Connections.php:161 -#: ../../Zotlabs/Module/Connections.php:250 +#: ../../Zotlabs/Module/Connections.php:52 +#: ../../Zotlabs/Module/Connections.php:157 +#: ../../Zotlabs/Module/Connections.php:246 msgid "Blocked" msgstr "" -#: ../../Zotlabs/Module/Connections.php:61 -#: ../../Zotlabs/Module/Connections.php:168 -#: ../../Zotlabs/Module/Connections.php:249 +#: ../../Zotlabs/Module/Connections.php:57 +#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:245 msgid "Ignored" msgstr "" -#: ../../Zotlabs/Module/Connections.php:66 -#: ../../Zotlabs/Module/Connections.php:182 -#: ../../Zotlabs/Module/Connections.php:248 +#: ../../Zotlabs/Module/Connections.php:62 +#: ../../Zotlabs/Module/Connections.php:178 +#: ../../Zotlabs/Module/Connections.php:244 msgid "Hidden" msgstr "" -#: ../../Zotlabs/Module/Connections.php:71 -#: ../../Zotlabs/Module/Connections.php:175 -#: ../../Zotlabs/Module/Connections.php:247 +#: ../../Zotlabs/Module/Connections.php:67 +#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:243 msgid "Archived" msgstr "" -#: ../../Zotlabs/Module/Connections.php:76 -#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116 +#: ../../Zotlabs/Module/Connections.php:72 +#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116 #: ../../include/conversation.php:1724 msgid "New" msgstr "" -#: ../../Zotlabs/Module/Connections.php:92 -#: ../../Zotlabs/Module/Connections.php:107 -#: ../../Zotlabs/Module/Connedit.php:720 ../../include/widgets.php:530 +#: ../../Zotlabs/Module/Connections.php:88 +#: ../../Zotlabs/Module/Connections.php:103 +#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:30 msgid "All" msgstr "" -#: ../../Zotlabs/Module/Connections.php:138 +#: ../../Zotlabs/Module/Connections.php:134 msgid "New Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:141 +#: ../../Zotlabs/Module/Connections.php:137 msgid "Show pending (new) connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:145 +#: ../../Zotlabs/Module/Connections.php:141 #: ../../Zotlabs/Module/Profperm.php:140 msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:148 +#: ../../Zotlabs/Module/Connections.php:144 msgid "Show all connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:160 msgid "Only show blocked connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:167 msgid "Only show ignored connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:178 +#: ../../Zotlabs/Module/Connections.php:174 msgid "Only show archived connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:181 msgid "Only show hidden connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:246 +#: ../../Zotlabs/Module/Connections.php:242 msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Connections.php:262 +#: ../../Zotlabs/Module/Connections.php:258 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Connections.php:259 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:264 +#: ../../Zotlabs/Module/Connections.php:260 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:273 +#: ../../Zotlabs/Module/Connections.php:269 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:275 +#: ../../Zotlabs/Module/Connections.php:271 msgid "Network" msgstr "" -#: ../../Zotlabs/Module/Connections.php:278 +#: ../../Zotlabs/Module/Connections.php:274 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:276 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:278 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:280 msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:285 +#: ../../Zotlabs/Module/Connections.php:281 #: ../../Zotlabs/Module/Admin/Accounts.php:171 msgid "Approve" msgstr "" -#: ../../Zotlabs/Module/Connections.php:286 +#: ../../Zotlabs/Module/Connections.php:282 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:287 -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Connections.php:283 +#: ../../Zotlabs/Module/Connedit.php:634 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connections.php:288 +#: ../../Zotlabs/Module/Connections.php:284 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:216 -#: ../../include/text.php:940 ../../include/nav.php:203 +#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216 +#: ../../include/nav.php:203 ../../include/text.php:939 msgid "Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:237 ../../include/widgets.php:302 -#: ../../include/text.php:1010 ../../include/text.php:1022 -#: ../../include/nav.php:180 ../../include/acl_selectors.php:213 +#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Module/Search.php:44 +#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../include/nav.php:180 ../../include/text.php:1009 +#: ../../include/text.php:1021 ../../include/acl_selectors.php:213 msgid "Search" msgstr "" -#: ../../Zotlabs/Module/Connections.php:317 +#: ../../Zotlabs/Module/Connections.php:313 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:318 +#: ../../Zotlabs/Module/Connections.php:314 msgid "Connections search" msgstr "" -#: ../../Zotlabs/Module/Connections.php:319 -#: ../../Zotlabs/Module/Directory.php:392 -#: ../../Zotlabs/Module/Directory.php:397 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Connections.php:315 +#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23 msgid "Find" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:58 +#: ../../Zotlabs/Module/Cover_photo.php:56 #: ../../Zotlabs/Module/Profile_photo.php:61 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:134 -#: ../../Zotlabs/Module/Cover_photo.php:181 +#: ../../Zotlabs/Module/Cover_photo.php:136 +#: ../../Zotlabs/Module/Cover_photo.php:186 msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:154 -#: ../../Zotlabs/Module/Profile_photo.php:135 +#: ../../Zotlabs/Module/Cover_photo.php:159 +#: ../../Zotlabs/Module/Profile_photo.php:137 msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:168 -#: ../../Zotlabs/Module/Profile_photo.php:201 ../../include/photos.php:149 +#: ../../Zotlabs/Module/Cover_photo.php:173 +#: ../../Zotlabs/Module/Profile_photo.php:203 ../../include/photos.php:145 msgid "Unable to process image" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:192 -#: ../../Zotlabs/Module/Profile_photo.php:236 +#: ../../Zotlabs/Module/Cover_photo.php:197 +#: ../../Zotlabs/Module/Profile_photo.php:238 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:210 -#: ../../Zotlabs/Module/Profile_photo.php:255 +#: ../../Zotlabs/Module/Cover_photo.php:214 +#: ../../Zotlabs/Module/Profile_photo.php:257 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4181 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4189 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4182 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4190 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4183 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4191 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4184 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4192 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4186 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4194 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1764 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759 msgid "cover photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:303 -#: ../../Zotlabs/Module/Cover_photo.php:318 -#: ../../Zotlabs/Module/Profile_photo.php:316 -#: ../../Zotlabs/Module/Profile_photo.php:363 +#: ../../Zotlabs/Module/Cover_photo.php:307 +#: ../../Zotlabs/Module/Cover_photo.php:322 +#: ../../Zotlabs/Module/Profile_photo.php:318 +#: ../../Zotlabs/Module/Profile_photo.php:365 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:354 -#: ../../Zotlabs/Module/Profile_photo.php:418 +#: ../../Zotlabs/Module/Cover_photo.php:358 +#: ../../Zotlabs/Module/Profile_photo.php:420 msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:355 -#: ../../Zotlabs/Module/Profile_photo.php:419 +#: ../../Zotlabs/Module/Cover_photo.php:359 +#: ../../Zotlabs/Module/Profile_photo.php:421 msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:356 +#: ../../Zotlabs/Module/Cover_photo.php:360 msgid "Upload Cover Photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:427 +#: ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:429 #: ../../Zotlabs/Module/Settings/Channel.php:404 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:427 +#: ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:429 msgid "skip this step" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:427 +#: ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:429 msgid "select a photo from your photo albums" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:377 -#: ../../Zotlabs/Module/Profile_photo.php:446 +#: ../../Zotlabs/Module/Cover_photo.php:381 +#: ../../Zotlabs/Module/Profile_photo.php:448 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:378 -#: ../../Zotlabs/Module/Profile_photo.php:447 +#: ../../Zotlabs/Module/Cover_photo.php:382 +#: ../../Zotlabs/Module/Profile_photo.php:449 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:380 -#: ../../Zotlabs/Module/Profile_photo.php:449 +#: ../../Zotlabs/Module/Cover_photo.php:384 +#: ../../Zotlabs/Module/Profile_photo.php:451 msgid "Done Editing" msgstr "" @@ -2304,8 +1885,8 @@ msgstr "" msgid "Log settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1661 -#: ../../include/widgets.php:1671 +#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48 +#: ../../Zotlabs/Widget/Admin.php:58 msgid "Logs" msgstr "" @@ -2378,7 +1959,7 @@ msgstr "" msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1642 +#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30 msgid "Profile Fields" msgstr "" @@ -2430,7 +2011,8 @@ msgid "" "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1637 +#: ../../Zotlabs/Module/Admin/Security.php:87 +#: ../../Zotlabs/Widget/Admin.php:25 msgid "Security" msgstr "" @@ -2588,7 +2170,8 @@ msgid "Account '%s' unblocked" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:165 -#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1635 +#: ../../Zotlabs/Module/Admin/Accounts.php:178 +#: ../../Zotlabs/Widget/Admin.php:23 msgid "Accounts" msgstr "" @@ -2614,12 +2197,12 @@ msgid "Deny" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:174 -#: ../../Zotlabs/Module/Connedit.php:629 +#: ../../Zotlabs/Module/Connedit.php:626 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:175 -#: ../../Zotlabs/Module/Connedit.php:629 +#: ../../Zotlabs/Module/Connedit.php:626 msgid "Unblock" msgstr "" @@ -2709,7 +2292,8 @@ msgstr "" msgid "Channel '%s' code disallowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1636 +#: ../../Zotlabs/Module/Admin/Channels.php:146 +#: ../../Zotlabs/Widget/Admin.php:24 msgid "Channels" msgstr "" @@ -2822,7 +2406,7 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2920 +#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2906 msgid "Default" msgstr "" @@ -2901,7 +2485,7 @@ msgstr "" msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:267 ../../include/widgets.php:1634 +#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" @@ -3215,7 +2799,8 @@ msgid "Enable" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:342 -#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../include/widgets.php:1639 +#: ../../Zotlabs/Module/Admin/Plugins.php:437 +#: ../../Zotlabs/Widget/Admin.php:27 msgid "Plugins" msgstr "" @@ -3226,7 +2811,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223 -#: ../../include/widgets.php:685 ../../include/nav.php:225 +#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:225 msgid "Settings" msgstr "" @@ -3328,7 +2913,7 @@ msgid "Screenshot" msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:123 -#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../include/widgets.php:1640 +#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28 msgid "Themes" msgstr "" @@ -3362,7 +2947,7 @@ msgid "Webpages" msgstr "" #: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Blocks.php:161 -#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1073 +#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Photos.php:1073 #: ../../extend/addon/addon/cdav/include/widgets.php:123 #: ../../include/conversation.php:1378 msgid "Share" @@ -3370,7 +2955,7 @@ msgstr "" #: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Pubsites.php:59 #: ../../Zotlabs/Module/Wiki.php:166 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Events.php:694 +#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Events.php:694 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151 #: ../../include/page_widgets.php:42 msgid "View" @@ -3395,13 +2980,13 @@ msgid "Page Title" msgstr "" #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Menu.php:114 -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:191 #: ../../include/page_widgets.php:47 msgid "Created" msgstr "" #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Menu.php:115 -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:192 #: ../../include/page_widgets.php:48 msgid "Edited" msgstr "" @@ -3426,25 +3011,25 @@ msgstr "" msgid "Import complete." msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:127 -#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188 +#: ../../Zotlabs/Module/Editlayout.php:128 +#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189 msgid "Layout Name" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:128 -#: ../../Zotlabs/Module/Layouts.php:131 +#: ../../Zotlabs/Module/Editlayout.php:129 +#: ../../Zotlabs/Module/Layouts.php:132 msgid "Layout Description (Optional)" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:136 +#: ../../Zotlabs/Module/Editlayout.php:137 msgid "Edit Layout" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:142 +#: ../../Zotlabs/Module/Editwebpage.php:144 msgid "Page link" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:169 +#: ../../Zotlabs/Module/Editwebpage.php:171 msgid "Edit Webpage" msgstr "" @@ -3533,7 +3118,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2273 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2259 msgid "Menus" msgstr "" @@ -3654,7 +3239,7 @@ msgstr "" msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1401 +#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12 msgid "Public Hubs" msgstr "" @@ -3696,6 +3281,446 @@ msgstr "" msgid "Rate" msgstr "" +#: ../../Zotlabs/Module/Setup.php:176 +msgid "$Projectname Server - Setup" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:180 +msgid "Could not connect to database." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:184 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:191 +msgid "Could not create table." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:196 +msgid "Your site database has been installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:200 +msgid "" +"You may need to import the file \"install/schema_xxx.sql\" manually using a " +"database client." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263 +#: ../../Zotlabs/Module/Setup.php:743 +msgid "Please see the file \"install/INSTALL.txt\"." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:260 +msgid "System check" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:337 +#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:690 +#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:944 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847 +msgid "Next" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:265 +msgid "Check again" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:287 +msgid "Database connection" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:288 +msgid "" +"In order to install $Projectname we need to know how to connect to your " +"database." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:289 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:290 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Database Server Name" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Default is 127.0.0.1" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:295 +msgid "Database Port" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:295 +msgid "Communication port number - use 0 for default" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:296 +msgid "Database Login Name" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:297 +msgid "Database Login Password" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:298 +msgid "Database Name" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:299 +msgid "Database Type" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342 +msgid "Site administrator email address" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344 +msgid "Website URL" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344 +msgid "Please use SSL (https) URL if available." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346 +msgid "Please select a default timezone for your website" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:331 +msgid "Site settings" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:385 +msgid "PHP version 5.5 or greater is required." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:386 +msgid "PHP version" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:402 +msgid "Could not find a command line version of PHP in the web server PATH." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:403 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:407 +msgid "PHP executable path" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:407 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:412 +msgid "Command line PHP" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:422 +msgid "" +"Unable to check command line PHP, as shell_exec() is disabled. This is " +"required." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:425 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:426 +msgid "This is required for message delivery to work." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:429 +msgid "PHP register_argc_argv" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:447 +#, php-format +msgid "" +"Your max allowed total upload size is set to %s. Maximum size of one file to " +"upload is set to %s. You are allowed to upload up to %d files at once." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:452 +msgid "You can adjust these settings in the server php.ini file." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:454 +msgid "PHP upload limits" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:477 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:478 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:481 +msgid "Generate encryption keys" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:498 +msgid "libCurl PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:499 +msgid "GD graphics PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:500 +msgid "OpenSSL PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:501 +msgid "PDO database PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:502 +msgid "mb_string PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:503 +msgid "xml PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509 +msgid "Apache mod_rewrite module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:507 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516 +msgid "exec" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:513 +msgid "" +"Error: exec is required but is either not installed or has been disabled in " +"php.ini" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522 +msgid "shell_exec" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:519 +msgid "" +"Error: shell_exec is required but is either not installed or has been " +"disabled in php.ini" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:527 +msgid "Error: libCURL PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:531 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:535 +msgid "Error: openssl PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:539 +msgid "Error: PDO database PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:543 +msgid "Error: mb_string PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:547 +msgid "Error: xml PHP module required for DAV but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:565 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:566 +msgid "" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:567 +msgid "" +"At the end of this procedure, we will give you a text to save in a file " +"named .htconfig.php in your Red top folder." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:568 +msgid "" +"You can alternatively skip this procedure and perform a manual installation. " +"Please see the file \"install/INSTALL.txt\" for instructions." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:571 +msgid ".htconfig.php is writable" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:585 +msgid "" +"This software uses the Smarty3 template engine to render its web views. " +"Smarty3 compiles templates to PHP to speed up rendering." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:586 +#, php-format +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory %s under the top level web folder." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has " +"write access to this folder." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:588 +#, php-format +msgid "" +"Note: as a security measure, you should give the web server write access to " +"%s only--not the template files (.tpl) that it contains." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:591 +#, php-format +msgid "%s is writable" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:607 +msgid "" +"This software uses the store directory to save uploaded files. The web " +"server needs to have write access to the store directory under the top level " +"web folder" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:611 +msgid "store is writable" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:644 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:645 +msgid "" +"If you have https access to your website or allow connections to TCP port " +"443 (the https: port), you MUST use a browser-valid certificate. You MUST " +"NOT use self-signed certificates!" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:646 +msgid "" +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:647 +msgid "" +"If your certificate is not recognized, members of other sites (who may " +"themselves have valid certificates) will get a warning message on their own " +"site complaining about security issues." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:648 +msgid "" +"This can cause usability issues elsewhere (not just on your own site) so we " +"must insist on this requirement." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:649 +msgid "" +"Providers are available that issue free certificates which are browser-valid." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:651 +msgid "" +"If you are confident that the certificate is valid and signed by a trusted " +"authority, check to see if you have failed to install an intermediate cert. " +"These are not normally required by browsers, but are required for server-to-" +"server communications." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:653 +msgid "SSL certificate validation" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:659 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." +"Test: " +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:662 +msgid "Url rewrite is working" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:676 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:700 +#: ../../extend/addon/addon/cdav/cdav.php:41 +#: ../../extend/addon/addon/rendezvous/rendezvous.php:401 +msgid "Errors encountered creating database tables." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:741 +msgid "<h1>What next</h1>" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:742 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +msgstr "" + #: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178 msgid "Apps" msgstr "" @@ -3790,7 +3815,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3804 +#: ../../include/items.php:3812 msgid "Privacy group not found." msgstr "" @@ -3924,11 +3949,11 @@ msgid "Previous" msgstr "" #: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691 -#: ../../include/channel.php:1370 +#: ../../include/channel.php:1365 msgid "Export" msgstr "" -#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2296 +#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2282 msgid "Import" msgstr "" @@ -3937,30 +3962,180 @@ msgstr "" msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203 -msgid "webpage" +#: ../../Zotlabs/Module/Wiki.php:30 +msgid "Profile Unavailable." msgstr "" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209 -msgid "block" +#: ../../Zotlabs/Module/Wiki.php:44 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40 +msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206 -msgid "layout" +#: ../../Zotlabs/Module/Wiki.php:68 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60 +msgid "Invalid channel" msgstr "" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212 -msgid "menu" +#: ../../Zotlabs/Module/Wiki.php:159 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144 +#: ../../include/conversation.php:1900 +msgid "Wikis" msgstr "" -#: ../../Zotlabs/Module/Impel.php:191 -#, php-format -msgid "%s element installed" +#: ../../Zotlabs/Module/Wiki.php:165 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150 +msgid "Download" msgstr "" -#: ../../Zotlabs/Module/Impel.php:194 -#, php-format -msgid "%s element installation failed" +#: ../../Zotlabs/Module/Wiki.php:169 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154 +msgid "Wiki name" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:170 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155 +msgid "Content type" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:179 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 +msgid "Create a status post for this wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:204 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183 +msgid "Wiki not found" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:228 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208 +msgid "Rename page" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:232 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212 +msgid "Error retrieving page content" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:268 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241 +msgid "Revision Comparison" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:269 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242 +msgid "Revert" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:273 +msgid "Short description of your changes (optional)" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:280 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251 +msgid "Source" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:288 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259 +msgid "New page name" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:293 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264 +#: ../../include/conversation.php:1299 +msgid "Embed image from photo albums" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:294 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1393 +msgid "Embed an image from your albums" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:296 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267 +#: ../../include/conversation.php:1395 ../../include/conversation.php:1442 +msgid "OK" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:297 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1335 +msgid "Choose images to embed" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:298 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1336 +msgid "Choose an album" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:299 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270 +msgid "Choose a different album" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:300 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../include/conversation.php:1338 +msgid "Error getting album list" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:301 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1339 +msgid "Error getting photo link" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:302 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1340 +msgid "Error getting album" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:369 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337 +msgid "Error creating wiki. Invalid name." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348 +msgid "Wiki created, but error creating Home page." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:388 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353 +msgid "Error creating wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:400 +msgid "Wiki delete permission denied." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:410 +msgid "Error deleting wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:436 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400 +msgid "New page created" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:555 +msgid "Cannot delete Home" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:619 +msgid "Current Revision" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:619 +msgid "Selected Revision" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:669 +msgid "You must be authenticated." msgstr "" #: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57 @@ -4052,330 +4227,331 @@ msgstr "" msgid "Post successful." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:82 +#: ../../Zotlabs/Module/Connedit.php:79 msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:112 +#: ../../Zotlabs/Module/Connedit.php:109 msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:249 +#: ../../Zotlabs/Module/Connedit.php:246 msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:251 +#: ../../Zotlabs/Module/Connedit.php:248 msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:301 +#: ../../Zotlabs/Module/Connedit.php:298 msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:434 +#: ../../Zotlabs/Module/Connedit.php:431 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:482 +#: ../../Zotlabs/Module/Connedit.php:479 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:497 ../../Zotlabs/Module/Connedit.php:506 -#: ../../Zotlabs/Module/Connedit.php:515 ../../Zotlabs/Module/Connedit.php:524 -#: ../../Zotlabs/Module/Connedit.php:537 +#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503 +#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521 +#: ../../Zotlabs/Module/Connedit.php:534 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:561 +#: ../../Zotlabs/Module/Connedit.php:558 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:601 ../../Zotlabs/Lib/Apps.php:228 +#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Lib/Apps.php:228 #: ../../extend/addon/addon/openclipatar/openclipatar.php:57 #: ../../include/conversation.php:936 ../../include/conversation.php:1049 #: ../../include/nav.php:103 msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:604 +#: ../../Zotlabs/Module/Connedit.php:601 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:608 +#: ../../Zotlabs/Module/Connedit.php:605 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:611 +#: ../../Zotlabs/Module/Connedit.php:608 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:615 +#: ../../Zotlabs/Module/Connedit.php:612 msgid "Refresh Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:618 +#: ../../Zotlabs/Module/Connedit.php:615 msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Connedit.php:619 msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:625 +#: ../../Zotlabs/Module/Connedit.php:622 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:632 +#: ../../Zotlabs/Module/Connedit.php:629 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:633 +#: ../../Zotlabs/Module/Connedit.php:630 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Connedit.php:634 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:640 +#: ../../Zotlabs/Module/Connedit.php:637 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:641 +#: ../../Zotlabs/Module/Connedit.php:638 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:645 +#: ../../Zotlabs/Module/Connedit.php:642 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:645 +#: ../../Zotlabs/Module/Connedit.php:642 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:648 +#: ../../Zotlabs/Module/Connedit.php:645 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:649 +#: ../../Zotlabs/Module/Connedit.php:646 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:650 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:650 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:656 +#: ../../Zotlabs/Module/Connedit.php:653 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:657 +#: ../../Zotlabs/Module/Connedit.php:654 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:664 +#: ../../Zotlabs/Module/Connedit.php:661 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:672 +#: ../../Zotlabs/Module/Connedit.php:669 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:675 +#: ../../Zotlabs/Module/Connedit.php:672 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:686 +#: ../../Zotlabs/Module/Connedit.php:683 msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:709 +#: ../../Zotlabs/Module/Connedit.php:706 msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:712 +#: ../../Zotlabs/Module/Connedit.php:709 msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:716 ../../include/widgets.php:526 +#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26 msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:717 ../../include/widgets.php:527 +#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:27 msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:718 +#: ../../Zotlabs/Module/Connedit.php:715 #: ../../Zotlabs/Module/Settings/Channel.php:62 #: ../../Zotlabs/Module/Settings/Channel.php:66 #: ../../Zotlabs/Module/Settings/Channel.php:67 #: ../../Zotlabs/Module/Settings/Channel.php:70 #: ../../Zotlabs/Module/Settings/Channel.php:81 -#: ../../include/selectors.php:123 ../../include/widgets.php:528 +#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123 #: ../../include/channel.php:408 ../../include/channel.php:409 #: ../../include/channel.php:416 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:719 ../../include/widgets.php:529 +#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:29 msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:746 +#: ../../Zotlabs/Module/Connedit.php:743 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:749 +#: ../../Zotlabs/Module/Connedit.php:746 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:786 +#: ../../Zotlabs/Module/Connedit.php:783 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:786 +#: ../../Zotlabs/Module/Connedit.php:783 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:791 +#: ../../Zotlabs/Module/Connedit.php:788 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:794 +#: ../../Zotlabs/Module/Connedit.php:791 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:797 +#: ../../Zotlabs/Module/Connedit.php:794 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:855 +#: ../../Zotlabs/Module/Connedit.php:852 msgid "none" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:858 ../../include/widgets.php:661 +#: ../../Zotlabs/Module/Connedit.php:855 +#: ../../Zotlabs/Widget/Settings_menu.php:107 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:858 ../../include/items.php:3837 +#: ../../Zotlabs/Module/Connedit.php:855 ../../include/items.php:3845 #, php-format msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:859 +#: ../../Zotlabs/Module/Connedit.php:856 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:859 +#: ../../Zotlabs/Module/Connedit.php:856 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:860 +#: ../../Zotlabs/Module/Connedit.php:857 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:861 +#: ../../Zotlabs/Module/Connedit.php:858 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:867 +#: ../../Zotlabs/Module/Connedit.php:864 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Connedit.php:865 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:872 +#: ../../Zotlabs/Module/Connedit.php:869 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:873 +#: ../../Zotlabs/Module/Connedit.php:870 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:875 +#: ../../Zotlabs/Module/Connedit.php:872 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:876 ../../Zotlabs/Module/Rate.php:155 +#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Rate.php:155 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:877 +#: ../../Zotlabs/Module/Connedit.php:874 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:883 +#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:880 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:880 +#: ../../Zotlabs/Module/Connedit.php:877 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:881 +#: ../../Zotlabs/Module/Connedit.php:878 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:881 ../../Zotlabs/Module/Connedit.php:882 +#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:879 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:882 +#: ../../Zotlabs/Module/Connedit.php:879 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:884 +#: ../../Zotlabs/Module/Connedit.php:881 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Connedit.php:886 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:892 +#: ../../Zotlabs/Module/Connedit.php:889 #: ../../Zotlabs/Module/Settings/Permcats.php:107 #: ../../Zotlabs/Module/Settings/Tokens.php:163 msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Connedit.php:891 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Connedit.php:893 #: ../../Zotlabs/Module/Settings/Tokens.php:160 msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:897 +#: ../../Zotlabs/Module/Connedit.php:894 #: ../../Zotlabs/Module/Settings/Permcats.php:105 #: ../../Zotlabs/Module/Settings/Tokens.php:161 msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:899 +#: ../../Zotlabs/Module/Connedit.php:896 #: ../../Zotlabs/Module/Settings/Permcats.php:110 #: ../../Zotlabs/Module/Settings/Tokens.php:166 msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:900 +#: ../../Zotlabs/Module/Connedit.php:897 #: ../../Zotlabs/Module/Settings/Permcats.php:111 #: ../../Zotlabs/Module/Settings/Tokens.php:167 msgid "" @@ -4384,7 +4560,7 @@ msgid "" "individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:901 +#: ../../Zotlabs/Module/Connedit.php:898 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -4392,51 +4568,51 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:902 +#: ../../Zotlabs/Module/Connedit.php:899 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Connedit.php:908 msgid "Details" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Connedit.php:911 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:915 +#: ../../Zotlabs/Module/Connedit.php:912 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138 #: ../../include/page_widgets.php:46 msgid "Title" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Connedit.php:929 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Connedit.php:930 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Connedit.php:931 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:935 +#: ../../Zotlabs/Module/Connedit.php:932 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Module/Connedit.php:933 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:937 +#: ../../Zotlabs/Module/Connedit.php:934 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160 msgid "ZIP Code" msgstr "" @@ -4567,10 +4743,9 @@ msgid "No ratings" msgstr "" #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17 -#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Display.php:22 +#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:22 #: ../../Zotlabs/Module/Viewconnections.php:23 #: ../../Zotlabs/Module/Photos.php:508 -#: ../../extend/addon/addon/friendica/dfrn_request.php:794 msgid "Public access denied." msgstr "" @@ -4600,38 +4775,30 @@ msgstr "" msgid "System Notifications" msgstr "" -#: ../../Zotlabs/Module/Item.php:184 -msgid "Unable to locate original post." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:450 -msgid "Empty post discarded." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:492 -msgid "Executable content type not permitted to this channel." +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203 +msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Item.php:842 -msgid "Duplicate post suppressed." +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209 +msgid "block" msgstr "" -#: ../../Zotlabs/Module/Item.php:984 -msgid "System error. Post not saved." +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206 +msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Item.php:1114 -msgid "Unable to obtain post information from database." +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212 +msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Item.php:1121 +#: ../../Zotlabs/Module/Impel.php:181 #, php-format -msgid "You have reached your limit of %1$.0f top level posts." +msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Item.php:1128 +#: ../../Zotlabs/Module/Impel.php:184 #, php-format -msgid "You have reached your limit of %1$.0f webpages." +msgid "%s element installation failed" msgstr "" #: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 @@ -4818,182 +4985,6 @@ msgstr "" msgid "Search results for: %s" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:30 -msgid "Profile Unavailable." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:44 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40 -msgid "Not found" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:68 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60 -msgid "Invalid channel" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:159 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144 -#: ../../include/conversation.php:1900 -msgid "Wikis" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:165 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150 -msgid "Download" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:169 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154 -msgid "Wiki name" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:170 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155 -msgid "Content type" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:179 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 -msgid "Create a status post for this wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:204 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183 -msgid "Wiki not found" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:228 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208 -msgid "Rename page" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:232 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212 -msgid "Error retrieving page content" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:259 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241 -msgid "Revision Comparison" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:260 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242 -msgid "Revert" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:264 -msgid "Short description of your changes (optional)" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:271 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251 -msgid "Source" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:279 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259 -msgid "New page name" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:284 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264 -#: ../../include/conversation.php:1299 -msgid "Embed image from photo albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:285 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1393 -msgid "Embed an image from your albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:287 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267 -#: ../../include/conversation.php:1395 ../../include/conversation.php:1442 -msgid "OK" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:288 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1335 -msgid "Choose images to embed" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:289 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1336 -msgid "Choose an album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:290 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270 -msgid "Choose a different album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:291 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271 -#: ../../include/conversation.php:1338 -msgid "Error getting album list" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:292 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1339 -msgid "Error getting photo link" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:293 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1340 -msgid "Error getting album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:357 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337 -msgid "Error creating wiki. Invalid name." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:369 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348 -msgid "Wiki created, but error creating Home page." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:376 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353 -msgid "Error creating wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:388 -msgid "Wiki delete permission denied." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:398 -msgid "Error deleting wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:424 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400 -msgid "New page created" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:539 -msgid "Cannot delete Home" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:603 -msgid "Current Revision" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:603 -msgid "Selected Revision" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:653 -msgid "You must be authenticated." -msgstr "" - #: ../../Zotlabs/Module/Like.php:19 msgid "Like/Dislike" msgstr "" @@ -5031,27 +5022,23 @@ msgstr "" #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 #: ../../Zotlabs/Module/Tagger.php:47 -#: ../../extend/addon/addon/diaspora/inbound.php:1794 #: ../../extend/addon/addon/redphotos/redphotohelper.php:74 -#: ../../include/conversation.php:120 ../../include/text.php:1942 +#: ../../include/conversation.php:120 ../../include/text.php:1928 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../extend/addon/addon/diaspora/inbound.php:1794 -#: ../../include/conversation.php:148 ../../include/text.php:1948 +#: ../../include/conversation.php:148 ../../include/text.php:1934 msgid "status" msgstr "" #: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260 #: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1145 -#: ../../include/conversation.php:123 ../../include/text.php:1945 +#: ../../include/conversation.php:123 ../../include/text.php:1931 msgid "event" msgstr "" -#: ../../Zotlabs/Module/Like.php:419 -#: ../../extend/addon/addon/diaspora/inbound.php:1823 -#: ../../include/conversation.php:164 +#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" @@ -5243,7 +5230,7 @@ msgstr "" msgid "Your message for %s (%s):" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2272 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2258 msgid "Blocks" msgstr "" @@ -5251,25 +5238,25 @@ msgstr "" msgid "Block Title" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2274 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2260 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:232 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232 #: ../../include/help.php:55 ../../include/help.php:61 #: ../../include/nav.php:174 ../../include/nav.php:288 msgid "Help" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:185 +#: ../../Zotlabs/Module/Layouts.php:186 msgid "Comanche page description language help" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:189 +#: ../../Zotlabs/Module/Layouts.php:190 msgid "Layout Description" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Layouts.php:195 msgid "Download PDL file" msgstr "" @@ -5291,28 +5278,28 @@ msgid "Optionally explain your rating (this information is public)" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:224 +#: ../../Zotlabs/Module/Profile_photo.php:226 #: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729 -#: ../../include/photo/photo_driver.php:730 +#: ../../include/photo/photo_driver.php:646 msgid "Profile Photos" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:194 +#: ../../Zotlabs/Module/Profile_photo.php:196 #: ../../extend/addon/addon/openclipatar/openclipatar.php:298 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:420 +#: ../../Zotlabs/Module/Profile_photo.php:422 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:420 +#: ../../Zotlabs/Module/Profile_photo.php:422 msgid "Upload Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:421 +#: ../../Zotlabs/Module/Profile_photo.php:423 #: ../../extend/addon/addon/openclipatar/openclipatar.php:182 #: ../../extend/addon/addon/openclipatar/openclipatar.php:194 msgid "Use" @@ -5451,115 +5438,115 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Directory.php:246 +#: ../../Zotlabs/Module/Directory.php:245 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Directory.php:257 +#: ../../Zotlabs/Module/Directory.php:256 msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:259 +#: ../../Zotlabs/Module/Directory.php:258 msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:261 +#: ../../Zotlabs/Module/Directory.php:260 msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:310 ../../include/channel.php:1298 +#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:315 ../../include/event.php:52 +#: ../../Zotlabs/Module/Directory.php:314 ../../include/event.php:52 #: ../../include/event.php:84 ../../include/channel.php:1134 msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:321 +#: ../../Zotlabs/Module/Directory.php:320 msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:326 ../../include/channel.php:1314 +#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1322 +#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317 msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:329 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54 +#: ../../Zotlabs/Widget/Suggestions.php:44 ../../Zotlabs/Widget/Follow.php:32 #: ../../include/connections.php:110 ../../include/conversation.php:938 -#: ../../include/conversation.php:1069 ../../include/widgets.php:134 -#: ../../include/widgets.php:171 ../../include/channel.php:1119 +#: ../../include/conversation.php:1069 ../../include/channel.php:1119 msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Directory.php:330 +#: ../../Zotlabs/Module/Directory.php:329 msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:333 +#: ../../Zotlabs/Module/Directory.php:332 msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:336 +#: ../../Zotlabs/Module/Directory.php:335 msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:338 +#: ../../Zotlabs/Module/Directory.php:337 msgid "Common connections:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:387 +#: ../../Zotlabs/Module/Directory.php:386 msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:387 +#: ../../Zotlabs/Module/Directory.php:386 msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:393 +#: ../../Zotlabs/Module/Directory.php:392 msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:396 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Directory.php:398 +#: ../../Zotlabs/Module/Directory.php:397 msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:398 +#: ../../Zotlabs/Module/Directory.php:397 msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:399 +#: ../../Zotlabs/Module/Directory.php:398 msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:400 +#: ../../Zotlabs/Module/Directory.php:399 msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:400 msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:401 msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:403 +#: ../../Zotlabs/Module/Directory.php:402 msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:420 +#: ../../Zotlabs/Module/Directory.php:419 msgid "No entries (some entries may be hidden)." msgstr "" @@ -5587,7 +5574,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1714 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1698 msgid "Password Reset" msgstr "" @@ -5736,7 +5723,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1367 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362 msgid "Profile" msgstr "" @@ -5959,8 +5946,8 @@ msgstr "" msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:677 -#: ../../include/features.php:213 +#: ../../Zotlabs/Module/Sources.php:96 +#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213 msgid "Channel Sources" msgstr "" @@ -6025,13 +6012,13 @@ msgstr "" msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Suggest.php:39 +#: ../../Zotlabs/Module/Suggest.php:37 msgid "" "No suggestions available. If this is a new site, please try again in 24 " "hours." msgstr "" -#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:136 +#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46 msgid "Ignore/Hide" msgstr "" @@ -6039,15 +6026,15 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1989 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1990 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1991 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986 msgid "Authenticate" msgstr "" @@ -6382,7 +6369,8 @@ msgid "" "Examples:" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:644 +#: ../../Zotlabs/Module/Settings/Tokens.php:150 +#: ../../Zotlabs/Widget/Settings_menu.php:90 msgid "Guest Access Tokens" msgstr "" @@ -6466,7 +6454,7 @@ msgid "Basic Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:482 -#: ../../include/channel.php:1255 +#: ../../include/channel.php:1250 msgid "Full Name:" msgstr "" @@ -6772,7 +6760,7 @@ msgid "Firefox Share $Projectname provider" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:578 -msgid "Start calendar week on monday" +msgid "Start calendar week on Monday" msgstr "" #: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 @@ -6849,7 +6837,7 @@ msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150 -#: ../../include/text.php:1950 +#: ../../include/text.php:1936 msgid "comment" msgstr "" @@ -6881,7 +6869,6 @@ msgid "No channel. Import failed." msgstr "" #: ../../Zotlabs/Module/Import.php:467 -#: ../../extend/addon/addon/diaspora/import_diaspora.php:142 msgid "Import completed." msgstr "" @@ -7024,12 +7011,12 @@ msgid "Show Oldest First" msgstr "" #: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335 -#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1751 +#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "" #: ../../Zotlabs/Module/Photos.php:809 -#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1768 +#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "" @@ -7168,7 +7155,7 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190 #: ../../include/taxonomy.php:403 ../../include/conversation.php:1952 -#: ../../include/channel.php:1273 +#: ../../include/channel.php:1268 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -7255,10 +7242,7 @@ msgstr "" msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:61 -#: ../../extend/addon/addon/diaspora/util.php:218 -#: ../../extend/addon/addon/diaspora/util.php:231 -#: ../../extend/addon/addon/diaspora/p.php:46 ../../include/network.php:1427 +#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1427 msgid "$projectname" msgstr "" @@ -7729,69 +7713,6 @@ msgstr "" msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:31 -#: ../../Zotlabs/Lib/NativeWikiPage.php:72 -msgid "(No Title)" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:86 -msgid "Wiki page create failed." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:99 -msgid "Wiki not found." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:110 -msgid "Destination name already exists" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:136 -#: ../../Zotlabs/Lib/NativeWikiPage.php:365 -msgid "Page not found" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:166 -msgid "Error reading page content" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:350 -#: ../../Zotlabs/Lib/NativeWikiPage.php:403 -#: ../../Zotlabs/Lib/NativeWikiPage.php:470 -#: ../../Zotlabs/Lib/NativeWikiPage.php:511 -msgid "Error reading wiki" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:391 -msgid "Page update failed." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:425 -msgid "Nothing deleted" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:491 -msgid "Compare: object not found." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:497 -msgid "Page updated" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:500 -msgid "Untitled" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:506 -msgid "Wiki resource_id required for git commit" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:577 -#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579 -#: ../../include/bbcode.php:610 ../../include/bbcode.php:756 -msgid "Different viewers will see this text differently" -msgstr "" - #: ../../Zotlabs/Lib/Permcat.php:58 msgctxt "permcat" msgid "default" @@ -7842,7 +7763,7 @@ msgid "Suggest Channels" msgstr "" #: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130 -#: ../../boot.php:1706 +#: ../../boot.php:1690 msgid "Login" msgstr "" @@ -7892,7 +7813,7 @@ msgstr "" msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:242 ../../include/widgets.php:1638 +#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "" @@ -7928,10 +7849,330 @@ msgstr "" msgid "Remove from app-tray" msgstr "" +#: ../../Zotlabs/Lib/NativeWikiPage.php:31 +#: ../../Zotlabs/Lib/NativeWikiPage.php:72 +msgid "(No Title)" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:86 +msgid "Wiki page create failed." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:99 +msgid "Wiki not found." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:110 +msgid "Destination name already exists" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:136 +#: ../../Zotlabs/Lib/NativeWikiPage.php:331 +msgid "Page not found" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +msgid "Error reading page content" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:322 +#: ../../Zotlabs/Lib/NativeWikiPage.php:370 +#: ../../Zotlabs/Lib/NativeWikiPage.php:437 +#: ../../Zotlabs/Lib/NativeWikiPage.php:478 +msgid "Error reading wiki" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:358 +msgid "Page update failed." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:392 +msgid "Nothing deleted" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:458 +msgid "Compare: object not found." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:464 +msgid "Page updated" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:467 +msgid "Untitled" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:473 +msgid "Wiki resource_id required for git commit" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:544 +#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579 +#: ../../include/bbcode.php:610 ../../include/bbcode.php:756 +msgid "Different viewers will see this text differently" +msgstr "" + #: ../../Zotlabs/Lib/NativeWiki.php:128 msgid "Wiki files deleted successfully" msgstr "" +#: ../../Zotlabs/Widget/Notes.php:16 +msgid "Notes" +msgstr "" + +#: ../../Zotlabs/Widget/Cover_photo.php:54 +msgid "Click to show more" +msgstr "" + +#: ../../Zotlabs/Widget/Tagcloud.php:25 +#: ../../Zotlabs/Widget/Appcategories.php:39 ../../include/taxonomy.php:188 +#: ../../include/taxonomy.php:270 ../../include/contact_widgets.php:91 +msgid "Categories" +msgstr "" + +#: ../../Zotlabs/Widget/Photo_rand.php:58 ../../Zotlabs/Widget/Photo.php:48 +msgid "photo/image" +msgstr "" + +#: ../../Zotlabs/Widget/Suggestions.php:51 +msgid "Suggestions" +msgstr "" + +#: ../../Zotlabs/Widget/Suggestions.php:52 +msgid "See more..." +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:22 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:29 +msgid "Add New Connection" +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:30 +msgid "Enter channel address" +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:31 +msgid "Examples: bob@example.com, https://example.com/barbara" +msgstr "" + +#: ../../Zotlabs/Widget/Savedsearch.php:75 +msgid "Remove term" +msgstr "" + +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301 +msgid "Saved Searches" +msgstr "" + +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336 +msgid "add" +msgstr "" + +#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 +#: ../../include/features.php:390 +msgid "Saved Folders" +msgstr "" + +#: ../../Zotlabs/Widget/Filer.php:31 ../../Zotlabs/Widget/Appcategories.php:42 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +msgid "Everything" +msgstr "" + +#: ../../Zotlabs/Widget/Archive.php:43 +msgid "Archives" +msgstr "" + +#: ../../Zotlabs/Widget/Rating.php:51 +msgid "Rating Tools" +msgstr "" + +#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57 +msgid "Rate Me" +msgstr "" + +#: ../../Zotlabs/Widget/Rating.php:60 +msgid "View Ratings" +msgstr "" + +#: ../../Zotlabs/Widget/Bookmarkedchats.php:24 +msgid "Bookmarked Chatrooms" +msgstr "" + +#: ../../Zotlabs/Widget/Suggestedchats.php:32 +msgid "Suggested Chatrooms" +msgstr "" + +#: ../../Zotlabs/Widget/Affinity.php:49 +msgid "Refresh" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:35 +msgid "Account settings" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:41 +msgid "Channel settings" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:50 +msgid "Additional features" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:57 +msgid "Feature/Addon settings" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:63 +msgid "Display settings" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:70 +msgid "Manage locations" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:77 +msgid "Export channel" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:83 +msgid "Connected apps" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153 +msgid "Permission Groups" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:115 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:13 +msgid "Private Mail Menu" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:15 +msgid "Combined View" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:213 +msgid "Inbox" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:214 +msgid "Outbox" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:215 +msgid "New Message" +msgstr "" + +#: ../../Zotlabs/Widget/Conversations.php:17 +#: ../../Zotlabs/Widget/Conversations.php:29 +msgid "Conversations" +msgstr "" + +#: ../../Zotlabs/Widget/Conversations.php:21 +msgid "Received Messages" +msgstr "" + +#: ../../Zotlabs/Widget/Conversations.php:25 +msgid "Sent Messages" +msgstr "" + +#: ../../Zotlabs/Widget/Conversations.php:39 +msgid "No messages." +msgstr "" + +#: ../../Zotlabs/Widget/Conversations.php:57 +msgid "Delete conversation" +msgstr "" + +#: ../../Zotlabs/Widget/Eventstools.php:13 +msgid "Events Tools" +msgstr "" + +#: ../../Zotlabs/Widget/Eventstools.php:14 +msgid "Export Calendar" +msgstr "" + +#: ../../Zotlabs/Widget/Eventstools.php:15 +msgid "Import Calendar" +msgstr "" + +#: ../../Zotlabs/Widget/Chatroom_list.php:16 +#: ../../include/conversation.php:1866 ../../include/conversation.php:1869 +msgid "Chatrooms" +msgstr "" + +#: ../../Zotlabs/Widget/Chatroom_list.php:20 +msgid "Overview" +msgstr "" + +#: ../../Zotlabs/Widget/Chatroom_members.php:11 +msgid "Chat Members" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_list.php:15 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:95 +msgid "Wiki List" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_pages.php:55 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:76 +msgid "Wiki Pages" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_pages.php:61 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:81 +msgid "Add new page" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_pages.php:62 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:82 +msgid "Page name" +msgstr "" + +#: ../../Zotlabs/Widget/Activity.php:50 +msgctxt "widget" +msgid "Activity" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_page_history.php:23 +msgctxt "wiki_history" +msgid "Message" +msgstr "" + +#: ../../Zotlabs/Widget/Tasklist.php:23 +msgid "Tasks" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 +msgid "Member registrations waiting for confirmation" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:29 +msgid "Inspect queue" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:31 +msgid "DB updates" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:233 +msgid "Admin" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:56 +msgid "Plugin Features" +msgstr "" + +#: ../../Zotlabs/Widget/Forums.php:85 +msgid "Forums" +msgstr "" + #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24 msgid "Flag Adult Photos" msgstr "" @@ -7988,39 +8229,6 @@ msgstr "" msgid "Quick Reference" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:677 -msgid "Diaspora Protocol Settings updated." -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:696 -msgid "Enable the Diaspora protocol for this channel" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:700 -msgid "Allow any Diaspora member to comment on your public posts" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:704 -msgid "Prevent your hashtags from being redirected to other sites" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:709 -msgid "Followed hashtags (comma separated, do not include the #)" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:714 -msgid "Diaspora Protocol Settings" -msgstr "" - -#: ../../extend/addon/addon/diaspora/import_diaspora.php:16 -msgid "No username found in import file." -msgstr "" - -#: ../../extend/addon/addon/diaspora/import_diaspora.php:41 -#: ../../include/import.php:51 -msgid "Unable to create a unique channel address. Import failed." -msgstr "" - #: ../../extend/addon/addon/dirstats/dirstats.php:94 msgid "Hubzilla Directory Stats" msgstr "" @@ -8241,316 +8449,6 @@ msgstr "" msgid "Flattr Widget Settings" msgstr "" -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:118 -msgid "Contact not found." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:119 -msgid "" -"This may occasionally happen if contact was requested by both persons and it " -"has already been approved." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:238 -msgid "Response from remote site was not understood." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:247 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:252 -msgid "Unexpected response from remote site: " -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:261 -msgid "Confirmation completed successfully." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:263 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:277 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:284 -msgid "Remote site reported: " -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:275 -msgid "Temporary failure. Please wait and try again." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:282 -msgid "Introduction failed or was revoked." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:428 -msgid "Unable to set contact photo." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:485 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:570 -#, php-format -msgid "No user record found for '%s' " -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:580 -msgid "Our site encryption key is apparently messed up." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:591 -msgid "Empty site URL was provided or URL could not be decrypted by us." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:612 -msgid "Contact record was not found for you on our site." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:626 -#, php-format -msgid "Site public key not available in contact record for URL %s." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:646 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:657 -msgid "Unable to set your contact credentials on our system." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:724 -msgid "Unable to update your contact profile details on our system" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:751 -#: ../../extend/addon/addon/friendica/dfrn_request.php:749 -msgid "[Name Withheld]" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:796 -#, php-format -msgid "%1$s has joined %2$s" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_poll.php:103 -#: ../../extend/addon/addon/friendica/dfrn_poll.php:536 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:102 -msgid "This introduction has already been accepted." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:123 -#: ../../extend/addon/addon/friendica/dfrn_request.php:528 -msgid "Profile location is not valid or does not contain profile information." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:128 -#: ../../extend/addon/addon/friendica/dfrn_request.php:533 -msgid "Warning: profile location has no identifiable owner name." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:130 -#: ../../extend/addon/addon/friendica/dfrn_request.php:535 -msgid "Warning: profile location has no profile photo." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:133 -#: ../../extend/addon/addon/friendica/dfrn_request.php:538 -#, php-format -msgid "%d required parameter was not found at the given location" -msgid_plural "%d required parameters were not found at the given location" -msgstr[0] "" -msgstr[1] "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:180 -msgid "Introduction complete." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:224 -msgid "Unrecoverable protocol error." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:252 -msgid "Profile unavailable." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:277 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:278 -msgid "Spam protection measures have been invoked." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:279 -msgid "Friends are advised to please try again in 24 hours." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:341 -msgid "Invalid locator" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:350 -msgid "Invalid email address." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:377 -msgid "This account has not been configured for email. Request failed." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:473 -msgid "Unable to resolve your name at the provided location." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:486 -msgid "You have already introduced yourself here." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:490 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:511 -msgid "Invalid profile URL." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:517 -msgid "Disallowed profile URL." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:587 -msgid "Failed to update contact record." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:608 -msgid "Your introduction has been sent." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:662 -msgid "Please login to confirm introduction." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:676 -msgid "" -"Incorrect identity currently logged in. Please login to <strong>this</" -"strong> profile." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:690 -#: ../../extend/addon/addon/friendica/dfrn_request.php:707 -msgid "Confirm" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:702 -msgid "Hide this contact" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:705 -#, php-format -msgid "Welcome home %s." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:706 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:836 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"communications networks:" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:857 -#, php-format -msgid "" -"If you are not yet a member of the free social web, <a href=\"%s/siteinfo" -"\">follow this link to find a public Friendica site and join us today</a>." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:862 -msgid "Friend/Connection Request" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:863 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:864 -msgid "Please answer the following:" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:865 -#, php-format -msgid "Does %s know you?" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:869 -msgid "Add a personal note:" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:871 -#: ../../include/network.php:1744 ../../include/network.php:1745 -msgid "Friendica" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:872 -msgid "StatusNet/Federated Social Web" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:873 -#: ../../include/network.php:1750 -msgid "Diaspora" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:874 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search " -"bar." -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:875 -msgid "Your Identity Address:" -msgstr "" - -#: ../../extend/addon/addon/friendica/dfrn_request.php:878 -msgid "Submit Request" -msgstr "" - -#: ../../extend/addon/addon/friendica/friendica.php:113 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:118 -msgid "GNU-Social Protocol Settings updated." -msgstr "" - -#: ../../extend/addon/addon/friendica/friendica.php:124 -msgid "Enable the (experimental) GNU-Social protocol for this channel" -msgstr "" - -#: ../../extend/addon/addon/friendica/friendica.php:128 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:133 -msgid "GNU-Social Protocol Settings" -msgstr "" - -#: ../../extend/addon/addon/friendica/friendica.php:185 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:323 -msgid "Follow" -msgstr "" - -#: ../../extend/addon/addon/friendica/friendica.php:188 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:326 -#, php-format -msgid "%1$s is now following %2$s" -msgstr "" - #: ../../extend/addon/addon/frphotos/frphotos.php:91 msgid "Friendica Photo Album Import" msgstr "" @@ -8662,7 +8560,7 @@ msgid "IRC Chatroom" msgstr "" #: ../../extend/addon/addon/jappixmini/jappixmini.php:305 -#: ../../include/channel.php:1139 ../../include/channel.php:1301 +#: ../../include/channel.php:1139 ../../include/channel.php:1296 msgid "Status:" msgstr "" @@ -9198,7 +9096,7 @@ msgid "Page to load after image selection." msgstr "" #: ../../extend/addon/addon/openclipatar/openclipatar.php:58 -#: ../../include/channel.php:1048 ../../include/nav.php:107 +#: ../../include/nav.php:107 ../../include/channel.php:1048 msgid "Edit Profile" msgstr "" @@ -10593,25 +10491,6 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44 -#, php-format -msgid "Reconnecting %d connections" -msgstr "" - -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:63 -msgid "Diaspora Reconnect" -msgstr "" - -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:65 -msgid "" -"Use this form to re-establish Diaspora connections which were initially made " -"from a different hub." -msgstr "" - -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:70 -msgid "Reconnect" -msgstr "" - #: ../../extend/addon/addon/mailtest/mailtest.php:19 msgid "Send test email" msgstr "" @@ -10773,37 +10652,13 @@ msgstr "" msgid "Error downloading wiki: " msgstr "" -#: ../../extend/addon/addon/gitwiki/gitwiki.php:76 -#: ../../include/widgets.php:956 -msgid "Wiki Pages" -msgstr "" - -#: ../../extend/addon/addon/gitwiki/gitwiki.php:81 -#: ../../include/widgets.php:962 -msgid "Add new page" -msgstr "" - -#: ../../extend/addon/addon/gitwiki/gitwiki.php:82 -#: ../../include/widgets.php:963 -msgid "Page name" -msgstr "" - -#: ../../extend/addon/addon/gitwiki/gitwiki.php:95 -#: ../../include/widgets.php:913 -msgid "Wiki List" -msgstr "" - -#: ../../extend/addon/addon/gnusoc/gnusoc.php:129 -msgid "Enable the GNU-Social protocol for this channel" -msgstr "" - -#: ../../extend/addon/addon/opensearch/opensearch.php:26 ../../boot.php:1143 +#: ../../extend/addon/addon/opensearch/opensearch.php:26 #, php-format msgctxt "opensearch" msgid "Search %1$s (%2$s)" msgstr "" -#: ../../extend/addon/addon/opensearch/opensearch.php:28 ../../boot.php:1143 +#: ../../extend/addon/addon/opensearch/opensearch.php:28 msgctxt "opensearch" msgid "$Projectname" msgstr "" @@ -10893,14 +10748,6 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/help.php:33 -msgid "Help:" -msgstr "" - -#: ../../include/help.php:65 -msgid "Not Found" -msgstr "" - #: ../../include/zot.php:649 msgid "Invalid data packet" msgstr "" @@ -10918,12 +10765,6 @@ msgstr "" msgid "invalid target signature" msgstr "" -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 -#: ../../include/widgets.php:455 -msgid "Categories" -msgstr "" - #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 msgid "Tags" msgstr "" @@ -11012,7 +10853,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:286 ../../boot.php:2555 +#: ../../include/datetime.php:286 ../../boot.php:2515 msgid "never" msgstr "" @@ -11338,73 +11179,29 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/items.php:807 ../../include/items.php:854 -msgid "(Unknown)" -msgstr "" - -#: ../../include/items.php:1045 -msgid "Visible to anybody on the internet." -msgstr "" - -#: ../../include/items.php:1047 -msgid "Visible to you only." -msgstr "" - -#: ../../include/items.php:1049 -msgid "Visible to anybody in this network." -msgstr "" - -#: ../../include/items.php:1051 -msgid "Visible to anybody authenticated." -msgstr "" - -#: ../../include/items.php:1053 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: ../../include/items.php:1055 -msgid "Visible to all connections." -msgstr "" - -#: ../../include/items.php:1057 -msgid "Visible to approved connections." -msgstr "" - -#: ../../include/items.php:1059 -msgid "Visible to specific connections." -msgstr "" - -#: ../../include/items.php:3820 -msgid "Privacy group is empty." -msgstr "" - -#: ../../include/items.php:3827 -#, php-format -msgid "Privacy group: %s" +#: ../../include/help.php:33 +msgid "Help:" msgstr "" -#: ../../include/items.php:3839 -msgid "Connection not found." +#: ../../include/help.php:65 +msgid "Not Found" msgstr "" -#: ../../include/items.php:4188 -msgid "profile photo" +#: ../../include/import.php:30 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/items.php:4384 -#, php-format -msgid "[Edited %s]" +#: ../../include/import.php:51 +msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/items.php:4384 -msgctxt "edit_activity" -msgid "Post" +#: ../../include/import.php:90 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../include/items.php:4384 -msgctxt "edit_activity" -msgid "Comment" +#: ../../include/import.php:100 +msgid "Cloned channel not found. Import failed." msgstr "" #: ../../include/conversation.php:204 @@ -11417,8 +11214,8 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:243 ../../include/text.php:1098 -#: ../../include/text.php:1103 +#: ../../include/conversation.php:243 ../../include/text.php:1097 +#: ../../include/text.php:1102 msgid "poked" msgstr "" @@ -11636,7 +11433,7 @@ msgstr "" msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1839 ../../include/photos.php:515 +#: ../../include/conversation.php:1839 ../../include/photos.php:507 msgid "Photo Albums" msgstr "" @@ -11644,11 +11441,6 @@ msgstr "" msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1866 ../../include/conversation.php:1869 -#: ../../include/widgets.php:888 -msgid "Chatrooms" -msgstr "" - #: ../../include/conversation.php:1879 msgid "Bookmarks" msgstr "" @@ -11742,16 +11534,6 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:53 ../../include/widgets.php:333 -#: ../../include/features.php:390 -msgid "Saved Folders" -msgstr "" - -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -#: ../../include/widgets.php:336 ../../include/widgets.php:458 -msgid "Everything" -msgstr "" - #: ../../include/contact_widgets.php:122 #, php-format msgid "%d connection in common" @@ -11763,219 +11545,148 @@ msgstr[1] "" msgid "show more" msgstr "" -#: ../../include/widgets.php:141 -msgid "Suggestions" -msgstr "" - -#: ../../include/widgets.php:142 -msgid "See more..." -msgstr "" - -#: ../../include/widgets.php:162 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" - -#: ../../include/widgets.php:168 -msgid "Add New Connection" -msgstr "" - -#: ../../include/widgets.php:169 -msgid "Enter channel address" -msgstr "" - -#: ../../include/widgets.php:170 -msgid "Examples: bob@example.com, https://example.com/barbara" -msgstr "" - -#: ../../include/widgets.php:186 -msgid "Notes" -msgstr "" - -#: ../../include/widgets.php:262 -msgid "Remove term" -msgstr "" - -#: ../../include/widgets.php:270 ../../include/features.php:301 -msgid "Saved Searches" -msgstr "" - -#: ../../include/widgets.php:271 ../../include/group.php:336 -msgid "add" -msgstr "" - -#: ../../include/widgets.php:377 -msgid "Archives" -msgstr "" - -#: ../../include/widgets.php:549 -msgid "Refresh" -msgstr "" - -#: ../../include/widgets.php:589 -msgid "Account settings" -msgstr "" - -#: ../../include/widgets.php:595 -msgid "Channel settings" -msgstr "" - -#: ../../include/widgets.php:604 -msgid "Additional features" -msgstr "" - -#: ../../include/widgets.php:611 -msgid "Feature/Addon settings" -msgstr "" - -#: ../../include/widgets.php:617 -msgid "Display settings" -msgstr "" - -#: ../../include/widgets.php:624 -msgid "Manage locations" +#: ../../include/nav.php:88 +msgid "Remote authentication" msgstr "" -#: ../../include/widgets.php:631 -msgid "Export channel" +#: ../../include/nav.php:88 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/widgets.php:637 -msgid "Connected apps" +#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1689 +msgid "Logout" msgstr "" -#: ../../include/widgets.php:652 ../../include/features.php:153 -msgid "Permission Groups" +#: ../../include/nav.php:99 ../../include/nav.php:140 +msgid "End this session" msgstr "" -#: ../../include/widgets.php:669 -msgid "Premium Channel Settings" +#: ../../include/nav.php:103 +msgid "Your profile page" msgstr "" -#: ../../include/widgets.php:698 -msgid "Private Mail Menu" +#: ../../include/nav.php:105 +msgid "Manage/Edit profiles" msgstr "" -#: ../../include/widgets.php:700 -msgid "Combined View" +#: ../../include/nav.php:107 +msgid "Edit your profile" msgstr "" -#: ../../include/widgets.php:705 ../../include/nav.php:213 -msgid "Inbox" +#: ../../include/nav.php:130 +msgid "Sign in" msgstr "" -#: ../../include/widgets.php:710 ../../include/nav.php:214 -msgid "Outbox" +#: ../../include/nav.php:155 +msgid "Take me home" msgstr "" -#: ../../include/widgets.php:715 ../../include/nav.php:215 -msgid "New Message" +#: ../../include/nav.php:157 +msgid "Log me out of this site" msgstr "" -#: ../../include/widgets.php:732 ../../include/widgets.php:744 -msgid "Conversations" +#: ../../include/nav.php:162 +msgid "Create an account" msgstr "" -#: ../../include/widgets.php:736 -msgid "Received Messages" +#: ../../include/nav.php:174 +msgid "Help and documentation" msgstr "" -#: ../../include/widgets.php:740 -msgid "Sent Messages" +#: ../../include/nav.php:178 +msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/widgets.php:754 -msgid "No messages." +#: ../../include/nav.php:180 +msgid "Search site @name, #tag, ?docs, content" msgstr "" -#: ../../include/widgets.php:772 -msgid "Delete conversation" +#: ../../include/nav.php:182 +msgid "Channel Directory" msgstr "" -#: ../../include/widgets.php:798 -msgid "Events Tools" +#: ../../include/nav.php:194 +msgid "Your grid" msgstr "" -#: ../../include/widgets.php:799 -msgid "Export Calendar" +#: ../../include/nav.php:195 +msgid "View your network/grid" msgstr "" -#: ../../include/widgets.php:800 -msgid "Import Calendar" +#: ../../include/nav.php:196 +msgid "Mark all grid notifications seen" msgstr "" -#: ../../include/widgets.php:892 -msgid "Overview" +#: ../../include/nav.php:198 +msgid "Channel home" msgstr "" -#: ../../include/widgets.php:899 -msgid "Chat Members" +#: ../../include/nav.php:199 +msgid "View your channel home" msgstr "" -#: ../../include/widgets.php:977 -msgctxt "wiki_history" -msgid "Message" +#: ../../include/nav.php:200 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/widgets.php:999 -msgid "Bookmarked Chatrooms" +#: ../../include/nav.php:206 +msgid "Notices" msgstr "" -#: ../../include/widgets.php:1030 -msgid "Suggested Chatrooms" +#: ../../include/nav.php:206 +msgid "Notifications" msgstr "" -#: ../../include/widgets.php:1175 ../../include/widgets.php:1287 -msgid "photo/image" +#: ../../include/nav.php:207 +msgid "View all notifications" msgstr "" -#: ../../include/widgets.php:1230 -msgid "Click to show more" +#: ../../include/nav.php:210 +msgid "Private mail" msgstr "" -#: ../../include/widgets.php:1381 -msgid "Rating Tools" +#: ../../include/nav.php:211 +msgid "View your private messages" msgstr "" -#: ../../include/widgets.php:1385 ../../include/widgets.php:1387 -msgid "Rate Me" +#: ../../include/nav.php:212 +msgid "Mark all private messages seen" msgstr "" -#: ../../include/widgets.php:1390 -msgid "View Ratings" +#: ../../include/nav.php:218 +msgid "Event Calendar" msgstr "" -#: ../../include/widgets.php:1483 -msgid "Forums" +#: ../../include/nav.php:219 +msgid "View events" msgstr "" -#: ../../include/widgets.php:1540 -msgctxt "widget" -msgid "Activity" +#: ../../include/nav.php:220 +msgid "Mark all events seen" msgstr "" -#: ../../include/widgets.php:1569 -msgid "Tasks" +#: ../../include/nav.php:223 +msgid "Manage Your Channels" msgstr "" -#: ../../include/widgets.php:1635 ../../include/widgets.php:1673 -msgid "Member registrations waiting for confirmation" +#: ../../include/nav.php:225 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/widgets.php:1641 -msgid "Inspect queue" +#: ../../include/nav.php:233 +msgid "Site Setup and Configuration" msgstr "" -#: ../../include/widgets.php:1643 -msgid "DB updates" +#: ../../include/nav.php:297 +msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/widgets.php:1668 ../../include/nav.php:233 -msgid "Admin" +#: ../../include/nav.php:298 +msgid "Please wait..." msgstr "" -#: ../../include/widgets.php:1669 -msgid "Plugin Features" +#: ../../include/nav.php:300 +msgid "Add Apps" msgstr "" #: ../../include/js_strings.php:5 @@ -12118,19 +11829,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:45 ../../include/text.php:1315 +#: ../../include/js_strings.php:45 ../../include/text.php:1314 msgid "January" msgstr "" -#: ../../include/js_strings.php:46 ../../include/text.php:1315 +#: ../../include/js_strings.php:46 ../../include/text.php:1314 msgid "February" msgstr "" -#: ../../include/js_strings.php:47 ../../include/text.php:1315 +#: ../../include/js_strings.php:47 ../../include/text.php:1314 msgid "March" msgstr "" -#: ../../include/js_strings.php:48 ../../include/text.php:1315 +#: ../../include/js_strings.php:48 ../../include/text.php:1314 msgid "April" msgstr "" @@ -12139,31 +11850,31 @@ msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:50 ../../include/text.php:1315 +#: ../../include/js_strings.php:50 ../../include/text.php:1314 msgid "June" msgstr "" -#: ../../include/js_strings.php:51 ../../include/text.php:1315 +#: ../../include/js_strings.php:51 ../../include/text.php:1314 msgid "July" msgstr "" -#: ../../include/js_strings.php:52 ../../include/text.php:1315 +#: ../../include/js_strings.php:52 ../../include/text.php:1314 msgid "August" msgstr "" -#: ../../include/js_strings.php:53 ../../include/text.php:1315 +#: ../../include/js_strings.php:53 ../../include/text.php:1314 msgid "September" msgstr "" -#: ../../include/js_strings.php:54 ../../include/text.php:1315 +#: ../../include/js_strings.php:54 ../../include/text.php:1314 msgid "October" msgstr "" -#: ../../include/js_strings.php:55 ../../include/text.php:1315 +#: ../../include/js_strings.php:55 ../../include/text.php:1314 msgid "November" msgstr "" -#: ../../include/js_strings.php:56 ../../include/text.php:1315 +#: ../../include/js_strings.php:56 ../../include/text.php:1314 msgid "December" msgstr "" @@ -12216,31 +11927,31 @@ msgstr "" msgid "Dec" msgstr "" -#: ../../include/js_strings.php:69 ../../include/text.php:1311 +#: ../../include/js_strings.php:69 ../../include/text.php:1310 msgid "Sunday" msgstr "" -#: ../../include/js_strings.php:70 ../../include/text.php:1311 +#: ../../include/js_strings.php:70 ../../include/text.php:1310 msgid "Monday" msgstr "" -#: ../../include/js_strings.php:71 ../../include/text.php:1311 +#: ../../include/js_strings.php:71 ../../include/text.php:1310 msgid "Tuesday" msgstr "" -#: ../../include/js_strings.php:72 ../../include/text.php:1311 +#: ../../include/js_strings.php:72 ../../include/text.php:1310 msgid "Wednesday" msgstr "" -#: ../../include/js_strings.php:73 ../../include/text.php:1311 +#: ../../include/js_strings.php:73 ../../include/text.php:1310 msgid "Thursday" msgstr "" -#: ../../include/js_strings.php:74 ../../include/text.php:1311 +#: ../../include/js_strings.php:74 ../../include/text.php:1310 msgid "Friday" msgstr "" -#: ../../include/js_strings.php:75 ../../include/text.php:1311 +#: ../../include/js_strings.php:75 ../../include/text.php:1310 msgid "Saturday" msgstr "" @@ -12313,184 +12024,263 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../include/text.php:461 +#: ../../include/network.php:756 +msgid "view full size" +msgstr "" + +#: ../../include/network.php:1490 +msgid "No Subject" +msgstr "" + +#: ../../include/network.php:1744 ../../include/network.php:1745 +msgid "Friendica" +msgstr "" + +#: ../../include/network.php:1746 +msgid "OStatus" +msgstr "" + +#: ../../include/network.php:1747 +msgid "GNU-Social" +msgstr "" + +#: ../../include/network.php:1748 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:1750 +msgid "Diaspora" +msgstr "" + +#: ../../include/network.php:1751 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:1752 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:1753 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:1754 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:1755 +msgid "MySpace" +msgstr "" + +#: ../../include/group.php:26 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "" + +#: ../../include/group.php:268 +msgid "Add new connections to this privacy group" +msgstr "" + +#: ../../include/group.php:309 +msgid "edit" +msgstr "" + +#: ../../include/group.php:331 ../../include/features.php:292 +msgid "Privacy Groups" +msgstr "" + +#: ../../include/group.php:332 +msgid "Edit group" +msgstr "" + +#: ../../include/group.php:333 +msgid "Add privacy group" +msgstr "" + +#: ../../include/group.php:334 +msgid "Channels not in any privacy group" +msgstr "" + +#: ../../include/text.php:460 msgid "prev" msgstr "" -#: ../../include/text.php:463 +#: ../../include/text.php:462 msgid "first" msgstr "" -#: ../../include/text.php:492 +#: ../../include/text.php:491 msgid "last" msgstr "" -#: ../../include/text.php:495 +#: ../../include/text.php:494 msgid "next" msgstr "" -#: ../../include/text.php:506 +#: ../../include/text.php:505 msgid "older" msgstr "" -#: ../../include/text.php:508 +#: ../../include/text.php:507 msgid "newer" msgstr "" -#: ../../include/text.php:928 +#: ../../include/text.php:927 msgid "No connections" msgstr "" -#: ../../include/text.php:953 +#: ../../include/text.php:952 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1098 ../../include/text.php:1103 +#: ../../include/text.php:1097 ../../include/text.php:1102 msgid "poke" msgstr "" -#: ../../include/text.php:1104 +#: ../../include/text.php:1103 msgid "ping" msgstr "" -#: ../../include/text.php:1104 +#: ../../include/text.php:1103 msgid "pinged" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1104 msgid "prod" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1104 msgid "prodded" msgstr "" -#: ../../include/text.php:1106 +#: ../../include/text.php:1105 msgid "slap" msgstr "" -#: ../../include/text.php:1106 +#: ../../include/text.php:1105 msgid "slapped" msgstr "" -#: ../../include/text.php:1107 +#: ../../include/text.php:1106 msgid "finger" msgstr "" -#: ../../include/text.php:1107 +#: ../../include/text.php:1106 msgid "fingered" msgstr "" -#: ../../include/text.php:1108 +#: ../../include/text.php:1107 msgid "rebuff" msgstr "" -#: ../../include/text.php:1108 +#: ../../include/text.php:1107 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1120 +#: ../../include/text.php:1119 msgid "happy" msgstr "" -#: ../../include/text.php:1121 +#: ../../include/text.php:1120 msgid "sad" msgstr "" -#: ../../include/text.php:1122 +#: ../../include/text.php:1121 msgid "mellow" msgstr "" -#: ../../include/text.php:1123 +#: ../../include/text.php:1122 msgid "tired" msgstr "" -#: ../../include/text.php:1124 +#: ../../include/text.php:1123 msgid "perky" msgstr "" -#: ../../include/text.php:1125 +#: ../../include/text.php:1124 msgid "angry" msgstr "" -#: ../../include/text.php:1126 +#: ../../include/text.php:1125 msgid "stupefied" msgstr "" -#: ../../include/text.php:1127 +#: ../../include/text.php:1126 msgid "puzzled" msgstr "" -#: ../../include/text.php:1128 +#: ../../include/text.php:1127 msgid "interested" msgstr "" -#: ../../include/text.php:1129 +#: ../../include/text.php:1128 msgid "bitter" msgstr "" -#: ../../include/text.php:1130 +#: ../../include/text.php:1129 msgid "cheerful" msgstr "" -#: ../../include/text.php:1131 +#: ../../include/text.php:1130 msgid "alive" msgstr "" -#: ../../include/text.php:1132 +#: ../../include/text.php:1131 msgid "annoyed" msgstr "" -#: ../../include/text.php:1133 +#: ../../include/text.php:1132 msgid "anxious" msgstr "" -#: ../../include/text.php:1134 +#: ../../include/text.php:1133 msgid "cranky" msgstr "" -#: ../../include/text.php:1135 +#: ../../include/text.php:1134 msgid "disturbed" msgstr "" -#: ../../include/text.php:1136 +#: ../../include/text.php:1135 msgid "frustrated" msgstr "" -#: ../../include/text.php:1137 +#: ../../include/text.php:1136 msgid "depressed" msgstr "" -#: ../../include/text.php:1138 +#: ../../include/text.php:1137 msgid "motivated" msgstr "" -#: ../../include/text.php:1139 +#: ../../include/text.php:1138 msgid "relaxed" msgstr "" -#: ../../include/text.php:1140 +#: ../../include/text.php:1139 msgid "surprised" msgstr "" -#: ../../include/text.php:1315 +#: ../../include/text.php:1314 msgid "May" msgstr "" -#: ../../include/text.php:1392 ../../include/text.php:1396 +#: ../../include/text.php:1391 ../../include/text.php:1395 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1398 +#: ../../include/text.php:1397 msgid "unknown" msgstr "" -#: ../../include/text.php:1434 +#: ../../include/text.php:1433 msgid "remove category" msgstr "" -#: ../../include/text.php:1511 +#: ../../include/text.php:1510 msgid "remove from file" msgstr "" @@ -12502,111 +12292,150 @@ msgstr "" msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1822 +#: ../../include/text.php:1808 msgid "Page content type" msgstr "" -#: ../../include/text.php:1955 +#: ../../include/text.php:1941 msgid "activity" msgstr "" -#: ../../include/text.php:2269 +#: ../../include/text.php:2255 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2275 +#: ../../include/text.php:2261 msgid "Pages" msgstr "" -#: ../../include/text.php:2297 +#: ../../include/text.php:2283 msgid "Import website..." msgstr "" -#: ../../include/text.php:2298 +#: ../../include/text.php:2284 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2299 +#: ../../include/text.php:2285 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2300 +#: ../../include/text.php:2286 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2301 +#: ../../include/text.php:2287 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2302 +#: ../../include/text.php:2288 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2303 +#: ../../include/text.php:2289 msgid "Select folder" msgstr "" -#: ../../include/text.php:2304 +#: ../../include/text.php:2290 msgid "Export website..." msgstr "" -#: ../../include/text.php:2305 +#: ../../include/text.php:2291 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2306 +#: ../../include/text.php:2292 msgid "website.zip" msgstr "" -#: ../../include/text.php:2307 +#: ../../include/text.php:2293 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2308 +#: ../../include/text.php:2294 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2309 +#: ../../include/text.php:2295 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2310 +#: ../../include/text.php:2296 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2311 +#: ../../include/text.php:2297 msgid "Specify folder" msgstr "" -#: ../../include/group.php:26 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +#: ../../include/photos.php:111 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/group.php:268 -msgid "Add new connections to this privacy group" +#: ../../include/photos.php:118 +msgid "Image file is empty." msgstr "" -#: ../../include/group.php:309 -msgid "edit" +#: ../../include/photos.php:257 +msgid "Photo storage failed." msgstr "" -#: ../../include/group.php:331 ../../include/features.php:292 -msgid "Privacy Groups" +#: ../../include/photos.php:297 +msgid "a new photo" msgstr "" -#: ../../include/group.php:332 -msgid "Edit group" +#: ../../include/photos.php:301 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/group.php:333 -msgid "Add privacy group" +#: ../../include/photos.php:511 +msgid "Upload New Photos" msgstr "" -#: ../../include/group.php:334 -msgid "Channels not in any privacy group" +#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040 +#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048 +#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054 +#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062 +#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070 +#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076 +#: ../../include/bbcode.php:1079 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:189 +#, php-format +msgid "Install %s element: " +msgstr "" + +#: ../../include/bbcode.php:193 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." +msgstr "" + +#: ../../include/bbcode.php:272 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "" + +#: ../../include/bbcode.php:349 ../../include/bbcode.php:357 +msgid "Click to open/close" +msgstr "" + +#: ../../include/bbcode.php:357 +msgid "spoiler" +msgstr "" + +#: ../../include/bbcode.php:1028 +msgid "$1 wrote:" msgstr "" #: ../../include/channel.php:33 @@ -12654,11 +12483,11 @@ msgstr "" msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1138 ../../include/channel.php:1257 +#: ../../include/channel.php:1138 ../../include/channel.php:1252 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1140 ../../include/channel.php:1312 +#: ../../include/channel.php:1140 ../../include/channel.php:1307 msgid "Homepage:" msgstr "" @@ -12666,202 +12495,100 @@ msgstr "" msgid "Online Now" msgstr "" -#: ../../include/channel.php:1262 +#: ../../include/channel.php:1257 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1286 +#: ../../include/channel.php:1281 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1287 +#: ../../include/channel.php:1282 msgid "j F" msgstr "" -#: ../../include/channel.php:1294 +#: ../../include/channel.php:1289 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1307 +#: ../../include/channel.php:1302 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1310 +#: ../../include/channel.php:1305 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1316 +#: ../../include/channel.php:1311 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1318 +#: ../../include/channel.php:1313 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1320 +#: ../../include/channel.php:1315 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1324 +#: ../../include/channel.php:1319 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1326 +#: ../../include/channel.php:1321 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1328 +#: ../../include/channel.php:1323 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1330 +#: ../../include/channel.php:1325 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1332 +#: ../../include/channel.php:1327 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1334 +#: ../../include/channel.php:1329 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1336 +#: ../../include/channel.php:1331 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1338 +#: ../../include/channel.php:1333 msgid "Television:" msgstr "" -#: ../../include/channel.php:1340 +#: ../../include/channel.php:1335 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1342 +#: ../../include/channel.php:1337 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1344 +#: ../../include/channel.php:1339 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1346 +#: ../../include/channel.php:1341 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1369 +#: ../../include/channel.php:1364 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:2103 +#: ../../include/channel.php:2098 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../include/network.php:756 -msgid "view full size" -msgstr "" - -#: ../../include/network.php:1490 -msgid "No Subject" -msgstr "" - -#: ../../include/network.php:1746 -msgid "OStatus" -msgstr "" - -#: ../../include/network.php:1747 -msgid "GNU-Social" -msgstr "" - -#: ../../include/network.php:1748 -msgid "RSS/Atom" -msgstr "" - -#: ../../include/network.php:1751 -msgid "Facebook" -msgstr "" - -#: ../../include/network.php:1752 -msgid "Zot" -msgstr "" - -#: ../../include/network.php:1753 -msgid "LinkedIn" -msgstr "" - -#: ../../include/network.php:1754 -msgid "XMPP/IM" -msgstr "" - -#: ../../include/network.php:1755 -msgid "MySpace" -msgstr "" - -#: ../../include/attach.php:250 ../../include/attach.php:338 -msgid "Item was not found." -msgstr "" - -#: ../../include/attach.php:499 -msgid "No source file." -msgstr "" - -#: ../../include/attach.php:521 -msgid "Cannot locate file to replace" -msgstr "" - -#: ../../include/attach.php:539 -msgid "Cannot locate file to revise/update" -msgstr "" - -#: ../../include/attach.php:670 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../include/attach.php:684 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:854 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:867 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:922 ../../include/attach.php:938 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:984 ../../include/attach.php:1142 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:1010 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:1032 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:1096 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:1100 -msgid "database storage failed." -msgstr "" - -#: ../../include/attach.php:1148 -msgid "Empty path" -msgstr "" - #: ../../include/message.php:32 msgid "Unable to determine sender." msgstr "" @@ -12878,202 +12605,83 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/nav.php:88 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:88 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1705 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:99 ../../include/nav.php:140 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:103 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:105 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:107 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:130 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:155 -msgid "Get me home" -msgstr "" - -#: ../../include/nav.php:157 -msgid "Log me out of this site" -msgstr "" - -#: ../../include/nav.php:162 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:174 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:178 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:180 -msgid "Search site @name, #tag, ?docs, content" -msgstr "" - -#: ../../include/nav.php:182 -msgid "Channel Directory" -msgstr "" - -#: ../../include/nav.php:194 -msgid "Your grid" -msgstr "" - -#: ../../include/nav.php:195 -msgid "View your network/grid" -msgstr "" - -#: ../../include/nav.php:196 -msgid "Mark all grid notifications seen" -msgstr "" - -#: ../../include/nav.php:198 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:199 -msgid "View your channel home" -msgstr "" - -#: ../../include/nav.php:200 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:206 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:206 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:207 -msgid "View all notifications" -msgstr "" - -#: ../../include/nav.php:210 -msgid "Private mail" +#: ../../include/security.php:117 +msgid "guest:" msgstr "" -#: ../../include/nav.php:211 -msgid "View your private messages" +#: ../../include/security.php:532 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/nav.php:212 -msgid "Mark all private messages seen" +#: ../../include/items.php:808 ../../include/items.php:855 +msgid "(Unknown)" msgstr "" -#: ../../include/nav.php:218 -msgid "Event Calendar" +#: ../../include/items.php:1046 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/nav.php:219 -msgid "View events" +#: ../../include/items.php:1048 +msgid "Visible to you only." msgstr "" -#: ../../include/nav.php:220 -msgid "Mark all events seen" +#: ../../include/items.php:1050 +msgid "Visible to anybody in this network." msgstr "" -#: ../../include/nav.php:223 -msgid "Manage Your Channels" +#: ../../include/items.php:1052 +msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/nav.php:225 -msgid "Account/Channel Settings" +#: ../../include/items.php:1054 +#, php-format +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/nav.php:233 -msgid "Site Setup and Configuration" +#: ../../include/items.php:1056 +msgid "Visible to all connections." msgstr "" -#: ../../include/nav.php:297 -msgid "@name, #tag, ?doc, content" +#: ../../include/items.php:1058 +msgid "Visible to approved connections." msgstr "" -#: ../../include/nav.php:298 -msgid "Please wait..." +#: ../../include/items.php:1060 +msgid "Visible to specific connections." msgstr "" -#: ../../include/nav.php:300 -msgid "Add Apps" +#: ../../include/items.php:3828 +msgid "Privacy group is empty." msgstr "" -#: ../../include/photos.php:115 +#: ../../include/items.php:3835 #, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:122 -msgid "Image file is empty." +msgid "Privacy group: %s" msgstr "" -#: ../../include/photos.php:260 -msgid "Photo storage failed." +#: ../../include/items.php:3847 +msgid "Connection not found." msgstr "" -#: ../../include/photos.php:300 -msgid "a new photo" +#: ../../include/items.php:4196 +msgid "profile photo" msgstr "" -#: ../../include/photos.php:304 +#: ../../include/items.php:4392 #, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "" - -#: ../../include/photos.php:519 -msgid "Upload New Photos" -msgstr "" - -#: ../../include/security.php:117 -msgid "guest:" -msgstr "" - -#: ../../include/security.php:532 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - -#: ../../include/import.php:30 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: ../../include/import.php:90 -msgid "Channel clone failed. Import failed." +msgid "[Edited %s]" msgstr "" -#: ../../include/import.php:100 -msgid "Cloned channel not found. Import failed." +#: ../../include/items.php:4392 +msgctxt "edit_activity" +msgid "Post" msgstr "" -#: ../../include/import.php:1373 -msgid "Unable to import element \"" +#: ../../include/items.php:4392 +msgctxt "edit_activity" +msgid "Comment" msgstr "" #: ../../include/acl_selectors.php:208 @@ -13128,6 +12736,68 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" +#: ../../include/attach.php:250 ../../include/attach.php:338 +msgid "Item was not found." +msgstr "" + +#: ../../include/attach.php:499 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:521 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:539 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:670 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "" + +#: ../../include/attach.php:684 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:854 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:867 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:922 ../../include/attach.php:938 +msgid "Path not available." +msgstr "" + +#: ../../include/attach.php:984 ../../include/attach.php:1142 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:1010 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:1032 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:1096 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:1100 +msgid "database storage failed." +msgstr "" + +#: ../../include/attach.php:1148 +msgid "Empty path" +msgstr "" + #: ../../include/permissions.php:35 msgid "Can view my normal stream and posts" msgstr "" @@ -13525,49 +13195,6 @@ msgstr "" msgid "Embedding disabled" msgstr "" -#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040 -#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048 -#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054 -#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062 -#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070 -#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076 -#: ../../include/bbcode.php:1079 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090 -msgid "Encrypted content" -msgstr "" - -#: ../../include/bbcode.php:189 -#, php-format -msgid "Install %s element: " -msgstr "" - -#: ../../include/bbcode.php:193 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "" - -#: ../../include/bbcode.php:272 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" - -#: ../../include/bbcode.php:349 ../../include/bbcode.php:357 -msgid "Click to open/close" -msgstr "" - -#: ../../include/bbcode.php:357 -msgid "spoiler" -msgstr "" - -#: ../../include/bbcode.php:1028 -msgid "$1 wrote:" -msgstr "" - #: ../../util/nconfig.php:34 msgid "Source channel not found." msgstr "" @@ -13704,54 +13331,54 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1479 +#: ../../boot.php:1463 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1482 +#: ../../boot.php:1466 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1686 +#: ../../boot.php:1670 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1708 +#: ../../boot.php:1692 msgid "Login/Email" msgstr "" -#: ../../boot.php:1709 +#: ../../boot.php:1693 msgid "Password" msgstr "" -#: ../../boot.php:1710 +#: ../../boot.php:1694 msgid "Remember me" msgstr "" -#: ../../boot.php:1713 +#: ../../boot.php:1697 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2277 +#: ../../boot.php:2237 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2432 +#: ../../boot.php:2392 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2435 +#: ../../boot.php:2395 #, php-format -msgid "[hubzilla] Website SSL error for %s" +msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2554 +#: ../../boot.php:2514 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2558 +#: ../../boot.php:2518 #, php-format -msgid "[hubzilla] Cron tasks not running on %s" +msgid "[$Projectname] Cron tasks not running on %s" msgstr "" diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index ea31c23a3..dbf8b9285 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -107,7 +107,8 @@ <script> window.wiki_resource_id = '{{$resource_id}}'; window.wiki_page_name = '{{$page}}'; - window.wiki_page_content = `{{$content}}`; +// window.wiki_page_content = "{{$content|escape:'javascript'}}"; + window.wiki_page_content = {{$content}}; window.wiki_page_commit = '{{$commit}}'; $("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary'); |