diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-19 16:27:24 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-19 16:27:24 -0700 |
| commit | cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9 (patch) | |
| tree | 2069795706e4d54b740ee5ef6d8469c75d331b34 | |
| parent | 656ec585b22e62b496fe96002ee8ca7f9fd02d64 (diff) | |
| parent | 52183f8bf85777068839490c37a882191f216fe4 (diff) | |
| download | volse-hubzilla-cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9.tar.gz volse-hubzilla-cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9.tar.bz2 volse-hubzilla-cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | CHANGELOG | 111 | ||||
| -rw-r--r-- | Zotlabs/Module/Display.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Module/Moderate.php | 22 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/connections.php | 3 | ||||
| -rw-r--r-- | include/conversation.php | 4 | ||||
| -rw-r--r-- | util/hmessages.po | 3069 | ||||
| -rw-r--r-- | view/js/main.js | 110 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/navbar_tucson.tpl | 2 |
10 files changed, 1867 insertions, 1465 deletions
@@ -1,3 +1,114 @@ +Hubzilla 2.8 (????-??-??) + - Redirect to be moderated items to /moderate + - Update notifications if notifications area remains open + - Create an actual logout module instead of relying on internal variables + - Add local_channel as a comanche condition variable + - Implement possibility to pin app-tray apps in the navbar via app category navbar_default + - Introduce custom navbars + - Re-implement single delivery + - Pdledit usability improvements + - Implement next generation notifications in right aside + - Implement single post view for /pubstream + - Make anonymous comments work in mod display + - Introduce notifications for unseen public stream posts (off by default) + - Preperatory work on Zot VI + - Add app for site admin + - Introduce experimental alternate channel_menu navigation (off by default) + - Introduce notifications for shared files + - Bring back notifications for account approvals + - Urlencode hashes from mod_acl + - Don't use chanlink_url() for feed mentions + - Design common friends widget to fit better in the app and move it to left aside + - Allow navbar to be used when cover photo is displayed in mod channel + - Implement admin setting to use imagick converter for large photos + - Process activity deletes from OStatus which for whatever reason do not use the industry standard tombstone mechanism + - Implement new css based spinner + - Move the link header initialisation from Router to Webserver + ⁻ Extend activity_match() to work with arrays + - Updated the trusted CA cert database + - Ostatus - support likes of comments + - Provide ability to mention a forum by using !forumname as well as the traditional red style (@forumname+) + - Encrypt delivery reports (not backward compatible) + - Provide a space between link header params (draft-cavage-http-signatures-08) + - Turn common_friends into a widget + - Update to jquery-3.2.1 + - Wiki pages sorted by name + - Create new hooks for permissions_accept and permissions_reject + - Provide rel=alternate link if no reshare content in post + - Add remote login button to login page + - DB update to add index to item.resource_id + - Implement wiki editing (name and acl) + - Provide a hook for importing a channel photo at channel creation time + - Implement wiki mimetype lock + - Bring back wiki downloads + - Add text/plain mimetype to wiki + - Implement per page mimetype selection for wikis + - Added english context help for apps and appman + - Implement owa (open web auth) + - Ignore diaspora_meta column on item import + - Check code permissions on cloud files + - Remove period from characters allowed in username + - Make comment highlighting more reliable + - Sign zot-info packets with httpsignatures + - Implement server to server magic auth + - Provide support for json-ld signatures + - Rewrite comment form open/close handling to be more reliable + - Radically reduce code duplication in updateConvItems() + - Remove discover tab in favour of the public stream app + - Apply autotime to all autotime classed elements when static loading a page + - Implement cards feature + - Extended support for help page translations including table of contents files at the top level + - Introduce util/dmkdir - a mkdir tool for DAV + - Various doco improvements + - Introduce util/dcp (DAV-copy) - copy file or directory from local system to Hubzilla + - Provide support for HTTPsig + - Implement mechanism for selective network following in protocol connectors (diaspora, ostatus, activitypub, zot, rss) + + Bugfixes + - Fix w2w posts not removed in contact_remove() - github issue #837 + - Fix guests not having a unique (non-existent) url + - Fix mod register re-using the password + - Fix write_storage permission not checked in /display + - Fix discovery of moderated items in enotify + - Fix profile thing image not deleted when thing deleted - github issue #868 + - Fix deletions to comments not synced on wall posts + - Fix community tags not preserved on post edit - github issue #865 + - Fix profile photo propagation issue if the local xchan_photo_[l|m|s] fields were changed from the /photo/profile/l/n form to photo/[hash] form by a clone operation + - Fix lockstate and current permissions not handed over to editor in mod card_edit + - Fix profile edit dropdown for multiple profiles + - Fix affinity slider spinner + - Fix mod pubsites broken + - Fix directory server admin selection includes known dead sites + - Fix sticky-kit issue where the bottom of left aside was not visible when section content was short + - Fix possibility to set bogus my_address + - Fix deleting of wiki pages + - Fix selected theme not appearing selected after change - github issue #855 + - Fix an issue where some encoded mids were not found in /display + - Fix issue with mentions and xchans with @ or / + - Fix webfinger returns invalid XML - github issue #851 + - Fix last remaining task in tasklist was not removed from view when completed + + Plugins/Addon + Hubwall: Remove errant $1 string in sender name + Map federation protocols for zotinfo + Gnusoc: force ostatus profile photos to get refreshed monthly + Gnusoc: fix ostatus mention notifications + Gnusoc: unsubscribe to gnusoc feeds if connector is disabled + Phpmailer: not using load/unload + Gnusoc: don't provide some information if gnusoc is disabled by the channel + Diaspora: add a predelivery interval + Diaspora: support for likes on comments + Introduce the pubcrawl plugin - an unapologetically non-compliant ActivityPub Protocol implemention + Introduce gravatar plugin + Pubsubhubbub: produce much more compact PuSH feeds + Diaspora: support text comments on reshare posts + Diaspora: changes to delivery scenarios for the special handling of profile messages + Diaspora: put diaspora seed_location in json webfinger + Gnusoc: fix mis-attributed comments from mastodon + Gnusoc: allow discovery by url (not just reddress) and permit upgrade from 'unknown' network to gnusoc + Implement mechanism for selective network following in protocol connectors + + Hubzilla 2.6.3 (2017-09-18) - Fix anonymous comments/likes on photos - this is not yet implemented - Fix favicon not displayed on certain pages diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 0ea55102e..d5afdd787 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -89,13 +89,18 @@ class Display extends \Zotlabs\Web\Controller { if($decoded) $item_hash = $decoded; - $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted from item where mid like '%s' limit 1", + $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1", dbesc($item_hash . '%') ); if($r) { $target_item = $r[0]; } + + //if the item is to be moderated redirect to /moderate + if($target_item['item_blocked'] == ITEM_MODERATED) { + goaway(z_root() . '/moderate/' . $target_item['id']); + } $r = null; diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php index 8aaa0897a..cf1625a6b 100644 --- a/Zotlabs/Module/Moderate.php +++ b/Zotlabs/Module/Moderate.php @@ -14,6 +14,24 @@ class Moderate extends \Zotlabs\Web\Controller { return; } + //show all items + if(argc() == 1) { + $r = q("select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc limit 60", + intval(local_channel()), + intval(ITEM_MODERATED) + ); + } + + //show a single item + if(argc() == 2) { + $post_id = intval(argv(1)); + + $r = q("select item.id as item_id, item.* from item where item.id = %d and item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc limit 60", + intval($post_id), + intval(local_channel()), + intval(ITEM_MODERATED) + ); + } if(argc() > 2) { $post_id = intval(argv(1)); @@ -55,10 +73,6 @@ class Moderate extends \Zotlabs\Web\Controller { goaway(z_root() . '/moderate'); } } - $r = q("select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc limit 60", - intval(local_channel()), - intval(ITEM_MODERATED) - ); if($r) { xchan_query($r); @@ -49,7 +49,7 @@ require_once('include/hubloc.php'); require_once('include/attach.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '2.7.6' ); +define ( 'STD_VERSION', '2.9' ); define ( 'ZOT_REVISION', '1.3' ); define ( 'DB_UPDATE_VERSION', 1196 ); diff --git a/include/connections.php b/include/connections.php index 0cf4cdc5a..60bce018e 100644 --- a/include/connections.php +++ b/include/connections.php @@ -369,7 +369,8 @@ function contact_remove($channel_id, $abook_id) { return false; - $r = q("select * from item where author_xchan = '%s' and uid = %d", + $r = q("select * from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d", + dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']), intval($channel_id) ); diff --git a/include/conversation.php b/include/conversation.php index c034e8a65..f395b2cbe 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -703,7 +703,9 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $is_new = true; - $conv_link = (($item['item_type'] == ITEM_TYPE_CARD) ? $item['plink'] : z_root() . '/display/' . gen_link_id($item['mid'])); + $conv_link_mid = (($mode == 'moderate') ? $item['parent_mid'] : $item['mid']); + + $conv_link = (($item['item_type'] == ITEM_TYPE_CARD) ? $item['plink'] : z_root() . '/display/' . gen_link_id($conv_link_mid)); $tmp_item = array( diff --git a/util/hmessages.po b/util/hmessages.po index 5115cf7c3..8a2eb961f 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.7.0\n" +"Project-Id-Version: 2.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-01 12:13+0200\n" +"POT-Creation-Date: 2017-10-19 12:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -146,14 +146,14 @@ msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:270 -#: ../../Zotlabs/Module/Cdav.php:1123 ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:132 #: ../../Zotlabs/Module/Settings/Channel.php:467 -#: ../../Zotlabs/Module/Connedit.php:932 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Register.php:213 ../../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:681 -#: ../../include/connections.php:688 +#: ../../include/event.php:1304 ../../include/connections.php:689 +#: ../../include/connections.php:696 msgid "Other" msgstr "" @@ -165,16 +165,17 @@ msgstr "" #: ../../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/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1062 +#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:29 +#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Filestorage.php:51 +#: ../../include/channel.php:1163 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/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115 -#: ../../Zotlabs/Module/Channel.php:245 ../../Zotlabs/Module/Channel.php:285 +#: ../../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 @@ -182,21 +183,21 @@ msgstr "" #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274 -#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:275 +#: ../../Zotlabs/Module/Thing.php:295 ../../Zotlabs/Module/Thing.php:336 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 -#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:102 +#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../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:235 ../../Zotlabs/Module/Wiki.php:341 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:388 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 -#: ../../Zotlabs/Module/Profile_photo.php:280 -#: ../../Zotlabs/Module/Profile_photo.php:293 +#: ../../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:1076 ../../Zotlabs/Module/Page.php:34 -#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:385 +#: ../../Zotlabs/Module/Item.php:1102 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:125 ../../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 @@ -206,31 +207,34 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 -#: ../../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/Message.php:18 -#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Register.php:77 +#: ../../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/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/Network.php:15 +#: ../../Zotlabs/Module/Cover_photo.php:294 +#: ../../Zotlabs/Module/Display.php:343 ../../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:39 +#: ../../Zotlabs/Module/Filestorage.php:112 ../../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/Web/WebServer.php:131 ../../addon/keepout/keepout.php:36 +#: ../../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:918 -#: ../../include/attach.php:992 ../../include/attach.php:1157 -#: ../../include/items.php:3440 ../../include/photos.php:28 +#: ../../include/attach.php:443 ../../include/attach.php:924 +#: ../../include/attach.php:998 ../../include/attach.php:1163 +#: ../../include/items.php:3489 ../../include/photos.php:28 msgid "Permission denied." msgstr "" @@ -239,7 +243,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2288 msgid "Blocks" msgstr "" @@ -257,62 +261,64 @@ msgstr "" msgid "Edited" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1126 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1185 #: ../../Zotlabs/Module/New_channel.php:147 -#: ../../Zotlabs/Module/Connedit.php:935 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Menu.php:118 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 -#: ../../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/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 msgid "Create" msgstr "" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Admin/Profs.php:154 #: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114 +#: ../../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:167 -#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:202 +#: ../../Zotlabs/Module/Wiki.php:346 ../../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/Lib/Apps.php:393 ../../Zotlabs/Lib/ThreadItem.php:107 -#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Widget/Cdav.php:125 -#: ../../Zotlabs/Widget/Cdav.php:161 ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1161 -#: ../../include/channel.php:1165 ../../include/menu.php:113 +#: ../../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 +#: ../../addon/gitwiki/Mod_Gitwiki.php:151 +#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1262 +#: ../../include/channel.php:1266 ../../include/menu.php:113 msgid "Edit" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1044 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1049 #: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 -#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308 +#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1346 msgid "Share" msgstr "" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Cdav.php:838 ../../Zotlabs/Module/Cdav.php:1128 +#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 #: ../../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:261 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Connections.php:268 -#: ../../Zotlabs/Module/Photos.php:1145 ../../Zotlabs/Module/Connedit.php:650 -#: ../../Zotlabs/Module/Connedit.php:937 ../../Zotlabs/Module/Group.php:179 +#: ../../Zotlabs/Module/Photos.php:1150 ../../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/Lib/Apps.php:394 -#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:240 -#: ../../include/conversation.php:649 ../../include/conversation.php:686 +#: ../../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 msgid "Delete" msgstr "" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 -#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Layouts.php:198 -#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:59 +#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198 +#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60 #: ../../addon/gitwiki/Mod_Gitwiki.php:153 msgid "View" msgstr "" @@ -346,10 +352,6 @@ msgid_plural "%d messages sent." msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Invite.php:98 ../../Zotlabs/Lib/Apps.php:254 -msgid "Invite" -msgstr "" - #: ../../Zotlabs/Module/Invite.php:107 msgid "You have no more invitations available" msgstr "" @@ -401,7 +403,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:271 +#: ../../Zotlabs/Module/Admin/Site.php:273 #: ../../Zotlabs/Module/Admin/Profs.php:157 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 @@ -411,23 +413,25 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Tokens.php:168 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:52 -#: ../../Zotlabs/Module/Settings/Display.php:203 +#: ../../Zotlabs/Module/Settings/Display.php:207 #: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 -#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Cal.php:343 +#: ../../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:1024 ../../Zotlabs/Module/Photos.php:1064 -#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Module/Wiki.php:171 -#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:200 -#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Chat.php:196 +#: ../../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/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:730 ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../view/theme/redbasic/php/config.php:95 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:226 +#: ../../Zotlabs/Lib/ThreadItem.php:743 ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../Zotlabs/Widget/Wiki_pages.php:61 +#: ../../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/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 @@ -436,7 +440,7 @@ msgstr "" #: ../../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:759 +#: ../../addon/diaspora/diaspora.php:807 #: ../../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 @@ -444,8 +448,8 @@ msgstr "" #: ../../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/chords/Mod_Chords.php:60 -#: ../../addon/libertree/libertree.php:85 +#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../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 @@ -463,6 +467,7 @@ msgstr "" #: ../../Zotlabs/Module/Editlayout.php:79 ../../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" msgstr "" @@ -482,9 +487,9 @@ 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:130 +#: ../../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:340 +#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:346 msgid "Permission denied" msgstr "" @@ -496,7 +501,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1485 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1585 msgid "Profile" msgstr "" @@ -513,159 +518,152 @@ msgstr "" msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:726 +#: ../../Zotlabs/Module/Cdav.php:785 msgid "INVALID EVENT DISMISSED!" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:727 +#: ../../Zotlabs/Module/Cdav.php:786 msgid "Summary: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:727 ../../Zotlabs/Module/Cdav.php:728 -#: ../../Zotlabs/Module/Cdav.php:735 ../../Zotlabs/Module/Embedphotos.php:146 -#: ../../Zotlabs/Module/Photos.php:759 ../../Zotlabs/Module/Photos.php:1215 -#: ../../Zotlabs/Lib/Apps.php:721 ../../Zotlabs/Lib/Apps.php:799 +#: ../../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 ../../include/conversation.php:1107 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:841 +#: ../../include/conversation.php:1143 msgid "Unknown" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:728 +#: ../../Zotlabs/Module/Cdav.php:787 msgid "Date: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736 +#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795 msgid "Reason: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:734 +#: ../../Zotlabs/Module/Cdav.php:793 msgid "INVALID CARD DISMISSED!" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:735 +#: ../../Zotlabs/Module/Cdav.php:794 msgid "Name: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:768 -msgid "CalDAV" -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:460 +#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460 msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Events.php:466 +#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466 msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Cdav.php:811 +#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870 msgid "Example: YYYY-MM-DD HH:mm" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:811 +#: ../../Zotlabs/Module/Cdav.php:870 msgid "End date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:812 ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 msgid "Description" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117 #: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 -#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:51 +#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:52 #: ../../include/js_strings.php:25 msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:689 +#: ../../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:913 +#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:918 msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:690 +#: ../../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:922 +#: ../../Zotlabs/Module/Photos.php:927 msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:822 ../../Zotlabs/Module/Events.php:700 +#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700 #: ../../Zotlabs/Module/Cal.php:346 msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:823 ../../Zotlabs/Module/Events.php:695 +#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:824 ../../Zotlabs/Module/Events.php:696 +#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:825 ../../Zotlabs/Module/Events.php:697 +#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697 msgid "Day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:826 +#: ../../Zotlabs/Module/Cdav.php:885 msgid "List month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:827 +#: ../../Zotlabs/Module/Cdav.php:886 msgid "List week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:828 +#: ../../Zotlabs/Module/Cdav.php:887 msgid "List day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:835 +#: ../../Zotlabs/Module/Cdav.php:894 msgid "More" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:836 +#: ../../Zotlabs/Module/Cdav.php:895 msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:837 +#: ../../Zotlabs/Module/Cdav.php:896 msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:839 +#: ../../Zotlabs/Module/Cdav.php:898 msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:840 ../../Zotlabs/Module/Cdav.php:1129 +#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 #: ../../Zotlabs/Module/Admin/Plugins.php:423 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Wiki.php:316 -#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Wiki.php:333 ../../Zotlabs/Module/Wiki.php:363 +#: ../../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:1324 -#: ../../include/conversation.php:1373 +#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1369 +#: ../../include/conversation.php:1418 msgid "Cancel" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:841 +#: ../../Zotlabs/Module/Cdav.php:900 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:969 -msgid "CardDAV" -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:1111 ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Sharedwithme.php:105 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Settings/Oauth.php:89 #: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Wiki.php:174 ../../Zotlabs/Module/Connedit.php:920 -#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:539 +#: ../../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/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 @@ -673,123 +671,123 @@ msgstr "" msgid "Name" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1112 ../../Zotlabs/Module/Connedit.php:921 +#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:925 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1113 ../../Zotlabs/Module/Connedit.php:922 +#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:926 msgid "Title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1114 ../../Zotlabs/Module/Connedit.php:923 +#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:927 #: ../../Zotlabs/Module/Profiles.php:789 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1115 +#: ../../Zotlabs/Module/Cdav.php:1174 #: ../../Zotlabs/Module/Admin/Accounts.php:169 #: ../../Zotlabs/Module/Admin/Accounts.php:181 -#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:790 +#: ../../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:1697 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1706 msgid "Email" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1116 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:929 #: ../../Zotlabs/Module/Profiles.php:791 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1117 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:930 #: ../../Zotlabs/Module/Profiles.php:792 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1118 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:502 +#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Profiles.php:502 #: ../../Zotlabs/Module/Profiles.php:793 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1119 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:932 #: ../../Zotlabs/Module/Profiles.php:794 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1120 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:933 #: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290 -#: ../../include/connections.php:674 +#: ../../include/connections.php:682 msgid "Mobile" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1121 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:934 #: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291 -#: ../../include/connections.php:675 +#: ../../include/connections.php:683 msgid "Home" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1122 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:935 #: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294 -#: ../../include/connections.php:678 +#: ../../include/connections.php:686 msgid "Work" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:937 #: ../../Zotlabs/Module/Profiles.php:799 #: ../../addon/jappixmini/jappixmini.php:368 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:938 #: ../../Zotlabs/Module/Profiles.php:800 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1127 +#: ../../Zotlabs/Module/Cdav.php:1186 #: ../../Zotlabs/Module/Admin/Plugins.php:453 #: ../../Zotlabs/Module/Settings/Oauth.php:42 #: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Lib/Apps.php:384 +#: ../../Zotlabs/Module/Connedit.php:940 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Lib/Apps.php:383 msgid "Update" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1130 ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:943 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1131 ../../Zotlabs/Module/Connedit.php:940 +#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:944 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1132 ../../Zotlabs/Module/Connedit.php:941 +#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:945 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1133 ../../Zotlabs/Module/Connedit.php:942 +#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:946 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1134 ../../Zotlabs/Module/Connedit.php:943 +#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:947 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1135 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:948 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1136 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:949 #: ../../Zotlabs/Module/Profiles.php:760 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1183 +#: ../../Zotlabs/Module/Cdav.php:1242 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1193 +#: ../../Zotlabs/Module/Cdav.php:1252 msgid "Default Addressbook" msgstr "" @@ -798,7 +796,7 @@ msgid "This site is not a directory server" msgstr "" #: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 -#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:403 +#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:431 msgid "You must be logged in to see this page." msgstr "" @@ -812,20 +810,10 @@ msgstr "" msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:97 ../../Zotlabs/Lib/Apps.php:240 -#: ../../include/nav.php:175 -msgid "Channel Home" -msgstr "" - -#: ../../Zotlabs/Module/Channel.php:112 +#: ../../Zotlabs/Module/Channel.php:107 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:256 -#: ../../addon/openid/MysqlProvider.php:69 -msgid "Language" -msgstr "" - #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 msgid "Export Channel" msgstr "" @@ -886,16 +874,15 @@ msgstr "" #: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:490 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 -#: ../../Zotlabs/Module/Display.php:22 +#: ../../Zotlabs/Module/Display.php:21 #: ../../Zotlabs/Module/Viewconnections.php:23 msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:25 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Module/Connections.php:313 ../../Zotlabs/Lib/Apps.php:250 -#: ../../Zotlabs/Widget/Sitesearch.php:31 ../../include/text.php:1021 -#: ../../include/text.php:1033 ../../include/acl_selectors.php:213 -#: ../../include/nav.php:160 +#: ../../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 msgid "Search" msgstr "" @@ -909,6 +896,11 @@ msgstr "" msgid "Search results for: %s" msgstr "" +#: ../../Zotlabs/Module/Pubstream.php:38 +#: ../../Zotlabs/Widget/Notifications.php:128 +msgid "Public Stream" +msgstr "" + #: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 msgid "Location not found." msgstr "" @@ -961,11 +953,11 @@ msgstr "" msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../Zotlabs/Module/Apporder.php:34 +#: ../../Zotlabs/Module/Apporder.php:39 msgid "Change Order of Navigation Apps" msgstr "" -#: ../../Zotlabs/Module/Apporder.php:35 +#: ../../Zotlabs/Module/Apporder.php:40 msgid "Use arrows to move the corresponding app up or down in the display list" msgstr "" @@ -1018,18 +1010,20 @@ 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:235 +#: ../../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/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392 -#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681 +#: ../../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:1605 -#: ../../view/theme/redbasic/php/config.php:100 -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1644 +#: ../../view/theme/redbasic_c/php/config.php:100 +#: ../../view/theme/redbasic_c/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:98 #: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 #: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 @@ -1066,18 +1060,19 @@ 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/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/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Profiles.php:681 +#: ../../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:1605 -#: ../../view/theme/redbasic/php/config.php:100 -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1644 +#: ../../view/theme/redbasic_c/php/config.php:100 +#: ../../view/theme/redbasic_c/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:98 #: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 #: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 @@ -1218,17 +1213,10 @@ msgstr "" #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51 #: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119 -#: ../../include/text.php:1933 ../../include/event.php:1145 +#: ../../include/text.php:1941 ../../include/event.php:1145 msgid "event" msgstr "" -#: ../../Zotlabs/Module/Events.php:275 ../../Zotlabs/Lib/Apps.php:243 -#: ../../include/conversation.php:1799 ../../include/conversation.php:1802 -#: ../../include/nav.php:195 ../../include/nav.php:397 -#: ../../include/nav.php:400 -msgid "Events" -msgstr "" - #: ../../Zotlabs/Module/Events.php:460 msgid "Edit event title" msgstr "" @@ -1286,13 +1274,13 @@ msgstr "" msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1065 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:739 -#: ../../include/conversation.php:1277 +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1070 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:753 +#: ../../include/conversation.php:1313 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1340 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1385 msgid "Permission settings" msgstr "" @@ -1317,7 +1305,7 @@ msgid "Delete event" msgstr "" #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313 -#: ../../include/text.php:1752 +#: ../../include/text.php:1760 msgid "Link to Source" msgstr "" @@ -1334,7 +1322,7 @@ msgid "Create Event" msgstr "" #: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339 -#: ../../include/channel.php:1488 +#: ../../include/channel.php:1588 msgid "Export" msgstr "" @@ -1402,21 +1390,21 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../Zotlabs/Module/Magic.php:71 +#: ../../Zotlabs/Module/Magic.php:72 msgid "Hub not found." msgstr "" #: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47 #: ../../Zotlabs/Module/Like.php:370 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:116 -#: ../../include/text.php:1930 +#: ../../addon/diaspora/Receiver.php:1424 ../../addon/pubcrawl/as.php:1288 +#: ../../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:1370 ../../include/conversation.php:144 -#: ../../include/text.php:1936 +#: ../../addon/diaspora/Receiver.php:1424 ../../addon/pubcrawl/as.php:1288 +#: ../../include/conversation.php:144 ../../include/text.php:1944 msgid "status" msgstr "" @@ -1461,7 +1449,7 @@ msgid "Use this form to import existing posts and content from an export file." msgstr "" #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:505 +#: ../../Zotlabs/Module/Import.php:516 msgid "File to Upload" msgstr "" @@ -1538,6 +1526,7 @@ msgstr "" #: ../../Zotlabs/Module/Removeme.php:61 #: ../../Zotlabs/Module/Removeaccount.php:58 +#: ../../Zotlabs/Module/Changeaddr.php:78 msgid "WARNING: " msgstr "" @@ -1552,6 +1541,7 @@ msgstr "" #: ../../Zotlabs/Module/Removeme.php:62 #: ../../Zotlabs/Module/Removeaccount.php:59 +#: ../../Zotlabs/Module/Changeaddr.php:79 msgid "Please enter your password for verification:" msgstr "" @@ -1579,7 +1569,7 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1386 +#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1394 msgid "Size" msgstr "" @@ -2169,9 +2159,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:35 -#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 -#: ../../include/items.php:3361 +#: ../../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 msgid "Item not found." msgstr "" @@ -2202,7 +2192,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:269 +#: ../../Zotlabs/Module/Admin/Site.php:271 #: ../../Zotlabs/Module/Admin/Security.php:86 #: ../../Zotlabs/Module/Admin.php:136 msgid "Administration" @@ -2220,7 +2210,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:201 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:132 +#: ../../include/nav.php:217 msgid "Settings" msgstr "" @@ -2283,7 +2274,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:384 +#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:383 msgid "Install" msgstr "" @@ -2304,7 +2295,7 @@ msgid "Switch branch" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Photos.php:967 ../../Zotlabs/Module/Tagrm.php:137 #: ../../addon/superblock/superblock.php:116 msgid "Remove" msgstr "" @@ -2327,7 +2318,7 @@ msgstr[1] "" msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:90 +#: ../../Zotlabs/Module/Admin/Accounts.php:90 ../../include/channel.php:2357 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -2366,7 +2357,7 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:171 -#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:685 +#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:716 msgid "Approve" msgstr "" @@ -2375,12 +2366,12 @@ msgid "Deny" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:174 -#: ../../Zotlabs/Module/Connedit.php:618 +#: ../../Zotlabs/Module/Connedit.php:622 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:175 -#: ../../Zotlabs/Module/Connedit.php:618 +#: ../../Zotlabs/Module/Connedit.php:622 msgid "Unblock" msgstr "" @@ -2523,7 +2514,7 @@ msgid "Disallow Code" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1757 ../../include/nav.php:355 +#: ../../include/conversation.php:1791 ../../include/nav.php:399 msgid "Channel" msgstr "" @@ -2568,379 +2559,391 @@ msgstr "" msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:142 +#: ../../Zotlabs/Module/Admin/Site.php:144 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:168 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2928 +#: ../../Zotlabs/Module/Admin/Site.php:170 +#: ../../view/theme/redbasic_c/php/config.php:15 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2943 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:179 +#: ../../Zotlabs/Module/Admin/Site.php:181 #: ../../Zotlabs/Module/Settings/Display.php:137 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:186 +#: ../../Zotlabs/Module/Admin/Site.php:188 #: ../../Zotlabs/Module/Settings/Display.php:151 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:188 +#: ../../Zotlabs/Module/Admin/Site.php:190 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:190 +#: ../../Zotlabs/Module/Admin/Site.php:192 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:236 +#: ../../Zotlabs/Module/Admin/Site.php:238 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:242 +#: ../../Zotlabs/Module/Admin/Site.php:244 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:243 +#: ../../Zotlabs/Module/Admin/Site.php:245 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:244 +#: ../../Zotlabs/Module/Admin/Site.php:246 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:245 +#: ../../Zotlabs/Module/Admin/Site.php:247 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:256 +#: ../../Zotlabs/Module/Admin/Site.php:258 msgid "Beginner/Basic" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:257 +#: ../../Zotlabs/Module/Admin/Site.php:259 msgid "Novice - not skilled but willing to learn" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:258 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Intermediate - somewhat comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Admin/Site.php:261 msgid "Advanced - very comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:262 msgid "Expert - I can write computer code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:263 msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:272 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:272 +#: ../../Zotlabs/Module/Admin/Site.php:274 #: ../../Zotlabs/Module/Register.php:251 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:273 +#: ../../Zotlabs/Module/Admin/Site.php:275 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:274 +#: ../../Zotlabs/Module/Admin/Site.php:276 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:275 ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin/Site.php:277 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:281 #: ../../addon/statusnet/statusnet.php:890 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:281 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Site default technical skill level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:281 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Used to provide a member experience matched to technical comfort level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Lock the technical skill level setting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Members can set their own technical comfort level by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:287 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:286 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:286 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:287 ../../Zotlabs/Module/Siteinfo.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:289 ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:291 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:290 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Mobile system theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:300 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:299 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:303 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:302 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:319 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:318 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:320 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:319 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:322 +msgid "Path to ImageMagick convert program" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:322 +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 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "0 for no expiration of imported content" msgstr "" @@ -2986,8 +2989,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:74 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 -#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022 -#: ../../include/text.php:1034 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1030 +#: ../../include/text.php:1042 msgid "Save" msgstr "" @@ -3184,16 +3187,16 @@ msgid "Visible to:" msgstr "" #: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 -#: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183 +#: ../../Zotlabs/Module/Acl.php:118 ../../include/acl_selectors.php:183 msgctxt "acl" msgid "Profile" msgstr "" -#: ../../Zotlabs/Module/Moderate.php:37 +#: ../../Zotlabs/Module/Moderate.php:55 msgid "Comment approved" msgstr "" -#: ../../Zotlabs/Module/Moderate.php:41 +#: ../../Zotlabs/Module/Moderate.php:59 msgid "Comment deleted" msgstr "" @@ -3217,25 +3220,25 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:103 #: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Connedit.php:908 msgid "My Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:105 #: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Connedit.php:899 +#: ../../Zotlabs/Module/Connedit.php:903 msgid "inherited" msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Connedit.php:910 msgid "Individual Permissions" msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:109 #: ../../Zotlabs/Module/Settings/Tokens.php:167 -#: ../../Zotlabs/Module/Connedit.php:907 +#: ../../Zotlabs/Module/Connedit.php:911 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -3247,9 +3250,9 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:67 #: ../../Zotlabs/Module/Settings/Channel.php:70 #: ../../Zotlabs/Module/Settings/Channel.php:81 -#: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28 -#: ../../include/selectors.php:123 ../../include/channel.php:408 -#: ../../include/channel.php:409 ../../include/channel.php:416 +#: ../../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 msgid "Friends" msgstr "" @@ -3303,7 +3306,7 @@ 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:429 +#: ../../Zotlabs/Module/Profile_photo.php:437 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "or" msgstr "" @@ -3324,7 +3327,7 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:486 ../../include/channel.php:1373 +#: ../../Zotlabs/Module/Settings/Channel.php:486 ../../include/channel.php:1473 msgid "Full Name:" msgstr "" @@ -3441,7 +3444,7 @@ msgid "May reduce spam activity" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:512 -msgid "Default Access Control List (ACL)" +msgid "Default Privacy Group" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:514 @@ -3695,7 +3698,7 @@ msgid "Expires (yyyy-mm-dd)" msgstr "" #: ../../Zotlabs/Module/Settings/Tokens.php:160 -#: ../../Zotlabs/Module/Connedit.php:903 +#: ../../Zotlabs/Module/Connedit.php:907 msgid "Their Settings" msgstr "" @@ -3805,107 +3808,107 @@ msgstr "" msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:200 +#: ../../Zotlabs/Module/Settings/Display.php:204 msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:205 msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:207 +#: ../../Zotlabs/Module/Settings/Display.php:211 msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:208 +#: ../../Zotlabs/Module/Settings/Display.php:212 msgid "Select scheme" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:210 +#: ../../Zotlabs/Module/Settings/Display.php:214 msgid "Mobile Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:211 +#: ../../Zotlabs/Module/Settings/Display.php:215 msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:211 +#: ../../Zotlabs/Module/Settings/Display.php:215 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:212 +#: ../../Zotlabs/Module/Settings/Display.php:216 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:213 +#: ../../Zotlabs/Module/Settings/Display.php:217 msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:213 +#: ../../Zotlabs/Module/Settings/Display.php:217 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:214 +#: ../../Zotlabs/Module/Settings/Display.php:218 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:214 +#: ../../Zotlabs/Module/Settings/Display.php:218 msgid "Maximum of 100 items" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:215 +#: ../../Zotlabs/Module/Settings/Display.php:219 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:216 +#: ../../Zotlabs/Module/Settings/Display.php:220 msgid "Manual conversation updates" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:216 +#: ../../Zotlabs/Module/Settings/Display.php:220 msgid "Default is on, turning this off may increase screen jumping" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:217 +#: ../../Zotlabs/Module/Settings/Display.php:221 msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:218 +#: ../../Zotlabs/Module/Settings/Display.php:222 msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:221 +#: ../../Zotlabs/Module/Settings/Display.php:225 msgid "Use blog/list mode on channel page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:221 -#: ../../Zotlabs/Module/Settings/Display.php:222 +#: ../../Zotlabs/Module/Settings/Display.php:225 +#: ../../Zotlabs/Module/Settings/Display.php:226 msgid "(comments displayed separately)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:222 +#: ../../Zotlabs/Module/Settings/Display.php:226 msgid "Use blog/list mode on grid page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:223 +#: ../../Zotlabs/Module/Settings/Display.php:227 msgid "Channel page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:223 -#: ../../Zotlabs/Module/Settings/Display.php:224 +#: ../../Zotlabs/Module/Settings/Display.php:227 +#: ../../Zotlabs/Module/Settings/Display.php:228 msgid "click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:224 +#: ../../Zotlabs/Module/Settings/Display.php:228 msgid "Grid page max height of content (in pixels)" msgstr "" @@ -3984,20 +3987,20 @@ msgstr "" msgid "Remove authorization" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:753 -#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Widget/Portfolio.php:78 +#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:758 +#: ../../Zotlabs/Module/Photos.php:1297 ../../Zotlabs/Widget/Portfolio.php:78 #: ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:784 +#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:789 #: ../../Zotlabs/Widget/Portfolio.php:97 ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:786 -#: ../../Zotlabs/Module/Photos.php:1323 -#: ../../Zotlabs/Module/Profile_photo.php:423 +#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:791 +#: ../../Zotlabs/Module/Photos.php:1328 +#: ../../Zotlabs/Module/Profile_photo.php:431 #: ../../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 @@ -4009,75 +4012,75 @@ msgstr "" msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../Zotlabs/Module/Thing.php:114 +#: ../../Zotlabs/Module/Thing.php:115 msgid "Thing updated" msgstr "" -#: ../../Zotlabs/Module/Thing.php:166 +#: ../../Zotlabs/Module/Thing.php:167 msgid "Object store: failed" msgstr "" -#: ../../Zotlabs/Module/Thing.php:170 +#: ../../Zotlabs/Module/Thing.php:171 msgid "Thing added" msgstr "" -#: ../../Zotlabs/Module/Thing.php:196 +#: ../../Zotlabs/Module/Thing.php:197 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../Zotlabs/Module/Thing.php:259 +#: ../../Zotlabs/Module/Thing.php:260 msgid "Show Thing" msgstr "" -#: ../../Zotlabs/Module/Thing.php:266 +#: ../../Zotlabs/Module/Thing.php:267 msgid "item not found." msgstr "" -#: ../../Zotlabs/Module/Thing.php:299 +#: ../../Zotlabs/Module/Thing.php:300 msgid "Edit Thing" msgstr "" -#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355 +#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:359 msgid "Select a profile" msgstr "" -#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 +#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 msgid "Post an activity" msgstr "" -#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 +#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 msgid "Only sends to viewers of the applicable profile" msgstr "" -#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360 +#: ../../Zotlabs/Module/Thing.php:308 ../../Zotlabs/Module/Thing.php:364 msgid "Name of thing e.g. something" msgstr "" -#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361 +#: ../../Zotlabs/Module/Thing.php:310 ../../Zotlabs/Module/Thing.php:365 msgid "URL of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:312 ../../Zotlabs/Module/Thing.php:366 msgid "URL for photo of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 -#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1013 -#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:235 +#: ../../Zotlabs/Module/Thing.php:314 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1018 +#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 #: ../../Zotlabs/Module/Filestorage.php:142 ../../include/acl_selectors.php:218 msgid "Permissions" msgstr "" -#: ../../Zotlabs/Module/Thing.php:353 +#: ../../Zotlabs/Module/Thing.php:357 msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Notify.php:57 ../../Zotlabs/Module/Notifications.php:38 +#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:38 msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:42 +#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:42 msgid "System Notifications" msgstr "" @@ -4094,43 +4097,43 @@ msgstr "" msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:470 +#: ../../Zotlabs/Module/Import.php:481 #: ../../addon/diaspora/import_diaspora.php:142 msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Import.php:498 +#: ../../Zotlabs/Module/Import.php:509 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:503 +#: ../../Zotlabs/Module/Import.php:514 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:504 +#: ../../Zotlabs/Module/Import.php:515 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "" -#: ../../Zotlabs/Module/Import.php:506 +#: ../../Zotlabs/Module/Import.php:517 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:507 +#: ../../Zotlabs/Module/Import.php:518 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:508 +#: ../../Zotlabs/Module/Import.php:519 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:509 +#: ../../Zotlabs/Module/Import.php:520 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:510 +#: ../../Zotlabs/Module/Import.php:521 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -4138,19 +4141,19 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:511 +#: ../../Zotlabs/Module/Import.php:522 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:512 +#: ../../Zotlabs/Module/Import.php:523 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:513 +#: ../../Zotlabs/Module/Import.php:524 msgid "Import a few months of posts if possible (limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Import.php:514 +#: ../../Zotlabs/Module/Import.php:525 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4160,21 +4163,22 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2102 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1640 +#: ../../include/channel.php:2204 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2103 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2205 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2104 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2206 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/Block.php:41 ../../Zotlabs/Module/Card_edit.php:44 msgid "Channel not found." msgstr "" @@ -4182,7 +4186,7 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304 +#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2312 msgid "Import" msgstr "" @@ -4210,11 +4214,13 @@ 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 ../../include/conversation.php:1225 +#: ../../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 ../../include/conversation.php:1336 +#: ../../Zotlabs/Module/Editblock.php:129 +#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1381 msgid "Title (optional)" msgstr "" @@ -4226,15 +4232,15 @@ msgstr "" msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:224 +#: ../../Zotlabs/Module/Apps.php:47 ../../Zotlabs/Lib/Apps.php:223 msgid "Apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:48 +#: ../../Zotlabs/Module/Apps.php:50 msgid "Manage apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:49 +#: ../../Zotlabs/Module/Apps.php:51 msgid "Create new app" msgstr "" @@ -4244,8 +4250,7 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../Zotlabs/Module/Mood.php:120 ../../Zotlabs/Module/Mood.php:135 -#: ../../Zotlabs/Lib/Apps.php:247 +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:247 msgid "Mood" msgstr "" @@ -4253,12 +4258,6 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Connections.php:33 -#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229 -#: ../../include/text.php:951 ../../include/nav.php:180 -msgid "Connections" -msgstr "" - #: ../../Zotlabs/Module/Connections.php:54 #: ../../Zotlabs/Module/Connections.php:156 #: ../../Zotlabs/Module/Connections.php:245 @@ -4284,17 +4283,18 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:74 #: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1663 +#: ../../include/conversation.php:1697 msgid "New" msgstr "" #: ../../Zotlabs/Module/Connections.php:88 #: ../../Zotlabs/Module/Connections.php:102 -#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30 +#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:30 msgid "All" msgstr "" #: ../../Zotlabs/Module/Connections.php:133 +#: ../../Zotlabs/Widget/Notifications.php:80 msgid "New Connections" msgstr "" @@ -4376,7 +4376,7 @@ msgid "Ignore connection" msgstr "" #: ../../Zotlabs/Module/Connections.php:284 -#: ../../Zotlabs/Module/Connedit.php:626 +#: ../../Zotlabs/Module/Connedit.php:630 msgid "Ignore" msgstr "" @@ -4384,6 +4384,11 @@ msgstr "" msgid "Recent activity" msgstr "" +#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229 +#: ../../include/text.php:959 ../../include/nav.php:107 +msgid "Connections" +msgstr "" + #: ../../Zotlabs/Module/Connections.php:314 msgid "Search your connections" msgstr "" @@ -4406,10 +4411,6 @@ msgstr "" msgid "Source of Item" msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:11 ../../Zotlabs/Lib/Apps.php:227 -msgid "View Bookmarks" -msgstr "" - #: ../../Zotlabs/Module/Bookmarks.php:56 msgid "Bookmark added" msgstr "" @@ -4462,7 +4463,7 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1025 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1030 msgid "Delete Photo" msgstr "" @@ -4474,12 +4475,6 @@ msgstr "" msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:558 ../../Zotlabs/Module/Fbrowser.php:29 -#: ../../Zotlabs/Lib/Apps.php:242 ../../include/conversation.php:1780 -#: ../../include/nav.php:378 -msgid "Photos" -msgstr "" - #: ../../Zotlabs/Module/Photos.php:593 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." @@ -4514,192 +4509,192 @@ msgstr "" msgid "Description (optional):" msgstr "" -#: ../../Zotlabs/Module/Photos.php:727 +#: ../../Zotlabs/Module/Photos.php:732 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:729 +#: ../../Zotlabs/Module/Photos.php:734 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:834 +#: ../../Zotlabs/Module/Photos.php:839 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:836 +#: ../../Zotlabs/Module/Photos.php:841 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:894 +#: ../../Zotlabs/Module/Photos.php:899 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:895 +#: ../../Zotlabs/Module/Photos.php:900 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:902 +#: ../../Zotlabs/Module/Photos.php:907 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:917 +#: ../../Zotlabs/Module/Photos.php:922 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:999 +#: ../../Zotlabs/Module/Photos.php:1004 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1001 +#: ../../Zotlabs/Module/Photos.php:1006 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1002 +#: ../../Zotlabs/Module/Photos.php:1007 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1005 +#: ../../Zotlabs/Module/Photos.php:1010 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1006 +#: ../../Zotlabs/Module/Photos.php:1011 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1007 +#: ../../Zotlabs/Module/Photos.php:1012 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1010 +#: ../../Zotlabs/Module/Photos.php:1015 msgid "Caption" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1012 +#: ../../Zotlabs/Module/Photos.php:1017 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1020 +#: ../../Zotlabs/Module/Photos.php:1025 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1023 +#: ../../Zotlabs/Module/Photos.php:1028 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Lib/ThreadItem.php:267 +#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Lib/ThreadItem.php:271 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:268 +#: ../../Zotlabs/Module/Photos.php:1048 ../../Zotlabs/Lib/ThreadItem.php:272 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1045 ../../Zotlabs/Lib/ThreadItem.php:410 -#: ../../include/conversation.php:736 +#: ../../Zotlabs/Module/Photos.php:1050 ../../Zotlabs/Lib/ThreadItem.php:416 +#: ../../include/conversation.php:768 msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179 -#: ../../Zotlabs/Lib/ThreadItem.php:727 +#: ../../Zotlabs/Module/Photos.php:1066 ../../Zotlabs/Module/Photos.php:1184 +#: ../../Zotlabs/Lib/ThreadItem.php:740 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Module/Photos.php:1181 -#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Photos.php:1186 +#: ../../Zotlabs/Lib/ThreadItem.php:742 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569 +#: ../../Zotlabs/Module/Photos.php:1084 ../../include/conversation.php:594 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569 +#: ../../Zotlabs/Module/Photos.php:1084 ../../include/conversation.php:594 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 +#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 +#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 +#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 +#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 +#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 +#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1110 -#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199 +#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Module/Photos.php:1115 +#: ../../Zotlabs/Lib/ThreadItem.php:191 ../../Zotlabs/Lib/ThreadItem.php:203 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:191 -#: ../../include/conversation.php:1904 ../../include/channel.php:1391 -#: ../../include/taxonomy.php:442 +#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:195 +#: ../../include/conversation.php:1950 ../../include/channel.php:1491 +#: ../../include/taxonomy.php:520 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:196 -#: ../../include/conversation.php:1907 +#: ../../Zotlabs/Module/Photos.php:1112 ../../Zotlabs/Lib/ThreadItem.php:200 +#: ../../include/conversation.php:1953 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1207 +#: ../../Zotlabs/Module/Photos.php:1212 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1216 +#: ../../Zotlabs/Module/Photos.php:1221 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1221 +#: ../../Zotlabs/Module/Photos.php:1226 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1229 ../../Zotlabs/Lib/ThreadItem.php:399 +#: ../../Zotlabs/Module/Photos.php:1234 ../../Zotlabs/Lib/ThreadItem.php:404 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1230 ../../Zotlabs/Lib/ThreadItem.php:400 +#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405 +#: ../../Zotlabs/Module/Photos.php:1240 ../../Zotlabs/Lib/ThreadItem.php:410 #: ../../include/acl_selectors.php:220 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1307 ../../Zotlabs/Module/Photos.php:1320 -#: ../../Zotlabs/Module/Photos.php:1321 ../../include/photos.php:526 +#: ../../Zotlabs/Module/Photos.php:1312 ../../Zotlabs/Module/Photos.php:1325 +#: ../../Zotlabs/Module/Photos.php:1326 ../../include/photos.php:601 msgid "Recent Photos" msgstr "" @@ -4715,165 +4710,206 @@ msgstr "" msgid "Invalid channel" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:79 ../../Zotlabs/Lib/Apps.php:239 -#: ../../include/conversation.php:1854 ../../include/features.php:95 -#: ../../include/nav.php:451 -msgid "Wiki" +#: ../../Zotlabs/Module/Wiki.php:124 ../../addon/gitwiki/Mod_Gitwiki.php:107 +msgid "Error retrieving wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:131 ../../addon/gitwiki/Mod_Gitwiki.php:114 +msgid "Error creating zip file export folder" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:132 +msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:162 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1851 ../../include/nav.php:448 +#: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146 +#: ../../include/conversation.php:1897 ../../include/nav.php:504 msgid "Wikis" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:168 ../../addon/gitwiki/Mod_Gitwiki.php:152 +#: ../../Zotlabs/Module/Wiki.php:203 ../../addon/gitwiki/Mod_Gitwiki.php:152 msgid "Download" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:170 ../../Zotlabs/Module/Chat.php:256 +#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256 #: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145 #: ../../addon/gitwiki/Mod_Gitwiki.php:154 msgid "Create New" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:172 ../../addon/gitwiki/Mod_Gitwiki.php:156 +#: ../../Zotlabs/Module/Wiki.php:207 ../../addon/gitwiki/Mod_Gitwiki.php:156 msgid "Wiki name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:173 ../../addon/gitwiki/Mod_Gitwiki.php:157 +#: ../../Zotlabs/Module/Wiki.php:208 ../../addon/gitwiki/Mod_Gitwiki.php:157 msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:175 ../../Zotlabs/Storage/Browser.php:235 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:336 +#: ../../Zotlabs/Widget/Wiki_pages.php:57 ../../include/text.php:1802 +msgid "Markdown" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:336 +#: ../../Zotlabs/Widget/Wiki_pages.php:57 ../../include/text.php:1800 +msgid "BBcode" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:57 +#: ../../include/text.php:1803 +msgid "Text" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:235 #: ../../addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:166 +#: ../../Zotlabs/Module/Wiki.php:211 +msgid "Any type" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:218 +msgid "Lock content type" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:219 ../../addon/gitwiki/Mod_Gitwiki.php:166 msgid "Create a status post for this wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:224 ../../addon/gitwiki/Mod_Gitwiki.php:185 +#: ../../Zotlabs/Module/Wiki.php:220 +msgid "Edit Wiki Name" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:262 ../../addon/gitwiki/Mod_Gitwiki.php:185 msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:248 ../../addon/gitwiki/Mod_Gitwiki.php:210 +#: ../../Zotlabs/Module/Wiki.php:286 ../../addon/gitwiki/Mod_Gitwiki.php:210 msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:258 ../../addon/gitwiki/Mod_Gitwiki.php:214 +#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:214 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:264 +#: ../../Zotlabs/Module/Wiki.php:302 ../../Zotlabs/Module/Wiki.php:304 msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:242 +#: ../../Zotlabs/Module/Wiki.php:331 ../../addon/gitwiki/Mod_Gitwiki.php:242 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../Zotlabs/Module/Wiki.php:332 ../../addon/gitwiki/Mod_Gitwiki.php:243 msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:293 +#: ../../Zotlabs/Module/Wiki.php:339 msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:300 ../../addon/gitwiki/Mod_Gitwiki.php:252 +#: ../../Zotlabs/Module/Wiki.php:346 ../../addon/gitwiki/Mod_Gitwiki.php:252 msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:309 ../../addon/gitwiki/Mod_Gitwiki.php:260 +#: ../../Zotlabs/Module/Wiki.php:356 ../../addon/gitwiki/Mod_Gitwiki.php:260 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:314 ../../addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1229 +#: ../../Zotlabs/Module/Wiki.php:361 ../../addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1265 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:315 ../../addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Wiki.php:362 ../../addon/gitwiki/Mod_Gitwiki.php:266 +#: ../../include/conversation.php:1368 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:317 ../../addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1325 ../../include/conversation.php:1372 +#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1370 ../../include/conversation.php:1417 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:318 ../../addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1265 +#: ../../Zotlabs/Module/Wiki.php:365 ../../addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1301 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:319 ../../addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1266 +#: ../../Zotlabs/Module/Wiki.php:366 ../../addon/gitwiki/Mod_Gitwiki.php:270 +#: ../../include/conversation.php:1302 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:320 ../../addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:367 ../../addon/gitwiki/Mod_Gitwiki.php:271 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:321 ../../addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1268 +#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1304 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:322 ../../addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1269 +#: ../../Zotlabs/Module/Wiki.php:369 ../../addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1305 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:323 ../../addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1270 +#: ../../Zotlabs/Module/Wiki.php:370 ../../addon/gitwiki/Mod_Gitwiki.php:274 +#: ../../include/conversation.php:1306 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:337 +#: ../../Zotlabs/Module/Wiki.php:442 ../../addon/gitwiki/Mod_Gitwiki.php:337 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:398 +#: ../../Zotlabs/Module/Wiki.php:449 msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:411 ../../addon/gitwiki/Mod_Gitwiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:462 ../../addon/gitwiki/Mod_Gitwiki.php:348 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:418 ../../addon/gitwiki/Mod_Gitwiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:469 ../../addon/gitwiki/Mod_Gitwiki.php:353 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:430 +#: ../../Zotlabs/Module/Wiki.php:492 +msgid "Error updating wiki. Invalid name." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:512 +msgid "Error updating wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:527 msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:440 +#: ../../Zotlabs/Module/Wiki.php:537 msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:466 ../../addon/gitwiki/Mod_Gitwiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:565 ../../addon/gitwiki/Mod_Gitwiki.php:400 msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:587 +#: ../../Zotlabs/Module/Wiki.php:686 msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:651 +#: ../../Zotlabs/Module/Wiki.php:750 msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:651 +#: ../../Zotlabs/Module/Wiki.php:750 msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:701 +#: ../../Zotlabs/Module/Wiki.php:800 msgid "You must be authenticated." msgstr "" @@ -4889,24 +4925,36 @@ msgstr "" msgid "Feature disabled." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69 +#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:88 msgid "Edit System Page Description" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:64 +#: ../../Zotlabs/Module/Pdledit.php:68 +msgid "(modified)" +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133 +msgid "Reset" +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:83 msgid "Layout not found." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:70 +#: ../../Zotlabs/Module/Pdledit.php:89 msgid "Module Name:" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:71 +#: ../../Zotlabs/Module/Pdledit.php:90 msgid "Layout Help" msgstr "" -#: ../../Zotlabs/Module/Poke.php:153 ../../Zotlabs/Module/Poke.php:182 -#: ../../Zotlabs/Lib/Apps.php:248 ../../include/conversation.php:1039 +#: ../../Zotlabs/Module/Pdledit.php:91 +msgid "Edit another layout" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:248 +#: ../../include/conversation.php:1075 msgid "Poke" msgstr "" @@ -4940,8 +4988,8 @@ msgid "Image uploaded but image cropping failed." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:226 -#: ../../include/photo/photo_driver.php:658 +#: ../../Zotlabs/Module/Profile_photo.php:234 +#: ../../include/photo/photo_driver.php:710 msgid "Profile Photos" msgstr "" @@ -4950,80 +4998,80 @@ msgstr "" msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:196 +#: ../../Zotlabs/Module/Profile_photo.php:204 #: ../../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:203 -#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:145 +#: ../../Zotlabs/Module/Profile_photo.php:211 +#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:156 msgid "Unable to process image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:238 +#: ../../Zotlabs/Module/Profile_photo.php:246 #: ../../Zotlabs/Module/Cover_photo.php:197 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:257 +#: ../../Zotlabs/Module/Profile_photo.php:265 #: ../../Zotlabs/Module/Cover_photo.php:214 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:318 -#: ../../Zotlabs/Module/Profile_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:326 +#: ../../Zotlabs/Module/Profile_photo.php:373 #: ../../Zotlabs/Module/Cover_photo.php:307 #: ../../Zotlabs/Module/Cover_photo.php:322 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:420 +#: ../../Zotlabs/Module/Profile_photo.php:428 #: ../../Zotlabs/Module/Cover_photo.php:358 msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:421 +#: ../../Zotlabs/Module/Profile_photo.php:429 #: ../../Zotlabs/Module/Cover_photo.php:359 msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:422 +#: ../../Zotlabs/Module/Profile_photo.php:430 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:422 +#: ../../Zotlabs/Module/Profile_photo.php:430 msgid "Upload Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:423 +#: ../../Zotlabs/Module/Profile_photo.php:431 #: ../../addon/openclipatar/openclipatar.php:182 #: ../../addon/openclipatar/openclipatar.php:194 msgid "Use" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Profile_photo.php:437 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "skip this step" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Profile_photo.php:437 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "select a photo from your photo albums" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:448 +#: ../../Zotlabs/Module/Profile_photo.php:456 #: ../../Zotlabs/Module/Cover_photo.php:381 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:449 +#: ../../Zotlabs/Module/Profile_photo.php:457 #: ../../Zotlabs/Module/Cover_photo.php:382 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:451 +#: ../../Zotlabs/Module/Profile_photo.php:459 #: ../../Zotlabs/Module/Cover_photo.php:384 msgid "Done Editing" msgstr "" @@ -5044,60 +5092,68 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:844 +#: ../../Zotlabs/Module/Item.php:870 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:989 +#: ../../Zotlabs/Module/Item.php:1015 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1025 +#: ../../Zotlabs/Module/Item.php:1051 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1123 +#: ../../Zotlabs/Module/Item.php:1156 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1130 +#: ../../Zotlabs/Module/Item.php:1163 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1137 +#: ../../Zotlabs/Module/Item.php:1170 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Ping.php:280 +#: ../../Zotlabs/Module/Ping.php:318 msgid "sent you a private message" msgstr "" -#: ../../Zotlabs/Module/Ping.php:331 +#: ../../Zotlabs/Module/Ping.php:369 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:341 +#: ../../Zotlabs/Module/Ping.php:393 +msgid "requires approval" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:403 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Module/Ping.php:359 +#: ../../Zotlabs/Module/Ping.php:421 msgid "[today]" msgstr "" -#: ../../Zotlabs/Module/Ping.php:368 +#: ../../Zotlabs/Module/Ping.php:430 msgid "posted an event" msgstr "" +#: ../../Zotlabs/Module/Ping.php:463 +msgid "shared a file with you" +msgstr "" + #: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29 msgid "Invalid item." msgstr "" #: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Display.php:122 -#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146 -#: ../../include/help.php:68 +#: ../../Zotlabs/Module/Display.php:120 +#: ../../Zotlabs/Lib/NativeWikiPage.php:515 ../../Zotlabs/Web/Router.php:158 +#: ../../include/help.php:81 msgid "Page not found." msgstr "" @@ -5127,293 +5183,293 @@ msgstr "" msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:298 +#: ../../Zotlabs/Module/Connedit.php:302 msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:423 +#: ../../Zotlabs/Module/Connedit.php:427 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:471 +#: ../../Zotlabs/Module/Connedit.php:475 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495 -#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513 -#: ../../Zotlabs/Module/Connedit.php:526 +#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499 +#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517 +#: ../../Zotlabs/Module/Connedit.php:530 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:550 +#: ../../Zotlabs/Module/Connedit.php:554 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:241 +#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:241 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:979 ../../include/nav.php:102 +#: ../../include/conversation.php:1015 ../../include/nav.php:141 msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:593 +#: ../../Zotlabs/Module/Connedit.php:597 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:597 +#: ../../Zotlabs/Module/Connedit.php:601 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:600 +#: ../../Zotlabs/Module/Connedit.php:604 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:604 +#: ../../Zotlabs/Module/Connedit.php:608 msgid "Refresh Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:607 +#: ../../Zotlabs/Module/Connedit.php:611 msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:611 +#: ../../Zotlabs/Module/Connedit.php:615 msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:614 +#: ../../Zotlabs/Module/Connedit.php:618 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:621 +#: ../../Zotlabs/Module/Connedit.php:625 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Connedit.php:626 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:626 +#: ../../Zotlabs/Module/Connedit.php:630 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:629 +#: ../../Zotlabs/Module/Connedit.php:633 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:630 +#: ../../Zotlabs/Module/Connedit.php:634 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:634 +#: ../../Zotlabs/Module/Connedit.php:638 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:634 +#: ../../Zotlabs/Module/Connedit.php:638 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Connedit.php:641 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:638 +#: ../../Zotlabs/Module/Connedit.php:642 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:642 +#: ../../Zotlabs/Module/Connedit.php:646 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:642 +#: ../../Zotlabs/Module/Connedit.php:646 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:645 +#: ../../Zotlabs/Module/Connedit.php:649 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:646 +#: ../../Zotlabs/Module/Connedit.php:650 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:657 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:661 +#: ../../Zotlabs/Module/Connedit.php:665 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:664 +#: ../../Zotlabs/Module/Connedit.php:668 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:675 +#: ../../Zotlabs/Module/Connedit.php:679 msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:698 +#: ../../Zotlabs/Module/Connedit.php:702 msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:701 +#: ../../Zotlabs/Module/Connedit.php:705 msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26 +#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:26 msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27 +#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:27 msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29 +#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:29 msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:735 +#: ../../Zotlabs/Module/Connedit.php:739 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:738 +#: ../../Zotlabs/Module/Connedit.php:742 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:775 +#: ../../Zotlabs/Module/Connedit.php:779 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:775 +#: ../../Zotlabs/Module/Connedit.php:779 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:780 +#: ../../Zotlabs/Module/Connedit.php:784 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:783 +#: ../../Zotlabs/Module/Connedit.php:787 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:786 +#: ../../Zotlabs/Module/Connedit.php:790 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:851 +#: ../../Zotlabs/Module/Connedit.php:855 msgid "This connection is unreachable from this location." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:852 +#: ../../Zotlabs/Module/Connedit.php:856 msgid "This connection may be unreachable from other channel locations." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:854 +#: ../../Zotlabs/Module/Connedit.php:858 msgid "Location independence is not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:860 +#: ../../Zotlabs/Module/Connedit.php:864 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:863 +#: ../../Zotlabs/Module/Connedit.php:867 #: ../../Zotlabs/Widget/Settings_menu.php:109 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925 +#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:3974 #, php-format msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:864 +#: ../../Zotlabs/Module/Connedit.php:868 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:864 +#: ../../Zotlabs/Module/Connedit.php:868 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:865 +#: ../../Zotlabs/Module/Connedit.php:869 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:866 +#: ../../Zotlabs/Module/Connedit.php:870 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:873 +#: ../../Zotlabs/Module/Connedit.php:877 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:874 +#: ../../Zotlabs/Module/Connedit.php:878 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:879 +#: ../../Zotlabs/Module/Connedit.php:883 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:880 +#: ../../Zotlabs/Module/Connedit.php:884 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:882 +#: ../../Zotlabs/Module/Connedit.php:886 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Rate.php:155 +#: ../../Zotlabs/Module/Connedit.php:887 ../../Zotlabs/Module/Rate.php:155 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:884 +#: ../../Zotlabs/Module/Connedit.php:888 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:890 +#: ../../Zotlabs/Module/Connedit.php:889 ../../Zotlabs/Module/Connedit.php:894 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Connedit.php:891 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Connedit.php:892 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Connedit.php:893 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Connedit.php:893 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:891 +#: ../../Zotlabs/Module/Connedit.php:895 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Connedit.php:900 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:901 +#: ../../Zotlabs/Module/Connedit.php:905 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Connedit.php:912 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -5421,18 +5477,14 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Connedit.php:913 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:918 +#: ../../Zotlabs/Module/Connedit.php:922 msgid "Details" msgstr "" -#: ../../Zotlabs/Module/Chat.php:94 ../../Zotlabs/Lib/Apps.php:228 -msgid "My Chatrooms" -msgstr "" - #: ../../Zotlabs/Module/Chat.php:181 msgid "Room not found" msgstr "" @@ -5458,13 +5510,13 @@ msgid "Bookmark this room" msgstr "" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1260 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1296 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:742 -#: ../../include/conversation.php:1370 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:757 +#: ../../include/conversation.php:1415 msgid "Encrypt text" msgstr "" @@ -5497,9 +5549,14 @@ msgstr "" msgid "min" msgstr "" +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:242 +#: ../../include/conversation.php:1814 ../../include/nav.php:422 +msgid "Photos" +msgstr "" + #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237 -#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Storage/Browser.php:247 -#: ../../include/conversation.php:1788 ../../include/nav.php:386 +#: ../../Zotlabs/Storage/Browser.php:225 ../../include/conversation.php:1822 +#: ../../include/nav.php:430 msgid "Files" msgstr "" @@ -5539,7 +5596,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2289 msgid "Menus" msgstr "" @@ -5591,14 +5648,13 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2290 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Module/Help.php:18 -#: ../../Zotlabs/Lib/Apps.php:245 ../../include/nav.php:157 -#: ../../include/nav.php:264 ../../include/help.php:55 -#: ../../include/help.php:61 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:245 +#: ../../include/nav.php:201 ../../include/nav.php:301 +#: ../../include/help.php:68 ../../include/help.php:74 msgid "Help" msgstr "" @@ -5615,12 +5671,12 @@ msgid "Download PDL file" msgstr "" #: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141 -#: ../../include/bbcode.php:334 +#: ../../include/bbcode.php:333 msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146 -#: ../../include/text.php:1938 +#: ../../include/text.php:1946 msgid "comment" msgstr "" @@ -5653,7 +5709,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:3892 +#: ../../include/items.php:3941 msgid "Privacy group not found." msgstr "" @@ -5788,7 +5844,7 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1183 +#: ../../include/channel.php:1284 msgid "Edit visibility" msgstr "" @@ -5800,7 +5856,7 @@ msgstr "" msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1154 +#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1255 msgid "Change profile photo" msgstr "" @@ -5820,7 +5876,7 @@ msgstr "" msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654 +#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1688 msgid "Personal" msgstr "" @@ -5965,12 +6021,12 @@ msgstr "" msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1179 +#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1280 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1161 -#: ../../include/nav.php:105 +#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1262 +#: ../../include/nav.php:144 msgid "Edit Profiles" msgstr "" @@ -5987,7 +6043,7 @@ msgid "Create a new channel" msgstr "" #: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234 -#: ../../include/nav.php:199 +#: ../../include/nav.php:129 ../../include/nav.php:215 msgid "Channel Manager" msgstr "" @@ -6021,6 +6077,16 @@ 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 "" + #: ../../Zotlabs/Module/Dirsearch.php:33 msgid "This directory server requires an access token" msgstr "" @@ -6072,7 +6138,7 @@ msgid "No ratings" msgstr "" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1029 +#: ../../include/conversation.php:1065 msgid "Ratings" msgstr "" @@ -6088,12 +6154,6 @@ msgstr "" msgid "Description: " msgstr "" -#: ../../Zotlabs/Module/Webpages.php:38 ../../Zotlabs/Module/Webpages.php:237 -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/conversation.php:1838 -#: ../../include/nav.php:435 -msgid "Webpages" -msgstr "" - #: ../../Zotlabs/Module/Webpages.php:54 msgid "Import Webpage Elements" msgstr "" @@ -6110,6 +6170,11 @@ msgstr "" msgid "Export selected" msgstr "" +#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:238 +#: ../../include/conversation.php:1884 ../../include/nav.php:491 +msgid "Webpages" +msgstr "" + #: ../../Zotlabs/Module/Webpages.php:248 msgid "Actions" msgstr "" @@ -6142,11 +6207,44 @@ msgstr "" msgid "Import complete." msgstr "" +#: ../../Zotlabs/Module/Changeaddr.php:35 +msgid "" +"Channel name changes are not allowed within 48 hours of changing the account " +"password." +msgstr "" + +#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:209 +#: ../../include/channel.php:579 +msgid "Reserved nickname. Please choose another." +msgstr "" + +#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:214 +#: ../../include/channel.php:584 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: ../../Zotlabs/Module/Changeaddr.php:77 +msgid "Change channel nickname/address" +msgstr "" + +#: ../../Zotlabs/Module/Changeaddr.php:78 +msgid "Any/all connections on other networks will be lost!" +msgstr "" + +#: ../../Zotlabs/Module/Changeaddr.php:80 +msgid "New channel address" +msgstr "" + +#: ../../Zotlabs/Module/Changeaddr.php:81 +msgid "Rename Channel" +msgstr "" + #: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43 msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:140 +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:178 msgid "Edit post" msgstr "" @@ -6207,7 +6305,7 @@ msgstr "" msgid "Delivery report for %1$s" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:151 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:60 msgid "Options" msgstr "" @@ -6232,7 +6330,7 @@ msgid "*" msgstr "" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:218 msgid "Channel Sources" msgstr "" @@ -6288,10 +6386,6 @@ msgstr "" msgid "Unable to remove source." msgstr "" -#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:257 -msgid "Post" -msgstr "" - #: ../../Zotlabs/Module/Like.php:19 msgid "Like/Dislike" msgstr "" @@ -6327,13 +6421,14 @@ msgstr "" msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1399 -#: ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1453 +#: ../../addon/pubcrawl/as.php:1323 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163 +#: ../../Zotlabs/Module/Like.php:425 ../../addon/pubcrawl/as.php:1325 +#: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -6376,10 +6471,6 @@ msgstr "" msgid "Thank you." msgstr "" -#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:244 -msgid "Directory" -msgstr "" - #: ../../Zotlabs/Module/Directory.php:245 #, php-format msgid "%d rating" @@ -6399,11 +6490,11 @@ msgstr "" msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1416 +#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1516 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1251 +#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1352 #: ../../include/event.php:52 ../../include/event.php:84 msgid "Location:" msgstr "" @@ -6412,17 +6503,17 @@ msgstr "" msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1432 +#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1532 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1440 +#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1540 msgid "About:" msgstr "" #: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:999 ../../include/channel.php:1236 +#: ../../include/conversation.php:1035 ../../include/channel.php:1337 #: ../../include/connections.php:111 msgid "Connect" msgstr "" @@ -6500,11 +6591,6 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Lib/Apps.php:232 -#: ../../include/features.php:333 -msgid "Suggest Channels" -msgstr "" - #: ../../Zotlabs/Module/Suggest.php:39 msgid "" "No suggestions available. If this is a new site, please try again in 24 " @@ -6539,11 +6625,6 @@ msgstr "" msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../Zotlabs/Module/Mail.php:143 ../../Zotlabs/Lib/Apps.php:246 -#: ../../include/nav.php:187 -msgid "Mail" -msgstr "" - #: ../../Zotlabs/Module/Mail.php:160 msgid "Messages" msgstr "" @@ -6581,7 +6662,7 @@ msgid "Subject:" msgstr "" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1320 +#: ../../include/conversation.php:1365 msgid "Attach file" msgstr "" @@ -6590,7 +6671,7 @@ msgid "Send" msgstr "" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1365 +#: ../../include/conversation.php:1410 msgid "Set expiration date" msgstr "" @@ -6662,7 +6743,7 @@ msgstr "" msgid "Software" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:48 +#: ../../Zotlabs/Module/Pubsites.php:49 msgid "Rate" msgstr "" @@ -6716,14 +6797,10 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:137 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:141 msgid "Save to Folder" msgstr "" -#: ../../Zotlabs/Module/Probe.php:11 ../../Zotlabs/Lib/Apps.php:231 -msgid "Remote Diagnostics" -msgstr "" - #: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34 #, php-format msgid "Fetching URL returns error: %1$s" @@ -6811,8 +6888,8 @@ msgstr "" msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1582 -#: ../../include/nav.php:145 +#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1620 +#: ../../include/nav.php:189 msgid "Register" msgstr "" @@ -6827,30 +6904,30 @@ msgstr "" msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4320 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4321 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4322 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4323 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4325 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1878 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1980 msgid "cover photo" msgstr "" @@ -6862,8 +6939,8 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1770 -#: ../../include/nav.php:368 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1804 +#: ../../include/nav.php:412 msgid "About" msgstr "" @@ -6879,14 +6956,18 @@ msgstr "" msgid "Tutorials" msgstr "" -#: ../../Zotlabs/Module/Help.php:93 +#: ../../Zotlabs/Module/Help.php:95 msgid "$Projectname Documentation" msgstr "" -#: ../../Zotlabs/Module/Help.php:94 +#: ../../Zotlabs/Module/Help.php:96 msgid "Contents" msgstr "" +#: ../../Zotlabs/Module/Display.php:340 +msgid "Item has been removed." +msgstr "" + #: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 msgid "Tag removed" msgstr "" @@ -6899,7 +6980,7 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Network.php:96 +#: ../../Zotlabs/Module/Network.php:97 msgid "No such group" msgstr "" @@ -6915,10 +6996,6 @@ msgstr "" msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:235 -msgid "Activity" -msgstr "" - #: ../../Zotlabs/Module/Network.php:221 msgid "Privacy group is empty" msgstr "" @@ -6935,14 +7012,10 @@ msgstr "" msgid "Invalid channel." msgstr "" -#: ../../Zotlabs/Module/Acl.php:344 +#: ../../Zotlabs/Module/Acl.php:351 msgid "network" msgstr "" -#: ../../Zotlabs/Module/Acl.php:354 -msgid "RSS" -msgstr "" - #: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 #: ../../addon/opensearch/opensearch.php:42 msgid "$Projectname" @@ -7002,12 +7075,12 @@ msgstr "" msgid "No channel." msgstr "" -#: ../../Zotlabs/Module/Common.php:43 -msgid "Common connections" +#: ../../Zotlabs/Module/Common.php:45 +msgid "No connections in common." msgstr "" -#: ../../Zotlabs/Module/Common.php:48 -msgid "No connections in common." +#: ../../Zotlabs/Module/Common.php:65 +msgid "View Common Connections" msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:65 @@ -7100,6 +7173,10 @@ msgstr "" msgid "Optionally explain your rating (this information is public)" msgstr "" +#: ../../Zotlabs/Module/Card_edit.php:128 +msgid "Edit Card" +msgstr "" + #: ../../Zotlabs/Module/Lostpass.php:19 msgid "No valid account found." msgstr "" @@ -7124,7 +7201,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1609 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1648 msgid "Password Reset" msgstr "" @@ -7169,12 +7246,8 @@ msgstr "" msgid "Email Address" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:133 -msgid "Reset" -msgstr "" - #: ../../Zotlabs/Module/Notifications.php:43 -#: ../../Zotlabs/Lib/ThreadItem.php:392 +#: ../../Zotlabs/Lib/ThreadItem.php:397 msgid "Mark all seen" msgstr "" @@ -7210,14 +7283,58 @@ msgstr "" msgid "Report Bug" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:227 +msgid "View Bookmarks" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:228 +msgid "My Chatrooms" +msgstr "" + #: ../../Zotlabs/Lib/Apps.php:230 msgid "Firefox Share" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1601 ../../include/nav.php:113 +#: ../../Zotlabs/Lib/Apps.php:231 +msgid "Remote Diagnostics" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:232 ../../include/features.php:342 +msgid "Suggest Channels" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1639 ../../include/nav.php:153 +#: ../../include/nav.php:157 msgid "Login" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:235 ../../include/nav.php:98 +msgid "Activity" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:239 ../../include/conversation.php:1900 +#: ../../include/features.php:95 ../../include/nav.php:507 +msgid "Wiki" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:240 ../../include/nav.php:102 +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 +msgid "Events" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:244 +msgid "Directory" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:246 ../../include/nav.php:116 +msgid "Mail" +msgstr "" + #: ../../Zotlabs/Lib/Apps.php:249 msgid "Chat" msgstr "" @@ -7234,29 +7351,41 @@ msgstr "" msgid "Random Channel" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:254 +msgid "Invite" +msgstr "" + #: ../../Zotlabs/Lib/Apps.php:255 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:256 ../../addon/openid/MysqlProvider.php:69 +msgid "Language" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:257 +msgid "Post" +msgstr "" + #: ../../Zotlabs/Lib/Apps.php:258 ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 #: ../../addon/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:391 +#: ../../Zotlabs/Lib/Apps.php:397 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:395 +#: ../../Zotlabs/Lib/Apps.php:401 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:401 +#: ../../Zotlabs/Lib/Apps.php:407 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:402 +#: ../../Zotlabs/Lib/Apps.php:408 msgid "Remove from app-tray" msgstr "" @@ -7281,71 +7410,71 @@ msgid "publisher" msgstr "" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:83 +#: ../../Zotlabs/Lib/NativeWikiPage.php:90 msgid "(No Title)" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:97 +#: ../../Zotlabs/Lib/NativeWikiPage.php:104 msgid "Wiki page create failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:110 +#: ../../Zotlabs/Lib/NativeWikiPage.php:117 msgid "Wiki not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:121 +#: ../../Zotlabs/Lib/NativeWikiPage.php:128 msgid "Destination name already exists" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:147 -#: ../../Zotlabs/Lib/NativeWikiPage.php:342 +#: ../../Zotlabs/Lib/NativeWikiPage.php:160 +#: ../../Zotlabs/Lib/NativeWikiPage.php:355 msgid "Page not found" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:177 +#: ../../Zotlabs/Lib/NativeWikiPage.php:191 msgid "Error reading page content" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:333 -#: ../../Zotlabs/Lib/NativeWikiPage.php:381 -#: ../../Zotlabs/Lib/NativeWikiPage.php:448 -#: ../../Zotlabs/Lib/NativeWikiPage.php:489 +#: ../../Zotlabs/Lib/NativeWikiPage.php:347 +#: ../../Zotlabs/Lib/NativeWikiPage.php:396 +#: ../../Zotlabs/Lib/NativeWikiPage.php:463 +#: ../../Zotlabs/Lib/NativeWikiPage.php:504 msgid "Error reading wiki" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:369 +#: ../../Zotlabs/Lib/NativeWikiPage.php:384 msgid "Page update failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:403 +#: ../../Zotlabs/Lib/NativeWikiPage.php:418 msgid "Nothing deleted" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +#: ../../Zotlabs/Lib/NativeWikiPage.php:484 msgid "Compare: object not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:475 +#: ../../Zotlabs/Lib/NativeWikiPage.php:490 msgid "Page updated" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:478 +#: ../../Zotlabs/Lib/NativeWikiPage.php:493 msgid "Untitled" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:484 +#: ../../Zotlabs/Lib/NativeWikiPage.php:499 msgid "Wiki resource_id required for git commit" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:540 +#: ../../Zotlabs/Lib/NativeWikiPage.php:555 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:578 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:667 -#: ../../include/bbcode.php:813 +#: ../../Zotlabs/Lib/NativeWikiPage.php:593 +#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:672 +#: ../../include/bbcode.php:818 msgid "Different viewers will see this text differently" msgstr "" @@ -7437,7 +7566,7 @@ msgid "$Projectname Notification" msgstr "" #: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:283 -#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:46 +#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:48 msgid "$projectname" msgstr "" @@ -7445,7 +7574,7 @@ msgstr "" msgid "Thank You," msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:65 +#: ../../Zotlabs/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33 #, php-format msgid "%s Administrator" msgstr "" @@ -7662,7 +7791,11 @@ msgstr "" msgid "commented on %s's post" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:128 +#: ../../Zotlabs/Lib/NativeWiki.php:151 +msgid "Wiki updated successfully" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWiki.php:198 msgid "Wiki files deleted successfully" msgstr "" @@ -7676,210 +7809,218 @@ msgstr "" msgid "Update %s failed. See error logs." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656 +#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:681 msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648 +#: ../../Zotlabs/Lib/ThreadItem.php:137 ../../include/conversation.php:673 msgid "Select" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:158 +#: ../../Zotlabs/Lib/ThreadItem.php:162 msgid "I will attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:158 +#: ../../Zotlabs/Lib/ThreadItem.php:162 msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:158 +#: ../../Zotlabs/Lib/ThreadItem.php:162 msgid "I might attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:168 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I agree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:168 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I disagree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:168 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I abstain" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:224 +#: ../../Zotlabs/Lib/ThreadItem.php:228 msgid "Add Star" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:225 +#: ../../Zotlabs/Lib/ThreadItem.php:229 msgid "Remove Star" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:226 +#: ../../Zotlabs/Lib/ThreadItem.php:230 msgid "Toggle Star Status" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:230 +#: ../../Zotlabs/Lib/ThreadItem.php:234 msgid "starred" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663 +#: ../../Zotlabs/Lib/ThreadItem.php:244 ../../include/conversation.php:688 msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664 +#: ../../Zotlabs/Lib/ThreadItem.php:245 ../../include/conversation.php:689 msgid "Message signature incorrect" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:249 +#: ../../Zotlabs/Lib/ThreadItem.php:253 msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:355 +#: ../../Zotlabs/Lib/ThreadItem.php:271 ../../include/taxonomy.php:433 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:356 +#: ../../Zotlabs/Lib/ThreadItem.php:272 ../../include/taxonomy.php:434 msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:272 +#: ../../Zotlabs/Lib/ThreadItem.php:276 msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:272 +#: ../../Zotlabs/Lib/ThreadItem.php:276 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:281 +#: ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:299 +#: ../../Zotlabs/Lib/ThreadItem.php:303 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329 +#: ../../Zotlabs/Lib/ThreadItem.php:333 ../../Zotlabs/Lib/ThreadItem.php:334 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:332 +#: ../../Zotlabs/Lib/ThreadItem.php:337 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:333 +#: ../../Zotlabs/Lib/ThreadItem.php:338 msgid "via" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:334 +#: ../../Zotlabs/Lib/ThreadItem.php:339 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:340 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715 +#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:747 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718 +#: ../../Zotlabs/Lib/ThreadItem.php:356 ../../include/conversation.php:750 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719 +#: ../../Zotlabs/Lib/ThreadItem.php:357 ../../include/conversation.php:751 #, php-format msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:358 +#: ../../Zotlabs/Lib/ThreadItem.php:363 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:359 +#: ../../Zotlabs/Lib/ThreadItem.php:364 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:360 +#: ../../Zotlabs/Lib/ThreadItem.php:365 msgid "Vote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:361 +#: ../../Zotlabs/Lib/ThreadItem.php:366 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:382 +#: ../../Zotlabs/Lib/ThreadItem.php:387 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:383 +#: ../../Zotlabs/Lib/ThreadItem.php:388 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:415 ../../include/conversation.php:471 +msgid "This is an unsaved preview" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:447 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315 +#: ../../Zotlabs/Lib/ThreadItem.php:744 ../../include/conversation.php:1360 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316 +#: ../../Zotlabs/Lib/ThreadItem.php:745 ../../include/conversation.php:1361 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317 +#: ../../Zotlabs/Lib/ThreadItem.php:746 ../../include/conversation.php:1362 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318 +#: ../../Zotlabs/Lib/ThreadItem.php:747 ../../include/conversation.php:1363 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319 +#: ../../Zotlabs/Lib/ThreadItem.php:748 ../../include/conversation.php:1364 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:736 +#: ../../Zotlabs/Lib/ThreadItem.php:749 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:737 +#: ../../Zotlabs/Lib/ThreadItem.php:750 +msgid "Attach File" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:751 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:738 +#: ../../Zotlabs/Lib/ThreadItem.php:752 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:747 +#: ../../Zotlabs/Lib/ThreadItem.php:762 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:748 +#: ../../Zotlabs/Lib/ThreadItem.php:763 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:749 +#: ../../Zotlabs/Lib/ThreadItem.php:764 msgid "Your website URL (optional)" msgstr "" -#: ../../Zotlabs/Zot/Auth.php:138 +#: ../../Zotlabs/Zot/Auth.php:152 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." msgstr "" -#: ../../Zotlabs/Zot/Auth.php:250 ../../addon/openid/Mod_Openid.php:76 +#: ../../Zotlabs/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76 #: ../../addon/openid/Mod_Openid.php:178 #, php-format msgid "Welcome %s. Remote authentication successful." @@ -7889,7 +8030,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2707 msgid "Collection" msgstr "" @@ -8036,12 +8177,14 @@ msgstr "" #: ../../Zotlabs/Widget/Appcategories.php:39 #: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91 -#: ../../include/taxonomy.php:227 ../../include/taxonomy.php:309 +#: ../../include/contact_widgets.php:132 ../../include/taxonomy.php:285 +#: ../../include/taxonomy.php:367 ../../include/taxonomy.php:387 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 msgid "Everything" msgstr "" @@ -8069,21 +8212,21 @@ msgstr "" msgid "Combined View" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:190 +#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:119 msgid "Inbox" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:191 +#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:120 msgid "Outbox" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:192 +#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:121 msgid "New Message" msgstr "" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1813 ../../include/conversation.php:1816 -#: ../../include/nav.php:411 ../../include/nav.php:414 +#: ../../include/conversation.php:1847 ../../include/conversation.php:1850 +#: ../../include/nav.php:455 ../../include/nav.php:458 msgid "Chatrooms" msgstr "" @@ -8165,7 +8308,7 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:306 msgid "Saved Searches" msgstr "" @@ -8177,15 +8320,15 @@ msgstr "" msgid "Notes" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:52 ../../addon/gitwiki/gitwiki.php:76 +#: ../../Zotlabs/Widget/Wiki_pages.php:47 ../../addon/gitwiki/gitwiki.php:76 msgid "Wiki Pages" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:81 +#: ../../Zotlabs/Widget/Wiki_pages.php:53 ../../addon/gitwiki/gitwiki.php:81 msgid "Add new page" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:59 ../../addon/gitwiki/gitwiki.php:82 +#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:82 msgid "Page name" msgstr "" @@ -8206,7 +8349,7 @@ msgid "See more..." msgstr "" #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:386 +#: ../../include/features.php:395 msgid "Saved Folders" msgstr "" @@ -8226,7 +8369,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:215 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:224 msgid "Admin" msgstr "" @@ -8266,7 +8409,7 @@ msgstr "" msgid "Connected apps" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:149 +#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:158 msgid "Permission Groups" msgstr "" @@ -8278,151 +8421,289 @@ msgstr "" msgid "Bookmarked Chatrooms" msgstr "" +#: ../../Zotlabs/Widget/Notifications.php:16 +msgid "New Network Activity" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:17 +msgid "New Network Activity Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:20 ../../include/nav.php:99 +msgid "View your network activity" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:24 +msgid "Mark all notifications read" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:32 +msgid "New Home Activity" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:33 +msgid "New Home Activity Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:36 +msgid "View your home activity" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:40 +#: ../../Zotlabs/Widget/Notifications.php:136 +msgid "Mark all notifications seen" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:48 +msgid "New Mails" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:49 +msgid "New Mails Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:52 +msgid "View your private mails" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:56 +msgid "Mark all messages seen" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:64 +msgid "New Events" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:65 +msgid "New Events Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:68 ../../include/nav.php:125 +msgid "View events" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:72 ../../include/nav.php:126 +msgid "Mark all events seen" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:81 +msgid "New Connections Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:84 +msgid "View all connections" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:92 +msgid "New Files" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:93 +msgid "New Files Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:100 +#: ../../Zotlabs/Widget/Notifications.php:101 ../../include/nav.php:112 +msgid "Notices" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:104 +msgid "View all notices" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:108 +msgid "Mark all notices seen" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:118 +msgid "New Registrations" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:119 +msgid "New Registrations Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:129 +msgid "Public Stream Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:132 +msgid "View the public stream" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:143 +#: ../../include/conversation.php:871 ../../include/nav.php:305 +msgid "Loading..." +msgstr "" + #: ../../util/nconfig.php:34 msgid "Source channel not found." msgstr "" -#: ../../boot.php:1581 +#: ../../boot.php:1619 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1600 ../../include/nav.php:99 ../../include/nav.php:123 -#: ../../include/nav.php:140 +#: ../../boot.php:1638 ../../include/nav.php:138 ../../include/nav.php:167 +#: ../../include/nav.php:184 msgid "Logout" msgstr "" -#: ../../boot.php:1603 +#: ../../boot.php:1642 msgid "Login/Email" msgstr "" -#: ../../boot.php:1604 +#: ../../boot.php:1643 msgid "Password" msgstr "" -#: ../../boot.php:1605 +#: ../../boot.php:1644 msgid "Remember me" msgstr "" -#: ../../boot.php:1608 +#: ../../boot.php:1647 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2146 +#: ../../boot.php:2191 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2299 +#: ../../boot.php:2344 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2304 +#: ../../boot.php:2349 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2423 +#: ../../boot.php:2468 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2428 +#: ../../boot.php:2473 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2429 ../../include/datetime.php:286 +#: ../../boot.php:2474 ../../include/datetime.php:286 msgid "never" msgstr "" +#: ../../view/theme/redbasic_c/php/config.php:16 +#: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 #: ../../view/theme/redbasic/php/config.php:19 msgid "Focus (Hubzilla default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic_c/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:97 msgid "Theme settings" msgstr "" -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic_c/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:98 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic_c/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic_c/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic_c/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic_c/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic_c/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic_c/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic_c/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic_c/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic_c/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic_c/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic_c/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Examples: 1rem, 100%, 16px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic_c/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic_c/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic_c/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Example: 4px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic_c/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic_c/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Set maximum width of content region in pixel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic_c/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic_c/php/config.php:115 msgid "Left align page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic_c/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic_c/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set size of followup author photos" msgstr "" @@ -8563,30 +8844,30 @@ msgstr "" msgid "Skeleton Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:200 +#: ../../addon/gnusoc/gnusoc.php:243 msgid "GNU-Social Protocol Settings updated." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:219 +#: ../../addon/gnusoc/gnusoc.php:262 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:222 +#: ../../addon/gnusoc/gnusoc.php:265 msgid "Enable the GNU-Social protocol for this channel" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:226 +#: ../../addon/gnusoc/gnusoc.php:269 msgid "GNU-Social Protocol Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:417 +#: ../../addon/gnusoc/gnusoc.php:460 msgid "Follow" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:420 +#: ../../addon/gnusoc/gnusoc.php:463 #, php-format msgid "%1$s is now following %2$s" msgstr "" @@ -8632,8 +8913,8 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1165 -#: ../../include/nav.php:107 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1266 +#: ../../include/nav.php:146 msgid "Edit Profile" msgstr "" @@ -8706,6 +8987,10 @@ msgstr "" msgid "Profile photo updated successfully." msgstr "" +#: ../../addon/zotvi/zot6.php:25 ../../include/zot.php:3983 +msgid "invalid target signature" +msgstr "" + #: ../../addon/adultphotoflag/adultphotoflag.php:24 msgid "Flag Adult Photos" msgstr "" @@ -9167,17 +9452,17 @@ msgstr "" msgid "OpenID protocol error. No ID returned." msgstr "" -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:286 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:289 msgid "Login failed." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1332 +#: ../../include/selectors.php:66 ../../include/channel.php:1432 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1330 +#: ../../include/selectors.php:66 ../../include/channel.php:1430 msgid "Female" msgstr "" @@ -9364,38 +9649,38 @@ msgstr "" msgid "declared undying love for" msgstr "" -#: ../../addon/diaspora/diaspora.php:715 +#: ../../addon/diaspora/diaspora.php:763 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../addon/diaspora/diaspora.php:734 +#: ../../addon/diaspora/diaspora.php:782 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:737 +#: ../../addon/diaspora/diaspora.php:785 msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../addon/diaspora/diaspora.php:741 +#: ../../addon/diaspora/diaspora.php:789 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../addon/diaspora/diaspora.php:745 +#: ../../addon/diaspora/diaspora.php:793 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/diaspora.php:749 +#: ../../addon/diaspora/diaspora.php:797 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/diaspora.php:754 +#: ../../addon/diaspora/diaspora.php:802 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/diaspora.php:759 +#: ../../addon/diaspora/diaspora.php:807 msgid "Diaspora Protocol Settings" msgstr "" @@ -9407,18 +9692,6 @@ msgstr "" msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../addon/gitwiki/Mod_Gitwiki.php:107 -msgid "Error retrieving wiki" -msgstr "" - -#: ../../addon/gitwiki/Mod_Gitwiki.php:114 -msgid "Error creating zip file export folder" -msgstr "" - -#: ../../addon/gitwiki/Mod_Gitwiki.php:132 -msgid "Error downloading wiki: " -msgstr "" - #: ../../addon/testdrive/testdrive.php:104 #, php-format msgid "Your account on %s will expire in a few days." @@ -9456,6 +9729,66 @@ msgstr "" msgid "PHP post_max_size (must be larger than upload_max_filesize): " msgstr "" +#: ../../addon/gravatar/gravatar.php:123 +msgid "generic profile image" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:124 +msgid "random geometric pattern" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:125 +msgid "monster face" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:126 +msgid "computer generated face" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:127 +msgid "retro arcade style face" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:128 +msgid "Hub default profile photo" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:143 +msgid "Information" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:143 +msgid "" +"Libravatar addon is installed, too. Please disable Libravatar addon or this " +"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if " +"nothing was found at Libravatar." +msgstr "" + +#: ../../addon/gravatar/gravatar.php:150 ../../addon/msgfooter/msgfooter.php:46 +#: ../../addon/xmpp/xmpp.php:91 +msgid "Save Settings" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:151 +msgid "Default avatar image" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:151 +msgid "Select default avatar image if none was found at Gravatar. See README" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:152 +msgid "Rating of images" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:152 +msgid "Select the appropriate avatar rating for your site. See README" +msgstr "" + +#: ../../addon/gravatar/gravatar.php:165 +msgid "Gravatar settings updated." +msgstr "" + #: ../../addon/visage/visage.php:93 msgid "Recent Channel/Profile Viewers" msgstr "" @@ -9562,10 +9895,6 @@ msgstr "" msgid "Include a marker on the map." msgstr "" -#: ../../addon/msgfooter/msgfooter.php:46 ../../addon/xmpp/xmpp.php:91 -msgid "Save Settings" -msgstr "" - #: ../../addon/msgfooter/msgfooter.php:47 msgid "text to include in all outgoing posts from this site" msgstr "" @@ -9606,8 +9935,8 @@ msgstr "" msgid "Hubzilla to Friendica Post Settings" msgstr "" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1256 -#: ../../include/channel.php:1419 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1357 +#: ../../include/channel.php:1519 msgid "Status:" msgstr "" @@ -9772,6 +10101,30 @@ 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 +msgid "ActivityPub" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1032 +msgid "ActivityPub Protocol Settings updated." +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1041 +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 +msgid "Enable the ActivityPub protocol for this channel" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1049 +msgid "ActivityPub Protocol Settings" +msgstr "" + #: ../../addon/donate/donate.php:21 msgid "Project Servers and Resources" msgstr "" @@ -10133,43 +10486,39 @@ msgstr "" msgid "Enter some text" msgstr "" -#: ../../addon/chess/chess.php:276 ../../addon/chess/chess.php:433 +#: ../../addon/chess/chess.php:278 ../../addon/chess/chess.php:465 msgid "Invalid game." msgstr "" -#: ../../addon/chess/chess.php:282 ../../addon/chess/chess.php:439 +#: ../../addon/chess/chess.php:284 ../../addon/chess/chess.php:471 msgid "You are not a player in this game." msgstr "" -#: ../../addon/chess/chess.php:315 +#: ../../addon/chess/chess.php:340 msgid "You must be a local channel to create a game." msgstr "" -#: ../../addon/chess/chess.php:333 +#: ../../addon/chess/chess.php:358 msgid "You must select one opponent that is not yourself." msgstr "" -#: ../../addon/chess/chess.php:336 -msgid "Creating new game..." -msgstr "" - -#: ../../addon/chess/chess.php:342 +#: ../../addon/chess/chess.php:367 msgid "You must select white or black." msgstr "" -#: ../../addon/chess/chess.php:349 +#: ../../addon/chess/chess.php:375 msgid "Error creating new game." msgstr "" -#: ../../addon/chess/chess.php:381 ../../include/channel.php:1016 +#: ../../addon/chess/chess.php:409 ../../include/channel.php:1117 msgid "Requested channel is not available." msgstr "" -#: ../../addon/chess/chess.php:395 +#: ../../addon/chess/chess.php:423 msgid "You must select a local channel /chess/channelname" msgstr "" -#: ../../addon/chess/chess.php:923 +#: ../../addon/chess/chess.php:969 msgid "Enable notifications" msgstr "" @@ -10768,11 +11117,6 @@ msgstr "" msgid "Send email to all members" msgstr "" -#: ../../addon/hubwall/hubwall.php:33 -#, php-format -msgid "$1%s Administrator" -msgstr "" - #: ../../addon/hubwall/hubwall.php:73 #, php-format msgid "%1$d of %2$d messages sent." @@ -10846,11 +11190,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1336 +#: ../../include/selectors.php:49 ../../include/channel.php:1436 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1338 +#: ../../include/selectors.php:49 ../../include/channel.php:1438 msgid "Non-specific" msgstr "" @@ -11040,282 +11384,274 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:239 ../../include/text.php:1096 -#: ../../include/text.php:1101 +#: ../../include/conversation.php:239 ../../include/text.php:1104 +#: ../../include/text.php:1109 msgid "poked" msgstr "" -#: ../../include/conversation.php:688 +#: ../../include/conversation.php:720 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:708 +#: ../../include/conversation.php:740 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:709 +#: ../../include/conversation.php:741 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:734 +#: ../../include/conversation.php:766 msgid "View in context" msgstr "" -#: ../../include/conversation.php:831 +#: ../../include/conversation.php:867 msgid "remove" msgstr "" -#: ../../include/conversation.php:835 ../../include/nav.php:268 -msgid "Loading..." -msgstr "" - -#: ../../include/conversation.php:836 +#: ../../include/conversation.php:872 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:879 +#: ../../include/conversation.php:915 msgid "View Source" msgstr "" -#: ../../include/conversation.php:889 +#: ../../include/conversation.php:925 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:898 +#: ../../include/conversation.php:934 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:989 +#: ../../include/conversation.php:1025 msgid "Activity/Posts" msgstr "" -#: ../../include/conversation.php:1009 +#: ../../include/conversation.php:1045 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1019 +#: ../../include/conversation.php:1055 msgid "Message" msgstr "" -#: ../../include/conversation.php:1153 +#: ../../include/conversation.php:1189 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1153 +#: ../../include/conversation.php:1189 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1157 +#: ../../include/conversation.php:1193 #, 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:1159 +#: ../../include/conversation.php:1195 #, 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:1165 +#: ../../include/conversation.php:1201 msgid "and" msgstr "" -#: ../../include/conversation.php:1168 +#: ../../include/conversation.php:1204 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1169 +#: ../../include/conversation.php:1205 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1169 +#: ../../include/conversation.php:1205 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1248 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1213 +#: ../../include/conversation.php:1249 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1261 +#: ../../include/conversation.php:1297 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1262 +#: ../../include/conversation.php:1298 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1267 +#: ../../include/conversation.php:1303 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1271 +#: ../../include/conversation.php:1307 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:1308 msgid "Comments disabled" msgstr "" -#: ../../include/conversation.php:1310 +#: ../../include/conversation.php:1355 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1313 +#: ../../include/conversation.php:1358 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1327 +#: ../../include/conversation.php:1372 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1330 +#: ../../include/conversation.php:1375 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1331 +#: ../../include/conversation.php:1376 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1339 +#: ../../include/conversation.php:1384 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1362 +#: ../../include/conversation.php:1407 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1368 +#: ../../include/conversation.php:1413 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1631 -msgid "Discover" -msgstr "" - -#: ../../include/conversation.php:1634 -msgid "Imported public streams" -msgstr "" - -#: ../../include/conversation.php:1639 +#: ../../include/conversation.php:1673 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1642 +#: ../../include/conversation.php:1676 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1646 +#: ../../include/conversation.php:1680 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1649 +#: ../../include/conversation.php:1683 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1657 +#: ../../include/conversation.php:1691 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1666 +#: ../../include/conversation.php:1700 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1672 +#: ../../include/conversation.php:1706 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1675 +#: ../../include/conversation.php:1709 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1682 +#: ../../include/conversation.php:1716 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1685 +#: ../../include/conversation.php:1719 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1760 ../../include/nav.php:358 +#: ../../include/conversation.php:1794 ../../include/nav.php:402 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1773 ../../include/nav.php:371 +#: ../../include/conversation.php:1807 ../../include/nav.php:415 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1783 ../../include/nav.php:381 -#: ../../include/photos.php:525 +#: ../../include/conversation.php:1817 ../../include/nav.php:425 +#: ../../include/photos.php:600 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1791 ../../include/nav.php:389 +#: ../../include/conversation.php:1825 ../../include/nav.php:433 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1827 ../../include/nav.php:424 +#: ../../include/conversation.php:1862 ../../include/nav.php:468 msgid "Bookmarks" msgstr "" -#: ../../include/conversation.php:1830 ../../include/nav.php:427 +#: ../../include/conversation.php:1865 ../../include/nav.php:471 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1841 ../../include/nav.php:438 +#: ../../include/conversation.php:1876 ../../include/nav.php:482 +msgid "View Cards" +msgstr "" + +#: ../../include/conversation.php:1887 ../../include/nav.php:494 msgid "View Webpages" msgstr "" -#: ../../include/conversation.php:1910 +#: ../../include/conversation.php:1956 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1913 +#: ../../include/conversation.php:1959 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1916 +#: ../../include/conversation.php:1962 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1919 +#: ../../include/conversation.php:1965 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1922 +#: ../../include/conversation.php:1968 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1925 +#: ../../include/conversation.php:1971 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -11376,328 +11712,340 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:939 +#: ../../include/text.php:947 msgid "No connections" msgstr "" -#: ../../include/text.php:964 +#: ../../include/text.php:972 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1096 ../../include/text.php:1101 +#: ../../include/text.php:1104 ../../include/text.php:1109 msgid "poke" msgstr "" -#: ../../include/text.php:1102 +#: ../../include/text.php:1110 msgid "ping" msgstr "" -#: ../../include/text.php:1102 +#: ../../include/text.php:1110 msgid "pinged" msgstr "" -#: ../../include/text.php:1103 +#: ../../include/text.php:1111 msgid "prod" msgstr "" -#: ../../include/text.php:1103 +#: ../../include/text.php:1111 msgid "prodded" msgstr "" -#: ../../include/text.php:1104 +#: ../../include/text.php:1112 msgid "slap" msgstr "" -#: ../../include/text.php:1104 +#: ../../include/text.php:1112 msgid "slapped" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1113 msgid "finger" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1113 msgid "fingered" msgstr "" -#: ../../include/text.php:1106 +#: ../../include/text.php:1114 msgid "rebuff" msgstr "" -#: ../../include/text.php:1106 +#: ../../include/text.php:1114 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1118 +#: ../../include/text.php:1126 msgid "happy" msgstr "" -#: ../../include/text.php:1119 +#: ../../include/text.php:1127 msgid "sad" msgstr "" -#: ../../include/text.php:1120 +#: ../../include/text.php:1128 msgid "mellow" msgstr "" -#: ../../include/text.php:1121 +#: ../../include/text.php:1129 msgid "tired" msgstr "" -#: ../../include/text.php:1122 +#: ../../include/text.php:1130 msgid "perky" msgstr "" -#: ../../include/text.php:1123 +#: ../../include/text.php:1131 msgid "angry" msgstr "" -#: ../../include/text.php:1124 +#: ../../include/text.php:1132 msgid "stupefied" msgstr "" -#: ../../include/text.php:1125 +#: ../../include/text.php:1133 msgid "puzzled" msgstr "" -#: ../../include/text.php:1126 +#: ../../include/text.php:1134 msgid "interested" msgstr "" -#: ../../include/text.php:1127 +#: ../../include/text.php:1135 msgid "bitter" msgstr "" -#: ../../include/text.php:1128 +#: ../../include/text.php:1136 msgid "cheerful" msgstr "" -#: ../../include/text.php:1129 +#: ../../include/text.php:1137 msgid "alive" msgstr "" -#: ../../include/text.php:1130 +#: ../../include/text.php:1138 msgid "annoyed" msgstr "" -#: ../../include/text.php:1131 +#: ../../include/text.php:1139 msgid "anxious" msgstr "" -#: ../../include/text.php:1132 +#: ../../include/text.php:1140 msgid "cranky" msgstr "" -#: ../../include/text.php:1133 +#: ../../include/text.php:1141 msgid "disturbed" msgstr "" -#: ../../include/text.php:1134 +#: ../../include/text.php:1142 msgid "frustrated" msgstr "" -#: ../../include/text.php:1135 +#: ../../include/text.php:1143 msgid "depressed" msgstr "" -#: ../../include/text.php:1136 +#: ../../include/text.php:1144 msgid "motivated" msgstr "" -#: ../../include/text.php:1137 +#: ../../include/text.php:1145 msgid "relaxed" msgstr "" -#: ../../include/text.php:1138 +#: ../../include/text.php:1146 msgid "surprised" msgstr "" -#: ../../include/text.php:1312 ../../include/js_strings.php:70 +#: ../../include/text.php:1320 ../../include/js_strings.php:70 msgid "Monday" msgstr "" -#: ../../include/text.php:1312 ../../include/js_strings.php:71 +#: ../../include/text.php:1320 ../../include/js_strings.php:71 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1312 ../../include/js_strings.php:72 +#: ../../include/text.php:1320 ../../include/js_strings.php:72 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1312 ../../include/js_strings.php:73 +#: ../../include/text.php:1320 ../../include/js_strings.php:73 msgid "Thursday" msgstr "" -#: ../../include/text.php:1312 ../../include/js_strings.php:74 +#: ../../include/text.php:1320 ../../include/js_strings.php:74 msgid "Friday" msgstr "" -#: ../../include/text.php:1312 ../../include/js_strings.php:75 +#: ../../include/text.php:1320 ../../include/js_strings.php:75 msgid "Saturday" msgstr "" -#: ../../include/text.php:1312 ../../include/js_strings.php:69 +#: ../../include/text.php:1320 ../../include/js_strings.php:69 msgid "Sunday" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:45 +#: ../../include/text.php:1324 ../../include/js_strings.php:45 msgid "January" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:46 +#: ../../include/text.php:1324 ../../include/js_strings.php:46 msgid "February" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:47 +#: ../../include/text.php:1324 ../../include/js_strings.php:47 msgid "March" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:48 +#: ../../include/text.php:1324 ../../include/js_strings.php:48 msgid "April" msgstr "" -#: ../../include/text.php:1316 +#: ../../include/text.php:1324 msgid "May" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:50 +#: ../../include/text.php:1324 ../../include/js_strings.php:50 msgid "June" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:51 +#: ../../include/text.php:1324 ../../include/js_strings.php:51 msgid "July" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:52 +#: ../../include/text.php:1324 ../../include/js_strings.php:52 msgid "August" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:53 +#: ../../include/text.php:1324 ../../include/js_strings.php:53 msgid "September" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:54 +#: ../../include/text.php:1324 ../../include/js_strings.php:54 msgid "October" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:55 +#: ../../include/text.php:1324 ../../include/js_strings.php:55 msgid "November" msgstr "" -#: ../../include/text.php:1316 ../../include/js_strings.php:56 +#: ../../include/text.php:1324 ../../include/js_strings.php:56 msgid "December" msgstr "" -#: ../../include/text.php:1380 ../../include/text.php:1384 +#: ../../include/text.php:1388 ../../include/text.php:1392 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1386 ../../include/feedutils.php:780 +#: ../../include/text.php:1394 ../../include/feedutils.php:780 msgid "unknown" msgstr "" -#: ../../include/text.php:1422 +#: ../../include/text.php:1430 msgid "remove category" msgstr "" -#: ../../include/text.php:1496 +#: ../../include/text.php:1504 msgid "remove from file" msgstr "" -#: ../../include/text.php:1615 ../../include/message.php:12 +#: ../../include/text.php:1623 ../../include/message.php:12 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1774 ../../include/language.php:367 +#: ../../include/text.php:1782 ../../include/language.php:367 msgid "default" msgstr "" -#: ../../include/text.php:1782 +#: ../../include/text.php:1790 msgid "Page layout" msgstr "" -#: ../../include/text.php:1782 +#: ../../include/text.php:1790 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1810 +#: ../../include/text.php:1801 +msgid "HTML" +msgstr "" + +#: ../../include/text.php:1804 +msgid "Comanche Layout" +msgstr "" + +#: ../../include/text.php:1809 +msgid "PHP" +msgstr "" + +#: ../../include/text.php:1818 msgid "Page content type" msgstr "" -#: ../../include/text.php:1943 +#: ../../include/text.php:1951 msgid "activity" msgstr "" -#: ../../include/text.php:2006 -msgid "a-z, 0-9, -, _, and . only" +#: ../../include/text.php:2014 +msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2277 +#: ../../include/text.php:2285 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2283 +#: ../../include/text.php:2291 msgid "Pages" msgstr "" -#: ../../include/text.php:2305 +#: ../../include/text.php:2313 msgid "Import website..." msgstr "" -#: ../../include/text.php:2306 +#: ../../include/text.php:2314 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2307 +#: ../../include/text.php:2315 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2308 +#: ../../include/text.php:2316 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2309 +#: ../../include/text.php:2317 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2310 +#: ../../include/text.php:2318 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2311 +#: ../../include/text.php:2319 msgid "Select folder" msgstr "" -#: ../../include/text.php:2312 +#: ../../include/text.php:2320 msgid "Export website..." msgstr "" -#: ../../include/text.php:2313 +#: ../../include/text.php:2321 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2314 +#: ../../include/text.php:2322 msgid "website.zip" msgstr "" -#: ../../include/text.php:2315 +#: ../../include/text.php:2323 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2316 +#: ../../include/text.php:2324 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2317 +#: ../../include/text.php:2325 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2318 +#: ../../include/text.php:2326 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2319 +#: ../../include/text.php:2327 msgid "Specify folder" msgstr "" @@ -11736,47 +12084,49 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:122 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" +#: ../../include/contact_widgets.php:166 +msgid "Common Connections" +msgstr "" -#: ../../include/contact_widgets.php:127 -msgid "show more" +#: ../../include/contact_widgets.php:171 +#, php-format +msgid "View all %d common connections" msgstr "" -#: ../../include/markdown.php:139 ../../include/bbcode.php:332 +#: ../../include/markdown.php:139 ../../include/bbcode.php:337 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/follow.php:26 +#: ../../include/follow.php:37 msgid "Channel is blocked on this site." msgstr "" -#: ../../include/follow.php:31 +#: ../../include/follow.php:42 msgid "Channel location missing." msgstr "" -#: ../../include/follow.php:73 +#: ../../include/follow.php:84 msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:90 +#: ../../include/follow.php:101 msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:140 ../../include/follow.php:175 -msgid "Protocol disabled." +#: ../../include/follow.php:156 +msgid "Remote channel or protocol unavailable." msgstr "" -#: ../../include/follow.php:163 +#: ../../include/follow.php:179 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:186 +#: ../../include/follow.php:191 +msgid "Protocol disabled." +msgstr "" + +#: ../../include/follow.php:202 msgid "Cannot connect to yourself." msgstr "" @@ -12070,302 +12420,284 @@ msgstr "" msgid "Item was not found." msgstr "" -#: ../../include/attach.php:501 +#: ../../include/attach.php:505 msgid "No source file." msgstr "" -#: ../../include/attach.php:523 +#: ../../include/attach.php:527 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:541 +#: ../../include/attach.php:545 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:674 +#: ../../include/attach.php:680 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:688 +#: ../../include/attach.php:694 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:858 +#: ../../include/attach.php:864 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:871 +#: ../../include/attach.php:877 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:932 ../../include/attach.php:948 +#: ../../include/attach.php:938 ../../include/attach.php:954 msgid "Path not available." msgstr "" -#: ../../include/attach.php:997 ../../include/attach.php:1162 +#: ../../include/attach.php:1003 ../../include/attach.php:1168 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1023 +#: ../../include/attach.php:1029 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1048 +#: ../../include/attach.php:1054 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1116 +#: ../../include/attach.php:1122 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1120 +#: ../../include/attach.php:1126 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1168 +#: ../../include/attach.php:1174 msgid "Empty path" msgstr "" -#: ../../include/security.php:117 -msgid "guest:" -msgstr "" - #: ../../include/security.php:531 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:851 ../../include/items.php:903 +#: ../../include/items.php:857 ../../include/items.php:909 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1087 +#: ../../include/items.php:1093 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1089 +#: ../../include/items.php:1095 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1091 +#: ../../include/items.php:1097 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1093 +#: ../../include/items.php:1099 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1095 +#: ../../include/items.php:1101 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1097 +#: ../../include/items.php:1103 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1099 +#: ../../include/items.php:1105 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1101 +#: ../../include/items.php:1107 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:3908 +#: ../../include/items.php:3957 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:3915 +#: ../../include/items.php:3964 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:3927 +#: ../../include/items.php:3976 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4280 +#: ../../include/items.php:4327 msgid "profile photo" msgstr "" -#: ../../include/items.php:4473 +#: ../../include/items.php:4520 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4473 +#: ../../include/items.php:4520 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4473 +#: ../../include/items.php:4520 msgctxt "edit_activity" msgid "Comment" msgstr "" -#: ../../include/channel.php:33 +#: ../../include/channel.php:34 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/channel.php:68 +#: ../../include/channel.php:69 msgid "Empty name" msgstr "" -#: ../../include/channel.php:71 +#: ../../include/channel.php:72 msgid "Name too long" msgstr "" -#: ../../include/channel.php:182 +#: ../../include/channel.php:183 msgid "No account identifier" msgstr "" -#: ../../include/channel.php:194 +#: ../../include/channel.php:195 msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:208 -msgid "Reserved nickname. Please choose another." -msgstr "" - -#: ../../include/channel.php:213 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: ../../include/channel.php:272 +#: ../../include/channel.php:273 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/channel.php:344 +#: ../../include/channel.php:359 msgid "Default Profile" msgstr "" -#: ../../include/channel.php:497 +#: ../../include/channel.php:512 ../../include/channel.php:601 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1162 +#: ../../include/channel.php:1263 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1182 +#: ../../include/channel.php:1283 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1255 ../../include/channel.php:1375 +#: ../../include/channel.php:1356 ../../include/channel.php:1475 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1257 ../../include/channel.php:1430 +#: ../../include/channel.php:1358 ../../include/channel.php:1530 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1258 +#: ../../include/channel.php:1359 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1334 +#: ../../include/channel.php:1434 msgid "Trans" msgstr "" -#: ../../include/channel.php:1380 +#: ../../include/channel.php:1480 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1404 +#: ../../include/channel.php:1504 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1405 +#: ../../include/channel.php:1505 msgid "j F" msgstr "" -#: ../../include/channel.php:1412 +#: ../../include/channel.php:1512 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1425 +#: ../../include/channel.php:1525 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1428 +#: ../../include/channel.php:1528 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1434 +#: ../../include/channel.php:1534 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1436 +#: ../../include/channel.php:1536 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1438 +#: ../../include/channel.php:1538 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1442 +#: ../../include/channel.php:1542 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1444 +#: ../../include/channel.php:1544 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1446 +#: ../../include/channel.php:1546 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1448 +#: ../../include/channel.php:1548 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1450 +#: ../../include/channel.php:1550 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1452 +#: ../../include/channel.php:1552 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1454 +#: ../../include/channel.php:1554 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1456 +#: ../../include/channel.php:1556 msgid "Television:" msgstr "" -#: ../../include/channel.php:1458 +#: ../../include/channel.php:1558 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1460 +#: ../../include/channel.php:1560 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1462 +#: ../../include/channel.php:1562 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1464 +#: ../../include/channel.php:1564 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1487 +#: ../../include/channel.php:1587 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:2256 -#, php-format -msgid "User '%s' deleted" -msgstr "" - #: ../../include/event.php:22 ../../include/event.php:69 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -12402,67 +12734,63 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/event.php:1292 ../../include/connections.php:676 +#: ../../include/event.php:1292 ../../include/connections.php:684 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1293 ../../include/connections.php:677 +#: ../../include/event.php:1293 ../../include/connections.php:685 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1295 ../../include/connections.php:679 +#: ../../include/event.php:1295 ../../include/connections.php:687 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1296 ../../include/connections.php:680 +#: ../../include/event.php:1296 ../../include/connections.php:688 msgid "Work, Fax" msgstr "" -#: ../../include/network.php:751 +#: ../../include/network.php:752 msgid "view full size" msgstr "" -#: ../../include/network.php:1691 ../../include/network.php:1692 +#: ../../include/network.php:1700 ../../include/network.php:1701 msgid "Friendica" msgstr "" -#: ../../include/network.php:1693 +#: ../../include/network.php:1702 msgid "OStatus" msgstr "" -#: ../../include/network.php:1694 +#: ../../include/network.php:1703 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1695 +#: ../../include/network.php:1704 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1696 -msgid "ActivityPub" -msgstr "" - -#: ../../include/network.php:1698 +#: ../../include/network.php:1707 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1699 +#: ../../include/network.php:1708 msgid "Facebook" msgstr "" -#: ../../include/network.php:1700 +#: ../../include/network.php:1709 msgid "Zot" msgstr "" -#: ../../include/network.php:1701 +#: ../../include/network.php:1710 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1702 +#: ../../include/network.php:1711 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1703 +#: ../../include/network.php:1712 msgid "MySpace" msgstr "" @@ -12504,17 +12832,17 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097 -#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105 -#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111 -#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119 -#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127 -#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133 -#: ../../include/bbcode.php:1136 +#: ../../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 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147 +#: ../../include/bbcode.php:233 ../../include/bbcode.php:1152 msgid "Encrypted content" msgstr "" @@ -12530,34 +12858,43 @@ msgid "" "to install it on this site." msgstr "" -#: ../../include/bbcode.php:409 ../../include/bbcode.php:417 +#: ../../include/bbcode.php:331 +msgid "card" +msgstr "" + +#: ../../include/bbcode.php:414 ../../include/bbcode.php:422 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:417 +#: ../../include/bbcode.php:422 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:1085 +#: ../../include/bbcode.php:1090 msgid "$1 wrote:" msgstr "" -#: ../../include/oembed.php:317 +#: ../../include/oembed.php:328 msgid " by " msgstr "" -#: ../../include/oembed.php:318 +#: ../../include/oembed.php:329 msgid " on " msgstr "" -#: ../../include/oembed.php:347 +#: ../../include/oembed.php:358 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:356 +#: ../../include/oembed.php:367 msgid "Embedding disabled" msgstr "" +#: ../../include/zid.php:305 +#, php-format +msgid "OpenWebAuth: %1$s welcomes %2$s" +msgstr "" + #: ../../include/features.php:54 msgid "General Features" msgstr "" @@ -12606,292 +12943,296 @@ msgstr "" msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/features.php:122 +#: ../../include/features.php:123 +msgid "Create personal planning cards" +msgstr "" + +#: ../../include/features.php:131 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:123 +#: ../../include/features.php:132 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:131 +#: ../../include/features.php:140 msgid "Photo Location" msgstr "" -#: ../../include/features.php:132 +#: ../../include/features.php:141 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:140 +#: ../../include/features.php:149 msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/features.php:141 +#: ../../include/features.php:150 msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/features.php:150 +#: ../../include/features.php:159 msgid "Provide alternate connection permission roles." msgstr "" -#: ../../include/features.php:158 +#: ../../include/features.php:167 msgid "Smart Birthdays" msgstr "" -#: ../../include/features.php:159 +#: ../../include/features.php:168 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "" -#: ../../include/features.php:167 +#: ../../include/features.php:176 msgid "Event Timezone Selection" msgstr "" -#: ../../include/features.php:168 +#: ../../include/features.php:177 msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:176 +#: ../../include/features.php:185 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:177 +#: ../../include/features.php:186 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:185 +#: ../../include/features.php:194 msgid "Advanced Theme and Layout Settings" msgstr "" -#: ../../include/features.php:186 +#: ../../include/features.php:195 msgid "Allows fine tuning of themes and page layouts" msgstr "" -#: ../../include/features.php:196 +#: ../../include/features.php:205 msgid "Post Composition Features" msgstr "" -#: ../../include/features.php:200 +#: ../../include/features.php:209 msgid "Large Photos" msgstr "" -#: ../../include/features.php:201 +#: ../../include/features.php:210 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:210 +#: ../../include/features.php:219 msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/features.php:218 +#: ../../include/features.php:227 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:219 +#: ../../include/features.php:228 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:227 +#: ../../include/features.php:236 msgid "Enable Voting Tools" msgstr "" -#: ../../include/features.php:228 +#: ../../include/features.php:237 msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/features.php:236 +#: ../../include/features.php:245 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:237 +#: ../../include/features.php:246 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:245 +#: ../../include/features.php:254 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:246 +#: ../../include/features.php:255 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:254 +#: ../../include/features.php:263 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:255 +#: ../../include/features.php:264 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:263 +#: ../../include/features.php:272 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:264 +#: ../../include/features.php:273 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:275 +#: ../../include/features.php:284 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:279 +#: ../../include/features.php:288 msgid "Search by Date" msgstr "" -#: ../../include/features.php:280 +#: ../../include/features.php:289 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:288 ../../include/group.php:332 +#: ../../include/features.php:297 ../../include/group.php:332 msgid "Privacy Groups" msgstr "" -#: ../../include/features.php:289 +#: ../../include/features.php:298 msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/features.php:298 +#: ../../include/features.php:307 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:306 +#: ../../include/features.php:315 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:307 +#: ../../include/features.php:316 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:315 +#: ../../include/features.php:324 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:316 +#: ../../include/features.php:325 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:324 +#: ../../include/features.php:333 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:325 +#: ../../include/features.php:334 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:334 +#: ../../include/features.php:343 msgid "Show friend and connection suggestions" msgstr "" -#: ../../include/features.php:342 +#: ../../include/features.php:351 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:343 +#: ../../include/features.php:352 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:355 +#: ../../include/features.php:364 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:359 +#: ../../include/features.php:368 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:360 +#: ../../include/features.php:369 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:368 +#: ../../include/features.php:377 msgid "Post Categories" msgstr "" -#: ../../include/features.php:369 +#: ../../include/features.php:378 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:377 +#: ../../include/features.php:386 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:378 +#: ../../include/features.php:387 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:387 +#: ../../include/features.php:396 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:395 +#: ../../include/features.php:404 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:396 +#: ../../include/features.php:405 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:404 +#: ../../include/features.php:413 msgid "Star Posts" msgstr "" -#: ../../include/features.php:405 +#: ../../include/features.php:414 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:413 +#: ../../include/features.php:422 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:414 +#: ../../include/features.php:423 msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/features.php:425 +#: ../../include/features.php:434 msgid "Premium Channel" msgstr "" -#: ../../include/features.php:426 +#: ../../include/features.php:435 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "" -#: ../../include/taxonomy.php:267 ../../include/taxonomy.php:288 +#: ../../include/taxonomy.php:325 ../../include/taxonomy.php:346 msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:332 +#: ../../include/taxonomy.php:410 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:353 +#: ../../include/taxonomy.php:431 msgid "have" msgstr "" -#: ../../include/taxonomy.php:353 +#: ../../include/taxonomy.php:431 msgid "has" msgstr "" -#: ../../include/taxonomy.php:354 +#: ../../include/taxonomy.php:432 msgid "want" msgstr "" -#: ../../include/taxonomy.php:354 +#: ../../include/taxonomy.php:432 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:355 +#: ../../include/taxonomy.php:433 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:356 +#: ../../include/taxonomy.php:434 msgid "dislikes" msgstr "" @@ -13044,214 +13385,178 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/nav.php:90 +#: ../../include/nav.php:91 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:90 +#: ../../include/nav.php:91 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:99 ../../include/nav.php:123 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:102 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:105 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:107 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:113 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:138 -msgid "Take me home" -msgstr "" - -#: ../../include/nav.php:140 -msgid "Log me out of this site" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:157 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:160 -msgid "Search site @name, #tag, ?docs, content" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Grid" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Your grid" +#: ../../include/nav.php:98 +msgid "Network Activity" msgstr "" -#: ../../include/nav.php:172 -msgid "View your network/grid" +#: ../../include/nav.php:100 +msgid "Mark all activity notifications seen" msgstr "" -#: ../../include/nav.php:173 -msgid "Mark all grid notifications seen" -msgstr "" - -#: ../../include/nav.php:175 +#: ../../include/nav.php:102 msgid "Channel home" msgstr "" -#: ../../include/nav.php:176 +#: ../../include/nav.php:103 msgid "View your channel home" msgstr "" -#: ../../include/nav.php:177 +#: ../../include/nav.php:104 msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:183 -msgid "Notices" +#: ../../include/nav.php:109 +msgid "Registrations" msgstr "" -#: ../../include/nav.php:183 +#: ../../include/nav.php:112 msgid "Notifications" msgstr "" -#: ../../include/nav.php:184 +#: ../../include/nav.php:113 msgid "View all notifications" msgstr "" -#: ../../include/nav.php:185 +#: ../../include/nav.php:114 msgid "Mark all system notifications seen" msgstr "" -#: ../../include/nav.php:187 +#: ../../include/nav.php:116 msgid "Private mail" msgstr "" -#: ../../include/nav.php:188 +#: ../../include/nav.php:117 msgid "View your private messages" msgstr "" -#: ../../include/nav.php:189 +#: ../../include/nav.php:118 msgid "Mark all private messages seen" msgstr "" -#: ../../include/nav.php:195 +#: ../../include/nav.php:124 msgid "Event Calendar" msgstr "" -#: ../../include/nav.php:196 -msgid "View events" +#: ../../include/nav.php:129 ../../include/nav.php:215 +msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:197 -msgid "Mark all events seen" +#: ../../include/nav.php:132 ../../include/nav.php:217 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:199 -msgid "Manage Your Channels" +#: ../../include/nav.php:138 ../../include/nav.php:167 +msgid "End this session" msgstr "" -#: ../../include/nav.php:201 -msgid "Account/Channel Settings" +#: ../../include/nav.php:141 +msgid "Your profile page" msgstr "" -#: ../../include/nav.php:203 -msgid "Shared Files" +#: ../../include/nav.php:144 +msgid "Manage/Edit profiles" +msgstr "" + +#: ../../include/nav.php:146 +msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:203 -msgid "New files shared with me" +#: ../../include/nav.php:153 ../../include/nav.php:157 +msgid "Sign in" msgstr "" -#: ../../include/nav.php:208 -msgid "Public stream" +#: ../../include/nav.php:182 +msgid "Take me home" msgstr "" -#: ../../include/nav.php:208 -msgid "Public stream activities" +#: ../../include/nav.php:184 +msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:215 +#: ../../include/nav.php:189 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:204 +msgid "Search site @name, #tag, ?docs, content" +msgstr "" + +#: ../../include/nav.php:224 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:274 +#: ../../include/nav.php:311 msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:275 +#: ../../include/nav.php:312 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:278 +#: ../../include/nav.php:318 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:279 +#: ../../include/nav.php:319 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:280 +#: ../../include/nav.php:320 msgid "Toggle System Apps" msgstr "" -#: ../../include/photos.php:111 +#: ../../include/photos.php:123 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/photos.php:118 +#: ../../include/photos.php:130 msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:257 +#: ../../include/photos.php:268 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:297 +#: ../../include/photos.php:308 msgid "a new photo" msgstr "" -#: ../../include/photos.php:301 +#: ../../include/photos.php:312 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:530 +#: ../../include/photos.php:605 msgid "Upload New Photos" msgstr "" -#: ../../include/zot.php:653 +#: ../../include/zot.php:654 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:680 +#: ../../include/zot.php:681 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2338 +#: ../../include/zot.php:2368 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:3946 -msgid "invalid target signature" -msgstr "" - #: ../../include/group.php:26 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -13291,14 +13596,18 @@ msgstr "" msgid "Logged out." msgstr "" -#: ../../include/auth.php:275 +#: ../../include/auth.php:263 +msgid "Email validation is incomplete. Please check your email." +msgstr "" + +#: ../../include/auth.php:278 msgid "Failed authentication" msgstr "" -#: ../../include/help.php:33 +#: ../../include/help.php:34 msgid "Help:" msgstr "" -#: ../../include/help.php:65 +#: ../../include/help.php:78 msgid "Not Found" msgstr "" diff --git a/view/js/main.js b/view/js/main.js index 3455de5c2..b4c2bcf5d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -415,6 +415,7 @@ function NavUpdate() { var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : ''); $.get(pingCmd,function(data) { + if(data.invalid == 1) { window.location.href=window.location.href; } @@ -440,71 +441,35 @@ function NavUpdate() { updateCountsOnly = false; if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs) { - $('#notifications-btn, #notifications-btn-1').css('opacity', 1); + $('#notifications-btn').css('opacity', 1); } else { - $('#notifications-btn, #notifications-btn-1').css('opacity', 0.5); + $('#notifications-btn').css('opacity', 0.5); $('#navbar-collapse-1').removeClass('show'); } - if(data.network == 0) { - data.network = ''; - $('.network-update, .network-button').hide(); - document.title = savedTitle; - } else { - $('.network-update, .network-button').show(); - document.title = '(' + data.network + ') ' + savedTitle; - } - $('.network-update').html(data.network); - - if(data.pubs == 0) { - data.pubs = ''; - $('.pubs-update, .pubs-button').hide(); - } else { - $('.pubs-update, .pubs-button').show(); + if(data.home || data.intros || data.register || data.mail || data.notify || data.files) { + $('#notifications-btn-icon').removeClass('fa-exclamation-circle'); + $('#notifications-btn-icon').addClass('fa-exclamation-triangle'); } - $('.pubs-update').html(data.pubs); - - if(data.files == 0) { - data.files = ''; - $('.files-update, .files-button').hide(); - } else { - $('.files-update, .files-button').show(); + if(!data.home && !data.intros && !data.register && !data.mail && !data.notify && !data.files) { + $('#notifications-btn-icon').removeClass('fa-exclamation-triangle'); + $('#notifications-btn-icon').addClass('fa-exclamation-circle'); } - $('.files-update').html(data.files); - - if(data.home == 0) { data.home = ''; $('.home-update, .home-button').hide(); } else { $('.home-update, .home-button').show(); } - $('.home-update').html(data.home); - - if(data.intros == 0) { data.intros = ''; $('.intros-update, .intros-button').hide(); } else { $('.intros-update, .intros-button').show(); } - $('.intros-update').html(data.intros); - - if(data.mail == 0) { data.mail = ''; $('.mail-update, .mail-button').hide(); } else { $('.mail-update, .mail-button').show(); } - $('.mail-update').html(data.mail); - - if(data.notify == 0) { data.notify = ''; $('.notify-update, .notify-button').hide(); } else { $('.notify-update, .notify-button').show(); } - $('.notify-update').html(data.notify); - - if(data.register == 0) { data.register = ''; $('.register-update, .register-button').hide(); } else { $('.register-update, .register-button').show(); } - $('.register-update').html(data.register); - - if(data.events == 0) { data.events = ''; $('.events-update, .events-button').hide(); } else { $('.events-update, .events-button').show(); } - $('.events-update').html(data.events); - if(data.events_today == 0) { data.events_today = ''; $('.events-today-update').removeClass('show'); } else { $('.events-today-update').addClass('show'); $('.events-update').html(data.events + '*'); } - $('.events-today-update').html(data.events_today); - - if(data.birthdays == 0) { data.birthdays = ''; $('.birthdays-update').removeClass('show'); } else { $('.birthdays-update').addClass('show'); } - $('.birthdays-update').html(data.birthdays); - - if(data.birthdays_today == 0) { data.birthdays_today = ''; $('.birthdays-today-update').removeClass('show'); } else { $('.birthdays-today-update').addClass('show'); $('.birthdays-update').html(data.birthdays + '*'); } - $('.birthdays-today-update').html(data.birthdays_today); - - if(data.all_events == 0) { data.all_events = ''; $('.all_events-update, .all_events-button').hide(); } else { $('.all_events-update, .all_events-button').show(); } - $('.all_events-update').html(data.all_events); - - if(data.all_events_today == 0) { data.all_events_today = ''; $('.all_events-today-update').removeClass('show'); } else { $('.all_events-today-update').addClass('show'); $('.all_events-update').html(data.all_events + '*'); } - $('.all_events-today-update').html(data.all_events_today); + $.each(data, function(index, item) { + //do not process those + var arr = ['notice', 'info', 'invalid']; + if(arr.indexOf(index) !== -1) + return; + + if(item == 0) { + $('.' + index + '-button').hide(); + } else { + $('.' + index + '-button').show(); + $('.' + index + '-update').html(item); + } + }); $.jGrowl.defaults.closerTemplate = '<div>[ ' + aStr.closeAll + ']</div>'; @@ -979,26 +944,21 @@ function notify_popup_loader(notifyType) { window.location.href=window.location.href; } - if(data.notify.length == 0){ - $("#navbar-" + notifyType + "-menu").html(aStr[nothingnew]); - $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]); - } else { - $("#navbar-" + notifyType + "-menu").html(notifications_all + notifications_mark); - $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); + $("#navbar-" + notifyType + "-menu").html(notifications_all + notifications_mark); + $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); - $(data.notify).each(function() { - html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); - $("#navbar-" + notifyType + "-menu").append(html); + $(data.notify).each(function() { + html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); + $("#navbar-" + notifyType + "-menu").append(html); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); + $("#nav-" + notifyType + "-menu").append(html); + }); - html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); - $("#nav-" + notifyType + "-menu").append(html); - }); - $(".dropdown-menu img[data-src], .notification img[data-src]").each(function(i, el){ - // Replace data-src attribute with src attribute for every image - $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); - }); - } + $(".dropdown-menu img[data-src], .notification img[data-src]").each(function(i, el){ + // Replace data-src attribute with src attribute for every image + $(el).attr('src', $(el).data("src")); + $(el).removeAttr("data-src"); + }); }); setTimeout(function() { diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 6e8463f46..b330993c8 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -74,7 +74,7 @@ </button> {{if $localuser || $nav.pubs}} <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white"> - <i class="fa fa-exclamation-circle"></i> + <i id="notifications-btn-icon" class="fa fa-exclamation-circle"></i> </button> {{/if}} <button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 602e0b988..faf8b5b4a 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -88,7 +88,7 @@ {{if $localuser || $nav.pubs}} <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1"> - <i class="fa fa-exclamation"></i> + <i id="notifications-btn-icon" class="fa fa-exclamation"></i> </button> {{/if}} |