From f6d76282549c562120417cbdd111109add4f7672 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 16 Jun 2016 20:16:39 -0700 Subject: core changes to better support media migrations --- include/attach.php | 12 +++++++++--- include/network.php | 15 +++++++++++++++ include/photos.php | 14 +++++++++----- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/include/attach.php b/include/attach.php index 78efde51f..33545b12a 100644 --- a/include/attach.php +++ b/include/attach.php @@ -423,6 +423,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $observer = array(); + $dosync = ((array_key_exists('nosync',$arr) && $arr['nosync']) ? 0 : 1); + if($observer_hash) { $x = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($observer_hash) @@ -829,6 +831,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { if($arr['description']) $args['description'] = $arr['description']; + $args['deliver'] = $dosync; + $p = photo_upload($channel,$observer,$args); if($p['success']) { $ret['body'] = $p['body']; @@ -865,10 +869,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { call_hooks('photo_upload_end',$ret); } - $sync = attach_export_data($channel,$hash); + if($dosync) { + $sync = attach_export_data($channel,$hash); - if($sync) - build_sync_packet($channel['channel_id'],array('file' => array($sync))); + if($sync) + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + } return $ret; } diff --git a/include/network.php b/include/network.php index a595a03d1..d922799b6 100644 --- a/include/network.php +++ b/include/network.php @@ -29,6 +29,8 @@ function get_capath() { * * \b nobody => only return the header * * \b filep => stream resource to write body to. header and body are not returned when using this option. * * \b custom => custom request method: e.g. 'PUT', 'DELETE' + * * \b cookiejar => cookie file (write) + * * \B cookiefile => cookie file (read) * * @return array an associative array with: * * \e int \b return_code => HTTP return code or 0 if timeout or failure @@ -60,6 +62,8 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_HEADER, $false); } + + if(x($opts,'headers')) @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']); @@ -82,6 +86,11 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); } + if(x($opts,'cookiejar')) + @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); + if(x($opts,'cookiefile')) + @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); + @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true)); @@ -228,6 +237,12 @@ logger('headers: ' . print_r($opts['headers'],true) . 'redir: ' . $redirects); @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); } + + if(x($opts,'cookiejar')) + @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); + if(x($opts,'cookiefile')) + @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); + @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true)); diff --git a/include/photos.php b/include/photos.php index c64d662ea..da6118b38 100644 --- a/include/photos.php +++ b/include/photos.php @@ -41,6 +41,10 @@ function photo_upload($channel, $observer, $args) { else $visible = 0; + $deliver = true; + if(array_key_exists('deliver',$args)) + $deliver = intval($args['deliver']); + // Set to default channel permissions. If the parent directory (album) has permissions set, // use those instead. If we have specific permissions supplied, they take precedence over // all other settings. 'allow_cid' being passed from an external source takes priority over channel settings. @@ -330,7 +334,7 @@ function photo_upload($channel, $observer, $args) { if($item['mid'] === $item['parent_mid']) { - $item['body'] = $args['body']; + $item['body'] = $summary; $item['obj_type'] = ACTIVITY_OBJ_PHOTO; $item['obj'] = json_encode($object); @@ -355,14 +359,14 @@ function photo_upload($channel, $observer, $args) { if(($item['edited'] > $r[0]['edited']) || $force) { $item['id'] = $r[0]['id']; $item['uid'] = $channel['channel_id']; - item_store_update($item); + item_store_update($item,false,$deliver); continue; } } else { $item['aid'] = $channel['channel_account_id']; $item['uid'] = $channel['channel_id']; - $item_result = item_store($item); + $item_result = item_store($item,false,$deliver); } } } @@ -414,10 +418,10 @@ function photo_upload($channel, $observer, $args) { - $result = item_store($arr); + $result = item_store($arr,false,$deliver); $item_id = $result['item_id']; - if($visible) + if($visible && $deliver) Zotlabs\Daemon\Master::Summon(array('Notifier', 'wall-new', $item_id)); } -- cgit v1.2.3 From aa5ac9dc3fb81bdc8aa17567eed42e845c408d00 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Jun 2016 11:57:36 +0200 Subject: only use height: auto for week and day view --- view/js/mod_cal.js | 2 +- view/js/mod_events.js | 2 +- view/tpl/event_head.tpl | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/view/js/mod_cal.js b/view/js/mod_cal.js index 0bf97fcf7..5867f676e 100644 --- a/view/js/mod_cal.js +++ b/view/js/mod_cal.js @@ -17,6 +17,6 @@ function on_fullscreen() { function on_inline() { var view = $('#events-calendar').fullCalendar('getView'); if(view.type === 'month') { - $('#events-calendar').fullCalendar('option', 'height', 'auto'); + $('#events-calendar').fullCalendar('option', 'height', ''); } } diff --git a/view/js/mod_events.js b/view/js/mod_events.js index e67890b47..66cf81ddd 100644 --- a/view/js/mod_events.js +++ b/view/js/mod_events.js @@ -28,6 +28,6 @@ function on_fullscreen() { function on_inline() { var view = $('#events-calendar').fullCalendar('getView'); if(view.type === 'month') { - $('#events-calendar').fullCalendar('option', 'height', 'auto'); + $('#events-calendar').fullCalendar('option', 'height', ''); } } diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 5083c5835..762bdcbb8 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -30,6 +30,12 @@ function changeView(action, viewName) { $('#events-calendar').fullCalendar(action, viewName); var view = $('#events-calendar').fullCalendar('getView'); + if(view.type === 'agendaDay' || view.type === 'agendaWeek') { + $('#events-calendar').fullCalendar('option', 'height', 'auto'); + } + else { + $('#events-calendar').fullCalendar('option', 'height', ''); + } $('#title').text(view.title); } @@ -42,7 +48,6 @@ firstDay: {{$first_day}}, eventLimit: 3, - height: 'auto', monthNames: aStr['monthNames'], monthNamesShort: aStr['monthNamesShort'], -- cgit v1.2.3 From 2793086c0d65c24e172f7260129968eb80705018 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 17 Jun 2016 14:58:03 -0700 Subject: 1. string update, 2. pretty print json blobs --- include/bbcode.php | 2 +- include/text.php | 6 + util/hmessages.po | 2427 +++++++++++++++++++++++++++------------------------- 3 files changed, 1253 insertions(+), 1182 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index b720355af..0bf326506 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -493,7 +493,7 @@ function bb_code($match) { function bb_highlight($match) { if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby', - 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh'])) + 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','json','sh'])) return text_highlight($match[2],strtolower($match[1])); return $match[0]; } diff --git a/include/text.php b/include/text.php index 50a3d8892..22f4556a8 100644 --- a/include/text.php +++ b/include/text.php @@ -2887,6 +2887,12 @@ function text_highlight($s,$lang) { if($lang === 'js') $lang = 'javascript'; + if($lang === 'json') { + $lang = 'javascript'; + if(! strpos(trim($s),"\n")) + $s = jindent($s); + } + if(! strpos('Text_Highlighter',get_include_path())) { set_include_path(get_include_path() . PATH_SEPARATOR . 'library/Text_Highlighter'); } diff --git a/util/hmessages.po b/util/hmessages.po index 2ec494c7c..42cf092bb 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-10 00:02-0700\n" +"POT-Creation-Date: 2016-06-17 00:02-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2621 msgid "Collection" msgstr "" @@ -46,15 +46,16 @@ msgid "Schedule Outbox" msgstr "" #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798 -#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486 -#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505 -#: ../../include/conversation.php:1032 +#: ../../Zotlabs/Module/Photos.php:1243 +#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:489 +#: ../../Zotlabs/Lib/Apps.php:564 ../../include/conversation.php:1035 +#: ../../include/widgets.php:1578 msgid "Unknown" msgstr "" #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93 -#: ../../include/conversation.php:1639 +#: ../../Zotlabs/Lib/Apps.php:216 ../../include/conversation.php:1654 +#: ../../include/nav.php:93 msgid "Files" msgstr "" @@ -67,16 +68,17 @@ msgid "Shared" msgstr "" #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306 -#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184 #: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142 -#: ../../Zotlabs/Module/Webpages.php:186 +#: ../../Zotlabs/Module/Webpages.php:194 msgid "Create" msgstr "" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308 #: ../../Zotlabs/Module/Cover_photo.php:357 #: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364 -#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518 +#: ../../Zotlabs/Module/Profile_photo.php:368 +#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1591 msgid "Upload" msgstr "" @@ -101,34 +103,34 @@ msgstr "" msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157 +#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:160 #: ../../Zotlabs/Module/Editblock.php:109 #: ../../Zotlabs/Module/Connections.php:290 #: ../../Zotlabs/Module/Connections.php:310 #: ../../Zotlabs/Module/Editpost.php:84 -#: ../../Zotlabs/Module/Editlayout.php:113 +#: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editwebpage.php:146 -#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187 -#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106 -#: ../../include/channel.php:937 ../../include/channel.php:941 -#: ../../include/menu.php:108 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 +#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:195 +#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../Zotlabs/Lib/Apps.php:340 +#: ../../include/channel.php:918 ../../include/channel.php:922 +#: ../../include/menu.php:108 ../../include/page_widgets.php:9 +#: ../../include/page_widgets.php:39 msgid "Edit" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159 -#: ../../Zotlabs/Module/Connedit.php:572 +#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:162 +#: ../../Zotlabs/Module/Connedit.php:578 #: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Connections.php:263 -#: ../../Zotlabs/Module/Editlayout.php:136 +#: ../../Zotlabs/Module/Editlayout.php:137 #: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177 #: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114 #: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261 -#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338 -#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657 +#: ../../Zotlabs/Module/Webpages.php:197 ../../Zotlabs/Lib/ThreadItem.php:126 +#: ../../Zotlabs/Lib/Apps.php:341 ../../include/conversation.php:660 msgid "Delete" msgstr "" @@ -184,8 +186,8 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:24 #: ../../Zotlabs/Module/Filestorage.php:79 #: ../../Zotlabs/Module/Filestorage.php:94 -#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210 -#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070 +#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:211 +#: ../../Zotlabs/Module/Item.php:219 ../../Zotlabs/Module/Item.php:1070 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76 #: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17 @@ -197,7 +199,7 @@ msgstr "" #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Notifications.php:70 #: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35 -#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26 +#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Pdledit.php:26 #: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68 #: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203 #: ../../Zotlabs/Module/Profiles.php:601 @@ -214,14 +216,14 @@ msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:25 #: ../../Zotlabs/Module/Viewconnections.php:30 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74 -#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438 +#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/photos.php:27 #: ../../include/attach.php:141 ../../include/attach.php:189 #: ../../include/attach.php:252 ../../include/attach.php:266 #: ../../include/attach.php:273 ../../include/attach.php:338 #: ../../include/attach.php:352 ../../include/attach.php:359 -#: ../../include/attach.php:437 ../../include/attach.php:895 -#: ../../include/attach.php:966 ../../include/attach.php:1118 -#: ../../include/photos.php:27 +#: ../../include/attach.php:439 ../../include/attach.php:901 +#: ../../include/attach.php:972 ../../include/attach.php:1124 +#: ../../include/items.php:3450 msgid "Permission denied." msgstr "" @@ -230,8 +232,8 @@ msgid "Not Found" msgstr "" #: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79 -#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97 -#: ../../Zotlabs/Module/Page.php:93 +#: ../../Zotlabs/Module/Display.php:118 ../../Zotlabs/Module/Help.php:97 +#: ../../Zotlabs/Module/Page.php:94 msgid "Page not found." msgstr "" @@ -253,7 +255,7 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:33 #: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:837 +#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:818 msgid "Requested profile is not available." msgstr "" @@ -261,40 +263,40 @@ msgstr "" msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152 +#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155 #: ../../Zotlabs/Module/Editblock.php:108 msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2266 msgid "Blocks" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:153 +#: ../../Zotlabs/Module/Blocks.php:156 msgid "Block Title" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../Zotlabs/Module/Layouts.php:188 -#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:198 -#: ../../include/page_widgets.php:44 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 +#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:206 +#: ../../include/page_widgets.php:47 msgid "Created" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:155 ../../Zotlabs/Module/Layouts.php:189 -#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:199 -#: ../../include/page_widgets.php:45 +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 +#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:207 +#: ../../include/page_widgets.php:48 msgid "Edited" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 -#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188 -#: ../../include/conversation.php:1208 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:196 +#: ../../include/conversation.php:1219 msgid "Share" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195 -#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193 -#: ../../include/page_widgets.php:39 +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197 +#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:201 +#: ../../include/page_widgets.php:42 msgid "View" msgstr "" @@ -348,7 +350,7 @@ msgstr "" #: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196 #: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98 -#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475 +#: ../../Zotlabs/Module/Connedit.php:737 ../../Zotlabs/Module/Events.php:475 #: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85 #: ../../Zotlabs/Module/Filestorage.php:162 #: ../../Zotlabs/Module/Import.php:550 @@ -372,8 +374,8 @@ msgstr "" #: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114 #: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757 -#: ../../include/widgets.php:769 ../../include/js_strings.php:22 +#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:22 +#: ../../include/widgets.php:757 ../../include/widgets.php:769 #: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -383,6 +385,7 @@ msgid "Today" msgstr "" #: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25 +#: ../../Zotlabs/Module/Wiki.php:20 msgid "You must be logged in to see this page." msgstr "" @@ -423,19 +426,19 @@ msgid "Bookmark this room" msgstr "" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205 -#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176 +#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1181 msgid "Please enter a link URL:" msgstr "" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258 #: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722 -#: ../../include/conversation.php:1256 +#: ../../include/conversation.php:1271 msgid "Encrypt text" msgstr "" #: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111 #: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252 -#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143 +#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1146 msgid "Insert web link" msgstr "" @@ -571,7 +574,7 @@ msgstr "" msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:660 #: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460 #: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89 #: ../../Zotlabs/Module/Filestorage.php:157 @@ -583,7 +586,7 @@ msgstr "" #: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708 msgid "No" msgstr "" @@ -598,7 +601,7 @@ msgstr "" #: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708 msgid "Yes" msgstr "" @@ -606,277 +609,277 @@ msgstr "" msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:425 +#: ../../Zotlabs/Module/Connedit.php:431 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449 -#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467 -#: ../../Zotlabs/Module/Connedit.php:480 +#: ../../Zotlabs/Module/Connedit.php:446 ../../Zotlabs/Module/Connedit.php:455 +#: ../../Zotlabs/Module/Connedit.php:464 ../../Zotlabs/Module/Connedit.php:473 +#: ../../Zotlabs/Module/Connedit.php:486 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:503 +#: ../../Zotlabs/Module/Connedit.php:509 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219 -#: ../../include/nav.php:86 ../../include/conversation.php:954 +#: ../../Zotlabs/Module/Connedit.php:525 ../../Zotlabs/Lib/Apps.php:220 +#: ../../include/conversation.php:957 ../../include/nav.php:86 msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:522 +#: ../../Zotlabs/Module/Connedit.php:528 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:526 +#: ../../Zotlabs/Module/Connedit.php:532 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:529 +#: ../../Zotlabs/Module/Connedit.php:535 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:533 +#: ../../Zotlabs/Module/Connedit.php:539 msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:536 +#: ../../Zotlabs/Module/Connedit.php:542 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041 +#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1041 msgid "Unblock" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040 +#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1040 msgid "Block" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:543 +#: ../../Zotlabs/Module/Connedit.php:549 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:544 +#: ../../Zotlabs/Module/Connedit.php:550 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:548 +#: ../../Zotlabs/Module/Connedit.php:554 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:548 +#: ../../Zotlabs/Module/Connedit.php:554 #: ../../Zotlabs/Module/Connections.php:277 #: ../../Zotlabs/Module/Notifications.php:55 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:551 +#: ../../Zotlabs/Module/Connedit.php:557 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:552 +#: ../../Zotlabs/Module/Connedit.php:558 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:556 +#: ../../Zotlabs/Module/Connedit.php:562 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:556 +#: ../../Zotlabs/Module/Connedit.php:562 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:559 +#: ../../Zotlabs/Module/Connedit.php:565 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:560 +#: ../../Zotlabs/Module/Connedit.php:566 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:564 +#: ../../Zotlabs/Module/Connedit.php:570 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:564 +#: ../../Zotlabs/Module/Connedit.php:570 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:567 +#: ../../Zotlabs/Module/Connedit.php:573 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:568 +#: ../../Zotlabs/Module/Connedit.php:574 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:575 +#: ../../Zotlabs/Module/Connedit.php:581 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493 +#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:493 msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494 +#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:494 msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342 +#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Module/Settings.php:342 #: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347 #: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361 -#: ../../include/widgets.php:495 ../../include/selectors.php:123 -#: ../../include/channel.php:389 ../../include/channel.php:390 -#: ../../include/channel.php:397 +#: ../../include/selectors.php:123 ../../include/channel.php:389 +#: ../../include/channel.php:390 ../../include/channel.php:397 +#: ../../include/widgets.php:495 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496 +#: ../../Zotlabs/Module/Connedit.php:599 ../../include/widgets.php:496 msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 +#: ../../Zotlabs/Module/Connedit.php:600 #: ../../Zotlabs/Module/Connections.php:92 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497 msgid "All" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:660 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:660 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:659 +#: ../../Zotlabs/Module/Connedit.php:665 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:662 +#: ../../Zotlabs/Module/Connedit.php:668 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:665 +#: ../../Zotlabs/Module/Connedit.php:671 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:698 +#: ../../Zotlabs/Module/Connedit.php:704 msgid "none" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614 +#: ../../Zotlabs/Module/Connedit.php:708 ../../include/widgets.php:614 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926 +#: ../../Zotlabs/Module/Connedit.php:708 ../../include/items.php:3937 #, php-format msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:703 +#: ../../Zotlabs/Module/Connedit.php:709 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:703 +#: ../../Zotlabs/Module/Connedit.php:709 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:705 +#: ../../Zotlabs/Module/Connedit.php:711 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:706 +#: ../../Zotlabs/Module/Connedit.php:712 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:710 +#: ../../Zotlabs/Module/Connedit.php:716 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:711 +#: ../../Zotlabs/Module/Connedit.php:717 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:713 +#: ../../Zotlabs/Module/Connedit.php:719 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159 +#: ../../Zotlabs/Module/Connedit.php:720 ../../Zotlabs/Module/Rate.php:159 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:715 +#: ../../Zotlabs/Module/Connedit.php:721 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721 +#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:727 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:718 +#: ../../Zotlabs/Module/Connedit.php:724 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:719 +#: ../../Zotlabs/Module/Connedit.php:725 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Module/Connedit.php:726 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:726 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:728 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:727 +#: ../../Zotlabs/Module/Connedit.php:733 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:730 +#: ../../Zotlabs/Module/Connedit.php:736 msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:732 +#: ../../Zotlabs/Module/Connedit.php:738 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:734 +#: ../../Zotlabs/Module/Connedit.php:740 msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:735 +#: ../../Zotlabs/Module/Connedit.php:741 msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:737 +#: ../../Zotlabs/Module/Connedit.php:743 msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:738 +#: ../../Zotlabs/Module/Connedit.php:744 msgid "" "Some permissions may be inherited from your channel's privacy settings, which have higher priority than " "individual settings. You can not change those settings here." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:739 +#: ../../Zotlabs/Module/Connedit.php:745 msgid "" "Some permissions may be inherited from your channel's privacy settings, which have higher priority than " @@ -884,7 +887,7 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:740 +#: ../../Zotlabs/Module/Connedit.php:746 msgid "Last update:" msgstr "" @@ -914,12 +917,12 @@ msgstr "" msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183 +#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1164 msgid "Age:" msgstr "" #: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52 -#: ../../include/event.php:84 ../../include/channel.php:1027 +#: ../../include/event.php:84 ../../include/channel.php:1008 #: ../../include/bb2diaspora.php:507 msgid "Location:" msgstr "" @@ -928,18 +931,18 @@ msgstr "" msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199 +#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1180 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207 +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1188 msgid "About:" msgstr "" #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 -#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147 -#: ../../include/widgets.php:184 ../../include/connections.php:78 -#: ../../include/conversation.php:956 ../../include/channel.php:1012 +#: ../../Zotlabs/Module/Suggest.php:56 ../../include/conversation.php:959 +#: ../../include/channel.php:993 ../../include/connections.php:78 +#: ../../include/widgets.php:147 ../../include/widgets.php:184 msgid "Connect" msgstr "" @@ -1018,7 +1021,7 @@ msgstr "" #: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33 #: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255 #: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359 +#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3371 msgid "Item not found." msgstr "" @@ -1028,7 +1031,7 @@ msgstr "" msgid "Item not found" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228 +#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243 msgid "Title (optional)" msgstr "" @@ -1074,7 +1077,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:76 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1535 +#: ../../include/conversation.php:1550 msgid "New" msgstr "" @@ -1167,7 +1170,7 @@ msgid "Connections" msgstr "" #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/text.php:945 #: ../../include/text.php:957 ../../include/nav.php:165 #: ../../include/acl_selectors.php:276 msgid "Search" @@ -1197,7 +1200,7 @@ msgid "Image resize failed." msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:168 -#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144 +#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:148 msgid "Unable to process image" msgstr "" @@ -1211,30 +1214,30 @@ msgstr "" msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270 +#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4298 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271 +#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4299 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4272 +#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4300 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273 +#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4301 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4275 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4303 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1642 msgid "cover photo" msgstr "" @@ -1324,8 +1327,8 @@ msgid "Event not found." msgstr "" #: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949 -#: ../../include/text.php:1943 ../../include/conversation.php:123 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1944 +#: ../../include/event.php:949 ../../include/conversation.php:123 msgid "event" msgstr "" @@ -1410,12 +1413,12 @@ msgid "Share this event" msgstr "" #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093 -#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719 -#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40 +#: ../../Zotlabs/Module/Webpages.php:202 ../../Zotlabs/Lib/ThreadItem.php:719 +#: ../../include/conversation.php:1198 ../../include/page_widgets.php:43 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232 +#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1247 msgid "Permission settings" msgstr "" @@ -1443,15 +1446,16 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220 -#: ../../include/nav.php:92 ../../include/conversation.php:1632 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:221 +#: ../../include/conversation.php:1647 ../../include/nav.php:92 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591 #: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1235 +#: ../../include/conversation.php:1274 msgid "Cancel" msgstr "" @@ -1535,17 +1539,17 @@ msgstr "" msgid "mail delivered" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:126 -#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186 +#: ../../Zotlabs/Module/Editlayout.php:127 +#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188 msgid "Layout Name" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:127 -#: ../../Zotlabs/Module/Layouts.php:130 +#: ../../Zotlabs/Module/Editlayout.php:128 +#: ../../Zotlabs/Module/Layouts.php:131 msgid "Layout Description (Optional)" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:135 +#: ../../Zotlabs/Module/Editlayout.php:136 msgid "Edit Layout" msgstr "" @@ -1578,7 +1582,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3893 +#: ../../include/items.php:3904 msgid "Privacy group not found." msgstr "" @@ -1658,7 +1662,7 @@ msgid "Help:" msgstr "" #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90 -#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223 +#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:224 #: ../../include/nav.php:159 msgid "Help" msgstr "" @@ -1711,8 +1715,8 @@ msgstr "" msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102 -#: ../../include/nav.php:163 +#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:163 +#: ../../include/widgets.php:102 msgid "Apps" msgstr "" @@ -1816,23 +1820,23 @@ msgid "" "only once and leave this page open until finished." msgstr "" -#: ../../Zotlabs/Module/Item.php:178 +#: ../../Zotlabs/Module/Item.php:179 msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:427 +#: ../../Zotlabs/Module/Item.php:428 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:467 +#: ../../Zotlabs/Module/Item.php:468 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../Zotlabs/Module/Item.php:847 +#: ../../Zotlabs/Module/Item.php:848 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:977 +#: ../../Zotlabs/Module/Item.php:983 msgid "System error. Post not saved." msgstr "" @@ -1850,19 +1854,19 @@ msgstr "" msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267 +#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2268 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:183 +#: ../../Zotlabs/Module/Layouts.php:185 msgid "Comanche page description language help" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:187 +#: ../../Zotlabs/Module/Layouts.php:189 msgid "Layout Description" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:192 +#: ../../Zotlabs/Module/Layouts.php:194 msgid "Download PDL file" msgstr "" @@ -1894,12 +1898,12 @@ msgstr "" #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18 #: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047 -#: ../../include/network.php:2151 ../../boot.php:1705 +#: ../../include/network.php:2176 ../../boot.php:1706 msgid "Email" msgstr "" #: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20 -#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236 +#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:237 msgid "Profile Photo" msgstr "" @@ -1935,7 +1939,7 @@ msgstr "" msgid "Homepage URL" msgstr "" -#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234 +#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:235 msgid "Language" msgstr "" @@ -1985,12 +1989,12 @@ msgstr "" msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Impel.php:196 +#: ../../Zotlabs/Module/Impel.php:187 #, php-format msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Impel.php:199 +#: ../../Zotlabs/Module/Impel.php:190 #, php-format msgid "%s element installation failed" msgstr "" @@ -2031,13 +2035,13 @@ msgid "Previous action reversed." msgstr "" #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1941 #: ../../include/conversation.php:120 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/text.php:1946 ../../include/conversation.php:148 +#: ../../include/text.php:1947 ../../include/conversation.php:148 msgid "status" msgstr "" @@ -2288,7 +2292,7 @@ msgid "Subject:" msgstr "" #: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376 -#: ../../include/conversation.php:1220 +#: ../../include/conversation.php:1231 msgid "Attach file" msgstr "" @@ -2297,7 +2301,7 @@ msgid "Send" msgstr "" #: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381 -#: ../../include/conversation.php:1251 +#: ../../include/conversation.php:1266 msgid "Set expiration date" msgstr "" @@ -2405,7 +2409,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711 +#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712 msgid "Password Reset" msgstr "" @@ -2490,7 +2494,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2267 msgid "Menus" msgstr "" @@ -2557,7 +2561,7 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225 +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:226 msgid "Mood" msgstr "" @@ -2894,11 +2898,12 @@ msgid "Show Oldest First" msgstr "" #: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331 -#: ../../include/widgets.php:1499 +#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1572 msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516 +#: ../../Zotlabs/Module/Photos.php:823 +#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1589 msgid "Edit Album" msgstr "" @@ -2976,7 +2981,7 @@ msgid "I don't like this (toggle)" msgstr "" #: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397 -#: ../../include/conversation.php:740 +#: ../../include/conversation.php:743 msgid "Please wait" msgstr "" @@ -2990,55 +2995,55 @@ msgstr "" msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574 +#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574 +#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579 msgctxt "title" msgid "Might attend" msgstr "" #: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138 #: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193 -#: ../../include/conversation.php:1717 +#: ../../include/conversation.php:1732 msgid "View all" msgstr "" #: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185 -#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741 -#: ../../include/channel.php:1158 +#: ../../include/taxonomy.php:403 ../../include/conversation.php:1756 +#: ../../include/channel.php:1139 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -3046,7 +3051,7 @@ msgstr[0] "" msgstr[1] "" #: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190 -#: ../../include/conversation.php:1744 +#: ../../include/conversation.php:1759 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -3125,7 +3130,7 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../Zotlabs/Module/Page.php:133 +#: ../../Zotlabs/Module/Page.php:131 msgid "" "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " @@ -3170,8 +3175,8 @@ msgstr "" msgid "Layout Help" msgstr "" -#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226 -#: ../../include/conversation.php:960 +#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:227 +#: ../../include/conversation.php:963 msgid "Poke" msgstr "" @@ -3290,7 +3295,7 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 -#: ../../include/channel.php:959 +#: ../../include/channel.php:940 msgid "Edit visibility" msgstr "" @@ -3302,7 +3307,7 @@ msgstr "" msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930 +#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:911 msgid "Change profile photo" msgstr "" @@ -3322,8 +3327,8 @@ msgstr "" msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105 -#: ../../include/conversation.php:1526 +#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541 +#: ../../include/widgets.php:105 msgid "Personal" msgstr "" @@ -3463,12 +3468,12 @@ msgstr "" msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955 +#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:936 msgid "Profile Image" msgstr "" #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88 -#: ../../include/channel.php:937 +#: ../../include/channel.php:918 msgid "Edit Profiles" msgstr "" @@ -3490,7 +3495,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249 +#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1230 msgid "Profile" msgstr "" @@ -3502,7 +3507,7 @@ msgstr "" msgid "Visible To" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270 +#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1343 msgid "Public Hubs" msgstr "" @@ -3536,7 +3541,7 @@ msgid "Software" msgstr "" #: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103 -#: ../../include/conversation.php:959 +#: ../../include/conversation.php:962 msgid "Ratings" msgstr "" @@ -3662,7 +3667,7 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841 +#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2845 msgid "Default" msgstr "" @@ -3698,7 +3703,7 @@ msgstr "" msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382 +#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1455 msgid "Site" msgstr "" @@ -4047,7 +4052,7 @@ msgid "" "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385 +#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1458 msgid "Security" msgstr "" @@ -4214,7 +4219,7 @@ msgid "Account '%s' unblocked" msgstr "" #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044 -#: ../../include/widgets.php:1383 +#: ../../include/widgets.php:1456 msgid "Accounts" msgstr "" @@ -4320,7 +4325,7 @@ msgstr "" msgid "Channel '%s' code disallowed" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384 +#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1457 msgid "Channels" msgstr "" @@ -4340,7 +4345,7 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611 +#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626 msgid "Channel" msgstr "" @@ -4379,7 +4384,7 @@ msgid "Enable" msgstr "" #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420 -#: ../../include/widgets.php:1387 +#: ../../include/widgets.php:1460 msgid "Plugins" msgstr "" @@ -4388,8 +4393,8 @@ msgid "Toggle" msgstr "" #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615 -#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638 -#: ../../include/nav.php:208 +#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:208 +#: ../../include/widgets.php:638 msgid "Settings" msgstr "" @@ -4445,7 +4450,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330 +#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:333 msgid "Install" msgstr "" @@ -4462,7 +4467,7 @@ msgid "Install a New Plugin Repository" msgstr "" #: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77 -#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330 +#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:333 msgid "Update" msgstr "" @@ -4479,7 +4484,7 @@ msgid "Screenshot" msgstr "" #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647 -#: ../../include/widgets.php:1388 +#: ../../include/widgets.php:1461 msgid "Themes" msgstr "" @@ -4495,8 +4500,8 @@ msgstr "" msgid "Log settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409 -#: ../../include/widgets.php:1419 +#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1482 +#: ../../include/widgets.php:1492 msgid "Logs" msgstr "" @@ -4562,7 +4567,7 @@ msgstr "" msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390 +#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1463 msgid "Profile Fields" msgstr "" @@ -4745,7 +4750,7 @@ msgid "Membership on this site is by invitation only." msgstr "" #: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147 -#: ../../boot.php:1685 +#: ../../boot.php:1686 msgid "Register" msgstr "" @@ -5172,7 +5177,7 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140 +#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1121 msgid "Full Name:" msgstr "" @@ -5993,8 +5998,8 @@ msgstr "" msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630 -#: ../../include/features.php:71 +#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:71 +#: ../../include/widgets.php:630 msgid "Channel Sources" msgstr "" @@ -6070,11 +6075,11 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256 +#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263 msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1949 #: ../../include/conversation.php:150 msgid "comment" msgstr "" @@ -6228,20 +6233,20 @@ msgstr "" msgid "Source of Item" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217 -#: ../../include/nav.php:106 ../../include/conversation.php:1685 +#: ../../Zotlabs/Module/Webpages.php:192 ../../Zotlabs/Lib/Apps.php:217 +#: ../../include/conversation.php:1700 ../../include/nav.php:106 msgid "Webpages" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41 +#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:44 msgid "Actions" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42 +#: ../../Zotlabs/Module/Webpages.php:204 ../../include/page_widgets.php:45 msgid "Page Link" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:197 +#: ../../Zotlabs/Module/Webpages.php:205 msgid "Page Title" msgstr "" @@ -6253,90 +6258,24 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../Zotlabs/Lib/Apps.php:204 -msgid "Site Admin" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:205 -msgid "Bug Report" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:206 -msgid "View Bookmarks" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:207 -msgid "My Chatrooms" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:209 -msgid "Firefox Share" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:210 -msgid "Remote Diagnostics" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89 -msgid "Suggest Channels" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110 -#: ../../boot.php:1703 -msgid "Login" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179 -msgid "Grid" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182 -msgid "Channel Home" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201 -#: ../../include/conversation.php:1649 ../../include/conversation.php:1652 -msgid "Events" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167 -msgid "Directory" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193 -msgid "Mail" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96 -msgid "Chat" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:229 -msgid "Probe" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:230 -msgid "Suggest" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:231 -msgid "Random Channel" +#: ../../Zotlabs/Module/Wiki.php:75 ../../Zotlabs/Lib/Apps.php:218 +msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:232 -msgid "Invite" +#: ../../Zotlabs/Module/Wiki.php:76 +msgid "Sandbox" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386 -msgid "Features" +#: ../../Zotlabs/Module/Wiki.php:156 +msgid "Enter the name of your new wiki:" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:235 -msgid "Post" +#: ../../Zotlabs/Module/Wiki.php:157 +msgid "Enter the name of the new page:" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:335 -msgid "Purchase" +#: ../../Zotlabs/Module/Wiki.php:158 +msgid "Enter the new name:" msgstr "" #: ../../Zotlabs/Lib/Chatroom.php:27 @@ -6359,19 +6298,19 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823 +#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1848 msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824 +#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1849 msgid "$projectname" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826 +#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1851 msgid "Thank You," msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828 +#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1853 #, php-format msgid "%s Administrator" msgstr "" @@ -6563,11 +6502,11 @@ msgstr "" msgid "commented on %s's post" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664 +#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667 msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656 +#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659 msgid "Select" msgstr "" @@ -6615,11 +6554,11 @@ msgstr "" msgid "starred" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671 +#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674 msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672 +#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675 msgid "Message signature incorrect" msgstr "" @@ -6675,17 +6614,17 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719 +#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722 +#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723 +#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726 #, php-format msgid "Expires: %s" msgstr "" @@ -6706,23 +6645,23 @@ msgstr "" msgid "[+] show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215 +#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216 +#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217 +#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218 +#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219 +#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230 msgid "Code" msgstr "" @@ -6738,173 +6677,172 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/Import/import_diaspora.php:16 -msgid "No username found in import file." +#: ../../Zotlabs/Lib/Apps.php:204 +msgid "Site Admin" msgstr "" -#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50 -msgid "Unable to create a unique channel address. Import failed." +#: ../../Zotlabs/Lib/Apps.php:205 +msgid "Bug Report" msgstr "" -#: ../../include/dba/dba_driver.php:171 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" +#: ../../Zotlabs/Lib/Apps.php:206 +msgid "View Bookmarks" msgstr "" -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/widgets.php:46 ../../include/widgets.php:429 -#: ../../include/contact_widgets.php:91 -msgid "Categories" +#: ../../Zotlabs/Lib/Apps.php:207 +msgid "My Chatrooms" msgstr "" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" +#: ../../Zotlabs/Lib/Apps.php:209 +msgid "Firefox Share" msgstr "" -#: ../../include/taxonomy.php:293 -msgid "Keywords" +#: ../../Zotlabs/Lib/Apps.php:210 +msgid "Remote Diagnostics" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "have" +#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89 +msgid "Suggest Channels" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "has" +#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110 +#: ../../boot.php:1704 +msgid "Login" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "want" +#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179 +msgid "Grid" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "wants" +#: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:182 +msgid "Channel Home" msgstr "" -#: ../../include/taxonomy.php:316 -msgid "likes" +#: ../../Zotlabs/Lib/Apps.php:222 ../../include/conversation.php:1664 +#: ../../include/conversation.php:1667 ../../include/nav.php:201 +msgid "Events" msgstr "" -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:167 +msgid "Directory" msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 -#: ../../include/bb2diaspora.php:485 -msgid "l F d, Y \\@ g:i A" +#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:193 +msgid "Mail" msgstr "" -#: ../../include/event.php:30 ../../include/event.php:73 -#: ../../include/bb2diaspora.php:491 -msgid "Starts:" +#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:96 +msgid "Chat" msgstr "" -#: ../../include/event.php:40 ../../include/event.php:77 -#: ../../include/bb2diaspora.php:499 -msgid "Finishes:" +#: ../../Zotlabs/Lib/Apps.php:230 +msgid "Probe" msgstr "" -#: ../../include/event.php:812 -msgid "This event has been added to your calendar." +#: ../../Zotlabs/Lib/Apps.php:231 +msgid "Suggest" msgstr "" -#: ../../include/event.php:1012 -msgid "Not specified" +#: ../../Zotlabs/Lib/Apps.php:232 +msgid "Random Channel" msgstr "" -#: ../../include/event.php:1013 -msgid "Needs Action" +#: ../../Zotlabs/Lib/Apps.php:233 +msgid "Invite" msgstr "" -#: ../../include/event.php:1014 -msgid "Completed" +#: ../../Zotlabs/Lib/Apps.php:234 ../../include/widgets.php:1459 +msgid "Features" msgstr "" -#: ../../include/event.php:1015 -msgid "In Process" +#: ../../Zotlabs/Lib/Apps.php:236 +msgid "Post" msgstr "" -#: ../../include/event.php:1016 -msgid "Cancelled" +#: ../../Zotlabs/Lib/Apps.php:338 +msgid "Purchase" msgstr "" -#: ../../include/import.php:29 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../include/Import/import_diaspora.php:16 +msgid "No username found in import file." msgstr "" -#: ../../include/import.php:76 -msgid "Channel clone failed. Import failed." +#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50 +msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/items.php:892 ../../include/items.php:937 -msgid "(Unknown)" +#: ../../include/dba/dba_driver.php:171 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/items.php:1136 -msgid "Visible to anybody on the internet." +#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 +#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 +#: ../../include/widgets.php:429 +msgid "Categories" msgstr "" -#: ../../include/items.php:1138 -msgid "Visible to you only." +#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +msgid "Tags" msgstr "" -#: ../../include/items.php:1140 -msgid "Visible to anybody in this network." +#: ../../include/taxonomy.php:293 +msgid "Keywords" msgstr "" -#: ../../include/items.php:1142 -msgid "Visible to anybody authenticated." +#: ../../include/taxonomy.php:314 +msgid "have" msgstr "" -#: ../../include/items.php:1144 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/taxonomy.php:314 +msgid "has" msgstr "" -#: ../../include/items.php:1146 -msgid "Visible to all connections." +#: ../../include/taxonomy.php:315 +msgid "want" msgstr "" -#: ../../include/items.php:1148 -msgid "Visible to approved connections." +#: ../../include/taxonomy.php:315 +msgid "wants" msgstr "" -#: ../../include/items.php:1150 -msgid "Visible to specific connections." +#: ../../include/taxonomy.php:316 +msgid "likes" msgstr "" -#: ../../include/items.php:3909 -msgid "Privacy group is empty." +#: ../../include/taxonomy.php:317 +msgid "dislikes" msgstr "" -#: ../../include/items.php:3916 +#: ../../include/photos.php:114 #, php-format -msgid "Privacy group: %s" +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/items.php:3928 -msgid "Connection not found." +#: ../../include/photos.php:121 +msgid "Image file is empty." msgstr "" -#: ../../include/items.php:4277 -msgid "profile photo" +#: ../../include/photos.php:259 +msgid "Photo storage failed." msgstr "" -#: ../../include/message.php:20 -msgid "No recipient provided." +#: ../../include/photos.php:299 +msgid "a new photo" msgstr "" -#: ../../include/message.php:25 -msgid "[no subject]" +#: ../../include/photos.php:303 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/photos.php:506 ../../include/conversation.php:1650 +msgid "Photo Albums" msgstr "" -#: ../../include/message.php:222 -msgid "Stored post could not be verified." +#: ../../include/photos.php:510 +msgid "Upload New Photos" msgstr "" #: ../../include/text.php:428 @@ -7165,298 +7103,396 @@ msgstr "" msgid "remove from file" msgstr "" -#: ../../include/text.php:1753 ../../include/text.php:1824 +#: ../../include/text.php:1754 ../../include/text.php:1825 msgid "default" msgstr "" -#: ../../include/text.php:1761 +#: ../../include/text.php:1762 msgid "Page layout" msgstr "" -#: ../../include/text.php:1761 +#: ../../include/text.php:1762 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1803 +#: ../../include/text.php:1804 msgid "Page content type" msgstr "" -#: ../../include/text.php:1836 +#: ../../include/text.php:1837 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1953 +#: ../../include/text.php:1954 msgid "activity" msgstr "" -#: ../../include/text.php:2262 +#: ../../include/text.php:2263 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2268 +#: ../../include/text.php:2269 msgid "Pages" msgstr "" -#: ../../include/widgets.php:103 -msgid "System" +#: ../../include/event.php:22 ../../include/event.php:69 +#: ../../include/bb2diaspora.php:485 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/widgets.php:106 -msgid "New App" +#: ../../include/event.php:30 ../../include/event.php:73 +#: ../../include/bb2diaspora.php:491 +msgid "Starts:" msgstr "" -#: ../../include/widgets.php:154 -msgid "Suggestions" +#: ../../include/event.php:40 ../../include/event.php:77 +#: ../../include/bb2diaspora.php:499 +msgid "Finishes:" msgstr "" -#: ../../include/widgets.php:155 -msgid "See more..." +#: ../../include/event.php:812 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/widgets.php:175 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +#: ../../include/event.php:1012 +msgid "Not specified" msgstr "" -#: ../../include/widgets.php:181 -msgid "Add New Connection" +#: ../../include/event.php:1013 +msgid "Needs Action" msgstr "" -#: ../../include/widgets.php:182 -msgid "Enter channel address" +#: ../../include/event.php:1014 +msgid "Completed" msgstr "" -#: ../../include/widgets.php:183 -msgid "Examples: bob@example.com, https://example.com/barbara" +#: ../../include/event.php:1015 +msgid "In Process" msgstr "" -#: ../../include/widgets.php:199 -msgid "Notes" +#: ../../include/event.php:1016 +msgid "Cancelled" msgstr "" -#: ../../include/widgets.php:273 -msgid "Remove term" +#: ../../include/message.php:20 +msgid "No recipient provided." msgstr "" -#: ../../include/widgets.php:281 ../../include/features.php:84 -msgid "Saved Searches" +#: ../../include/message.php:25 +msgid "[no subject]" msgstr "" -#: ../../include/widgets.php:282 ../../include/group.php:316 -msgid "add" +#: ../../include/message.php:45 +msgid "Unable to determine sender." msgstr "" -#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53 -#: ../../include/features.php:98 -msgid "Saved Folders" +#: ../../include/message.php:222 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/widgets.php:313 ../../include/widgets.php:432 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -msgid "Everything" +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/widgets.php:354 -msgid "Archives" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/widgets.php:516 -msgid "Refresh" +#: ../../include/conversation.php:694 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/widgets.php:556 -msgid "Account settings" +#: ../../include/conversation.php:713 +msgid "Categories:" msgstr "" -#: ../../include/widgets.php:562 -msgid "Channel settings" +#: ../../include/conversation.php:714 +msgid "Filed under:" msgstr "" -#: ../../include/widgets.php:571 -msgid "Additional features" +#: ../../include/conversation.php:741 +msgid "View in context" msgstr "" -#: ../../include/widgets.php:578 -msgid "Feature/Addon settings" +#: ../../include/conversation.php:850 +msgid "remove" msgstr "" -#: ../../include/widgets.php:584 -msgid "Display settings" +#: ../../include/conversation.php:854 ../../include/nav.php:247 +msgid "Loading..." msgstr "" -#: ../../include/widgets.php:591 -msgid "Manage locations" +#: ../../include/conversation.php:855 +msgid "Delete Selected Items" msgstr "" -#: ../../include/widgets.php:600 -msgid "Export channel" +#: ../../include/conversation.php:951 +msgid "View Source" msgstr "" -#: ../../include/widgets.php:607 -msgid "Connected apps" +#: ../../include/conversation.php:952 +msgid "Follow Thread" msgstr "" -#: ../../include/widgets.php:622 -msgid "Premium Channel Settings" +#: ../../include/conversation.php:953 +msgid "Unfollow Thread" msgstr "" -#: ../../include/widgets.php:651 -msgid "Private Mail Menu" +#: ../../include/conversation.php:958 +msgid "Activity/Posts" msgstr "" -#: ../../include/widgets.php:653 -msgid "Combined View" +#: ../../include/conversation.php:960 +msgid "Edit Connection" msgstr "" -#: ../../include/widgets.php:658 ../../include/nav.php:196 -msgid "Inbox" +#: ../../include/conversation.php:961 +msgid "Message" msgstr "" -#: ../../include/widgets.php:663 ../../include/nav.php:197 -msgid "Outbox" +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/widgets.php:668 ../../include/nav.php:198 -msgid "New Message" +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/widgets.php:685 ../../include/widgets.php:697 -msgid "Conversations" +#: ../../include/conversation.php:1082 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1084 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1090 +msgid "and" msgstr "" -#: ../../include/widgets.php:689 -msgid "Received Messages" +#: ../../include/conversation.php:1093 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/widgets.php:693 -msgid "Sent Messages" +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../include/widgets.php:707 -msgid "No messages." +#: ../../include/conversation.php:1133 +msgid "Set your location" msgstr "" -#: ../../include/widgets.php:725 -msgid "Delete conversation" +#: ../../include/conversation.php:1134 +msgid "Clear browser location" msgstr "" -#: ../../include/widgets.php:751 -msgid "Events Menu" +#: ../../include/conversation.php:1150 +msgid "Embed image from photo albums" msgstr "" -#: ../../include/widgets.php:752 -msgid "Day View" +#: ../../include/conversation.php:1182 +msgid "Tag term:" msgstr "" -#: ../../include/widgets.php:753 -msgid "Week View" +#: ../../include/conversation.php:1183 +msgid "Where are you right now?" msgstr "" -#: ../../include/widgets.php:754 -msgid "Month View" +#: ../../include/conversation.php:1186 +msgid "Choose images to embed" msgstr "" -#: ../../include/widgets.php:766 -msgid "Events Tools" +#: ../../include/conversation.php:1187 +msgid "Choose an album" msgstr "" -#: ../../include/widgets.php:767 -msgid "Export Calendar" +#: ../../include/conversation.php:1188 +msgid "Choose a different album..." msgstr "" -#: ../../include/widgets.php:768 -msgid "Import Calendar" +#: ../../include/conversation.php:1189 +msgid "Error getting album list" msgstr "" -#: ../../include/widgets.php:842 ../../include/conversation.php:1662 -#: ../../include/conversation.php:1665 -msgid "Chatrooms" +#: ../../include/conversation.php:1190 +msgid "Error getting photo link" msgstr "" -#: ../../include/widgets.php:846 -msgid "Overview" +#: ../../include/conversation.php:1191 +msgid "Error getting album" msgstr "" -#: ../../include/widgets.php:853 -msgid "Chat Members" +#: ../../include/conversation.php:1221 +msgid "Page link name" msgstr "" -#: ../../include/widgets.php:876 -msgid "Bookmarked Chatrooms" +#: ../../include/conversation.php:1224 +msgid "Post as" msgstr "" -#: ../../include/widgets.php:899 -msgid "Suggested Chatrooms" +#: ../../include/conversation.php:1234 +msgid "Embed an image from your albums" msgstr "" -#: ../../include/widgets.php:1044 ../../include/widgets.php:1156 -msgid "photo/image" +#: ../../include/conversation.php:1236 ../../include/conversation.php:1273 +msgid "OK" msgstr "" -#: ../../include/widgets.php:1099 -msgid "Click to show more" +#: ../../include/conversation.php:1238 +msgid "Toggle voting" msgstr "" -#: ../../include/widgets.php:1250 -msgid "Rating Tools" +#: ../../include/conversation.php:1246 +msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/widgets.php:1254 ../../include/widgets.php:1256 -msgid "Rate Me" +#: ../../include/conversation.php:1269 +msgid "Set publish date" msgstr "" -#: ../../include/widgets.php:1259 -msgid "View Ratings" +#: ../../include/conversation.php:1518 +msgid "Discover" msgstr "" -#: ../../include/widgets.php:1316 -msgid "Forums" +#: ../../include/conversation.php:1521 +msgid "Imported public streams" msgstr "" -#: ../../include/widgets.php:1345 -msgid "Tasks" +#: ../../include/conversation.php:1526 +msgid "Commented Order" msgstr "" -#: ../../include/widgets.php:1354 -msgid "Documentation" +#: ../../include/conversation.php:1529 +msgid "Sort by Comment Date" msgstr "" -#: ../../include/widgets.php:1356 -msgid "Project/Site Information" +#: ../../include/conversation.php:1533 +msgid "Posted Order" msgstr "" -#: ../../include/widgets.php:1357 -msgid "For Members" +#: ../../include/conversation.php:1536 +msgid "Sort by Post Date" msgstr "" -#: ../../include/widgets.php:1358 -msgid "For Administrators" +#: ../../include/conversation.php:1544 +msgid "Posts that mention or involve you" msgstr "" -#: ../../include/widgets.php:1359 -msgid "For Developers" +#: ../../include/conversation.php:1553 +msgid "Activity Stream - by date" msgstr "" -#: ../../include/widgets.php:1383 ../../include/widgets.php:1421 -msgid "Member registrations waiting for confirmation" +#: ../../include/conversation.php:1559 +msgid "Starred" msgstr "" -#: ../../include/widgets.php:1389 -msgid "Inspect queue" +#: ../../include/conversation.php:1562 +msgid "Favourite Posts" msgstr "" -#: ../../include/widgets.php:1391 -msgid "DB updates" +#: ../../include/conversation.php:1569 +msgid "Spam" msgstr "" -#: ../../include/widgets.php:1416 ../../include/nav.php:216 -msgid "Admin" +#: ../../include/conversation.php:1572 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/widgets.php:1417 -msgid "Plugin Features" +#: ../../include/conversation.php:1629 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../include/conversation.php:1638 +msgid "About" +msgstr "" + +#: ../../include/conversation.php:1641 +msgid "Profile Details" msgstr "" +#: ../../include/conversation.php:1657 +msgid "Files and Storage" +msgstr "" + +#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 +#: ../../include/widgets.php:842 +msgid "Chatrooms" +msgstr "" + +#: ../../include/conversation.php:1690 ../../include/nav.php:102 +msgid "Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1693 +msgid "Saved Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1703 +msgid "Manage Webpages" +msgstr "" + +#: ../../include/conversation.php:1762 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1765 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1768 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1771 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1774 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1777 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + #: ../../include/follow.php:27 msgid "Channel is blocked on this site." msgstr "" @@ -7485,26 +7521,17 @@ msgstr "" msgid "Cannot connect to yourself." msgstr "" -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" -msgstr "" - -#: ../../include/api.php:1336 -msgid "Public Timeline" -msgstr "" - -#: ../../include/bbcode.php:123 ../../include/bbcode.php:844 -#: ../../include/bbcode.php:847 ../../include/bbcode.php:852 -#: ../../include/bbcode.php:855 ../../include/bbcode.php:858 -#: ../../include/bbcode.php:861 ../../include/bbcode.php:866 +#: ../../include/bbcode.php:123 ../../include/bbcode.php:866 #: ../../include/bbcode.php:869 ../../include/bbcode.php:874 #: ../../include/bbcode.php:877 ../../include/bbcode.php:880 -#: ../../include/bbcode.php:883 +#: ../../include/bbcode.php:883 ../../include/bbcode.php:888 +#: ../../include/bbcode.php:891 ../../include/bbcode.php:896 +#: ../../include/bbcode.php:899 ../../include/bbcode.php:902 +#: ../../include/bbcode.php:905 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:162 ../../include/bbcode.php:894 +#: ../../include/bbcode.php:162 ../../include/bbcode.php:916 msgid "Encrypted content" msgstr "" @@ -7520,27 +7547,32 @@ msgid "" "to install it on this site." msgstr "" -#: ../../include/bbcode.php:254 +#: ../../include/bbcode.php:261 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:331 ../../include/bbcode.php:339 +#: ../../include/bbcode.php:338 ../../include/bbcode.php:346 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:339 +#: ../../include/bbcode.php:346 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:585 +#: ../../include/bbcode.php:607 msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/bbcode.php:832 +#: ../../include/bbcode.php:854 msgid "$1 wrote:" msgstr "" +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" +msgstr "" + #: ../../include/dir_fns.php:141 msgid "Directory Options" msgstr "" @@ -7557,13 +7589,30 @@ msgstr "" msgid "This Website Only" msgstr "" +#: ../../include/zot.php:709 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:725 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:2373 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + +#: ../../include/zot.php:3722 +msgid "invalid target signature" +msgstr "" + #: ../../include/security.php:383 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:82 ../../include/nav.php:113 ../../boot.php:1702 +#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1703 msgid "Logout" msgstr "" @@ -7587,7 +7636,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:90 ../../include/channel.php:941 +#: ../../include/nav.php:90 ../../include/channel.php:922 msgid "Edit Profile" msgstr "" @@ -7607,10 +7656,6 @@ msgstr "" msgid "Your chatrooms" msgstr "" -#: ../../include/nav.php:102 ../../include/conversation.php:1675 -msgid "Bookmarks" -msgstr "" - #: ../../include/nav.php:102 msgid "Your bookmarks" msgstr "" @@ -7700,362 +7745,109 @@ msgstr "" msgid "Mark all private messages seen" msgstr "" -#: ../../include/nav.php:201 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:202 -msgid "See all events" -msgstr "" - -#: ../../include/nav.php:203 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:206 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:208 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:216 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:247 ../../include/conversation.php:851 -msgid "Loading..." -msgstr "" - -#: ../../include/nav.php:252 -msgid "@name, #tag, ?doc, content" -msgstr "" - -#: ../../include/nav.php:253 -msgid "Please wait..." -msgstr "" - -#: ../../include/connections.php:95 -msgid "New window" -msgstr "" - -#: ../../include/connections.php:96 -msgid "Open the selected location in a different window or browser tab" -msgstr "" - -#: ../../include/connections.php:214 -#, php-format -msgid "User '%s' deleted" -msgstr "" - -#: ../../include/contact_widgets.php:11 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:19 -msgid "Find Channels" -msgstr "" - -#: ../../include/contact_widgets.php:20 -msgid "Enter name or interest" -msgstr "" - -#: ../../include/contact_widgets.php:21 -msgid "Connect/Follow" -msgstr "" - -#: ../../include/contact_widgets.php:22 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: ../../include/contact_widgets.php:26 -msgid "Random Profile" -msgstr "" - -#: ../../include/contact_widgets.php:27 -msgid "Invite Friends" -msgstr "" - -#: ../../include/contact_widgets.php:29 -msgid "Advanced example: name=fred and country=iceland" -msgstr "" - -#: ../../include/contact_widgets.php:122 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:127 -msgid "show more" -msgstr "" - -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: ../../include/conversation.php:691 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:710 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:711 -msgid "Filed under:" -msgstr "" - -#: ../../include/conversation.php:738 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:847 -msgid "remove" -msgstr "" - -#: ../../include/conversation.php:852 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:948 -msgid "View Source" -msgstr "" - -#: ../../include/conversation.php:949 -msgid "Follow Thread" -msgstr "" - -#: ../../include/conversation.php:950 -msgid "Unfollow Thread" -msgstr "" - -#: ../../include/conversation.php:955 -msgid "Activity/Posts" -msgstr "" - -#: ../../include/conversation.php:957 -msgid "Edit Connection" -msgstr "" - -#: ../../include/conversation.php:958 -msgid "Message" -msgstr "" - -#: ../../include/conversation.php:1075 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:1075 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: ../../include/conversation.php:1079 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1081 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1087 -msgid "and" -msgstr "" - -#: ../../include/conversation.php:1090 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1091 -#, php-format -msgid "%s like this." -msgstr "" - -#: ../../include/conversation.php:1091 -#, php-format -msgid "%s don't like this." -msgstr "" - -#: ../../include/conversation.php:1130 -msgid "Set your location" -msgstr "" - -#: ../../include/conversation.php:1131 -msgid "Clear browser location" -msgstr "" - -#: ../../include/conversation.php:1177 -msgid "Tag term:" -msgstr "" - -#: ../../include/conversation.php:1178 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:1210 -msgid "Page link name" -msgstr "" - -#: ../../include/conversation.php:1213 -msgid "Post as" -msgstr "" - -#: ../../include/conversation.php:1223 -msgid "Toggle voting" -msgstr "" - -#: ../../include/conversation.php:1231 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: ../../include/conversation.php:1254 -msgid "Set publish date" -msgstr "" - -#: ../../include/conversation.php:1258 -msgid "OK" -msgstr "" - -#: ../../include/conversation.php:1503 -msgid "Discover" -msgstr "" - -#: ../../include/conversation.php:1506 -msgid "Imported public streams" -msgstr "" - -#: ../../include/conversation.php:1511 -msgid "Commented Order" +#: ../../include/nav.php:196 ../../include/widgets.php:658 +msgid "Inbox" msgstr "" -#: ../../include/conversation.php:1514 -msgid "Sort by Comment Date" +#: ../../include/nav.php:197 ../../include/widgets.php:663 +msgid "Outbox" msgstr "" -#: ../../include/conversation.php:1518 -msgid "Posted Order" +#: ../../include/nav.php:198 ../../include/widgets.php:668 +msgid "New Message" msgstr "" -#: ../../include/conversation.php:1521 -msgid "Sort by Post Date" +#: ../../include/nav.php:201 +msgid "Event Calendar" msgstr "" -#: ../../include/conversation.php:1529 -msgid "Posts that mention or involve you" +#: ../../include/nav.php:202 +msgid "See all events" msgstr "" -#: ../../include/conversation.php:1538 -msgid "Activity Stream - by date" +#: ../../include/nav.php:203 +msgid "Mark all events seen" msgstr "" -#: ../../include/conversation.php:1544 -msgid "Starred" +#: ../../include/nav.php:206 +msgid "Manage Your Channels" msgstr "" -#: ../../include/conversation.php:1547 -msgid "Favourite Posts" +#: ../../include/nav.php:208 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/conversation.php:1554 -msgid "Spam" +#: ../../include/nav.php:216 ../../include/widgets.php:1489 +msgid "Admin" msgstr "" -#: ../../include/conversation.php:1557 -msgid "Posts flagged as SPAM" +#: ../../include/nav.php:216 +msgid "Site Setup and Configuration" msgstr "" -#: ../../include/conversation.php:1614 -msgid "Status Messages and Posts" +#: ../../include/nav.php:252 +msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/conversation.php:1623 -msgid "About" +#: ../../include/nav.php:253 +msgid "Please wait..." msgstr "" -#: ../../include/conversation.php:1626 -msgid "Profile Details" +#: ../../include/contact_widgets.php:11 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:19 +msgid "Find Channels" msgstr "" -#: ../../include/conversation.php:1635 ../../include/photos.php:502 -msgid "Photo Albums" +#: ../../include/contact_widgets.php:20 +msgid "Enter name or interest" msgstr "" -#: ../../include/conversation.php:1642 -msgid "Files and Storage" +#: ../../include/contact_widgets.php:21 +msgid "Connect/Follow" msgstr "" -#: ../../include/conversation.php:1678 -msgid "Saved Bookmarks" +#: ../../include/contact_widgets.php:22 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/conversation.php:1688 -msgid "Manage Webpages" +#: ../../include/contact_widgets.php:26 +msgid "Random Profile" msgstr "" -#: ../../include/conversation.php:1747 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" +#: ../../include/contact_widgets.php:27 +msgid "Invite Friends" +msgstr "" -#: ../../include/conversation.php:1750 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" +#: ../../include/contact_widgets.php:29 +msgid "Advanced example: name=fred and country=iceland" +msgstr "" -#: ../../include/conversation.php:1753 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" +#: ../../include/contact_widgets.php:53 ../../include/features.php:98 +#: ../../include/widgets.php:310 +msgid "Saved Folders" +msgstr "" -#: ../../include/conversation.php:1756 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +#: ../../include/widgets.php:313 ../../include/widgets.php:432 +msgid "Everything" +msgstr "" -#: ../../include/conversation.php:1759 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" +#: ../../include/contact_widgets.php:122 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1762 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" +#: ../../include/contact_widgets.php:127 +msgid "show more" +msgstr "" #: ../../include/selectors.php:30 msgid "Frequently" @@ -8171,136 +7963,290 @@ msgstr "" msgid "Deviant" msgstr "" -#: ../../include/selectors.php:85 -msgid "Fetish" +#: ../../include/selectors.php:85 +msgid "Fetish" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Oodles" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Nonsexual" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Single" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Lonely" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Available" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Unavailable" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Has crush" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Infatuated" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Dating" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Unfaithful" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Sex Addict" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Friends/Benefits" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Casual" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Engaged" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Married" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Imaginarily married" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Partners" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Cohabiting" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Common law" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Happy" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Not looking" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Swinger" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Betrayed" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Separated" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Unstable" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Divorced" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Imaginarily divorced" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Widowed" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Uncertain" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "It's complicated" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Don't care" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Ask me" +msgstr "" + +#: ../../include/channel.php:32 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/channel.php:66 +msgid "Empty name" +msgstr "" + +#: ../../include/channel.php:69 +msgid "Name too long" +msgstr "" + +#: ../../include/channel.php:180 +msgid "No account identifier" +msgstr "" + +#: ../../include/channel.php:192 +msgid "Nickname is required." +msgstr "" + +#: ../../include/channel.php:206 +msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/selectors.php:85 -msgid "Oodles" +#: ../../include/channel.php:211 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/selectors.php:85 -msgid "Nonsexual" +#: ../../include/channel.php:287 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Single" +#: ../../include/channel.php:345 +msgid "Default Profile" msgstr "" -#: ../../include/selectors.php:123 -msgid "Lonely" +#: ../../include/channel.php:772 +msgid "Requested channel is not available." msgstr "" -#: ../../include/selectors.php:123 -msgid "Available" +#: ../../include/channel.php:919 +msgid "Create New Profile" msgstr "" -#: ../../include/selectors.php:123 -msgid "Unavailable" +#: ../../include/channel.php:939 +msgid "Visible to everybody" msgstr "" -#: ../../include/selectors.php:123 -msgid "Has crush" +#: ../../include/channel.php:1012 ../../include/channel.php:1123 +msgid "Gender:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Infatuated" +#: ../../include/channel.php:1013 ../../include/channel.php:1167 +msgid "Status:" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Dating" +#: ../../include/channel.php:1014 ../../include/channel.php:1178 +msgid "Homepage:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Unfaithful" +#: ../../include/channel.php:1015 +msgid "Online Now" msgstr "" -#: ../../include/selectors.php:123 -msgid "Sex Addict" +#: ../../include/channel.php:1128 +msgid "Like this channel" msgstr "" -#: ../../include/selectors.php:123 -msgid "Friends/Benefits" +#: ../../include/channel.php:1152 +msgid "j F, Y" msgstr "" -#: ../../include/selectors.php:123 -msgid "Casual" +#: ../../include/channel.php:1153 +msgid "j F" msgstr "" -#: ../../include/selectors.php:123 -msgid "Engaged" +#: ../../include/channel.php:1160 +msgid "Birthday:" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Married" +#: ../../include/channel.php:1173 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../include/selectors.php:123 -msgid "Imaginarily married" +#: ../../include/channel.php:1176 +msgid "Sexual Preference:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Partners" +#: ../../include/channel.php:1182 +msgid "Tags:" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Cohabiting" +#: ../../include/channel.php:1184 +msgid "Political Views:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Common law" +#: ../../include/channel.php:1186 +msgid "Religion:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Happy" +#: ../../include/channel.php:1190 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Not looking" +#: ../../include/channel.php:1192 +msgid "Likes:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Swinger" +#: ../../include/channel.php:1194 +msgid "Dislikes:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Betrayed" +#: ../../include/channel.php:1196 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Separated" +#: ../../include/channel.php:1198 +msgid "My other channels:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Unstable" +#: ../../include/channel.php:1200 +msgid "Musical interests:" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Divorced" +#: ../../include/channel.php:1202 +msgid "Books, literature:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Imaginarily divorced" +#: ../../include/channel.php:1204 +msgid "Television:" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Widowed" +#: ../../include/channel.php:1206 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Uncertain" +#: ../../include/channel.php:1208 +msgid "Love/Romance:" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "It's complicated" +#: ../../include/channel.php:1210 +msgid "Work/employment:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Don't care" +#: ../../include/channel.php:1212 +msgid "School/education:" msgstr "" -#: ../../include/selectors.php:123 -msgid "Ask me" +#: ../../include/channel.php:1232 +msgid "Like this thing" msgstr "" #: ../../include/PermissionDescription.php:31 @@ -8405,7 +8351,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1871 +#: ../../include/account.php:404 ../../include/network.php:1896 msgid "Administrator" msgstr "" @@ -8447,218 +8393,64 @@ msgstr "" msgid "Item was not found." msgstr "" -#: ../../include/attach.php:497 +#: ../../include/attach.php:499 msgid "No source file." msgstr "" -#: ../../include/attach.php:519 +#: ../../include/attach.php:521 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:537 +#: ../../include/attach.php:539 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:672 +#: ../../include/attach.php:674 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:686 +#: ../../include/attach.php:688 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:842 +#: ../../include/attach.php:846 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:855 +#: ../../include/attach.php:859 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:909 ../../include/attach.php:925 +#: ../../include/attach.php:915 ../../include/attach.php:931 msgid "Path not available." msgstr "" -#: ../../include/attach.php:971 ../../include/attach.php:1123 +#: ../../include/attach.php:977 ../../include/attach.php:1129 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:997 +#: ../../include/attach.php:1003 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1019 +#: ../../include/attach.php:1025 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1077 +#: ../../include/attach.php:1083 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1081 +#: ../../include/attach.php:1087 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1129 +#: ../../include/attach.php:1135 msgid "Empty path" msgstr "" -#: ../../include/channel.php:32 -msgid "Unable to obtain identity information from database" -msgstr "" - -#: ../../include/channel.php:66 -msgid "Empty name" -msgstr "" - -#: ../../include/channel.php:69 -msgid "Name too long" -msgstr "" - -#: ../../include/channel.php:180 -msgid "No account identifier" -msgstr "" - -#: ../../include/channel.php:192 -msgid "Nickname is required." -msgstr "" - -#: ../../include/channel.php:206 -msgid "Reserved nickname. Please choose another." -msgstr "" - -#: ../../include/channel.php:211 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: ../../include/channel.php:287 -msgid "Unable to retrieve created identity" -msgstr "" - -#: ../../include/channel.php:345 -msgid "Default Profile" -msgstr "" - -#: ../../include/channel.php:791 -msgid "Requested channel is not available." -msgstr "" - -#: ../../include/channel.php:938 -msgid "Create New Profile" -msgstr "" - -#: ../../include/channel.php:958 -msgid "Visible to everybody" -msgstr "" - -#: ../../include/channel.php:1031 ../../include/channel.php:1142 -msgid "Gender:" -msgstr "" - -#: ../../include/channel.php:1032 ../../include/channel.php:1186 -msgid "Status:" -msgstr "" - -#: ../../include/channel.php:1033 ../../include/channel.php:1197 -msgid "Homepage:" -msgstr "" - -#: ../../include/channel.php:1034 -msgid "Online Now" -msgstr "" - -#: ../../include/channel.php:1147 -msgid "Like this channel" -msgstr "" - -#: ../../include/channel.php:1171 -msgid "j F, Y" -msgstr "" - -#: ../../include/channel.php:1172 -msgid "j F" -msgstr "" - -#: ../../include/channel.php:1179 -msgid "Birthday:" -msgstr "" - -#: ../../include/channel.php:1192 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../include/channel.php:1195 -msgid "Sexual Preference:" -msgstr "" - -#: ../../include/channel.php:1201 -msgid "Tags:" -msgstr "" - -#: ../../include/channel.php:1203 -msgid "Political Views:" -msgstr "" - -#: ../../include/channel.php:1205 -msgid "Religion:" -msgstr "" - -#: ../../include/channel.php:1209 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/channel.php:1211 -msgid "Likes:" -msgstr "" - -#: ../../include/channel.php:1213 -msgid "Dislikes:" -msgstr "" - -#: ../../include/channel.php:1215 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/channel.php:1217 -msgid "My other channels:" -msgstr "" - -#: ../../include/channel.php:1219 -msgid "Musical interests:" -msgstr "" - -#: ../../include/channel.php:1221 -msgid "Books, literature:" -msgstr "" - -#: ../../include/channel.php:1223 -msgid "Television:" -msgstr "" - -#: ../../include/channel.php:1225 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../include/channel.php:1227 -msgid "Love/Romance:" -msgstr "" - -#: ../../include/channel.php:1229 -msgid "Work/employment:" -msgstr "" - -#: ../../include/channel.php:1231 -msgid "School/education:" -msgstr "" - -#: ../../include/channel.php:1251 -msgid "Like this thing" -msgstr "" - #: ../../include/features.php:48 msgid "General Features" msgstr "" @@ -8846,6 +8638,10 @@ msgstr "" msgid "Enable management and selection of privacy groups" msgstr "" +#: ../../include/features.php:84 ../../include/widgets.php:281 +msgid "Saved Searches" +msgstr "" + #: ../../include/features.php:84 msgid "Save search terms for re-use" msgstr "" @@ -8950,6 +8746,28 @@ msgstr "" msgid "Embedding disabled" msgstr "" +#: ../../include/import.php:29 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../include/import.php:76 +msgid "Channel clone failed. Import failed." +msgstr "" + +#: ../../include/connections.php:95 +msgid "New window" +msgstr "" + +#: ../../include/connections.php:96 +msgid "Open the selected location in a different window or browser tab" +msgstr "" + +#: ../../include/connections.php:214 +#, php-format +msgid "User '%s' deleted" +msgstr "" + #: ../../include/acl_selectors.php:271 msgid "Who can see this?" msgstr "" @@ -9003,7 +8821,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:272 ../../boot.php:2470 +#: ../../include/datetime.php:272 ../../boot.php:2471 msgid "never" msgstr "" @@ -9103,6 +8921,10 @@ msgstr "" msgid "Channels not in any privacy group" msgstr "" +#: ../../include/group.php:316 ../../include/widgets.php:282 +msgid "add" +msgstr "" + #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" @@ -9347,106 +9169,345 @@ msgctxt "calendar" msgid "All day" msgstr "" -#: ../../include/network.php:657 +#: ../../include/network.php:682 msgid "view full size" msgstr "" -#: ../../include/network.php:1885 +#: ../../include/network.php:1910 msgid "No Subject" msgstr "" -#: ../../include/network.php:2146 ../../include/network.php:2147 +#: ../../include/network.php:2171 ../../include/network.php:2172 msgid "Friendica" msgstr "" -#: ../../include/network.php:2148 +#: ../../include/network.php:2173 msgid "OStatus" msgstr "" -#: ../../include/network.php:2149 +#: ../../include/network.php:2174 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:2150 +#: ../../include/network.php:2175 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:2152 +#: ../../include/network.php:2177 msgid "Diaspora" msgstr "" -#: ../../include/network.php:2153 +#: ../../include/network.php:2178 msgid "Facebook" msgstr "" -#: ../../include/network.php:2154 +#: ../../include/network.php:2179 msgid "Zot" msgstr "" -#: ../../include/network.php:2155 +#: ../../include/network.php:2180 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:2156 +#: ../../include/network.php:2181 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:2157 +#: ../../include/network.php:2182 msgid "MySpace" msgstr "" -#: ../../include/photos.php:110 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/items.php:902 ../../include/items.php:947 +msgid "(Unknown)" msgstr "" -#: ../../include/photos.php:117 -msgid "Image file is empty." +#: ../../include/items.php:1146 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/photos.php:255 -msgid "Photo storage failed." +#: ../../include/items.php:1148 +msgid "Visible to you only." msgstr "" -#: ../../include/photos.php:295 -msgid "a new photo" +#: ../../include/items.php:1150 +msgid "Visible to anybody in this network." msgstr "" -#: ../../include/photos.php:299 +#: ../../include/items.php:1152 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1154 #, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/photos.php:506 -msgid "Upload New Photos" +#: ../../include/items.php:1156 +msgid "Visible to all connections." msgstr "" -#: ../../include/zot.php:699 -msgid "Invalid data packet" +#: ../../include/items.php:1158 +msgid "Visible to approved connections." msgstr "" -#: ../../include/zot.php:715 -msgid "Unable to verify channel signature" +#: ../../include/items.php:1160 +msgid "Visible to specific connections." msgstr "" -#: ../../include/zot.php:2363 +#: ../../include/items.php:3920 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:3927 #, php-format -msgid "Unable to verify site signature for %s" +msgid "Privacy group: %s" msgstr "" -#: ../../include/zot.php:3712 -msgid "invalid target signature" +#: ../../include/items.php:3939 +msgid "Connection not found." +msgstr "" + +#: ../../include/items.php:4305 +msgid "profile photo" msgstr "" -#: ../../include/page_widgets.php:6 +#: ../../include/page_widgets.php:7 msgid "New Page" msgstr "" -#: ../../include/page_widgets.php:43 +#: ../../include/page_widgets.php:46 msgid "Title" msgstr "" +#: ../../include/widgets.php:103 +msgid "System" +msgstr "" + +#: ../../include/widgets.php:106 +msgid "New App" +msgstr "" + +#: ../../include/widgets.php:154 +msgid "Suggestions" +msgstr "" + +#: ../../include/widgets.php:155 +msgid "See more..." +msgstr "" + +#: ../../include/widgets.php:175 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/widgets.php:181 +msgid "Add New Connection" +msgstr "" + +#: ../../include/widgets.php:182 +msgid "Enter channel address" +msgstr "" + +#: ../../include/widgets.php:183 +msgid "Examples: bob@example.com, https://example.com/barbara" +msgstr "" + +#: ../../include/widgets.php:199 +msgid "Notes" +msgstr "" + +#: ../../include/widgets.php:273 +msgid "Remove term" +msgstr "" + +#: ../../include/widgets.php:354 +msgid "Archives" +msgstr "" + +#: ../../include/widgets.php:516 +msgid "Refresh" +msgstr "" + +#: ../../include/widgets.php:556 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:562 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:571 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:578 +msgid "Feature/Addon settings" +msgstr "" + +#: ../../include/widgets.php:584 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:591 +msgid "Manage locations" +msgstr "" + +#: ../../include/widgets.php:600 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:607 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:622 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:651 +msgid "Private Mail Menu" +msgstr "" + +#: ../../include/widgets.php:653 +msgid "Combined View" +msgstr "" + +#: ../../include/widgets.php:685 ../../include/widgets.php:697 +msgid "Conversations" +msgstr "" + +#: ../../include/widgets.php:689 +msgid "Received Messages" +msgstr "" + +#: ../../include/widgets.php:693 +msgid "Sent Messages" +msgstr "" + +#: ../../include/widgets.php:707 +msgid "No messages." +msgstr "" + +#: ../../include/widgets.php:725 +msgid "Delete conversation" +msgstr "" + +#: ../../include/widgets.php:751 +msgid "Events Menu" +msgstr "" + +#: ../../include/widgets.php:752 +msgid "Day View" +msgstr "" + +#: ../../include/widgets.php:753 +msgid "Week View" +msgstr "" + +#: ../../include/widgets.php:754 +msgid "Month View" +msgstr "" + +#: ../../include/widgets.php:766 +msgid "Events Tools" +msgstr "" + +#: ../../include/widgets.php:767 +msgid "Export Calendar" +msgstr "" + +#: ../../include/widgets.php:768 +msgid "Import Calendar" +msgstr "" + +#: ../../include/widgets.php:846 +msgid "Overview" +msgstr "" + +#: ../../include/widgets.php:853 +msgid "Chat Members" +msgstr "" + +#: ../../include/widgets.php:875 +msgid "Wiki List" +msgstr "" + +#: ../../include/widgets.php:913 +msgid "Wiki Pages" +msgstr "" + +#: ../../include/widgets.php:948 +msgid "Bookmarked Chatrooms" +msgstr "" + +#: ../../include/widgets.php:971 +msgid "Suggested Chatrooms" +msgstr "" + +#: ../../include/widgets.php:1117 ../../include/widgets.php:1229 +msgid "photo/image" +msgstr "" + +#: ../../include/widgets.php:1172 +msgid "Click to show more" +msgstr "" + +#: ../../include/widgets.php:1323 +msgid "Rating Tools" +msgstr "" + +#: ../../include/widgets.php:1327 ../../include/widgets.php:1329 +msgid "Rate Me" +msgstr "" + +#: ../../include/widgets.php:1332 +msgid "View Ratings" +msgstr "" + +#: ../../include/widgets.php:1389 +msgid "Forums" +msgstr "" + +#: ../../include/widgets.php:1418 +msgid "Tasks" +msgstr "" + +#: ../../include/widgets.php:1427 +msgid "Documentation" +msgstr "" + +#: ../../include/widgets.php:1429 +msgid "Project/Site Information" +msgstr "" + +#: ../../include/widgets.php:1430 +msgid "For Members" +msgstr "" + +#: ../../include/widgets.php:1431 +msgid "For Administrators" +msgstr "" + +#: ../../include/widgets.php:1432 +msgid "For Developers" +msgstr "" + +#: ../../include/widgets.php:1456 ../../include/widgets.php:1494 +msgid "Member registrations waiting for confirmation" +msgstr "" + +#: ../../include/widgets.php:1462 +msgid "Inspect queue" +msgstr "" + +#: ../../include/widgets.php:1464 +msgid "DB updates" +msgstr "" + +#: ../../include/widgets.php:1490 +msgid "Plugin Features" +msgstr "" + #: ../../include/permissions.php:26 msgid "Can view my normal stream and posts" msgstr "" @@ -9618,6 +9679,10 @@ msgstr "" msgid "$Projectname event notification:" msgstr "" +#: ../../include/api.php:1326 +msgid "Public Timeline" +msgstr "" + #: ../../view/theme/redbasic/php/config.php:82 msgid "Focus (Hubzilla default)" msgstr "" @@ -9754,62 +9819,62 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1162 +#: ../../boot.php:1163 #, php-format msgctxt "opensearch" msgid "Search %1$s (%2$s)" msgstr "" -#: ../../boot.php:1162 +#: ../../boot.php:1163 msgctxt "opensearch" msgid "$Projectname" msgstr "" -#: ../../boot.php:1480 +#: ../../boot.php:1481 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1483 +#: ../../boot.php:1484 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1684 +#: ../../boot.php:1685 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1706 +#: ../../boot.php:1707 msgid "Password" msgstr "" -#: ../../boot.php:1707 +#: ../../boot.php:1708 msgid "Remember me" msgstr "" -#: ../../boot.php:1710 +#: ../../boot.php:1711 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2276 +#: ../../boot.php:2277 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2425 +#: ../../boot.php:2426 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2428 +#: ../../boot.php:2429 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2469 +#: ../../boot.php:2470 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2473 +#: ../../boot.php:2474 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" -- cgit v1.2.3 From c81f6b9f6f1ab7f7dc61e5343e52d4ccedbff5a1 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 17 Jun 2016 16:28:36 -0700 Subject: "thing" always showing default url, not that supplied by the thing. --- Zotlabs/Module/Thing.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php index e23cce565..65fc0588e 100644 --- a/Zotlabs/Module/Thing.php +++ b/Zotlabs/Module/Thing.php @@ -26,7 +26,7 @@ class Thing extends \Zotlabs\Web\Controller { $verb = escape_tags($_REQUEST['verb']); $activity = intval($_REQUEST['activity']); $profile_guid = escape_tags($_REQUEST['profile_assign']); - $url = $_REQUEST['link']; + $url = $_REQUEST['url']; $photo = $_REQUEST['img']; $hash = random_string(); @@ -235,7 +235,7 @@ class Thing extends \Zotlabs\Web\Controller { } - function get() { + function get() { // @FIXME one problem with things is we can't share them unless we provide the channel in the url // so we can definitively lookup the owner. -- cgit v1.2.3 From 2e7606f5697cc5e362cb2b1af134316766985689 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 17 Jun 2016 21:44:08 -0700 Subject: the text link to a thing will take you to the local thing page, both as a link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL. --- include/channel.php | 1 + include/taxonomy.php | 2 +- view/tpl/profile_advanced.tpl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/channel.php b/include/channel.php index 92c274105..90dfb2bf6 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1224,6 +1224,7 @@ function advanced_profile(&$a) { $things = get_things(App::$profile['profile_guid'],App::$profile['profile_uid']); + // logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); return replace_macros($tpl, array( diff --git a/include/taxonomy.php b/include/taxonomy.php index 177215fe8..067bd3246 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -400,7 +400,7 @@ function get_things($profile_hash,$uid) { if(! $things[$rr['obj_verb']]) $things[$rr['obj_verb']] = array(); - $things[$rr['obj_verb']][] = array('term' => $rr['obj_term'],'url' => $rr['obj_url'],'img' => $rr['obj_imgurl'], 'profile' => $rr['profile_name'],'term_hash' => $rr['obj_obj'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun')); + $things[$rr['obj_verb']][] = array('term' => $rr['obj_term'],'url' => $rr['obj_url'],'img' => $rr['obj_imgurl'], 'editurl' => z_root() . '/thing/' . $rr['obj_obj'], 'profile' => $rr['profile_name'],'term_hash' => $rr['obj_obj'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun')); } $sorted_things = array(); if($things) { diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index a4c98b1d0..d0c9621f9 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -282,7 +282,7 @@
    {{foreach $items as $item}}
  • {{if $item.img}}{{$item.term}}{{/if}} - {{$item.term}} + {{$item.term}} {{if $profile.canlike}}

@@ -83,7 +84,7 @@ or

[dl terms="b"]
[*= First element term] First element descript
  • [spoiler] for hiding spoilers

  • [rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional
    • -
  • [qr]text to post[/qr] - create a QR code.
    • +
  • [qr]text to post[/qr] - create a QR code (if the qrator plugin is installed).
  • [toc] - create a table of content in a webpage. Please refer to the original jquery toc to get more explanations.
    • Optional param: 'data-toc'. If ommited the default is 'body'
      • -- cgit v1.2.3 From cc09f9a7a5f799a0811ba83799c0a3ac6598c476 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jun 2016 22:50:41 -0700 Subject: Added many of the recent schema changes to the database schema documentation --- doc/database/db_abook.bb | 15 +++++++++++---- doc/database/db_addon.bb | 4 ++-- doc/database/db_app.bb | 14 +++++++++++++- doc/database/db_attach.bb | 4 +++- doc/database/db_channel.bb | 4 ++++ doc/database/db_chatpresence.bb | 2 +- doc/database/db_clients.bb | 2 +- doc/database/db_event.bb | 26 ++++++++++++++++++++++---- doc/database/db_groups.bb | 2 +- doc/database/db_hook.bb | 6 ++++-- doc/database/db_item.bb | 2 +- doc/database/db_notify.bb | 4 ++-- doc/database/db_photo.bb | 6 +++--- doc/database/db_profile.bb | 6 +++--- doc/database/db_term.bb | 2 +- 15 files changed, 72 insertions(+), 27 deletions(-) diff --git a/doc/database/db_abook.bb b/doc/database/db_abook.bb index 364429884..a346480d7 100644 --- a/doc/database/db_abook.bb +++ b/doc/database/db_abook.bb @@ -15,10 +15,6 @@ [/td][/tr] [tr][td]abook_closeness[/td][td]"closeness" value for optional affinity tool, 0-99[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]99[/td][td] [/td][/tr] -[tr][td]abook_rating[/td][td]The channel owner's (public) rating of this connection -10 to +10, default 0 or unrated[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]abook_rating_text[/td][td]The channel owner's (public) rating of this connection free form text[/td][td]text[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] [tr][td]abook_created[/td][td]Datetime this record was created[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] [/td][/tr] [tr][td]abook_updated[/td][td]Datetime this record was modified[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] @@ -32,16 +28,27 @@ [tr][td]abook_profile[/td][td]profile.guid of profile to display to this connection if authenticated[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td] [/td][/tr] [tr][td]abook_blocked[/td][td]Bi-directional communications with this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_ignored[/td][td]Incoming communications from this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_hidden[/td][td]This connection will not be shown as a connection to anybody but the channel owner[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_archived[/td][td]This connection is likely non-functioning and the entry and conversations are preserved, but further polled communications will not be attempted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_pending[/td][td]A connection request was received from this channel but has not been approved by the channel owner, public communications may still be visible but no additional permissions have been granted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_unconnected[/td][td]currently unused. Projected usage is to indicate "one-way" connections which were insitgated on this end but are still pending on the remote end. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_self[/td][td]is a special case where the owner is the target. Every channel has one abook entry with abook_self and with a target abook_xchan set to channel.channel_hash . When this flag is present, abook_my_perms is the default permissions granted to all new connections and several other fields are unused.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_feed[/td][td]indicates this connection is an RSS/Atom feed and may trigger special handling.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]abook_instance[/td][td]comma separated list of site urls of all channel clones that this connection is connected with (used only for singleton networks which don't support cloning)[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [/table] diff --git a/doc/database/db_addon.bb b/doc/database/db_addon.bb index afa06d56c..bccd295f5 100644 --- a/doc/database/db_addon.bb +++ b/doc/database/db_addon.bb @@ -3,7 +3,7 @@ [/th][/tr] [tr][td]id[/td][td][/td]generated index[td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment [/td][/tr] -[tr][td]name[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[tr][td]aname[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] [tr][td]version[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] @@ -11,7 +11,7 @@ [/td][/tr] [tr][td]hidden[/td][td]currently unused[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] -[tr][td]timestamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td] +[tr][td]tstamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td] [/td][/tr] [tr][td]plugin_admin[/td][td]1 = has admin config, 0 = has no admin config[/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]0[/td][td] [/td][/tr] diff --git a/doc/database/db_app.bb b/doc/database/db_app.bb index 7076bffdd..09df473ee 100644 --- a/doc/database/db_app.bb +++ b/doc/database/db_app.bb @@ -27,8 +27,20 @@ [/td][/tr] [tr][td]app_page[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] [/td][/tr] -[tr][td]app_requires[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] +[tr][td]app_requires[/td][td]access rules[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] [/td][/tr] + +[tr][td]app_created[/td][td]datetime of app creation[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_edited[/td][td]datetime of last app edit[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] + +[tr][td]app_deleted[/td][td]1 = deleted, 0 = normal[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] +[tr][td]app_system[/td][td]1 = imported system app, 0 = member created app[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td] +[/td][/tr] + + [/table] Storage for personal apps diff --git a/doc/database/db_attach.bb b/doc/database/db_attach.bb index 7d2befb47..5098401de 100644 --- a/doc/database/db_attach.bb +++ b/doc/database/db_attach.bb @@ -29,9 +29,11 @@ [/td][/tr] [tr][td]os_storage[/td][td]if 0, data contains content; if 1 data contains path to content (always 1 in hubzilla)[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] +[tr][td]os_path[/td][td]under construction, store the system path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] [tr][td]display_path[/td][td]under construction, store the human readable path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] -[tr][td]data[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]content[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]created[/td][td]creation time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] [/td][/tr] diff --git a/doc/database/db_channel.bb b/doc/database/db_channel.bb index 6f53517d8..518ff0978 100644 --- a/doc/database/db_channel.bb +++ b/doc/database/db_channel.bb @@ -35,6 +35,8 @@ [/td][/tr] [tr][td]channel_dirdate[/td][td]time when directory was last pinged. Must do this once a month[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] [/td][/tr] +[tr][td]channel_lastpost[/td][td]date of last post for this channel. May not be fully implemented[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] +[/td][/tr] [tr][td]channel_deleted[/td][td]time when channel was deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td] [/td][/tr] [tr][td]channel_max_anon_mail[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td] @@ -95,6 +97,8 @@ [/td][/tr] [tr][td]channel_system[/td][td]if 1, this is the special system channel on this site[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td] [/td][/tr] +[tr][td]channel_moved[/td][td]URL of relocated channel, making this instance abandoned if set[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] [/table] Return to [zrl=[baseurl]/help/database]database documentation[/zrl] diff --git a/doc/database/db_chatpresence.bb b/doc/database/db_chatpresence.bb index 28cd6f207..0a7f666c9 100644 --- a/doc/database/db_chatpresence.bb +++ b/doc/database/db_chatpresence.bb @@ -11,7 +11,7 @@ [/td][/tr] [tr][td]cp_status[/td][td]text status description e.g. "online"[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] -[tr][td]cp_client[/td][td][/td]IP address of this client[td]char(128)[/td][td]NO[/td][td][/td][td][/td][td] +[tr][td]cp_client[/td][td]IP address of this client[/td][td]char(128)[/td][td]NO[/td][td][/td][td][/td][td] [/td][/tr] [/table] diff --git a/doc/database/db_clients.bb b/doc/database/db_clients.bb index d342b529f..0c66a4fc2 100644 --- a/doc/database/db_clients.bb +++ b/doc/database/db_clients.bb @@ -7,7 +7,7 @@ [/td][/tr] [tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]name[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td] +[tr][td]clname[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]icon[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td] [/td][/tr] diff --git a/doc/database/db_event.bb b/doc/database/db_event.bb index 7c31d7fde..ad3c15789 100644 --- a/doc/database/db_event.bb +++ b/doc/database/db_event.bb @@ -15,9 +15,9 @@ [/td][/tr] [tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]start[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[tr][td]dtstart[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] -[tr][td]finish[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[tr][td]dtend[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] [tr][td]summary[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] @@ -25,13 +25,13 @@ [/td][/tr] [tr][td]location[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]type[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[tr][td]etype[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] [tr][td]nofinish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] [tr][td]adjust[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]1[/td][td] [/td][/tr] -[tr][td]ignore[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[tr][td]dismissed[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] [tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] @@ -41,6 +41,24 @@ [/td][/tr] [tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] + +[tr][td]event_status[/td][td][/td][td]charr(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_status_date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_percent[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_repeat[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_sequence[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_priority[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]event_vdata[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]cal_id[/td][td][/td][td]int(10)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] + [/table] Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_groups.bb b/doc/database/db_groups.bb index 078d96464..73265b90e 100644 --- a/doc/database/db_groups.bb +++ b/doc/database/db_groups.bb @@ -11,7 +11,7 @@ [/td][/tr] [tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] -[tr][td]name[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [/table] diff --git a/doc/database/db_hook.bb b/doc/database/db_hook.bb index 0812b1b41..233062f98 100644 --- a/doc/database/db_hook.bb +++ b/doc/database/db_hook.bb @@ -7,9 +7,11 @@ [/td][/tr] [tr][td]file[/td][td]relative filename of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]function[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]fn[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]priority[/td][td]not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td] +[tr][td]priority[/td][td]can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td] +[/td][/tr] +[tr][td]hook_version[/td][td]version 0 hooks must have two arguments, the App and the hook data. version 1 hooks have 1 argument - the hook data[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td] [/td][/tr] [/table] diff --git a/doc/database/db_item.bb b/doc/database/db_item.bb index e4e594196..6383e13f8 100644 --- a/doc/database/db_item.bb +++ b/doc/database/db_item.bb @@ -51,7 +51,7 @@ [/td][/tr] [tr][td]obj_type[/td][td]ActivityStreams object type (old style URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] [/td][/tr] -[tr][td]object[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]obj[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]tgt_type[/td][td]ActivityStreams target type if applicable (URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td] [/td][/tr] diff --git a/doc/database/db_notify.bb b/doc/database/db_notify.bb index 42f9350e5..4787266cd 100644 --- a/doc/database/db_notify.bb +++ b/doc/database/db_notify.bb @@ -5,7 +5,7 @@ [/td][/tr] [tr][td]hash[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] -[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]xname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] @@ -25,7 +25,7 @@ [/td][/tr] [tr][td]seen[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] -[tr][td]type[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[tr][td]ntype[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] [tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] diff --git a/doc/database/db_photo.bb b/doc/database/db_photo.bb index 6a0cdf362..91840ec1e 100644 --- a/doc/database/db_photo.bb +++ b/doc/database/db_photo.bb @@ -23,15 +23,15 @@ [/td][/tr] [tr][td]filename[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]type[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td] +[tr][td]mimetype[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td] [/td][/tr] [tr][td]height[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]width[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]size[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[tr][td]filesize[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] -[tr][td]data[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]content[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]scale[/td][td][/td][td]tinyint(3)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] diff --git a/doc/database/db_profile.bb b/doc/database/db_profile.bb index 83db75713..717fae585 100644 --- a/doc/database/db_profile.bb +++ b/doc/database/db_profile.bb @@ -15,7 +15,7 @@ [/td][/tr] [tr][td]hide_friends[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] [/td][/tr] -[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]fullname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]pdesc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] @@ -41,7 +41,7 @@ [/td][/tr] [tr][td]marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] -[tr][td]with[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]partner[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]howlong[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td] [/td][/tr] @@ -73,7 +73,7 @@ [/td][/tr] [tr][td]romance[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] -[tr][td]work[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[tr][td]employment[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] [tr][td]education[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td] [/td][/tr] diff --git a/doc/database/db_term.bb b/doc/database/db_term.bb index e1f6415fa..bd155fe21 100644 --- a/doc/database/db_term.bb +++ b/doc/database/db_term.bb @@ -11,7 +11,7 @@ [/td][/tr] [tr][td]otype[/td][td]type of linked thing[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] -[tr][td]type[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[tr][td]ttype[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] [tr][td]term[/td][td]the actual taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] [/td][/tr] -- cgit v1.2.3