diff options
40 files changed, 519 insertions, 470 deletions
@@ -1,4 +1,4 @@ -Hubzilla 3.8 (????-??-??) +Hubzilla 3.8 (2018-10-19) - Re-implement basic build test via gitlab-ci - Rework wiki encoding/decoding - Implement improved worker (experimental - off by default) @@ -62,6 +62,7 @@ Hubzilla 3.8 (????-??-??) - Fix app update and ownership issues Addons + - Upgrade Info: new addon to inform channel owners about system upgrades - Superblock: fix issue with not removeable channels - Cart: fix subscription table not created on install - Hsse: new addon - a WYSIWYG editor for certain modules diff --git a/app/articles.apd b/app/articles.apd index 00b3c4a3c..525d0443e 100644 --- a/app/articles.apd +++ b/app/articles.apd @@ -1,4 +1,4 @@ -version: 1.3 +version: 2 url: $baseurl/articles/$nick name: Articles requires: local_channel diff --git a/app/bookmarks.apd b/app/bookmarks.apd index a5e0d7bc6..fc1b68d50 100644 --- a/app/bookmarks.apd +++ b/app/bookmarks.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/bookmarks requires: local_channel name: Bookmarks diff --git a/app/caldav.apd b/app/caldav.apd index f1938a9fb..30b45b4bd 100644 --- a/app/caldav.apd +++ b/app/caldav.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/cdav/calendar, $baseurl/settings/calendar requires: local_channel name: CalDAV diff --git a/app/carddav.apd b/app/carddav.apd index 3b60ebcfe..d32e636b4 100644 --- a/app/carddav.apd +++ b/app/carddav.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/cdav/addressbook requires: local_channel name: CardDAV diff --git a/app/cards.apd b/app/cards.apd index ecc61b7f9..780f71e75 100644 --- a/app/cards.apd +++ b/app/cards.apd @@ -1,4 +1,4 @@ -version: 1.2 +version: 2 url: $baseurl/cards/$nick name: Cards requires: local_channel diff --git a/app/channel.apd b/app/channel.apd index f0f435ef5..d48266c95 100644 --- a/app/channel.apd +++ b/app/channel.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/channel/$nick, $baseurl/settings/channel_home requires: local_channel name: Channel Home diff --git a/app/chat.apd b/app/chat.apd index 524c13bfd..627c62d12 100644 --- a/app/chat.apd +++ b/app/chat.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/chat/$nick requires: local_channel name: Chatrooms diff --git a/app/connections.apd b/app/connections.apd index 6ab5977af..0e4c7d670 100644 --- a/app/connections.apd +++ b/app/connections.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/connections, $baseurl/settings/connections requires: local_channel name: Connections diff --git a/app/defperm.apd b/app/defperm.apd index 9be554543..2b241ee7f 100644 --- a/app/defperm.apd +++ b/app/defperm.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/defperms requires: local_channel, custom_role name: Default Permissions diff --git a/app/directory.apd b/app/directory.apd index 0c723c16b..887c31e30 100644 --- a/app/directory.apd +++ b/app/directory.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/directory, $baseurl/settings/directory name: Directory photo: icon:sitemap diff --git a/app/events.apd b/app/events.apd index edd85959d..b69ee35ee 100644 --- a/app/events.apd +++ b/app/events.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/events, $baseurl/settings/events requires: local_channel name: Events diff --git a/app/group.apd b/app/group.apd index d16b9237c..da0b31407 100644 --- a/app/group.apd +++ b/app/group.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/group requires: local_channel name: Privacy Groups diff --git a/app/help.apd b/app/help.apd index c81584178..a0e6a491b 100644 --- a/app/help.apd +++ b/app/help.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/help name: Help photo: icon:question diff --git a/app/invite.apd b/app/invite.apd index 99c2a4eec..5c0e8d09f 100644 --- a/app/invite.apd +++ b/app/invite.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/invite requires: local_channel name: Invite diff --git a/app/lang.apd b/app/lang.apd index c30a74654..65495dd5b 100644 --- a/app/lang.apd +++ b/app/lang.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/lang name: Language photo: icon:language diff --git a/app/mail.apd b/app/mail.apd index 9df9139f3..f94a2b3c7 100644 --- a/app/mail.apd +++ b/app/mail.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/mail/combined requires: local_channel name: Mail diff --git a/app/mood.apd b/app/mood.apd index e05606a0e..dd4e51cec 100644 --- a/app/mood.apd +++ b/app/mood.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/mood requires: local_channel name: Mood diff --git a/app/network.apd b/app/network.apd index 1f6f9d46b..f67b48ffe 100644 --- a/app/network.apd +++ b/app/network.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/network, $baseurl/settings/network requires: local_channel name: Network diff --git a/app/notes.apd b/app/notes.apd index ba7e2bbc1..01f94c60a 100644 --- a/app/notes.apd +++ b/app/notes.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/notes requires: local_channel name: Notes diff --git a/app/oauth.apd b/app/oauth.apd index 4771773ed..5e69e4401 100644 --- a/app/oauth.apd +++ b/app/oauth.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/oauth requires: local_channel name: OAuth Apps Manager diff --git a/app/oauth2.apd b/app/oauth2.apd index 21fa44c97..86828bf24 100644 --- a/app/oauth2.apd +++ b/app/oauth2.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/oauth2 requires: local_channel name: OAuth2 Apps Manager diff --git a/app/pdledit.apd b/app/pdledit.apd index ae62d4ff3..fbc643296 100644 --- a/app/pdledit.apd +++ b/app/pdledit.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/pdledit requires: local_channel name: PDL Editor diff --git a/app/permcats.apd b/app/permcats.apd index 6a961b87e..e9fd6e56f 100644 --- a/app/permcats.apd +++ b/app/permcats.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/permcats requires: local_channel name: Permission Categories diff --git a/app/photos.apd b/app/photos.apd index 09b4eb0fd..b28b315cd 100644 --- a/app/photos.apd +++ b/app/photos.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/photos/$nick, $baseurl/settings/photos requires: local_channel name: Photos diff --git a/app/poke.apd b/app/poke.apd index 37b640fb8..cf23c29b4 100644 --- a/app/poke.apd +++ b/app/poke.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/poke requires: local_channel name: Poke diff --git a/app/post.apd b/app/post.apd index 08e5ccf0c..d3ce88454 100644 --- a/app/post.apd +++ b/app/post.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/rpost?f=&body= requires: observer name: Post diff --git a/app/premium_channel.apd b/app/premium_channel.apd index 263dd5701..9764051d1 100644 --- a/app/premium_channel.apd +++ b/app/premium_channel.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/connect/$nick requires: local_channel name: Premium Channel diff --git a/app/probe.apd b/app/probe.apd index 19515c0aa..097219292 100644 --- a/app/probe.apd +++ b/app/probe.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/probe requires: local_channel name: Remote Diagnostics diff --git a/app/pubstream.apd b/app/pubstream.apd index ce9997126..4447ca750 100644 --- a/app/pubstream.apd +++ b/app/pubstream.apd @@ -1,4 +1,4 @@ -version: 2.2 +version: 2 url: $baseurl/pubstream requires: public_stream name: Public Stream diff --git a/app/randprof.apd b/app/randprof.apd index 1b2addd5c..60281d909 100644 --- a/app/randprof.apd +++ b/app/randprof.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/randprof name: Random Channel target: randprof diff --git a/app/search.apd b/app/search.apd index 9eb24ad41..462561f33 100644 --- a/app/search.apd +++ b/app/search.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/search name: Search photo: icon:search diff --git a/app/sources.apd b/app/sources.apd index 69dd0aac0..deeeae0a2 100644 --- a/app/sources.apd +++ b/app/sources.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/sources requires: local_channel name: Channel Sources diff --git a/app/storage.apd b/app/storage.apd index cafcf81e8..ea15a2ef2 100644 --- a/app/storage.apd +++ b/app/storage.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/cloud/$nick requires: local_channel name: Files diff --git a/app/suggest.apd b/app/suggest.apd index 51b555264..0fdd8a399 100644 --- a/app/suggest.apd +++ b/app/suggest.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/suggest requires: local_channel name: Suggest Channels diff --git a/app/tokens.apd b/app/tokens.apd index 6cb66cbd7..f271dc56c 100644 --- a/app/tokens.apd +++ b/app/tokens.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/tokens requires: local_channel name: Guest Access diff --git a/app/uexport.apd b/app/uexport.apd index c7723fa26..773d74429 100644 --- a/app/uexport.apd +++ b/app/uexport.apd @@ -1,4 +1,4 @@ -version: 1 +version: 2 url: $baseurl/uexport requires: local_channel name: Channel Export diff --git a/app/webpages.apd b/app/webpages.apd index e98cc0794..1c215512f 100644 --- a/app/webpages.apd +++ b/app/webpages.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/webpages/$nick requires: local_channel name: Webpages diff --git a/app/wiki.apd b/app/wiki.apd index 56edfde20..e2fbe77e1 100644 --- a/app/wiki.apd +++ b/app/wiki.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 2 url: $baseurl/wiki/$nick requires: local_channel name: Wiki diff --git a/util/hmessages.po b/util/hmessages.po index 7bf1cce83..9561cab2b 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.9\n" +"Project-Id-Version: 3.9.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-06 17:07+0200\n" +"POT-Creation-Date: 2018-10-19 11:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,9 +151,9 @@ msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:306 #: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/event.php:1315 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/selectors.php:115 +#: ../../include/selectors.php:151 ../../include/event.php:1315 #: ../../include/event.php:1322 ../../include/connections.php:703 #: ../../include/connections.php:710 msgid "Other" @@ -194,7 +194,7 @@ msgstr "" #: ../../Zotlabs/Module/Mood.php:124 ../../Zotlabs/Module/Connections.php:32 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59 -#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:415 +#: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428 #: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 @@ -221,7 +221,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:313 #: ../../Zotlabs/Module/Cover_photo.php:326 -#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:17 +#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Network.php:17 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:96 @@ -282,7 +282,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:284 #: ../../Zotlabs/Module/Connections.php:322 #: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211 -#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Menu.php:175 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:235 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99 @@ -295,7 +295,7 @@ msgid "Edit" msgstr "" #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1104 -#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124 #: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1389 msgid "Share" @@ -320,7 +320,7 @@ msgid "Delete" msgstr "" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:695 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409 #: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:261 #: ../../Zotlabs/Module/Pubsites.php:60 msgid "View" @@ -436,7 +436,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Security.php:112 -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:493 #: ../../Zotlabs/Module/Settings/Features.php:46 #: ../../Zotlabs/Module/Settings/Events.php:41 #: ../../Zotlabs/Module/Settings/Calendar.php:41 @@ -444,10 +444,10 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Connections.php:41 #: ../../Zotlabs/Module/Settings/Photos.php:41 #: ../../Zotlabs/Module/Settings/Account.php:103 -#: ../../Zotlabs/Module/Settings/Profiles.php:41 +#: ../../Zotlabs/Module/Settings/Profiles.php:50 #: ../../Zotlabs/Module/Settings/Manage.php:41 #: ../../Zotlabs/Module/Settings/Featured.php:54 -#: ../../Zotlabs/Module/Settings/Channel_home.php:61 +#: ../../Zotlabs/Module/Settings/Channel_home.php:89 #: ../../Zotlabs/Module/Settings/Directory.php:41 #: ../../Zotlabs/Module/Settings/Editor.php:41 #: ../../Zotlabs/Module/Settings/Display.php:189 @@ -461,7 +461,7 @@ msgstr "" #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:888 #: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:265 +#: ../../Zotlabs/Module/Pconfig.php:111 ../../Zotlabs/Module/Defperms.php:265 #: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:156 #: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 #: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162 @@ -469,8 +469,8 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 #: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Lib/ThreadItem.php:767 #: ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../Zotlabs/Widget/Wiki_pages.php:40 -#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Wiki_pages.php:42 +#: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:94 #: ../../addon/skeleton/skeleton.php:65 ../../addon/planets/planets.php:153 @@ -501,7 +501,7 @@ msgstr "" #: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1263 #: ../../addon/cart/submodules/manualcat.php:248 #: ../../addon/cart/submodules/hzservices.php:640 -#: ../../addon/cart/submodules/subscriptions.php:401 +#: ../../addon/cart/submodules/subscriptions.php:410 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 #: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237 #: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95 @@ -522,7 +522,7 @@ msgid "Add Article" msgstr "" #: ../../Zotlabs/Module/Articles.php:214 ../../Zotlabs/Lib/Apps.php:302 -#: ../../include/nav.php:477 +#: ../../include/nav.php:482 msgid "Articles" msgstr "" @@ -552,8 +552,8 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1233 ../../Zotlabs/Module/Article_edit.php:131 #: ../../Zotlabs/Module/Admin/Addons.php:423 #: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145 -#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:356 -#: ../../Zotlabs/Module/Wiki.php:388 ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:368 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Editwebpage.php:169 @@ -616,7 +616,7 @@ msgstr "" #: ../../Zotlabs/Lib/Activity.php:858 ../../Zotlabs/Lib/Apps.php:994 #: ../../Zotlabs/Lib/Apps.php:1078 ../../Zotlabs/Storage/Browser.php:164 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84 -#: ../../addon/pubcrawl/as.php:964 ../../include/conversation.php:1166 +#: ../../addon/pubcrawl/as.php:963 ../../include/conversation.php:1166 msgid "Unknown" msgstr "" @@ -751,7 +751,7 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:907 #: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:144 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 -#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Lib/NativeWikiPage.php:561 #: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 @@ -777,7 +777,7 @@ msgstr "" #: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1779 msgid "Email" msgstr "" @@ -963,7 +963,7 @@ msgstr "" msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:375 +#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:374 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -1184,7 +1184,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "(click to open/close)" msgstr "" @@ -1208,7 +1208,7 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:255 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 @@ -1263,7 +1263,7 @@ msgstr "" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1275,7 +1275,7 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:257 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 @@ -1329,7 +1329,7 @@ msgstr "" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1629,14 +1629,14 @@ msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 ../../Zotlabs/Lib/Activity.php:1570 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1512 +#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1511 #: ../../include/conversation.php:116 ../../include/text.php:2028 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 #: ../../Zotlabs/Lib/Activity.php:1570 ../../addon/diaspora/Receiver.php:1539 -#: ../../addon/pubcrawl/as.php:1512 ../../include/conversation.php:144 +#: ../../addon/pubcrawl/as.php:1511 ../../include/conversation.php:144 #: ../../include/text.php:2034 msgid "status" msgstr "" @@ -1720,7 +1720,7 @@ msgstr "" #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256 -#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:288 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:293 msgid "Loading" msgstr "" @@ -1753,7 +1753,7 @@ msgid "Choose a short nickname" msgstr "" #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:535 #: ../../Zotlabs/Module/Register.php:261 msgid "Channel role and privacy" msgstr "" @@ -1831,7 +1831,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:617 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Remove Channel" msgstr "" @@ -2667,7 +2667,7 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:386 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:391 msgid "Channel" msgstr "" @@ -2698,7 +2698,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Display.php:452 ../../Zotlabs/Module/Filestorage.php:24 #: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3587 msgid "Item not found." msgstr "" @@ -2758,7 +2758,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:187 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087 msgid "Default" msgstr "" @@ -2939,7 +2939,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " +"example: 'pubstream' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" @@ -3559,12 +3559,12 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:78 #: ../../Zotlabs/Module/Settings/Channel.php:89 #: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:24 -#: ../../include/selectors.php:123 ../../include/channel.php:444 +#: ../../include/selectors.php:134 ../../include/channel.php:444 #: ../../include/channel.php:445 ../../include/channel.php:452 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:272 +#: ../../Zotlabs/Module/Settings/Channel.php:266 #: ../../Zotlabs/Module/Defperms.php:111 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3574,413 +3574,401 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:327 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:335 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:336 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:337 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:338 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:339 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:340 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Settings/Channel.php:409 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:420 +#: ../../Zotlabs/Module/Settings/Channel.php:414 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:424 +#: ../../Zotlabs/Module/Settings/Channel.php:418 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:433 +#: ../../Zotlabs/Module/Settings/Channel.php:427 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:436 +#: ../../Zotlabs/Module/Settings/Channel.php:430 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 msgid "Automatic membership approval" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 #: ../../Zotlabs/Module/Defperms.php:255 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:491 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:517 ../../include/channel.php:1528 +#: ../../Zotlabs/Module/Settings/Channel.php:499 ../../include/channel.php:1528 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:500 #: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 -msgid "Profile to assign new connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Default permissions category" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:545 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:563 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Unseen stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:587 -#: ../../Zotlabs/Module/Settings/Channel.php:592 -#: ../../Zotlabs/Module/Settings/Channel.php:593 -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Unseen public stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 #, 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:601 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:609 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:610 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:612 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:613 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:613 -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:616 -msgid "Personal menu to display in your channel pages" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:619 -msgid "Firefox Share $Projectname provider" -msgstr "" - #: ../../Zotlabs/Module/Settings/Features.php:43 msgid "Additional Features" msgstr "" @@ -4074,7 +4062,7 @@ msgstr "" msgid "Remove this account including all its channels" msgstr "" -#: ../../Zotlabs/Module/Settings/Profiles.php:39 +#: ../../Zotlabs/Module/Settings/Profiles.php:47 msgid "Profiles Settings" msgstr "" @@ -4118,17 +4106,21 @@ msgstr "" msgid "Please save/submit changes to any panel before opening another." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:41 +#: ../../Zotlabs/Module/Settings/Channel_home.php:44 #: ../../Zotlabs/Module/Settings/Network.php:41 msgid "Max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:43 +#: ../../Zotlabs/Module/Settings/Channel_home.php:46 #: ../../Zotlabs/Module/Settings/Network.php:43 msgid "Click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:58 +#: ../../Zotlabs/Module/Settings/Channel_home.php:59 +msgid "Personal menu to display in your channel pages" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel_home.php:86 msgid "Channel Home Settings" msgstr "" @@ -4224,7 +4216,7 @@ msgid "Link post titles to source" msgstr "" #: ../../Zotlabs/Module/Settings/Display.php:205 -#: ../../Zotlabs/Widget/Newmember.php:69 +#: ../../Zotlabs/Widget/Newmember.php:75 msgid "New Member Links" msgstr "" @@ -5123,7 +5115,7 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:77 ../../addon/cart/myshop.php:37 #: ../../addon/cart/cart.php:1440 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/manual_payments.php:63 +#: ../../addon/cart/manual_payments.php:93 msgid "Invalid channel" msgstr "" @@ -5140,7 +5132,7 @@ msgid "Error downloading wiki: " msgstr "" #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:19 -#: ../../include/nav.php:501 +#: ../../include/nav.php:506 msgid "Wikis" msgstr "" @@ -5161,21 +5153,21 @@ msgstr "" msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:41 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41 #: ../../include/text.php:1892 msgid "Markdown" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1890 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1890 msgid "BBcode" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1893 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1893 msgid "Text" msgstr "" @@ -5199,147 +5191,147 @@ msgstr "" msgid "Edit Wiki Name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:274 msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:295 +#: ../../Zotlabs/Module/Wiki.php:300 msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Wiki.php:321 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326 +#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331 msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:354 +#: ../../Zotlabs/Module/Wiki.php:366 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:355 ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:564 #: ../../Zotlabs/Widget/Wiki_page_history.php:25 msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:362 +#: ../../Zotlabs/Module/Wiki.php:374 msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:384 msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Wiki.php:399 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:387 ../../addon/hsse/hsse.php:208 +#: ../../Zotlabs/Module/Wiki.php:400 ../../addon/hsse/hsse.php:208 #: ../../include/conversation.php:1411 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:389 ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:466 #: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210 #: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1413 #: ../../include/conversation.php:1460 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:390 ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:467 #: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139 #: ../../include/conversation.php:1342 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:391 ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Wiki.php:404 ../../Zotlabs/Module/Profile_photo.php:468 #: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140 #: ../../include/conversation.php:1343 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:392 ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:469 #: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:393 ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:470 #: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142 #: ../../include/conversation.php:1345 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:394 ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:471 #: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143 #: ../../include/conversation.php:1346 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:395 ../../Zotlabs/Module/Profile_photo.php:472 +#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Profile_photo.php:472 #: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144 #: ../../include/conversation.php:1347 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:397 +#: ../../Zotlabs/Module/Wiki.php:410 msgid "History" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:473 +#: ../../Zotlabs/Module/Wiki.php:488 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:480 +#: ../../Zotlabs/Module/Wiki.php:495 msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:493 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:500 +#: ../../Zotlabs/Module/Wiki.php:515 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:523 +#: ../../Zotlabs/Module/Wiki.php:539 msgid "Error updating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:559 msgid "Error updating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:558 +#: ../../Zotlabs/Module/Wiki.php:574 msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:568 +#: ../../Zotlabs/Module/Wiki.php:584 msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:601 +#: ../../Zotlabs/Module/Wiki.php:617 msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:722 +#: ../../Zotlabs/Module/Wiki.php:739 msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:836 +#: ../../Zotlabs/Module/Wiki.php:853 msgid "You must be authenticated." msgstr "" @@ -5619,7 +5611,7 @@ msgstr "" #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 #: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 #: ../../Zotlabs/Module/Display.php:174 -#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:185 +#: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185 #: ../../include/help.php:132 msgid "Page not found." msgstr "" @@ -6019,12 +6011,12 @@ msgid "min" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:320 -#: ../../include/features.php:391 ../../include/nav.php:409 +#: ../../include/features.php:391 ../../include/nav.php:414 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:315 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:417 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:422 msgid "Files" msgstr "" @@ -6121,7 +6113,7 @@ msgid "Layouts" msgstr "" #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:323 -#: ../../include/nav.php:168 ../../include/nav.php:284 +#: ../../include/nav.php:168 ../../include/nav.php:289 #: ../../include/help.php:117 ../../include/help.php:125 msgid "Help" msgstr "" @@ -6202,15 +6194,15 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63 msgid "This setting requires special processing and editing has been blocked." msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:48 +#: ../../Zotlabs/Module/Pconfig.php:52 msgid "Configuration Editor" msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:49 +#: ../../Zotlabs/Module/Pconfig.php:53 msgid "" "Warning: Changing some settings could render your channel inoperable. Please " "leave this page unless you are comfortable with and knowledgeable about how " @@ -6734,7 +6726,7 @@ msgid "Add Card" msgstr "" #: ../../Zotlabs/Module/Cards.php:203 ../../Zotlabs/Lib/Apps.php:303 -#: ../../include/nav.php:466 +#: ../../include/nav.php:471 msgid "Cards" msgstr "" @@ -6834,7 +6826,7 @@ msgid "Export selected" msgstr "" #: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:316 -#: ../../include/nav.php:489 +#: ../../include/nav.php:494 msgid "Webpages" msgstr "" @@ -6968,8 +6960,8 @@ msgstr "" msgid "Delivery report for %1$s" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 -#: ../../Zotlabs/Widget/Wiki_pages.php:96 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41 +#: ../../Zotlabs/Widget/Wiki_pages.php:98 msgid "Options" msgstr "" @@ -7106,14 +7098,14 @@ msgid "Previous action reversed." msgstr "" #: ../../Zotlabs/Module/Like.php:438 ../../Zotlabs/Lib/Activity.php:1605 -#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1547 +#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1546 #: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" #: ../../Zotlabs/Module/Like.php:440 ../../Zotlabs/Lib/Activity.php:1607 -#: ../../addon/pubcrawl/as.php:1549 ../../include/conversation.php:163 +#: ../../addon/pubcrawl/as.php:1548 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -7669,7 +7661,7 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:399 +#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:404 msgid "About" msgstr "" @@ -7693,11 +7685,11 @@ msgstr "" msgid "Contents" msgstr "" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:393 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:446 +#: ../../Zotlabs/Module/Display.php:445 msgid "Item has been removed." msgstr "" @@ -8014,9 +8006,9 @@ msgid "Mark all seen" msgstr "" #: ../../Zotlabs/Lib/Activity.php:1417 ../../Zotlabs/Lib/Activity.php:1614 -#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1222 -#: ../../addon/pubcrawl/as.php:1377 ../../addon/pubcrawl/as.php:1556 -#: ../../include/network.php:1768 +#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1221 +#: ../../addon/pubcrawl/as.php:1376 ../../addon/pubcrawl/as.php:1555 +#: ../../include/network.php:1778 msgid "ActivityPub" msgstr "" @@ -8060,12 +8052,12 @@ msgstr "" msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:455 +#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:460 msgid "Bookmarks" msgstr "" #: ../../Zotlabs/Lib/Apps.php:307 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/nav.php:442 ../../include/nav.php:445 +#: ../../include/nav.php:447 ../../include/nav.php:450 msgid "Chatrooms" msgstr "" @@ -8086,7 +8078,7 @@ msgstr "" msgid "Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:504 +#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:509 msgid "Wiki" msgstr "" @@ -8241,79 +8233,79 @@ msgid "publisher" msgstr "" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +#: ../../Zotlabs/Lib/NativeWikiPage.php:94 msgid "(No Title)" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +#: ../../Zotlabs/Lib/NativeWikiPage.php:109 msgid "Wiki page create failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +#: ../../Zotlabs/Lib/NativeWikiPage.php:122 msgid "Wiki not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +#: ../../Zotlabs/Lib/NativeWikiPage.php:133 msgid "Destination name already exists" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:163 -#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +#: ../../Zotlabs/Lib/NativeWikiPage.php:362 msgid "Page not found" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +#: ../../Zotlabs/Lib/NativeWikiPage.php:197 msgid "Error reading page content" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:350 -#: ../../Zotlabs/Lib/NativeWikiPage.php:400 -#: ../../Zotlabs/Lib/NativeWikiPage.php:467 -#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +#: ../../Zotlabs/Lib/NativeWikiPage.php:353 +#: ../../Zotlabs/Lib/NativeWikiPage.php:402 +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +#: ../../Zotlabs/Lib/NativeWikiPage.php:510 msgid "Error reading wiki" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +#: ../../Zotlabs/Lib/NativeWikiPage.php:390 msgid "Page update failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +#: ../../Zotlabs/Lib/NativeWikiPage.php:424 msgid "Nothing deleted" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +#: ../../Zotlabs/Lib/NativeWikiPage.php:490 msgid "Compare: object not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +#: ../../Zotlabs/Lib/NativeWikiPage.php:496 msgid "Page updated" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +#: ../../Zotlabs/Lib/NativeWikiPage.php:499 msgid "Untitled" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +#: ../../Zotlabs/Lib/NativeWikiPage.php:505 msgid "Wiki resource_id required for git commit" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Lib/NativeWikiPage.php:562 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:560 +#: ../../Zotlabs/Lib/NativeWikiPage.php:563 #: ../../Zotlabs/Widget/Wiki_page_history.php:24 msgid "Date" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 #: ../../Zotlabs/Widget/Wiki_page_history.php:26 msgid "Compare" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:600 ../../include/bbcode.php:746 +#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:746 #: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "" @@ -8721,11 +8713,11 @@ msgstr "" msgid "edited a comment dated %s" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:151 +#: ../../Zotlabs/Lib/NativeWiki.php:152 msgid "Wiki updated successfully" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:205 +#: ../../Zotlabs/Lib/NativeWiki.php:206 msgid "Wiki files deleted successfully" msgstr "" @@ -8974,8 +8966,8 @@ msgstr "" msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:428 -#: ../../include/nav.php:431 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:433 +#: ../../include/nav.php:436 msgid "Calendar" msgstr "" @@ -9313,16 +9305,16 @@ msgstr "" msgid "Saved Searches" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 +#: ../../Zotlabs/Widget/Wiki_pages.php:34 +#: ../../Zotlabs/Widget/Wiki_pages.php:91 msgid "Add new page" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 +#: ../../Zotlabs/Widget/Wiki_pages.php:85 msgid "Wiki Pages" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Page name" msgstr "" @@ -9431,7 +9423,19 @@ msgstr "" msgid "Documentation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:65 +#: ../../Zotlabs/Widget/Newmember.php:57 +msgid "Missing Features?" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:59 +msgid "Pin apps to navigation bar" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:60 +msgid "Install more apps" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:71 msgid "View public stream" msgstr "" @@ -9607,20 +9611,20 @@ msgstr "" msgid "Network/Protocol" msgstr "" -#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1772 +#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1782 msgid "Zot" msgstr "" -#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1770 +#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1780 msgid "Diaspora" msgstr "" -#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1763 -#: ../../include/network.php:1764 +#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1773 +#: ../../include/network.php:1774 msgid "Friendica" msgstr "" -#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1765 +#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1775 msgid "OStatus" msgstr "" @@ -10498,13 +10502,13 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1487 +#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1487 msgid "Male" msgstr "" -#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1485 +#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1485 msgid "Female" msgstr "" @@ -11077,6 +11081,36 @@ msgstr "" msgid "Jappix Mini Settings" msgstr "" +#: ../../addon/upgrade_info/upgrade_info.php:43 +msgid "Your channel has been upgraded to the latest $Projectname version." +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:44 +msgid "" +"To improve usability, we have converted some features into installable stand-" +"alone apps." +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:45 +msgid "Please visit the $Projectname" +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:46 +msgid "app store" +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:47 +msgid "and install possibly missing apps." +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:52 +msgid "Upgrade Info" +msgstr "" + +#: ../../addon/upgrade_info/upgrade_info.php:56 +msgid "Do not show this again" +msgstr "" + #: ../../addon/channelreputation/channelreputation.php:101 #: ../../addon/channelreputation/channelreputation.php:102 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 @@ -11904,7 +11938,7 @@ msgstr "" #: ../../addon/cart/cart.php:1462 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/manual_payments.php:38 +#: ../../addon/cart/manual_payments.php:68 msgid "Order not found." msgstr "" @@ -12044,39 +12078,39 @@ msgid "" "Cannot include subscription items with different terms in the same order." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:365 +#: ../../addon/cart/submodules/subscriptions.php:372 msgid "Select Subscription to Edit" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:371 +#: ../../addon/cart/submodules/subscriptions.php:380 msgid "Edit Subscriptions" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:405 +#: ../../addon/cart/submodules/subscriptions.php:414 msgid "Subscription SKU" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:410 +#: ../../addon/cart/submodules/subscriptions.php:419 msgid "Catalog Description" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:414 +#: ../../addon/cart/submodules/subscriptions.php:423 msgid "Subscription available for purchase." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:419 +#: ../../addon/cart/submodules/subscriptions.php:428 msgid "Maximum active subscriptions to this item per account." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:422 +#: ../../addon/cart/submodules/subscriptions.php:431 msgid "Subscription price." msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:426 +#: ../../addon/cart/submodules/subscriptions.php:435 msgid "Quantity" msgstr "" -#: ../../addon/cart/submodules/subscriptions.php:430 +#: ../../addon/cart/submodules/subscriptions.php:439 msgid "Term" msgstr "" @@ -12084,11 +12118,11 @@ msgstr "" msgid "Error: order mismatch. Please try again." msgstr "" -#: ../../addon/cart/manual_payments.php:31 +#: ../../addon/cart/manual_payments.php:61 msgid "Manual payments are not enabled." msgstr "" -#: ../../addon/cart/manual_payments.php:47 +#: ../../addon/cart/manual_payments.php:77 msgid "Finished" msgstr "" @@ -12620,243 +12654,247 @@ msgstr "" msgid "Test mode (only send to hub administrator)" msgstr "" -#: ../../include/selectors.php:30 +#: ../../include/selectors.php:18 +msgid "Profile to assign new connections" +msgstr "" + +#: ../../include/selectors.php:41 msgid "Frequently" msgstr "" -#: ../../include/selectors.php:31 +#: ../../include/selectors.php:42 msgid "Hourly" msgstr "" -#: ../../include/selectors.php:32 +#: ../../include/selectors.php:43 msgid "Twice daily" msgstr "" -#: ../../include/selectors.php:33 +#: ../../include/selectors.php:44 msgid "Daily" msgstr "" -#: ../../include/selectors.php:34 +#: ../../include/selectors.php:45 msgid "Weekly" msgstr "" -#: ../../include/selectors.php:35 +#: ../../include/selectors.php:46 msgid "Monthly" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Male" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Female" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Male" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Female" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transgender" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Intersex" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transsexual" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1491 +#: ../../include/selectors.php:60 ../../include/channel.php:1491 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1493 +#: ../../include/selectors.php:60 ../../include/channel.php:1493 msgid "Non-specific" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Undecided" msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Males" msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Females" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Gay" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Lesbian" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "No Preference" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Bisexual" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Autosexual" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Abstinent" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Virgin" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Deviant" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Fetish" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Oodles" msgstr "" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Nonsexual" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Single" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Lonely" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Available" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unavailable" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Has crush" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Infatuated" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Dating" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unfaithful" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Sex Addict" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Friends/Benefits" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Casual" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Engaged" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Married" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily married" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Partners" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Cohabiting" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Common law" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Happy" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Not looking" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Swinger" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Betrayed" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Separated" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unstable" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Divorced" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily divorced" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Widowed" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Uncertain" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "It's complicated" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Don't care" msgstr "" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Ask me" msgstr "" @@ -13205,47 +13243,47 @@ msgstr "" msgid "surprised" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:86 +#: ../../include/text.php:1377 ../../include/js_strings.php:95 msgid "Monday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:87 +#: ../../include/text.php:1377 ../../include/js_strings.php:96 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:88 +#: ../../include/text.php:1377 ../../include/js_strings.php:97 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:89 +#: ../../include/text.php:1377 ../../include/js_strings.php:98 msgid "Thursday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:90 +#: ../../include/text.php:1377 ../../include/js_strings.php:99 msgid "Friday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:91 +#: ../../include/text.php:1377 ../../include/js_strings.php:100 msgid "Saturday" msgstr "" -#: ../../include/text.php:1377 ../../include/js_strings.php:85 +#: ../../include/text.php:1377 ../../include/js_strings.php:94 msgid "Sunday" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:61 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "January" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:62 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "February" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:63 +#: ../../include/text.php:1381 ../../include/js_strings.php:72 msgid "March" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:64 +#: ../../include/text.php:1381 ../../include/js_strings.php:73 msgid "April" msgstr "" @@ -13253,31 +13291,31 @@ msgstr "" msgid "May" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:66 +#: ../../include/text.php:1381 ../../include/js_strings.php:75 msgid "June" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:67 +#: ../../include/text.php:1381 ../../include/js_strings.php:76 msgid "July" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:77 msgid "August" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:78 msgid "September" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:79 msgid "October" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:80 msgid "November" msgstr "" -#: ../../include/text.php:1381 ../../include/js_strings.php:72 +#: ../../include/text.php:1381 ../../include/js_strings.php:81 msgid "December" msgstr "" @@ -13301,7 +13339,7 @@ msgstr "" msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1872 ../../include/language.php:397 +#: ../../include/text.php:1872 ../../include/language.php:423 msgid "default" msgstr "" @@ -13600,181 +13638,191 @@ msgid " channel name" msgstr "" #: ../../include/js_strings.php:41 +#, php-format +msgid "%d minutes" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:42 +#, php-format +msgid "about %d hours" +msgid_plural "about %d hours" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:43 +#, php-format +msgid "%d days" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:44 +#, php-format +msgid "%d months" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:45 +#, php-format +msgid "%d years" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/js_strings.php:50 msgid "timeago.prefixAgo" msgstr "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:51 msgid "timeago.prefixFromNow" msgstr "" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:52 msgid "timeago.suffixAgo" msgstr "" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:53 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:56 msgid "less than a minute" msgstr "" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:57 msgid "about a minute" msgstr "" -#: ../../include/js_strings.php:49 -#, php-format -msgid "%d minutes" -msgstr "" - -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:59 msgid "about an hour" msgstr "" -#: ../../include/js_strings.php:51 -#, php-format -msgid "about %d hours" -msgstr "" - -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:61 msgid "a day" msgstr "" -#: ../../include/js_strings.php:53 -#, php-format -msgid "%d days" -msgstr "" - -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:63 msgid "about a month" msgstr "" -#: ../../include/js_strings.php:55 -#, php-format -msgid "%d months" -msgstr "" - -#: ../../include/js_strings.php:56 +#: ../../include/js_strings.php:65 msgid "about a year" msgstr "" -#: ../../include/js_strings.php:57 -#, php-format -msgid "%d years" -msgstr "" - -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:67 msgid " " msgstr "" -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:68 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:74 msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:82 msgid "Jan" msgstr "" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:83 msgid "Feb" msgstr "" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:84 msgid "Mar" msgstr "" -#: ../../include/js_strings.php:76 +#: ../../include/js_strings.php:85 msgid "Apr" msgstr "" -#: ../../include/js_strings.php:77 +#: ../../include/js_strings.php:86 msgctxt "short" msgid "May" msgstr "" -#: ../../include/js_strings.php:78 +#: ../../include/js_strings.php:87 msgid "Jun" msgstr "" -#: ../../include/js_strings.php:79 +#: ../../include/js_strings.php:88 msgid "Jul" msgstr "" -#: ../../include/js_strings.php:80 +#: ../../include/js_strings.php:89 msgid "Aug" msgstr "" -#: ../../include/js_strings.php:81 +#: ../../include/js_strings.php:90 msgid "Sep" msgstr "" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:91 msgid "Oct" msgstr "" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:92 msgid "Nov" msgstr "" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:93 msgid "Dec" msgstr "" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:101 msgid "Sun" msgstr "" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:102 msgid "Mon" msgstr "" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:103 msgid "Tue" msgstr "" -#: ../../include/js_strings.php:95 +#: ../../include/js_strings.php:104 msgid "Wed" msgstr "" -#: ../../include/js_strings.php:96 +#: ../../include/js_strings.php:105 msgid "Thu" msgstr "" -#: ../../include/js_strings.php:97 +#: ../../include/js_strings.php:106 msgid "Fri" msgstr "" -#: ../../include/js_strings.php:98 +#: ../../include/js_strings.php:107 msgid "Sat" msgstr "" -#: ../../include/js_strings.php:99 +#: ../../include/js_strings.php:108 msgctxt "calendar" msgid "today" msgstr "" -#: ../../include/js_strings.php:100 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "month" msgstr "" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "week" msgstr "" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:111 msgctxt "calendar" msgid "day" msgstr "" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "All day" msgstr "" @@ -14160,35 +14208,35 @@ msgstr "" msgid "Work, Fax" msgstr "" -#: ../../include/network.php:760 +#: ../../include/network.php:770 msgid "view full size" msgstr "" -#: ../../include/network.php:1766 +#: ../../include/network.php:1776 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1767 +#: ../../include/network.php:1777 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1771 +#: ../../include/network.php:1781 msgid "Facebook" msgstr "" -#: ../../include/network.php:1773 +#: ../../include/network.php:1783 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1774 +#: ../../include/network.php:1784 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1775 +#: ../../include/network.php:1785 msgid "MySpace" msgstr "" -#: ../../include/language.php:410 +#: ../../include/language.php:436 msgid "Select an alternate language" msgstr "" @@ -14829,55 +14877,55 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:294 +#: ../../include/nav.php:299 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:295 +#: ../../include/nav.php:300 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:301 +#: ../../include/nav.php:306 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:302 +#: ../../include/nav.php:307 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:303 +#: ../../include/nav.php:308 msgid "Toggle System Apps" msgstr "" -#: ../../include/nav.php:389 +#: ../../include/nav.php:394 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:402 +#: ../../include/nav.php:407 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:412 ../../include/photos.php:667 +#: ../../include/nav.php:417 ../../include/photos.php:667 msgid "Photo Albums" msgstr "" -#: ../../include/nav.php:420 +#: ../../include/nav.php:425 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:458 +#: ../../include/nav.php:463 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:469 +#: ../../include/nav.php:474 msgid "View Cards" msgstr "" -#: ../../include/nav.php:480 +#: ../../include/nav.php:485 msgid "View Articles" msgstr "" -#: ../../include/nav.php:492 +#: ../../include/nav.php:497 msgid "View Webpages" msgstr "" |