diff options
| author | zotlabs <mike@macgirvin.com> | 2017-12-14 13:32:58 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-12-14 13:32:58 -0800 |
| commit | 684b572aa8005479f3eb219fc526c812c801ca76 (patch) | |
| tree | f8ee52081242cb28f681c2ca934f65fcf1a42387 | |
| parent | 215d615fc3bb9e168e21a78a6319a7971c4d1e9e (diff) | |
| parent | a61c72b3b2076a5971eca47cda8aa067c03f9d6c (diff) | |
| download | volse-hubzilla-684b572aa8005479f3eb219fc526c812c801ca76.tar.gz volse-hubzilla-684b572aa8005479f3eb219fc526c812c801ca76.tar.bz2 volse-hubzilla-684b572aa8005479f3eb219fc526c812c801ca76.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | Zotlabs/Module/Embedphotos.php | 2 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/attach.php | 5 | ||||
| -rw-r--r-- | include/conversation.php | 4 | ||||
| -rw-r--r-- | include/nav.php | 10 | ||||
| -rw-r--r-- | util/hmessages.po | 2892 | ||||
| -rw-r--r-- | view/css/mod_cloud.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 10 |
9 files changed, 1539 insertions, 1400 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php index c92af27d6..15cc68d7f 100644 --- a/Zotlabs/Module/Embedphotos.php +++ b/Zotlabs/Module/Embedphotos.php @@ -83,7 +83,7 @@ class Embedphotos extends \Zotlabs\Web\Controller { return ''; if($args['album']) - $album = $args['album']; + $album = (($args['album'] === '/') ? '' : $args['album']); if($args['title']) $title = $args['title']; @@ -50,7 +50,7 @@ require_once('include/hubloc.php'); require_once('include/attach.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '2.9.4' ); +define ( 'STD_VERSION', '3.1' ); define ( 'ZOT_REVISION', '1.3' ); define ( 'DB_UPDATE_VERSION', 1198 ); diff --git a/include/attach.php b/include/attach.php index 88b6fa8e7..e94454905 100644 --- a/include/attach.php +++ b/include/attach.php @@ -308,6 +308,11 @@ function attach_can_view_folder($uid,$ob_hash,$folder_hash) { $hash = $folder_hash; $result = false; + if(! $folder_hash) { + return perm_is_allowed($uid,$ob_hash,'view_storage'); + } + + do { $r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra", dbesc($hash), diff --git a/include/conversation.php b/include/conversation.php index fc0942474..77694deb3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -755,8 +755,8 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa 'forged' => $forged, 'txt_cats' => t('Categories:'), 'txt_folders' => t('Filed under:'), - 'has_cats' => ((count($body['categories'])) ? 'true' : ''), - 'has_folders' => ((count($body['folders'])) ? 'true' : ''), + 'has_cats' => (($body['categories']) ? 'true' : ''), + 'has_folders' => (($body['folders']) ? 'true' : ''), 'text' => strip_tags($body['html']), 'ago' => relative_date($item['created']), 'app' => $item['app'], diff --git a/include/nav.php b/include/nav.php index 2366fe7f1..8566cc58c 100644 --- a/include/nav.php +++ b/include/nav.php @@ -176,13 +176,15 @@ EOT; } - - $homelink = get_my_url(); - if(! $homelink) { + $my_url = get_my_url(); + if(! $my_url) { $observer = App::get_observer(); - $homelink = (($observer) ? $observer['xchan_url'] : ''); + $my_url = (($observer) ? $observer['xchan_url'] : ''); } + $homelink_arr = parse_url($my_url); + $homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host']; + if(! $is_owner) { $nav['rusermenu'] = array( $homelink, diff --git a/util/hmessages.po b/util/hmessages.po index 8a2eb961f..ab43266e5 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.9\n" +"Project-Id-Version: 3.0RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-19 12:01+0200\n" +"POT-Creation-Date: 2017-12-13 12:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,168 +17,169 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../Zotlabs/Access/Permissions.php:53 +#: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my channel stream and posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:54 +#: ../../Zotlabs/Access/Permissions.php:57 msgid "Can send me their channel stream and posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:55 +#: ../../Zotlabs/Access/Permissions.php:58 msgid "Can view my default channel profile" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:56 +#: ../../Zotlabs/Access/Permissions.php:59 msgid "Can view my connections" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:57 +#: ../../Zotlabs/Access/Permissions.php:60 msgid "Can view my file storage and photos" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:58 +#: ../../Zotlabs/Access/Permissions.php:61 msgid "Can upload/modify my file storage and photos" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:59 +#: ../../Zotlabs/Access/Permissions.php:62 msgid "Can view my channel webpages" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:60 +#: ../../Zotlabs/Access/Permissions.php:63 msgid "Can view my wiki pages" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:61 +#: ../../Zotlabs/Access/Permissions.php:64 msgid "Can create/edit my channel webpages" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:62 +#: ../../Zotlabs/Access/Permissions.php:65 msgid "Can write to my wiki pages" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:63 +#: ../../Zotlabs/Access/Permissions.php:66 msgid "Can post on my channel (wall) page" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:64 +#: ../../Zotlabs/Access/Permissions.php:67 msgid "Can comment on or like my posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:65 +#: ../../Zotlabs/Access/Permissions.php:68 msgid "Can send me private mail messages" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:66 +#: ../../Zotlabs/Access/Permissions.php:69 msgid "Can like/dislike profiles and profile things" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:67 +#: ../../Zotlabs/Access/Permissions.php:70 msgid "Can forward to all my channel connections via @+ mentions in posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:68 +#: ../../Zotlabs/Access/Permissions.php:71 msgid "Can chat with me" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:69 +#: ../../Zotlabs/Access/Permissions.php:72 msgid "Can source my public posts in derived channels" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:70 +#: ../../Zotlabs/Access/Permissions.php:73 msgid "Can administer my channel" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:248 +#: ../../Zotlabs/Access/PermissionRoles.php:265 msgid "Social Networking" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:249 +#: ../../Zotlabs/Access/PermissionRoles.php:266 msgid "Social - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:250 +#: ../../Zotlabs/Access/PermissionRoles.php:267 msgid "Social - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:251 +#: ../../Zotlabs/Access/PermissionRoles.php:268 msgid "Social - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:254 +#: ../../Zotlabs/Access/PermissionRoles.php:271 msgid "Community Forum" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:255 +#: ../../Zotlabs/Access/PermissionRoles.php:272 msgid "Forum - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:256 +#: ../../Zotlabs/Access/PermissionRoles.php:273 msgid "Forum - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:257 +#: ../../Zotlabs/Access/PermissionRoles.php:274 msgid "Forum - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:260 +#: ../../Zotlabs/Access/PermissionRoles.php:277 msgid "Feed Republish" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:261 +#: ../../Zotlabs/Access/PermissionRoles.php:278 msgid "Feed - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:262 +#: ../../Zotlabs/Access/PermissionRoles.php:279 msgid "Feed - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:265 +#: ../../Zotlabs/Access/PermissionRoles.php:282 msgid "Special Purpose" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:266 +#: ../../Zotlabs/Access/PermissionRoles.php:283 msgid "Special - Celebrity/Soapbox" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:267 +#: ../../Zotlabs/Access/PermissionRoles.php:284 msgid "Special - Group Repository" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:270 +#: ../../Zotlabs/Access/PermissionRoles.php:287 #: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Settings/Channel.php:467 +#: ../../Zotlabs/Module/Settings/Channel.php:474 #: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Register.php:213 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Register.php:221 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/event.php:1297 -#: ../../include/event.php:1304 ../../include/connections.php:689 +#: ../../include/selectors.php:140 ../../include/event.php:1308 +#: ../../include/event.php:1315 ../../include/connections.php:689 #: ../../include/connections.php:696 msgid "Other" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:271 +#: ../../Zotlabs/Access/PermissionRoles.php:288 msgid "Custom/Expert Mode" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31 -#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Achievements.php:15 -#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editblock.php:31 -#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Layouts.php:31 -#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:29 -#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Filestorage.php:51 -#: ../../include/channel.php:1163 +#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29 +#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17 +#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12 +#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 +#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 +#: ../../Zotlabs/Module/Cards.php:29 ../../Zotlabs/Module/Webpages.php:33 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1198 msgid "Requested profile is not available." msgstr "" #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 -#: ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110 #: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Appman.php:86 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Article_edit.php:51 #: ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 @@ -190,19 +191,19 @@ msgstr "" #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:388 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:400 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 -#: ../../Zotlabs/Module/Profile_photo.php:288 -#: ../../Zotlabs/Module/Profile_photo.php:301 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223 -#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250 -#: ../../Zotlabs/Module/Item.php:1102 ../../Zotlabs/Module/Page.php:34 -#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:294 +#: ../../Zotlabs/Module/Profile_photo.php:307 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:228 +#: ../../Zotlabs/Module/Item.php:245 ../../Zotlabs/Module/Item.php:255 +#: ../../Zotlabs/Module/Item.php:1085 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 #: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Profiles.php:198 -#: ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13 +#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 @@ -210,31 +211,31 @@ msgstr "" #: ../../Zotlabs/Module/Cards.php:68 ../../Zotlabs/Module/Webpages.php:118 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74 -#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Suggest.php:28 +#: ../../Zotlabs/Module/Like.php:184 ../../Zotlabs/Module/Suggest.php:28 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Display.php:343 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:404 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:85 -#: ../../Zotlabs/Module/Filestorage.php:112 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Rate.php:113 #: ../../Zotlabs/Module/Card_edit.php:51 -#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Lib/Chatroom.php:137 +#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Lib/Chatroom.php:133 #: ../../Zotlabs/Web/WebServer.php:169 ../../addon/keepout/keepout.php:36 #: ../../addon/openid/Mod_Id.php:53 ../../addon/gitwiki/Mod_Gitwiki.php:196 #: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40 -#: ../../include/attach.php:144 ../../include/attach.php:191 -#: ../../include/attach.php:255 ../../include/attach.php:269 -#: ../../include/attach.php:276 ../../include/attach.php:344 -#: ../../include/attach.php:358 ../../include/attach.php:365 -#: ../../include/attach.php:443 ../../include/attach.php:924 -#: ../../include/attach.php:998 ../../include/attach.php:1163 -#: ../../include/items.php:3489 ../../include/photos.php:28 +#: ../../include/attach.php:150 ../../include/attach.php:197 +#: ../../include/attach.php:270 ../../include/attach.php:284 +#: ../../include/attach.php:293 ../../include/attach.php:366 +#: ../../include/attach.php:380 ../../include/attach.php:387 +#: ../../include/attach.php:469 ../../include/attach.php:1008 +#: ../../include/attach.php:1082 ../../include/attach.php:1247 +#: ../../include/items.php:3633 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -261,58 +262,60 @@ msgstr "" msgid "Edited" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1185 -#: ../../Zotlabs/Module/New_channel.php:147 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:147 #: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Menu.php:118 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Cards.php:96 ../../Zotlabs/Module/Webpages.php:239 -#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:335 -#: ../../Zotlabs/Widget/Cdav.php:127 ../../Zotlabs/Widget/Cdav.php:164 +#: ../../Zotlabs/Storage/Browser.php:273 ../../Zotlabs/Storage/Browser.php:379 +#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 msgid "Create" msgstr "" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 +#: ../../Zotlabs/Module/Article_edit.php:99 #: ../../Zotlabs/Module/Admin/Profs.php:154 #: ../../Zotlabs/Module/Settings/Oauth.php:149 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:114 #: ../../Zotlabs/Module/Connections.php:260 #: ../../Zotlabs/Module/Connections.php:297 #: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:346 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Wiki.php:358 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Layouts.php:193 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85 #: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:399 -#: ../../Zotlabs/Lib/ThreadItem.php:111 ../../Zotlabs/Storage/Browser.php:239 -#: ../../Zotlabs/Widget/Cdav.php:125 ../../Zotlabs/Widget/Cdav.php:161 +#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:285 +#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162 #: ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1262 -#: ../../include/channel.php:1266 ../../include/menu.php:113 +#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1297 +#: ../../include/channel.php:1301 ../../include/menu.php:113 msgid "Edit" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1049 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 #: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 -#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1346 +#: ../../Zotlabs/Widget/Cdav.php:124 ../../include/conversation.php:1363 msgid "Share" msgstr "" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 +#: ../../Zotlabs/Module/Article_edit.php:129 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:155 #: ../../Zotlabs/Module/Settings/Oauth.php:150 #: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Connections.php:268 -#: ../../Zotlabs/Module/Photos.php:1150 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 #: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Group.php:179 #: ../../Zotlabs/Module/Profiles.php:803 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Module/Card_edit.php:129 -#: ../../Zotlabs/Lib/Apps.php:400 ../../Zotlabs/Lib/ThreadItem.php:131 -#: ../../Zotlabs/Storage/Browser.php:240 ../../include/conversation.php:674 -#: ../../include/conversation.php:717 +#: ../../Zotlabs/Lib/Apps.php:400 ../../Zotlabs/Lib/ThreadItem.php:141 +#: ../../Zotlabs/Storage/Browser.php:286 ../../include/conversation.php:690 +#: ../../include/conversation.php:733 msgid "Delete" msgstr "" @@ -394,7 +397,7 @@ msgstr "" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:148 +#: ../../Zotlabs/Module/Appman.php:152 #: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:308 #: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 @@ -403,58 +406,59 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:273 +#: ../../Zotlabs/Module/Admin/Site.php:277 #: ../../Zotlabs/Module/Admin/Profs.php:157 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 #: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Channel.php:480 +#: ../../Zotlabs/Module/Settings/Channel.php:489 #: ../../Zotlabs/Module/Settings/Features.php:47 #: ../../Zotlabs/Module/Settings/Tokens.php:168 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:52 -#: ../../Zotlabs/Module/Settings/Display.php:207 +#: ../../Zotlabs/Module/Settings/Display.php:209 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374 -#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:343 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:659 -#: ../../Zotlabs/Module/Photos.php:1029 ../../Zotlabs/Module/Photos.php:1069 -#: ../../Zotlabs/Module/Photos.php:1187 ../../Zotlabs/Module/Wiki.php:206 -#: ../../Zotlabs/Module/Pdledit.php:94 ../../Zotlabs/Module/Poke.php:200 -#: ../../Zotlabs/Module/Connedit.php:904 ../../Zotlabs/Module/Chat.php:196 -#: ../../Zotlabs/Module/Chat.php:242 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 +#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 +#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 +#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 +#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 #: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 #: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 -#: ../../Zotlabs/Module/Filestorage.php:155 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:743 ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../Zotlabs/Widget/Wiki_pages.php:61 +#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../Zotlabs/Widget/Wiki_pages.php:40 +#: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:269 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:273 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 #: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89 -#: ../../addon/mailhost/mailhost.php:40 #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:807 +#: ../../addon/diaspora/diaspora.php:816 #: ../../addon/gitwiki/Mod_Gitwiki.php:155 -#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170 -#: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100 +#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 +#: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 +#: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 #: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 #: ../../addon/statusnet/statusnet.php:380 #: ../../addon/statusnet/statusnet.php:432 -#: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217 +#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:217 #: ../../addon/twitter/twitter.php:259 #: ../../addon/smileybutton/smileybutton.php:219 ../../addon/piwik/piwik.php:95 #: ../../addon/pageheader/pageheader.php:48 @@ -464,8 +468,25 @@ msgstr "" msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editblock.php:79 -#: ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Cards.php:38 +#: ../../Zotlabs/Module/Cards.php:178 ../../Zotlabs/Lib/Apps.php:224 +#: ../../include/conversation.php:1890 ../../include/features.php:122 +#: ../../include/nav.php:490 +msgid "Cards" +msgstr "" + +#: ../../Zotlabs/Module/Articles.php:95 +msgid "Add Article" +msgstr "" + +#: ../../Zotlabs/Module/Articles.php:178 ../../include/nav.php:501 +msgid "Articles" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Article_edit.php:17 +#: ../../Zotlabs/Module/Article_edit.php:33 +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 #: ../../Zotlabs/Module/Editwebpage.php:80 ../../Zotlabs/Module/Editpost.php:24 #: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33 msgid "Item not found" @@ -484,12 +505,13 @@ msgstr "" msgid "Edit Layout" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:74 -#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 -#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:168 -#: ../../addon/redphotos/redphotos.php:119 ../../addon/frphotos/frphotos.php:81 -#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:346 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 +#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:111 +#: ../../Zotlabs/Module/Group.php:74 ../../Zotlabs/Module/Dreport.php:10 +#: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Like.php:295 +#: ../../Zotlabs/Web/WebServer.php:168 ../../addon/redphotos/redphotos.php:119 +#: ../../addon/hzfiles/hzfiles.php:73 ../../addon/frphotos/frphotos.php:81 +#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:358 msgid "Permission denied" msgstr "" @@ -501,7 +523,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1585 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1633 msgid "Profile" msgstr "" @@ -528,11 +550,11 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 #: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 -#: ../../Zotlabs/Module/Photos.php:764 ../../Zotlabs/Module/Photos.php:1220 -#: ../../Zotlabs/Lib/Apps.php:727 ../../Zotlabs/Lib/Apps.php:805 -#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:86 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:841 -#: ../../include/conversation.php:1143 +#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 +#: ../../Zotlabs/Lib/Apps.php:744 ../../Zotlabs/Lib/Apps.php:822 +#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:842 +#: ../../include/conversation.php:1160 msgid "Unknown" msgstr "" @@ -569,7 +591,7 @@ msgid "End date and time" msgstr "" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 msgid "Description" msgstr "" @@ -582,20 +604,20 @@ msgid "Location" msgstr "" #: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689 -#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:337 -#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:918 +#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339 +#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971 msgid "Previous" msgstr "" #: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 -#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Cal.php:345 -#: ../../Zotlabs/Module/Photos.php:927 +#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 +#: ../../Zotlabs/Module/Photos.php:980 msgid "Next" msgstr "" #: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700 -#: ../../Zotlabs/Module/Cal.php:346 +#: ../../Zotlabs/Module/Cal.php:348 msgid "Today" msgstr "" @@ -643,14 +665,13 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:423 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:333 ../../Zotlabs/Module/Wiki.php:363 +#: ../../Zotlabs/Module/Wiki.php:345 ../../Zotlabs/Module/Wiki.php:375 #: ../../Zotlabs/Module/Connedit.php:942 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 #: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/js_upload/js_upload.php:46 -#: ../../addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1369 -#: ../../include/conversation.php:1418 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/gitwiki/Mod_Gitwiki.php:244 +#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1386 +#: ../../include/conversation.php:1435 msgid "Cancel" msgstr "" @@ -663,8 +684,8 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:89 #: ../../Zotlabs/Module/Settings/Oauth.php:115 #: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:924 -#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:554 -#: ../../Zotlabs/Storage/Browser.php:234 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Storage/Browser.php:280 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 #: ../../addon/gitwiki/Mod_Gitwiki.php:158 @@ -690,7 +711,7 @@ msgstr "" #: ../../Zotlabs/Module/Connedit.php:928 ../../Zotlabs/Module/Profiles.php:790 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1706 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 msgid "Email" msgstr "" @@ -717,19 +738,19 @@ msgid "Note" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:933 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1301 #: ../../include/connections.php:682 msgid "Mobile" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:934 -#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291 +#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1302 #: ../../include/connections.php:683 msgid "Home" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:935 -#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294 +#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1305 #: ../../include/connections.php:686 msgid "Work" msgstr "" @@ -872,9 +893,13 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:490 +#: ../../Zotlabs/Module/Hq.php:136 +msgid "Welcome to hubzilla!" +msgstr "" + +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 -#: ../../Zotlabs/Module/Display.php:21 +#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30 #: ../../Zotlabs/Module/Viewconnections.php:23 msgid "Public access denied." msgstr "" @@ -882,7 +907,7 @@ msgstr "" #: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:313 #: ../../Zotlabs/Lib/Apps.php:250 ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../include/text.php:1029 ../../include/text.php:1041 -#: ../../include/acl_selectors.php:213 ../../include/nav.php:204 +#: ../../include/acl_selectors.php:213 ../../include/nav.php:211 msgid "Search" msgstr "" @@ -896,8 +921,8 @@ msgstr "" msgid "Search results for: %s" msgstr "" -#: ../../Zotlabs/Module/Pubstream.php:38 -#: ../../Zotlabs/Widget/Notifications.php:128 +#: ../../Zotlabs/Module/Pubstream.php:81 +#: ../../Zotlabs/Widget/Notifications.php:129 msgid "Public Stream" msgstr "" @@ -953,12 +978,22 @@ msgstr "" msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../Zotlabs/Module/Apporder.php:39 -msgid "Change Order of Navigation Apps" +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of Pinned Navbar Apps" +msgstr "" + +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of App Tray Apps" +msgstr "" + +#: ../../Zotlabs/Module/Apporder.php:45 +msgid "" +"Use arrows to move the corresponding app left (top) or right (bottom) in the " +"navbar" msgstr "" -#: ../../Zotlabs/Module/Apporder.php:40 -msgid "Use arrows to move the corresponding app up or down in the display list" +#: ../../Zotlabs/Module/Apporder.php:45 +msgid "Use arrows to move the corresponding app up or down in the app tray" msgstr "" #: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 @@ -987,7 +1022,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:522 msgid "(click to open/close)" msgstr "" @@ -1010,17 +1045,17 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:237 -#: ../../Zotlabs/Module/Settings/Channel.php:298 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:240 +#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Settings/Display.php:105 +#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 #: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:150 -#: ../../Zotlabs/Module/Filestorage.php:158 -#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1644 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:394 ../../boot.php:1669 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1060,16 +1095,17 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:239 -#: ../../Zotlabs/Module/Settings/Channel.php:298 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:242 +#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Settings/Display.php:105 +#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 #: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:150 -#: ../../Zotlabs/Module/Filestorage.php:158 -#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1644 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180 +#: ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:394 ../../boot.php:1669 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1211,9 +1247,9 @@ msgstr "" msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51 -#: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119 -#: ../../include/text.php:1941 ../../include/event.php:1145 +#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 +#: ../../Zotlabs/Module/Like.php:384 ../../include/conversation.php:119 +#: ../../include/text.php:1941 ../../include/event.php:1153 msgid "event" msgstr "" @@ -1222,9 +1258,9 @@ msgid "Edit event title" msgstr "" #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137 +#: ../../Zotlabs/Module/Appman.php:140 ../../Zotlabs/Module/Appman.php:141 #: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../include/datetime.php:259 +#: ../../include/datetime.php:265 msgid "Required" msgstr "" @@ -1274,13 +1310,13 @@ msgstr "" msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1070 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:753 -#: ../../include/conversation.php:1313 +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:764 +#: ../../include/conversation.php:1330 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1385 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1402 msgid "Permission settings" msgstr "" @@ -1292,7 +1328,7 @@ msgstr "" msgid "Advanced Options" msgstr "" -#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:264 +#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266 msgid "l, F j" msgstr "" @@ -1304,7 +1340,7 @@ msgstr "" msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313 +#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 #: ../../include/text.php:1760 msgid "Link to Source" msgstr "" @@ -1313,16 +1349,16 @@ msgstr "" msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336 +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 msgid "Edit Event" msgstr "" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336 +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 msgid "Create Event" msgstr "" -#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339 -#: ../../include/channel.php:1588 +#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 +#: ../../include/channel.php:1636 msgid "Export" msgstr "" @@ -1342,47 +1378,47 @@ msgstr "" msgid "Malformed app." msgstr "" -#: ../../Zotlabs/Module/Appman.php:125 +#: ../../Zotlabs/Module/Appman.php:129 msgid "Embed code" msgstr "" -#: ../../Zotlabs/Module/Appman.php:131 +#: ../../Zotlabs/Module/Appman.php:135 msgid "Edit App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:131 +#: ../../Zotlabs/Module/Appman.php:135 msgid "Create App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:136 +#: ../../Zotlabs/Module/Appman.php:140 msgid "Name of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:137 +#: ../../Zotlabs/Module/Appman.php:141 msgid "Location (URL) of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:139 +#: ../../Zotlabs/Module/Appman.php:143 msgid "Photo icon URL" msgstr "" -#: ../../Zotlabs/Module/Appman.php:139 +#: ../../Zotlabs/Module/Appman.php:143 msgid "80 x 80 pixels - optional" msgstr "" -#: ../../Zotlabs/Module/Appman.php:140 +#: ../../Zotlabs/Module/Appman.php:144 msgid "Categories (optional, comma separated list)" msgstr "" -#: ../../Zotlabs/Module/Appman.php:141 +#: ../../Zotlabs/Module/Appman.php:145 msgid "Version ID" msgstr "" -#: ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Appman.php:146 msgid "Price of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:147 msgid "Location (URL) to purchase app" msgstr "" @@ -1394,30 +1430,55 @@ msgstr "" msgid "Hub not found." msgstr "" -#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47 -#: ../../Zotlabs/Module/Like.php:370 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 +#: ../../Zotlabs/Module/Like.php:382 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1424 ../../addon/pubcrawl/as.php:1288 +#: ../../addon/diaspora/Receiver.php:1433 ../../addon/pubcrawl/as.php:1295 #: ../../include/conversation.php:116 ../../include/text.php:1938 msgid "photo" msgstr "" -#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370 -#: ../../addon/diaspora/Receiver.php:1424 ../../addon/pubcrawl/as.php:1288 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:382 +#: ../../addon/diaspora/Receiver.php:1433 ../../addon/pubcrawl/as.php:1295 #: ../../include/conversation.php:144 ../../include/text.php:1944 msgid "status" msgstr "" -#: ../../Zotlabs/Module/Subthread.php:118 +#: ../../Zotlabs/Module/Subthread.php:142 #, php-format msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Subthread.php:120 +#: ../../Zotlabs/Module/Subthread.php:144 #, php-format msgid "%1$s stopped following %2$s's %3$s" msgstr "" +#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62 +#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75 +#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41 +#: ../../Zotlabs/Module/Card_edit.php:44 +msgid "Channel not found." +msgstr "" + +#: ../../Zotlabs/Module/Article_edit.php:101 +#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 +#: ../../include/conversation.php:1278 +msgid "Insert web link" +msgstr "" + +#: ../../Zotlabs/Module/Article_edit.php:117 +#: ../../Zotlabs/Module/Editblock.php:129 +#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1398 +msgid "Title (optional)" +msgstr "" + +#: ../../Zotlabs/Module/Article_edit.php:128 +msgid "Edit Article" +msgstr "" + #: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 msgid "Nothing to import." msgstr "" @@ -1459,24 +1520,24 @@ msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:237 +#: ../../Zotlabs/Module/Register.php:249 msgid "Name or caption" msgstr "" #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:237 +#: ../../Zotlabs/Module/Register.php:249 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" #: ../../Zotlabs/Module/New_channel.php:136 -#: ../../Zotlabs/Module/Register.php:239 +#: ../../Zotlabs/Module/Register.php:251 msgid "Choose a short nickname" msgstr "" #: ../../Zotlabs/Module/New_channel.php:136 -#: ../../Zotlabs/Module/Register.php:239 +#: ../../Zotlabs/Module/Register.php:251 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address e." @@ -1484,17 +1545,17 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/New_channel.php:137 -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:252 msgid "Channel role and privacy" msgstr "" #: ../../Zotlabs/Module/New_channel.php:137 -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:252 msgid "Select a channel role with your privacy requirements." msgstr "" #: ../../Zotlabs/Module/New_channel.php:137 -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:252 msgid "Read more about roles" msgstr "" @@ -1556,7 +1617,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Remove Channel" msgstr "" @@ -1569,12 +1630,12 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1394 +#: ../../Zotlabs/Storage/Browser.php:282 ../../include/text.php:1394 msgid "Size" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:237 +#: ../../Zotlabs/Storage/Browser.php:283 msgid "Last Modified" msgstr "" @@ -2159,9 +2220,9 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:259 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:33 -#: ../../Zotlabs/Module/Display.php:347 ../../Zotlabs/Module/Filestorage.php:24 -#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3410 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 +#: ../../Zotlabs/Module/Display.php:408 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3546 msgid "Item not found." msgstr "" @@ -2192,7 +2253,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:271 +#: ../../Zotlabs/Module/Admin/Site.php:275 #: ../../Zotlabs/Module/Admin/Security.php:86 #: ../../Zotlabs/Module/Admin.php:136 msgid "Administration" @@ -2210,8 +2271,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:236 -#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:132 -#: ../../include/nav.php:217 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:139 +#: ../../include/nav.php:224 msgid "Settings" msgstr "" @@ -2295,7 +2356,7 @@ msgid "Switch branch" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:967 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137 #: ../../addon/superblock/superblock.php:116 msgid "Remove" msgstr "" @@ -2318,7 +2379,7 @@ msgstr[1] "" msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:90 ../../include/channel.php:2357 +#: ../../Zotlabs/Module/Admin/Accounts.php:90 ../../include/channel.php:2456 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -2357,7 +2418,7 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:171 -#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:716 +#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:732 msgid "Approve" msgstr "" @@ -2379,7 +2440,7 @@ msgstr "" msgid "ID" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:288 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:284 msgid "All Channels" msgstr "" @@ -2514,7 +2575,7 @@ msgid "Disallow Code" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1791 ../../include/nav.php:399 +#: ../../include/conversation.php:1808 ../../include/nav.php:410 msgid "Channel" msgstr "" @@ -2559,391 +2620,409 @@ msgstr "" msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:144 +#: ../../Zotlabs/Module/Admin/Site.php:147 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:170 +#: ../../Zotlabs/Module/Admin/Site.php:173 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2943 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2968 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:181 -#: ../../Zotlabs/Module/Settings/Display.php:137 +#: ../../Zotlabs/Module/Admin/Site.php:184 +#: ../../Zotlabs/Module/Settings/Display.php:139 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:188 -#: ../../Zotlabs/Module/Settings/Display.php:151 +#: ../../Zotlabs/Module/Admin/Site.php:191 +#: ../../Zotlabs/Module/Settings/Display.php:153 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:190 +#: ../../Zotlabs/Module/Admin/Site.php:193 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:192 +#: ../../Zotlabs/Module/Admin/Site.php:195 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:238 +#: ../../Zotlabs/Module/Admin/Site.php:241 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:244 +#: ../../Zotlabs/Module/Admin/Site.php:247 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:245 +#: ../../Zotlabs/Module/Admin/Site.php:248 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:246 +#: ../../Zotlabs/Module/Admin/Site.php:249 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:247 +#: ../../Zotlabs/Module/Admin/Site.php:250 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:258 +#: ../../Zotlabs/Module/Admin/Site.php:262 msgid "Beginner/Basic" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Admin/Site.php:263 msgid "Novice - not skilled but willing to learn" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:264 msgid "Intermediate - somewhat comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:265 msgid "Advanced - very comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "Expert - I can write computer code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:263 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:272 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:276 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:274 -#: ../../Zotlabs/Module/Register.php:251 +#: ../../Zotlabs/Module/Admin/Site.php:278 +#: ../../Zotlabs/Module/Register.php:263 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:275 +#: ../../Zotlabs/Module/Admin/Site.php:279 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:276 +#: ../../Zotlabs/Module/Admin/Site.php:280 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:277 ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin/Site.php:281 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:281 -#: ../../addon/statusnet/statusnet.php:890 +#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:287 msgid "Site default technical skill level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:287 msgid "Used to provide a member experience matched to technical comfort level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "Lock the technical skill level setting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "Members can set their own technical comfort level by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:289 ../../Zotlabs/Module/Siteinfo.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:293 ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Mobile system theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:325 +msgid "Queue Threshold" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:325 +msgid "" +"Always defer immediate delivery if queue contains more than this number of " +"entries." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:328 +msgid "Allow SVG thumbnails in file browser" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:328 +msgid "WARNING: SVG images may contain malicious code." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "0 for no expiration of imported content" msgstr "" @@ -3220,19 +3299,19 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:103 #: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Defperms.php:250 msgid "My Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:105 #: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Connedit.php:903 +#: ../../Zotlabs/Module/Connedit.php:903 ../../Zotlabs/Module/Defperms.php:248 msgid "inherited" msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Defperms.php:253 msgid "Individual Permissions" msgstr "" @@ -3245,18 +3324,19 @@ msgid "" "individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:62 -#: ../../Zotlabs/Module/Settings/Channel.php:66 -#: ../../Zotlabs/Module/Settings/Channel.php:67 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:81 +#: ../../Zotlabs/Module/Settings/Channel.php:64 +#: ../../Zotlabs/Module/Settings/Channel.php:68 +#: ../../Zotlabs/Module/Settings/Channel.php:69 +#: ../../Zotlabs/Module/Settings/Channel.php:72 +#: ../../Zotlabs/Module/Settings/Channel.php:83 #: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:28 -#: ../../include/selectors.php:123 ../../include/channel.php:423 -#: ../../include/channel.php:424 ../../include/channel.php:431 +#: ../../include/selectors.php:123 ../../include/channel.php:437 +#: ../../include/channel.php:438 ../../include/channel.php:445 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:255 +#: ../../Zotlabs/Module/Settings/Channel.php:262 +#: ../../Zotlabs/Module/Defperms.php:103 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54 @@ -3265,387 +3345,402 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:316 +#: ../../Zotlabs/Module/Settings/Channel.php:323 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:317 +#: ../../Zotlabs/Module/Settings/Channel.php:324 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:318 +#: ../../Zotlabs/Module/Settings/Channel.php:325 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:319 +#: ../../Zotlabs/Module/Settings/Channel.php:326 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:320 +#: ../../Zotlabs/Module/Settings/Channel.php:327 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:321 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:322 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:323 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:399 +#: ../../Zotlabs/Module/Settings/Channel.php:406 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:404 +#: ../../Zotlabs/Module/Settings/Channel.php:411 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:408 -#: ../../Zotlabs/Module/Profile_photo.php:437 +#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Profile_photo.php:443 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:413 +#: ../../Zotlabs/Module/Settings/Channel.php:420 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:416 +#: ../../Zotlabs/Module/Settings/Channel.php:423 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:478 +#: ../../Zotlabs/Module/Settings/Channel.php:487 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:485 +#: ../../Zotlabs/Module/Settings/Channel.php:494 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:486 ../../include/channel.php:1473 +#: ../../Zotlabs/Module/Settings/Channel.php:495 ../../include/channel.php:1521 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:487 +#: ../../Zotlabs/Module/Settings/Channel.php:496 #: ../../Zotlabs/Module/Settings/Account.php:119 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:497 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:489 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:489 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:490 +#: ../../Zotlabs/Module/Settings/Channel.php:499 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:492 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:492 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:494 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:496 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:524 +msgid "Profile to assign new connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:533 msgid "Channel permissions category:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:522 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Default Permissions Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:545 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:538 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:563 msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 -#: ../../Zotlabs/Module/Settings/Channel.php:558 -#: ../../Zotlabs/Module/Settings/Channel.php:559 -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "Unseen public activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:576 +msgid "Email notification hub (hostname)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#, php-format +msgid "" +"If your channel is mirrored to multiple hubs, set this to your preferred " +"location. This will prevent duplicate email notifications. Example: %s" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "" "Also show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Start calendar week on Monday" msgstr "" @@ -3799,116 +3894,124 @@ msgstr "" msgid "Feature/Addon Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:145 +#: ../../Zotlabs/Module/Settings/Display.php:147 msgid "No special theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:148 +#: ../../Zotlabs/Module/Settings/Display.php:150 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:204 msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:203 +#: ../../Zotlabs/Module/Settings/Display.php:205 msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:204 +#: ../../Zotlabs/Module/Settings/Display.php:206 msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:207 msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:211 +#: ../../Zotlabs/Module/Settings/Display.php:213 msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:212 +#: ../../Zotlabs/Module/Settings/Display.php:214 msgid "Select scheme" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:214 +#: ../../Zotlabs/Module/Settings/Display.php:216 msgid "Mobile Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:215 +#: ../../Zotlabs/Module/Settings/Display.php:217 msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:215 +#: ../../Zotlabs/Module/Settings/Display.php:217 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:216 +#: ../../Zotlabs/Module/Settings/Display.php:218 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:217 +#: ../../Zotlabs/Module/Settings/Display.php:219 msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:217 +#: ../../Zotlabs/Module/Settings/Display.php:219 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:218 +#: ../../Zotlabs/Module/Settings/Display.php:220 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:218 +#: ../../Zotlabs/Module/Settings/Display.php:220 msgid "Maximum of 100 items" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:219 +#: ../../Zotlabs/Module/Settings/Display.php:221 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:220 +#: ../../Zotlabs/Module/Settings/Display.php:222 +msgid "Provide channel menu in navigation bar" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:222 +msgid "Default: channel menu located in app menu" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:223 msgid "Manual conversation updates" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:220 +#: ../../Zotlabs/Module/Settings/Display.php:223 msgid "Default is on, turning this off may increase screen jumping" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:221 +#: ../../Zotlabs/Module/Settings/Display.php:224 msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:222 +#: ../../Zotlabs/Module/Settings/Display.php:225 msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:225 +#: ../../Zotlabs/Module/Settings/Display.php:228 msgid "Use blog/list mode on channel page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:225 -#: ../../Zotlabs/Module/Settings/Display.php:226 +#: ../../Zotlabs/Module/Settings/Display.php:228 +#: ../../Zotlabs/Module/Settings/Display.php:229 msgid "(comments displayed separately)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:226 +#: ../../Zotlabs/Module/Settings/Display.php:229 msgid "Use blog/list mode on grid page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:227 +#: ../../Zotlabs/Module/Settings/Display.php:230 msgid "Channel page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:227 -#: ../../Zotlabs/Module/Settings/Display.php:228 +#: ../../Zotlabs/Module/Settings/Display.php:230 +#: ../../Zotlabs/Module/Settings/Display.php:231 msgid "click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:228 +#: ../../Zotlabs/Module/Settings/Display.php:231 msgid "Grid page max height of content (in pixels)" msgstr "" @@ -3932,7 +4035,7 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:90 #: ../../Zotlabs/Module/Settings/Oauth.php:116 -#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:775 +#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:775 msgid "Consumer Key" msgstr "" @@ -3943,7 +4046,7 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:91 #: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../addon/statusnet/statusnet.php:892 ../../addon/twitter/twitter.php:776 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:776 msgid "Consumer Secret" msgstr "" @@ -3987,24 +4090,24 @@ msgstr "" msgid "Remove authorization" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:758 -#: ../../Zotlabs/Module/Photos.php:1297 ../../Zotlabs/Widget/Portfolio.php:78 +#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:811 +#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Widget/Portfolio.php:87 #: ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:789 -#: ../../Zotlabs/Widget/Portfolio.php:97 ../../Zotlabs/Widget/Album.php:95 +#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:842 +#: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:791 -#: ../../Zotlabs/Module/Photos.php:1328 -#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:712 +#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +#: ../../Zotlabs/Module/Profile_photo.php:437 #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:337 -#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168 -#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97 +#: ../../Zotlabs/Storage/Browser.php:274 ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169 +#: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Album.php:97 msgid "Upload" msgstr "" @@ -4066,9 +4169,9 @@ msgid "URL for photo of thing (optional)" msgstr "" #: ../../Zotlabs/Module/Thing.php:314 ../../Zotlabs/Module/Thing.php:367 -#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1018 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 -#: ../../Zotlabs/Module/Filestorage.php:142 ../../include/acl_selectors.php:218 +#: ../../Zotlabs/Module/Filestorage.php:147 ../../include/acl_selectors.php:218 msgid "Permissions" msgstr "" @@ -4076,11 +4179,11 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:38 +#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:57 msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:42 +#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:61 msgid "System Notifications" msgstr "" @@ -4098,7 +4201,7 @@ msgid "No channel. Import failed." msgstr "" #: ../../Zotlabs/Module/Import.php:481 -#: ../../addon/diaspora/import_diaspora.php:142 +#: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "" @@ -4163,30 +4266,24 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1640 -#: ../../include/channel.php:2204 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1665 +#: ../../include/channel.php:2301 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2205 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2302 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2206 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2303 msgid "Authenticate" msgstr "" -#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96 -#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31 -#: ../../Zotlabs/Module/Block.php:41 ../../Zotlabs/Module/Card_edit.php:44 -msgid "Channel not found." -msgstr "" - #: ../../Zotlabs/Module/Cal.php:69 msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2312 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2312 msgid "Import" msgstr "" @@ -4212,18 +4309,6 @@ msgstr "" msgid "Item not available." msgstr "" -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 -#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 -#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 -#: ../../include/conversation.php:1261 -msgid "Insert web link" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:129 -#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1381 -msgid "Title (optional)" -msgstr "" - #: ../../Zotlabs/Module/Editblock.php:138 msgid "Edit Block" msgstr "" @@ -4244,7 +4329,7 @@ msgstr "" msgid "Create new app" msgstr "" -#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256 +#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268 #, php-format msgctxt "mood" msgid "%1$s is %2$s" @@ -4283,7 +4368,8 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:74 #: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1697 +#: ../../Zotlabs/Module/Notifications.php:52 +#: ../../include/conversation.php:1714 msgid "New" msgstr "" @@ -4294,7 +4380,7 @@ msgid "All" msgstr "" #: ../../Zotlabs/Module/Connections.php:133 -#: ../../Zotlabs/Widget/Notifications.php:80 +#: ../../Zotlabs/Widget/Notifications.php:82 msgid "New Connections" msgstr "" @@ -4385,7 +4471,7 @@ msgid "Recent activity" msgstr "" #: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229 -#: ../../include/text.php:959 ../../include/nav.php:107 +#: ../../include/text.php:959 ../../include/nav.php:114 msgid "Connections" msgstr "" @@ -4398,8 +4484,8 @@ msgid "Connections search" msgstr "" #: ../../Zotlabs/Module/Connections.php:316 -#: ../../Zotlabs/Module/Directory.php:391 -#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Directory.php:396 +#: ../../Zotlabs/Module/Directory.php:401 ../../include/contact_widgets.php:23 msgid "Find" msgstr "" @@ -4463,238 +4549,238 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1030 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083 msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:501 +#: ../../Zotlabs/Module/Photos.php:551 msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Photos.php:550 +#: ../../Zotlabs/Module/Photos.php:600 msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:593 +#: ../../Zotlabs/Module/Photos.php:646 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:596 +#: ../../Zotlabs/Module/Photos.php:649 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:638 +#: ../../Zotlabs/Module/Photos.php:691 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:642 +#: ../../Zotlabs/Module/Photos.php:695 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:643 +#: ../../Zotlabs/Module/Photos.php:696 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Photos.php:697 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:645 +#: ../../Zotlabs/Module/Photos.php:698 msgid "Caption (optional):" msgstr "" -#: ../../Zotlabs/Module/Photos.php:646 +#: ../../Zotlabs/Module/Photos.php:699 msgid "Description (optional):" msgstr "" -#: ../../Zotlabs/Module/Photos.php:732 +#: ../../Zotlabs/Module/Photos.php:785 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:734 +#: ../../Zotlabs/Module/Photos.php:787 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:839 +#: ../../Zotlabs/Module/Photos.php:892 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:841 +#: ../../Zotlabs/Module/Photos.php:894 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:899 +#: ../../Zotlabs/Module/Photos.php:952 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:900 +#: ../../Zotlabs/Module/Photos.php:953 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:907 +#: ../../Zotlabs/Module/Photos.php:960 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:922 +#: ../../Zotlabs/Module/Photos.php:975 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1004 +#: ../../Zotlabs/Module/Photos.php:1057 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1006 +#: ../../Zotlabs/Module/Photos.php:1059 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1007 +#: ../../Zotlabs/Module/Photos.php:1060 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1010 +#: ../../Zotlabs/Module/Photos.php:1063 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1011 +#: ../../Zotlabs/Module/Photos.php:1064 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1012 +#: ../../Zotlabs/Module/Photos.php:1065 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1015 +#: ../../Zotlabs/Module/Photos.php:1068 msgid "Caption" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1017 +#: ../../Zotlabs/Module/Photos.php:1070 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1025 +#: ../../Zotlabs/Module/Photos.php:1078 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1028 +#: ../../Zotlabs/Module/Photos.php:1081 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Lib/ThreadItem.php:271 +#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1048 ../../Zotlabs/Lib/ThreadItem.php:272 +#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1050 ../../Zotlabs/Lib/ThreadItem.php:416 -#: ../../include/conversation.php:768 +#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427 +#: ../../include/conversation.php:785 msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1066 ../../Zotlabs/Module/Photos.php:1184 -#: ../../Zotlabs/Lib/ThreadItem.php:740 +#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 +#: ../../Zotlabs/Lib/ThreadItem.php:751 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Photos.php:1186 -#: ../../Zotlabs/Lib/ThreadItem.php:742 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 +#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1084 ../../include/conversation.php:594 +#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1084 ../../include/conversation.php:594 +#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Module/Photos.php:1115 -#: ../../Zotlabs/Lib/ThreadItem.php:191 ../../Zotlabs/Lib/ThreadItem.php:203 +#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168 +#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:195 -#: ../../include/conversation.php:1950 ../../include/channel.php:1491 -#: ../../include/taxonomy.php:520 +#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 +#: ../../include/conversation.php:1978 ../../include/channel.php:1539 +#: ../../include/taxonomy.php:593 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1112 ../../Zotlabs/Lib/ThreadItem.php:200 -#: ../../include/conversation.php:1953 +#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 +#: ../../include/conversation.php:1981 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Module/Photos.php:1265 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1221 +#: ../../Zotlabs/Module/Photos.php:1274 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1226 +#: ../../Zotlabs/Module/Photos.php:1279 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1234 ../../Zotlabs/Lib/ThreadItem.php:404 +#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405 +#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1240 ../../Zotlabs/Lib/ThreadItem.php:410 +#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 #: ../../include/acl_selectors.php:220 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1312 ../../Zotlabs/Module/Photos.php:1325 -#: ../../Zotlabs/Module/Photos.php:1326 ../../include/photos.php:601 +#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:656 msgid "Recent Photos" msgstr "" @@ -4702,7 +4788,8 @@ msgstr "" msgid "Profile Unavailable." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:44 ../../addon/gitwiki/Mod_Gitwiki.php:42 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:108 +#: ../../addon/gitwiki/Mod_Gitwiki.php:42 msgid "Not found" msgstr "" @@ -4723,7 +4810,7 @@ msgid "Error downloading wiki: " msgstr "" #: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1897 ../../include/nav.php:504 +#: ../../include/conversation.php:1925 ../../include/nav.php:526 msgid "Wikis" msgstr "" @@ -4745,22 +4832,25 @@ msgstr "" msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:336 -#: ../../Zotlabs/Widget/Wiki_pages.php:57 ../../include/text.php:1802 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1802 +#: ../../include/features.php:378 msgid "Markdown" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:336 -#: ../../Zotlabs/Widget/Wiki_pages.php:57 ../../include/text.php:1800 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1800 msgid "BBcode" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:57 -#: ../../include/text.php:1803 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1803 msgid "Text" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:235 +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:281 #: ../../addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" msgstr "" @@ -4789,127 +4879,127 @@ msgstr "" msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:214 +#: ../../Zotlabs/Module/Wiki.php:305 ../../addon/gitwiki/Mod_Gitwiki.php:214 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:302 ../../Zotlabs/Module/Wiki.php:304 +#: ../../Zotlabs/Module/Wiki.php:313 ../../Zotlabs/Module/Wiki.php:315 msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:331 ../../addon/gitwiki/Mod_Gitwiki.php:242 +#: ../../Zotlabs/Module/Wiki.php:343 ../../addon/gitwiki/Mod_Gitwiki.php:242 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:332 ../../addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../Zotlabs/Module/Wiki.php:344 ../../addon/gitwiki/Mod_Gitwiki.php:243 msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:339 +#: ../../Zotlabs/Module/Wiki.php:351 msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:346 ../../addon/gitwiki/Mod_Gitwiki.php:252 +#: ../../Zotlabs/Module/Wiki.php:358 ../../addon/gitwiki/Mod_Gitwiki.php:252 msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:356 ../../addon/gitwiki/Mod_Gitwiki.php:260 +#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:260 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:361 ../../addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1265 +#: ../../Zotlabs/Module/Wiki.php:373 ../../addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1282 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:362 ../../addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1368 +#: ../../Zotlabs/Module/Wiki.php:374 ../../addon/gitwiki/Mod_Gitwiki.php:266 +#: ../../include/conversation.php:1385 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1370 ../../include/conversation.php:1417 +#: ../../Zotlabs/Module/Wiki.php:376 ../../addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1387 ../../include/conversation.php:1434 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:365 ../../addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1301 +#: ../../Zotlabs/Module/Wiki.php:377 ../../addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1318 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:366 ../../addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1302 +#: ../../Zotlabs/Module/Wiki.php:378 ../../addon/gitwiki/Mod_Gitwiki.php:270 +#: ../../include/conversation.php:1319 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:367 ../../addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:379 ../../addon/gitwiki/Mod_Gitwiki.php:271 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1304 +#: ../../Zotlabs/Module/Wiki.php:380 ../../addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1321 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:369 ../../addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1305 +#: ../../Zotlabs/Module/Wiki.php:381 ../../addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1322 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:370 ../../addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1306 +#: ../../Zotlabs/Module/Wiki.php:382 ../../addon/gitwiki/Mod_Gitwiki.php:274 +#: ../../include/conversation.php:1323 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:442 ../../addon/gitwiki/Mod_Gitwiki.php:337 +#: ../../Zotlabs/Module/Wiki.php:458 ../../addon/gitwiki/Mod_Gitwiki.php:337 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:449 +#: ../../Zotlabs/Module/Wiki.php:465 msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:462 ../../addon/gitwiki/Mod_Gitwiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:478 ../../addon/gitwiki/Mod_Gitwiki.php:348 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:469 ../../addon/gitwiki/Mod_Gitwiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:485 ../../addon/gitwiki/Mod_Gitwiki.php:353 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:492 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Error updating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:512 +#: ../../Zotlabs/Module/Wiki.php:528 msgid "Error updating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:527 +#: ../../Zotlabs/Module/Wiki.php:543 msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:537 +#: ../../Zotlabs/Module/Wiki.php:553 msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:565 ../../addon/gitwiki/Mod_Gitwiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:586 ../../addon/gitwiki/Mod_Gitwiki.php:400 msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:686 +#: ../../Zotlabs/Module/Wiki.php:707 msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:750 +#: ../../Zotlabs/Module/Wiki.php:771 msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:750 +#: ../../Zotlabs/Module/Wiki.php:771 msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:800 +#: ../../Zotlabs/Module/Wiki.php:821 msgid "You must be authenticated." msgstr "" @@ -4925,7 +5015,7 @@ msgstr "" msgid "Feature disabled." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:88 +#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90 msgid "Edit System Page Description" msgstr "" @@ -4937,24 +5027,28 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:83 +#: ../../Zotlabs/Module/Pdledit.php:85 msgid "Layout not found." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:89 +#: ../../Zotlabs/Module/Pdledit.php:91 msgid "Module Name:" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:90 +#: ../../Zotlabs/Module/Pdledit.php:92 msgid "Layout Help" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:91 +#: ../../Zotlabs/Module/Pdledit.php:93 msgid "Edit another layout" msgstr "" +#: ../../Zotlabs/Module/Pdledit.php:94 +msgid "System layout" +msgstr "" + #: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1075 +#: ../../include/conversation.php:1092 msgid "Poke" msgstr "" @@ -4988,8 +5082,8 @@ msgid "Image uploaded but image cropping failed." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:234 -#: ../../include/photo/photo_driver.php:710 +#: ../../Zotlabs/Module/Profile_photo.php:240 +#: ../../include/photo/photo_driver.php:740 msgid "Profile Photos" msgstr "" @@ -4998,80 +5092,80 @@ msgstr "" msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:204 +#: ../../Zotlabs/Module/Profile_photo.php:210 #: ../../addon/openclipatar/openclipatar.php:298 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:211 -#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:156 +#: ../../Zotlabs/Module/Profile_photo.php:217 +#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195 msgid "Unable to process image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:246 +#: ../../Zotlabs/Module/Profile_photo.php:252 #: ../../Zotlabs/Module/Cover_photo.php:197 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:265 +#: ../../Zotlabs/Module/Profile_photo.php:271 #: ../../Zotlabs/Module/Cover_photo.php:214 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:326 -#: ../../Zotlabs/Module/Profile_photo.php:373 +#: ../../Zotlabs/Module/Profile_photo.php:332 +#: ../../Zotlabs/Module/Profile_photo.php:379 #: ../../Zotlabs/Module/Cover_photo.php:307 #: ../../Zotlabs/Module/Cover_photo.php:322 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:428 +#: ../../Zotlabs/Module/Profile_photo.php:434 #: ../../Zotlabs/Module/Cover_photo.php:358 msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Profile_photo.php:435 #: ../../Zotlabs/Module/Cover_photo.php:359 msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:430 +#: ../../Zotlabs/Module/Profile_photo.php:436 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:430 +#: ../../Zotlabs/Module/Profile_photo.php:436 msgid "Upload Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Profile_photo.php:437 #: ../../addon/openclipatar/openclipatar.php:182 #: ../../addon/openclipatar/openclipatar.php:194 msgid "Use" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:437 +#: ../../Zotlabs/Module/Profile_photo.php:443 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "skip this step" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:437 +#: ../../Zotlabs/Module/Profile_photo.php:443 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "select a photo from your photo albums" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:456 +#: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Cover_photo.php:381 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Profile_photo.php:463 #: ../../Zotlabs/Module/Cover_photo.php:382 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Cover_photo.php:384 msgid "Done Editing" msgstr "" @@ -5084,65 +5178,65 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Item.php:185 +#: ../../Zotlabs/Module/Item.php:193 msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:470 +#: ../../Zotlabs/Module/Item.php:475 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:870 +#: ../../Zotlabs/Module/Item.php:853 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1015 +#: ../../Zotlabs/Module/Item.php:998 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1051 +#: ../../Zotlabs/Module/Item.php:1034 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1156 +#: ../../Zotlabs/Module/Item.php:1139 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1163 +#: ../../Zotlabs/Module/Item.php:1168 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1170 +#: ../../Zotlabs/Module/Item.php:1175 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Ping.php:318 +#: ../../Zotlabs/Module/Ping.php:311 msgid "sent you a private message" msgstr "" -#: ../../Zotlabs/Module/Ping.php:369 +#: ../../Zotlabs/Module/Ping.php:360 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:393 +#: ../../Zotlabs/Module/Ping.php:384 msgid "requires approval" msgstr "" -#: ../../Zotlabs/Module/Ping.php:403 +#: ../../Zotlabs/Module/Ping.php:394 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Module/Ping.php:421 +#: ../../Zotlabs/Module/Ping.php:412 msgid "[today]" msgstr "" -#: ../../Zotlabs/Module/Ping.php:430 +#: ../../Zotlabs/Module/Ping.php:421 msgid "posted an event" msgstr "" -#: ../../Zotlabs/Module/Ping.php:463 +#: ../../Zotlabs/Module/Ping.php:454 msgid "shared a file with you" msgstr "" @@ -5150,14 +5244,14 @@ msgstr "" msgid "Invalid item." msgstr "" -#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Display.php:120 -#: ../../Zotlabs/Lib/NativeWikiPage.php:515 ../../Zotlabs/Web/Router.php:158 +#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 +#: ../../Zotlabs/Module/Display.php:133 +#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:168 #: ../../include/help.php:81 msgid "Page not found." msgstr "" -#: ../../Zotlabs/Module/Page.php:165 +#: ../../Zotlabs/Module/Page.php:173 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, " @@ -5167,7 +5261,7 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:79 +#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59 msgid "Could not access contact record." msgstr "" @@ -5207,7 +5301,7 @@ msgstr "" #: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:241 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:1015 ../../include/nav.php:141 +#: ../../include/conversation.php:1032 ../../include/nav.php:148 msgid "View Profile" msgstr "" @@ -5375,17 +5469,17 @@ msgid "" "not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:867 +#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Defperms.php:238 #: ../../Zotlabs/Widget/Settings_menu.php:109 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:3974 +#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4134 #, php-format msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Connedit.php:868 ../../Zotlabs/Module/Defperms.php:239 msgid "Apply these permissions automatically" msgstr "" @@ -5393,11 +5487,11 @@ msgstr "" msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Defperms.php:240 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Defperms.php:241 msgid "Add permission role" msgstr "" @@ -5409,7 +5503,7 @@ msgstr "" msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:883 +#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Defperms.php:245 msgid "" "The permissions indicated on this page will be applied to all new " "connections." @@ -5510,13 +5604,13 @@ msgid "Bookmark this room" msgstr "" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1296 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1313 msgid "Please enter a link URL:" msgstr "" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:757 -#: ../../include/conversation.php:1415 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:768 +#: ../../include/conversation.php:1432 msgid "Encrypt text" msgstr "" @@ -5550,13 +5644,13 @@ msgid "min" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:242 -#: ../../include/conversation.php:1814 ../../include/nav.php:422 +#: ../../include/conversation.php:1831 ../../include/nav.php:433 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237 -#: ../../Zotlabs/Storage/Browser.php:225 ../../include/conversation.php:1822 -#: ../../include/nav.php:430 +#: ../../Zotlabs/Storage/Browser.php:269 ../../include/conversation.php:1839 +#: ../../include/nav.php:441 msgid "Files" msgstr "" @@ -5653,7 +5747,7 @@ msgid "Layouts" msgstr "" #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:245 -#: ../../include/nav.php:201 ../../include/nav.php:301 +#: ../../include/nav.php:208 ../../include/nav.php:312 #: ../../include/help.php:68 ../../include/help.php:74 msgid "Help" msgstr "" @@ -5670,17 +5764,25 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141 -#: ../../include/bbcode.php:333 +#: ../../Zotlabs/Module/Cloud.php:114 +msgid "Unknown error" +msgstr "" + +#: ../../Zotlabs/Module/Tagger.php:48 +msgid "Post not found." +msgstr "" + +#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 +#: ../../include/bbcode.php:335 msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146 +#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 #: ../../include/text.php:1946 msgid "comment" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:95 +#: ../../Zotlabs/Module/Tagger.php:117 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -5700,6 +5802,21 @@ msgid "" "to correctly use this feature." msgstr "" +#: ../../Zotlabs/Module/Defperms.php:239 +msgid "" +"If enabled, connection requests will be approved without your interaction" +msgstr "" + +#: ../../Zotlabs/Module/Defperms.php:246 +msgid "Automatic approval settings" +msgstr "" + +#: ../../Zotlabs/Module/Defperms.php:254 +msgid "" +"Some individual permissions may have been preset or locked based on your " +"channel type and privacy settings." +msgstr "" + #: ../../Zotlabs/Module/Group.php:24 msgid "Privacy group created." msgstr "" @@ -5709,7 +5826,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:3941 +#: ../../include/items.php:4101 msgid "Privacy group not found." msgstr "" @@ -5844,7 +5961,7 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1284 +#: ../../include/channel.php:1320 msgid "Edit visibility" msgstr "" @@ -5856,7 +5973,7 @@ msgstr "" msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1255 +#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1290 msgid "Change profile photo" msgstr "" @@ -5876,7 +5993,7 @@ msgstr "" msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1688 +#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1705 msgid "Personal" msgstr "" @@ -5884,7 +6001,7 @@ msgstr "" msgid "Relation" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55 +#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "" @@ -6021,12 +6138,12 @@ msgstr "" msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1280 +#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1316 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1262 -#: ../../include/nav.php:144 +#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1297 +#: ../../include/nav.php:151 msgid "Edit Profiles" msgstr "" @@ -6043,7 +6160,7 @@ msgid "Create a new channel" msgstr "" #: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234 -#: ../../include/nav.php:129 ../../include/nav.php:215 +#: ../../include/nav.php:136 ../../include/nav.php:222 msgid "Channel Manager" msgstr "" @@ -6077,12 +6194,6 @@ msgstr "" msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Cards.php:38 ../../Zotlabs/Module/Cards.php:178 -#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1873 -#: ../../include/features.php:122 ../../include/nav.php:479 -msgid "Cards" -msgstr "" - #: ../../Zotlabs/Module/Cards.php:95 msgid "Add Card" msgstr "" @@ -6103,7 +6214,7 @@ msgstr "" msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:221 +#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:229 msgid "Terms of Service" msgstr "" @@ -6138,7 +6249,7 @@ msgid "No ratings" msgstr "" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1065 +#: ../../include/conversation.php:1082 msgid "Ratings" msgstr "" @@ -6171,7 +6282,7 @@ msgid "Export selected" msgstr "" #: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:238 -#: ../../include/conversation.php:1884 ../../include/nav.php:491 +#: ../../include/conversation.php:1912 ../../include/nav.php:513 msgid "Webpages" msgstr "" @@ -6213,13 +6324,13 @@ msgid "" "password." msgstr "" -#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:209 -#: ../../include/channel.php:579 +#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214 +#: ../../include/channel.php:599 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:214 -#: ../../include/channel.php:584 +#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219 +#: ../../include/channel.php:604 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" @@ -6305,7 +6416,8 @@ msgstr "" msgid "Delivery report for %1$s" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:60 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Options" msgstr "" @@ -6330,7 +6442,7 @@ msgid "*" msgstr "" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:218 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:228 msgid "Channel Sources" msgstr "" @@ -6386,200 +6498,200 @@ msgstr "" msgid "Unable to remove source." msgstr "" -#: ../../Zotlabs/Module/Like.php:19 +#: ../../Zotlabs/Module/Like.php:22 msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Like.php:24 +#: ../../Zotlabs/Module/Like.php:27 msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Like.php:25 +#: ../../Zotlabs/Module/Like.php:28 msgid "" "Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" "\"register\">register as a new $Projectname member</a> to continue." msgstr "" -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 +#: ../../Zotlabs/Module/Like.php:108 ../../Zotlabs/Module/Like.php:134 +#: ../../Zotlabs/Module/Like.php:172 msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:122 +#: ../../Zotlabs/Module/Like.php:120 ../../include/conversation.php:122 msgid "channel" msgstr "" -#: ../../Zotlabs/Module/Like.php:146 +#: ../../Zotlabs/Module/Like.php:149 msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Like.php:192 +#: ../../Zotlabs/Module/Like.php:195 msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Like.php:240 +#: ../../Zotlabs/Module/Like.php:243 msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1453 -#: ../../addon/pubcrawl/as.php:1323 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:435 ../../addon/diaspora/Receiver.php:1462 +#: ../../addon/pubcrawl/as.php:1330 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:425 ../../addon/pubcrawl/as.php:1325 +#: ../../Zotlabs/Module/Like.php:437 ../../addon/pubcrawl/as.php:1332 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:427 +#: ../../Zotlabs/Module/Like.php:439 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:429 +#: ../../Zotlabs/Module/Like.php:441 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:431 +#: ../../Zotlabs/Module/Like.php:443 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:433 +#: ../../Zotlabs/Module/Like.php:445 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:435 +#: ../../Zotlabs/Module/Like.php:447 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:437 +#: ../../Zotlabs/Module/Like.php:449 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:547 +#: ../../Zotlabs/Module/Like.php:561 msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Like.php:548 +#: ../../Zotlabs/Module/Like.php:562 msgid "Thank you." msgstr "" -#: ../../Zotlabs/Module/Directory.php:245 +#: ../../Zotlabs/Module/Directory.php:250 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Directory.php:256 +#: ../../Zotlabs/Module/Directory.php:261 msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:258 +#: ../../Zotlabs/Module/Directory.php:263 msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:260 +#: ../../Zotlabs/Module/Directory.php:265 msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1516 +#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1564 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1352 -#: ../../include/event.php:52 ../../include/event.php:84 +#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1392 +#: ../../include/event.php:53 ../../include/event.php:85 msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:320 +#: ../../Zotlabs/Module/Directory.php:325 msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1532 +#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1580 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1540 +#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1588 msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:333 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1035 ../../include/channel.php:1337 +#: ../../include/conversation.php:1052 ../../include/channel.php:1377 #: ../../include/connections.php:111 msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Directory.php:329 +#: ../../Zotlabs/Module/Directory.php:334 msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:332 +#: ../../Zotlabs/Module/Directory.php:337 msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:335 +#: ../../Zotlabs/Module/Directory.php:340 msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:337 -msgid "Common connections:" +#: ../../Zotlabs/Module/Directory.php:342 +msgid "Common connections (estimated):" msgstr "" -#: ../../Zotlabs/Module/Directory.php:386 +#: ../../Zotlabs/Module/Directory.php:391 msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:386 +#: ../../Zotlabs/Module/Directory.php:391 msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:392 +#: ../../Zotlabs/Module/Directory.php:397 msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:400 ../../Zotlabs/Module/Suggest.php:64 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:402 msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:402 msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:398 +#: ../../Zotlabs/Module/Directory.php:403 msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:399 +#: ../../Zotlabs/Module/Directory.php:404 msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:400 +#: ../../Zotlabs/Module/Directory.php:405 msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:406 msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:419 +#: ../../Zotlabs/Module/Directory.php:424 msgid "No entries (some entries may be hidden)." msgstr "" @@ -6662,7 +6774,7 @@ msgid "Subject:" msgstr "" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1365 +#: ../../include/conversation.php:1382 msgid "Attach file" msgstr "" @@ -6671,7 +6783,7 @@ msgid "Send" msgstr "" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1410 +#: ../../include/conversation.php:1427 msgid "Set expiration date" msgstr "" @@ -6747,28 +6859,28 @@ msgstr "" msgid "Rate" msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263 +#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:263 msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269 +#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:269 msgid "block" msgstr "" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266 +#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:266 msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272 +#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:272 msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Impel.php:181 +#: ../../Zotlabs/Module/Impel.php:183 #, php-format msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Impel.php:184 +#: ../../Zotlabs/Module/Impel.php:186 #, php-format msgid "%s element installation failed" msgstr "" @@ -6797,7 +6909,7 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:141 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151 msgid "Save to Folder" msgstr "" @@ -6819,81 +6931,85 @@ msgstr "" msgid "Passwords do not match." msgstr "" -#: ../../Zotlabs/Module/Register.php:131 +#: ../../Zotlabs/Module/Register.php:127 ../../Zotlabs/Module/Register.php:137 msgid "" "Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../Zotlabs/Module/Register.php:137 +#: ../../Zotlabs/Module/Register.php:135 +msgid "Registration successful. Continue to create your first channel..." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:144 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../Zotlabs/Module/Register.php:140 +#: ../../Zotlabs/Module/Register.php:147 msgid "Your registration can not be processed." msgstr "" -#: ../../Zotlabs/Module/Register.php:184 +#: ../../Zotlabs/Module/Register.php:192 msgid "Registration on this hub is disabled." msgstr "" -#: ../../Zotlabs/Module/Register.php:193 +#: ../../Zotlabs/Module/Register.php:201 msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:194 +#: ../../Zotlabs/Module/Register.php:202 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" msgstr "" -#: ../../Zotlabs/Module/Register.php:204 +#: ../../Zotlabs/Module/Register.php:212 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:227 +#: ../../Zotlabs/Module/Register.php:235 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:229 +#: ../../Zotlabs/Module/Register.php:241 #, php-format -msgid "I am over 13 years of age and accept the %s for this website" +msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:233 +#: ../../Zotlabs/Module/Register.php:245 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:234 +#: ../../Zotlabs/Module/Register.php:246 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:235 +#: ../../Zotlabs/Module/Register.php:247 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:236 +#: ../../Zotlabs/Module/Register.php:248 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:241 +#: ../../Zotlabs/Module/Register.php:253 msgid "no" msgstr "" -#: ../../Zotlabs/Module/Register.php:241 +#: ../../Zotlabs/Module/Register.php:253 msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/Register.php:268 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1620 -#: ../../include/nav.php:189 +#: ../../Zotlabs/Module/Register.php:280 ../../boot.php:1645 +#: ../../include/nav.php:196 msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Register.php:269 +#: ../../Zotlabs/Module/Register.php:281 msgid "" "This site may require email verification after submitting this form. If you " "are returned to a login page, please check your email for instructions." @@ -6904,30 +7020,30 @@ msgstr "" msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4320 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4478 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4321 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4479 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4322 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4480 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4323 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4481 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4325 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4483 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1980 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2053 msgid "cover photo" msgstr "" @@ -6939,8 +7055,8 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1804 -#: ../../include/nav.php:412 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1821 +#: ../../include/nav.php:423 msgid "About" msgstr "" @@ -6964,7 +7080,11 @@ msgstr "" msgid "Contents" msgstr "" -#: ../../Zotlabs/Module/Display.php:340 +#: ../../Zotlabs/Module/Display.php:349 +msgid "Article" +msgstr "" + +#: ../../Zotlabs/Module/Display.php:401 msgid "Item has been removed." msgstr "" @@ -6984,35 +7104,35 @@ msgstr "" msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:136 +#: ../../Zotlabs/Module/Network.php:137 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:141 +#: ../../Zotlabs/Module/Network.php:142 msgid "forum" msgstr "" -#: ../../Zotlabs/Module/Network.php:153 +#: ../../Zotlabs/Module/Network.php:154 msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:221 +#: ../../Zotlabs/Module/Network.php:222 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:230 +#: ../../Zotlabs/Module/Network.php:231 msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Network.php:256 +#: ../../Zotlabs/Module/Network.php:257 msgid "Invalid connection." msgstr "" -#: ../../Zotlabs/Module/Network.php:275 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:276 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "" -#: ../../Zotlabs/Module/Acl.php:351 +#: ../../Zotlabs/Module/Acl.php:358 msgid "network" msgstr "" @@ -7034,40 +7154,40 @@ msgstr "" msgid "File not found." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:137 +#: ../../Zotlabs/Module/Filestorage.php:142 msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:149 +#: ../../Zotlabs/Module/Filestorage.php:154 msgid "Set/edit permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:150 +#: ../../Zotlabs/Module/Filestorage.php:155 msgid "Include all files and sub folders" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:151 +#: ../../Zotlabs/Module/Filestorage.php:156 msgid "Return to file list" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:153 +#: ../../Zotlabs/Module/Filestorage.php:158 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:154 +#: ../../Zotlabs/Module/Filestorage.php:159 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:156 +#: ../../Zotlabs/Module/Filestorage.php:161 msgid "Share this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:157 +#: ../../Zotlabs/Module/Filestorage.php:162 msgid "Show URL to this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:158 -#: ../../Zotlabs/Storage/Browser.php:351 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:394 msgid "Show in your contacts shared folder" msgstr "" @@ -7201,7 +7321,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1648 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1673 msgid "Password Reset" msgstr "" @@ -7246,8 +7366,8 @@ msgstr "" msgid "Email Address" msgstr "" -#: ../../Zotlabs/Module/Notifications.php:43 -#: ../../Zotlabs/Lib/ThreadItem.php:397 +#: ../../Zotlabs/Module/Notifications.php:62 +#: ../../Zotlabs/Lib/ThreadItem.php:408 msgid "Mark all seen" msgstr "" @@ -7299,31 +7419,30 @@ msgstr "" msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:232 ../../include/features.php:342 +#: ../../Zotlabs/Lib/Apps.php:232 ../../include/features.php:352 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1639 ../../include/nav.php:153 -#: ../../include/nav.php:157 +#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1664 ../../include/nav.php:160 +#: ../../include/nav.php:164 msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:235 ../../include/nav.php:98 +#: ../../Zotlabs/Lib/Apps.php:235 ../../include/nav.php:105 msgid "Activity" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:239 ../../include/conversation.php:1900 -#: ../../include/features.php:95 ../../include/nav.php:507 +#: ../../Zotlabs/Lib/Apps.php:239 ../../include/conversation.php:1928 +#: ../../include/features.php:95 ../../include/nav.php:529 msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:240 ../../include/nav.php:102 +#: ../../Zotlabs/Lib/Apps.php:240 ../../include/nav.php:109 msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:243 ../../include/conversation.php:1833 -#: ../../include/conversation.php:1836 ../../include/nav.php:124 -#: ../../include/nav.php:441 ../../include/nav.php:444 +#: ../../Zotlabs/Lib/Apps.php:243 ../../include/conversation.php:1850 +#: ../../include/conversation.php:1853 ../../include/nav.php:131 msgid "Events" msgstr "" @@ -7331,7 +7450,7 @@ msgstr "" msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:246 ../../include/nav.php:116 +#: ../../Zotlabs/Lib/Apps.php:246 ../../include/nav.php:123 msgid "Mail" msgstr "" @@ -7381,14 +7500,22 @@ msgstr "" msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:407 +#: ../../Zotlabs/Lib/Apps.php:409 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:408 +#: ../../Zotlabs/Lib/Apps.php:410 msgid "Remove from app-tray" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:411 +msgid "Pin to navbar" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:412 +msgid "Unpin from navbar" +msgstr "" + #: ../../Zotlabs/Lib/Permcat.php:58 msgctxt "permcat" msgid "default" @@ -7410,71 +7537,71 @@ msgid "publisher" msgstr "" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:90 +#: ../../Zotlabs/Lib/NativeWikiPage.php:93 msgid "(No Title)" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:104 +#: ../../Zotlabs/Lib/NativeWikiPage.php:107 msgid "Wiki page create failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:117 +#: ../../Zotlabs/Lib/NativeWikiPage.php:120 msgid "Wiki not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:128 +#: ../../Zotlabs/Lib/NativeWikiPage.php:131 msgid "Destination name already exists" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:160 -#: ../../Zotlabs/Lib/NativeWikiPage.php:355 +#: ../../Zotlabs/Lib/NativeWikiPage.php:163 +#: ../../Zotlabs/Lib/NativeWikiPage.php:359 msgid "Page not found" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:191 +#: ../../Zotlabs/Lib/NativeWikiPage.php:194 msgid "Error reading page content" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:347 -#: ../../Zotlabs/Lib/NativeWikiPage.php:396 -#: ../../Zotlabs/Lib/NativeWikiPage.php:463 -#: ../../Zotlabs/Lib/NativeWikiPage.php:504 +#: ../../Zotlabs/Lib/NativeWikiPage.php:350 +#: ../../Zotlabs/Lib/NativeWikiPage.php:400 +#: ../../Zotlabs/Lib/NativeWikiPage.php:467 +#: ../../Zotlabs/Lib/NativeWikiPage.php:508 msgid "Error reading wiki" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:384 +#: ../../Zotlabs/Lib/NativeWikiPage.php:388 msgid "Page update failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:418 +#: ../../Zotlabs/Lib/NativeWikiPage.php:422 msgid "Nothing deleted" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:484 +#: ../../Zotlabs/Lib/NativeWikiPage.php:488 msgid "Compare: object not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:490 +#: ../../Zotlabs/Lib/NativeWikiPage.php:494 msgid "Page updated" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:493 +#: ../../Zotlabs/Lib/NativeWikiPage.php:497 msgid "Untitled" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:499 +#: ../../Zotlabs/Lib/NativeWikiPage.php:503 msgid "Wiki resource_id required for git commit" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:555 +#: ../../Zotlabs/Lib/NativeWikiPage.php:559 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:593 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:672 -#: ../../include/bbcode.php:818 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 +#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:674 +#: ../../include/bbcode.php:822 msgid "Different viewers will see this text differently" msgstr "" @@ -7541,23 +7668,23 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:27 +#: ../../Zotlabs/Lib/Chatroom.php:23 msgid "Missing room name" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:36 +#: ../../Zotlabs/Lib/Chatroom.php:32 msgid "Duplicate room name" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 +#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90 msgid "Invalid room specifier." msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:126 +#: ../../Zotlabs/Lib/Chatroom.php:122 msgid "Room not found." msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:147 +#: ../../Zotlabs/Lib/Chatroom.php:143 msgid "Room is full" msgstr "" @@ -7782,11 +7909,11 @@ msgstr "" msgid "[$Projectname:Notify]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:789 +#: ../../Zotlabs/Lib/Enotify.php:793 msgid "created a new post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:790 +#: ../../Zotlabs/Lib/Enotify.php:794 #, php-format msgid "commented on %s's post" msgstr "" @@ -7809,208 +7936,208 @@ msgstr "" msgid "Update %s failed. See error logs." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:681 +#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697 msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:137 ../../include/conversation.php:673 +#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689 msgid "Select" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:162 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I will attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:162 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:162 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I might attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I agree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I disagree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I abstain" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:228 +#: ../../Zotlabs/Lib/ThreadItem.php:238 msgid "Add Star" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:229 +#: ../../Zotlabs/Lib/ThreadItem.php:239 msgid "Remove Star" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:230 +#: ../../Zotlabs/Lib/ThreadItem.php:240 msgid "Toggle Star Status" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:234 +#: ../../Zotlabs/Lib/ThreadItem.php:244 msgid "starred" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:244 ../../include/conversation.php:688 +#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704 msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:245 ../../include/conversation.php:689 +#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705 msgid "Message signature incorrect" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:253 +#: ../../Zotlabs/Lib/ThreadItem.php:263 msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:271 ../../include/taxonomy.php:433 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:506 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:272 ../../include/taxonomy.php:434 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:507 msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:276 +#: ../../Zotlabs/Lib/ThreadItem.php:286 msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:276 +#: ../../Zotlabs/Lib/ThreadItem.php:286 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:285 +#: ../../Zotlabs/Lib/ThreadItem.php:295 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:303 +#: ../../Zotlabs/Lib/ThreadItem.php:313 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:333 ../../Zotlabs/Lib/ThreadItem.php:334 +#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:337 +#: ../../Zotlabs/Lib/ThreadItem.php:347 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:338 +#: ../../Zotlabs/Lib/ThreadItem.php:348 msgid "via" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:339 +#: ../../Zotlabs/Lib/ThreadItem.php:349 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:340 +#: ../../Zotlabs/Lib/ThreadItem.php:350 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:747 +#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:356 ../../include/conversation.php:750 +#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:357 ../../include/conversation.php:751 +#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767 #, php-format msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:363 +#: ../../Zotlabs/Lib/ThreadItem.php:374 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:364 +#: ../../Zotlabs/Lib/ThreadItem.php:375 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:365 +#: ../../Zotlabs/Lib/ThreadItem.php:376 msgid "Vote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:366 +#: ../../Zotlabs/Lib/ThreadItem.php:377 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:387 +#: ../../Zotlabs/Lib/ThreadItem.php:398 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:388 +#: ../../Zotlabs/Lib/ThreadItem.php:399 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:415 ../../include/conversation.php:471 +#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483 msgid "This is an unsaved preview" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:447 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:744 ../../include/conversation.php:1360 +#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1377 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:745 ../../include/conversation.php:1361 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1378 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:746 ../../include/conversation.php:1362 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1379 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:747 ../../include/conversation.php:1363 +#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1380 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:748 ../../include/conversation.php:1364 +#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1381 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:749 +#: ../../Zotlabs/Lib/ThreadItem.php:760 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:750 +#: ../../Zotlabs/Lib/ThreadItem.php:761 msgid "Attach File" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:751 +#: ../../Zotlabs/Lib/ThreadItem.php:762 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:752 +#: ../../Zotlabs/Lib/ThreadItem.php:763 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:762 +#: ../../Zotlabs/Lib/ThreadItem.php:773 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:763 +#: ../../Zotlabs/Lib/ThreadItem.php:774 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:764 +#: ../../Zotlabs/Lib/ThreadItem.php:775 msgid "Your website URL (optional)" msgstr "" @@ -8026,7 +8153,7 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:284 msgid "parent" msgstr "" @@ -8042,7 +8169,8 @@ msgstr "" msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:452 +#: ../../include/nav.php:455 msgid "Calendar" msgstr "" @@ -8054,48 +8182,41 @@ msgstr "" msgid "Schedule Outbox" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:226 +#: ../../Zotlabs/Storage/Browser.php:270 msgid "Total" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:228 +#: ../../Zotlabs/Storage/Browser.php:272 msgid "Shared" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:304 +#: ../../Zotlabs/Storage/Browser.php:350 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:309 +#: ../../Zotlabs/Storage/Browser.php:355 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:320 +#: ../../Zotlabs/Storage/Browser.php:366 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:330 -msgid "" -"Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\" " -"href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop " -"Clients</a>" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:334 +#: ../../Zotlabs/Storage/Browser.php:378 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:336 +#: ../../Zotlabs/Storage/Browser.php:380 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:350 +#: ../../Zotlabs/Storage/Browser.php:393 msgid "Drop files here to immediately upload" msgstr "" -#: ../../Zotlabs/Widget/Forums.php:85 +#: ../../Zotlabs/Widget/Forums.php:99 msgid "Forums" msgstr "" @@ -8111,80 +8232,81 @@ msgstr "" msgid "Read-only" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:116 +#: ../../Zotlabs/Widget/Cdav.php:117 msgid "My Calendars" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:118 +#: ../../Zotlabs/Widget/Cdav.php:119 msgid "Shared Calendars" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:122 +#: ../../Zotlabs/Widget/Cdav.php:123 msgid "Share this calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:124 +#: ../../Zotlabs/Widget/Cdav.php:125 msgid "Calendar name and color" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Widget/Cdav.php:127 msgid "Create new calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:128 +#: ../../Zotlabs/Widget/Cdav.php:129 msgid "Calendar Name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:129 +#: ../../Zotlabs/Widget/Cdav.php:130 msgid "Calendar Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:130 +#: ../../Zotlabs/Widget/Cdav.php:131 msgid "Import calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:131 +#: ../../Zotlabs/Widget/Cdav.php:132 msgid "Select a calendar to import to" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:158 +#: ../../Zotlabs/Widget/Cdav.php:159 msgid "Addressbooks" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:160 +#: ../../Zotlabs/Widget/Cdav.php:161 msgid "Addressbook name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:162 +#: ../../Zotlabs/Widget/Cdav.php:163 msgid "Create new addressbook" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:163 +#: ../../Zotlabs/Widget/Cdav.php:164 msgid "Addressbook Name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:165 +#: ../../Zotlabs/Widget/Cdav.php:166 msgid "Addressbook Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:166 +#: ../../Zotlabs/Widget/Cdav.php:167 msgid "Import addressbook" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:167 +#: ../../Zotlabs/Widget/Cdav.php:168 msgid "Select an addressbook to import to" msgstr "" -#: ../../Zotlabs/Widget/Appcategories.php:39 -#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91 -#: ../../include/contact_widgets.php:132 ../../include/taxonomy.php:285 -#: ../../include/taxonomy.php:367 ../../include/taxonomy.php:387 +#: ../../Zotlabs/Widget/Appcategories.php:40 +#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97 +#: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186 +#: ../../include/taxonomy.php:337 ../../include/taxonomy.php:419 +#: ../../include/taxonomy.php:439 ../../include/taxonomy.php:460 msgid "Categories" msgstr "" -#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -#: ../../include/contact_widgets.php:135 +#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 +#: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 msgid "Everything" msgstr "" @@ -8204,6 +8326,14 @@ msgstr "" msgid "Suggested Chatrooms" msgstr "" +#: ../../Zotlabs/Widget/Hq_controls.php:14 +msgid "HQ Control Panel" +msgstr "" + +#: ../../Zotlabs/Widget/Hq_controls.php:17 +msgid "Create a new post" +msgstr "" + #: ../../Zotlabs/Widget/Mailmenu.php:13 msgid "Private Mail Menu" msgstr "" @@ -8212,21 +8342,21 @@ msgstr "" msgid "Combined View" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:126 msgid "Inbox" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:120 +#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:127 msgid "Outbox" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:121 +#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:128 msgid "New Message" msgstr "" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1847 ../../include/conversation.php:1850 -#: ../../include/nav.php:455 ../../include/nav.php:458 +#: ../../include/conversation.php:1864 ../../include/conversation.php:1867 +#: ../../include/nav.php:466 ../../include/nav.php:469 msgid "Chatrooms" msgstr "" @@ -8288,11 +8418,11 @@ msgstr "" msgid "Conversations" msgstr "" -#: ../../Zotlabs/Widget/Conversations.php:35 +#: ../../Zotlabs/Widget/Conversations.php:37 msgid "No messages." msgstr "" -#: ../../Zotlabs/Widget/Conversations.php:55 +#: ../../Zotlabs/Widget/Conversations.php:57 msgid "Delete conversation" msgstr "" @@ -8308,11 +8438,11 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:306 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:316 msgid "Saved Searches" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:337 +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333 msgid "add" msgstr "" @@ -8320,15 +8450,16 @@ msgstr "" msgid "Notes" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:47 ../../addon/gitwiki/gitwiki.php:76 -msgid "Wiki Pages" +#: ../../Zotlabs/Widget/Wiki_pages.php:32 +#: ../../Zotlabs/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81 +msgid "Add new page" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:53 ../../addon/gitwiki/gitwiki.php:81 -msgid "Add new page" +#: ../../Zotlabs/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76 +msgid "Wiki Pages" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:82 +#: ../../Zotlabs/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82 msgid "Page name" msgstr "" @@ -8349,7 +8480,7 @@ msgid "See more..." msgstr "" #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:395 +#: ../../include/features.php:414 msgid "Saved Folders" msgstr "" @@ -8369,7 +8500,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:224 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:231 msgid "Admin" msgstr "" @@ -8409,7 +8540,7 @@ msgstr "" msgid "Connected apps" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:158 +#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:168 msgid "Permission Groups" msgstr "" @@ -8429,165 +8560,170 @@ msgstr "" msgid "New Network Activity Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:20 ../../include/nav.php:99 +#: ../../Zotlabs/Widget/Notifications.php:20 ../../include/nav.php:106 msgid "View your network activity" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:24 +#: ../../Zotlabs/Widget/Notifications.php:23 msgid "Mark all notifications read" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:32 +#: ../../Zotlabs/Widget/Notifications.php:26 +#: ../../Zotlabs/Widget/Notifications.php:44 +#: ../../Zotlabs/Widget/Notifications.php:139 +msgid "Show new posts only" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:34 msgid "New Home Activity" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:33 +#: ../../Zotlabs/Widget/Notifications.php:35 msgid "New Home Activity Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:36 +#: ../../Zotlabs/Widget/Notifications.php:38 msgid "View your home activity" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:40 +#: ../../Zotlabs/Widget/Notifications.php:41 #: ../../Zotlabs/Widget/Notifications.php:136 msgid "Mark all notifications seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:48 +#: ../../Zotlabs/Widget/Notifications.php:52 msgid "New Mails" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:49 +#: ../../Zotlabs/Widget/Notifications.php:53 msgid "New Mails Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:52 +#: ../../Zotlabs/Widget/Notifications.php:56 msgid "View your private mails" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:56 +#: ../../Zotlabs/Widget/Notifications.php:59 msgid "Mark all messages seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:64 +#: ../../Zotlabs/Widget/Notifications.php:67 msgid "New Events" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:65 +#: ../../Zotlabs/Widget/Notifications.php:68 msgid "New Events Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:68 ../../include/nav.php:125 +#: ../../Zotlabs/Widget/Notifications.php:71 ../../include/nav.php:132 msgid "View events" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:72 ../../include/nav.php:126 +#: ../../Zotlabs/Widget/Notifications.php:74 ../../include/nav.php:133 msgid "Mark all events seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:81 +#: ../../Zotlabs/Widget/Notifications.php:83 msgid "New Connections Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:84 +#: ../../Zotlabs/Widget/Notifications.php:86 msgid "View all connections" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:92 +#: ../../Zotlabs/Widget/Notifications.php:94 msgid "New Files" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:93 +#: ../../Zotlabs/Widget/Notifications.php:95 msgid "New Files Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:100 -#: ../../Zotlabs/Widget/Notifications.php:101 ../../include/nav.php:112 +#: ../../Zotlabs/Widget/Notifications.php:102 +#: ../../Zotlabs/Widget/Notifications.php:103 ../../include/nav.php:119 msgid "Notices" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:104 +#: ../../Zotlabs/Widget/Notifications.php:106 msgid "View all notices" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:108 +#: ../../Zotlabs/Widget/Notifications.php:109 msgid "Mark all notices seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:118 +#: ../../Zotlabs/Widget/Notifications.php:119 msgid "New Registrations" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:119 +#: ../../Zotlabs/Widget/Notifications.php:120 msgid "New Registrations Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:129 +#: ../../Zotlabs/Widget/Notifications.php:130 msgid "Public Stream Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:132 +#: ../../Zotlabs/Widget/Notifications.php:133 msgid "View the public stream" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:143 -#: ../../include/conversation.php:871 ../../include/nav.php:305 -msgid "Loading..." +#: ../../Zotlabs/Widget/Notifications.php:147 ../../include/nav.php:316 +msgid "Loading" msgstr "" #: ../../util/nconfig.php:34 msgid "Source channel not found." msgstr "" -#: ../../boot.php:1619 +#: ../../boot.php:1644 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1638 ../../include/nav.php:138 ../../include/nav.php:167 -#: ../../include/nav.php:184 +#: ../../boot.php:1663 ../../include/nav.php:145 ../../include/nav.php:174 +#: ../../include/nav.php:191 msgid "Logout" msgstr "" -#: ../../boot.php:1642 +#: ../../boot.php:1667 msgid "Login/Email" msgstr "" -#: ../../boot.php:1643 +#: ../../boot.php:1668 msgid "Password" msgstr "" -#: ../../boot.php:1644 +#: ../../boot.php:1669 msgid "Remember me" msgstr "" -#: ../../boot.php:1647 +#: ../../boot.php:1672 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2191 +#: ../../boot.php:2257 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2344 +#: ../../boot.php:2419 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2349 +#: ../../boot.php:2424 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2468 +#: ../../boot.php:2540 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2473 +#: ../../boot.php:2545 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2474 ../../include/datetime.php:286 +#: ../../boot.php:2546 ../../include/datetime.php:292 msgid "never" msgstr "" @@ -8844,30 +8980,30 @@ msgstr "" msgid "Skeleton Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:243 +#: ../../addon/gnusoc/gnusoc.php:247 msgid "GNU-Social Protocol Settings updated." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:262 +#: ../../addon/gnusoc/gnusoc.php:266 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:265 +#: ../../addon/gnusoc/gnusoc.php:269 msgid "Enable the GNU-Social protocol for this channel" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:269 +#: ../../addon/gnusoc/gnusoc.php:273 msgid "GNU-Social Protocol Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:460 +#: ../../addon/gnusoc/gnusoc.php:464 msgid "Follow" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:463 +#: ../../addon/gnusoc/gnusoc.php:467 #, php-format msgid "%1$s is now following %2$s" msgstr "" @@ -8913,8 +9049,8 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1266 -#: ../../include/nav.php:146 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1301 +#: ../../include/nav.php:153 msgid "Edit Profile" msgstr "" @@ -8987,7 +9123,7 @@ msgstr "" msgid "Profile photo updated successfully." msgstr "" -#: ../../addon/zotvi/zot6.php:25 ../../include/zot.php:3983 +#: ../../addon/zotvi/zot6.php:25 ../../include/zot.php:4051 msgid "invalid target signature" msgstr "" @@ -9120,38 +9256,6 @@ msgstr "" msgid "Insane Journal Settings saved." msgstr "" -#: ../../addon/js_upload/js_upload.php:44 -msgid "Upload a file" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:45 -msgid "Drop files here to upload" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:47 -msgid "Failed" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:315 -msgid "No files were uploaded." -msgstr "" - -#: ../../addon/js_upload/js_upload.php:322 -msgid "Uploaded file is empty" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:335 -msgid "Image exceeds size limit of " -msgstr "" - -#: ../../addon/js_upload/js_upload.php:347 -msgid "File has an invalid extension, it should be one of " -msgstr "" - -#: ../../addon/js_upload/js_upload.php:359 -msgid "Upload was cancelled, or server error encountered" -msgstr "" - #: ../../addon/dwpost/dwpost.php:42 msgid "Post to Dreamwidth" msgstr "" @@ -9176,18 +9280,6 @@ msgstr "" msgid "Dreamwidth Post Settings" msgstr "" -#: ../../addon/firefox/firefox.php:23 -msgid "Install Firefox Sharing Tools" -msgstr "" - -#: ../../addon/firefox/firefox.php:34 -msgid "Share content from Firefox to $Projectname" -msgstr "" - -#: ../../addon/firefox/firefox.php:37 -msgid "Install Firefox Sharing Tools to this web browser" -msgstr "" - #: ../../addon/dirstats/dirstats.php:94 msgid "Hubzilla Directory Stats" msgstr "" @@ -9247,22 +9339,6 @@ msgid "" "applies to chatrooms," msgstr "" -#: ../../addon/mailhost/mailhost.php:36 -msgid "Email notification hub" -msgstr "" - -#: ../../addon/mailhost/mailhost.php:36 -msgid "Hostname" -msgstr "" - -#: ../../addon/mailhost/mailhost.php:40 -msgid "Mailhost Settings" -msgstr "" - -#: ../../addon/mailhost/mailhost.php:54 -msgid "MAILHOST Settings saved." -msgstr "" - #: ../../addon/likebanner/likebanner.php:51 msgid "Your Webbie:" msgstr "" @@ -9457,12 +9533,12 @@ msgid "Login failed." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1432 +#: ../../include/selectors.php:66 ../../include/channel.php:1480 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1430 +#: ../../include/selectors.php:66 ../../include/channel.php:1478 msgid "Female" msgstr "" @@ -9649,38 +9725,38 @@ msgstr "" msgid "declared undying love for" msgstr "" -#: ../../addon/diaspora/diaspora.php:763 +#: ../../addon/diaspora/diaspora.php:772 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../addon/diaspora/diaspora.php:782 +#: ../../addon/diaspora/diaspora.php:791 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/diaspora/diaspora.php:785 +#: ../../addon/diaspora/diaspora.php:794 msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../addon/diaspora/diaspora.php:789 +#: ../../addon/diaspora/diaspora.php:798 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../addon/diaspora/diaspora.php:793 +#: ../../addon/diaspora/diaspora.php:802 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/diaspora.php:797 +#: ../../addon/diaspora/diaspora.php:806 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/diaspora.php:802 +#: ../../addon/diaspora/diaspora.php:811 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/diaspora.php:807 +#: ../../addon/diaspora/diaspora.php:816 msgid "Diaspora Protocol Settings" msgstr "" @@ -9789,6 +9865,26 @@ msgstr "" msgid "Gravatar settings updated." msgstr "" +#: ../../addon/hzfiles/hzfiles.php:79 +msgid "Hubzilla File Storage Import" +msgstr "" + +#: ../../addon/hzfiles/hzfiles.php:80 +msgid "This will import all your cloud files from another server." +msgstr "" + +#: ../../addon/hzfiles/hzfiles.php:81 +msgid "Hubzilla Server base URL" +msgstr "" + +#: ../../addon/hzfiles/hzfiles.php:82 +msgid "Since modified date yyyy-mm-dd" +msgstr "" + +#: ../../addon/hzfiles/hzfiles.php:83 +msgid "Until modified date yyyy-mm-dd" +msgstr "" + #: ../../addon/visage/visage.php:93 msgid "Recent Channel/Profile Viewers" msgstr "" @@ -9935,8 +10031,8 @@ msgstr "" msgid "Hubzilla to Friendica Post Settings" msgstr "" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1357 -#: ../../include/channel.php:1519 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1397 +#: ../../include/channel.php:1567 msgid "Status:" msgstr "" @@ -10101,27 +10197,35 @@ msgstr "" msgid "Friendica Login Password" msgstr "" -#: ../../addon/pubcrawl/as.php:1076 ../../addon/pubcrawl/as.php:1160 -#: ../../addon/pubcrawl/as.php:1332 ../../include/network.php:1705 +#: ../../addon/pubcrawl/as.php:1077 ../../addon/pubcrawl/as.php:1164 +#: ../../addon/pubcrawl/as.php:1339 ../../include/network.php:1768 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1032 +#: ../../addon/pubcrawl/pubcrawl.php:1033 msgid "ActivityPub Protocol Settings updated." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1041 +#: ../../addon/pubcrawl/pubcrawl.php:1042 msgid "" "The ActivityPub protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1044 +#: ../../addon/pubcrawl/pubcrawl.php:1045 msgid "Enable the ActivityPub protocol for this channel" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1048 +msgid "Send multi-media HTML articles" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1048 +msgid "Not supported by some microblog services such as Mastodon" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings" msgstr "" @@ -10466,11 +10570,11 @@ msgstr "" msgid "GNU social Post Settings" msgstr "" -#: ../../addon/statusnet/statusnet.php:891 +#: ../../addon/statusnet/statusnet.php:892 msgid "API URL" msgstr "" -#: ../../addon/statusnet/statusnet.php:894 +#: ../../addon/statusnet/statusnet.php:895 msgid "Application name" msgstr "" @@ -10510,7 +10614,7 @@ msgstr "" msgid "Error creating new game." msgstr "" -#: ../../addon/chess/chess.php:409 ../../include/channel.php:1117 +#: ../../addon/chess/chess.php:409 ../../include/channel.php:1152 msgid "Requested channel is not available." msgstr "" @@ -11190,11 +11294,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1436 +#: ../../include/selectors.php:49 ../../include/channel.php:1484 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1438 +#: ../../include/selectors.php:49 ../../include/channel.php:1486 msgid "Non-specific" msgstr "" @@ -11374,284 +11478,306 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/conversation.php:200 +#: ../../include/conversation.php:169 +#, php-format +msgid "likes %1$s's %2$s" +msgstr "" + +#: ../../include/conversation.php:172 +#, php-format +msgid "doesn't like %1$s's %2$s" +msgstr "" + +#: ../../include/conversation.php:212 #, php-format msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/conversation.php:235 +#: ../../include/conversation.php:247 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:239 ../../include/text.php:1104 +#: ../../include/conversation.php:251 ../../include/text.php:1104 #: ../../include/text.php:1109 msgid "poked" msgstr "" -#: ../../include/conversation.php:720 +#: ../../include/conversation.php:736 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:740 +#: ../../include/conversation.php:756 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:741 +#: ../../include/conversation.php:757 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:766 +#: ../../include/conversation.php:783 msgid "View in context" msgstr "" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:884 msgid "remove" msgstr "" -#: ../../include/conversation.php:872 +#: ../../include/conversation.php:888 +msgid "Loading..." +msgstr "" + +#: ../../include/conversation.php:889 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:915 +#: ../../include/conversation.php:932 msgid "View Source" msgstr "" -#: ../../include/conversation.php:925 +#: ../../include/conversation.php:942 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:934 +#: ../../include/conversation.php:951 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1025 +#: ../../include/conversation.php:1042 msgid "Activity/Posts" msgstr "" -#: ../../include/conversation.php:1045 +#: ../../include/conversation.php:1062 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1055 +#: ../../include/conversation.php:1072 msgid "Message" msgstr "" -#: ../../include/conversation.php:1189 +#: ../../include/conversation.php:1206 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1189 +#: ../../include/conversation.php:1206 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1193 +#: ../../include/conversation.php:1210 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1195 +#: ../../include/conversation.php:1212 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1201 +#: ../../include/conversation.php:1218 msgid "and" msgstr "" -#: ../../include/conversation.php:1204 +#: ../../include/conversation.php:1221 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1222 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1222 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1248 +#: ../../include/conversation.php:1265 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1249 +#: ../../include/conversation.php:1266 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1297 +#: ../../include/conversation.php:1314 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1298 +#: ../../include/conversation.php:1315 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1303 +#: ../../include/conversation.php:1320 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1307 +#: ../../include/conversation.php:1324 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1308 +#: ../../include/conversation.php:1325 msgid "Comments disabled" msgstr "" -#: ../../include/conversation.php:1355 +#: ../../include/conversation.php:1372 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1358 +#: ../../include/conversation.php:1375 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1372 +#: ../../include/conversation.php:1389 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1392 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1376 +#: ../../include/conversation.php:1393 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1384 +#: ../../include/conversation.php:1401 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1407 +#: ../../include/conversation.php:1424 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1413 +#: ../../include/conversation.php:1430 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1673 +#: ../../include/conversation.php:1690 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1676 +#: ../../include/conversation.php:1693 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1680 +#: ../../include/conversation.php:1697 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1683 +#: ../../include/conversation.php:1700 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1691 +#: ../../include/conversation.php:1708 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1717 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1706 +#: ../../include/conversation.php:1723 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1709 +#: ../../include/conversation.php:1726 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1716 +#: ../../include/conversation.php:1733 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1719 +#: ../../include/conversation.php:1736 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1794 ../../include/nav.php:402 +#: ../../include/conversation.php:1811 ../../include/nav.php:413 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1807 ../../include/nav.php:415 +#: ../../include/conversation.php:1824 ../../include/nav.php:426 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1817 ../../include/nav.php:425 -#: ../../include/photos.php:600 +#: ../../include/conversation.php:1834 ../../include/nav.php:436 +#: ../../include/photos.php:655 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1825 ../../include/nav.php:433 +#: ../../include/conversation.php:1842 ../../include/nav.php:444 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1862 ../../include/nav.php:468 +#: ../../include/conversation.php:1879 ../../include/nav.php:479 msgid "Bookmarks" msgstr "" -#: ../../include/conversation.php:1865 ../../include/nav.php:471 +#: ../../include/conversation.php:1882 ../../include/nav.php:482 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1876 ../../include/nav.php:482 +#: ../../include/conversation.php:1893 ../../include/nav.php:493 msgid "View Cards" msgstr "" -#: ../../include/conversation.php:1887 ../../include/nav.php:494 +#: ../../include/conversation.php:1901 +msgid "articles" +msgstr "" + +#: ../../include/conversation.php:1904 ../../include/nav.php:504 +msgid "View Articles" +msgstr "" + +#: ../../include/conversation.php:1915 ../../include/nav.php:516 msgid "View Webpages" msgstr "" -#: ../../include/conversation.php:1956 +#: ../../include/conversation.php:1984 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1959 +#: ../../include/conversation.php:1987 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1962 +#: ../../include/conversation.php:1990 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1965 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1968 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1971 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -11929,7 +12055,7 @@ msgstr "" msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1394 ../../include/feedutils.php:780 +#: ../../include/text.php:1394 ../../include/feedutils.php:825 msgid "unknown" msgstr "" @@ -11945,7 +12071,7 @@ msgstr "" msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1782 ../../include/language.php:367 +#: ../../include/text.php:1782 ../../include/language.php:364 msgid "default" msgstr "" @@ -12084,16 +12210,16 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:166 +#: ../../include/contact_widgets.php:223 msgid "Common Connections" msgstr "" -#: ../../include/contact_widgets.php:171 +#: ../../include/contact_widgets.php:228 #, php-format msgid "View all %d common connections" msgstr "" -#: ../../include/markdown.php:139 ../../include/bbcode.php:337 +#: ../../include/markdown.php:158 ../../include/bbcode.php:339 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" @@ -12416,385 +12542,385 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/attach.php:250 ../../include/attach.php:339 +#: ../../include/attach.php:265 ../../include/attach.php:361 msgid "Item was not found." msgstr "" -#: ../../include/attach.php:505 +#: ../../include/attach.php:553 msgid "No source file." msgstr "" -#: ../../include/attach.php:527 +#: ../../include/attach.php:575 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:545 +#: ../../include/attach.php:593 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:680 +#: ../../include/attach.php:734 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:694 +#: ../../include/attach.php:754 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:864 +#: ../../include/attach.php:929 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:877 +#: ../../include/attach.php:948 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:938 ../../include/attach.php:954 +#: ../../include/attach.php:1022 ../../include/attach.php:1038 msgid "Path not available." msgstr "" -#: ../../include/attach.php:1003 ../../include/attach.php:1168 +#: ../../include/attach.php:1087 ../../include/attach.php:1252 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1029 +#: ../../include/attach.php:1113 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1054 +#: ../../include/attach.php:1138 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1122 +#: ../../include/attach.php:1206 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1126 +#: ../../include/attach.php:1210 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1174 +#: ../../include/attach.php:1258 msgid "Empty path" msgstr "" -#: ../../include/security.php:531 +#: ../../include/security.php:532 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/items.php:857 ../../include/items.php:909 +#: ../../include/items.php:885 ../../include/items.php:945 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1093 +#: ../../include/items.php:1129 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1095 +#: ../../include/items.php:1131 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1097 +#: ../../include/items.php:1133 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1099 +#: ../../include/items.php:1135 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1101 +#: ../../include/items.php:1137 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1103 +#: ../../include/items.php:1139 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1105 +#: ../../include/items.php:1141 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1107 +#: ../../include/items.php:1143 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:3957 +#: ../../include/items.php:4117 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:3964 +#: ../../include/items.php:4124 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:3976 +#: ../../include/items.php:4136 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4327 +#: ../../include/items.php:4485 msgid "profile photo" msgstr "" -#: ../../include/items.php:4520 +#: ../../include/items.php:4676 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4520 +#: ../../include/items.php:4676 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4520 +#: ../../include/items.php:4676 msgctxt "edit_activity" msgid "Comment" msgstr "" -#: ../../include/channel.php:34 +#: ../../include/channel.php:35 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/channel.php:69 +#: ../../include/channel.php:68 msgid "Empty name" msgstr "" -#: ../../include/channel.php:72 +#: ../../include/channel.php:71 msgid "Name too long" msgstr "" -#: ../../include/channel.php:183 +#: ../../include/channel.php:188 msgid "No account identifier" msgstr "" -#: ../../include/channel.php:195 +#: ../../include/channel.php:200 msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:273 +#: ../../include/channel.php:277 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/channel.php:359 +#: ../../include/channel.php:373 msgid "Default Profile" msgstr "" -#: ../../include/channel.php:512 ../../include/channel.php:601 +#: ../../include/channel.php:532 ../../include/channel.php:621 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1263 +#: ../../include/channel.php:1298 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1283 +#: ../../include/channel.php:1319 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1356 ../../include/channel.php:1475 +#: ../../include/channel.php:1396 ../../include/channel.php:1523 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1358 ../../include/channel.php:1530 +#: ../../include/channel.php:1398 ../../include/channel.php:1578 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1359 +#: ../../include/channel.php:1399 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1434 +#: ../../include/channel.php:1482 msgid "Trans" msgstr "" -#: ../../include/channel.php:1480 +#: ../../include/channel.php:1528 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1504 +#: ../../include/channel.php:1552 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1505 +#: ../../include/channel.php:1553 msgid "j F" msgstr "" -#: ../../include/channel.php:1512 +#: ../../include/channel.php:1560 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1525 +#: ../../include/channel.php:1573 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1528 +#: ../../include/channel.php:1576 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1534 +#: ../../include/channel.php:1582 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1536 +#: ../../include/channel.php:1584 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1538 +#: ../../include/channel.php:1586 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1542 +#: ../../include/channel.php:1590 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1544 +#: ../../include/channel.php:1592 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1546 +#: ../../include/channel.php:1594 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1548 +#: ../../include/channel.php:1596 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1550 +#: ../../include/channel.php:1598 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1552 +#: ../../include/channel.php:1600 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1554 +#: ../../include/channel.php:1602 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1556 +#: ../../include/channel.php:1604 msgid "Television:" msgstr "" -#: ../../include/channel.php:1558 +#: ../../include/channel.php:1606 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1560 +#: ../../include/channel.php:1608 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1562 +#: ../../include/channel.php:1610 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1564 +#: ../../include/channel.php:1612 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1587 +#: ../../include/channel.php:1635 msgid "Like this thing" msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 +#: ../../include/event.php:23 ../../include/event.php:70 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:30 ../../include/event.php:73 +#: ../../include/event.php:31 ../../include/event.php:74 msgid "Starts:" msgstr "" -#: ../../include/event.php:40 ../../include/event.php:77 +#: ../../include/event.php:41 ../../include/event.php:78 msgid "Finishes:" msgstr "" -#: ../../include/event.php:1008 +#: ../../include/event.php:1011 msgid "This event has been added to your calendar." msgstr "" -#: ../../include/event.php:1208 +#: ../../include/event.php:1220 msgid "Not specified" msgstr "" -#: ../../include/event.php:1209 +#: ../../include/event.php:1221 msgid "Needs Action" msgstr "" -#: ../../include/event.php:1210 +#: ../../include/event.php:1222 msgid "Completed" msgstr "" -#: ../../include/event.php:1211 +#: ../../include/event.php:1223 msgid "In Process" msgstr "" -#: ../../include/event.php:1212 +#: ../../include/event.php:1224 msgid "Cancelled" msgstr "" -#: ../../include/event.php:1292 ../../include/connections.php:684 +#: ../../include/event.php:1303 ../../include/connections.php:684 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1293 ../../include/connections.php:685 +#: ../../include/event.php:1304 ../../include/connections.php:685 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1295 ../../include/connections.php:687 +#: ../../include/event.php:1306 ../../include/connections.php:687 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1296 ../../include/connections.php:688 +#: ../../include/event.php:1307 ../../include/connections.php:688 msgid "Work, Fax" msgstr "" -#: ../../include/network.php:752 +#: ../../include/network.php:761 msgid "view full size" msgstr "" -#: ../../include/network.php:1700 ../../include/network.php:1701 +#: ../../include/network.php:1763 ../../include/network.php:1764 msgid "Friendica" msgstr "" -#: ../../include/network.php:1702 +#: ../../include/network.php:1765 msgid "OStatus" msgstr "" -#: ../../include/network.php:1703 +#: ../../include/network.php:1766 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1704 +#: ../../include/network.php:1767 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1707 +#: ../../include/network.php:1770 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1708 +#: ../../include/network.php:1771 msgid "Facebook" msgstr "" -#: ../../include/network.php:1709 +#: ../../include/network.php:1772 msgid "Zot" msgstr "" -#: ../../include/network.php:1710 +#: ../../include/network.php:1773 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1711 +#: ../../include/network.php:1774 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1712 +#: ../../include/network.php:1775 msgid "MySpace" msgstr "" -#: ../../include/language.php:380 +#: ../../include/language.php:377 msgid "Select an alternate language" msgstr "" @@ -12832,23 +12958,23 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/bbcode.php:194 ../../include/bbcode.php:1102 -#: ../../include/bbcode.php:1105 ../../include/bbcode.php:1110 -#: ../../include/bbcode.php:1113 ../../include/bbcode.php:1116 -#: ../../include/bbcode.php:1119 ../../include/bbcode.php:1124 -#: ../../include/bbcode.php:1127 ../../include/bbcode.php:1132 -#: ../../include/bbcode.php:1135 ../../include/bbcode.php:1138 -#: ../../include/bbcode.php:1141 +#: ../../include/bbcode.php:194 ../../include/bbcode.php:1106 +#: ../../include/bbcode.php:1109 ../../include/bbcode.php:1114 +#: ../../include/bbcode.php:1117 ../../include/bbcode.php:1120 +#: ../../include/bbcode.php:1123 ../../include/bbcode.php:1128 +#: ../../include/bbcode.php:1131 ../../include/bbcode.php:1136 +#: ../../include/bbcode.php:1139 ../../include/bbcode.php:1142 +#: ../../include/bbcode.php:1145 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:233 ../../include/bbcode.php:1152 +#: ../../include/bbcode.php:233 ../../include/bbcode.php:1156 msgid "Encrypted content" msgstr "" #: ../../include/bbcode.php:249 #, php-format -msgid "Install %s element: " +msgid "Install %1$s element %2$s" msgstr "" #: ../../include/bbcode.php:253 @@ -12862,15 +12988,19 @@ msgstr "" msgid "card" msgstr "" -#: ../../include/bbcode.php:414 ../../include/bbcode.php:422 +#: ../../include/bbcode.php:333 +msgid "article" +msgstr "" + +#: ../../include/bbcode.php:416 ../../include/bbcode.php:424 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:422 +#: ../../include/bbcode.php:424 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:1090 +#: ../../include/bbcode.php:1094 msgid "$1 wrote:" msgstr "" @@ -12890,7 +13020,7 @@ msgstr "" msgid "Embedding disabled" msgstr "" -#: ../../include/zid.php:305 +#: ../../include/zid.php:340 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" @@ -12947,292 +13077,296 @@ msgstr "" msgid "Create personal planning cards" msgstr "" -#: ../../include/features.php:131 +#: ../../include/features.php:141 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:132 +#: ../../include/features.php:142 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:140 +#: ../../include/features.php:150 msgid "Photo Location" msgstr "" -#: ../../include/features.php:141 +#: ../../include/features.php:151 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:149 +#: ../../include/features.php:159 msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/features.php:150 +#: ../../include/features.php:160 msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/features.php:159 +#: ../../include/features.php:169 msgid "Provide alternate connection permission roles." msgstr "" -#: ../../include/features.php:167 +#: ../../include/features.php:177 msgid "Smart Birthdays" msgstr "" -#: ../../include/features.php:168 +#: ../../include/features.php:178 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "" -#: ../../include/features.php:176 +#: ../../include/features.php:186 msgid "Event Timezone Selection" msgstr "" -#: ../../include/features.php:177 +#: ../../include/features.php:187 msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:185 +#: ../../include/features.php:195 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:186 +#: ../../include/features.php:196 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:194 +#: ../../include/features.php:204 msgid "Advanced Theme and Layout Settings" msgstr "" -#: ../../include/features.php:195 +#: ../../include/features.php:205 msgid "Allows fine tuning of themes and page layouts" msgstr "" -#: ../../include/features.php:205 +#: ../../include/features.php:215 msgid "Post Composition Features" msgstr "" -#: ../../include/features.php:209 +#: ../../include/features.php:219 msgid "Large Photos" msgstr "" -#: ../../include/features.php:210 +#: ../../include/features.php:220 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:219 +#: ../../include/features.php:229 msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/features.php:227 +#: ../../include/features.php:237 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:228 +#: ../../include/features.php:238 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:236 +#: ../../include/features.php:246 msgid "Enable Voting Tools" msgstr "" -#: ../../include/features.php:237 +#: ../../include/features.php:247 msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/features.php:245 +#: ../../include/features.php:255 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:246 +#: ../../include/features.php:256 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:254 +#: ../../include/features.php:264 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:255 +#: ../../include/features.php:265 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:263 +#: ../../include/features.php:273 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:264 +#: ../../include/features.php:274 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:272 +#: ../../include/features.php:282 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:273 +#: ../../include/features.php:283 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:284 +#: ../../include/features.php:294 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:288 +#: ../../include/features.php:298 msgid "Search by Date" msgstr "" -#: ../../include/features.php:289 +#: ../../include/features.php:299 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:297 ../../include/group.php:332 +#: ../../include/features.php:307 ../../include/group.php:328 msgid "Privacy Groups" msgstr "" -#: ../../include/features.php:298 +#: ../../include/features.php:308 msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/features.php:307 +#: ../../include/features.php:317 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:315 +#: ../../include/features.php:325 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:316 +#: ../../include/features.php:326 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:324 +#: ../../include/features.php:334 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:325 +#: ../../include/features.php:335 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:333 +#: ../../include/features.php:343 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:334 +#: ../../include/features.php:344 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:343 +#: ../../include/features.php:353 msgid "Show friend and connection suggestions" msgstr "" -#: ../../include/features.php:351 +#: ../../include/features.php:361 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:352 +#: ../../include/features.php:362 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:364 +#: ../../include/features.php:374 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:368 +#: ../../include/features.php:379 +msgid "Use markdown for editing posts" +msgstr "" + +#: ../../include/features.php:387 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:369 +#: ../../include/features.php:388 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:377 +#: ../../include/features.php:396 msgid "Post Categories" msgstr "" -#: ../../include/features.php:378 +#: ../../include/features.php:397 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:386 +#: ../../include/features.php:405 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:387 +#: ../../include/features.php:406 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:396 +#: ../../include/features.php:415 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:404 +#: ../../include/features.php:423 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:405 +#: ../../include/features.php:424 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:413 +#: ../../include/features.php:432 msgid "Star Posts" msgstr "" -#: ../../include/features.php:414 +#: ../../include/features.php:433 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:422 +#: ../../include/features.php:441 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:423 +#: ../../include/features.php:442 msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/features.php:434 +#: ../../include/features.php:453 msgid "Premium Channel" msgstr "" -#: ../../include/features.php:435 +#: ../../include/features.php:454 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "" -#: ../../include/taxonomy.php:325 ../../include/taxonomy.php:346 +#: ../../include/taxonomy.php:377 ../../include/taxonomy.php:398 msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:410 +#: ../../include/taxonomy.php:483 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:431 +#: ../../include/taxonomy.php:504 msgid "have" msgstr "" -#: ../../include/taxonomy.php:431 +#: ../../include/taxonomy.php:504 msgid "has" msgstr "" -#: ../../include/taxonomy.php:432 +#: ../../include/taxonomy.php:505 msgid "want" msgstr "" -#: ../../include/taxonomy.php:432 +#: ../../include/taxonomy.php:505 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:433 +#: ../../include/taxonomy.php:506 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:434 +#: ../../include/taxonomy.php:507 msgid "dislikes" msgstr "" @@ -13304,283 +13438,283 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/datetime.php:147 +#: ../../include/datetime.php:150 msgid "Birthday" msgstr "" -#: ../../include/datetime.php:149 +#: ../../include/datetime.php:152 msgid "Age: " msgstr "" -#: ../../include/datetime.php:151 +#: ../../include/datetime.php:154 msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:292 +#: ../../include/datetime.php:298 msgid "less than a second ago" msgstr "" -#: ../../include/datetime.php:310 +#: ../../include/datetime.php:316 #, php-format msgctxt "e.g. 22 hours ago, 1 minute ago" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:321 +#: ../../include/datetime.php:327 msgctxt "relative_date" msgid "year" msgid_plural "years" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:324 +#: ../../include/datetime.php:330 msgctxt "relative_date" msgid "month" msgid_plural "months" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:327 +#: ../../include/datetime.php:333 msgctxt "relative_date" msgid "week" msgid_plural "weeks" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:330 +#: ../../include/datetime.php:336 msgctxt "relative_date" msgid "day" msgid_plural "days" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:333 +#: ../../include/datetime.php:339 msgctxt "relative_date" msgid "hour" msgid_plural "hours" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:336 +#: ../../include/datetime.php:342 msgctxt "relative_date" msgid "minute" msgid_plural "minutes" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:339 +#: ../../include/datetime.php:345 msgctxt "relative_date" msgid "second" msgid_plural "seconds" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:576 +#: ../../include/datetime.php:579 #, php-format msgid "%1$s's birthday" msgstr "" -#: ../../include/datetime.php:577 +#: ../../include/datetime.php:580 #, php-format msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/nav.php:91 +#: ../../include/nav.php:98 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:91 +#: ../../include/nav.php:98 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:98 +#: ../../include/nav.php:105 msgid "Network Activity" msgstr "" -#: ../../include/nav.php:100 +#: ../../include/nav.php:107 msgid "Mark all activity notifications seen" msgstr "" -#: ../../include/nav.php:102 +#: ../../include/nav.php:109 msgid "Channel home" msgstr "" -#: ../../include/nav.php:103 +#: ../../include/nav.php:110 msgid "View your channel home" msgstr "" -#: ../../include/nav.php:104 +#: ../../include/nav.php:111 msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:109 +#: ../../include/nav.php:116 msgid "Registrations" msgstr "" -#: ../../include/nav.php:112 +#: ../../include/nav.php:119 msgid "Notifications" msgstr "" -#: ../../include/nav.php:113 +#: ../../include/nav.php:120 msgid "View all notifications" msgstr "" -#: ../../include/nav.php:114 +#: ../../include/nav.php:121 msgid "Mark all system notifications seen" msgstr "" -#: ../../include/nav.php:116 +#: ../../include/nav.php:123 msgid "Private mail" msgstr "" -#: ../../include/nav.php:117 +#: ../../include/nav.php:124 msgid "View your private messages" msgstr "" -#: ../../include/nav.php:118 +#: ../../include/nav.php:125 msgid "Mark all private messages seen" msgstr "" -#: ../../include/nav.php:124 +#: ../../include/nav.php:131 msgid "Event Calendar" msgstr "" -#: ../../include/nav.php:129 ../../include/nav.php:215 +#: ../../include/nav.php:136 ../../include/nav.php:222 msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:132 ../../include/nav.php:217 +#: ../../include/nav.php:139 ../../include/nav.php:224 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:138 ../../include/nav.php:167 +#: ../../include/nav.php:145 ../../include/nav.php:174 msgid "End this session" msgstr "" -#: ../../include/nav.php:141 +#: ../../include/nav.php:148 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:144 +#: ../../include/nav.php:151 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:146 +#: ../../include/nav.php:153 msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:153 ../../include/nav.php:157 +#: ../../include/nav.php:160 ../../include/nav.php:164 msgid "Sign in" msgstr "" -#: ../../include/nav.php:182 +#: ../../include/nav.php:189 msgid "Take me home" msgstr "" -#: ../../include/nav.php:184 +#: ../../include/nav.php:191 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:189 +#: ../../include/nav.php:196 msgid "Create an account" msgstr "" -#: ../../include/nav.php:201 +#: ../../include/nav.php:208 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:204 +#: ../../include/nav.php:211 msgid "Search site @name, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:224 +#: ../../include/nav.php:231 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:311 +#: ../../include/nav.php:322 msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:312 +#: ../../include/nav.php:323 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:318 +#: ../../include/nav.php:329 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:319 +#: ../../include/nav.php:330 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:320 +#: ../../include/nav.php:331 msgid "Toggle System Apps" msgstr "" -#: ../../include/photos.php:123 +#: ../../include/photos.php:150 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/photos.php:130 +#: ../../include/photos.php:161 msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:268 +#: ../../include/photos.php:322 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:308 +#: ../../include/photos.php:364 msgid "a new photo" msgstr "" -#: ../../include/photos.php:312 +#: ../../include/photos.php:368 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:605 +#: ../../include/photos.php:660 msgid "Upload New Photos" msgstr "" -#: ../../include/zot.php:654 +#: ../../include/zot.php:675 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:681 +#: ../../include/zot.php:702 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2368 +#: ../../include/zot.php:2409 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/group.php:26 +#: ../../include/group.php:22 msgid "" "A deleted group with this name was revived. Existing item permissions " "<strong>may</strong> apply to this group and any future members. If this is " "not what you intended, please create another group with a different name." msgstr "" -#: ../../include/group.php:268 +#: ../../include/group.php:264 msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/group.php:310 +#: ../../include/group.php:306 msgid "edit" msgstr "" -#: ../../include/group.php:333 +#: ../../include/group.php:329 msgid "Edit group" msgstr "" -#: ../../include/group.php:334 +#: ../../include/group.php:330 msgid "Add privacy group" msgstr "" -#: ../../include/group.php:335 +#: ../../include/group.php:331 msgid "Channels not in any privacy group" msgstr "" diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css index 53eb80b44..83deddf8a 100644 --- a/view/css/mod_cloud.css +++ b/view/css/mod_cloud.css @@ -21,6 +21,10 @@ padding: 7px 3px 7px 10px; } +#cloud-index td:nth-child(2){ + word-break: break-all; +} + #cloud-index th:nth-child(8), #cloud-index td:nth-child(8){ padding: 7px 3px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d88340a4e..b0a109c92 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1802,12 +1802,6 @@ dl.bb-dl > dd > li { overflow: hidden; } -#cloud-index { - width: 100%; - table-layout: fixed; +.caption-visible { + max-height: 75%; } - -#cloud-index td { - width: auto; - overflow: hidden; -}
\ No newline at end of file diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 660e1e011..ad3caff88 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -39,12 +39,12 @@ {{else}} <table id="cloud-index"> <tr> - <th width="4%"></th> - <th width="47%">{{$name}}</th> - <th width="4%"></th><th width="4%"></th><th width="4%"></th><th width="4%"></th> + <th width="1%"></th> + <th width="92%">{{$name}}</th> + <th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th> <th width="1%">{{*{{$type}}*}}</th> - <th width="10%" class="d-none d-md-table-cell">{{$size}}</th> - <th width="22%" class="d-none d-md-table-cell">{{$lastmod}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$size}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th> </tr> {{if $parentpath}} <tr> |