diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | util/hmessages.po | 3398 |
2 files changed, 1738 insertions, 1662 deletions
@@ -55,7 +55,7 @@ require_once('include/bbcode.php'); require_once('include/items.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '6.5.13' ); +define ( 'STD_VERSION', '7.0RC' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1250 ); diff --git a/util/hmessages.po b/util/hmessages.po index 6f6835fae..e8d085c8a 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 6.4RC1\n" +"Project-Id-Version: 7.0RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-27 07:58+0000\n" +"POT-Creation-Date: 2022-01-14 18:27+0000\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" @@ -21,7 +21,7 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 -#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3370 +#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3425 #: ../../Zotlabs/Module/Admin/Site.php:251 msgid "Default" msgstr "" @@ -46,11 +46,11 @@ msgstr "" #: ../../addon/ijpost/Mod_Ijpost.php:72 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:62 #: ../../addon/dwpost/Mod_Dwpost.php:78 -#: ../../addon/startpage/Mod_Startpage.php:71 ../../addon/mail/Mod_Mail.php:206 +#: ../../addon/startpage/Mod_Startpage.php:71 #: ../../addon/twitter/Mod_Twitter.php:182 #: ../../addon/pumpio/Mod_Pumpio.php:113 #: ../../addon/cart/submodules/subscriptions.php:410 -#: ../../addon/cart/submodules/hzservices.php:644 +#: ../../addon/cart/submodules/hzservices.php:645 #: ../../addon/cart/submodules/orderoptions.php:312 #: ../../addon/cart/submodules/orderoptions.php:412 #: ../../addon/cart/submodules/manualcat.php:248 @@ -77,11 +77,11 @@ msgstr "" #: ../../addon/xmpp/Mod_Xmpp.php:70 ../../include/js_strings.php:22 #: ../../Zotlabs/Widget/Wiki_pages.php:42 #: ../../Zotlabs/Widget/Wiki_pages.php:99 -#: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Tokens.php:186 +#: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Tokens.php:294 #: ../../Zotlabs/Module/Import_items.php:125 #: ../../Zotlabs/Module/Import.php:611 ../../Zotlabs/Module/Setup.php:306 -#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Group.php:149 -#: ../../Zotlabs/Module/Group.php:165 ../../Zotlabs/Module/Oauth.php:109 +#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Group.php:150 +#: ../../Zotlabs/Module/Group.php:159 ../../Zotlabs/Module/Oauth.php:109 #: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Chat.php:246 #: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Mitem.php:259 #: ../../Zotlabs/Module/Filestorage.php:208 @@ -96,16 +96,18 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Addons.php:442 -#: ../../Zotlabs/Module/Regate.php:407 ../../Zotlabs/Module/Permcats.php:127 +#: ../../Zotlabs/Module/Regate.php:407 ../../Zotlabs/Module/Permcats.php:228 #: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Appman.php:221 +#: ../../Zotlabs/Module/Contactedit.php:429 +#: ../../Zotlabs/Module/Contactedit.php:455 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Photos.php:1064 ../../Zotlabs/Module/Photos.php:1104 -#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Profiles.php:739 #: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Module/Affinity.php:84 #: ../../Zotlabs/Module/Settings/Network.php:62 #: ../../Zotlabs/Module/Settings/Features.php:48 -#: ../../Zotlabs/Module/Settings/Channel.php:499 +#: ../../Zotlabs/Module/Settings/Channel.php:224 #: ../../Zotlabs/Module/Settings/Account.php:107 #: ../../Zotlabs/Module/Settings/Events.php:42 #: ../../Zotlabs/Module/Settings/Manage.php:43 @@ -117,13 +119,14 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Connections.php:42 #: ../../Zotlabs/Module/Settings/Photos.php:42 #: ../../Zotlabs/Module/Settings/Profiles.php:52 +#: ../../Zotlabs/Module/Settings/Privacy.php:110 #: ../../Zotlabs/Module/Settings/Conversation.php:49 -#: ../../Zotlabs/Module/Defperms.php:264 ../../Zotlabs/Module/Pconfig.php:116 +#: ../../Zotlabs/Module/Defperms.php:263 ../../Zotlabs/Module/Pconfig.php:116 #: ../../Zotlabs/Module/Oauth2.php:114 ../../Zotlabs/Module/Thing.php:328 #: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:106 -#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Connedit.php:714 #: ../../Zotlabs/Module/Locs.php:125 ../../Zotlabs/Module/Sources.php:123 -#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Lib/ThreadItem.php:827 +#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Lib/ThreadItem.php:851 #: ../../Zotlabs/Storage/Browser.php:382 msgid "Submit" msgstr "" @@ -155,9 +158,9 @@ msgstr "" #: ../../addon/pumpio/Mod_Pumpio.php:96 ../../addon/pumpio/Mod_Pumpio.php:100 #: ../../addon/cart/submodules/subscriptions.php:153 #: ../../addon/cart/submodules/subscriptions.php:425 -#: ../../addon/cart/submodules/hzservices.php:66 -#: ../../addon/cart/submodules/hzservices.php:650 -#: ../../addon/cart/submodules/hzservices.php:654 +#: ../../addon/cart/submodules/hzservices.php:67 +#: ../../addon/cart/submodules/hzservices.php:651 +#: ../../addon/cart/submodules/hzservices.php:655 #: ../../addon/cart/submodules/orderoptions.php:72 #: ../../addon/cart/submodules/orderoptions.php:338 #: ../../addon/cart/submodules/orderoptions.php:362 @@ -177,27 +180,37 @@ msgstr "" #: ../../addon/libertree/Mod_Libertree.php:57 #: ../../addon/socialauth/Mod_SocialAuth.php:212 #: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65 -#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1472 +#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1486 #: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 #: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512 +#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138 +#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249 +#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 -#: ../../Zotlabs/Module/Admin/Site.php:319 ../../Zotlabs/Module/Api.php:99 -#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:683 -#: ../../Zotlabs/Module/Settings/Channel.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Permcats.php:218 +#: ../../Zotlabs/Module/Contactedit.php:284 +#: ../../Zotlabs/Module/Contactedit.php:329 ../../Zotlabs/Module/Api.php:99 +#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:675 +#: ../../Zotlabs/Module/Profiles.php:685 ../../Zotlabs/Module/Profiles.php:693 +#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Settings/Channel.php:219 #: ../../Zotlabs/Module/Settings/Display.php:86 +#: ../../Zotlabs/Module/Settings/Privacy.php:120 +#: ../../Zotlabs/Module/Settings/Privacy.php:121 +#: ../../Zotlabs/Module/Settings/Privacy.php:122 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:196 ../../Zotlabs/Module/Wiki.php:224 -#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Connedit.php:401 -#: ../../Zotlabs/Module/Connedit.php:781 ../../Zotlabs/Module/Sources.php:122 -#: ../../Zotlabs/Module/Sources.php:157 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 -#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311 -#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 -#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 -#: ../../boot.php:1733 +#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224 +#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 +#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 +#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../Zotlabs/Storage/Browser.php:310 +#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312 +#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391 +#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1743 msgid "No" msgstr "" @@ -220,9 +233,9 @@ msgstr "" #: ../../addon/pumpio/Mod_Pumpio.php:96 ../../addon/pumpio/Mod_Pumpio.php:100 #: ../../addon/cart/submodules/subscriptions.php:153 #: ../../addon/cart/submodules/subscriptions.php:425 -#: ../../addon/cart/submodules/hzservices.php:66 -#: ../../addon/cart/submodules/hzservices.php:650 -#: ../../addon/cart/submodules/hzservices.php:654 +#: ../../addon/cart/submodules/hzservices.php:67 +#: ../../addon/cart/submodules/hzservices.php:651 +#: ../../addon/cart/submodules/hzservices.php:655 #: ../../addon/cart/submodules/orderoptions.php:72 #: ../../addon/cart/submodules/orderoptions.php:337 #: ../../addon/cart/submodules/orderoptions.php:361 @@ -242,26 +255,36 @@ msgstr "" #: ../../addon/libertree/Mod_Libertree.php:57 #: ../../addon/socialauth/Mod_SocialAuth.php:212 #: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65 -#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1472 +#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1486 #: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 #: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512 +#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138 +#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249 +#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 -#: ../../Zotlabs/Module/Admin/Site.php:321 ../../Zotlabs/Module/Api.php:98 -#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:683 -#: ../../Zotlabs/Module/Settings/Channel.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Permcats.php:218 +#: ../../Zotlabs/Module/Contactedit.php:284 ../../Zotlabs/Module/Api.php:98 +#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:675 +#: ../../Zotlabs/Module/Profiles.php:685 ../../Zotlabs/Module/Profiles.php:693 +#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Settings/Channel.php:219 #: ../../Zotlabs/Module/Settings/Display.php:86 +#: ../../Zotlabs/Module/Settings/Privacy.php:120 +#: ../../Zotlabs/Module/Settings/Privacy.php:121 +#: ../../Zotlabs/Module/Settings/Privacy.php:122 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:196 ../../Zotlabs/Module/Wiki.php:224 -#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Connedit.php:401 -#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 -#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 -#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../Zotlabs/Storage/Browser.php:310 -#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312 -#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391 -#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1733 +#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224 +#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Sources.php:122 +#: ../../Zotlabs/Module/Sources.php:157 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 +#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311 +#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 +#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 +#: ../../boot.php:1743 msgid "Yes" msgstr "" @@ -326,7 +349,7 @@ msgid "Set shadow depth of photos" msgstr "" #: ../../view/theme/redbasic/php/config.php:113 -msgid "Set maximum width of content region in pixel" +msgid "Set maximum width of content region in rem" msgstr "" #: ../../view/theme/redbasic/php/config.php:113 @@ -417,7 +440,7 @@ msgstr "" #: ../../addon/channelreputation/channelreputation.php:233 #: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:158 -#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Lib/ThreadItem.php:497 +#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Lib/ThreadItem.php:521 #: ../../Zotlabs/Storage/Browser.php:411 msgid "Close" msgstr "" @@ -456,7 +479,6 @@ msgstr "" #: ../../addon/superblock/Mod_Superblock.php:90 #: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459 -#: ../../Zotlabs/Module/Profile_photo.php:501 #: ../../Zotlabs/Module/Cover_photo.php:424 #: ../../Zotlabs/Module/Photos.php:1002 msgid "Remove" @@ -507,14 +529,14 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:112 -#: ../../include/conversation.php:1086 ../../Zotlabs/Module/Connedit.php:593 -#: ../../Zotlabs/Lib/Apps.php:350 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:110 +#: ../../include/conversation.php:1086 ../../Zotlabs/Module/Connedit.php:480 +#: ../../Zotlabs/Lib/Apps.php:348 msgid "View Profile" msgstr "" -#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:117 -#: ../../include/channel.php:1527 +#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:115 +#: ../../include/channel.php:1534 msgid "Edit Profile" msgstr "" @@ -589,7 +611,7 @@ msgid "Unknown error. Please try again later." msgstr "" #: ../../addon/openclipatar/openclipatar.php:299 -#: ../../Zotlabs/Module/Profile_photo.php:254 +#: ../../Zotlabs/Module/Profile_photo.php:268 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." @@ -600,7 +622,7 @@ msgid "Profile photo updated successfully." msgstr "" #: ../../addon/bookmarker/bookmarker.php:38 -#: ../../Zotlabs/Lib/ThreadItem.php:474 +#: ../../Zotlabs/Lib/ThreadItem.php:498 msgid "Save Bookmarks" msgstr "" @@ -632,8 +654,8 @@ msgstr "" msgid "Queueworker Settings" msgstr "" -#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1142 -#: ../../include/text.php:1154 ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1146 +#: ../../include/text.php:1158 ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Cards.php:111 #: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Articles.php:115 #: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103 @@ -682,7 +704,7 @@ msgstr "" msgid "Photo Gallery" msgstr "" -#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1421 +#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1427 #: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Profile.php:27 ../../Zotlabs/Module/Webpages.php:39 #: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Connect.php:17 @@ -702,33 +724,33 @@ msgid "" "Set a random planet from the Star Wars Empire as your location when posting" msgstr "" -#: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:22 -#: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36 -#: ../../include/photos.php:30 ../../include/items.php:3749 -#: ../../include/attach.php:156 ../../include/attach.php:205 -#: ../../include/attach.php:278 ../../include/attach.php:329 -#: ../../include/attach.php:424 ../../include/attach.php:438 -#: ../../include/attach.php:445 ../../include/attach.php:527 -#: ../../include/attach.php:1096 ../../include/attach.php:1169 -#: ../../include/attach.php:1332 ../../Zotlabs/Module/Article_edit.php:51 +#: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44 +#: ../../addon/keepout/keepout.php:36 ../../include/photos.php:30 +#: ../../include/items.php:3881 ../../include/attach.php:156 +#: ../../include/attach.php:205 ../../include/attach.php:278 +#: ../../include/attach.php:329 ../../include/attach.php:424 +#: ../../include/attach.php:438 ../../include/attach.php:445 +#: ../../include/attach.php:527 ../../include/attach.php:1096 +#: ../../include/attach.php:1169 ../../include/attach.php:1332 +#: ../../Zotlabs/Module/Article_edit.php:51 #: ../../Zotlabs/Module/Attach_edit.php:90 #: ../../Zotlabs/Module/Attach_edit.php:99 -#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:19 +#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:18 #: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Setup.php:208 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Channel.php:217 ../../Zotlabs/Module/Channel.php:373 -#: ../../Zotlabs/Module/Channel.php:412 ../../Zotlabs/Module/Group.php:15 -#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Card_edit.php:51 +#: ../../Zotlabs/Module/Channel.php:220 ../../Zotlabs/Module/Channel.php:376 +#: ../../Zotlabs/Module/Channel.php:415 ../../Zotlabs/Module/Group.php:14 +#: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Card_edit.php:51 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:111 #: ../../Zotlabs/Module/Chat.php:116 #: ../../Zotlabs/Module/Channel_calendar.php:232 -#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Item.php:500 ../../Zotlabs/Module/Item.php:519 -#: ../../Zotlabs/Module/Item.php:529 ../../Zotlabs/Module/Item.php:1434 +#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/Poke.php:157 +#: ../../Zotlabs/Module/Item.php:501 ../../Zotlabs/Module/Item.php:520 +#: ../../Zotlabs/Module/Item.php:530 ../../Zotlabs/Module/Item.php:1445 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99 #: ../../Zotlabs/Module/Profile.php:114 #: ../../Zotlabs/Module/Sharedwithme.php:19 @@ -748,8 +770,8 @@ msgstr "" #: ../../Zotlabs/Module/Appman.php:153 ../../Zotlabs/Module/Cards.php:84 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Profile_photo.php:338 -#: ../../Zotlabs/Module/Profile_photo.php:351 +#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Profile_photo.php:390 +#: ../../Zotlabs/Module/Profile_photo.php:417 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Settings.php:58 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 @@ -757,16 +779,16 @@ msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:341 #: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Photos.php:71 #: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133 -#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637 +#: ../../Zotlabs/Module/Profiles.php:171 ../../Zotlabs/Module/Profiles.php:614 #: ../../Zotlabs/Module/Articles.php:87 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 #: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141 -#: ../../Zotlabs/Module/Defperms.php:182 ../../Zotlabs/Module/Thing.php:282 +#: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Thing.php:282 #: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343 #: ../../Zotlabs/Module/Pdledit.php:35 ../../Zotlabs/Module/Wiki.php:57 #: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:425 -#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:394 +#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:299 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:98 #: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135 @@ -774,13 +796,13 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1707 +#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:64 +#: ../../include/selectors.php:81 ../../include/channel.php:1715 msgid "Male" msgstr "" -#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1705 +#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:64 +#: ../../include/selectors.php:81 ../../include/channel.php:1713 msgid "Female" msgstr "" @@ -816,7 +838,7 @@ msgid "Last Name" msgstr "" #: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/Mod_Redred.php:73 -#: ../../boot.php:1722 +#: ../../boot.php:1732 msgid "Nickname" msgstr "" @@ -830,13 +852,13 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1376 #: ../../Zotlabs/Module/Admin/Accounts.php:316 #: ../../Zotlabs/Module/Admin/Accounts.php:330 -#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Connedit.php:736 msgid "Email" msgstr "" #: ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 -#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:367 +#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:365 msgid "Profile Photo" msgstr "" @@ -869,11 +891,11 @@ msgid "Timezone" msgstr "" #: ../../addon/openid/MysqlProvider.php:68 -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "Homepage URL" msgstr "" -#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:365 +#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:363 msgid "Language" msgstr "" @@ -894,7 +916,7 @@ msgid "Birthdate" msgstr "" #: ../../addon/openid/MysqlProvider.php:74 -#: ../../Zotlabs/Module/Profiles.php:488 +#: ../../Zotlabs/Module/Profiles.php:457 msgid "Gender" msgstr "" @@ -1049,7 +1071,7 @@ msgstr "" msgid "Channel is required." msgstr "" -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:325 msgid "Invalid channel." msgstr "" @@ -1096,8 +1118,8 @@ msgstr "" #: ../../addon/redphotos/redphotos.php:119 #: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75 #: ../../include/items.php:440 ../../Zotlabs/Module/Import_items.php:116 -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:95 -#: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Cloud.php:123 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:108 +#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Cloud.php:123 #: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:89 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:55 #: ../../Zotlabs/Web/WebServer.php:115 @@ -1143,11 +1165,11 @@ msgstr "" msgid "0 or blank to import all available" msgstr "" -#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1952 -#: ../../addon/diaspora/Receiver.php:1626 ../../include/text.php:2247 -#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:439 +#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1943 +#: ../../addon/diaspora/Receiver.php:1629 ../../include/text.php:2302 +#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:445 #: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:115 -#: ../../Zotlabs/Lib/Activity.php:3379 +#: ../../Zotlabs/Lib/Activity.php:3391 msgid "photo" msgstr "" @@ -1397,7 +1419,7 @@ msgid "Files imported" msgstr "" #: ../../addon/content_import/Mod_content_import.php:134 -#: ../../Zotlabs/Lib/Apps.php:338 +#: ../../Zotlabs/Lib/Apps.php:336 msgid "Content Import" msgstr "" @@ -1438,139 +1460,139 @@ msgstr "" msgid "Until modified date yyyy-mm-dd" msgstr "" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1335 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1349 msgid "Set your location" msgstr "" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1336 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1350 msgid "Clear browser location" msgstr "" -#: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:205 -#: ../../include/conversation.php:1348 ../../Zotlabs/Module/Article_edit.php:99 +#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1362 +#: ../../Zotlabs/Module/Article_edit.php:99 #: ../../Zotlabs/Module/Card_edit.php:101 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:218 #: ../../Zotlabs/Module/Editblock.php:116 msgid "Insert web link" msgstr "" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1352 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1366 msgid "Embed (existing) photo from your photo albums" msgstr "" -#: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:135 -#: ../../include/conversation.php:1385 ../../Zotlabs/Module/Chat.php:216 +#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1399 +#: ../../Zotlabs/Module/Chat.php:216 msgid "Please enter a link URL:" msgstr "" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1386 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1400 msgid "Tag term:" msgstr "" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1387 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1401 msgid "Where are you right now?" msgstr "" -#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1390 -#: ../../Zotlabs/Module/Profile_photo.php:509 +#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1404 +#: ../../Zotlabs/Module/Profile_photo.php:551 #: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:400 msgid "Choose images to embed" msgstr "" -#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1391 -#: ../../Zotlabs/Module/Profile_photo.php:510 +#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1405 +#: ../../Zotlabs/Module/Profile_photo.php:552 #: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:401 msgid "Choose an album" msgstr "" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1392 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1406 msgid "Choose a different album..." msgstr "" -#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1393 -#: ../../Zotlabs/Module/Profile_photo.php:512 +#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1407 +#: ../../Zotlabs/Module/Profile_photo.php:554 #: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:403 msgid "Error getting album list" msgstr "" -#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1394 -#: ../../Zotlabs/Module/Profile_photo.php:513 +#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1408 +#: ../../Zotlabs/Module/Profile_photo.php:555 #: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:404 msgid "Error getting photo link" msgstr "" -#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1395 -#: ../../Zotlabs/Module/Profile_photo.php:514 +#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1409 +#: ../../Zotlabs/Module/Profile_photo.php:556 #: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:405 msgid "Error getting album" msgstr "" -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1396 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1410 msgid "Comments enabled" msgstr "" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1397 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1411 msgid "Comments disabled" msgstr "" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1408 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1422 #: ../../Zotlabs/Module/Webpages.php:259 ../../Zotlabs/Module/Photos.php:1105 -#: ../../Zotlabs/Lib/ThreadItem.php:837 +#: ../../Zotlabs/Lib/ThreadItem.php:861 msgid "Preview" msgstr "" -#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1441 +#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1455 #: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:253 #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1084 #: ../../Zotlabs/Module/Wiki.php:298 ../../Zotlabs/Module/Layouts.php:194 msgid "Share" msgstr "" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1450 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1464 msgid "Page link name" msgstr "" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1453 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1467 msgid "Post as" msgstr "" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1455 -#: ../../Zotlabs/Lib/ThreadItem.php:828 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1469 +#: ../../Zotlabs/Lib/ThreadItem.php:852 msgid "Bold" msgstr "" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1456 -#: ../../Zotlabs/Lib/ThreadItem.php:829 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1470 +#: ../../Zotlabs/Lib/ThreadItem.php:853 msgid "Italic" msgstr "" -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1457 -#: ../../Zotlabs/Lib/ThreadItem.php:830 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1471 +#: ../../Zotlabs/Lib/ThreadItem.php:854 msgid "Underline" msgstr "" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1458 -#: ../../Zotlabs/Lib/ThreadItem.php:831 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1472 +#: ../../Zotlabs/Lib/ThreadItem.php:855 msgid "Quote" msgstr "" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1459 -#: ../../Zotlabs/Lib/ThreadItem.php:832 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1473 +#: ../../Zotlabs/Lib/ThreadItem.php:856 msgid "Code" msgstr "" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1460 -#: ../../Zotlabs/Lib/ThreadItem.php:834 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1474 +#: ../../Zotlabs/Lib/ThreadItem.php:858 msgid "Attach/Upload file" msgstr "" -#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1463 +#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1477 #: ../../Zotlabs/Module/Wiki.php:397 msgid "Embed an image from your albums" msgstr "" #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 -#: ../../include/conversation.php:1464 ../../include/conversation.php:1519 +#: ../../include/conversation.php:1478 ../../include/conversation.php:1533 #: ../../Zotlabs/Module/Article_edit.php:130 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth.php:110 @@ -1579,37 +1601,37 @@ msgstr "" #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../Zotlabs/Module/Editpost.php:111 #: ../../Zotlabs/Module/Admin/Addons.php:427 -#: ../../Zotlabs/Module/Profile_photo.php:507 +#: ../../Zotlabs/Module/Profile_photo.php:549 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:56 #: ../../Zotlabs/Module/Editlayout.php:140 #: ../../Zotlabs/Module/Cover_photo.php:428 -#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Oauth2.php:115 +#: ../../Zotlabs/Module/Profiles.php:817 ../../Zotlabs/Module/Oauth2.php:115 #: ../../Zotlabs/Module/Oauth2.php:143 ../../Zotlabs/Module/Wiki.php:365 -#: ../../Zotlabs/Module/Wiki.php:398 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Wiki.php:398 ../../Zotlabs/Module/Connedit.php:750 #: ../../Zotlabs/Storage/Browser.php:383 msgid "Cancel" msgstr "" #: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257 -#: ../../include/conversation.php:1465 ../../include/conversation.php:1518 -#: ../../Zotlabs/Module/Profile_photo.php:508 +#: ../../include/conversation.php:1479 ../../include/conversation.php:1532 +#: ../../Zotlabs/Module/Profile_photo.php:550 #: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:399 msgid "OK" msgstr "" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1467 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1481 msgid "Toggle voting" msgstr "" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1474 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1488 msgid "Disable comments" msgstr "" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1475 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1489 msgid "Toggle comments" msgstr "" -#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1481 +#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1495 #: ../../Zotlabs/Module/Article_edit.php:116 #: ../../Zotlabs/Module/Card_edit.php:118 #: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:678 @@ -1617,30 +1639,28 @@ msgstr "" msgid "Title (optional)" msgstr "" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1485 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1499 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1486 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1500 msgid "Permission settings" msgstr "" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1508 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1522 msgid "Other networks and post services" msgstr "" -#: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:209 -#: ../../include/conversation.php:1511 +#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1525 msgid "Set expiration date" msgstr "" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1514 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1528 msgid "Set publish date" msgstr "" -#: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:211 -#: ../../include/conversation.php:1516 ../../Zotlabs/Module/Chat.php:217 -#: ../../Zotlabs/Lib/ThreadItem.php:841 +#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1530 +#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:865 msgid "Encrypt text" msgstr "" @@ -1701,8 +1721,8 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:82 ../../addon/twitter/twitter.php:493 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/diaspora/diaspora.php:104 #: ../../addon/piwik/piwik.php:116 ../../addon/logrot/logrot.php:54 -#: ../../addon/xmpp/xmpp.php:54 ../../Zotlabs/Module/Settings/Channel.php:269 -#: ../../Zotlabs/Module/Defperms.php:112 +#: ../../addon/xmpp/xmpp.php:54 ../../Zotlabs/Module/Settings/Channel.php:146 +#: ../../Zotlabs/Module/Defperms.php:111 msgid "Settings updated." msgstr "" @@ -1759,26 +1779,26 @@ msgstr "" msgid "Enter some text" msgstr "" -#: ../../addon/pubcrawl/as.php:1345 ../../addon/pubcrawl/as.php:1785 -#: ../../addon/pubcrawl/as.php:1996 ../../include/network.php:1742 -#: ../../Zotlabs/Lib/Activity.php:3229 ../../Zotlabs/Lib/Activity.php:3421 +#: ../../addon/pubcrawl/as.php:1332 ../../addon/pubcrawl/as.php:1776 +#: ../../addon/pubcrawl/as.php:1987 ../../include/network.php:1742 +#: ../../Zotlabs/Lib/Activity.php:3241 ../../Zotlabs/Lib/Activity.php:3433 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/as.php:1952 ../../addon/diaspora/Receiver.php:1626 -#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115 +#: ../../addon/pubcrawl/as.php:1943 ../../addon/diaspora/Receiver.php:1629 +#: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Module/Subthread.php:115 msgid "status" msgstr "" -#: ../../addon/pubcrawl/as.php:1987 ../../addon/diaspora/Receiver.php:1572 -#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:471 -#: ../../Zotlabs/Lib/Activity.php:3412 +#: ../../addon/pubcrawl/as.php:1978 ../../addon/diaspora/Receiver.php:1575 +#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:477 +#: ../../Zotlabs/Lib/Activity.php:3424 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../addon/pubcrawl/as.php:1989 ../../include/conversation.php:177 -#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3414 +#: ../../addon/pubcrawl/as.php:1980 ../../include/conversation.php:177 +#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3426 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2056,19 +2076,19 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:172 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../Zotlabs/Module/Group.php:153 ../../Zotlabs/Module/Oauth.php:111 -#: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Chat.php:255 -#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth.php:137 +#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Cdav.php:1372 +#: ../../Zotlabs/Module/Sharedwithme.php:106 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144 -#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:732 #: ../../Zotlabs/Lib/NativeWikiPage.php:582 #: ../../Zotlabs/Storage/Browser.php:377 msgid "Name" msgstr "" #: ../../addon/rendezvous/rendezvous.php:173 -#: ../../addon/cart/submodules/hzservices.php:656 +#: ../../addon/cart/submodules/hzservices.php:657 #: ../../addon/cart/submodules/manualcat.php:260 #: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Appman.php:211 #: ../../Zotlabs/Module/Rbmark.php:100 @@ -2169,78 +2189,6 @@ msgstr "" msgid "Startpage" msgstr "" -#: ../../addon/mail/Mod_Mail.php:36 -msgid "Messages" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:48 -msgid "message" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:75 -msgid "Conversation removed." -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:136 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:166 ../../Zotlabs/Module/Wiki.php:209 -#: ../../Zotlabs/Storage/Browser.php:404 -msgid "Download" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:167 -msgid "Delete message" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:168 -msgid "Delivery report" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:169 -msgid "Recall message" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:171 -msgid "Message has been recalled." -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:189 -msgid "Delete Conversation" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:191 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:195 -msgid "Send Reply" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:196 -msgid "To:" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:198 ../../Zotlabs/Module/Invite.php:542 -msgid "Subject:" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:200 -#, php-format -msgid "Your message for %s (%s):" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:204 -msgid "Attach file" -msgstr "" - -#: ../../addon/mail/Mod_Mail.php:401 ../../include/text.php:1838 -msgid "Download binary/encrypted content" -msgstr "" - #: ../../addon/adultphotoflag/adultphotoflag.php:24 msgid "Flag Adult Photos" msgstr "" @@ -2469,7 +2417,7 @@ msgid "Send ZID" msgstr "" #: ../../addon/cart/widgets/catalogitem.php:57 -#: ../../addon/cart/submodules/hzservices.php:659 +#: ../../addon/cart/submodules/hzservices.php:660 #: ../../addon/cart/submodules/manualcat.php:263 msgid "Price" msgstr "" @@ -2546,72 +2494,72 @@ msgstr "" msgid "Term" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:64 +#: ../../addon/cart/submodules/hzservices.php:65 msgid "Enable Hubzilla Services Module" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:163 +#: ../../addon/cart/submodules/hzservices.php:164 #: ../../addon/cart/submodules/manualcat.php:172 msgid "New Sku" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:198 +#: ../../addon/cart/submodules/hzservices.php:199 #: ../../addon/cart/submodules/manualcat.php:208 msgid "Cannot save edits to locked item." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:247 -#: ../../addon/cart/submodules/hzservices.php:334 +#: ../../addon/cart/submodules/hzservices.php:248 +#: ../../addon/cart/submodules/hzservices.php:335 msgid "SKU not found." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:300 -#: ../../addon/cart/submodules/hzservices.php:304 +#: ../../addon/cart/submodules/hzservices.php:301 +#: ../../addon/cart/submodules/hzservices.php:305 msgid "Invalid Activation Directive." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:375 -#: ../../addon/cart/submodules/hzservices.php:379 +#: ../../addon/cart/submodules/hzservices.php:376 +#: ../../addon/cart/submodules/hzservices.php:380 msgid "Invalid Deactivation Directive." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:565 +#: ../../addon/cart/submodules/hzservices.php:566 msgid "Add to this privacy group" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:581 +#: ../../addon/cart/submodules/hzservices.php:582 msgid "Set user service class" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:608 +#: ../../addon/cart/submodules/hzservices.php:609 msgid "You must be using a local account to purchase this service." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:648 +#: ../../addon/cart/submodules/hzservices.php:649 #: ../../addon/cart/submodules/manualcat.php:252 msgid "Changes Locked" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:652 +#: ../../addon/cart/submodules/hzservices.php:653 #: ../../addon/cart/submodules/manualcat.php:256 msgid "Item available for purchase." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:662 +#: ../../addon/cart/submodules/hzservices.php:663 #: ../../addon/cart/submodules/manualcat.php:266 msgid "Photo URL" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:666 +#: ../../addon/cart/submodules/hzservices.php:667 msgid "Add buyer to privacy group" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:671 +#: ../../addon/cart/submodules/hzservices.php:672 msgid "Add buyer as connection" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:679 -#: ../../addon/cart/submodules/hzservices.php:721 +#: ../../addon/cart/submodules/hzservices.php:680 +#: ../../addon/cart/submodules/hzservices.php:722 msgid "Set Service Class" msgstr "" @@ -2632,8 +2580,8 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:458 #: ../../include/js_strings.php:123 ../../include/datetime.php:211 #: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:209 -#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Profiles.php:747 -#: ../../Zotlabs/Module/Profiles.php:751 +#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Profiles.php:761 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Required" msgstr "" @@ -2849,7 +2797,7 @@ msgstr "" msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../addon/diaspora/import_diaspora.php:141 +#: ../../addon/diaspora/import_diaspora.php:140 msgid "Import completed." msgstr "" @@ -2890,22 +2838,22 @@ msgstr "" msgid "Diaspora Protocol" msgstr "" -#: ../../addon/diaspora/Receiver.php:1576 +#: ../../addon/diaspora/Receiver.php:1579 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2205 ../../Zotlabs/Module/Like.php:481 +#: ../../addon/diaspora/Receiver.php:2208 ../../Zotlabs/Module/Like.php:487 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2207 ../../Zotlabs/Module/Like.php:483 +#: ../../addon/diaspora/Receiver.php:2210 ../../Zotlabs/Module/Like.php:489 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2209 ../../Zotlabs/Module/Like.php:485 +#: ../../addon/diaspora/Receiver.php:2212 ../../Zotlabs/Module/Like.php:491 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -2998,7 +2946,7 @@ msgstr "" #: ../../addon/workflow/workflow.php:2617 #: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1374 -#: ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Connedit.php:734 msgid "Title" msgstr "" @@ -3008,7 +2956,7 @@ msgid "Brief description or title" msgstr "" #: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:26 -#: ../../Zotlabs/Lib/Apps.php:376 +#: ../../Zotlabs/Lib/Apps.php:374 msgid "Notes" msgstr "" @@ -3213,7 +3161,7 @@ msgstr "" #: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:239 #: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:682 #: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Thing.php:321 -#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:675 +#: ../../Zotlabs/Module/Thing.php:374 msgid "Permissions" msgstr "" @@ -3223,7 +3171,7 @@ msgid "Set/edit permissions" msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:291 -#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3672 +#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3804 #: ../../Zotlabs/Module/Filestorage.php:29 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:260 @@ -3273,7 +3221,7 @@ msgstr "" msgid "<blush>" msgstr "" -#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:334 +#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:332 msgid "Report Bug" msgstr "" @@ -3630,7 +3578,7 @@ msgstr "" msgid "Posted by" msgstr "" -#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2111 +#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2166 #: ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:214 #: ../../Zotlabs/Module/Wiki.php:368 @@ -3737,480 +3685,497 @@ msgstr "" msgid "XMPP Settings" msgstr "" -#: ../../include/text.php:524 +#: ../../include/text.php:525 msgid "prev" msgstr "" -#: ../../include/text.php:526 +#: ../../include/text.php:527 msgid "first" msgstr "" -#: ../../include/text.php:555 +#: ../../include/text.php:556 msgid "last" msgstr "" -#: ../../include/text.php:558 +#: ../../include/text.php:559 msgid "next" msgstr "" -#: ../../include/text.php:576 +#: ../../include/text.php:577 msgid "older" msgstr "" -#: ../../include/text.php:578 +#: ../../include/text.php:579 msgid "newer" msgstr "" -#: ../../include/text.php:1015 -msgid "No connections" -msgstr "" - -#: ../../include/text.php:1027 ../../include/features.php:133 -#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:339 +#: ../../include/text.php:1033 ../../include/features.php:133 +#: ../../Zotlabs/Module/Connections.php:390 ../../Zotlabs/Lib/Apps.php:337 msgid "Connections" msgstr "" -#: ../../include/text.php:1035 ../../Zotlabs/Module/Viewconnections.php:80 -#: ../../Zotlabs/Module/Connections.php:289 +#: ../../include/text.php:1041 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../Zotlabs/Module/Connections.php:297 msgid "Accepts" msgstr "" -#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:83 -#: ../../Zotlabs/Module/Connections.php:292 +#: ../../include/text.php:1044 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../Zotlabs/Module/Connections.php:300 msgid "Comments" msgstr "" -#: ../../include/text.php:1043 ../../Zotlabs/Module/Viewconnections.php:88 -#: ../../Zotlabs/Module/Connections.php:297 +#: ../../include/text.php:1049 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../Zotlabs/Module/Connections.php:305 msgid "Stream items" msgstr "" -#: ../../include/text.php:1048 ../../Zotlabs/Module/Viewconnections.php:93 -#: ../../Zotlabs/Module/Connections.php:302 +#: ../../include/text.php:1054 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../Zotlabs/Module/Connections.php:310 msgid "Wall posts" msgstr "" -#: ../../include/text.php:1052 ../../Zotlabs/Module/Viewconnections.php:97 -#: ../../Zotlabs/Module/Connections.php:306 +#: ../../include/text.php:1058 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../Zotlabs/Module/Connections.php:314 msgid "Nothing" msgstr "" -#: ../../include/text.php:1067 +#: ../../include/text.php:1071 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1130 +#: ../../include/text.php:1134 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1141 ../../include/text.php:1153 -#: ../../include/nav.php:192 ../../include/acl_selectors.php:149 +#: ../../include/text.php:1145 ../../include/text.php:1157 +#: ../../include/nav.php:190 ../../include/acl_selectors.php:149 #: ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../Zotlabs/Widget/Activity_filter.php:203 -#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Module/Connections.php:379 -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Module/Connections.php:394 +#: ../../Zotlabs/Lib/Apps.php:357 msgid "Search" msgstr "" -#: ../../include/text.php:1233 ../../include/text.php:1237 +#: ../../include/text.php:1237 ../../include/text.php:1241 msgid "poke" msgstr "" -#: ../../include/text.php:1233 ../../include/text.php:1237 +#: ../../include/text.php:1237 ../../include/text.php:1241 #: ../../include/conversation.php:267 msgid "poked" msgstr "" -#: ../../include/text.php:1238 +#: ../../include/text.php:1242 msgid "ping" msgstr "" -#: ../../include/text.php:1238 +#: ../../include/text.php:1242 msgid "pinged" msgstr "" -#: ../../include/text.php:1239 +#: ../../include/text.php:1243 msgid "prod" msgstr "" -#: ../../include/text.php:1239 +#: ../../include/text.php:1243 msgid "prodded" msgstr "" -#: ../../include/text.php:1240 +#: ../../include/text.php:1244 msgid "slap" msgstr "" -#: ../../include/text.php:1240 +#: ../../include/text.php:1244 msgid "slapped" msgstr "" -#: ../../include/text.php:1241 +#: ../../include/text.php:1245 msgid "finger" msgstr "" -#: ../../include/text.php:1241 +#: ../../include/text.php:1245 msgid "fingered" msgstr "" -#: ../../include/text.php:1242 +#: ../../include/text.php:1246 msgid "rebuff" msgstr "" -#: ../../include/text.php:1242 +#: ../../include/text.php:1246 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1265 +#: ../../include/text.php:1269 msgid "happy" msgstr "" -#: ../../include/text.php:1266 +#: ../../include/text.php:1270 msgid "sad" msgstr "" -#: ../../include/text.php:1267 +#: ../../include/text.php:1271 msgid "mellow" msgstr "" -#: ../../include/text.php:1268 +#: ../../include/text.php:1272 msgid "tired" msgstr "" -#: ../../include/text.php:1269 +#: ../../include/text.php:1273 msgid "perky" msgstr "" -#: ../../include/text.php:1270 +#: ../../include/text.php:1274 msgid "angry" msgstr "" -#: ../../include/text.php:1271 +#: ../../include/text.php:1275 msgid "stupefied" msgstr "" -#: ../../include/text.php:1272 +#: ../../include/text.php:1276 msgid "puzzled" msgstr "" -#: ../../include/text.php:1273 +#: ../../include/text.php:1277 msgid "interested" msgstr "" -#: ../../include/text.php:1274 +#: ../../include/text.php:1278 msgid "bitter" msgstr "" -#: ../../include/text.php:1275 +#: ../../include/text.php:1279 msgid "cheerful" msgstr "" -#: ../../include/text.php:1276 +#: ../../include/text.php:1280 msgid "alive" msgstr "" -#: ../../include/text.php:1277 +#: ../../include/text.php:1281 msgid "annoyed" msgstr "" -#: ../../include/text.php:1278 +#: ../../include/text.php:1282 msgid "anxious" msgstr "" -#: ../../include/text.php:1279 +#: ../../include/text.php:1283 msgid "cranky" msgstr "" -#: ../../include/text.php:1280 +#: ../../include/text.php:1284 msgid "disturbed" msgstr "" -#: ../../include/text.php:1281 +#: ../../include/text.php:1285 msgid "frustrated" msgstr "" -#: ../../include/text.php:1282 +#: ../../include/text.php:1286 msgid "depressed" msgstr "" -#: ../../include/text.php:1283 +#: ../../include/text.php:1287 msgid "motivated" msgstr "" -#: ../../include/text.php:1284 +#: ../../include/text.php:1288 msgid "relaxed" msgstr "" -#: ../../include/text.php:1285 +#: ../../include/text.php:1289 msgid "surprised" msgstr "" -#: ../../include/text.php:1473 ../../include/js_strings.php:99 +#: ../../include/text.php:1477 ../../include/js_strings.php:99 msgid "Monday" msgstr "" -#: ../../include/text.php:1473 ../../include/js_strings.php:100 +#: ../../include/text.php:1477 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1473 ../../include/js_strings.php:101 +#: ../../include/text.php:1477 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1473 ../../include/js_strings.php:102 +#: ../../include/text.php:1477 ../../include/js_strings.php:102 msgid "Thursday" msgstr "" -#: ../../include/text.php:1473 ../../include/js_strings.php:103 +#: ../../include/text.php:1477 ../../include/js_strings.php:103 msgid "Friday" msgstr "" -#: ../../include/text.php:1473 ../../include/js_strings.php:104 +#: ../../include/text.php:1477 ../../include/js_strings.php:104 msgid "Saturday" msgstr "" -#: ../../include/text.php:1473 ../../include/js_strings.php:98 +#: ../../include/text.php:1477 ../../include/js_strings.php:98 msgid "Sunday" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:74 +#: ../../include/text.php:1481 ../../include/js_strings.php:74 msgid "January" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:75 +#: ../../include/text.php:1481 ../../include/js_strings.php:75 msgid "February" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:76 +#: ../../include/text.php:1481 ../../include/js_strings.php:76 msgid "March" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:77 +#: ../../include/text.php:1481 ../../include/js_strings.php:77 msgid "April" msgstr "" -#: ../../include/text.php:1477 +#: ../../include/text.php:1481 msgid "May" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:79 +#: ../../include/text.php:1481 ../../include/js_strings.php:79 msgid "June" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:80 +#: ../../include/text.php:1481 ../../include/js_strings.php:80 msgid "July" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:81 +#: ../../include/text.php:1481 ../../include/js_strings.php:81 msgid "August" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:82 +#: ../../include/text.php:1481 ../../include/js_strings.php:82 msgid "September" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:83 +#: ../../include/text.php:1481 ../../include/js_strings.php:83 msgid "October" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:84 +#: ../../include/text.php:1481 ../../include/js_strings.php:84 msgid "November" msgstr "" -#: ../../include/text.php:1477 ../../include/js_strings.php:85 +#: ../../include/text.php:1481 ../../include/js_strings.php:85 msgid "December" msgstr "" -#: ../../include/text.php:1535 +#: ../../include/text.php:1539 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1537 ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../include/text.php:1541 ../../Zotlabs/Module/Sharedwithme.php:108 #: ../../Zotlabs/Storage/Browser.php:379 msgid "Size" msgstr "" -#: ../../include/text.php:1537 ../../include/feedutils.php:874 +#: ../../include/text.php:1541 ../../include/feedutils.php:874 msgid "unknown" msgstr "" -#: ../../include/text.php:1578 +#: ../../include/text.php:1582 msgid "remove category" msgstr "" -#: ../../include/text.php:1655 +#: ../../include/text.php:1659 msgid "remove from file" msgstr "" -#: ../../include/text.php:1909 -msgid "Poll has ended." +#: ../../include/text.php:1843 +msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1912 +#: ../../include/text.php:1901 ../../include/text.php:1910 +#: ../../include/text.php:1937 ../../include/text.php:1946 #, php-format -msgid "Poll ends: %s" +msgctxt "noun" +msgid "%d Vote" +msgid_plural "%d Votes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:1953 +#, php-format +msgctxt "noun" +msgid "%d Vote in total" +msgid_plural "%d Votes in total" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:1959 +msgid "Poll has ended" msgstr "" -#: ../../include/text.php:1917 ../../Zotlabs/Lib/ThreadItem.php:446 +#: ../../include/text.php:1962 +#, php-format +msgid "Poll ends in %s" +msgstr "" + +#: ../../include/text.php:1969 ../../Zotlabs/Lib/ThreadItem.php:470 msgid "Vote" msgstr "" -#: ../../include/text.php:2069 +#: ../../include/text.php:2124 msgid "Link to Source" msgstr "" -#: ../../include/text.php:2091 ../../include/language.php:428 +#: ../../include/text.php:2146 ../../include/language.php:428 msgid "default" msgstr "" -#: ../../include/text.php:2099 +#: ../../include/text.php:2154 msgid "Page layout" msgstr "" -#: ../../include/text.php:2099 +#: ../../include/text.php:2154 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:2109 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2164 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:214 #: ../../Zotlabs/Module/Wiki.php:368 msgid "BBcode" msgstr "" -#: ../../include/text.php:2110 +#: ../../include/text.php:2165 msgid "HTML" msgstr "" -#: ../../include/text.php:2112 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2167 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:214 msgid "Text" msgstr "" -#: ../../include/text.php:2113 +#: ../../include/text.php:2168 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:2118 +#: ../../include/text.php:2173 msgid "PHP" msgstr "" -#: ../../include/text.php:2127 +#: ../../include/text.php:2182 msgid "Page content type" msgstr "" -#: ../../include/text.php:2250 ../../include/event.php:1259 +#: ../../include/text.php:2305 ../../include/event.php:1259 #: ../../include/conversation.php:132 #: ../../Zotlabs/Module/Channel_calendar.php:221 -#: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75 +#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Module/Tagger.php:75 msgid "event" msgstr "" -#: ../../include/text.php:2253 ../../include/conversation.php:158 +#: ../../include/text.php:2308 ../../include/conversation.php:158 #: ../../include/bbcode.php:555 ../../include/markdown.php:205 -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3379 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3391 msgid "post" msgstr "" -#: ../../include/text.php:2255 ../../include/conversation.php:160 +#: ../../include/text.php:2310 ../../include/conversation.php:160 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "" -#: ../../include/text.php:2260 +#: ../../include/text.php:2315 msgid "activity" msgstr "" -#: ../../include/text.php:2263 +#: ../../include/text.php:2318 msgid "poll" msgstr "" -#: ../../include/text.php:2376 +#: ../../include/text.php:2431 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2681 +#: ../../include/text.php:2736 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2684 ../../Zotlabs/Module/Blocks.php:154 +#: ../../include/text.php:2739 ../../Zotlabs/Module/Blocks.php:154 msgid "Blocks" msgstr "" -#: ../../include/text.php:2685 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2740 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "" -#: ../../include/text.php:2686 ../../Zotlabs/Module/Layouts.php:184 +#: ../../include/text.php:2741 ../../Zotlabs/Module/Layouts.php:184 msgid "Layouts" msgstr "" -#: ../../include/text.php:2687 +#: ../../include/text.php:2742 msgid "Pages" msgstr "" -#: ../../include/text.php:2699 +#: ../../include/text.php:2754 msgid "Import" msgstr "" -#: ../../include/text.php:2700 +#: ../../include/text.php:2755 msgid "Import website..." msgstr "" -#: ../../include/text.php:2701 +#: ../../include/text.php:2756 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2702 +#: ../../include/text.php:2757 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2703 +#: ../../include/text.php:2758 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2704 +#: ../../include/text.php:2759 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2705 +#: ../../include/text.php:2760 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2706 +#: ../../include/text.php:2761 msgid "Select folder" msgstr "" -#: ../../include/text.php:2707 +#: ../../include/text.php:2762 msgid "Export website..." msgstr "" -#: ../../include/text.php:2708 +#: ../../include/text.php:2763 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2709 +#: ../../include/text.php:2764 msgid "website.zip" msgstr "" -#: ../../include/text.php:2710 +#: ../../include/text.php:2765 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2711 +#: ../../include/text.php:2766 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2712 +#: ../../include/text.php:2767 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2713 +#: ../../include/text.php:2768 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2714 +#: ../../include/text.php:2769 msgid "Specify folder" msgstr "" @@ -4232,7 +4197,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:63 ../../include/event.php:134 -#: ../../include/channel.php:1618 ../../Zotlabs/Module/Directory.php:353 +#: ../../include/channel.php:1625 ../../Zotlabs/Module/Directory.php:353 msgid "Location:" msgstr "" @@ -4272,47 +4237,47 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/event.php:1422 ../../include/connections.php:724 -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:917 +#: ../../include/event.php:1422 ../../include/connections.php:751 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:808 +#: ../../Zotlabs/Module/Connedit.php:741 msgid "Mobile" msgstr "" -#: ../../include/event.php:1423 ../../include/connections.php:725 +#: ../../include/event.php:1423 ../../include/connections.php:752 #: ../../Zotlabs/Widget/Notifications.php:36 ../../Zotlabs/Module/Cdav.php:1382 -#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:918 +#: ../../Zotlabs/Module/Profiles.php:809 ../../Zotlabs/Module/Connedit.php:742 msgid "Home" msgstr "" -#: ../../include/event.php:1424 ../../include/connections.php:726 +#: ../../include/event.php:1424 ../../include/connections.php:753 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1425 ../../include/connections.php:727 +#: ../../include/event.php:1425 ../../include/connections.php:754 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1426 ../../include/connections.php:728 -#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:796 -#: ../../Zotlabs/Module/Connedit.php:919 +#: ../../include/event.php:1426 ../../include/connections.php:755 +#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:810 +#: ../../Zotlabs/Module/Connedit.php:743 msgid "Work" msgstr "" -#: ../../include/event.php:1427 ../../include/connections.php:729 +#: ../../include/event.php:1427 ../../include/connections.php:756 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1428 ../../include/connections.php:730 +#: ../../include/event.php:1428 ../../include/connections.php:757 msgid "Work, Fax" msgstr "" #: ../../include/event.php:1429 ../../include/event.php:1436 -#: ../../include/selectors.php:60 ../../include/selectors.php:77 -#: ../../include/selectors.php:115 ../../include/selectors.php:151 -#: ../../include/connections.php:731 ../../include/connections.php:738 -#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:797 -#: ../../Zotlabs/Module/Connedit.php:920 -#: ../../Zotlabs/Access/PermissionRoles.php:310 +#: ../../include/selectors.php:64 ../../include/selectors.php:81 +#: ../../include/selectors.php:119 ../../include/selectors.php:155 +#: ../../include/connections.php:758 ../../include/connections.php:765 +#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:811 +#: ../../Zotlabs/Module/Connedit.php:744 +#: ../../Zotlabs/Access/PermissionRoles.php:360 msgid "Other" msgstr "" @@ -4328,8 +4293,8 @@ msgstr "" msgid "On" msgstr "" -#: ../../include/features.php:82 ../../include/nav.php:468 -#: ../../include/nav.php:471 ../../Zotlabs/Lib/Apps.php:352 +#: ../../include/features.php:82 ../../include/nav.php:466 +#: ../../include/nav.php:469 ../../Zotlabs/Lib/Apps.php:350 msgid "Calendar" msgstr "" @@ -4349,7 +4314,7 @@ msgstr "" msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:349 +#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:347 msgid "Channel Home" msgstr "" @@ -4421,7 +4386,7 @@ msgstr "" msgid "Ability to reply on selected comment" msgstr "" -#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:353 +#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:351 msgid "Directory" msgstr "" @@ -4521,7 +4486,7 @@ msgid "Change channels directly from within the navigation dropdown menu" msgstr "" #: ../../include/features.php:290 ../../Zotlabs/Widget/Notifications.php:16 -#: ../../Zotlabs/Module/Connections.php:333 +#: ../../Zotlabs/Module/Connections.php:338 msgid "Network" msgstr "" @@ -4593,8 +4558,8 @@ msgstr "" msgid "Ability to display only posts that you've interacted on" msgstr "" -#: ../../include/features.php:368 ../../include/nav.php:449 -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:351 +#: ../../include/features.php:368 ../../include/nav.php:447 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:349 msgid "Photos" msgstr "" @@ -4606,7 +4571,7 @@ msgstr "" msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:382 ../../Zotlabs/Lib/Apps.php:369 +#: ../../include/features.php:382 ../../Zotlabs/Lib/Apps.php:367 msgid "Profiles" msgstr "" @@ -4634,7 +4599,7 @@ msgstr "" msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/security.php:607 +#: ../../include/security.php:629 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." @@ -4645,11 +4610,11 @@ msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1103 -#: ../../Zotlabs/Module/Photos.php:1219 ../../Zotlabs/Lib/ThreadItem.php:826 +#: ../../Zotlabs/Module/Photos.php:1219 ../../Zotlabs/Lib/ThreadItem.php:850 msgid "Comment" msgstr "" -#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:535 +#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:559 #, php-format msgid "%s show all" msgstr "" @@ -4705,7 +4670,7 @@ msgstr "" msgid "Rate This Channel (this is public)" msgstr "" -#: ../../include/js_strings.php:20 ../../Zotlabs/Module/Connedit.php:872 +#: ../../include/js_strings.php:20 msgid "Rating" msgstr "" @@ -4722,8 +4687,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" #: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:52 -#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Profiles.php:511 -#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Profiles.php:480 +#: ../../Zotlabs/Module/Profiles.php:750 ../../Zotlabs/Module/Locs.php:121 msgid "Location" msgstr "" @@ -4777,12 +4742,12 @@ msgstr "" msgid "Pinned" msgstr "" -#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:473 +#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:497 msgid "Pin to the top" msgstr "" #: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:155 -#: ../../Zotlabs/Lib/ThreadItem.php:473 +#: ../../Zotlabs/Lib/ThreadItem.php:497 msgid "Unpin from the top" msgstr "" @@ -4989,8 +4954,8 @@ msgid "Help:" msgstr "" #: ../../include/help.php:118 ../../include/help.php:126 -#: ../../include/nav.php:178 ../../include/nav.php:317 -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:354 +#: ../../include/nav.php:176 ../../include/nav.php:315 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:352 msgid "Help" msgstr "" @@ -5015,7 +4980,7 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:198 ../../Zotlabs/Module/Profile_photo.php:261 +#: ../../include/photos.php:198 ../../Zotlabs/Module/Profile_photo.php:275 #: ../../Zotlabs/Module/Cover_photo.php:241 msgid "Unable to process image" msgstr "" @@ -5034,7 +4999,7 @@ msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:722 ../../include/nav.php:452 +#: ../../include/photos.php:722 ../../include/nav.php:450 msgid "Photo Albums" msgstr "" @@ -5140,7 +5105,7 @@ msgstr "" #: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:432 #: ../../Zotlabs/Module/Directory.php:437 -#: ../../Zotlabs/Module/Connections.php:382 +#: ../../Zotlabs/Module/Connections.php:398 msgid "Find" msgstr "" @@ -5221,206 +5186,194 @@ msgstr "" msgid "Manage your channels" msgstr "" -#: ../../include/nav.php:101 ../../include/group.php:327 -#: ../../include/acl_selectors.php:87 -#: ../../Zotlabs/Widget/Activity_filter.php:88 -#: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:152 -#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:370 -msgid "Privacy Groups" -msgstr "" - -#: ../../include/nav.php:101 -msgid "Manage your privacy groups" -msgstr "" - -#: ../../include/nav.php:103 ../../Zotlabs/Widget/Settings_menu.php:61 +#: ../../include/nav.php:101 ../../Zotlabs/Widget/Settings_menu.php:66 #: ../../Zotlabs/Widget/Newmember.php:53 #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:345 +#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:343 msgid "Settings" msgstr "" -#: ../../include/nav.php:103 +#: ../../include/nav.php:101 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:109 ../../include/nav.php:139 -#: ../../include/nav.php:160 ../../boot.php:1727 +#: ../../include/nav.php:107 ../../include/nav.php:137 +#: ../../include/nav.php:158 ../../boot.php:1737 msgid "Logout" msgstr "" -#: ../../include/nav.php:109 ../../include/nav.php:139 +#: ../../include/nav.php:107 ../../include/nav.php:137 msgid "End this session" msgstr "" -#: ../../include/nav.php:112 +#: ../../include/nav.php:110 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:115 ../../include/channel.php:1523 -#: ../../Zotlabs/Module/Profiles.php:832 +#: ../../include/nav.php:113 ../../include/channel.php:1530 +#: ../../Zotlabs/Module/Profiles.php:851 msgid "Edit Profiles" msgstr "" -#: ../../include/nav.php:115 +#: ../../include/nav.php:113 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:117 ../../Zotlabs/Widget/Newmember.php:35 +#: ../../include/nav.php:115 ../../Zotlabs/Widget/Newmember.php:35 msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:124 ../../include/nav.php:128 -#: ../../Zotlabs/Lib/Apps.php:342 ../../boot.php:1728 +#: ../../include/nav.php:122 ../../include/nav.php:126 +#: ../../Zotlabs/Lib/Apps.php:340 ../../boot.php:1738 msgid "Login" msgstr "" -#: ../../include/nav.php:124 ../../include/nav.php:128 +#: ../../include/nav.php:122 ../../include/nav.php:126 msgid "Sign in" msgstr "" -#: ../../include/nav.php:158 +#: ../../include/nav.php:156 msgid "Take me home" msgstr "" -#: ../../include/nav.php:160 +#: ../../include/nav.php:158 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:165 ../../Zotlabs/Module/Register.php:542 -#: ../../boot.php:1705 +#: ../../include/nav.php:163 ../../Zotlabs/Module/Register.php:542 +#: ../../boot.php:1715 msgid "Register" msgstr "" -#: ../../include/nav.php:165 +#: ../../include/nav.php:163 msgid "Create an account" msgstr "" -#: ../../include/nav.php:178 +#: ../../include/nav.php:176 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:192 +#: ../../include/nav.php:190 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:198 ../../Zotlabs/Widget/Admin.php:55 +#: ../../include/nav.php:196 ../../Zotlabs/Widget/Admin.php:55 msgid "Admin" msgstr "" -#: ../../include/nav.php:198 +#: ../../include/nav.php:196 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:321 ../../Zotlabs/Widget/Messages.php:28 +#: ../../include/nav.php:319 ../../Zotlabs/Widget/Messages.php:28 #: ../../Zotlabs/Widget/Notifications.php:166 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:854 +#: ../../Zotlabs/Module/Defperms.php:254 msgid "Loading" msgstr "" -#: ../../include/nav.php:326 +#: ../../include/nav.php:324 msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:327 +#: ../../include/nav.php:325 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:333 ../../Zotlabs/Lib/Apps.php:329 +#: ../../include/nav.php:331 ../../Zotlabs/Lib/Apps.php:327 msgid "Apps" msgstr "" -#: ../../include/nav.php:334 +#: ../../include/nav.php:332 msgid "Channel Apps" msgstr "" -#: ../../include/nav.php:335 +#: ../../include/nav.php:333 msgid "System Apps" msgstr "" -#: ../../include/nav.php:336 +#: ../../include/nav.php:334 msgid "Pinned Apps" msgstr "" -#: ../../include/nav.php:337 +#: ../../include/nav.php:335 msgid "Featured Apps" msgstr "" -#: ../../include/nav.php:426 ../../Zotlabs/Module/Admin/Channels.php:154 +#: ../../include/nav.php:424 ../../Zotlabs/Module/Admin/Channels.php:154 msgid "Channel" msgstr "" -#: ../../include/nav.php:429 +#: ../../include/nav.php:427 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:439 ../../Zotlabs/Module/Help.php:83 +#: ../../include/nav.php:437 ../../Zotlabs/Module/Help.php:83 msgid "About" msgstr "" -#: ../../include/nav.php:442 +#: ../../include/nav.php:440 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:457 ../../Zotlabs/Widget/Notifications.php:101 -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/nav.php:455 ../../Zotlabs/Widget/Notifications.php:101 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:344 #: ../../Zotlabs/Storage/Browser.php:351 msgid "Files" msgstr "" -#: ../../include/nav.php:460 +#: ../../include/nav.php:458 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:482 ../../include/nav.php:485 -#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:336 +#: ../../include/nav.php:480 ../../include/nav.php:483 +#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:334 msgid "Chatrooms" msgstr "" -#: ../../include/nav.php:495 ../../Zotlabs/Module/Bookmarks.php:90 -#: ../../Zotlabs/Lib/Apps.php:335 +#: ../../include/nav.php:493 ../../Zotlabs/Module/Bookmarks.php:90 +#: ../../Zotlabs/Lib/Apps.php:333 msgid "Bookmarks" msgstr "" -#: ../../include/nav.php:498 +#: ../../include/nav.php:496 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:506 ../../Zotlabs/Module/Cards.php:205 -#: ../../Zotlabs/Lib/Apps.php:332 +#: ../../include/nav.php:504 ../../Zotlabs/Module/Cards.php:205 +#: ../../Zotlabs/Lib/Apps.php:330 msgid "Cards" msgstr "" -#: ../../include/nav.php:509 +#: ../../include/nav.php:507 msgid "View Cards" msgstr "" -#: ../../include/nav.php:517 ../../Zotlabs/Module/Articles.php:223 -#: ../../Zotlabs/Lib/Apps.php:331 +#: ../../include/nav.php:515 ../../Zotlabs/Module/Articles.php:223 +#: ../../Zotlabs/Lib/Apps.php:329 msgid "Articles" msgstr "" -#: ../../include/nav.php:520 +#: ../../include/nav.php:518 msgid "View Articles" msgstr "" -#: ../../include/nav.php:529 ../../Zotlabs/Module/Webpages.php:249 -#: ../../Zotlabs/Lib/Apps.php:347 +#: ../../include/nav.php:527 ../../Zotlabs/Module/Webpages.php:249 +#: ../../Zotlabs/Lib/Apps.php:345 msgid "Webpages" msgstr "" -#: ../../include/nav.php:532 +#: ../../include/nav.php:530 msgid "View Webpages" msgstr "" -#: ../../include/nav.php:541 ../../Zotlabs/Widget/Wiki_list.php:15 +#: ../../include/nav.php:539 ../../Zotlabs/Widget/Wiki_list.php:15 #: ../../Zotlabs/Module/Wiki.php:203 msgid "Wikis" msgstr "" -#: ../../include/nav.php:544 ../../Zotlabs/Lib/Apps.php:348 +#: ../../include/nav.php:542 ../../Zotlabs/Lib/Apps.php:346 msgid "Wiki" msgstr "" @@ -5441,7 +5394,7 @@ msgid "Failed authentication" msgstr "" #: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:51 -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:752 msgid "Miscellaneous" msgstr "" @@ -5457,7 +5410,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:238 ../../boot.php:2742 +#: ../../include/datetime.php:238 ../../boot.php:2751 msgid "never" msgstr "" @@ -5539,12 +5492,12 @@ msgid "Summary: " msgstr "" #: ../../include/cdav.php:158 ../../include/cdav.php:159 -#: ../../include/cdav.php:167 ../../include/conversation.php:1217 +#: ../../include/cdav.php:167 ../../include/conversation.php:1231 #: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Pinned.php:268 #: ../../Zotlabs/Widget/Portfolio.php:95 #: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:799 -#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/Activity.php:1657 -#: ../../Zotlabs/Lib/Apps.php:1148 ../../Zotlabs/Lib/Apps.php:1232 +#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/Activity.php:1656 +#: ../../Zotlabs/Lib/Apps.php:1146 ../../Zotlabs/Lib/Apps.php:1230 msgid "Unknown" msgstr "" @@ -5564,7 +5517,7 @@ msgstr "" msgid "Name: " msgstr "" -#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:178 +#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:184 msgid "channel" msgstr "" @@ -5594,7 +5547,7 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:502 +#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:526 msgid "This is an unsaved preview" msgstr "" @@ -5644,50 +5597,52 @@ msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:181 +#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:204 msgid "Select" msgstr "" #: ../../include/conversation.php:730 ../../include/conversation.php:784 -#: ../../Zotlabs/Module/Article_edit.php:128 +#: ../../Zotlabs/Module/Tokens.php:295 +#: ../../Zotlabs/Module/Article_edit.php:128 ../../Zotlabs/Module/Group.php:251 #: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Oauth.php:172 #: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1055 #: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Webpages.php:254 #: ../../Zotlabs/Module/Admin/Accounts.php:320 #: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Blocks.php:162 +#: ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Permcats.php:232 +#: ../../Zotlabs/Module/Contactedit.php:660 ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Connections.php:329 -#: ../../Zotlabs/Module/Photos.php:1185 ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Module/Oauth2.php:193 ../../Zotlabs/Module/Thing.php:269 -#: ../../Zotlabs/Module/Connedit.php:653 ../../Zotlabs/Module/Connedit.php:925 -#: ../../Zotlabs/Lib/Apps.php:598 ../../Zotlabs/Lib/ThreadItem.php:171 -#: ../../Zotlabs/Storage/Browser.php:384 +#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Photos.php:1185 +#: ../../Zotlabs/Module/Profiles.php:816 ../../Zotlabs/Module/Oauth2.php:193 +#: ../../Zotlabs/Module/Thing.php:269 ../../Zotlabs/Module/Connedit.php:540 +#: ../../Zotlabs/Module/Connedit.php:749 ../../Zotlabs/Lib/Apps.php:596 +#: ../../Zotlabs/Lib/ThreadItem.php:194 ../../Zotlabs/Storage/Browser.php:384 msgid "Delete" msgstr "" -#: ../../include/conversation.php:736 ../../Zotlabs/Lib/ThreadItem.php:274 +#: ../../include/conversation.php:736 ../../Zotlabs/Lib/ThreadItem.php:297 msgid "Toggle Star Status" msgstr "" -#: ../../include/conversation.php:742 ../../Zotlabs/Lib/ThreadItem.php:103 +#: ../../include/conversation.php:742 msgid "Private Message" msgstr "" #: ../../include/conversation.php:751 ../../Zotlabs/Widget/Pinned.php:88 -#: ../../Zotlabs/Lib/ThreadItem.php:285 +#: ../../Zotlabs/Lib/ThreadItem.php:308 msgid "Message signature validated" msgstr "" #: ../../include/conversation.php:752 ../../Zotlabs/Widget/Pinned.php:89 -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:309 msgid "Message signature incorrect" msgstr "" #: ../../include/conversation.php:783 #: ../../Zotlabs/Module/Admin/Accounts.php:318 -#: ../../Zotlabs/Module/Connections.php:343 +#: ../../Zotlabs/Module/Connections.php:349 +#: ../../Zotlabs/Module/Connections.php:400 msgid "Approve" msgstr "" @@ -5705,19 +5660,19 @@ msgid "Filed under:" msgstr "" #: ../../include/conversation.php:817 ../../Zotlabs/Widget/Pinned.php:132 -#: ../../Zotlabs/Lib/ThreadItem.php:430 +#: ../../Zotlabs/Lib/ThreadItem.php:454 #, php-format msgid "from %s" msgstr "" #: ../../include/conversation.php:820 ../../Zotlabs/Widget/Pinned.php:135 -#: ../../Zotlabs/Lib/ThreadItem.php:433 +#: ../../Zotlabs/Lib/ThreadItem.php:457 #, php-format msgid "last edited: %s" msgstr "" #: ../../include/conversation.php:821 ../../Zotlabs/Widget/Pinned.php:136 -#: ../../Zotlabs/Lib/ThreadItem.php:434 +#: ../../Zotlabs/Lib/ThreadItem.php:458 #, php-format msgid "Expires: %s" msgstr "" @@ -5727,7 +5682,7 @@ msgid "View in context" msgstr "" #: ../../include/conversation.php:838 ../../Zotlabs/Module/Photos.php:1085 -#: ../../Zotlabs/Lib/ThreadItem.php:503 +#: ../../Zotlabs/Lib/ThreadItem.php:527 msgid "Please wait" msgstr "" @@ -5739,7 +5694,7 @@ msgstr "" msgid "Loading..." msgstr "" -#: ../../include/conversation.php:943 ../../Zotlabs/Lib/ThreadItem.php:302 +#: ../../include/conversation.php:943 ../../Zotlabs/Lib/ThreadItem.php:325 msgid "Conversation Features" msgstr "" @@ -5759,464 +5714,464 @@ msgstr "" msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1096 ../../Zotlabs/Module/Connedit.php:614 +#: ../../include/conversation.php:1098 ../../Zotlabs/Module/Connedit.php:501 msgid "Recent Activity" msgstr "" -#: ../../include/conversation.php:1106 ../../include/connections.php:110 -#: ../../include/channel.php:1603 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../include/conversation.php:1110 ../../include/connections.php:112 +#: ../../include/channel.php:1610 ../../Zotlabs/Widget/Suggestions.php:46 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:369 -#: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:69 +#: ../../Zotlabs/Module/Connections.php:356 ../../Zotlabs/Module/Suggest.php:69 msgid "Connect" msgstr "" -#: ../../include/conversation.php:1116 +#: ../../include/conversation.php:1122 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1126 +#: ../../include/conversation.php:1134 #: ../../Zotlabs/Module/Admin/Accounts.php:347 msgid "Message" msgstr "" -#: ../../include/conversation.php:1136 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../include/conversation.php:1146 ../../Zotlabs/Module/Pubsites.php:35 msgid "Ratings" msgstr "" -#: ../../include/conversation.php:1146 ../../Zotlabs/Module/Poke.php:197 -#: ../../Zotlabs/Lib/Apps.php:357 +#: ../../include/conversation.php:1158 ../../Zotlabs/Module/Poke.php:197 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Poke" msgstr "" -#: ../../include/conversation.php:1268 +#: ../../include/conversation.php:1282 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1268 +#: ../../include/conversation.php:1282 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:1286 #, 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:1274 +#: ../../include/conversation.php:1288 #, 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:1280 +#: ../../include/conversation.php:1294 msgid "and" msgstr "" -#: ../../include/conversation.php:1283 +#: ../../include/conversation.php:1297 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1284 +#: ../../include/conversation.php:1298 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1284 +#: ../../include/conversation.php:1298 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1468 +#: ../../include/conversation.php:1482 msgid "Toggle poll" msgstr "" -#: ../../include/conversation.php:1469 +#: ../../include/conversation.php:1483 msgid "Option" msgstr "" -#: ../../include/conversation.php:1470 +#: ../../include/conversation.php:1484 msgid "Add option" msgstr "" -#: ../../include/conversation.php:1471 +#: ../../include/conversation.php:1485 msgid "Minutes" msgstr "" -#: ../../include/conversation.php:1471 +#: ../../include/conversation.php:1485 msgid "Hours" msgstr "" -#: ../../include/conversation.php:1471 +#: ../../include/conversation.php:1485 msgid "Days" msgstr "" -#: ../../include/conversation.php:1472 +#: ../../include/conversation.php:1486 msgid "Allow multiple answers" msgstr "" -#: ../../include/conversation.php:1482 +#: ../../include/conversation.php:1496 msgid "Summary (optional)" msgstr "" -#: ../../include/conversation.php:1754 ../../include/taxonomy.php:670 -#: ../../include/channel.php:1766 ../../Zotlabs/Module/Photos.php:1142 -#: ../../Zotlabs/Lib/ThreadItem.php:243 +#: ../../include/conversation.php:1768 ../../include/taxonomy.php:670 +#: ../../include/channel.php:1774 ../../Zotlabs/Module/Photos.php:1142 +#: ../../Zotlabs/Lib/ThreadItem.php:266 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1757 ../../Zotlabs/Module/Photos.php:1147 -#: ../../Zotlabs/Lib/ThreadItem.php:248 +#: ../../include/conversation.php:1771 ../../Zotlabs/Module/Photos.php:1147 +#: ../../Zotlabs/Lib/ThreadItem.php:271 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1760 +#: ../../include/conversation.php:1774 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1763 +#: ../../include/conversation.php:1777 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1766 +#: ../../include/conversation.php:1780 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1769 +#: ../../include/conversation.php:1783 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1772 +#: ../../include/conversation.php:1786 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1775 +#: ../../include/conversation.php:1789 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: ../../include/selectors.php:18 -msgid "Profile to assign new connections" +#: ../../include/selectors.php:17 +msgid "Select a profile to assign to this contact" msgstr "" -#: ../../include/selectors.php:41 +#: ../../include/selectors.php:45 msgid "Frequently" msgstr "" -#: ../../include/selectors.php:42 +#: ../../include/selectors.php:46 msgid "Hourly" msgstr "" -#: ../../include/selectors.php:43 +#: ../../include/selectors.php:47 msgid "Twice daily" msgstr "" -#: ../../include/selectors.php:44 +#: ../../include/selectors.php:48 msgid "Daily" msgstr "" -#: ../../include/selectors.php:45 +#: ../../include/selectors.php:49 msgid "Weekly" msgstr "" -#: ../../include/selectors.php:46 +#: ../../include/selectors.php:50 msgid "Monthly" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Currently Male" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Currently Female" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Mostly Male" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Mostly Female" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Transgender" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Intersex" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Transsexual" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1711 +#: ../../include/selectors.php:64 ../../include/channel.php:1719 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1713 +#: ../../include/selectors.php:64 ../../include/channel.php:1721 msgid "Non-specific" msgstr "" -#: ../../include/selectors.php:60 +#: ../../include/selectors.php:64 msgid "Undecided" msgstr "" -#: ../../include/selectors.php:96 ../../include/selectors.php:115 +#: ../../include/selectors.php:100 ../../include/selectors.php:119 msgid "Males" msgstr "" -#: ../../include/selectors.php:96 ../../include/selectors.php:115 +#: ../../include/selectors.php:100 ../../include/selectors.php:119 msgid "Females" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Gay" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Lesbian" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "No Preference" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Bisexual" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Autosexual" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Abstinent" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Virgin" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Deviant" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Fetish" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Oodles" msgstr "" -#: ../../include/selectors.php:96 +#: ../../include/selectors.php:100 msgid "Nonsexual" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "Single" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Lonely" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Available" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Unavailable" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Has crush" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Infatuated" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "Dating" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Unfaithful" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Sex Addict" msgstr "" -#: ../../include/selectors.php:134 ../../include/channel.php:457 -#: ../../include/channel.php:460 ../../Zotlabs/Widget/Affinity.php:32 -#: ../../Zotlabs/Module/Settings/Channel.php:71 -#: ../../Zotlabs/Module/Settings/Channel.php:75 -#: ../../Zotlabs/Module/Settings/Channel.php:76 -#: ../../Zotlabs/Module/Settings/Channel.php:79 -#: ../../Zotlabs/Module/Settings/Channel.php:90 -#: ../../Zotlabs/Module/Connedit.php:710 +#: ../../include/selectors.php:138 ../../include/channel.php:456 +#: ../../include/channel.php:459 ../../Zotlabs/Widget/Affinity.php:32 +#: ../../Zotlabs/Module/Contactedit.php:297 +#: ../../Zotlabs/Module/Connedit.php:581 msgid "Friends" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Friends/Benefits" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Casual" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Engaged" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "Married" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Imaginarily married" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Partners" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "Cohabiting" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Common law" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Happy" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Not looking" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Swinger" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Betrayed" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "Separated" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Unstable" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "Divorced" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Imaginarily divorced" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "Widowed" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Uncertain" msgstr "" -#: ../../include/selectors.php:134 ../../include/selectors.php:151 +#: ../../include/selectors.php:138 ../../include/selectors.php:155 msgid "It's complicated" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Don't care" msgstr "" -#: ../../include/selectors.php:134 +#: ../../include/selectors.php:138 msgid "Ask me" msgstr "" -#: ../../include/connections.php:134 +#: ../../include/connections.php:136 msgid "New window" msgstr "" -#: ../../include/connections.php:135 +#: ../../include/connections.php:137 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/group.php:23 ../../Zotlabs/Lib/Group.php:28 +#: ../../include/group.php:23 msgid "" "A deleted group with this name was revived. Existing item permissions " "<strong>may</strong> apply to this group and any future members. If this is " "not what you intended, please create another group with a different name." msgstr "" -#: ../../include/group.php:271 ../../Zotlabs/Lib/Group.php:270 +#: ../../include/group.php:271 msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/group.php:305 ../../Zotlabs/Lib/AccessList.php:311 -#: ../../Zotlabs/Lib/Group.php:302 +#: ../../include/group.php:305 msgid "edit" msgstr "" -#: ../../include/group.php:328 ../../Zotlabs/Lib/Group.php:325 +#: ../../include/group.php:327 ../../include/acl_selectors.php:87 +#: ../../Zotlabs/Widget/Activity_filter.php:88 +#: ../../Zotlabs/Module/Group.php:143 ../../Zotlabs/Lib/Apps.php:368 +msgid "Privacy Groups" +msgstr "" + +#: ../../include/group.php:328 msgid "Edit group" msgstr "" -#: ../../include/group.php:329 ../../Zotlabs/Lib/Group.php:326 -msgid "Add privacy group" +#: ../../include/group.php:329 +msgid "Manage privacy groups" msgstr "" -#: ../../include/group.php:330 ../../Zotlabs/Lib/Group.php:327 +#: ../../include/group.php:330 msgid "Channels not in any privacy group" msgstr "" #: ../../include/group.php:332 ../../Zotlabs/Widget/Savedsearch.php:84 -#: ../../Zotlabs/Lib/AccessList.php:336 ../../Zotlabs/Lib/Group.php:329 msgid "add" msgstr "" @@ -6249,7 +6204,7 @@ msgstr "" msgid "wants" msgstr "" -#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:341 msgid "like" msgstr "" @@ -6257,7 +6212,7 @@ msgstr "" msgid "likes" msgstr "" -#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:319 +#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:342 msgid "dislike" msgstr "" @@ -6269,100 +6224,106 @@ msgstr "" msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1243 +#: ../../include/items.php:1246 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1245 +#: ../../include/items.php:1248 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1247 +#: ../../include/items.php:1250 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1249 +#: ../../include/items.php:1252 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1251 +#: ../../include/items.php:1254 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1253 +#: ../../include/items.php:1256 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1255 +#: ../../include/items.php:1258 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1257 +#: ../../include/items.php:1260 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4249 ../../Zotlabs/Module/Group.php:62 -#: ../../Zotlabs/Module/Group.php:212 +#: ../../include/items.php:3322 ../../Zotlabs/Module/Share.php:104 +#: ../../Zotlabs/Lib/Activity.php:2310 +#, php-format +msgid "🔁 Repeated %1$s's %2$s" +msgstr "" + +#: ../../include/items.php:4381 ../../Zotlabs/Module/Group.php:62 +#: ../../Zotlabs/Module/Group.php:206 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:4265 +#: ../../include/items.php:4397 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4272 +#: ../../include/items.php:4404 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4282 ../../Zotlabs/Module/Connedit.php:852 +#: ../../include/items.php:4414 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4284 +#: ../../include/items.php:4416 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4630 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4762 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "" -#: ../../include/items.php:4631 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4763 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../include/items.php:4632 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4764 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "" -#: ../../include/items.php:4633 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4765 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../include/items.php:4635 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4767 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../include/items.php:4637 +#: ../../include/items.php:4769 msgid "profile photo" msgstr "" -#: ../../include/items.php:4829 +#: ../../include/items.php:4962 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4829 +#: ../../include/items.php:4962 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4829 +#: ../../include/items.php:4962 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -6464,8 +6425,8 @@ msgid "please come back" msgstr "" #: ../../include/photo/photo_driver.php:434 -#: ../../Zotlabs/Module/Profile_photo.php:147 -#: ../../Zotlabs/Module/Profile_photo.php:284 +#: ../../Zotlabs/Module/Profile_photo.php:167 +#: ../../Zotlabs/Module/Profile_photo.php:337 msgid "Profile Photos" msgstr "" @@ -6546,22 +6507,22 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/menu.php:120 ../../include/channel.php:1523 -#: ../../include/channel.php:1527 ../../Zotlabs/Widget/Cdav.php:138 +#: ../../include/menu.php:120 ../../include/channel.php:1530 +#: ../../include/channel.php:1534 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:97 -#: ../../Zotlabs/Module/Group.php:251 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Oauth.php:171 ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:252 #: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Blocks.php:160 #: ../../Zotlabs/Module/Editblock.php:114 #: ../../Zotlabs/Module/Editlayout.php:114 -#: ../../Zotlabs/Module/Connections.php:321 -#: ../../Zotlabs/Module/Connections.php:363 -#: ../../Zotlabs/Module/Connections.php:383 ../../Zotlabs/Module/Menu.php:176 +#: ../../Zotlabs/Module/Connections.php:329 +#: ../../Zotlabs/Module/Connections.php:378 +#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Module/Menu.php:176 #: ../../Zotlabs/Module/Oauth2.php:192 ../../Zotlabs/Module/Thing.php:268 #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:381 -#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:597 -#: ../../Zotlabs/Lib/ThreadItem.php:149 +#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:595 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "Edit" msgstr "" @@ -6640,230 +6601,231 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/channel.php:46 +#: ../../include/channel.php:48 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/channel.php:79 +#: ../../include/channel.php:81 msgid "Empty name" msgstr "" -#: ../../include/channel.php:82 +#: ../../include/channel.php:84 msgid "Name too long" msgstr "" -#: ../../include/channel.php:199 +#: ../../include/channel.php:201 msgid "No account identifier" msgstr "" -#: ../../include/channel.php:211 ../../Zotlabs/Module/Register.php:95 +#: ../../include/channel.php:213 ../../Zotlabs/Module/Register.php:95 msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:225 ../../include/channel.php:661 +#: ../../include/channel.php:227 ../../include/channel.php:659 #: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/channel.php:230 ../../include/channel.php:666 +#: ../../include/channel.php:232 ../../include/channel.php:664 #: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/channel.php:290 +#: ../../include/channel.php:292 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/channel.php:393 +#: ../../include/channel.php:402 msgid "Default Profile" msgstr "" -#: ../../include/channel.php:594 ../../include/channel.php:683 +#: ../../include/channel.php:592 ../../include/channel.php:681 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1367 +#: ../../include/channel.php:1373 msgid "Requested channel is not available" msgstr "" -#: ../../include/channel.php:1516 ../../Zotlabs/Module/Profiles.php:730 +#: ../../include/channel.php:1523 ../../Zotlabs/Module/Profiles.php:744 msgid "Change profile photo" msgstr "" -#: ../../include/channel.php:1524 +#: ../../include/channel.php:1531 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1542 ../../Zotlabs/Module/Profiles.php:822 +#: ../../include/channel.php:1549 ../../Zotlabs/Module/Profiles.php:841 msgid "Profile Image" msgstr "" -#: ../../include/channel.php:1545 +#: ../../include/channel.php:1552 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1546 ../../Zotlabs/Module/Profiles.php:727 -#: ../../Zotlabs/Module/Profiles.php:826 +#: ../../include/channel.php:1553 ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:845 msgid "Edit visibility" msgstr "" -#: ../../include/channel.php:1622 ../../include/channel.php:1750 +#: ../../include/channel.php:1629 ../../include/channel.php:1758 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1623 ../../include/channel.php:1794 +#: ../../include/channel.php:1630 ../../include/channel.php:1802 msgid "Status:" msgstr "" -#: ../../include/channel.php:1624 ../../include/channel.php:1818 +#: ../../include/channel.php:1631 ../../include/channel.php:1826 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1625 +#: ../../include/channel.php:1632 ../../include/channel.php:1828 +#: ../../Zotlabs/Module/Directory.php:366 +msgid "Hometown:" +msgstr "" + +#: ../../include/channel.php:1633 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1678 +#: ../../include/channel.php:1686 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1709 +#: ../../include/channel.php:1717 msgid "Trans" msgstr "" -#: ../../include/channel.php:1748 ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../include/channel.php:1756 msgid "Full Name:" msgstr "" -#: ../../include/channel.php:1755 +#: ../../include/channel.php:1763 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1779 +#: ../../include/channel.php:1787 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1780 +#: ../../include/channel.php:1788 msgid "j F" msgstr "" -#: ../../include/channel.php:1787 +#: ../../include/channel.php:1795 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1791 ../../Zotlabs/Module/Directory.php:348 +#: ../../include/channel.php:1799 ../../Zotlabs/Module/Directory.php:348 msgid "Age:" msgstr "" -#: ../../include/channel.php:1800 +#: ../../include/channel.php:1808 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1812 +#: ../../include/channel.php:1820 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1816 +#: ../../include/channel.php:1824 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1820 ../../Zotlabs/Module/Directory.php:366 -msgid "Hometown:" -msgstr "" - -#: ../../include/channel.php:1822 +#: ../../include/channel.php:1830 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1824 +#: ../../include/channel.php:1832 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1826 ../../Zotlabs/Module/Directory.php:368 +#: ../../include/channel.php:1834 ../../Zotlabs/Module/Directory.php:368 msgid "About:" msgstr "" -#: ../../include/channel.php:1828 +#: ../../include/channel.php:1836 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1830 +#: ../../include/channel.php:1838 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1832 +#: ../../include/channel.php:1840 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1834 +#: ../../include/channel.php:1842 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1836 +#: ../../include/channel.php:1844 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1838 +#: ../../include/channel.php:1846 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1840 +#: ../../include/channel.php:1848 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1842 +#: ../../include/channel.php:1850 msgid "Television:" msgstr "" -#: ../../include/channel.php:1844 +#: ../../include/channel.php:1852 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1846 +#: ../../include/channel.php:1854 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1848 +#: ../../include/channel.php:1856 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1850 +#: ../../include/channel.php:1858 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1871 ../../Zotlabs/Module/Profperm.php:113 -#: ../../Zotlabs/Lib/Apps.php:368 +#: ../../include/channel.php:1879 ../../Zotlabs/Module/Profperm.php:113 +#: ../../Zotlabs/Lib/Apps.php:366 msgid "Profile" msgstr "" -#: ../../include/channel.php:1873 +#: ../../include/channel.php:1881 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:1874 +#: ../../include/channel.php:1882 msgid "Export" msgstr "" -#: ../../include/channel.php:2313 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2335 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "" -#: ../../include/channel.php:2588 ../../Zotlabs/Module/Rmagic.php:96 -#: ../../boot.php:1729 +#: ../../include/channel.php:2610 ../../Zotlabs/Module/Rmagic.php:96 +#: ../../boot.php:1739 msgid "Remote Authentication" msgstr "" -#: ../../include/channel.php:2589 ../../Zotlabs/Module/Rmagic.php:97 +#: ../../include/channel.php:2611 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../include/channel.php:2590 ../../Zotlabs/Module/Rmagic.php:98 +#: ../../include/channel.php:2612 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "" -#: ../../include/channel.php:2748 ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../include/channel.php:2770 ../../Zotlabs/Module/Admin/Accounts.php:184 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -6889,6 +6851,7 @@ msgid "Forums" msgstr "" #: ../../include/acl_selectors.php:136 +#: ../../Zotlabs/Module/Settings/Privacy.php:56 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" msgstr "" @@ -6975,6 +6938,14 @@ msgstr "" msgid "Stream Order" msgstr "" +#: ../../Zotlabs/Widget/Tokens.php:35 +msgid "Add new guest" +msgstr "" + +#: ../../Zotlabs/Widget/Tokens.php:43 ../../Zotlabs/Module/Lockview.php:226 +msgid "Guest access" +msgstr "" + #: ../../Zotlabs/Widget/Archive.php:43 msgid "Archives" msgstr "" @@ -7011,7 +6982,7 @@ msgstr "" #: ../../Zotlabs/Widget/Album.php:97 ../../Zotlabs/Widget/Cdav.php:146 #: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110 #: ../../Zotlabs/Module/Embedphotos.php:189 -#: ../../Zotlabs/Module/Profile_photo.php:500 +#: ../../Zotlabs/Module/Profile_photo.php:543 #: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:692 #: ../../Zotlabs/Storage/Browser.php:540 msgid "Upload" @@ -7025,59 +6996,39 @@ msgstr "" msgid "Public Hubs" msgstr "" -#: ../../Zotlabs/Widget/Conversations.php:15 -msgid "Received Messages" -msgstr "" - -#: ../../Zotlabs/Widget/Conversations.php:19 -msgid "Sent Messages" -msgstr "" - -#: ../../Zotlabs/Widget/Conversations.php:23 -msgid "Conversations" -msgstr "" - -#: ../../Zotlabs/Widget/Conversations.php:33 -msgid "No messages." -msgstr "" - -#: ../../Zotlabs/Widget/Conversations.php:53 -msgid "Delete conversation" -msgstr "" - #: ../../Zotlabs/Widget/Chatroom_members.php:11 msgid "Chat Members" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206 +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:229 msgid "I will attend" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206 +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:229 msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206 +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:229 msgid "I might attend" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220 +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:243 msgid "I agree" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220 +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:243 msgid "I disagree" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220 +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:243 msgid "I abstain" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330 +#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:353 msgid "Share This" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330 +#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:353 msgid "share" msgstr "" @@ -7087,19 +7038,19 @@ msgid "View %s's profile - %s" msgstr "" #: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Widget/Messages.php:99 -#: ../../Zotlabs/Lib/ThreadItem.php:414 +#: ../../Zotlabs/Lib/ThreadItem.php:438 msgid "via" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:141 ../../Zotlabs/Lib/ThreadItem.php:445 +#: ../../Zotlabs/Widget/Pinned.php:141 ../../Zotlabs/Lib/ThreadItem.php:469 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:142 ../../Zotlabs/Lib/ThreadItem.php:447 +#: ../../Zotlabs/Widget/Pinned.php:142 ../../Zotlabs/Lib/ThreadItem.php:471 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Lib/ThreadItem.php:471 +#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Lib/ThreadItem.php:495 msgid "Pinned post" msgstr "" @@ -7153,8 +7104,8 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Cdav.php:1387 #: ../../Zotlabs/Module/Webpages.php:251 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159 -#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Menu.php:182 -#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Layouts.php:185 +#: ../../Zotlabs/Module/Profiles.php:814 ../../Zotlabs/Module/Menu.php:182 +#: ../../Zotlabs/Module/Connedit.php:747 ../../Zotlabs/Module/Layouts.php:185 #: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538 msgid "Create" msgstr "" @@ -7223,11 +7174,15 @@ msgstr "" msgid "Channel settings" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:44 +msgid "Privacy settings" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:51 msgid "Display settings" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:53 +#: ../../Zotlabs/Widget/Settings_menu.php:58 msgid "Manage locations" msgstr "" @@ -7284,20 +7239,17 @@ msgstr "" msgid "Toggle personal notes" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:13 -msgid "Private Mail Menu" +#: ../../Zotlabs/Widget/Permcats.php:35 +msgid "Add new role" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:15 -msgid "Combined View" +#: ../../Zotlabs/Widget/Permcats.php:86 +#: ../../Zotlabs/Module/Contactedit.php:409 +msgid "Contact roles" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:20 -msgid "Inbox" -msgstr "" - -#: ../../Zotlabs/Widget/Mailmenu.php:25 -msgid "Outbox" +#: ../../Zotlabs/Widget/Permcats.php:87 +msgid "Role members" msgstr "" #: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58 @@ -7323,7 +7275,7 @@ msgstr "" msgid "Security" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:364 +#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:362 msgid "Features" msgstr "" @@ -7466,6 +7418,14 @@ msgstr "" msgid "Import Calendar" msgstr "" +#: ../../Zotlabs/Widget/Privacygroups.php:38 +msgid "Add new group" +msgstr "" + +#: ../../Zotlabs/Widget/Privacygroups.php:47 +msgid "Privacy groups" +msgstr "" + #: ../../Zotlabs/Widget/Rating.php:51 msgid "Rating Tools" msgstr "" @@ -7482,7 +7442,7 @@ msgstr "" msgid "Click to show more" msgstr "" -#: ../../Zotlabs/Widget/Follow.php:22 +#: ../../Zotlabs/Widget/Follow.php:22 ../../Zotlabs/Module/Connections.php:368 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" @@ -7606,21 +7566,29 @@ msgstr "" msgid "Saved" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:708 +#: ../../Zotlabs/Widget/Affinity.php:30 +#: ../../Zotlabs/Module/Contactedit.php:295 +#: ../../Zotlabs/Module/Connedit.php:579 msgid "Me" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:709 +#: ../../Zotlabs/Widget/Affinity.php:31 +#: ../../Zotlabs/Module/Contactedit.php:296 +#: ../../Zotlabs/Module/Connedit.php:580 msgid "Family" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:711 +#: ../../Zotlabs/Widget/Affinity.php:33 +#: ../../Zotlabs/Module/Contactedit.php:298 +#: ../../Zotlabs/Module/Connedit.php:582 msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:34 ../../Zotlabs/Module/Connections.php:97 +#: ../../Zotlabs/Widget/Affinity.php:34 +#: ../../Zotlabs/Module/Contactedit.php:299 +#: ../../Zotlabs/Module/Connections.php:97 #: ../../Zotlabs/Module/Connections.php:111 -#: ../../Zotlabs/Module/Connedit.php:712 +#: ../../Zotlabs/Module/Connedit.php:583 msgid "All" msgstr "" @@ -7723,7 +7691,7 @@ msgid "New registrations notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:147 -#: ../../Zotlabs/Module/Pubstream.php:100 ../../Zotlabs/Lib/Apps.php:381 +#: ../../Zotlabs/Module/Pubstream.php:100 ../../Zotlabs/Lib/Apps.php:379 msgid "Public Stream" msgstr "" @@ -7739,76 +7707,50 @@ msgstr "" msgid "Sorry, you have got no notifications at the moment" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:39 +#: ../../Zotlabs/Module/Tokens.php:94 #, php-format msgid "This channel is limited to %d tokens" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:45 +#: ../../Zotlabs/Module/Tokens.php:100 msgid "Name and Password are required." msgstr "" -#: ../../Zotlabs/Module/Tokens.php:85 +#: ../../Zotlabs/Module/Tokens.php:215 msgid "Token saved." msgstr "" -#: ../../Zotlabs/Module/Tokens.php:131 +#: ../../Zotlabs/Module/Tokens.php:261 msgid "" "Use this form to create temporary access identifiers to share things with " "non-members. These identities may be used in Access Control Lists and " "visitors may login using these credentials to access private content." msgstr "" -#: ../../Zotlabs/Module/Tokens.php:133 -msgid "" -"You may also provide <em>dropbox</em> style access links to friends and " -"associates by adding the Login Password to any specific site URL as shown. " -"Examples:" +#: ../../Zotlabs/Module/Tokens.php:274 +msgid "Please select a role for this guest!" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:168 -msgid "Guest Access Tokens" +#: ../../Zotlabs/Module/Tokens.php:287 +msgid "Select a role for this guest" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:175 +#: ../../Zotlabs/Module/Tokens.php:288 ../../Zotlabs/Lib/Apps.php:373 +msgid "Guest Access" +msgstr "" + +#: ../../Zotlabs/Module/Tokens.php:291 msgid "Login Name" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:176 +#: ../../Zotlabs/Module/Tokens.php:292 msgid "Login Password" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:177 +#: ../../Zotlabs/Module/Tokens.php:293 msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:178 ../../Zotlabs/Module/Connedit.php:892 -msgid "Their Settings" -msgstr "" - -#: ../../Zotlabs/Module/Tokens.php:179 ../../Zotlabs/Module/Permcats.php:120 -#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:893 -msgid "My Settings" -msgstr "" - -#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122 -#: ../../Zotlabs/Module/Defperms.php:263 ../../Zotlabs/Module/Connedit.php:888 -msgid "inherited" -msgstr "" - -#: ../../Zotlabs/Module/Tokens.php:184 ../../Zotlabs/Module/Permcats.php:125 -#: ../../Zotlabs/Module/Defperms.php:268 ../../Zotlabs/Module/Connedit.php:895 -msgid "Individual Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Tokens.php:185 ../../Zotlabs/Module/Permcats.php:126 -#: ../../Zotlabs/Module/Connedit.php:896 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." -msgstr "" - #: ../../Zotlabs/Module/Article_edit.php:17 #: ../../Zotlabs/Module/Article_edit.php:33 #: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33 @@ -7845,29 +7787,29 @@ msgstr "" msgid "Can not move folder \"%s\" into itself." msgstr "" -#: ../../Zotlabs/Module/Network.php:107 +#: ../../Zotlabs/Module/Network.php:106 msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:156 +#: ../../Zotlabs/Module/Network.php:155 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:168 ../../Zotlabs/Module/Channel.php:229 +#: ../../Zotlabs/Module/Network.php:167 ../../Zotlabs/Module/Channel.php:232 msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:209 ../../Zotlabs/Module/Channel.php:264 +#: ../../Zotlabs/Module/Network.php:208 ../../Zotlabs/Module/Channel.php:267 #: ../../Zotlabs/Module/Hq.php:114 ../../Zotlabs/Module/Pubstream.php:90 #: ../../Zotlabs/Module/Display.php:87 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Network.php:243 +#: ../../Zotlabs/Module/Network.php:242 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:253 +#: ../../Zotlabs/Module/Network.php:252 msgid "Privacy group: " msgstr "" @@ -8684,27 +8626,27 @@ msgstr "" msgid "View" msgstr "" -#: ../../Zotlabs/Module/Channel.php:136 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Channel.php:139 ../../Zotlabs/Module/Hcard.php:37 #: ../../Zotlabs/Module/Profile.php:62 msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Channel.php:143 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Channel.php:146 ../../Zotlabs/Module/Hcard.php:44 #: ../../Zotlabs/Module/Profile.php:69 msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:156 ../../Zotlabs/Module/Channel.php:178 +#: ../../Zotlabs/Module/Channel.php:159 ../../Zotlabs/Module/Channel.php:181 #: ../../Zotlabs/Module/Hq.php:39 ../../Zotlabs/Module/Pubstream.php:47 #: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Oep.php:83 msgid "Malformed message id." msgstr "" -#: ../../Zotlabs/Module/Channel.php:214 +#: ../../Zotlabs/Module/Channel.php:217 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:491 ../../Zotlabs/Module/Display.php:358 +#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:358 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -8730,64 +8672,60 @@ msgstr "" msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Group.php:46 +#: ../../Zotlabs/Module/Group.php:47 msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Group.php:49 +#: ../../Zotlabs/Module/Group.php:50 msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:81 +#: ../../Zotlabs/Module/Group.php:82 msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Group.php:141 -msgid "Add Group" +#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:301 +msgid "Post to this group by default" msgstr "" -#: ../../Zotlabs/Module/Group.php:145 -msgid "Privacy group name" +#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:302 +msgid "Add new contacts to this group by default" msgstr "" -#: ../../Zotlabs/Module/Group.php:146 ../../Zotlabs/Module/Group.php:255 -msgid "Members are visible to other channels" +#: ../../Zotlabs/Module/Group.php:146 +msgid "Privacy group name" msgstr "" -#: ../../Zotlabs/Module/Group.php:154 ../../Zotlabs/Module/Help.php:84 -msgid "Members" +#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249 +msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Group.php:181 +#: ../../Zotlabs/Module/Group.php:175 msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Group.php:184 +#: ../../Zotlabs/Module/Group.php:178 msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:250 +#: ../../Zotlabs/Module/Group.php:244 #, php-format msgid "Privacy Group: %s" msgstr "" -#: ../../Zotlabs/Module/Group.php:252 +#: ../../Zotlabs/Module/Group.php:246 msgid "Privacy group name: " msgstr "" -#: ../../Zotlabs/Module/Group.php:257 -msgid "Delete Group" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:268 +#: ../../Zotlabs/Module/Group.php:262 msgid "Group members" msgstr "" -#: ../../Zotlabs/Module/Group.php:270 +#: ../../Zotlabs/Module/Group.php:264 msgid "Not in this group" msgstr "" -#: ../../Zotlabs/Module/Group.php:302 +#: ../../Zotlabs/Module/Group.php:296 msgid "Click a channel to toggle membership" msgstr "" @@ -8865,9 +8803,9 @@ msgstr "" #: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:135 #: ../../Zotlabs/Module/Cdav.php:1052 ../../Zotlabs/Module/Cdav.php:1388 #: ../../Zotlabs/Module/Admin/Addons.php:457 -#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:58 -#: ../../Zotlabs/Module/Oauth2.php:142 ../../Zotlabs/Module/Connedit.php:924 -#: ../../Zotlabs/Lib/Apps.php:542 +#: ../../Zotlabs/Module/Profiles.php:815 ../../Zotlabs/Module/Oauth2.php:58 +#: ../../Zotlabs/Module/Oauth2.php:142 ../../Zotlabs/Module/Connedit.php:748 +#: ../../Zotlabs/Lib/Apps.php:540 msgid "Update" msgstr "" @@ -8938,7 +8876,7 @@ msgstr "" msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:465 +#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:466 msgid "Unable to locate original post." msgstr "" @@ -9039,57 +8977,57 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Like.php:106 +#: ../../Zotlabs/Module/Like.php:112 msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Like.php:112 +#: ../../Zotlabs/Module/Like.php:118 msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Like.php:113 +#: ../../Zotlabs/Module/Like.php:119 msgid "" "Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" "\"register\">register as a new $Projectname member</a> to continue." msgstr "" -#: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192 -#: ../../Zotlabs/Module/Like.php:230 +#: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198 +#: ../../Zotlabs/Module/Like.php:236 msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Like.php:207 +#: ../../Zotlabs/Module/Like.php:213 msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Like.php:253 +#: ../../Zotlabs/Module/Like.php:259 msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Like.php:289 +#: ../../Zotlabs/Module/Like.php:295 msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:475 +#: ../../Zotlabs/Module/Like.php:481 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:477 +#: ../../Zotlabs/Module/Like.php:483 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:479 +#: ../../Zotlabs/Module/Like.php:485 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:586 +#: ../../Zotlabs/Module/Like.php:592 msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Like.php:587 +#: ../../Zotlabs/Module/Like.php:593 msgid "Thank you." msgstr "" @@ -9199,73 +9137,73 @@ msgid "" "Could not fetch calendar resource. The selected calendar might be disabled." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:733 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:788 -#: ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Connedit.php:735 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:790 -#: ../../Zotlabs/Module/Connedit.php:913 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:804 +#: ../../Zotlabs/Module/Connedit.php:737 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:791 -#: ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:805 +#: ../../Zotlabs/Module/Connedit.php:738 msgid "Website" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1379 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792 -#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Locs.php:122 +#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:806 +#: ../../Zotlabs/Module/Connedit.php:739 ../../Zotlabs/Module/Locs.php:122 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:793 -#: ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:807 +#: ../../Zotlabs/Module/Connedit.php:740 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Connedit.php:921 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:812 +#: ../../Zotlabs/Module/Connedit.php:745 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Module/Connedit.php:922 +#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:813 +#: ../../Zotlabs/Module/Connedit.php:746 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:751 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:752 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:753 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:754 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:755 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:756 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:759 -#: ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Connedit.php:757 msgid "Country" msgstr "" @@ -9277,46 +9215,59 @@ msgstr "" msgid "Default Addressbook" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:75 -msgid "Remote privacy information not available." +#: ../../Zotlabs/Module/Lockview.php:100 +msgid "Remote privacy information not available" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:96 -msgid "Visible to:" -msgstr "" - -#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 +#: ../../Zotlabs/Module/Lockview.php:143 ../../Zotlabs/Module/Lockview.php:184 #: ../../Zotlabs/Module/Acl.php:123 msgctxt "acl" msgid "Profile" msgstr "" -#: ../../Zotlabs/Module/Item.php:746 +#: ../../Zotlabs/Module/Lockview.php:154 ../../Zotlabs/Module/Lockview.php:193 +msgid "Privacy group" +msgstr "" + +#: ../../Zotlabs/Module/Lockview.php:214 +#, php-format +msgid "Click to copy link to this ressource for guest %s to clipboard" +msgstr "" + +#: ../../Zotlabs/Module/Lockview.php:214 +msgid "Link copied" +msgstr "" + +#: ../../Zotlabs/Module/Lockview.php:221 +msgid "Access" +msgstr "" + +#: ../../Zotlabs/Module/Item.php:748 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1177 +#: ../../Zotlabs/Module/Item.php:1188 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1320 +#: ../../Zotlabs/Module/Item.php:1331 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1354 +#: ../../Zotlabs/Module/Item.php:1365 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1487 +#: ../../Zotlabs/Module/Item.php:1498 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1494 +#: ../../Zotlabs/Module/Item.php:1505 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1501 +#: ../../Zotlabs/Module/Item.php:1512 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -9347,7 +9298,6 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:532 msgid "(click to open/close)" msgstr "" @@ -9476,6 +9426,10 @@ msgstr "" msgid "Documentation Search" msgstr "" +#: ../../Zotlabs/Module/Help.php:84 +msgid "Members" +msgstr "" + #: ../../Zotlabs/Module/Help.php:85 msgid "Administrators" msgstr "" @@ -9661,11 +9615,6 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2309 -#, php-format -msgid "🔁 Repeated %1$s's %2$s" -msgstr "" - #: ../../Zotlabs/Module/Share.php:120 msgid "Post repeated" msgstr "" @@ -10016,12 +9965,14 @@ msgid "No verified registrations available" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:321 -#: ../../Zotlabs/Module/Connedit.php:621 +#: ../../Zotlabs/Module/Contactedit.php:632 +#: ../../Zotlabs/Module/Connedit.php:508 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:322 -#: ../../Zotlabs/Module/Connedit.php:621 +#: ../../Zotlabs/Module/Contactedit.php:632 +#: ../../Zotlabs/Module/Connedit.php:508 msgid "Unblock" msgstr "" @@ -10301,7 +10252,7 @@ msgid "Advanced examples:" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:457 -#: ../../Zotlabs/Module/Settings/Channel.php:422 +#: ../../Zotlabs/Module/Settings/Channel.php:178 msgid "or" msgstr "" @@ -10436,7 +10387,9 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:512 #: ../../Zotlabs/Module/Admin/Site.php:513 -#: ../../Zotlabs/Module/Connedit.php:877 ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Contactedit.php:423 +#: ../../Zotlabs/Module/Contactedit.php:424 +#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Module/Connedit.php:707 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" @@ -10954,7 +10907,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:542 +#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:540 msgid "Install" msgstr "" @@ -11022,7 +10975,7 @@ msgid "Please enter your password for verification:" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:602 +#: ../../Zotlabs/Module/Settings/Channel.php:277 msgid "Remove Channel" msgstr "" @@ -11162,7 +11115,7 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Manage.php:137 ../../Zotlabs/Module/Profiles.php:833 +#: ../../Zotlabs/Module/Manage.php:137 ../../Zotlabs/Module/Profiles.php:852 #: ../../Zotlabs/Module/Wiki.php:211 msgid "Create New" msgstr "" @@ -11204,26 +11157,67 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:29 +#: ../../Zotlabs/Module/Permcats.php:56 +msgid "Contact role deleted." +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:82 msgid "Permission category name is required." msgstr "" -#: ../../Zotlabs/Module/Permcats.php:48 -msgid "Permission category saved." +#: ../../Zotlabs/Module/Permcats.php:98 ../../Zotlabs/Module/Permcats.php:123 +msgid "Contact role saved." msgstr "" -#: ../../Zotlabs/Module/Permcats.php:78 -msgid "" -"Use this form to create permission rules for various classes of people or " -"connections." +#: ../../Zotlabs/Module/Permcats.php:174 +msgid "Role to assign affected contacts and default role to" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:174 +msgid "Role to assign affected contacts to" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:205 +msgid "Assign this role to" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:207 +msgid "All my contacts" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:218 +msgid "Automatically assign this role to new contacts" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:219 ../../Zotlabs/Lib/Apps.php:378 +msgid "Contact Roles" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:220 +msgid "Role name" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:220 +msgid "System role - not editable" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:221 +msgid "Deleting" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:224 ../../Zotlabs/Module/Defperms.php:262 +#: ../../Zotlabs/Module/Connedit.php:713 +msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:111 ../../Zotlabs/Lib/Apps.php:380 -msgid "Permission Categories" +#: ../../Zotlabs/Module/Permcats.php:226 +msgid "Role Permissions" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:119 -msgid "Permission category name" +#: ../../Zotlabs/Module/Permcats.php:227 +msgid "" +"Some permissions may be inherited from your <a href=\"settings\">channel " +"role</a>, which have higher priority than contact role settings." msgstr "" #: ../../Zotlabs/Module/Email_resend.php:12 @@ -11310,65 +11304,65 @@ msgstr "" msgid "No content available for year" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:167 +#: ../../Zotlabs/Module/Uexport.php:171 msgid "Export Channel" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:169 +#: ../../Zotlabs/Module/Uexport.php:173 msgid "Export channel" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:170 +#: ../../Zotlabs/Module/Uexport.php:174 msgid "" "This will export your identity and social graph into a file which can be " "used to import your channel to a new hub." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:173 +#: ../../Zotlabs/Module/Uexport.php:177 msgid "Export content" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:174 +#: ../../Zotlabs/Module/Uexport.php:178 msgid "" "This will export your posts, direct messages, articles and cards per month " "stored into a zip file per year. Months with no posts will be dismissed." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:176 +#: ../../Zotlabs/Module/Uexport.php:180 msgid "Export wikis" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:177 +#: ../../Zotlabs/Module/Uexport.php:181 msgid "This will export your wikis and wiki pages." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:179 +#: ../../Zotlabs/Module/Uexport.php:183 msgid "Export webpages" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:180 +#: ../../Zotlabs/Module/Uexport.php:184 msgid "This will export your webpages and menus." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:182 +#: ../../Zotlabs/Module/Uexport.php:186 msgid "Export channel calendar" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:183 +#: ../../Zotlabs/Module/Uexport.php:187 msgid "" "This will export your channel calendar events and associated items. CalDAV " "calendars are not included." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:185 +#: ../../Zotlabs/Module/Uexport.php:189 msgid "Export chatrooms" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:186 +#: ../../Zotlabs/Module/Uexport.php:190 msgid "This will export your chatrooms. Chat history is dismissed." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:188 +#: ../../Zotlabs/Module/Uexport.php:192 #, php-format msgid "" "This export can be imported or restored by visiting <a href=\"%1$s\">%2$s</" @@ -11429,18 +11423,8 @@ msgid "Channel name" msgstr "" #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:541 -msgid "Channel role and privacy" -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:178 -msgid "" -"Select a channel permission role compatible with your usage needs and " -"privacy requirements." -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:178 -msgid "Read more about channel permission roles" +#: ../../Zotlabs/Module/Settings/Channel.php:228 +msgid "Channel role" msgstr "" #: ../../Zotlabs/Module/New_channel.php:181 @@ -11475,7 +11459,7 @@ msgstr "" msgid "No service class restrictions found." msgstr "" -#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:356 +#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:354 msgid "Mood" msgstr "" @@ -11629,6 +11613,268 @@ msgstr "" msgid "Repository version (dev)" msgstr "" +#: ../../Zotlabs/Module/Contactedit.php:50 +msgid "Invalid abook_id" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:78 ../../Zotlabs/Module/Defperms.php:67 +#: ../../Zotlabs/Module/Connedit.php:80 +msgid "Could not access contact record." +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:107 +#: ../../Zotlabs/Module/Connedit.php:101 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:192 +#: ../../Zotlabs/Module/Connedit.php:215 +msgid "is now connected to" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:252 +#: ../../Zotlabs/Module/Contactedit.php:401 +#: ../../Zotlabs/Module/Connedit.php:701 +msgid "Contact Tools" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:329 +#: ../../Zotlabs/Module/Connedit.php:622 +msgid "Approve this contact" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:329 +#: ../../Zotlabs/Module/Connedit.php:622 +msgid "Accept contact to allow communication" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:362 +#: ../../Zotlabs/Module/Connedit.php:658 +msgid "Please select a role for this contact!" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:382 +#: ../../Zotlabs/Module/Connedit.php:678 +msgid "This contact is unreachable from this location." +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:383 +#: ../../Zotlabs/Module/Connedit.php:679 +msgid "This contact may be unreachable from other channel locations." +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:385 +#: ../../Zotlabs/Module/Connedit.php:681 +msgid "Location independence is not supported by their network." +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:395 +msgid "View profile" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:397 +#: ../../Zotlabs/Module/Connections.php:405 +msgid "This is a group/forum channel" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:408 +msgid "Select a role for this contact" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:420 +#: ../../Zotlabs/Module/Connedit.php:703 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:422 +#: ../../Zotlabs/Module/Connedit.php:705 +msgid "Custom Filter" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:423 +#: ../../Zotlabs/Module/Connedit.php:706 +msgid "Only import posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:424 +#: ../../Zotlabs/Module/Connedit.php:707 +msgid "Do not import posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:429 +#: ../../Zotlabs/Module/Connedit.php:714 +msgid "Approve contact" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:431 +#: ../../Zotlabs/Module/Connedit.php:717 +msgid "Their" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:432 +#: ../../Zotlabs/Module/Connedit.php:718 +msgid "My" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:449 +msgid "Contact updated" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:449 +msgid "Contact update failed" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:455 +#: ../../Zotlabs/Module/Connections.php:348 +msgid "Approve connection" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:501 +#: ../../Zotlabs/Module/Contactedit.php:511 +msgid "Refresh succeeded" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:504 +msgid "Refresh failed - channel is currently unavailable" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:523 +msgid "Block status updated" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:527 +msgid "Block failed" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:538 +msgid "Ignore status updated" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:542 +msgid "Ignore failed" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:553 +msgid "Archive status updated" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:557 +msgid "Archive failed" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:568 +msgid "Hide status updated" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:572 +msgid "Hide failed" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:607 +msgid "Contact removed" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:611 +msgid "Delete failed" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:621 +#: ../../Zotlabs/Module/Connedit.php:487 +msgid "Refresh Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:622 +#: ../../Zotlabs/Module/Connedit.php:490 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:626 +#: ../../Zotlabs/Module/Connedit.php:494 +msgid "Refresh Photo" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:627 +#: ../../Zotlabs/Module/Connedit.php:497 +msgid "Fetch updated photo" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:634 +#: ../../Zotlabs/Module/Connedit.php:511 +msgid "Block (or Unblock) all communications with this connection" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:635 +#: ../../Zotlabs/Module/Connedit.php:512 +msgid "This connection is blocked!" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:639 +#: ../../Zotlabs/Module/Connedit.php:516 +msgid "Unignore" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:639 +#: ../../Zotlabs/Module/Connections.php:351 +#: ../../Zotlabs/Module/Connedit.php:516 +msgid "Ignore" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:641 +#: ../../Zotlabs/Module/Connedit.php:519 +msgid "Ignore (or Unignore) all inbound communications from this connection" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:642 +#: ../../Zotlabs/Module/Connedit.php:520 +msgid "This connection is ignored!" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:646 +#: ../../Zotlabs/Module/Connedit.php:524 +msgid "Unarchive" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:646 +#: ../../Zotlabs/Module/Connedit.php:524 +msgid "Archive" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:648 +#: ../../Zotlabs/Module/Connedit.php:527 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:649 +#: ../../Zotlabs/Module/Connedit.php:528 +msgid "This connection is archived!" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:532 +msgid "Unhide" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:532 +msgid "Hide" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:655 +#: ../../Zotlabs/Module/Connedit.php:535 +msgid "Hide or Unhide this connection from your other connections" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:656 +#: ../../Zotlabs/Module/Connedit.php:536 +msgid "This connection is hidden!" +msgstr "" + +#: ../../Zotlabs/Module/Contactedit.php:662 +#: ../../Zotlabs/Module/Connedit.php:543 +msgid "Delete this connection" +msgstr "" + #: ../../Zotlabs/Module/Cards.php:110 msgid "Add Card" msgstr "" @@ -11783,101 +12029,89 @@ msgstr "" msgid "Invalid response." msgstr "" -#: ../../Zotlabs/Module/Vote.php:132 +#: ../../Zotlabs/Module/Vote.php:127 msgid "Response submitted. Updates may not appear instantly." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:93 +#: ../../Zotlabs/Module/Profile_photo.php:128 #: ../../Zotlabs/Module/Cover_photo.php:85 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:166 +#: ../../Zotlabs/Module/Profile_photo.php:184 #: ../../Zotlabs/Module/Cover_photo.php:212 msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:296 +#: ../../Zotlabs/Module/Profile_photo.php:350 #: ../../Zotlabs/Module/Cover_photo.php:265 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:315 +#: ../../Zotlabs/Module/Profile_photo.php:370 #: ../../Zotlabs/Module/Cover_photo.php:282 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:379 -#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Profile_photo.php:428 +#: ../../Zotlabs/Module/Profile_photo.php:493 #: ../../Zotlabs/Module/Cover_photo.php:367 #: ../../Zotlabs/Module/Cover_photo.php:382 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:495 -msgid "" -"Your default profile photo is visible to anybody on the internet. Profile " -"photos for alternate profiles will inherit the permissions of the profile" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:495 +#: ../../Zotlabs/Module/Profile_photo.php:540 msgid "" -"Your profile photo is visible to anybody on the internet and may be " +"This profile photo will be visible to anybody on the internet and may be " "distributed to other websites." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:497 -#: ../../Zotlabs/Module/Cover_photo.php:420 -msgid "Upload File:" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:498 -#: ../../Zotlabs/Module/Cover_photo.php:421 -msgid "Select a profile:" +#: ../../Zotlabs/Module/Profile_photo.php:540 +msgid "" +"This profile photo will be visible only to channels with permission to view " +"this profile." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:499 +#: ../../Zotlabs/Module/Profile_photo.php:542 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:499 +#: ../../Zotlabs/Module/Profile_photo.php:542 msgid "Change Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:500 -msgid "Use" +#: ../../Zotlabs/Module/Profile_photo.php:544 +msgid "Reset to default" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:505 -#: ../../Zotlabs/Module/Profile_photo.php:506 +#: ../../Zotlabs/Module/Profile_photo.php:547 +#: ../../Zotlabs/Module/Profile_photo.php:548 #: ../../Zotlabs/Module/Cover_photo.php:426 #: ../../Zotlabs/Module/Cover_photo.php:427 msgid "Use a photo from your albums" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:511 +#: ../../Zotlabs/Module/Profile_photo.php:553 #: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:402 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:516 -#: ../../Zotlabs/Module/Cover_photo.php:438 -msgid "Select existing photo" +#: ../../Zotlabs/Module/Profile_photo.php:558 +msgid "Select existing" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:535 +#: ../../Zotlabs/Module/Profile_photo.php:577 #: ../../Zotlabs/Module/Cover_photo.php:455 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:536 +#: ../../Zotlabs/Module/Profile_photo.php:578 #: ../../Zotlabs/Module/Cover_photo.php:456 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:538 -#: ../../Zotlabs/Module/Cover_photo.php:458 -msgid "Done Editing" +#: ../../Zotlabs/Module/Profile_photo.php:580 +msgid "Done editing" msgstr "" #: ../../Zotlabs/Module/Editblock.php:138 @@ -11892,7 +12126,7 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:185 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:208 msgid "Save to Folder" msgstr "" @@ -11911,25 +12145,25 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:58 #: ../../Zotlabs/Module/Connections.php:116 -#: ../../Zotlabs/Module/Connections.php:274 +#: ../../Zotlabs/Module/Connections.php:282 msgid "Active" msgstr "" #: ../../Zotlabs/Module/Connections.php:63 #: ../../Zotlabs/Module/Connections.php:182 -#: ../../Zotlabs/Module/Connections.php:279 +#: ../../Zotlabs/Module/Connections.php:287 msgid "Blocked" msgstr "" #: ../../Zotlabs/Module/Connections.php:68 #: ../../Zotlabs/Module/Connections.php:189 -#: ../../Zotlabs/Module/Connections.php:278 +#: ../../Zotlabs/Module/Connections.php:286 msgid "Ignored" msgstr "" #: ../../Zotlabs/Module/Connections.php:73 #: ../../Zotlabs/Module/Connections.php:203 -#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Connections.php:285 msgid "Hidden" msgstr "" @@ -11976,74 +12210,70 @@ msgstr "" msgid "Show all connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:275 +#: ../../Zotlabs/Module/Connections.php:283 msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Connections.php:276 +#: ../../Zotlabs/Module/Connections.php:284 msgid "Archived" msgstr "" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:288 msgid "Not connected at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:327 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:328 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:322 +#: ../../Zotlabs/Module/Connections.php:330 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:331 +#: ../../Zotlabs/Module/Connections.php:336 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:336 +#: ../../Zotlabs/Module/Connections.php:341 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Connections.php:343 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:340 +#: ../../Zotlabs/Module/Connections.php:346 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:342 -msgid "Approve connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:344 +#: ../../Zotlabs/Module/Connections.php:350 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:345 -#: ../../Zotlabs/Module/Connedit.php:629 -msgid "Ignore" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:346 +#: ../../Zotlabs/Module/Connections.php:352 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:352 +#: ../../Zotlabs/Module/Connections.php:358 msgid "Connect at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:380 +#: ../../Zotlabs/Module/Connections.php:395 +#: ../../Zotlabs/Module/Connedit.php:686 +msgid "Contact role" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:396 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:381 -msgid "Connections search" +#: ../../Zotlabs/Module/Connections.php:397 +msgid "Contact search" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:196 @@ -12055,10 +12285,26 @@ msgstr "" msgid "Your cover photo may be visible to anybody on the internet" msgstr "" +#: ../../Zotlabs/Module/Cover_photo.php:420 +msgid "Upload File:" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:421 +msgid "Select a profile:" +msgstr "" + #: ../../Zotlabs/Module/Cover_photo.php:422 msgid "Change Cover Photo" msgstr "" +#: ../../Zotlabs/Module/Cover_photo.php:438 +msgid "Select existing photo" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:458 +msgid "Done Editing" +msgstr "" + #: ../../Zotlabs/Module/Photos.php:80 msgid "Page owner information could not be retrieved." msgstr "" @@ -12185,21 +12431,21 @@ msgstr "" msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:341 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:319 +#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:342 msgid "I don't like this (toggle)" msgstr "" #: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217 -#: ../../Zotlabs/Lib/ThreadItem.php:824 +#: ../../Zotlabs/Lib/ThreadItem.php:848 msgid "This is you" msgstr "" #: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1150 -#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../Zotlabs/Lib/ThreadItem.php:251 +#: ../../Zotlabs/Lib/ThreadItem.php:262 ../../Zotlabs/Lib/ThreadItem.php:274 msgid "View all" msgstr "" @@ -12215,12 +12461,12 @@ msgstr "" msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:491 +#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:515 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:492 +#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:516 msgctxt "noun" msgid "Dislikes" msgstr "" @@ -12249,7 +12495,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1737 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1747 msgid "Password Reset" msgstr "" @@ -12316,8 +12562,8 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186 -#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661 +#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:214 +#: ../../Zotlabs/Module/Profiles.php:642 msgid "Profile not found." msgstr "" @@ -12341,227 +12587,239 @@ msgstr "" msgid "Profile unavailable to export." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:254 +#: ../../Zotlabs/Module/Profiles.php:225 msgid "Profile Name is required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:461 +#: ../../Zotlabs/Module/Profiles.php:430 msgid "Marital Status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:465 +#: ../../Zotlabs/Module/Profiles.php:434 msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:788 msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:789 msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:446 ../../Zotlabs/Module/Profiles.php:796 msgid "Work/Employment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:480 +#: ../../Zotlabs/Module/Profiles.php:449 msgid "Religion" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:484 +#: ../../Zotlabs/Module/Profiles.php:453 msgid "Political Views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:492 +#: ../../Zotlabs/Module/Profiles.php:461 msgid "Sexual Preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:496 +#: ../../Zotlabs/Module/Profiles.php:465 msgid "Homepage" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:500 +#: ../../Zotlabs/Module/Profiles.php:469 msgid "Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:596 +#: ../../Zotlabs/Module/Profiles.php:577 msgid "Profile updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:680 -msgid "Hide your connections list from viewers of this profile" +#: ../../Zotlabs/Module/Profiles.php:672 +msgid "Hide my connections from viewers of this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:685 +msgid "Publish my default profile in the network directory" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:693 +msgid "Suggest me as a potential contact to new members" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:697 +msgid "Reveal my online status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:728 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:746 msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Profiles.php:748 msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Personal" +#: ../../Zotlabs/Module/Profiles.php:749 +msgid "Basic" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:737 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Relationship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:758 msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:761 msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:763 msgid "This is your default profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:751 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Short title/description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Maximal 190 characters" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:755 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Profiles.php:772 msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:764 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:764 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:768 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:784 msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:790 msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:791 msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:792 msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:793 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:794 msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:795 msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:797 msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:798 msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:799 msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Profiles.php:801 msgid "Communications" msgstr "" @@ -12720,6 +12978,10 @@ msgstr "" msgid "Invite template" msgstr "" +#: ../../Zotlabs/Module/Invite.php:542 +msgid "Subject:" +msgstr "" + #: ../../Zotlabs/Module/Invite.php:548 msgid "Here you may enter personal notes to the recipient(s)" msgstr "" @@ -12797,407 +13059,272 @@ msgstr "" msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:331 -msgid "Nobody except yourself" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:332 -msgid "Only those you specifically allow" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:333 -msgid "Approved connections" +#: ../../Zotlabs/Module/Settings/Channel.php:103 +#: ../../Zotlabs/Module/Settings/Channel.php:212 +msgid "Please select a channel role" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:334 -msgid "Any connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:335 -msgid "Anybody on this website" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:336 -msgid "Anybody in this network" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:337 -msgid "Anybody authenticated" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:338 -msgid "Anybody on the internet" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:413 -msgid "Publish your default profile in the network directory" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:418 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:431 +#: ../../Zotlabs/Module/Settings/Channel.php:189 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:434 +#: ../../Zotlabs/Module/Settings/Channel.php:192 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:474 -msgid "Automatic membership approval" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:474 -#: ../../Zotlabs/Module/Defperms.php:254 -msgid "" -"If enabled, connection requests will be approved without your interaction" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:497 +#: ../../Zotlabs/Module/Settings/Channel.php:223 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:230 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:506 -msgid "Email Address:" +#: ../../Zotlabs/Module/Settings/Channel.php:231 +msgid "Channel timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 -msgid "Your Timezone:" +#: ../../Zotlabs/Module/Settings/Channel.php:232 +msgid "Default post location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:508 -msgid "Default Post Location:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:232 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:509 -msgid "Use Browser Location:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:511 -msgid "Adult Content" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:511 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" +#: ../../Zotlabs/Module/Settings/Channel.php:233 +msgid "Use browser location" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 -msgid "Security and Privacy Settings" +#: ../../Zotlabs/Module/Settings/Channel.php:234 +msgid "Adult content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:515 -msgid "Your permissions are already configured. Click to view/adjust" +#: ../../Zotlabs/Module/Settings/Channel.php:234 +msgid "This channel frequently or regularly publishes adult content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:517 -msgid "Hide my online presence" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:517 -msgid "Prevents displaying in your profile that you are online" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:519 -msgid "Simple Privacy Settings:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:520 -msgid "" -"Very Public - <em>extremely permissive (should be used with caution)</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:521 -msgid "" -"Typical - <em>default public, privacy when desired (similar to social " -"network permissions but with improved privacy)</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:522 -msgid "Private - <em>default private, never open or public</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:523 -msgid "Blocked - <em>default blocked to/from everybody</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:525 -msgid "Allow others to tag your posts" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:525 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:527 -msgid "Channel Permission Limits" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:529 -msgid "Expire other channel content after this many days" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:529 -msgid "0 or blank to use the website limit." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:529 -#, php-format -msgid "This website expires after %d days." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:529 -msgid "This website does not expire imported content." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:529 -msgid "The website limit takes precedence if lower than your limit." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:235 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:235 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:531 -msgid "Default Privacy Group" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:533 -msgid "Use my default audience setting for the type of object published" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:542 -msgid "Default permissions category" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:548 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:548 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:236 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:237 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:238 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:239 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:240 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:241 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:242 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:243 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:244 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:245 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:246 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:247 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:248 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:249 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:250 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:251 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:252 msgid "Unseen stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:253 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:254 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 -#: ../../Zotlabs/Module/Settings/Channel.php:578 -#: ../../Zotlabs/Module/Settings/Channel.php:579 -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:254 +#: ../../Zotlabs/Module/Settings/Channel.php:259 +#: ../../Zotlabs/Module/Settings/Channel.php:260 +#: ../../Zotlabs/Module/Settings/Channel.php:261 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:255 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:256 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:257 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:257 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:258 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:259 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:260 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:261 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:262 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:263 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:264 msgid "Unseen public stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:265 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:266 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:267 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:267 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:268 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:269 msgid "Mark all notices of the thread read if a notice is clicked" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:269 msgid "If no, only the clicked notice will be marked read" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:270 msgid "" "Desktop notifications are unavailable because the required browser " "permission has not been granted" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:271 msgid "Grant permission" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:272 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:272 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 -msgid "Advanced Account/Page Type Settings" +#: ../../Zotlabs/Module/Settings/Channel.php:275 +msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 -msgid "Change the behaviour of this account for special situations" +#: ../../Zotlabs/Module/Settings/Channel.php:275 +#: ../../Zotlabs/Module/Settings/Channel.php:276 +msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:599 -msgid "Miscellaneous Settings" +#: ../../Zotlabs/Module/Settings/Channel.php:276 +msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 -msgid "Default photo upload folder" +#: ../../Zotlabs/Module/Settings/Channel.php:278 +msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 -#: ../../Zotlabs/Module/Settings/Channel.php:601 -msgid "%Y - current year, %m - current month" +#: ../../Zotlabs/Module/Settings/Channel.php:279 +msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:601 -msgid "Default file upload folder" +#: ../../Zotlabs/Module/Settings/Channel.php:279 +msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 -msgid "Remove this channel." +#: ../../Zotlabs/Module/Settings/Channel.php:279 +#, php-format +msgid "This website expires after %d days." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:279 +msgid "This website does not expire imported content." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:279 +msgid "The website limit takes precedence if lower than your limit." msgstr "" #: ../../Zotlabs/Module/Settings/Account.php:21 @@ -13379,10 +13506,90 @@ msgstr "" msgid "Photos Settings" msgstr "" +#: ../../Zotlabs/Module/Settings/Profiles.php:41 +msgid "Default profile for new contacts" +msgstr "" + #: ../../Zotlabs/Module/Settings/Profiles.php:49 msgid "Profiles Settings" msgstr "" +#: ../../Zotlabs/Module/Settings/Privacy.php:39 +msgid "Privacy settings updated." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:57 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:58 +msgid "Approved connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:59 +msgid "Any connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:60 +msgid "Anybody on this website" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:61 +msgid "Anybody in this network" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:62 +msgid "Anybody authenticated" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:63 +msgid "Anybody on the internet" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:73 +msgid "" +"Advise: set to \"Anybody on the internet\" and use privacy groups to " +"restrict access" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:109 +msgid "Privacy Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:114 +msgid "Advanced configuration" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:116 +msgid "Proceed with caution" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:117 +msgid "" +"Changing advanced configuration settings can impact your, and your contacts " +"channels functionality and security." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:118 +msgid "Accept the risk and continue" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:120 +msgid "Automatically approve new contacts" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:121 +msgid "Opt-out of search engine indexing" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:122 +msgid "Group actor" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Privacy.php:122 +msgid "Allow this channel to act as a forum" +msgstr "" + #: ../../Zotlabs/Module/Settings/Conversation.php:23 msgid "Settings saved." msgstr "" @@ -13483,37 +13690,46 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:90 -msgid "Could not access contact record." -msgstr "" - -#: ../../Zotlabs/Module/Defperms.php:253 ../../Zotlabs/Module/Connedit.php:852 +#: ../../Zotlabs/Module/Defperms.php:252 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:254 ../../Zotlabs/Module/Connedit.php:853 +#: ../../Zotlabs/Module/Defperms.php:253 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:854 +#: ../../Zotlabs/Module/Defperms.php:253 +msgid "" +"If enabled, connection requests will be approved without your interaction" +msgstr "" + +#: ../../Zotlabs/Module/Defperms.php:254 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:855 +#: ../../Zotlabs/Module/Defperms.php:255 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:260 ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Defperms.php:259 ../../Zotlabs/Module/Connedit.php:700 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -#: ../../Zotlabs/Module/Defperms.php:261 +#: ../../Zotlabs/Module/Defperms.php:260 msgid "Automatic approval settings" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:269 +#: ../../Zotlabs/Module/Defperms.php:264 +msgid "My Settings" +msgstr "" + +#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:720 +msgid "Individual Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Defperms.php:268 msgid "" "Some individual permissions may have been preset or locked based on your " "channel type and privacy settings." @@ -13760,6 +13976,10 @@ msgstr "" msgid "Error downloading wiki: " msgstr "" +#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Storage/Browser.php:404 +msgid "Download" +msgstr "" + #: ../../Zotlabs/Module/Wiki.php:213 msgid "Wiki name" msgstr "" @@ -13887,244 +14107,113 @@ msgid "" "hours." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:121 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:262 +#: ../../Zotlabs/Module/Connedit.php:171 msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:264 +#: ../../Zotlabs/Module/Connedit.php:173 msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:307 -msgid "is now connected to" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:432 +#: ../../Zotlabs/Module/Connedit.php:320 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:480 +#: ../../Zotlabs/Module/Connedit.php:368 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503 -#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521 -#: ../../Zotlabs/Module/Connedit.php:534 +#: ../../Zotlabs/Module/Connedit.php:382 ../../Zotlabs/Module/Connedit.php:391 +#: ../../Zotlabs/Module/Connedit.php:400 ../../Zotlabs/Module/Connedit.php:409 +#: ../../Zotlabs/Module/Connedit.php:422 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:553 +#: ../../Zotlabs/Module/Connedit.php:441 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:596 +#: ../../Zotlabs/Module/Connedit.php:483 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:600 -msgid "Refresh Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:603 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:607 -msgid "Refresh Photo" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:610 -msgid "Fetch updated photo" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:617 +#: ../../Zotlabs/Module/Connedit.php:504 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:624 -msgid "Block (or Unblock) all communications with this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:625 -msgid "This connection is blocked!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:629 -msgid "Unignore" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:632 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:633 -msgid "This connection is ignored!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:637 -msgid "Unarchive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:637 -msgid "Archive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:640 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:641 -msgid "This connection is archived!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:645 -msgid "Unhide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:645 -msgid "Hide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:648 -msgid "Hide or Unhide this connection from your other connections" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:649 -msgid "This connection is hidden!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:656 -msgid "Delete this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:664 +#: ../../Zotlabs/Module/Connedit.php:550 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:667 +#: ../../Zotlabs/Module/Connedit.php:553 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:678 -msgid "Open Individual Permissions section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:701 +#: ../../Zotlabs/Module/Connedit.php:572 msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:704 +#: ../../Zotlabs/Module/Connedit.php:575 msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:741 +#: ../../Zotlabs/Module/Connedit.php:612 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:744 +#: ../../Zotlabs/Module/Connedit.php:615 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:781 -msgid "Approve this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:781 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:786 +#: ../../Zotlabs/Module/Connedit.php:626 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:789 +#: ../../Zotlabs/Module/Connedit.php:629 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:792 +#: ../../Zotlabs/Module/Connedit.php:632 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:840 -msgid "This connection is unreachable from this location." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:841 -msgid "This connection may be unreachable from other channel locations." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:843 -msgid "Location independence is not supported by their network." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:849 -msgid "" -"This connection is unreachable from this location. Location independence is " -"not supported by their network." +#: ../../Zotlabs/Module/Connedit.php:685 +#, php-format +msgid "Contact: %s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:853 -msgid "Connection requests will be approved without your interaction" +#: ../../Zotlabs/Module/Connedit.php:687 +msgid "Manage contact roles" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:862 -msgid "This connection's primary address is" +#: ../../Zotlabs/Module/Connedit.php:694 +msgid "This contacts's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:863 +#: ../../Zotlabs/Module/Connedit.php:695 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:869 -msgid "Connection Tools" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:871 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:873 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:874 ../../Zotlabs/Module/Connedit.php:879 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:876 -msgid "Custom Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:877 -msgid "Only import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:878 -msgid "Do not import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:880 -msgid "This information is public!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:885 -msgid "Connection Pending Approval" +#: ../../Zotlabs/Module/Connedit.php:710 +msgid "Contact Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:890 +#: ../../Zotlabs/Module/Connedit.php:715 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:897 +#: ../../Zotlabs/Module/Connedit.php:721 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:722 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -14132,11 +14221,11 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:898 +#: ../../Zotlabs/Module/Connedit.php:723 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Connedit.php:731 msgid "Details" msgstr "" @@ -14151,7 +14240,7 @@ msgid "System Notifications" msgstr "" #: ../../Zotlabs/Module/Notifications.php:111 -#: ../../Zotlabs/Lib/ThreadItem.php:484 +#: ../../Zotlabs/Lib/ThreadItem.php:508 msgid "Mark all seen" msgstr "" @@ -14227,7 +14316,7 @@ msgstr "" msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Lib/Apps.php:374 +#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Lib/Apps.php:372 msgid "Channel Sources" msgstr "" @@ -14307,79 +14396,49 @@ msgstr "" msgid "Or enter new bookmark folder name" msgstr "" -#: ../../Zotlabs/Lib/AccessList.php:28 +#: ../../Zotlabs/Lib/AccessList.php:26 msgid "" -"A deleted list with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this list and any future members. If this is " -"not what you intended, please create another list with a different name." -msgstr "" - -#: ../../Zotlabs/Lib/AccessList.php:286 -msgid "Add new connections to this access list" -msgstr "" - -#: ../../Zotlabs/Lib/AccessList.php:331 -msgid "Lists" -msgstr "" - -#: ../../Zotlabs/Lib/AccessList.php:332 -msgid "Edit list" +"A deleted privacy group with this name was revived. Existing item " +"permissions <strong>may</strong> apply to this privacy group and any future " +"members. If this is not what you intended, please create another privacy " +"group with a different name." msgstr "" -#: ../../Zotlabs/Lib/AccessList.php:333 -msgid "Create new list" +#: ../../Zotlabs/Lib/AccessList.php:265 +msgid "Select a privacy group" msgstr "" -#: ../../Zotlabs/Lib/AccessList.php:334 -msgid "Channels not in any access list" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:82 +#: ../../Zotlabs/Lib/Permcat.php:84 msgctxt "permcat" -msgid "default" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:133 -msgctxt "permcat" -msgid "follower" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:137 -msgctxt "permcat" -msgid "contributor" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:141 -msgctxt "permcat" -msgid "publisher" +msgid "Default" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2286 +#: ../../Zotlabs/Lib/Activity.php:2287 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2289 +#: ../../Zotlabs/Lib/Activity.php:2290 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2295 +#: ../../Zotlabs/Lib/Activity.php:2296 #, php-format msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2298 +#: ../../Zotlabs/Lib/Activity.php:2299 #, php-format msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2301 +#: ../../Zotlabs/Lib/Activity.php:2302 #, php-format msgid "May attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2304 +#: ../../Zotlabs/Lib/Activity.php:2305 #, php-format msgid "May not attend %s's event" msgstr "" @@ -14711,7 +14770,7 @@ msgstr "" msgid "Cannot connect to yourself." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:271 +#: ../../Zotlabs/Lib/Connect.php:272 msgid "error saving data" msgstr "" @@ -14743,119 +14802,115 @@ msgstr "" msgid "Wiki files deleted successfully" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:330 +#: ../../Zotlabs/Lib/Apps.php:328 msgid "Affinity Tool" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:333 +#: ../../Zotlabs/Lib/Apps.php:331 msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:337 +#: ../../Zotlabs/Lib/Apps.php:335 msgid "Content Filter" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:340 +#: ../../Zotlabs/Lib/Apps.php:338 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:341 +#: ../../Zotlabs/Lib/Apps.php:339 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:343 +#: ../../Zotlabs/Lib/Apps.php:341 msgid "Channel Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:344 +#: ../../Zotlabs/Lib/Apps.php:342 msgid "Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:355 +#: ../../Zotlabs/Lib/Apps.php:353 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:358 +#: ../../Zotlabs/Lib/Apps.php:356 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:360 +#: ../../Zotlabs/Lib/Apps.php:358 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:361 +#: ../../Zotlabs/Lib/Apps.php:359 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:362 +#: ../../Zotlabs/Lib/Apps.php:360 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:363 +#: ../../Zotlabs/Lib/Apps.php:361 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:366 ../../Zotlabs/Storage/Browser.php:407 +#: ../../Zotlabs/Lib/Apps.php:364 ../../Zotlabs/Storage/Browser.php:407 msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:369 msgid "Notifications" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "Order Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:373 +#: ../../Zotlabs/Lib/Apps.php:371 msgid "CardDAV" msgstr "" #: ../../Zotlabs/Lib/Apps.php:375 -msgid "Guest Access" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:377 msgid "OAuth Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:378 +#: ../../Zotlabs/Lib/Apps.php:376 msgid "OAuth2 Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:379 +#: ../../Zotlabs/Lib/Apps.php:377 msgid "PDL Editor" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:382 +#: ../../Zotlabs/Lib/Apps.php:380 msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:383 +#: ../../Zotlabs/Lib/Apps.php:381 msgid "Channel Export" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:572 ../../Zotlabs/Lib/Apps.php:594 +#: ../../Zotlabs/Lib/Apps.php:570 ../../Zotlabs/Lib/Apps.php:592 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:599 +#: ../../Zotlabs/Lib/Apps.php:597 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:607 +#: ../../Zotlabs/Lib/Apps.php:605 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:608 +#: ../../Zotlabs/Lib/Apps.php:606 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:609 +#: ../../Zotlabs/Lib/Apps.php:607 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:610 +#: ../../Zotlabs/Lib/Apps.php:608 msgid "Unpin from navbar" msgstr "" @@ -14952,91 +15007,103 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../Zotlabs/Lib/Libzot.php:671 +#: ../../Zotlabs/Lib/Libzot.php:673 msgid "Unable to verify channel signature" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:131 +#: ../../Zotlabs/Lib/ThreadItem.php:109 +msgid "Restricted message" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:116 +msgid "Public Policy" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:154 msgid "Privacy conflict. Discretion advised." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:175 ../../Zotlabs/Storage/Browser.php:369 +#: ../../Zotlabs/Lib/ThreadItem.php:198 ../../Zotlabs/Storage/Browser.php:369 msgid "Admin Delete" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:320 +#: ../../Zotlabs/Lib/ThreadItem.php:343 msgid "Reply on this comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:320 +#: ../../Zotlabs/Lib/ThreadItem.php:343 msgid "reply" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:320 +#: ../../Zotlabs/Lib/ThreadItem.php:343 msgid "Reply to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:340 +#: ../../Zotlabs/Lib/ThreadItem.php:363 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:359 +#: ../../Zotlabs/Lib/ThreadItem.php:382 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:360 +#: ../../Zotlabs/Lib/ThreadItem.php:383 #, php-format msgid "%d unseen" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:413 +#: ../../Zotlabs/Lib/ThreadItem.php:427 +msgid "Forum" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:437 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:415 +#: ../../Zotlabs/Lib/ThreadItem.php:439 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:416 +#: ../../Zotlabs/Lib/ThreadItem.php:440 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:444 +#: ../../Zotlabs/Lib/ThreadItem.php:468 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:462 +#: ../../Zotlabs/Lib/ThreadItem.php:486 msgid "Go to previous comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:475 +#: ../../Zotlabs/Lib/ThreadItem.php:499 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:833 +#: ../../Zotlabs/Lib/ThreadItem.php:857 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:835 +#: ../../Zotlabs/Lib/ThreadItem.php:859 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:836 +#: ../../Zotlabs/Lib/ThreadItem.php:860 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:846 +#: ../../Zotlabs/Lib/ThreadItem.php:870 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:847 +#: ../../Zotlabs/Lib/ThreadItem.php:871 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:848 +#: ../../Zotlabs/Lib/ThreadItem.php:872 msgid "Your website URL (optional)" msgstr "" @@ -15055,6 +15122,7 @@ msgid "Update %s failed. See error logs." msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:108 +#: ../../Zotlabs/Access/PermissionRoles.php:384 msgid "Public" msgstr "" @@ -15107,75 +15175,87 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../Zotlabs/Lib/Libsync.php:748 +#: ../../Zotlabs/Lib/Libsync.php:805 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:287 +#: ../../Zotlabs/Access/PermissionRoles.php:337 msgid "Social Networking" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:288 +#: ../../Zotlabs/Access/PermissionRoles.php:338 msgid "Social - Federation" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:289 +#: ../../Zotlabs/Access/PermissionRoles.php:339 msgid "Social - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:290 +#: ../../Zotlabs/Access/PermissionRoles.php:340 msgid "Social - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:291 +#: ../../Zotlabs/Access/PermissionRoles.php:341 msgid "Social - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:294 +#: ../../Zotlabs/Access/PermissionRoles.php:344 msgid "Community Forum" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:295 +#: ../../Zotlabs/Access/PermissionRoles.php:345 msgid "Forum - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:296 +#: ../../Zotlabs/Access/PermissionRoles.php:346 msgid "Forum - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:297 +#: ../../Zotlabs/Access/PermissionRoles.php:347 msgid "Forum - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:300 +#: ../../Zotlabs/Access/PermissionRoles.php:350 msgid "Feed Republish" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:301 +#: ../../Zotlabs/Access/PermissionRoles.php:351 msgid "Feed - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:302 +#: ../../Zotlabs/Access/PermissionRoles.php:352 msgid "Feed - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:305 +#: ../../Zotlabs/Access/PermissionRoles.php:355 msgid "Special Purpose" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Access/PermissionRoles.php:356 msgid "Special - Celebrity/Soapbox" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:307 +#: ../../Zotlabs/Access/PermissionRoles.php:357 msgid "Special - Group Repository" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:311 +#: ../../Zotlabs/Access/PermissionRoles.php:361 msgid "Custom/Expert Mode" msgstr "" +#: ../../Zotlabs/Access/PermissionRoles.php:385 +msgid "Personal" +msgstr "" + +#: ../../Zotlabs/Access/PermissionRoles.php:386 +msgid "Community forum" +msgstr "" + +#: ../../Zotlabs/Access/PermissionRoles.php:387 +msgid "Custom" +msgstr "" + #: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my channel stream and posts" msgstr "" @@ -15233,15 +15313,11 @@ msgid "Can like/dislike profiles and profile things" msgstr "" #: ../../Zotlabs/Access/Permissions.php:70 -msgid "Can forward direct messages to all my channel connections (forum)" -msgstr "" - -#: ../../Zotlabs/Access/Permissions.php:71 msgid "Can chat with me" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:72 -msgid "Can source my public posts in derived channels" +#: ../../Zotlabs/Access/Permissions.php:71 +msgid "Can source/mirror my public posts in derived channels" msgstr "" #: ../../Zotlabs/Access/Permissions.php:73 @@ -15356,40 +15432,40 @@ msgid "" "an existing folder." msgstr "" -#: ../../boot.php:1704 +#: ../../boot.php:1714 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1722 +#: ../../boot.php:1732 msgid "Email or nickname" msgstr "" -#: ../../boot.php:1732 +#: ../../boot.php:1742 msgid "Password" msgstr "" -#: ../../boot.php:1733 +#: ../../boot.php:1743 msgid "Remember me" msgstr "" -#: ../../boot.php:1736 +#: ../../boot.php:1746 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2615 +#: ../../boot.php:2624 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2620 +#: ../../boot.php:2629 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2736 +#: ../../boot.php:2745 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2741 +#: ../../boot.php:2750 msgid "Cron/Scheduled tasks not running." msgstr "" |