diff options
| author | Max Kostikov <max@kostikov.co> | 2020-09-17 19:47:44 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-09-17 19:47:44 +0200 |
| commit | 02cf85fa344b028ba2275ed44909ad9eefe7be92 (patch) | |
| tree | 0732ac67cc4c44625278179fa54b62c20326dfe4 | |
| parent | 5271232aa5428f171ba1dedc42165a6a1611334e (diff) | |
| parent | 76a6e0b6fcda9ab87a8f6ec3ee8873d4fcdb4cd4 (diff) | |
| download | volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.tar.gz volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.tar.bz2 volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin/Addons.php | 4 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/features.php | 4 | ||||
| -rw-r--r-- | util/hmessages.po | 5272 | ||||
| -rw-r--r-- | vendor/composer/ClassLoader.php | 2 | ||||
| -rw-r--r-- | vendor/composer/autoload_classmap.php | 3 | ||||
| -rw-r--r-- | vendor/composer/autoload_static.php | 3 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 4 |
9 files changed, 2664 insertions, 2634 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index fadc38b38..024502d2a 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -287,12 +287,16 @@ class ThreadItem { $settings = ''; + $tagger = []; + // FIXME - check this permission if($conv->get_profile_owner() == local_channel()) { + /* disable until we agree on how to implemnt this in zot6/activitypub $tagger = array( 'tagit' => t("Add Tag"), 'classtagger' => "", ); + */ $settings = t('Conversation Tools'); } diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php index 243eb242f..b67ab7b3a 100644 --- a/Zotlabs/Module/Admin/Addons.php +++ b/Zotlabs/Module/Admin/Addons.php @@ -18,7 +18,7 @@ class Addons { @include_once("addon/" . argv(2) . "/" . argv(2) . ".php"); if(function_exists(argv(2).'_plugin_admin_post')) { $func = argv(2) . '_plugin_admin_post'; - $func($a); + $func(); } goaway(z_root() . '/admin/addons/' . argv(2) ); @@ -332,7 +332,7 @@ class Addons { @require_once("addon/$plugin/$plugin.php"); if(function_exists($plugin.'_plugin_admin')) { $func = $plugin.'_plugin_admin'; - $func($a, $admin_form); + $func($admin_form); } } @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '4.7.12' ); +define ( 'STD_VERSION', '5.1' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1238 ); diff --git a/include/features.php b/include/features.php index 0dd245e7f..e1457604b 100644 --- a/include/features.php +++ b/include/features.php @@ -144,7 +144,7 @@ function get_features($filtered = true, $level = (-1)) { 'conversation' => [ t('Conversation'), - + /* disable until we agree on how to implemnt this in zot6/activitypub [ 'commtag', t('Community Tagging'), @@ -152,7 +152,7 @@ function get_features($filtered = true, $level = (-1)) { false, get_config('feature_lock','commtag'), ], - + */ [ 'emojis', t('Emoji Reactions'), diff --git a/util/hmessages.po b/util/hmessages.po index 1ee79b449..bd102535d 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 4.6RC\n" +"Project-Id-Version: 5.0RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-11 08:09+0000\n" +"POT-Creation-Date: 2020-09-17 11:07+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" @@ -17,8 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3231 -#: ../../Zotlabs/Module/Admin/Site.php:187 +#: ../../view/theme/redbasic/php/config.php:15 +#: ../../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:3360 +#: ../../Zotlabs/Module/Admin/Site.php:185 msgid "Default" msgstr "" @@ -28,98 +32,98 @@ msgid "Focus (Hubzilla default)" msgstr "" #: ../../view/theme/redbasic/php/config.php:94 -#: ../../addon/channelreputation/channelreputation.php:142 +#: ../../addon/channelreputation/channelreputation.php:143 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/photocache/Mod_Photocache.php:67 #: ../../addon/redred/Mod_Redred.php:90 ../../addon/redphotos/redphotos.php:136 #: ../../addon/statusnet/Mod_Statusnet.php:193 #: ../../addon/statusnet/Mod_Statusnet.php:251 #: ../../addon/statusnet/Mod_Statusnet.php:306 -#: ../../addon/statusnet/statusnet.php:602 ../../addon/frphotos/frphotos.php:97 -#: ../../addon/rtof/Mod_Rtof.php:72 ../../addon/wppost/Mod_Wppost.php:97 +#: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:72 +#: ../../addon/wppost/Mod_Wppost.php:109 #: ../../addon/content_import/Mod_content_import.php:142 -#: ../../addon/openstreetmap/openstreetmap.php:153 +#: ../../addon/openstreetmap/openstreetmap.php:155 #: ../../addon/ijpost/Mod_Ijpost.php:72 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:65 -#: ../../addon/dwpost/Mod_Dwpost.php:71 -#: ../../addon/startpage/Mod_Startpage.php:73 +#: ../../addon/dwpost/Mod_Dwpost.php:80 +#: ../../addon/startpage/Mod_Startpage.php:73 ../../addon/mail/Mod_Mail.php:310 #: ../../addon/twitter/Mod_Twitter.php:184 #: ../../addon/pumpio/Mod_Pumpio.php:115 #: ../../addon/cart/submodules/subscriptions.php:410 -#: ../../addon/cart/submodules/hzservices.php:642 -#: ../../addon/cart/submodules/manualcat.php:250 -#: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1258 +#: ../../addon/cart/submodules/hzservices.php:643 +#: ../../addon/cart/submodules/orderoptions.php:312 +#: ../../addon/cart/submodules/orderoptions.php:412 +#: ../../addon/cart/submodules/manualcat.php:252 +#: ../../addon/cart/Settings/Cart.php:132 +#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1261 #: ../../addon/nofed/Mod_Nofed.php:53 #: ../../addon/smileybutton/Mod_Smileybutton.php:55 -#: ../../addon/redfiles/redfiles.php:124 -#: ../../addon/diaspora/Mod_Diaspora.php:102 ../../addon/piwik/piwik.php:95 -#: ../../addon/workflow/workflow.php:1256 -#: ../../addon/workflow/workflow.php:1302 -#: ../../addon/workflow/workflow.php:1399 -#: ../../addon/workflow/workflow.php:2398 +#: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:75 +#: ../../addon/diaspora/Mod_Diaspora.php:100 ../../addon/piwik/piwik.php:95 +#: ../../addon/workflow/workflow.php:1461 +#: ../../addon/workflow/workflow.php:1520 +#: ../../addon/workflow/workflow.php:1639 +#: ../../addon/workflow/workflow.php:2742 #: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:94 #: ../../addon/likebanner/likebanner.php:57 -#: ../../addon/chords/Mod_Chords.php:60 ../../addon/fuzzloc/Mod_Fuzzloc.php:56 -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:92 -#: ../../addon/hubwall/hubwall.php:95 -#: ../../addon/flashcards/Mod_Flashcards.php:213 +#: ../../addon/fuzzloc/Mod_Fuzzloc.php:56 ../../addon/hubwall/hubwall.php:95 +#: ../../addon/flashcards/Mod_Flashcards.php:262 #: ../../addon/libertree/Mod_Libertree.php:70 ../../addon/logrot/logrot.php:35 -#: ../../addon/skeleton/Mod_Skeleton.php:51 ../../addon/nsfw/Mod_Nsfw.php:61 -#: ../../addon/mailtest/mailtest.php:100 ../../addon/ljpost/Mod_Ljpost.php:78 -#: ../../addon/hzfiles/hzfiles.php:86 -#: ../../addon/jappixmini/Mod_Jappixmini.php:261 +#: ../../addon/skeleton/Mod_Skeleton.php:51 +#: ../../addon/socialauth/Mod_SocialAuth.php:330 +#: ../../addon/nsfw/Mod_Nsfw.php:61 ../../addon/mailtest/mailtest.php:100 +#: ../../addon/ljpost/Mod_Ljpost.php:82 ../../addon/hzfiles/hzfiles.php:86 #: ../../addon/pageheader/Mod_Pageheader.php:54 ../../addon/irc/irc.php:45 #: ../../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:188 #: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Module/Import.php:646 ../../Zotlabs/Module/Setup.php:304 -#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:150 -#: ../../Zotlabs/Module/Group.php:166 ../../Zotlabs/Module/Oauth.php:111 -#: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 +#: ../../Zotlabs/Module/Import.php:649 ../../Zotlabs/Module/Setup.php:304 +#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:151 +#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Oauth.php:111 +#: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248 #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Mitem.php:259 #: ../../Zotlabs/Module/Filestorage.php:203 -#: ../../Zotlabs/Module/Connect.php:124 ../../Zotlabs/Module/Editpost.php:86 +#: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Editpost.php:86 #: ../../Zotlabs/Module/Admin/Themes.php:158 #: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Security.php:112 +#: ../../Zotlabs/Module/Admin/Security.php:120 #: ../../Zotlabs/Module/Admin/Accounts.php:168 -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:287 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Addons.php:442 -#: ../../Zotlabs/Module/Events.php:501 ../../Zotlabs/Module/Permcats.php:128 +#: ../../Zotlabs/Module/Events.php:501 ../../Zotlabs/Module/Permcats.php:129 #: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Appman.php:155 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Photos.php:1055 ../../Zotlabs/Module/Photos.php:1096 -#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Photos.php:1057 ../../Zotlabs/Module/Photos.php:1097 +#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Module/Profiles.php:725 #: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Module/Affinity.php:87 -#: ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Module/Settings/Network.php:61 -#: ../../Zotlabs/Module/Settings/Features.php:46 -#: ../../Zotlabs/Module/Settings/Channel.php:493 +#: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Module/Settings/Network.php:62 +#: ../../Zotlabs/Module/Settings/Features.php:48 +#: ../../Zotlabs/Module/Settings/Channel.php:494 #: ../../Zotlabs/Module/Settings/Account.php:103 -#: ../../Zotlabs/Module/Settings/Events.php:41 -#: ../../Zotlabs/Module/Settings/Manage.php:41 -#: ../../Zotlabs/Module/Settings/Channel_home.php:89 -#: ../../Zotlabs/Module/Settings/Calendar.php:41 -#: ../../Zotlabs/Module/Settings/Display.php:189 -#: ../../Zotlabs/Module/Settings/Directory.php:41 -#: ../../Zotlabs/Module/Settings/Editor.php:41 -#: ../../Zotlabs/Module/Settings/Connections.php:41 -#: ../../Zotlabs/Module/Settings/Photos.php:41 -#: ../../Zotlabs/Module/Settings/Profiles.php:50 -#: ../../Zotlabs/Module/Settings/Conversation.php:48 -#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Pconfig.php:116 -#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:326 -#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Pdledit.php:107 -#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Settings/Events.php:42 +#: ../../Zotlabs/Module/Settings/Manage.php:43 +#: ../../Zotlabs/Module/Settings/Channel_home.php:91 +#: ../../Zotlabs/Module/Settings/Calendar.php:42 +#: ../../Zotlabs/Module/Settings/Display.php:190 +#: ../../Zotlabs/Module/Settings/Directory.php:42 +#: ../../Zotlabs/Module/Settings/Editor.php:42 +#: ../../Zotlabs/Module/Settings/Connections.php:42 +#: ../../Zotlabs/Module/Settings/Photos.php:42 +#: ../../Zotlabs/Module/Settings/Profiles.php:52 +#: ../../Zotlabs/Module/Settings/Conversation.php:49 +#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Pconfig.php:116 +#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:328 +#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:108 +#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:905 #: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Sources.php:125 -#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:796 +#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:825 msgid "Submit" msgstr "" @@ -133,115 +137,129 @@ msgstr "" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../addon/channelreputation/channelreputation.php:110 +#: ../../addon/channelreputation/channelreputation.php:111 #: ../../addon/redred/Mod_Redred.php:63 #: ../../addon/statusnet/Mod_Statusnet.php:260 #: ../../addon/statusnet/Mod_Statusnet.php:282 #: ../../addon/statusnet/Mod_Statusnet.php:291 ../../addon/rtof/Mod_Rtof.php:49 -#: ../../addon/wppost/Mod_Wppost.php:82 ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/wppost/Mod_Wppost.php:90 +#: ../../addon/wppost/Mod_Wppost.php:94 #: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/content_import/Mod_content_import.php:138 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 -#: ../../addon/dwpost/Mod_Dwpost.php:60 ../../addon/twitter/Mod_Twitter.php:162 +#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65 +#: ../../addon/twitter/Mod_Twitter.php:162 #: ../../addon/twitter/Mod_Twitter.php:171 ../../addon/pumpio/Mod_Pumpio.php:94 #: ../../addon/pumpio/Mod_Pumpio.php:98 ../../addon/pumpio/Mod_Pumpio.php:102 #: ../../addon/cart/submodules/subscriptions.php:153 #: ../../addon/cart/submodules/subscriptions.php:425 -#: ../../addon/cart/submodules/hzservices.php:64 -#: ../../addon/cart/submodules/hzservices.php:648 -#: ../../addon/cart/submodules/hzservices.php:652 +#: ../../addon/cart/submodules/hzservices.php:65 +#: ../../addon/cart/submodules/hzservices.php:649 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/orderoptions.php:72 +#: ../../addon/cart/submodules/orderoptions.php:338 +#: ../../addon/cart/submodules/orderoptions.php:362 +#: ../../addon/cart/submodules/orderoptions.php:438 +#: ../../addon/cart/submodules/orderoptions.php:462 #: ../../addon/cart/submodules/paypalbutton.php:87 #: ../../addon/cart/submodules/paypalbutton.php:95 +#: ../../addon/cart/submodules/paypalbuttonV2.php:88 +#: ../../addon/cart/submodules/paypalbuttonV2.php:96 #: ../../addon/cart/submodules/manualcat.php:63 -#: ../../addon/cart/submodules/manualcat.php:256 -#: ../../addon/cart/submodules/manualcat.php:260 -#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71 -#: ../../addon/cart/cart.php:1252 ../../addon/nofed/Mod_Nofed.php:42 +#: ../../addon/cart/submodules/manualcat.php:258 +#: ../../addon/cart/submodules/manualcat.php:262 +#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 +#: ../../addon/cart/cart.php:1255 ../../addon/nofed/Mod_Nofed.php:42 #: ../../addon/smileybutton/Mod_Smileybutton.php:44 #: ../../addon/libertree/Mod_Libertree.php:59 -#: ../../addon/ljpost/Mod_Ljpost.php:62 ../../addon/ljpost/Mod_Ljpost.php:66 -#: ../../addon/jappixmini/Mod_Jappixmini.php:161 -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -#: ../../addon/jappixmini/Mod_Jappixmini.php:199 -#: ../../addon/jappixmini/Mod_Jappixmini.php:203 -#: ../../addon/jappixmini/Mod_Jappixmini.php:207 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639 -#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Mitem.php:176 -#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 -#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:198 +#: ../../addon/socialauth/Mod_SocialAuth.php:214 +#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1451 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../Zotlabs/Module/Import.php:638 +#: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 +#: ../../Zotlabs/Module/Filestorage.php:198 #: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 -#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:670 -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Settings/Channel.php:309 -#: ../../Zotlabs/Module/Settings/Display.php:89 +#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:672 +#: ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Settings/Display.php:90 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406 -#: ../../Zotlabs/Module/Connedit.php:796 ../../Zotlabs/Module/Sources.php:124 +#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:407 +#: ../../Zotlabs/Module/Connedit.php:797 ../../Zotlabs/Module/Sources.php:124 #: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:162 #: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1679 +#: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1703 msgid "No" msgstr "" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../addon/channelreputation/channelreputation.php:110 +#: ../../addon/channelreputation/channelreputation.php:111 #: ../../addon/redred/Mod_Redred.php:63 #: ../../addon/statusnet/Mod_Statusnet.php:260 #: ../../addon/statusnet/Mod_Statusnet.php:282 #: ../../addon/statusnet/Mod_Statusnet.php:291 ../../addon/rtof/Mod_Rtof.php:49 -#: ../../addon/wppost/Mod_Wppost.php:82 ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/wppost/Mod_Wppost.php:90 +#: ../../addon/wppost/Mod_Wppost.php:94 #: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/content_import/Mod_content_import.php:138 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 -#: ../../addon/dwpost/Mod_Dwpost.php:60 ../../addon/twitter/Mod_Twitter.php:162 +#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65 +#: ../../addon/twitter/Mod_Twitter.php:162 #: ../../addon/twitter/Mod_Twitter.php:171 ../../addon/pumpio/Mod_Pumpio.php:94 #: ../../addon/pumpio/Mod_Pumpio.php:98 ../../addon/pumpio/Mod_Pumpio.php:102 #: ../../addon/cart/submodules/subscriptions.php:153 #: ../../addon/cart/submodules/subscriptions.php:425 -#: ../../addon/cart/submodules/hzservices.php:64 -#: ../../addon/cart/submodules/hzservices.php:648 -#: ../../addon/cart/submodules/hzservices.php:652 +#: ../../addon/cart/submodules/hzservices.php:65 +#: ../../addon/cart/submodules/hzservices.php:649 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/orderoptions.php:72 +#: ../../addon/cart/submodules/orderoptions.php:337 +#: ../../addon/cart/submodules/orderoptions.php:361 +#: ../../addon/cart/submodules/orderoptions.php:437 +#: ../../addon/cart/submodules/orderoptions.php:461 #: ../../addon/cart/submodules/paypalbutton.php:87 #: ../../addon/cart/submodules/paypalbutton.php:95 +#: ../../addon/cart/submodules/paypalbuttonV2.php:88 +#: ../../addon/cart/submodules/paypalbuttonV2.php:96 #: ../../addon/cart/submodules/manualcat.php:63 -#: ../../addon/cart/submodules/manualcat.php:256 -#: ../../addon/cart/submodules/manualcat.php:260 -#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71 -#: ../../addon/cart/cart.php:1252 ../../addon/nofed/Mod_Nofed.php:42 +#: ../../addon/cart/submodules/manualcat.php:258 +#: ../../addon/cart/submodules/manualcat.php:262 +#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 +#: ../../addon/cart/cart.php:1255 ../../addon/nofed/Mod_Nofed.php:42 #: ../../addon/smileybutton/Mod_Smileybutton.php:44 #: ../../addon/libertree/Mod_Libertree.php:59 -#: ../../addon/ljpost/Mod_Ljpost.php:62 ../../addon/ljpost/Mod_Ljpost.php:66 -#: ../../addon/jappixmini/Mod_Jappixmini.php:161 -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -#: ../../addon/jappixmini/Mod_Jappixmini.php:199 -#: ../../addon/jappixmini/Mod_Jappixmini.php:203 -#: ../../addon/jappixmini/Mod_Jappixmini.php:207 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639 -#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Mitem.php:176 -#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 -#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:198 +#: ../../addon/socialauth/Mod_SocialAuth.php:214 +#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1451 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../Zotlabs/Module/Import.php:638 +#: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 +#: ../../Zotlabs/Module/Filestorage.php:198 #: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:257 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 -#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:670 -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Settings/Channel.php:309 -#: ../../Zotlabs/Module/Settings/Display.php:89 +#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:672 +#: ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Settings/Display.php:90 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406 +#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:407 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411 -#: ../../boot.php:1679 +#: ../../boot.php:1703 msgid "Yes" msgstr "" @@ -329,91 +347,91 @@ msgstr "" msgid "Source channel not found." msgstr "" -#: ../../addon/channelreputation/channelreputation.php:100 #: ../../addon/channelreputation/channelreputation.php:101 +#: ../../addon/channelreputation/channelreputation.php:102 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 #: ../../addon/cart/myshop.php:211 ../../addon/cart/myshop.php:259 #: ../../addon/cart/myshop.php:294 ../../addon/cart/myshop.php:317 msgid "Access Denied" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:108 +#: ../../addon/channelreputation/channelreputation.php:109 msgid "Enable Community Moderation" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:116 +#: ../../addon/channelreputation/channelreputation.php:117 msgid "Reputation automatically given to new members" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:117 +#: ../../addon/channelreputation/channelreputation.php:118 msgid "Reputation will never fall below this value" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:118 +#: ../../addon/channelreputation/channelreputation.php:119 msgid "Minimum reputation before posting is allowed" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:119 +#: ../../addon/channelreputation/channelreputation.php:120 msgid "Minimum reputation before commenting is allowed" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:120 +#: ../../addon/channelreputation/channelreputation.php:121 msgid "Minimum reputation before a member is able to moderate other posts" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:121 +#: ../../addon/channelreputation/channelreputation.php:122 msgid "" "Max ratio of moderator's reputation that can be added to/deducted from " "reputation of person being moderated" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:122 +#: ../../addon/channelreputation/channelreputation.php:123 msgid "Reputation \"cost\" to post" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:123 +#: ../../addon/channelreputation/channelreputation.php:124 msgid "Reputation \"cost\" to comment" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:124 +#: ../../addon/channelreputation/channelreputation.php:125 msgid "" "Reputation automatically recovers at this rate per hour until it reaches " "minimum_to_post" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:125 +#: ../../addon/channelreputation/channelreputation.php:126 msgid "" "When minimum_to_moderate > reputation > minimum_to_post reputation recovers " "at this rate per hour" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:139 +#: ../../addon/channelreputation/channelreputation.php:140 msgid "Community Moderation Settings" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:229 +#: ../../addon/channelreputation/channelreputation.php:232 msgid "Channel Reputation" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:230 -#: ../../include/acl_selectors.php:125 ../../Zotlabs/Module/Photos.php:1274 -#: ../../Zotlabs/Lib/ThreadItem.php:463 +#: ../../addon/channelreputation/channelreputation.php:233 +#: ../../include/acl_selectors.php:125 ../../Zotlabs/Widget/Pinned.php:160 +#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:495 msgid "Close" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:233 +#: ../../addon/channelreputation/channelreputation.php:236 msgid "An Error has occurred." msgstr "" -#: ../../addon/channelreputation/channelreputation.php:251 +#: ../../addon/channelreputation/channelreputation.php:254 msgid "Upvote" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:252 +#: ../../addon/channelreputation/channelreputation.php:255 msgid "Downvote" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:374 +#: ../../addon/channelreputation/channelreputation.php:414 msgid "Can moderate reputation on my channel." msgstr "" @@ -432,37 +450,36 @@ msgstr "" #: ../../addon/gallery/Mod_Gallery.php:58 #: ../../addon/planets/Mod_Planets.php:20 ../../addon/redred/Mod_Redred.php:50 #: ../../addon/statusnet/Mod_Statusnet.php:146 ../../addon/rtof/Mod_Rtof.php:36 -#: ../../addon/wppost/Mod_Wppost.php:41 ../../addon/hsse/Mod_Hsse.php:21 +#: ../../addon/wppost/Mod_Wppost.php:43 ../../addon/hsse/Mod_Hsse.php:21 #: ../../addon/ijpost/Mod_Ijpost.php:35 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:40 -#: ../../addon/dwpost/Mod_Dwpost.php:36 +#: ../../addon/dwpost/Mod_Dwpost.php:39 #: ../../addon/startpage/Mod_Startpage.php:50 #: ../../addon/twitter/Mod_Twitter.php:78 ../../addon/pumpio/Mod_Pumpio.php:53 #: ../../addon/sendzid/Mod_Sendzid.php:20 ../../addon/nofed/Mod_Nofed.php:33 #: ../../addon/smileybutton/Mod_Smileybutton.php:35 #: ../../addon/diaspora/Mod_Diaspora.php:58 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:34 -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:53 #: ../../addon/libertree/Mod_Libertree.php:35 +#: ../../addon/hideaside/Mod_Hideaside.php:23 #: ../../addon/skeleton/Mod_Skeleton.php:32 ../../addon/nsfw/Mod_Nsfw.php:33 -#: ../../addon/gnusoc/Mod_Gnusoc.php:22 ../../addon/ljpost/Mod_Ljpost.php:37 -#: ../../addon/jappixmini/Mod_Jappixmini.php:96 +#: ../../addon/gnusoc/Mod_Gnusoc.php:22 ../../addon/ljpost/Mod_Ljpost.php:38 #: ../../addon/authchoose/Mod_Authchoose.php:28 #: ../../addon/pageheader/Mod_Pageheader.php:34 #: ../../addon/xmpp/Mod_Xmpp.php:35 ../../Zotlabs/Module/Tokens.php:99 -#: ../../Zotlabs/Module/Group.php:106 ../../Zotlabs/Module/Oauth.php:100 -#: ../../Zotlabs/Module/Chat.php:102 ../../Zotlabs/Module/Poke.php:165 -#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Webpages.php:48 -#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Pubstream.php:20 -#: ../../Zotlabs/Module/Permcats.php:62 ../../Zotlabs/Module/Lang.php:17 -#: ../../Zotlabs/Module/Uexport.php:61 ../../Zotlabs/Module/Mood.php:134 -#: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Articles.php:52 -#: ../../Zotlabs/Module/Bookmarks.php:78 ../../Zotlabs/Module/Probe.php:18 -#: ../../Zotlabs/Module/Invite.php:110 ../../Zotlabs/Module/Notes.php:56 -#: ../../Zotlabs/Module/Affinity.php:52 ../../Zotlabs/Module/Defperms.php:189 -#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29 -#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Wiki.php:52 -#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Sources.php:88 +#: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Oauth.php:100 +#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Poke.php:165 +#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Webpages.php:48 +#: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Permcats.php:63 +#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:61 +#: ../../Zotlabs/Module/Mood.php:134 ../../Zotlabs/Module/Cards.php:51 +#: ../../Zotlabs/Module/Articles.php:52 ../../Zotlabs/Module/Bookmarks.php:78 +#: ../../Zotlabs/Module/Probe.php:18 ../../Zotlabs/Module/Invite.php:110 +#: ../../Zotlabs/Module/Notes.php:57 ../../Zotlabs/Module/Affinity.php:52 +#: ../../Zotlabs/Module/Defperms.php:190 ../../Zotlabs/Module/Oauth2.php:106 +#: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Pdledit.php:43 +#: ../../Zotlabs/Module/Wiki.php:52 ../../Zotlabs/Module/Suggest.php:40 +#: ../../Zotlabs/Module/Sources.php:88 msgid "Not Installed" msgstr "" @@ -484,8 +501,8 @@ msgstr "" #: ../../addon/superblock/Mod_Superblock.php:91 #: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459 -#: ../../Zotlabs/Module/Profile_photo.php:499 -#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Photos.php:993 +#: ../../Zotlabs/Module/Profile_photo.php:501 +#: ../../Zotlabs/Module/Cover_photo.php:424 ../../Zotlabs/Module/Photos.php:995 msgid "Remove" msgstr "" @@ -497,6 +514,7 @@ msgstr "" #: ../../addon/nsabait/Mod_Nsabait.php:24 #: ../../addon/rainbowtag/Mod_Rainbowtag.php:26 #: ../../addon/planets/Mod_Planets.php:23 ../../addon/hsse/Mod_Hsse.php:26 +#: ../../addon/hideaside/Mod_Hideaside.php:27 #: ../../addon/authchoose/Mod_Authchoose.php:33 msgid "Installed" msgstr "" @@ -546,14 +564,14 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:110 -#: ../../include/conversation.php:1038 ../../Zotlabs/Module/Connedit.php:608 -#: ../../Zotlabs/Lib/Apps.php:343 +#: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:112 +#: ../../include/conversation.php:1065 ../../Zotlabs/Module/Connedit.php:609 +#: ../../Zotlabs/Lib/Apps.php:344 msgid "View Profile" msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:115 -#: ../../include/channel.php:1430 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:117 +#: ../../include/channel.php:1527 msgid "Edit Profile" msgstr "" @@ -628,7 +646,7 @@ msgid "Unknown error. Please try again later." msgstr "" #: ../../addon/openclipatar/openclipatar.php:298 -#: ../../Zotlabs/Module/Profile_photo.php:252 +#: ../../Zotlabs/Module/Profile_photo.php:254 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." @@ -639,7 +657,7 @@ msgid "Profile photo updated successfully." msgstr "" #: ../../addon/bookmarker/bookmarker.php:38 -#: ../../Zotlabs/Lib/ThreadItem.php:440 +#: ../../Zotlabs/Lib/ThreadItem.php:472 msgid "Save Bookmarks" msgstr "" @@ -660,172 +678,14 @@ msgstr "" msgid "Queueworker Settings" msgstr "" -#: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1106 -#: ../../include/text.php:1118 ../../Zotlabs/Widget/Notes.php:23 +#: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1132 +#: ../../include/text.php:1144 ../../Zotlabs/Widget/Notes.php:23 #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104 msgid "Save" msgstr "" -#: ../../addon/tour/tour.php:76 -msgid "Edit your profile and change settings." -msgstr "" - -#: ../../addon/tour/tour.php:77 -msgid "Click here to see activity from your connections." -msgstr "" - -#: ../../addon/tour/tour.php:78 -msgid "Click here to see your channel home." -msgstr "" - -#: ../../addon/tour/tour.php:79 -msgid "You can access your private messages from here." -msgstr "" - -#: ../../addon/tour/tour.php:80 -msgid "Create new events here." -msgstr "" - -#: ../../addon/tour/tour.php:81 -msgid "" -"You can accept new connections and change permissions for existing ones " -"here. You can also e.g. create groups of contacts." -msgstr "" - -#: ../../addon/tour/tour.php:82 -msgid "System notifications will arrive here" -msgstr "" - -#: ../../addon/tour/tour.php:83 -msgid "Search for content and users" -msgstr "" - -#: ../../addon/tour/tour.php:84 -msgid "Browse for new contacts" -msgstr "" - -#: ../../addon/tour/tour.php:85 -msgid "Launch installed apps" -msgstr "" - -#: ../../addon/tour/tour.php:86 -msgid "Looking for help? Click here." -msgstr "" - -#: ../../addon/tour/tour.php:87 -msgid "" -"New events have occurred in your network. Click here to see what has " -"happened!" -msgstr "" - -#: ../../addon/tour/tour.php:88 -msgid "You have received a new private message. Click here to see from who!" -msgstr "" - -#: ../../addon/tour/tour.php:89 -msgid "There are events this week. Click here too see which!" -msgstr "" - -#: ../../addon/tour/tour.php:90 -msgid "You have received a new introduction. Click here to see who!" -msgstr "" - -#: ../../addon/tour/tour.php:91 -msgid "" -"There is a new system notification. Click here to see what has happened!" -msgstr "" - -#: ../../addon/tour/tour.php:94 -msgid "Click here to share text, images, videos and sound." -msgstr "" - -#: ../../addon/tour/tour.php:95 -msgid "You can write an optional title for your update (good for long posts)." -msgstr "" - -#: ../../addon/tour/tour.php:96 -msgid "Entering some categories here makes it easier to find your post later." -msgstr "" - -#: ../../addon/tour/tour.php:97 -msgid "Share photos, links, location, etc." -msgstr "" - -#: ../../addon/tour/tour.php:98 -msgid "" -"Only want to share content for a while? Make it expire at a certain date." -msgstr "" - -#: ../../addon/tour/tour.php:99 -msgid "You can password protect content." -msgstr "" - -#: ../../addon/tour/tour.php:100 -msgid "Choose who you share with." -msgstr "" - -#: ../../addon/tour/tour.php:102 -msgid "Click here when you are done." -msgstr "" - -#: ../../addon/tour/tour.php:105 -msgid "Adjust from which channels posts should be displayed." -msgstr "" - -#: ../../addon/tour/tour.php:106 -msgid "Only show posts from channels in the specified privacy group." -msgstr "" - -#: ../../addon/tour/tour.php:110 -msgid "" -"Easily find posts containing tags (keywords preceded by the \"#\" symbol)." -msgstr "" - -#: ../../addon/tour/tour.php:111 -msgid "Easily find posts in given category." -msgstr "" - -#: ../../addon/tour/tour.php:112 -msgid "Easily find posts by date." -msgstr "" - -#: ../../addon/tour/tour.php:113 -msgid "" -"Suggested users who have volounteered to be shown as suggestions, and who we " -"think you might find interesting." -msgstr "" - -#: ../../addon/tour/tour.php:114 -msgid "Here you see channels you have connected to." -msgstr "" - -#: ../../addon/tour/tour.php:115 -msgid "Save your search so you can repeat it at a later date." -msgstr "" - -#: ../../addon/tour/tour.php:118 -msgid "" -"If you see this icon you can be sure that the sender is who it say it is. It " -"is normal that it is not always possible to verify the sender, so the icon " -"will be missing sometimes. There is usually no need to worry about that." -msgstr "" - -#: ../../addon/tour/tour.php:119 -msgid "" -"Danger! It seems someone tried to forge a message! This message is not " -"necessarily from who it says it is from!" -msgstr "" - -#: ../../addon/tour/tour.php:126 -msgid "" -"Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can " -"pause it at any time and continue where you left off by reloading the page, " -"or navigting to another page.</p><p>You can also advance by pressing the " -"return key" -msgstr "" - #: ../../addon/rainbowtag/Mod_Rainbowtag.php:15 msgid "Add some colour to tag clouds" msgstr "" @@ -865,15 +725,15 @@ msgstr "" msgid "Photo Cache" msgstr "" -#: ../../addon/gallery/gallery.php:38 ../../addon/gallery/Mod_Gallery.php:136 +#: ../../addon/gallery/gallery.php:43 ../../addon/gallery/Mod_Gallery.php:136 msgid "Gallery" msgstr "" -#: ../../addon/gallery/gallery.php:41 +#: ../../addon/gallery/gallery.php:46 msgid "Photo Gallery" msgstr "" -#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1327 +#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1424 #: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Webpages.php:39 #: ../../Zotlabs/Module/Filestorage.php:53 ../../Zotlabs/Module/Connect.php:17 @@ -902,34 +762,33 @@ msgid "" "Set a random planet from the Star Wars Empire as your location when posting" msgstr "" -#: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44 -#: ../../addon/keepout/keepout.php:36 -#: ../../addon/flashcards/Mod_Flashcards.php:276 ../../include/photos.php:27 -#: ../../include/items.php:3796 ../../include/attach.php:150 -#: ../../include/attach.php:199 ../../include/attach.php:272 -#: ../../include/attach.php:380 ../../include/attach.php:394 -#: ../../include/attach.php:401 ../../include/attach.php:483 -#: ../../include/attach.php:1043 ../../include/attach.php:1117 -#: ../../include/attach.php:1280 ../../Zotlabs/Module/Article_edit.php:51 -#: ../../Zotlabs/Module/Network.php:19 ../../Zotlabs/Module/Register.php:80 -#: ../../Zotlabs/Module/Setup.php:206 +#: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:25 +#: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36 +#: ../../include/photos.php:27 ../../include/items.php:3965 +#: ../../include/attach.php:156 ../../include/attach.php:205 +#: ../../include/attach.php:278 ../../include/attach.php:386 +#: ../../include/attach.php:400 ../../include/attach.php:407 +#: ../../include/attach.php:489 ../../include/attach.php:1055 +#: ../../include/attach.php:1129 ../../include/attach.php:1292 +#: ../../Zotlabs/Module/Article_edit.php:51 ../../Zotlabs/Module/Network.php:19 +#: ../../Zotlabs/Module/Register.php:80 ../../Zotlabs/Module/Setup.php:206 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Channel.php:169 ../../Zotlabs/Module/Channel.php:332 -#: ../../Zotlabs/Module/Channel.php:371 ../../Zotlabs/Module/Group.php:14 -#: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Card_edit.php:51 +#: ../../Zotlabs/Module/Channel.php:181 ../../Zotlabs/Module/Channel.php:348 +#: ../../Zotlabs/Module/Channel.php:387 ../../Zotlabs/Module/Group.php:15 +#: ../../Zotlabs/Module/Group.php:31 ../../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:115 -#: ../../Zotlabs/Module/Chat.php:120 -#: ../../Zotlabs/Module/Channel_calendar.php:224 -#: ../../Zotlabs/Module/Like.php:187 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Item.php:417 ../../Zotlabs/Module/Item.php:436 -#: ../../Zotlabs/Module/Item.php:446 ../../Zotlabs/Module/Item.php:1315 +#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:113 +#: ../../Zotlabs/Module/Chat.php:118 +#: ../../Zotlabs/Module/Channel_calendar.php:230 +#: ../../Zotlabs/Module/Like.php:193 ../../Zotlabs/Module/Poke.php:157 +#: ../../Zotlabs/Module/Item.php:383 ../../Zotlabs/Module/Item.php:402 +#: ../../Zotlabs/Module/Item.php:412 ../../Zotlabs/Module/Item.php:1328 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:85 #: ../../Zotlabs/Module/Profile.php:101 -#: ../../Zotlabs/Module/Sharedwithme.php:16 +#: ../../Zotlabs/Module/Sharedwithme.php:19 #: ../../Zotlabs/Module/Webpages.php:133 #: ../../Zotlabs/Module/Filestorage.php:17 #: ../../Zotlabs/Module/Filestorage.php:72 @@ -939,50 +798,50 @@ msgstr "" #: ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Events.php:277 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Authtest.php:16 -#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Moderate.php:13 -#: ../../Zotlabs/Module/Display.php:451 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Moderate.php:15 +#: ../../Zotlabs/Module/Display.php:456 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Mood.php:126 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Cards.php:86 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Message.php:18 -#: ../../Zotlabs/Module/Profile_photo.php:336 -#: ../../Zotlabs/Module/Profile_photo.php:349 +#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Vote.php:19 +#: ../../Zotlabs/Module/Profile_photo.php:338 +#: ../../Zotlabs/Module/Profile_photo.php:351 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Settings.php:59 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 #: ../../Zotlabs/Module/Connections.php:32 -#: ../../Zotlabs/Module/Cover_photo.php:347 -#: ../../Zotlabs/Module/Cover_photo.php:360 ../../Zotlabs/Module/Photos.php:69 +#: ../../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:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637 #: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102 -#: ../../Zotlabs/Module/Mail.php:150 ../../Zotlabs/Module/Block.php:24 -#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Rate.php:113 -#: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141 -#: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Thing.php:280 -#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 -#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Wiki.php:59 -#: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428 -#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:399 +#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 +#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Menu.php:130 +#: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Defperms.php:182 +#: ../../Zotlabs/Module/Thing.php:282 ../../Zotlabs/Module/Thing.php:302 +#: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35 +#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 +#: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Suggest.php:32 +#: ../../Zotlabs/Module/Connedit.php:400 #: ../../Zotlabs/Module/Notifications.php:11 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:133 -#: ../../Zotlabs/Web/WebServer.php:123 +#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135 +#: ../../Zotlabs/Web/WebServer.php:115 msgid "Permission denied." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1610 +#: ../../include/selectors.php:77 ../../include/channel.php:1707 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1608 +#: ../../include/selectors.php:77 ../../include/channel.php:1705 msgid "Female" msgstr "" @@ -996,7 +855,7 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:317 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:320 msgid "Login failed." msgstr "" @@ -1028,17 +887,17 @@ msgstr "" #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:71 -#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1732 -#: ../../Zotlabs/Module/Cdav.php:1377 +#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1736 +#: ../../Zotlabs/Module/Cdav.php:1372 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 -#: ../../Zotlabs/Module/Profiles.php:787 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:928 msgid "Email" msgstr "" #: ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 -#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:360 +#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:361 msgid "Profile Photo" msgstr "" @@ -1066,16 +925,16 @@ msgstr "" msgid "Profile Photo 128px" msgstr "" -#: ../../addon/openid/MysqlProvider.php:67 +#: ../../addon/openid/MysqlProvider.php:67 ../../include/event.php:123 msgid "Timezone" msgstr "" #: ../../addon/openid/MysqlProvider.php:68 -#: ../../Zotlabs/Module/Profiles.php:767 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Homepage URL" msgstr "" -#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:358 +#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:359 msgid "Language" msgstr "" @@ -1096,7 +955,7 @@ msgid "Birthdate" msgstr "" #: ../../addon/openid/MysqlProvider.php:74 -#: ../../Zotlabs/Module/Profiles.php:486 +#: ../../Zotlabs/Module/Profiles.php:488 msgid "Gender" msgstr "" @@ -1251,7 +1110,7 @@ msgstr "" msgid "Channel is required." msgstr "" -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:325 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326 msgid "Invalid channel." msgstr "" @@ -1289,7 +1148,6 @@ msgid "Hubzilla channel name" msgstr "" #: ../../addon/redred/Mod_Redred.php:79 -#: ../../addon/jappixmini/Mod_Jappixmini.php:195 msgid "Hubzilla password" msgstr "" @@ -1305,14 +1163,14 @@ msgstr "" msgid "Photos imported" msgstr "" -#: ../../addon/redphotos/redphotos.php:119 ../../addon/frphotos/frphotos.php:82 +#: ../../addon/redphotos/redphotos.php:119 #: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75 -#: ../../include/items.php:435 ../../Zotlabs/Module/Import_items.php:120 -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:98 -#: ../../Zotlabs/Module/Like.php:301 ../../Zotlabs/Module/Cloud.php:119 -#: ../../Zotlabs/Module/Share.php:71 ../../Zotlabs/Module/Subthread.php:86 +#: ../../include/items.php:439 ../../Zotlabs/Module/Import_items.php:120 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:99 +#: ../../Zotlabs/Module/Like.php:295 ../../Zotlabs/Module/Cloud.php:119 +#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82 -#: ../../Zotlabs/Web/WebServer.php:122 +#: ../../Zotlabs/Web/WebServer.php:114 msgid "Permission denied" msgstr "" @@ -1355,11 +1213,11 @@ msgstr "" msgid "0 or blank to import all available" msgstr "" -#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1692 -#: ../../addon/diaspora/Receiver.php:1592 ../../include/text.php:2119 -#: ../../include/conversation.php:116 ../../Zotlabs/Module/Like.php:392 -#: ../../Zotlabs/Module/Tagger.php:69 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:2444 +#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1810 +#: ../../addon/diaspora/Receiver.php:1597 ../../include/text.php:2233 +#: ../../include/conversation.php:118 ../../Zotlabs/Module/Like.php:386 +#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:112 +#: ../../Zotlabs/Lib/Activity.php:2892 msgid "photo" msgstr "" @@ -1491,7 +1349,7 @@ msgid "Post to GNU social" msgstr "" #: ../../addon/statusnet/statusnet.php:593 -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "Site name" msgstr "" @@ -1499,13 +1357,13 @@ msgstr "" msgid "API URL" msgstr "" -#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:501 +#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:506 #: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141 #: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147 msgid "Consumer Secret" msgstr "" -#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:500 +#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:505 #: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140 msgid "Consumer Key" msgstr "" @@ -1514,26 +1372,6 @@ msgstr "" msgid "Application name" msgstr "" -#: ../../addon/frphotos/frphotos.php:92 -msgid "Friendica Photo Album Import" -msgstr "" - -#: ../../addon/frphotos/frphotos.php:93 -msgid "This will import all your Friendica photo albums to this Red channel." -msgstr "" - -#: ../../addon/frphotos/frphotos.php:94 -msgid "Friendica Server base URL" -msgstr "" - -#: ../../addon/frphotos/frphotos.php:95 -msgid "Friendica Login Username" -msgstr "" - -#: ../../addon/frphotos/frphotos.php:96 -msgid "Friendica Login Password" -msgstr "" - #: ../../addon/rtof/Mod_Rtof.php:24 msgid "Friendica Crosspost Connector Settings saved." msgstr "" @@ -1574,51 +1412,66 @@ msgstr "" msgid "Post to WordPress" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:28 +#: ../../addon/wppost/wppost.php:173 ../../addon/wppost/Mod_Wppost.php:98 +#: ../../addon/dwpost/Mod_Dwpost.php:69 ../../addon/dwpost/dwpost.php:134 +#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:384 +msgid "Source" +msgstr "" + +#: ../../addon/wppost/Mod_Wppost.php:30 msgid "Wordpress Settings saved." msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:41 +#: ../../addon/wppost/Mod_Wppost.php:43 msgid "Wordpress Post App" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:42 +#: ../../addon/wppost/Mod_Wppost.php:44 msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:65 +#: ../../addon/wppost/Mod_Wppost.php:69 msgid "WordPress username" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:69 +#: ../../addon/wppost/Mod_Wppost.php:73 msgid "WordPress password" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:73 +#: ../../addon/wppost/Mod_Wppost.php:77 msgid "WordPress API URL" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:74 +#: ../../addon/wppost/Mod_Wppost.php:78 msgid "Typically https://your-blog.tld/xmlrpc.php" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:77 +#: ../../addon/wppost/Mod_Wppost.php:81 msgid "WordPress blogid" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:78 +#: ../../addon/wppost/Mod_Wppost.php:82 msgid "For multi-user sites such as wordpress.com, otherwise leave blank" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:82 +#: ../../addon/wppost/Mod_Wppost.php:86 msgid "Post to WordPress by default" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/wppost/Mod_Wppost.php:90 msgid "Forward comments (requires hubzilla_wp plugin)" msgstr "" -#: ../../addon/wppost/Mod_Wppost.php:94 +#: ../../addon/wppost/Mod_Wppost.php:94 ../../addon/dwpost/Mod_Dwpost.php:65 +#: ../../addon/ljpost/Mod_Ljpost.php:71 +msgid "Add link to original post" +msgstr "" + +#: ../../addon/wppost/Mod_Wppost.php:98 ../../addon/dwpost/Mod_Dwpost.php:69 +msgid "Link description (default:" +msgstr "" + +#: ../../addon/wppost/Mod_Wppost.php:106 msgid "Wordpress Post" msgstr "" @@ -1643,7 +1496,7 @@ msgid "" msgstr "" #: ../../addon/content_import/Mod_content_import.php:135 -#: ../../Zotlabs/Lib/Apps.php:331 +#: ../../Zotlabs/Lib/Apps.php:332 msgid "Content Import" msgstr "" @@ -1684,211 +1537,211 @@ msgstr "" msgid "Until modified date yyyy-mm-dd" msgstr "" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1285 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1313 msgid "Set your location" msgstr "" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1286 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1314 msgid "Clear browser location" msgstr "" -#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1298 +#: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:166 +#: ../../addon/mail/Mod_Mail.php:309 ../../include/conversation.php:1326 #: ../../Zotlabs/Module/Article_edit.php:100 #: ../../Zotlabs/Module/Card_edit.php:101 -#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:222 -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Mail.php:292 -#: ../../Zotlabs/Module/Mail.php:435 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220 +#: ../../Zotlabs/Module/Editblock.php:116 msgid "Insert web link" msgstr "" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1302 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1330 msgid "Embed (existing) photo from your photo albums" msgstr "" -#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1337 -#: ../../Zotlabs/Module/Chat.php:220 ../../Zotlabs/Module/Mail.php:245 -#: ../../Zotlabs/Module/Mail.php:366 +#: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:119 +#: ../../addon/mail/Mod_Mail.php:240 ../../include/conversation.php:1365 +#: ../../Zotlabs/Module/Chat.php:218 msgid "Please enter a link URL:" msgstr "" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1338 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1366 msgid "Tag term:" msgstr "" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1339 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1367 msgid "Where are you right now?" msgstr "" -#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1342 -#: ../../Zotlabs/Module/Profile_photo.php:507 -#: ../../Zotlabs/Module/Cover_photo.php:436 ../../Zotlabs/Module/Wiki.php:403 +#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1370 +#: ../../Zotlabs/Module/Profile_photo.php:509 +#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:403 msgid "Choose images to embed" msgstr "" -#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1343 -#: ../../Zotlabs/Module/Profile_photo.php:508 -#: ../../Zotlabs/Module/Cover_photo.php:437 ../../Zotlabs/Module/Wiki.php:404 +#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1371 +#: ../../Zotlabs/Module/Profile_photo.php:510 +#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:404 msgid "Choose an album" msgstr "" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1344 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1372 msgid "Choose a different album..." msgstr "" -#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1345 -#: ../../Zotlabs/Module/Profile_photo.php:510 -#: ../../Zotlabs/Module/Cover_photo.php:439 ../../Zotlabs/Module/Wiki.php:406 +#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1373 +#: ../../Zotlabs/Module/Profile_photo.php:512 +#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:406 msgid "Error getting album list" msgstr "" -#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1346 -#: ../../Zotlabs/Module/Profile_photo.php:511 -#: ../../Zotlabs/Module/Cover_photo.php:440 ../../Zotlabs/Module/Wiki.php:407 +#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1374 +#: ../../Zotlabs/Module/Profile_photo.php:513 +#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:407 msgid "Error getting photo link" msgstr "" -#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1347 -#: ../../Zotlabs/Module/Profile_photo.php:512 -#: ../../Zotlabs/Module/Cover_photo.php:441 ../../Zotlabs/Module/Wiki.php:408 +#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1375 +#: ../../Zotlabs/Module/Profile_photo.php:514 +#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:408 msgid "Error getting album" msgstr "" -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1348 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1376 msgid "Comments enabled" msgstr "" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1349 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1377 msgid "Comments disabled" msgstr "" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1359 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1387 #: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:486 -#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Lib/ThreadItem.php:806 +#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Lib/ThreadItem.php:835 msgid "Preview" msgstr "" -#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1392 +#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1420 #: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:256 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1075 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1077 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 msgid "Share" msgstr "" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1401 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1429 msgid "Page link name" msgstr "" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1404 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1432 msgid "Post as" msgstr "" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1406 -#: ../../Zotlabs/Lib/ThreadItem.php:797 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1434 +#: ../../Zotlabs/Lib/ThreadItem.php:826 msgid "Bold" msgstr "" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1407 -#: ../../Zotlabs/Lib/ThreadItem.php:798 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1435 +#: ../../Zotlabs/Lib/ThreadItem.php:827 msgid "Italic" msgstr "" -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1408 -#: ../../Zotlabs/Lib/ThreadItem.php:799 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1436 +#: ../../Zotlabs/Lib/ThreadItem.php:828 msgid "Underline" msgstr "" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1409 -#: ../../Zotlabs/Lib/ThreadItem.php:800 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1437 +#: ../../Zotlabs/Lib/ThreadItem.php:829 msgid "Quote" msgstr "" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1410 -#: ../../Zotlabs/Lib/ThreadItem.php:801 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1438 +#: ../../Zotlabs/Lib/ThreadItem.php:830 msgid "Code" msgstr "" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1411 -#: ../../Zotlabs/Lib/ThreadItem.php:803 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1439 +#: ../../Zotlabs/Lib/ThreadItem.php:832 msgid "Attach/Upload file" msgstr "" -#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1414 +#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1442 #: ../../Zotlabs/Module/Wiki.php:400 msgid "Embed an image from your albums" msgstr "" #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 -#: ../../include/conversation.php:1415 ../../include/conversation.php:1464 +#: ../../include/conversation.php:1443 ../../include/conversation.php:1496 #: ../../Zotlabs/Module/Article_edit.php:130 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Card_edit.php:131 ../../Zotlabs/Module/Oauth.php:112 #: ../../Zotlabs/Module/Oauth.php:138 ../../Zotlabs/Module/Editwebpage.php:169 -#: ../../Zotlabs/Module/Cdav.php:1081 ../../Zotlabs/Module/Cdav.php:1391 +#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1386 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../Zotlabs/Module/Editpost.php:110 #: ../../Zotlabs/Module/Admin/Addons.php:427 -#: ../../Zotlabs/Module/Profile_photo.php:505 +#: ../../Zotlabs/Module/Profile_photo.php:507 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:55 #: ../../Zotlabs/Module/Editlayout.php:140 -#: ../../Zotlabs/Module/Cover_photo.php:434 -#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:117 +#: ../../Zotlabs/Module/Cover_photo.php:428 +#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Oauth2.php:117 #: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:368 -#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:941 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:942 msgid "Cancel" msgstr "" #: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257 -#: ../../include/conversation.php:1416 ../../include/conversation.php:1463 -#: ../../Zotlabs/Module/Profile_photo.php:506 -#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:402 +#: ../../include/conversation.php:1444 ../../include/conversation.php:1495 +#: ../../Zotlabs/Module/Profile_photo.php:508 +#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:402 msgid "OK" msgstr "" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1418 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1446 msgid "Toggle voting" msgstr "" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1421 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1453 msgid "Disable comments" msgstr "" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1422 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1454 msgid "Toggle comments" msgstr "" -#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1427 +#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1459 #: ../../Zotlabs/Module/Article_edit.php:116 #: ../../Zotlabs/Module/Card_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:671 -#: ../../Zotlabs/Module/Photos.php:1041 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:673 +#: ../../Zotlabs/Module/Photos.php:1043 msgid "Title (optional)" msgstr "" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1430 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1462 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1431 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1463 #: ../../Zotlabs/Module/Events.php:487 msgid "Permission settings" msgstr "" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1453 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1485 msgid "Other networks and post services" msgstr "" -#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1456 -#: ../../Zotlabs/Module/Mail.php:296 ../../Zotlabs/Module/Mail.php:439 +#: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:170 +#: ../../addon/mail/Mod_Mail.php:313 ../../include/conversation.php:1488 msgid "Set expiration date" msgstr "" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1459 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1491 msgid "Set publish date" msgstr "" -#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1461 -#: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:298 -#: ../../Zotlabs/Module/Mail.php:441 ../../Zotlabs/Lib/ThreadItem.php:810 +#: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:172 +#: ../../addon/mail/Mod_Mail.php:315 ../../include/conversation.php:1493 +#: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:839 msgid "Encrypt text" msgstr "" @@ -1904,53 +1757,53 @@ msgstr "" msgid "WYSIWYG Status" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:131 +#: ../../addon/openstreetmap/openstreetmap.php:133 msgid "View Larger" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:154 +#: ../../addon/openstreetmap/openstreetmap.php:156 msgid "Tile Server URL" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:154 +#: ../../addon/openstreetmap/openstreetmap.php:156 msgid "" "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank" "\">public tile servers</a>" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:155 +#: ../../addon/openstreetmap/openstreetmap.php:157 msgid "Nominatim (reverse geocoding) Server URL" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:155 +#: ../../addon/openstreetmap/openstreetmap.php:157 msgid "" "A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=" "\"_blank\">Nominatim servers</a>" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:156 +#: ../../addon/openstreetmap/openstreetmap.php:158 msgid "Default zoom" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:156 +#: ../../addon/openstreetmap/openstreetmap.php:158 msgid "" "The default zoom level. (1:world, 18:highest, also depends on tile server)" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:157 +#: ../../addon/openstreetmap/openstreetmap.php:159 msgid "Include marker on map" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:157 +#: ../../addon/openstreetmap/openstreetmap.php:159 msgid "Include a marker on the map." msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:169 -#: ../../addon/rendezvous/rendezvous.php:82 ../../addon/twitter/twitter.php:489 -#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/piwik/piwik.php:116 -#: ../../addon/logrot/logrot.php:54 ../../addon/xmpp/xmpp.php:54 -#: ../../Zotlabs/Module/Settings/Channel.php:266 -#: ../../Zotlabs/Module/Defperms.php:111 +#: ../../addon/openstreetmap/openstreetmap.php:171 +#: ../../addon/rendezvous/rendezvous.php:82 ../../addon/twitter/twitter.php:494 +#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/diaspora/diaspora.php:93 +#: ../../addon/piwik/piwik.php:116 ../../addon/logrot/logrot.php:54 +#: ../../addon/xmpp/xmpp.php:54 ../../Zotlabs/Module/Settings/Channel.php:267 +#: ../../Zotlabs/Module/Defperms.php:112 msgid "Settings updated." msgstr "" @@ -2002,38 +1855,39 @@ msgstr "" msgid "Enter some text" msgstr "" -#: ../../addon/pubcrawl/as.php:1080 ../../include/conversation.php:1166 -#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Module/Embedphotos.php:174 ../../Zotlabs/Module/Cdav.php:871 -#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Cdav.php:879 -#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1254 -#: ../../Zotlabs/Lib/Activity.php:1192 ../../Zotlabs/Lib/Apps.php:1114 -#: ../../Zotlabs/Lib/Apps.php:1198 ../../Zotlabs/Storage/Browser.php:164 +#: ../../addon/pubcrawl/as.php:1134 ../../include/cdav.php:158 +#: ../../include/cdav.php:159 ../../include/cdav.php:167 +#: ../../include/conversation.php:1196 ../../Zotlabs/Widget/Album.php:84 +#: ../../Zotlabs/Widget/Pinned.php:270 ../../Zotlabs/Widget/Portfolio.php:95 +#: ../../Zotlabs/Module/Embedphotos.php:176 ../../Zotlabs/Module/Photos.php:792 +#: ../../Zotlabs/Module/Photos.php:1254 ../../Zotlabs/Lib/Activity.php:1458 +#: ../../Zotlabs/Lib/Apps.php:1112 ../../Zotlabs/Lib/Apps.php:1196 +#: ../../Zotlabs/Storage/Browser.php:164 msgid "Unknown" msgstr "" -#: ../../addon/pubcrawl/as.php:1348 ../../addon/pubcrawl/as.php:1544 -#: ../../addon/pubcrawl/as.php:1738 ../../include/network.php:1731 -#: ../../Zotlabs/Lib/Activity.php:2294 ../../Zotlabs/Lib/Activity.php:2488 +#: ../../addon/pubcrawl/as.php:1428 ../../addon/pubcrawl/as.php:1662 +#: ../../addon/pubcrawl/as.php:1856 ../../include/network.php:1735 +#: ../../Zotlabs/Lib/Activity.php:2742 ../../Zotlabs/Lib/Activity.php:2936 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/as.php:1692 ../../addon/diaspora/Receiver.php:1592 -#: ../../include/text.php:2125 ../../include/conversation.php:144 -#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:2444 +#: ../../addon/pubcrawl/as.php:1810 ../../addon/diaspora/Receiver.php:1597 +#: ../../include/text.php:2239 ../../include/conversation.php:146 +#: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Subthread.php:112 +#: ../../Zotlabs/Lib/Activity.php:2892 msgid "status" msgstr "" -#: ../../addon/pubcrawl/as.php:1729 ../../addon/diaspora/Receiver.php:1532 -#: ../../include/conversation.php:160 ../../Zotlabs/Module/Like.php:447 -#: ../../Zotlabs/Lib/Activity.php:2479 +#: ../../addon/pubcrawl/as.php:1847 ../../addon/diaspora/Receiver.php:1537 +#: ../../include/conversation.php:162 ../../Zotlabs/Module/Like.php:422 +#: ../../Zotlabs/Lib/Activity.php:2927 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../addon/pubcrawl/as.php:1731 ../../include/conversation.php:163 -#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:2481 +#: ../../addon/pubcrawl/as.php:1849 ../../include/conversation.php:165 +#: ../../Zotlabs/Module/Like.php:424 ../../Zotlabs/Lib/Activity.php:2929 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2083,35 +1937,35 @@ msgstr "" msgid "Authentication successful but rejected: account creation is disabled." msgstr "" -#: ../../addon/dwpost/Mod_Dwpost.php:24 +#: ../../addon/dwpost/Mod_Dwpost.php:26 msgid "Dreamwidth Crosspost Connector Settings saved." msgstr "" -#: ../../addon/dwpost/Mod_Dwpost.php:36 +#: ../../addon/dwpost/Mod_Dwpost.php:39 msgid "Dreamwidth Crosspost Connector App" msgstr "" -#: ../../addon/dwpost/Mod_Dwpost.php:37 -msgid "Relay public postings to Dreamwidth" +#: ../../addon/dwpost/Mod_Dwpost.php:40 +msgid "Relay public posts to Dreamwidth" msgstr "" -#: ../../addon/dwpost/Mod_Dwpost.php:52 +#: ../../addon/dwpost/Mod_Dwpost.php:53 msgid "Dreamwidth username" msgstr "" -#: ../../addon/dwpost/Mod_Dwpost.php:56 +#: ../../addon/dwpost/Mod_Dwpost.php:57 msgid "Dreamwidth password" msgstr "" -#: ../../addon/dwpost/Mod_Dwpost.php:60 +#: ../../addon/dwpost/Mod_Dwpost.php:61 msgid "Post to Dreamwidth by default" msgstr "" -#: ../../addon/dwpost/Mod_Dwpost.php:68 +#: ../../addon/dwpost/Mod_Dwpost.php:77 msgid "Dreamwidth Crosspost Connector" msgstr "" -#: ../../addon/dwpost/dwpost.php:47 +#: ../../addon/dwpost/dwpost.php:49 msgid "Post to Dreamwidth" msgstr "" @@ -2271,7 +2125,7 @@ msgstr "" msgid "Errors encountered deleting database table " msgstr "" -#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:498 +#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:503 msgid "Submit Settings" msgstr "" @@ -2323,21 +2177,21 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:172 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../Zotlabs/Module/Group.php:154 ../../Zotlabs/Module/Oauth.php:113 -#: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:259 -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Sharedwithme.php:104 +#: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Oauth.php:113 +#: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:257 +#: ../../Zotlabs/Module/Cdav.php:1368 ../../Zotlabs/Module/Sharedwithme.php:106 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:923 -#: ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Lib/NativeWikiPage.php:564 #: ../../Zotlabs/Storage/Browser.php:291 msgid "Name" msgstr "" #: ../../addon/rendezvous/rendezvous.php:173 -#: ../../addon/cart/submodules/hzservices.php:654 -#: ../../addon/cart/submodules/manualcat.php:262 -#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:481 +#: ../../addon/cart/submodules/hzservices.php:655 +#: ../../addon/cart/submodules/manualcat.php:264 +#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:481 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101 msgid "Description" msgstr "" @@ -2444,6 +2298,105 @@ msgstr "" msgid "Startpage" msgstr "" +#: ../../addon/mail/Mod_Mail.php:39 +msgid "Messages" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:52 +msgid "message" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:92 +msgid "Message recalled." +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:105 +msgid "Conversation removed." +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:120 ../../addon/mail/Mod_Mail.php:241 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:148 +msgid "Requested channel is not in this network" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:156 +msgid "Send Private Message" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:157 ../../addon/mail/Mod_Mail.php:300 +msgid "To:" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:160 ../../addon/mail/Mod_Mail.php:302 +msgid "Subject:" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:163 ../../Zotlabs/Module/Invite.php:157 +msgid "Your message:" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:165 ../../addon/mail/Mod_Mail.php:308 +msgid "Attach file" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:167 +msgid "Send" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:271 +msgid "Delete message" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:272 +msgid "Delivery report" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:273 +msgid "Recall message" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:275 +msgid "Message has been recalled." +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:293 +msgid "Delete Conversation" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:295 +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:299 +msgid "Send Reply" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:304 +#, php-format +msgid "Your message for %s (%s):" +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:384 +msgid "Unable to lookup recipient." +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:391 +msgid "Unable to communicate with requested channel." +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:398 +msgid "Cannot verify requested channel." +msgstr "" + +#: ../../addon/mail/Mod_Mail.php:416 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "" + #: ../../addon/adultphotoflag/adultphotoflag.php:24 msgid "Flag Adult Photos" msgstr "" @@ -2692,8 +2645,8 @@ msgid "Send ZID" msgstr "" #: ../../addon/cart/widgets/catalogitem.php:57 -#: ../../addon/cart/submodules/hzservices.php:657 -#: ../../addon/cart/submodules/manualcat.php:265 +#: ../../addon/cart/submodules/hzservices.php:658 +#: ../../addon/cart/submodules/manualcat.php:267 msgid "Price" msgstr "" @@ -2707,7 +2660,8 @@ msgstr "" #: ../../addon/cart/manual_payments.php:68 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/cart.php:1460 +#: ../../addon/cart/submodules/paypalbuttonV2.php:409 +#: ../../addon/cart/cart.php:1463 msgid "Order not found." msgstr "" @@ -2717,7 +2671,8 @@ msgstr "" #: ../../addon/cart/manual_payments.php:93 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1438 +#: ../../addon/cart/submodules/paypalbuttonV2.php:478 +#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1441 #: ../../Zotlabs/Module/Wiki.php:77 msgid "Invalid channel" msgstr "" @@ -2767,109 +2722,149 @@ msgstr "" msgid "Term" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:62 +#: ../../addon/cart/submodules/hzservices.php:63 msgid "Enable Hubzilla Services Module" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:161 -#: ../../addon/cart/submodules/manualcat.php:174 +#: ../../addon/cart/submodules/hzservices.php:162 +#: ../../addon/cart/submodules/manualcat.php:176 msgid "New Sku" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:196 -#: ../../addon/cart/submodules/manualcat.php:210 +#: ../../addon/cart/submodules/hzservices.php:197 +#: ../../addon/cart/submodules/manualcat.php:212 msgid "Cannot save edits to locked item." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:245 -#: ../../addon/cart/submodules/hzservices.php:332 +#: ../../addon/cart/submodules/hzservices.php:246 +#: ../../addon/cart/submodules/hzservices.php:333 msgid "SKU not found." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:298 -#: ../../addon/cart/submodules/hzservices.php:302 +#: ../../addon/cart/submodules/hzservices.php:299 +#: ../../addon/cart/submodules/hzservices.php:303 msgid "Invalid Activation Directive." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:373 -#: ../../addon/cart/submodules/hzservices.php:377 +#: ../../addon/cart/submodules/hzservices.php:374 +#: ../../addon/cart/submodules/hzservices.php:378 msgid "Invalid Deactivation Directive." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:563 +#: ../../addon/cart/submodules/hzservices.php:564 msgid "Add to this privacy group" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:579 +#: ../../addon/cart/submodules/hzservices.php:580 msgid "Set user service class" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:606 +#: ../../addon/cart/submodules/hzservices.php:607 msgid "You must be using a local account to purchase this service." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:646 -#: ../../addon/cart/submodules/manualcat.php:254 +#: ../../addon/cart/submodules/hzservices.php:647 +#: ../../addon/cart/submodules/manualcat.php:256 msgid "Changes Locked" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:650 -#: ../../addon/cart/submodules/manualcat.php:258 +#: ../../addon/cart/submodules/hzservices.php:651 +#: ../../addon/cart/submodules/manualcat.php:260 msgid "Item available for purchase." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:660 -#: ../../addon/cart/submodules/manualcat.php:268 +#: ../../addon/cart/submodules/hzservices.php:661 +#: ../../addon/cart/submodules/manualcat.php:270 msgid "Photo URL" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:664 +#: ../../addon/cart/submodules/hzservices.php:665 msgid "Add buyer to privacy group" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:669 +#: ../../addon/cart/submodules/hzservices.php:670 msgid "Add buyer as connection" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:677 -#: ../../addon/cart/submodules/hzservices.php:719 +#: ../../addon/cart/submodules/hzservices.php:678 +#: ../../addon/cart/submodules/hzservices.php:720 msgid "Set Service Class" msgstr "" +#: ../../addon/cart/submodules/orderoptions.php:70 +msgid "Enable Order/Item Options" +msgstr "" + +#: ../../addon/cart/submodules/orderoptions.php:333 +#: ../../addon/cart/submodules/orderoptions.php:357 +#: ../../addon/cart/submodules/orderoptions.php:433 +#: ../../addon/cart/submodules/orderoptions.php:457 +msgid "Label" +msgstr "" + +#: ../../addon/cart/submodules/orderoptions.php:334 +#: ../../addon/cart/submodules/orderoptions.php:358 +#: ../../addon/cart/submodules/orderoptions.php:434 +#: ../../addon/cart/submodules/orderoptions.php:458 +#: ../../include/datetime.php:211 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:751 +msgid "Required" +msgstr "" + +#: ../../addon/cart/submodules/orderoptions.php:336 +#: ../../addon/cart/submodules/orderoptions.php:360 +#: ../../addon/cart/submodules/orderoptions.php:436 +#: ../../addon/cart/submodules/orderoptions.php:460 +msgid "Instructions" +msgstr "" + #: ../../addon/cart/submodules/paypalbutton.php:85 msgid "Enable Paypal Button Module" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:93 +#: ../../addon/cart/submodules/paypalbuttonV2.php:94 msgid "Use Production Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:100 +#: ../../addon/cart/submodules/paypalbuttonV2.php:101 msgid "Paypal Sandbox Client Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:107 +#: ../../addon/cart/submodules/paypalbuttonV2.php:108 msgid "Paypal Sandbox Secret Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:113 +#: ../../addon/cart/submodules/paypalbuttonV2.php:114 msgid "Paypal Production Client Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:120 +#: ../../addon/cart/submodules/paypalbuttonV2.php:121 msgid "Paypal Production Secret Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:252 +#: ../../addon/cart/submodules/paypalbuttonV2.php:264 msgid "Paypal button payments are not enabled." msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:270 +#: ../../addon/cart/submodules/paypalbuttonV2.php:282 msgid "" "Paypal button payments are not properly configured. Please choose another " "payment option." msgstr "" +#: ../../addon/cart/submodules/paypalbuttonV2.php:86 +msgid "Enable Paypal Button Module (API-v2)" +msgstr "" + #: ../../addon/cart/submodules/manualcat.php:61 msgid "Enable Manual Cart Module" msgstr "" @@ -2878,7 +2873,7 @@ msgstr "" msgid "Access Denied." msgstr "" -#: ../../addon/cart/myshop.php:111 ../../addon/cart/cart.php:1328 +#: ../../addon/cart/myshop.php:111 ../../addon/cart/cart.php:1331 msgid "Order Not Found" msgstr "" @@ -2887,72 +2882,80 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: ../../addon/cart/Settings/Cart.php:56 +#: ../../addon/cart/Settings/Cart.php:58 msgid "Enable Test Catalog" msgstr "" -#: ../../addon/cart/Settings/Cart.php:68 +#: ../../addon/cart/Settings/Cart.php:70 msgid "Enable Manual Payments" msgstr "" -#: ../../addon/cart/Settings/Cart.php:88 +#: ../../addon/cart/Settings/Cart.php:90 msgid "Base Merchant Currency" msgstr "" -#: ../../addon/cart/Settings/Cart.php:111 ../../addon/cart/cart.php:1257 +#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1260 msgid "Cart Settings" msgstr "" -#: ../../addon/cart/cart.php:150 +#: ../../addon/cart/cart.php:153 msgid "DB Cleanup Failure" msgstr "" -#: ../../addon/cart/cart.php:556 +#: ../../addon/cart/cart.php:559 msgid "[cart] Item Added" msgstr "" -#: ../../addon/cart/cart.php:945 +#: ../../addon/cart/cart.php:948 msgid "Order already checked out." msgstr "" -#: ../../addon/cart/cart.php:1250 +#: ../../addon/cart/cart.php:1253 msgid "Drop database tables when uninstalling." msgstr "" -#: ../../addon/cart/cart.php:1269 ../../addon/cart/cart.php:1272 +#: ../../addon/cart/cart.php:1272 ../../addon/cart/cart.php:1275 msgid "Shop" msgstr "" -#: ../../addon/cart/cart.php:1292 ../../addon/flashcards/Mod_Flashcards.php:37 +#: ../../addon/cart/cart.php:1295 ../../addon/flashcards/Mod_Flashcards.php:51 #: ../../Zotlabs/Module/Wiki.php:35 msgid "Profile Unavailable." msgstr "" -#: ../../addon/cart/cart.php:1389 +#: ../../addon/cart/cart.php:1392 msgid "Cart utilities for orders and payments" msgstr "" -#: ../../addon/cart/cart.php:1427 +#: ../../addon/cart/cart.php:1430 msgid "You must be logged into the Grid to shop." msgstr "" -#: ../../addon/cart/cart.php:1468 +#: ../../addon/cart/cart.php:1471 msgid "Access denied." msgstr "" -#: ../../addon/cart/cart.php:1520 ../../addon/cart/cart.php:1663 +#: ../../addon/cart/cart.php:1523 ../../addon/cart/cart.php:1666 msgid "No Order Found" msgstr "" -#: ../../addon/cart/cart.php:1529 +#: ../../addon/cart/cart.php:1532 msgid "An unknown error has occurred Please start again." msgstr "" -#: ../../addon/cart/cart.php:1696 +#: ../../addon/cart/cart.php:1675 +msgid "Requirements not met." +msgstr "" + +#: ../../addon/cart/cart.php:1675 +msgid "Review your order and complete any needed requirements." +msgstr "" + +#: ../../addon/cart/cart.php:1701 msgid "Invalid Payment Type. Please start again." msgstr "" -#: ../../addon/cart/cart.php:1703 +#: ../../addon/cart/cart.php:1708 msgid "Order not found" msgstr "" @@ -2998,7 +3001,7 @@ msgstr "" msgid "Smileybutton Settings" msgstr "" -#: ../../addon/redfiles/redfilehelper.php:64 +#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2035 msgid "file" msgstr "" @@ -3010,21 +3013,38 @@ msgstr "" msgid "This will import all your Redmatrix cloud files to this channel." msgstr "" +#: ../../addon/diaspora/diaspora.php:66 +msgid "" +"Please install the statistics addon to be able to configure a diaspora relay" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:76 +msgid "Diaspora Relay Handle" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:76 +msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:96 +msgid "Diaspora relay could not be imported" +msgstr "" + #: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:336 #: ../../addon/diaspora/util.php:349 ../../Zotlabs/Lib/Enotify.php:61 msgid "$projectname" msgstr "" -#: ../../addon/diaspora/import_diaspora.php:18 +#: ../../addon/diaspora/import_diaspora.php:19 msgid "No username found in import file." msgstr "" -#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:75 +#: ../../addon/diaspora/import_diaspora.php:44 ../../include/import.php:76 msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../addon/diaspora/import_diaspora.php:141 -#: ../../Zotlabs/Module/Import.php:594 +#: ../../addon/diaspora/import_diaspora.php:142 +#: ../../Zotlabs/Module/Import.php:597 msgid "Import completed." msgstr "" @@ -3043,42 +3063,42 @@ msgstr "" msgid "Diaspora Protocol App" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:77 +#: ../../addon/diaspora/Mod_Diaspora.php:75 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:81 +#: ../../addon/diaspora/Mod_Diaspora.php:79 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:85 +#: ../../addon/diaspora/Mod_Diaspora.php:83 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:90 +#: ../../addon/diaspora/Mod_Diaspora.php:88 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:99 +#: ../../addon/diaspora/Mod_Diaspora.php:97 msgid "Diaspora Protocol" msgstr "" -#: ../../addon/diaspora/Receiver.php:1536 +#: ../../addon/diaspora/Receiver.php:1541 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2178 ../../Zotlabs/Module/Like.php:457 +#: ../../addon/diaspora/Receiver.php:2184 ../../Zotlabs/Module/Like.php:432 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2180 ../../Zotlabs/Module/Like.php:459 +#: ../../addon/diaspora/Receiver.php:2186 ../../Zotlabs/Module/Like.php:434 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2182 ../../Zotlabs/Module/Like.php:461 +#: ../../addon/diaspora/Receiver.php:2188 ../../Zotlabs/Module/Like.php:436 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -3127,62 +3147,66 @@ msgstr "" msgid "This feature requires Piwik >= 2.2.0" msgstr "" -#: ../../addon/workflow/workflow.php:212 +#: ../../addon/workflow/workflow.php:222 msgid "Workflow user." msgstr "" -#: ../../addon/workflow/workflow.php:259 +#: ../../addon/workflow/workflow.php:272 msgid "This channel" msgstr "" -#: ../../addon/workflow/workflow.php:272 ../../Zotlabs/Module/Locs.php:119 +#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:119 msgid "Primary" msgstr "" -#: ../../addon/workflow/workflow.php:480 ../../addon/workflow/workflow.php:1233 -#: ../../addon/workflow/workflow.php:1251 +#: ../../addon/workflow/workflow.php:541 ../../addon/workflow/workflow.php:1437 +#: ../../addon/workflow/workflow.php:1456 msgid "Workflow" msgstr "" -#: ../../addon/workflow/workflow.php:1250 +#: ../../addon/workflow/workflow.php:1425 +msgid "No Workflows Available" +msgstr "" + +#: ../../addon/workflow/workflow.php:1455 msgid "Add item to which workflow" msgstr "" -#: ../../addon/workflow/workflow.php:1297 -#: ../../addon/workflow/workflow.php:1394 +#: ../../addon/workflow/workflow.php:1515 +#: ../../addon/workflow/workflow.php:1634 msgid "Create Workflow Item" msgstr "" -#: ../../addon/workflow/workflow.php:2270 +#: ../../addon/workflow/workflow.php:2596 msgid "Link" msgstr "" -#: ../../addon/workflow/workflow.php:2272 +#: ../../addon/workflow/workflow.php:2598 msgid "Web link." msgstr "" -#: ../../addon/workflow/workflow.php:2291 -#: ../../addon/workflow/workflow.php:2344 ../../Zotlabs/Module/Cdav.php:1375 -#: ../../Zotlabs/Module/Connedit.php:925 +#: ../../addon/workflow/workflow.php:2617 +#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1370 +#: ../../Zotlabs/Module/Connedit.php:926 msgid "Title" msgstr "" -#: ../../addon/workflow/workflow.php:2293 -#: ../../addon/workflow/workflow.php:2346 +#: ../../addon/workflow/workflow.php:2619 +#: ../../addon/workflow/workflow.php:2680 msgid "Brief description or title" msgstr "" -#: ../../addon/workflow/workflow.php:2299 ../../Zotlabs/Widget/Notes.php:21 -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:21 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "Notes" msgstr "" -#: ../../addon/workflow/workflow.php:2301 -#: ../../addon/workflow/workflow.php:2354 +#: ../../addon/workflow/workflow.php:2627 +#: ../../addon/workflow/workflow.php:2688 msgid "Notes and Info" msgstr "" -#: ../../addon/workflow/workflow.php:2352 +#: ../../addon/workflow/workflow.php:2686 msgid "Body" msgstr "" @@ -3283,52 +3307,6 @@ msgstr "" msgid "Embed:" msgstr "" -#: ../../addon/chords/chords.php:33 -msgid "Quick Reference" -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:44 -msgid "" -"This is a fairly comprehensive and complete guitar chord dictionary which " -"will list most of the available ways to play a certain chord, starting from " -"the base of the fingerboard up to a few frets beyond the twelfth fret " -"(beyond which everything repeats). A couple of non-standard tunings are " -"provided for the benefit of slide players, etc." -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:46 -msgid "" -"Chord names start with a root note (A-G) and may include sharps (#) and " -"flats (b). This software will parse most of the standard naming conventions " -"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:48 -msgid "" -"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " -"E7b13b11 ..." -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:51 -msgid "Guitar Chords" -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:52 -msgid "The complete online chord dictionary" -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:57 -msgid "Tuning" -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:58 -msgid "Chord name: example: Em7" -msgstr "" - -#: ../../addon/chords/Mod_Chords.php:59 -msgid "Show for left handed stringing" -msgstr "" - #: ../../addon/opensearch/opensearch.php:26 #, php-format msgctxt "opensearch" @@ -3374,70 +3352,6 @@ msgstr "" msgid "Fuzzy Location" msgstr "" -#: ../../addon/flattrwidget/flattrwidget.php:50 -msgid "Flattr this!" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:41 -msgid "Flattr widget settings updated." -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:53 -msgid "Flattr Widget App" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:54 -msgid "Add a Flattr button to your channel page" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:65 -msgid "Flattr user" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:69 -msgid "URL of the Thing to flattr" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:69 -msgid "If empty channel URL is used" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:73 -msgid "Title of the Thing to flattr" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:73 -msgid "If empty \"channel name on The Hubzilla\" will be used" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:77 -msgid "Static or dynamic flattr button" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:77 -msgid "static" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:77 -msgid "dynamic" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:81 -msgid "Alignment of the widget" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:81 -msgid "left" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:81 -msgid "right" -msgstr "" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:89 -msgid "Flattr Widget" -msgstr "" - #: ../../addon/hubwall/hubwall.php:19 msgid "Send email to all members" msgstr "" @@ -3487,31 +3401,31 @@ msgstr "" msgid "Message sent to %s. New account registration: %s" msgstr "" -#: ../../addon/flashcards/Mod_Flashcards.php:169 +#: ../../addon/flashcards/Mod_Flashcards.php:218 msgid "Not allowed." msgstr "" -#: ../../addon/flashcards/Mod_Flashcards.php:205 -#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Chat.php:243 -#: ../../Zotlabs/Module/Filestorage.php:190 ../../Zotlabs/Module/Photos.php:675 -#: ../../Zotlabs/Module/Photos.php:1044 ../../Zotlabs/Module/Thing.php:319 -#: ../../Zotlabs/Module/Thing.php:372 ../../Zotlabs/Module/Connedit.php:690 +#: ../../addon/flashcards/Mod_Flashcards.php:254 +#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Filestorage.php:190 ../../Zotlabs/Module/Photos.php:677 +#: ../../Zotlabs/Module/Photos.php:1046 ../../Zotlabs/Module/Thing.php:321 +#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:691 msgid "Permissions" msgstr "" -#: ../../addon/flashcards/Mod_Flashcards.php:212 +#: ../../addon/flashcards/Mod_Flashcards.php:261 #: ../../Zotlabs/Module/Filestorage.php:197 msgid "Set/edit permissions" msgstr "" -#: ../../addon/flashcards/Mod_Flashcards.php:235 -#: ../../addon/flashcards/Mod_Flashcards.php:236 ../../include/items.php:3719 +#: ../../addon/flashcards/Mod_Flashcards.php:284 +#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3888 #: ../../Zotlabs/Module/Filestorage.php:26 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:260 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:455 ../../Zotlabs/Module/Admin.php:62 -#: ../../Zotlabs/Module/Thing.php:94 +#: ../../Zotlabs/Module/Display.php:460 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Thing.php:96 msgid "Item not found." msgstr "" @@ -3563,7 +3477,7 @@ msgstr "" msgid "<blush>" msgstr "" -#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:327 +#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:328 msgid "Report Bug" msgstr "" @@ -3675,6 +3589,16 @@ msgstr "" msgid "Your $Productname test account is about to expire." msgstr "" +#: ../../addon/hideaside/Mod_Hideaside.php:23 +#: ../../addon/hideaside/Mod_Hideaside.php:27 +msgid "Hide Aside App" +msgstr "" + +#: ../../addon/hideaside/Mod_Hideaside.php:24 +#: ../../addon/hideaside/Mod_Hideaside.php:28 +msgid "Fade out aside areas after a while when using endless scroll" +msgstr "" + #: ../../addon/skeleton/Mod_Skeleton.php:32 msgid "Skeleton App" msgstr "" @@ -3695,6 +3619,86 @@ msgstr "" msgid "Skeleton Settings" msgstr "" +#: ../../addon/socialauth/Mod_SocialAuth.php:104 +#: ../../addon/socialauth/Mod_SocialAuth.php:176 +msgid "Network error" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:108 +#: ../../addon/socialauth/Mod_SocialAuth.php:180 +msgid "API error" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:112 +#: ../../addon/socialauth/Mod_SocialAuth.php:184 +msgid "Unknown issue" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:168 +msgid "Unable to login using email address " +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:202 +msgid "Sign in to Hubzilla using a social account" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:207 +msgid "Social Authentication using your social media account" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:211 +msgid "" +"This app enables one or more social provider sign-in buttons on the login " +"page." +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:229 +msgid "Add an identity provider" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:256 +msgid "Enable " +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:263 +msgid "Key" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:263 +#: ../../addon/socialauth/Mod_SocialAuth.php:268 +#: ../../addon/socialauth/Mod_SocialAuth.php:284 +#: ../../addon/socialauth/Mod_SocialAuth.php:297 +msgid "Word" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:268 +msgid "Secret" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:297 +msgid "Add a custom provider" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:317 +msgid "Remove an identity provider" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:327 +msgid "Social authentication" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:366 +msgid "Error while saving provider settings" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:382 +msgid "Custom provider already exists" +msgstr "" + +#: ../../addon/socialauth/Mod_SocialAuth.php:399 +msgid "Social authentication settings saved." +msgstr "" + #: ../../addon/nsfw/nsfw.php:152 msgid "Possible adult content" msgstr "" @@ -3848,31 +3852,31 @@ msgstr "" msgid "Mail Test" msgstr "" -#: ../../addon/ljpost/Mod_Ljpost.php:37 +#: ../../addon/ljpost/Mod_Ljpost.php:38 msgid "Livejournal Crosspost Connector App" msgstr "" -#: ../../addon/ljpost/Mod_Ljpost.php:38 +#: ../../addon/ljpost/Mod_Ljpost.php:39 msgid "Relay public posts to Livejournal" msgstr "" -#: ../../addon/ljpost/Mod_Ljpost.php:54 +#: ../../addon/ljpost/Mod_Ljpost.php:55 msgid "Livejournal username" msgstr "" -#: ../../addon/ljpost/Mod_Ljpost.php:58 +#: ../../addon/ljpost/Mod_Ljpost.php:59 msgid "Livejournal password" msgstr "" -#: ../../addon/ljpost/Mod_Ljpost.php:62 +#: ../../addon/ljpost/Mod_Ljpost.php:63 msgid "Post to Livejournal by default" msgstr "" -#: ../../addon/ljpost/Mod_Ljpost.php:66 +#: ../../addon/ljpost/Mod_Ljpost.php:67 msgid "Send wall-to-wall posts to Livejournal" msgstr "" -#: ../../addon/ljpost/Mod_Ljpost.php:75 +#: ../../addon/ljpost/Mod_Ljpost.php:79 msgid "Livejournal Crosspost Connector" msgstr "" @@ -3880,64 +3884,11 @@ msgstr "" msgid "Post to Livejournal" msgstr "" -#: ../../addon/ljpost/ljpost.php:125 +#: ../../addon/ljpost/ljpost.php:127 msgid "Posted by" msgstr "" -#: ../../addon/chess/Mod_Chess.php:180 ../../addon/chess/Mod_Chess.php:377 -msgid "Invalid game." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:186 ../../addon/chess/Mod_Chess.php:417 -msgid "You are not a player in this game." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:242 -msgid "You must be a local channel to create a game." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:260 -msgid "You must select one opponent that is not yourself." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:271 -msgid "Random color chosen." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:279 -msgid "Error creating new game." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:306 ../../include/channel.php:1273 -msgid "Requested channel is not available." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:311 ../../addon/chess/Mod_Chess.php:333 -msgid "Chess not installed." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:326 -msgid "You must select a local channel /chess/channelname" -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:343 ../../Zotlabs/Module/Ochannel.php:32 -#: ../../Zotlabs/Module/Channel.php:42 ../../Zotlabs/Module/Chat.php:31 -msgid "You must be logged in to see this page." -msgstr "" - -#: ../../addon/chess/Mod_Chess.php:447 ../../include/help.php:132 -#: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 -#: ../../Zotlabs/Module/Display.php:174 ../../Zotlabs/Module/Display.php:180 -#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185 -msgid "Page not found." -msgstr "" - -#: ../../addon/chess/chess.php:645 -msgid "Enable notifications" -msgstr "" - -#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:1983 +#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2097 #: ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 @@ -3960,74 +3911,6 @@ msgstr "" msgid "Hubzilla Server base URL" msgstr "" -#: ../../addon/jappixmini/Mod_Jappixmini.php:96 -msgid "Jappixmini App" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:97 -msgid "Provides a Facebook-like chat using Jappix Mini" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:157 ../../include/channel.php:1526 -#: ../../include/channel.php:1697 -msgid "Status:" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:161 -msgid "Hide Jappixmini Chat-Widget from the webinterface" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:166 -msgid "Jabber username" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:172 -msgid "Jabber server" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:178 -msgid "Jabber BOSH host URL" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:185 -msgid "Jabber password" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -msgid "Encrypt Jabber password with Hubzilla password" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -#: ../../Zotlabs/Module/Settings/Channel.php:567 -#: ../../Zotlabs/Module/Settings/Channel.php:572 -#: ../../Zotlabs/Module/Settings/Channel.php:573 -#: ../../Zotlabs/Module/Settings/Channel.php:574 -msgid "Recommended" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:199 -#: ../../addon/jappixmini/Mod_Jappixmini.php:203 -msgid "Approve subscription requests from Hubzilla contacts automatically" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:207 -msgid "Purge internal list of jabber addresses of contacts" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:212 -msgid "Configuration Help" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:216 -#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:796 -#: ../../Zotlabs/Module/Connedit.php:936 -msgid "Add Contact" -msgstr "" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:258 -msgid "Jappixmini Settings" -msgstr "" - #: ../../addon/authchoose/Mod_Authchoose.php:22 msgid "" "Allow magic authentication only to websites of your immediate connections" @@ -4125,20 +4008,20 @@ msgstr "" msgid "XMPP Settings" msgstr "" -#: ../../include/zot.php:774 +#: ../../include/zot.php:773 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:801 ../../Zotlabs/Lib/Libzot.php:652 +#: ../../include/zot.php:800 ../../Zotlabs/Lib/Libzot.php:652 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2628 ../../Zotlabs/Lib/Libsync.php:733 +#: ../../include/zot.php:2627 ../../Zotlabs/Lib/Libsync.php:740 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:4325 +#: ../../include/zot.php:4342 msgid "invalid target signature" msgstr "" @@ -4166,536 +4049,578 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:1000 +#: ../../include/text.php:1005 msgid "No connections" msgstr "" -#: ../../include/text.php:1012 ../../include/features.php:133 -#: ../../Zotlabs/Module/Connections.php:351 ../../Zotlabs/Lib/Apps.php:332 +#: ../../include/text.php:1017 ../../include/features.php:133 +#: ../../Zotlabs/Module/Connections.php:374 ../../Zotlabs/Lib/Apps.php:333 msgid "Connections" msgstr "" -#: ../../include/text.php:1032 +#: ../../include/text.php:1025 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../Zotlabs/Module/Connections.php:288 +msgid "Accepts" +msgstr "" + +#: ../../include/text.php:1028 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../Zotlabs/Module/Connections.php:291 +msgid "Comments" +msgstr "" + +#: ../../include/text.php:1033 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../Zotlabs/Module/Connections.php:296 +msgid "Stream items" +msgstr "" + +#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../Zotlabs/Module/Connections.php:301 +msgid "Wall posts" +msgstr "" + +#: ../../include/text.php:1042 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../Zotlabs/Module/Connections.php:305 +msgid "Nothing" +msgstr "" + +#: ../../include/text.php:1057 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1120 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1105 ../../include/text.php:1117 -#: ../../include/nav.php:186 ../../include/acl_selectors.php:118 +#: ../../include/text.php:1131 ../../include/text.php:1143 +#: ../../include/nav.php:188 ../../include/acl_selectors.php:118 #: ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../Zotlabs/Widget/Activity_filter.php:151 -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:355 -#: ../../Zotlabs/Lib/Apps.php:352 +#: ../../Zotlabs/Widget/Activity_filter.php:193 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:378 +#: ../../Zotlabs/Lib/Apps.php:353 msgid "Search" msgstr "" -#: ../../include/text.php:1197 ../../include/text.php:1201 +#: ../../include/text.php:1223 ../../include/text.php:1227 msgid "poke" msgstr "" -#: ../../include/text.php:1197 ../../include/text.php:1201 -#: ../../include/conversation.php:251 +#: ../../include/text.php:1223 ../../include/text.php:1227 +#: ../../include/conversation.php:255 msgid "poked" msgstr "" -#: ../../include/text.php:1202 +#: ../../include/text.php:1228 msgid "ping" msgstr "" -#: ../../include/text.php:1202 +#: ../../include/text.php:1228 msgid "pinged" msgstr "" -#: ../../include/text.php:1203 +#: ../../include/text.php:1229 msgid "prod" msgstr "" -#: ../../include/text.php:1203 +#: ../../include/text.php:1229 msgid "prodded" msgstr "" -#: ../../include/text.php:1204 +#: ../../include/text.php:1230 msgid "slap" msgstr "" -#: ../../include/text.php:1204 +#: ../../include/text.php:1230 msgid "slapped" msgstr "" -#: ../../include/text.php:1205 +#: ../../include/text.php:1231 msgid "finger" msgstr "" -#: ../../include/text.php:1205 +#: ../../include/text.php:1231 msgid "fingered" msgstr "" -#: ../../include/text.php:1206 +#: ../../include/text.php:1232 msgid "rebuff" msgstr "" -#: ../../include/text.php:1206 +#: ../../include/text.php:1232 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1229 +#: ../../include/text.php:1255 msgid "happy" msgstr "" -#: ../../include/text.php:1230 +#: ../../include/text.php:1256 msgid "sad" msgstr "" -#: ../../include/text.php:1231 +#: ../../include/text.php:1257 msgid "mellow" msgstr "" -#: ../../include/text.php:1232 +#: ../../include/text.php:1258 msgid "tired" msgstr "" -#: ../../include/text.php:1233 +#: ../../include/text.php:1259 msgid "perky" msgstr "" -#: ../../include/text.php:1234 +#: ../../include/text.php:1260 msgid "angry" msgstr "" -#: ../../include/text.php:1235 +#: ../../include/text.php:1261 msgid "stupefied" msgstr "" -#: ../../include/text.php:1236 +#: ../../include/text.php:1262 msgid "puzzled" msgstr "" -#: ../../include/text.php:1237 +#: ../../include/text.php:1263 msgid "interested" msgstr "" -#: ../../include/text.php:1238 +#: ../../include/text.php:1264 msgid "bitter" msgstr "" -#: ../../include/text.php:1239 +#: ../../include/text.php:1265 msgid "cheerful" msgstr "" -#: ../../include/text.php:1240 +#: ../../include/text.php:1266 msgid "alive" msgstr "" -#: ../../include/text.php:1241 +#: ../../include/text.php:1267 msgid "annoyed" msgstr "" -#: ../../include/text.php:1242 +#: ../../include/text.php:1268 msgid "anxious" msgstr "" -#: ../../include/text.php:1243 +#: ../../include/text.php:1269 msgid "cranky" msgstr "" -#: ../../include/text.php:1244 +#: ../../include/text.php:1270 msgid "disturbed" msgstr "" -#: ../../include/text.php:1245 +#: ../../include/text.php:1271 msgid "frustrated" msgstr "" -#: ../../include/text.php:1246 +#: ../../include/text.php:1272 msgid "depressed" msgstr "" -#: ../../include/text.php:1247 +#: ../../include/text.php:1273 msgid "motivated" msgstr "" -#: ../../include/text.php:1248 +#: ../../include/text.php:1274 msgid "relaxed" msgstr "" -#: ../../include/text.php:1249 +#: ../../include/text.php:1275 msgid "surprised" msgstr "" -#: ../../include/text.php:1437 ../../include/js_strings.php:96 +#: ../../include/text.php:1463 ../../include/js_strings.php:99 msgid "Monday" msgstr "" -#: ../../include/text.php:1437 ../../include/js_strings.php:97 +#: ../../include/text.php:1463 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1437 ../../include/js_strings.php:98 +#: ../../include/text.php:1463 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1437 ../../include/js_strings.php:99 +#: ../../include/text.php:1463 ../../include/js_strings.php:102 msgid "Thursday" msgstr "" -#: ../../include/text.php:1437 ../../include/js_strings.php:100 +#: ../../include/text.php:1463 ../../include/js_strings.php:103 msgid "Friday" msgstr "" -#: ../../include/text.php:1437 ../../include/js_strings.php:101 +#: ../../include/text.php:1463 ../../include/js_strings.php:104 msgid "Saturday" msgstr "" -#: ../../include/text.php:1437 ../../include/js_strings.php:95 +#: ../../include/text.php:1463 ../../include/js_strings.php:98 msgid "Sunday" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:71 +#: ../../include/text.php:1467 ../../include/js_strings.php:74 msgid "January" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:72 +#: ../../include/text.php:1467 ../../include/js_strings.php:75 msgid "February" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:73 +#: ../../include/text.php:1467 ../../include/js_strings.php:76 msgid "March" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:74 +#: ../../include/text.php:1467 ../../include/js_strings.php:77 msgid "April" msgstr "" -#: ../../include/text.php:1441 +#: ../../include/text.php:1467 msgid "May" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:76 +#: ../../include/text.php:1467 ../../include/js_strings.php:79 msgid "June" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:77 +#: ../../include/text.php:1467 ../../include/js_strings.php:80 msgid "July" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:78 +#: ../../include/text.php:1467 ../../include/js_strings.php:81 msgid "August" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:79 +#: ../../include/text.php:1467 ../../include/js_strings.php:82 msgid "September" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:80 +#: ../../include/text.php:1467 ../../include/js_strings.php:83 msgid "October" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:81 +#: ../../include/text.php:1467 ../../include/js_strings.php:84 msgid "November" msgstr "" -#: ../../include/text.php:1441 ../../include/js_strings.php:82 +#: ../../include/text.php:1467 ../../include/js_strings.php:85 msgid "December" msgstr "" -#: ../../include/text.php:1515 +#: ../../include/text.php:1541 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1517 ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../include/text.php:1543 ../../Zotlabs/Module/Sharedwithme.php:108 #: ../../Zotlabs/Storage/Browser.php:293 msgid "Size" msgstr "" -#: ../../include/text.php:1517 ../../include/feedutils.php:870 +#: ../../include/text.php:1543 ../../include/feedutils.php:871 msgid "unknown" msgstr "" -#: ../../include/text.php:1553 +#: ../../include/text.php:1579 msgid "remove category" msgstr "" -#: ../../include/text.php:1629 +#: ../../include/text.php:1655 msgid "remove from file" msgstr "" -#: ../../include/text.php:1793 ../../include/message.php:13 +#: ../../include/text.php:1824 ../../include/message.php:13 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1941 ../../Zotlabs/Module/Events.php:669 +#: ../../include/text.php:1895 +msgid "Poll has ended." +msgstr "" + +#: ../../include/text.php:1898 +#, php-format +msgid "Poll ends: %s" +msgstr "" + +#: ../../include/text.php:1903 ../../Zotlabs/Lib/ThreadItem.php:444 +msgid "Vote" +msgstr "" + +#: ../../include/text.php:2055 ../../Zotlabs/Module/Events.php:669 msgid "Link to Source" msgstr "" -#: ../../include/text.php:1963 ../../include/language.php:423 +#: ../../include/text.php:2077 ../../include/language.php:424 msgid "default" msgstr "" -#: ../../include/text.php:1971 +#: ../../include/text.php:2085 msgid "Page layout" msgstr "" -#: ../../include/text.php:1971 +#: ../../include/text.php:2085 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1981 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2095 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 msgid "BBcode" msgstr "" -#: ../../include/text.php:1982 +#: ../../include/text.php:2096 msgid "HTML" msgstr "" -#: ../../include/text.php:1984 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2098 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 msgid "Text" msgstr "" -#: ../../include/text.php:1985 +#: ../../include/text.php:2099 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:1990 +#: ../../include/text.php:2104 msgid "PHP" msgstr "" -#: ../../include/text.php:1999 +#: ../../include/text.php:2113 msgid "Page content type" msgstr "" -#: ../../include/text.php:2122 ../../include/event.php:1213 -#: ../../include/conversation.php:119 -#: ../../Zotlabs/Module/Channel_calendar.php:213 -#: ../../Zotlabs/Module/Like.php:394 ../../Zotlabs/Module/Tagger.php:73 +#: ../../include/text.php:2236 ../../include/event.php:1259 +#: ../../include/conversation.php:121 +#: ../../Zotlabs/Module/Channel_calendar.php:219 +#: ../../Zotlabs/Module/Like.php:388 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Events.php:266 msgid "event" msgstr "" -#: ../../include/text.php:2127 ../../include/conversation.php:146 -#: ../../Zotlabs/Module/Tagger.php:79 +#: ../../include/text.php:2241 ../../include/conversation.php:148 +#: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "" -#: ../../include/text.php:2132 +#: ../../include/text.php:2246 msgid "activity" msgstr "" -#: ../../include/text.php:2233 +#: ../../include/text.php:2249 +msgid "poll" +msgstr "" + +#: ../../include/text.php:2350 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2559 +#: ../../include/text.php:2676 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2562 ../../Zotlabs/Module/Blocks.php:154 +#: ../../include/text.php:2679 ../../Zotlabs/Module/Blocks.php:154 msgid "Blocks" msgstr "" -#: ../../include/text.php:2563 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2680 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "" -#: ../../include/text.php:2564 ../../Zotlabs/Module/Layouts.php:184 +#: ../../include/text.php:2681 ../../Zotlabs/Module/Layouts.php:184 msgid "Layouts" msgstr "" -#: ../../include/text.php:2565 +#: ../../include/text.php:2682 msgid "Pages" msgstr "" -#: ../../include/text.php:2577 +#: ../../include/text.php:2694 msgid "Import" msgstr "" -#: ../../include/text.php:2578 +#: ../../include/text.php:2695 msgid "Import website..." msgstr "" -#: ../../include/text.php:2579 +#: ../../include/text.php:2696 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2580 +#: ../../include/text.php:2697 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2581 +#: ../../include/text.php:2698 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2582 +#: ../../include/text.php:2699 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2583 +#: ../../include/text.php:2700 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2584 +#: ../../include/text.php:2701 msgid "Select folder" msgstr "" -#: ../../include/text.php:2585 +#: ../../include/text.php:2702 msgid "Export website..." msgstr "" -#: ../../include/text.php:2586 +#: ../../include/text.php:2703 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2587 +#: ../../include/text.php:2704 msgid "website.zip" msgstr "" -#: ../../include/text.php:2588 +#: ../../include/text.php:2705 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2589 +#: ../../include/text.php:2706 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2590 +#: ../../include/text.php:2707 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2591 +#: ../../include/text.php:2708 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2592 +#: ../../include/text.php:2709 msgid "Specify folder" msgstr "" -#: ../../include/text.php:2954 ../../Zotlabs/Storage/Browser.php:131 +#: ../../include/text.php:3082 ../../Zotlabs/Storage/Browser.php:131 msgid "Collection" msgstr "" -#: ../../include/opengraph.php:58 +#: ../../include/opengraph.php:56 #, php-format msgid "This is the home page of %s." msgstr "" -#: ../../include/event.php:32 ../../include/event.php:95 +#: ../../include/event.php:33 ../../include/event.php:110 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:40 +#: ../../include/event.php:41 msgid "Starts:" msgstr "" -#: ../../include/event.php:50 +#: ../../include/event.php:51 msgid "Finishes:" msgstr "" -#: ../../include/event.php:62 ../../include/event.php:112 -#: ../../include/channel.php:1521 ../../Zotlabs/Module/Directory.php:339 +#: ../../include/event.php:63 ../../include/event.php:134 +#: ../../include/channel.php:1618 ../../Zotlabs/Module/Directory.php:352 msgid "Location:" msgstr "" -#: ../../include/event.php:95 +#: ../../include/event.php:110 msgid "l F d, Y" msgstr "" -#: ../../include/event.php:99 +#: ../../include/event.php:114 msgid "Start:" msgstr "" -#: ../../include/event.php:103 +#: ../../include/event.php:118 msgid "End:" msgstr "" -#: ../../include/event.php:1064 +#: ../../include/event.php:1106 msgid "This event has been added to your calendar." msgstr "" -#: ../../include/event.php:1290 +#: ../../include/event.php:1337 msgid "Not specified" msgstr "" -#: ../../include/event.php:1291 +#: ../../include/event.php:1338 msgid "Needs Action" msgstr "" -#: ../../include/event.php:1292 +#: ../../include/event.php:1339 msgid "Completed" msgstr "" -#: ../../include/event.php:1293 +#: ../../include/event.php:1340 msgid "In Process" msgstr "" -#: ../../include/event.php:1294 +#: ../../include/event.php:1341 msgid "Cancelled" msgstr "" -#: ../../include/event.php:1375 ../../include/connections.php:728 -#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:792 -#: ../../Zotlabs/Module/Connedit.php:932 +#: ../../include/event.php:1422 ../../include/connections.php:728 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Connedit.php:933 msgid "Mobile" msgstr "" -#: ../../include/event.php:1376 ../../include/connections.php:729 -#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:793 -#: ../../Zotlabs/Module/Connedit.php:933 +#: ../../include/event.php:1423 ../../include/connections.php:729 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Connedit.php:934 msgid "Home" msgstr "" -#: ../../include/event.php:1377 ../../include/connections.php:730 +#: ../../include/event.php:1424 ../../include/connections.php:730 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1378 ../../include/connections.php:731 +#: ../../include/event.php:1425 ../../include/connections.php:731 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1379 ../../include/connections.php:732 -#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:934 +#: ../../include/event.php:1426 ../../include/connections.php:732 +#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Connedit.php:935 msgid "Work" msgstr "" -#: ../../include/event.php:1380 ../../include/connections.php:733 +#: ../../include/event.php:1427 ../../include/connections.php:733 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1381 ../../include/connections.php:734 +#: ../../include/event.php:1428 ../../include/connections.php:734 msgid "Work, Fax" msgstr "" -#: ../../include/event.php:1382 ../../include/event.php:1389 +#: ../../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:735 ../../include/connections.php:742 -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Connedit.php:935 -#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Access/PermissionRoles.php:310 msgid "Other" msgstr "" #: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:36 +#: ../../Zotlabs/Module/Settings/Features.php:38 msgid "Off" msgstr "" #: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:36 +#: ../../Zotlabs/Module/Settings/Features.php:38 msgid "On" msgstr "" -#: ../../include/features.php:82 ../../include/nav.php:465 -#: ../../include/nav.php:468 ../../Zotlabs/Lib/Apps.php:345 +#: ../../include/features.php:82 ../../include/nav.php:463 +#: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:346 #: ../../Zotlabs/Storage/Browser.php:140 msgid "Calendar" msgstr "" @@ -4716,7 +4641,7 @@ msgstr "" msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:342 +#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:343 msgid "Channel Home" msgstr "" @@ -4736,11 +4661,11 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/features.php:124 ../../include/features.php:351 +#: ../../include/features.php:124 ../../include/features.php:359 msgid "Use blog/list mode" msgstr "" -#: ../../include/features.php:125 ../../include/features.php:352 +#: ../../include/features.php:125 ../../include/features.php:360 msgid "Comments will be displayed separately" msgstr "" @@ -4756,14 +4681,6 @@ msgstr "" msgid "Conversation" msgstr "" -#: ../../include/features.php:150 -msgid "Community Tagging" -msgstr "" - -#: ../../include/features.php:151 -msgid "Ability to tag existing posts" -msgstr "" - #: ../../include/features.php:158 msgid "Emoji Reactions" msgstr "" @@ -4796,7 +4713,7 @@ msgstr "" msgid "Ability to reply on selected comment" msgstr "" -#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:347 msgid "Directory" msgstr "" @@ -4840,167 +4757,175 @@ msgid "" msgstr "" #: ../../include/features.php:235 -msgid "Enable Voting Tools" -msgstr "" - -#: ../../include/features.php:236 -msgid "Provide a class of post which others can vote on" -msgstr "" - -#: ../../include/features.php:243 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:244 +#: ../../include/features.php:236 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:251 +#: ../../include/features.php:243 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:252 +#: ../../include/features.php:244 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:259 +#: ../../include/features.php:251 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:260 +#: ../../include/features.php:252 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:267 +#: ../../include/features.php:259 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:268 +#: ../../include/features.php:260 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:275 +#: ../../include/features.php:267 msgid "Auto-save drafts of posts and comments" msgstr "" -#: ../../include/features.php:276 +#: ../../include/features.php:268 msgid "" "Automatically saves post and comment drafts in local browser storage to help " "prevent accidental loss of compositions" msgstr "" -#: ../../include/features.php:285 +#: ../../include/features.php:277 msgid "Manage" msgstr "" -#: ../../include/features.php:289 +#: ../../include/features.php:281 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:290 +#: ../../include/features.php:282 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:299 ../../Zotlabs/Module/Connections.php:310 +#: ../../include/features.php:291 ../../Zotlabs/Module/Connections.php:332 msgid "Network" msgstr "" -#: ../../include/features.php:303 ../../Zotlabs/Widget/Savedsearch.php:83 -msgid "Saved Searches" +#: ../../include/features.php:295 +msgid "Events Filter" +msgstr "" + +#: ../../include/features.php:296 +msgid "Ability to display only events" +msgstr "" + +#: ../../include/features.php:303 +msgid "Polls Filter" msgstr "" #: ../../include/features.php:304 +msgid "Ability to display only polls" +msgstr "" + +#: ../../include/features.php:311 ../../Zotlabs/Widget/Savedsearch.php:83 +msgid "Saved Searches" +msgstr "" + +#: ../../include/features.php:312 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:311 ../../include/contact_widgets.php:53 -#: ../../Zotlabs/Widget/Activity_filter.php:137 +#: ../../include/features.php:319 ../../include/contact_widgets.php:53 +#: ../../Zotlabs/Widget/Activity_filter.php:179 #: ../../Zotlabs/Widget/Filer.php:28 msgid "Saved Folders" msgstr "" -#: ../../include/features.php:312 +#: ../../include/features.php:320 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:319 +#: ../../include/features.php:327 msgid "Alternate Stream Order" msgstr "" -#: ../../include/features.php:320 +#: ../../include/features.php:328 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "" -#: ../../include/features.php:327 +#: ../../include/features.php:335 msgid "Contact Filter" msgstr "" -#: ../../include/features.php:328 +#: ../../include/features.php:336 msgid "Ability to display only posts of a selected contact" msgstr "" -#: ../../include/features.php:335 +#: ../../include/features.php:343 msgid "Forum Filter" msgstr "" -#: ../../include/features.php:336 +#: ../../include/features.php:344 msgid "Ability to display only posts of a specific forum" msgstr "" -#: ../../include/features.php:343 +#: ../../include/features.php:351 msgid "Personal Posts Filter" msgstr "" -#: ../../include/features.php:344 +#: ../../include/features.php:352 msgid "Ability to display only posts that you've interacted on" msgstr "" -#: ../../include/features.php:361 ../../include/nav.php:446 -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:344 +#: ../../include/features.php:369 ../../include/nav.php:444 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345 msgid "Photos" msgstr "" -#: ../../include/features.php:365 +#: ../../include/features.php:373 msgid "Photo Location" msgstr "" -#: ../../include/features.php:366 +#: ../../include/features.php:374 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:375 ../../Zotlabs/Lib/Apps.php:362 +#: ../../include/features.php:383 ../../Zotlabs/Lib/Apps.php:363 msgid "Profiles" msgstr "" -#: ../../include/features.php:379 +#: ../../include/features.php:387 msgid "Advanced Profiles" msgstr "" -#: ../../include/features.php:380 +#: ../../include/features.php:388 msgid "Additional profile sections and selections" msgstr "" -#: ../../include/features.php:387 +#: ../../include/features.php:395 msgid "Profile Import/Export" msgstr "" -#: ../../include/features.php:388 +#: ../../include/features.php:396 msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/features.php:395 +#: ../../include/features.php:403 msgid "Multiple Profiles" msgstr "" -#: ../../include/features.php:396 +#: ../../include/features.php:404 msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/security.php:607 +#: ../../include/security.php:609 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." @@ -5010,12 +4935,12 @@ msgstr "" msgid "Delete this item?" msgstr "" -#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1095 -#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Lib/ThreadItem.php:795 +#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1096 +#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Lib/ThreadItem.php:824 msgid "Comment" msgstr "" -#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:502 +#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:533 #, php-format msgid "%s show all" msgstr "" @@ -5072,7 +4997,7 @@ msgid "Rate This Channel (this is public)" msgstr "" #: ../../include/js_strings.php:20 ../../Zotlabs/Module/Rate.php:155 -#: ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Connedit.php:888 msgid "Rating" msgstr "" @@ -5089,8 +5014,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:1038 ../../Zotlabs/Module/Events.php:483 -#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:483 +#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736 #: ../../Zotlabs/Module/Locs.php:117 msgid "Location" msgstr "" @@ -5141,192 +5066,205 @@ msgstr "" msgid "Back to reply" msgstr "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:37 +msgid "Pinned" +msgstr "" + +#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:471 +msgid "Pin to the top" +msgstr "" + +#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:157 +#: ../../Zotlabs/Lib/ThreadItem.php:471 +msgid "Unpin from the top" +msgstr "" + +#: ../../include/js_strings.php:45 #, php-format msgid "%d minutes" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:46 #, php-format msgid "about %d hours" msgid_plural "about %d hours" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:47 #, php-format msgid "%d days" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:45 +#: ../../include/js_strings.php:48 #, php-format msgid "%d months" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:46 +#: ../../include/js_strings.php:49 #, php-format msgid "%d years" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:51 +#: ../../include/js_strings.php:54 msgid "timeago.prefixAgo" msgstr "" -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:55 msgid "timeago.prefixFromNow" msgstr "" -#: ../../include/js_strings.php:53 +#: ../../include/js_strings.php:56 msgid "timeago.suffixAgo" msgstr "" -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:57 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:57 +#: ../../include/js_strings.php:60 msgid "less than a minute" msgstr "" -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:61 msgid "about a minute" msgstr "" -#: ../../include/js_strings.php:60 +#: ../../include/js_strings.php:63 msgid "about an hour" msgstr "" -#: ../../include/js_strings.php:62 +#: ../../include/js_strings.php:65 msgid "a day" msgstr "" -#: ../../include/js_strings.php:64 +#: ../../include/js_strings.php:67 msgid "about a month" msgstr "" -#: ../../include/js_strings.php:66 +#: ../../include/js_strings.php:69 msgid "about a year" msgstr "" -#: ../../include/js_strings.php:68 +#: ../../include/js_strings.php:71 msgid " " msgstr "" -#: ../../include/js_strings.php:69 +#: ../../include/js_strings.php:72 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:78 msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:86 msgid "Jan" msgstr "" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:87 msgid "Feb" msgstr "" -#: ../../include/js_strings.php:85 +#: ../../include/js_strings.php:88 msgid "Mar" msgstr "" -#: ../../include/js_strings.php:86 +#: ../../include/js_strings.php:89 msgid "Apr" msgstr "" -#: ../../include/js_strings.php:87 +#: ../../include/js_strings.php:90 msgctxt "short" msgid "May" msgstr "" -#: ../../include/js_strings.php:88 +#: ../../include/js_strings.php:91 msgid "Jun" msgstr "" -#: ../../include/js_strings.php:89 +#: ../../include/js_strings.php:92 msgid "Jul" msgstr "" -#: ../../include/js_strings.php:90 +#: ../../include/js_strings.php:93 msgid "Aug" msgstr "" -#: ../../include/js_strings.php:91 +#: ../../include/js_strings.php:94 msgid "Sep" msgstr "" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:95 msgid "Oct" msgstr "" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:96 msgid "Nov" msgstr "" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:97 msgid "Dec" msgstr "" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:105 msgid "Sun" msgstr "" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:106 msgid "Mon" msgstr "" -#: ../../include/js_strings.php:104 +#: ../../include/js_strings.php:107 msgid "Tue" msgstr "" -#: ../../include/js_strings.php:105 +#: ../../include/js_strings.php:108 msgid "Wed" msgstr "" -#: ../../include/js_strings.php:106 +#: ../../include/js_strings.php:109 msgid "Thu" msgstr "" -#: ../../include/js_strings.php:107 +#: ../../include/js_strings.php:110 msgid "Fri" msgstr "" -#: ../../include/js_strings.php:108 +#: ../../include/js_strings.php:111 msgid "Sat" msgstr "" -#: ../../include/js_strings.php:109 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "today" msgstr "" -#: ../../include/js_strings.php:110 +#: ../../include/js_strings.php:113 msgctxt "calendar" msgid "month" msgstr "" -#: ../../include/js_strings.php:111 +#: ../../include/js_strings.php:114 msgctxt "calendar" msgid "week" msgstr "" -#: ../../include/js_strings.php:112 +#: ../../include/js_strings.php:115 msgctxt "calendar" msgid "day" msgstr "" -#: ../../include/js_strings.php:113 +#: ../../include/js_strings.php:116 msgctxt "calendar" msgid "All day" msgstr "" @@ -5336,8 +5274,8 @@ msgid "Help:" msgstr "" #: ../../include/help.php:117 ../../include/help.php:125 -#: ../../include/nav.php:172 ../../include/nav.php:322 -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:347 +#: ../../include/nav.php:174 ../../include/nav.php:320 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348 msgid "Help" msgstr "" @@ -5345,6 +5283,14 @@ msgstr "" msgid "Not Found" msgstr "" +#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:140 +#: ../../Zotlabs/Module/Display.php:157 ../../Zotlabs/Module/Display.php:177 +#: ../../Zotlabs/Module/Display.php:183 ../../Zotlabs/Module/Page.php:136 +#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:521 +#: ../../Zotlabs/Web/Router.php:185 +msgid "Page not found." +msgstr "" + #: ../../include/photos.php:151 #, php-format msgid "Image exceeds website size limit of %lu bytes" @@ -5354,8 +5300,8 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:259 -#: ../../Zotlabs/Module/Cover_photo.php:239 +#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:261 +#: ../../Zotlabs/Module/Cover_photo.php:241 msgid "Unable to process image" msgstr "" @@ -5373,7 +5319,7 @@ msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:666 ../../include/nav.php:449 +#: ../../include/photos.php:666 ../../include/nav.php:447 msgid "Photo Albums" msgstr "" @@ -5386,43 +5332,43 @@ msgstr "" msgid "Upload New Photos" msgstr "" -#: ../../include/network.php:1726 ../../include/network.php:1727 +#: ../../include/network.php:1730 ../../include/network.php:1731 msgid "Friendica" msgstr "" -#: ../../include/network.php:1728 +#: ../../include/network.php:1732 msgid "OStatus" msgstr "" -#: ../../include/network.php:1729 +#: ../../include/network.php:1733 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1730 +#: ../../include/network.php:1734 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1733 +#: ../../include/network.php:1737 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1734 +#: ../../include/network.php:1738 msgid "Facebook" msgstr "" -#: ../../include/network.php:1735 +#: ../../include/network.php:1739 msgid "Zot" msgstr "" -#: ../../include/network.php:1736 +#: ../../include/network.php:1740 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1737 +#: ../../include/network.php:1741 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1738 +#: ../../include/network.php:1742 msgid "MySpace" msgstr "" @@ -5456,7 +5402,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:16 ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../include/contact_widgets.php:16 ../../Zotlabs/Module/Admin/Site.php:291 msgid "Advanced" msgstr "" @@ -5476,13 +5422,13 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:416 -#: ../../Zotlabs/Module/Directory.php:421 -#: ../../Zotlabs/Module/Connections.php:358 +#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:431 +#: ../../Zotlabs/Module/Directory.php:436 +#: ../../Zotlabs/Module/Connections.php:381 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:420 +#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:435 #: ../../Zotlabs/Module/Suggest.php:79 msgid "Channel Suggestions" msgstr "" @@ -5509,7 +5455,7 @@ msgstr "" #: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409 #: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 #: ../../include/taxonomy.php:532 ../../Zotlabs/Widget/Appcategories.php:43 -#: ../../Zotlabs/Module/Cdav.php:1093 +#: ../../Zotlabs/Module/Cdav.php:1066 msgid "Categories" msgstr "" @@ -5522,249 +5468,249 @@ msgstr "" msgid "View all %d common connections" msgstr "" -#: ../../include/language.php:436 +#: ../../include/language.php:437 msgid "Select an alternate language" msgstr "" -#: ../../include/import.php:28 +#: ../../include/import.php:29 msgid "Unable to import a removed channel." msgstr "" -#: ../../include/import.php:54 +#: ../../include/import.php:55 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/import.php:120 +#: ../../include/import.php:121 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../include/nav.php:90 +#: ../../include/nav.php:92 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:90 +#: ../../include/nav.php:92 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:96 ../../Zotlabs/Module/Manage.php:170 -#: ../../Zotlabs/Lib/Apps.php:336 +#: ../../include/nav.php:98 ../../Zotlabs/Module/Manage.php:170 +#: ../../Zotlabs/Lib/Apps.php:337 msgid "Channel Manager" msgstr "" -#: ../../include/nav.php:96 +#: ../../include/nav.php:98 msgid "Manage your channels" msgstr "" -#: ../../include/nav.php:99 ../../include/group.php:320 -#: ../../Zotlabs/Widget/Activity_filter.php:41 -#: ../../Zotlabs/Module/Group.php:141 ../../Zotlabs/Module/Group.php:153 -#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:363 +#: ../../include/nav.php:101 ../../include/group.php:321 +#: ../../Zotlabs/Widget/Activity_filter.php:82 +#: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 +#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364 msgid "Privacy Groups" msgstr "" -#: ../../include/nav.php:99 +#: ../../include/nav.php:101 msgid "Manage your privacy groups" msgstr "" -#: ../../include/nav.php:101 ../../Zotlabs/Widget/Settings_menu.php:61 +#: ../../include/nav.php:103 ../../Zotlabs/Widget/Settings_menu.php:61 #: ../../Zotlabs/Widget/Newmember.php:53 #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:338 +#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339 msgid "Settings" msgstr "" -#: ../../include/nav.php:101 +#: ../../include/nav.php:103 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:107 ../../include/nav.php:136 -#: ../../include/nav.php:155 ../../boot.php:1673 +#: ../../include/nav.php:109 ../../include/nav.php:138 +#: ../../include/nav.php:157 ../../boot.php:1697 msgid "Logout" msgstr "" -#: ../../include/nav.php:107 ../../include/nav.php:136 +#: ../../include/nav.php:109 ../../include/nav.php:138 msgid "End this session" msgstr "" -#: ../../include/nav.php:110 +#: ../../include/nav.php:112 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:113 ../../include/channel.php:1426 -#: ../../Zotlabs/Module/Profiles.php:830 +#: ../../include/nav.php:115 ../../include/channel.php:1523 +#: ../../Zotlabs/Module/Profiles.php:832 msgid "Edit Profiles" msgstr "" -#: ../../include/nav.php:113 +#: ../../include/nav.php:115 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:115 ../../Zotlabs/Widget/Newmember.php:35 +#: ../../include/nav.php:117 ../../Zotlabs/Widget/Newmember.php:35 msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:122 ../../include/nav.php:126 -#: ../../Zotlabs/Lib/Apps.php:335 ../../boot.php:1674 +#: ../../include/nav.php:124 ../../include/nav.php:128 +#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1698 msgid "Login" msgstr "" -#: ../../include/nav.php:122 ../../include/nav.php:126 +#: ../../include/nav.php:124 ../../include/nav.php:128 msgid "Sign in" msgstr "" -#: ../../include/nav.php:153 +#: ../../include/nav.php:155 msgid "Take me home" msgstr "" -#: ../../include/nav.php:155 +#: ../../include/nav.php:157 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:160 ../../Zotlabs/Module/Register.php:293 -#: ../../boot.php:1654 +#: ../../include/nav.php:162 ../../Zotlabs/Module/Register.php:293 +#: ../../boot.php:1678 msgid "Register" msgstr "" -#: ../../include/nav.php:160 +#: ../../include/nav.php:162 msgid "Create an account" msgstr "" -#: ../../include/nav.php:172 +#: ../../include/nav.php:174 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:186 +#: ../../include/nav.php:188 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:192 ../../Zotlabs/Widget/Admin.php:55 +#: ../../include/nav.php:194 ../../Zotlabs/Widget/Admin.php:55 msgid "Admin" msgstr "" -#: ../../include/nav.php:192 +#: ../../include/nav.php:194 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:326 ../../Zotlabs/Widget/Notifications.php:162 +#: ../../include/nav.php:324 ../../Zotlabs/Widget/Notifications.php:182 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 msgid "Loading" msgstr "" -#: ../../include/nav.php:332 +#: ../../include/nav.php:330 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:333 +#: ../../include/nav.php:331 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:339 +#: ../../include/nav.php:337 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:340 +#: ../../include/nav.php:338 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:341 +#: ../../include/nav.php:339 msgid "Toggle System Apps" msgstr "" -#: ../../include/nav.php:423 ../../Zotlabs/Module/Admin/Channels.php:154 +#: ../../include/nav.php:421 ../../Zotlabs/Module/Admin/Channels.php:154 msgid "Channel" msgstr "" -#: ../../include/nav.php:426 +#: ../../include/nav.php:424 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:436 ../../Zotlabs/Module/Help.php:80 +#: ../../include/nav.php:434 ../../Zotlabs/Module/Help.php:83 msgid "About" msgstr "" -#: ../../include/nav.php:439 +#: ../../include/nav.php:437 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:454 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:339 ../../Zotlabs/Storage/Browser.php:278 +#: ../../include/nav.php:452 ../../Zotlabs/Module/Fbrowser.php:85 +#: ../../Zotlabs/Lib/Apps.php:340 ../../Zotlabs/Storage/Browser.php:278 msgid "Files" msgstr "" -#: ../../include/nav.php:457 +#: ../../include/nav.php:455 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:479 ../../include/nav.php:482 -#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:329 +#: ../../include/nav.php:477 ../../include/nav.php:480 +#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:330 msgid "Chatrooms" msgstr "" -#: ../../include/nav.php:492 ../../Zotlabs/Lib/Apps.php:328 +#: ../../include/nav.php:490 ../../Zotlabs/Lib/Apps.php:329 msgid "Bookmarks" msgstr "" -#: ../../include/nav.php:495 +#: ../../include/nav.php:493 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:503 ../../Zotlabs/Module/Cards.php:207 -#: ../../Zotlabs/Lib/Apps.php:325 +#: ../../include/nav.php:501 ../../Zotlabs/Module/Cards.php:207 +#: ../../Zotlabs/Lib/Apps.php:326 msgid "Cards" msgstr "" -#: ../../include/nav.php:506 +#: ../../include/nav.php:504 msgid "View Cards" msgstr "" -#: ../../include/nav.php:514 ../../Zotlabs/Module/Articles.php:226 -#: ../../Zotlabs/Lib/Apps.php:324 +#: ../../include/nav.php:512 ../../Zotlabs/Module/Articles.php:226 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Articles" msgstr "" -#: ../../include/nav.php:517 +#: ../../include/nav.php:515 msgid "View Articles" msgstr "" -#: ../../include/nav.php:526 ../../Zotlabs/Module/Webpages.php:252 -#: ../../Zotlabs/Lib/Apps.php:340 +#: ../../include/nav.php:524 ../../Zotlabs/Module/Webpages.php:252 +#: ../../Zotlabs/Lib/Apps.php:341 msgid "Webpages" msgstr "" -#: ../../include/nav.php:529 +#: ../../include/nav.php:527 msgid "View Webpages" msgstr "" -#: ../../include/nav.php:538 ../../Zotlabs/Widget/Wiki_list.php:15 +#: ../../include/nav.php:536 ../../Zotlabs/Widget/Wiki_list.php:15 #: ../../Zotlabs/Module/Wiki.php:206 msgid "Wikis" msgstr "" -#: ../../include/nav.php:541 ../../Zotlabs/Lib/Apps.php:341 +#: ../../include/nav.php:539 ../../Zotlabs/Lib/Apps.php:342 msgid "Wiki" msgstr "" -#: ../../include/auth.php:192 +#: ../../include/auth.php:194 msgid "Delegation session ended." msgstr "" -#: ../../include/auth.php:196 +#: ../../include/auth.php:198 msgid "Logged out." msgstr "" -#: ../../include/auth.php:291 +#: ../../include/auth.php:294 msgid "Email validation is incomplete. Please check your email." msgstr "" -#: ../../include/auth.php:307 +#: ../../include/auth.php:310 msgid "Failed authentication" msgstr "" #: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:51 -#: ../../Zotlabs/Module/Profiles.php:736 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Miscellaneous" msgstr "" @@ -5780,14 +5726,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:211 ../../Zotlabs/Module/Events.php:468 -#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:143 -#: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:745 -#: ../../Zotlabs/Module/Profiles.php:749 -msgid "Required" -msgstr "" - -#: ../../include/datetime.php:238 ../../boot.php:2605 +#: ../../include/datetime.php:238 ../../boot.php:2702 msgid "never" msgstr "" @@ -5860,11 +5799,36 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/follow.php:37 +#: ../../include/cdav.php:157 +msgid "INVALID EVENT DISMISSED!" +msgstr "" + +#: ../../include/cdav.php:158 +msgid "Summary: " +msgstr "" + +#: ../../include/cdav.php:159 +msgid "Date: " +msgstr "" + +#: ../../include/cdav.php:160 ../../include/cdav.php:168 +msgid "Reason: " +msgstr "" + +#: ../../include/cdav.php:166 +msgid "INVALID CARD DISMISSED!" +msgstr "" + +#: ../../include/cdav.php:167 +msgid "Name: " +msgstr "" + +#: ../../include/follow.php:37 ../../Zotlabs/Lib/Connect.php:46 +#: ../../Zotlabs/Lib/Connect.php:143 msgid "Channel is blocked on this site." msgstr "" -#: ../../include/follow.php:42 +#: ../../include/follow.php:42 ../../Zotlabs/Lib/Connect.php:51 msgid "Channel location missing." msgstr "" @@ -5880,333 +5844,372 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:166 +#: ../../include/follow.php:166 ../../Zotlabs/Lib/Connect.php:103 msgid "Remote channel or protocol unavailable." msgstr "" -#: ../../include/follow.php:190 +#: ../../include/follow.php:190 ../../Zotlabs/Lib/Connect.php:137 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:202 +#: ../../include/follow.php:202 ../../Zotlabs/Lib/Connect.php:155 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:213 +#: ../../include/follow.php:213 ../../Zotlabs/Lib/Connect.php:167 msgid "Cannot connect to yourself." msgstr "" -#: ../../include/conversation.php:122 ../../Zotlabs/Module/Like.php:123 +#: ../../include/conversation.php:124 ../../Zotlabs/Module/Like.php:129 msgid "channel" msgstr "" -#: ../../include/conversation.php:169 +#: ../../include/conversation.php:171 #, php-format msgid "likes %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:172 +#: ../../include/conversation.php:174 #, php-format msgid "doesn't like %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:212 +#: ../../include/conversation.php:214 ../../include/conversation.php:216 #, php-format msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/conversation.php:247 +#: ../../include/conversation.php:251 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:268 ../../Zotlabs/Module/Mood.php:76 +#: ../../include/conversation.php:274 ../../Zotlabs/Module/Mood.php:76 #, php-format msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:483 ../../Zotlabs/Lib/ThreadItem.php:468 +#: ../../include/conversation.php:503 ../../Zotlabs/Lib/ThreadItem.php:500 msgid "This is an unsaved preview" msgstr "" -#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:639 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:640 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:641 ../../Zotlabs/Widget/Pinned.php:77 +#: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:642 ../../Zotlabs/Widget/Pinned.php:78 +#: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:643 ../../Zotlabs/Widget/Pinned.php:79 +#: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:644 ../../Zotlabs/Widget/Pinned.php:66 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:645 ../../Zotlabs/Widget/Pinned.php:67 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:646 ../../Zotlabs/Widget/Pinned.php:68 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:690 ../../Zotlabs/Lib/ThreadItem.php:178 +#: ../../include/conversation.php:716 ../../Zotlabs/Lib/ThreadItem.php:180 msgid "Select" msgstr "" -#: ../../include/conversation.php:691 ../../include/conversation.php:736 +#: ../../include/conversation.php:717 ../../include/conversation.php:762 #: ../../Zotlabs/Module/Article_edit.php:128 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Module/Oauth.php:174 -#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1079 -#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Webpages.php:257 +#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1052 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Webpages.php:257 #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Connections.php:306 -#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Profiles.php:800 -#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:267 -#: ../../Zotlabs/Module/Connedit.php:668 ../../Zotlabs/Module/Connedit.php:940 -#: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:168 +#: ../../Zotlabs/Module/Connections.php:328 +#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:269 +#: ../../Zotlabs/Module/Connedit.php:669 ../../Zotlabs/Module/Connedit.php:941 +#: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:170 #: ../../Zotlabs/Storage/Browser.php:297 msgid "Delete" msgstr "" -#: ../../include/conversation.php:695 ../../Zotlabs/Lib/ThreadItem.php:267 +#: ../../include/conversation.php:721 ../../Zotlabs/Lib/ThreadItem.php:273 msgid "Toggle Star Status" msgstr "" -#: ../../include/conversation.php:700 ../../Zotlabs/Lib/ThreadItem.php:103 +#: ../../include/conversation.php:726 ../../Zotlabs/Lib/ThreadItem.php:103 msgid "Private Message" msgstr "" -#: ../../include/conversation.php:707 ../../Zotlabs/Lib/ThreadItem.php:278 +#: ../../include/conversation.php:733 ../../Zotlabs/Widget/Pinned.php:88 +#: ../../Zotlabs/Lib/ThreadItem.php:284 msgid "Message signature validated" msgstr "" -#: ../../include/conversation.php:708 ../../Zotlabs/Lib/ThreadItem.php:279 +#: ../../include/conversation.php:734 ../../Zotlabs/Widget/Pinned.php:89 +#: ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Message signature incorrect" msgstr "" -#: ../../include/conversation.php:735 +#: ../../include/conversation.php:761 #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:342 msgid "Approve" msgstr "" -#: ../../include/conversation.php:739 +#: ../../include/conversation.php:766 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:759 +#: ../../include/conversation.php:786 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:760 +#: ../../include/conversation.php:787 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:766 ../../Zotlabs/Lib/ThreadItem.php:401 +#: ../../include/conversation.php:793 ../../Zotlabs/Widget/Pinned.php:133 +#: ../../Zotlabs/Lib/ThreadItem.php:429 #, php-format msgid "from %s" msgstr "" -#: ../../include/conversation.php:769 ../../Zotlabs/Lib/ThreadItem.php:404 +#: ../../include/conversation.php:796 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../Zotlabs/Lib/ThreadItem.php:432 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:770 ../../Zotlabs/Lib/ThreadItem.php:405 +#: ../../include/conversation.php:797 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:785 +#: ../../include/conversation.php:812 msgid "View in context" msgstr "" -#: ../../include/conversation.php:787 ../../Zotlabs/Module/Photos.php:1076 -#: ../../Zotlabs/Lib/ThreadItem.php:469 +#: ../../include/conversation.php:814 ../../Zotlabs/Module/Photos.php:1078 +#: ../../Zotlabs/Lib/ThreadItem.php:501 msgid "Please wait" msgstr "" -#: ../../include/conversation.php:886 +#: ../../include/conversation.php:913 msgid "remove" msgstr "" -#: ../../include/conversation.php:890 +#: ../../include/conversation.php:917 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:891 ../../Zotlabs/Lib/ThreadItem.php:291 +#: ../../include/conversation.php:918 ../../Zotlabs/Lib/ThreadItem.php:301 msgid "Conversation Tools" msgstr "" -#: ../../include/conversation.php:892 +#: ../../include/conversation.php:919 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:962 msgid "View Source" msgstr "" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:972 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:954 +#: ../../include/conversation.php:981 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1048 ../../Zotlabs/Module/Connedit.php:629 +#: ../../include/conversation.php:1075 ../../Zotlabs/Module/Connedit.php:630 msgid "Recent Activity" msgstr "" -#: ../../include/conversation.php:1058 ../../include/connections.php:110 -#: ../../include/channel.php:1506 ../../Zotlabs/Widget/Suggestions.php:46 -#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:353 -#: ../../Zotlabs/Module/Connections.php:326 ../../Zotlabs/Module/Suggest.php:71 +#: ../../include/conversation.php:1085 ../../include/connections.php:110 +#: ../../include/channel.php:1603 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:368 +#: ../../Zotlabs/Module/Connections.php:349 ../../Zotlabs/Module/Suggest.php:71 msgid "Connect" msgstr "" -#: ../../include/conversation.php:1068 +#: ../../include/conversation.php:1095 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1078 +#: ../../include/conversation.php:1105 msgid "Message" msgstr "" -#: ../../include/conversation.php:1088 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../include/conversation.php:1115 ../../Zotlabs/Module/Pubsites.php:35 #: ../../Zotlabs/Module/Ratings.php:97 msgid "Ratings" msgstr "" -#: ../../include/conversation.php:1098 ../../Zotlabs/Module/Poke.php:199 -#: ../../Zotlabs/Lib/Apps.php:350 +#: ../../include/conversation.php:1125 ../../Zotlabs/Module/Poke.php:199 +#: ../../Zotlabs/Lib/Apps.php:351 msgid "Poke" msgstr "" -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1247 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1247 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1216 +#: ../../include/conversation.php:1251 #, 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:1218 +#: ../../include/conversation.php:1253 #, 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:1224 +#: ../../include/conversation.php:1259 msgid "and" msgstr "" -#: ../../include/conversation.php:1227 +#: ../../include/conversation.php:1262 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1228 +#: ../../include/conversation.php:1263 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1228 +#: ../../include/conversation.php:1263 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1702 ../../include/taxonomy.php:659 -#: ../../include/channel.php:1669 ../../Zotlabs/Module/Photos.php:1135 -#: ../../Zotlabs/Lib/ThreadItem.php:236 +#: ../../include/conversation.php:1447 +msgid "Toggle poll" +msgstr "" + +#: ../../include/conversation.php:1448 +msgid "Option" +msgstr "" + +#: ../../include/conversation.php:1449 +msgid "Add option" +msgstr "" + +#: ../../include/conversation.php:1450 +msgid "Minutes" +msgstr "" + +#: ../../include/conversation.php:1450 +msgid "Hours" +msgstr "" + +#: ../../include/conversation.php:1450 +msgid "Days" +msgstr "" + +#: ../../include/conversation.php:1451 +msgid "Allow multiple answers" +msgstr "" + +#: ../../include/conversation.php:1734 ../../include/taxonomy.php:659 +#: ../../include/channel.php:1766 ../../Zotlabs/Module/Photos.php:1135 +#: ../../Zotlabs/Lib/ThreadItem.php:242 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1705 ../../Zotlabs/Module/Photos.php:1140 -#: ../../Zotlabs/Lib/ThreadItem.php:241 +#: ../../include/conversation.php:1737 ../../Zotlabs/Module/Photos.php:1140 +#: ../../Zotlabs/Lib/ThreadItem.php:247 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1708 +#: ../../include/conversation.php:1740 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1711 +#: ../../include/conversation.php:1743 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1714 +#: ../../include/conversation.php:1746 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1717 +#: ../../include/conversation.php:1749 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1720 +#: ../../include/conversation.php:1752 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1723 +#: ../../include/conversation.php:1755 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -6273,11 +6276,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1614 +#: ../../include/selectors.php:60 ../../include/channel.php:1711 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1616 +#: ../../include/selectors.php:60 ../../include/channel.php:1713 msgid "Non-specific" msgstr "" @@ -6373,15 +6376,15 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/selectors.php:134 ../../include/channel.php:493 -#: ../../include/channel.php:494 ../../include/channel.php:501 +#: ../../include/selectors.php:134 ../../include/channel.php:504 +#: ../../include/channel.php:505 ../../include/channel.php:512 #: ../../Zotlabs/Widget/Affinity.php:32 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:74 +#: ../../Zotlabs/Module/Settings/Channel.php:71 #: ../../Zotlabs/Module/Settings/Channel.php:75 -#: ../../Zotlabs/Module/Settings/Channel.php:78 -#: ../../Zotlabs/Module/Settings/Channel.php:89 -#: ../../Zotlabs/Module/Connedit.php:725 +#: ../../Zotlabs/Module/Settings/Channel.php:76 +#: ../../Zotlabs/Module/Settings/Channel.php:79 +#: ../../Zotlabs/Module/Settings/Channel.php:90 +#: ../../Zotlabs/Module/Connedit.php:726 msgid "Friends" msgstr "" @@ -6477,35 +6480,36 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/group.php:22 ../../Zotlabs/Lib/Group.php:28 +#: ../../include/group.php:23 ../../Zotlabs/Lib/Group.php:28 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:264 ../../Zotlabs/Lib/Group.php:270 +#: ../../include/group.php:265 ../../Zotlabs/Lib/Group.php:270 msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/group.php:298 ../../Zotlabs/Lib/Group.php:302 +#: ../../include/group.php:299 ../../Zotlabs/Lib/AccessList.php:311 +#: ../../Zotlabs/Lib/Group.php:302 msgid "edit" msgstr "" -#: ../../include/group.php:321 ../../Zotlabs/Lib/Group.php:325 +#: ../../include/group.php:322 ../../Zotlabs/Lib/Group.php:325 msgid "Edit group" msgstr "" -#: ../../include/group.php:322 ../../Zotlabs/Lib/Group.php:326 +#: ../../include/group.php:323 ../../Zotlabs/Lib/Group.php:326 msgid "Add privacy group" msgstr "" -#: ../../include/group.php:323 ../../Zotlabs/Lib/Group.php:327 +#: ../../include/group.php:324 ../../Zotlabs/Lib/Group.php:327 msgid "Channels not in any privacy group" msgstr "" -#: ../../include/group.php:325 ../../Zotlabs/Widget/Savedsearch.php:84 -#: ../../Zotlabs/Lib/Group.php:329 +#: ../../include/group.php:326 ../../Zotlabs/Widget/Savedsearch.php:84 +#: ../../Zotlabs/Lib/AccessList.php:336 ../../Zotlabs/Lib/Group.php:329 msgid "add" msgstr "" @@ -6538,7 +6542,7 @@ msgstr "" msgid "wants" msgstr "" -#: ../../include/taxonomy.php:573 ../../Zotlabs/Lib/ThreadItem.php:307 +#: ../../include/taxonomy.php:573 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "like" msgstr "" @@ -6546,7 +6550,7 @@ msgstr "" msgid "likes" msgstr "" -#: ../../include/taxonomy.php:574 ../../Zotlabs/Lib/ThreadItem.php:308 +#: ../../include/taxonomy.php:574 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "dislike" msgstr "" @@ -6554,104 +6558,104 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/items.php:984 ../../include/items.php:1044 +#: ../../include/items.php:999 ../../include/items.php:1059 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1232 +#: ../../include/items.php:1247 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1234 +#: ../../include/items.php:1249 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1236 +#: ../../include/items.php:1251 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1238 +#: ../../include/items.php:1253 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1240 +#: ../../include/items.php:1255 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1242 +#: ../../include/items.php:1257 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1244 +#: ../../include/items.php:1259 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1246 +#: ../../include/items.php:1261 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4296 ../../Zotlabs/Module/Group.php:61 -#: ../../Zotlabs/Module/Group.php:213 +#: ../../include/items.php:4465 ../../Zotlabs/Module/Group.php:62 +#: ../../Zotlabs/Module/Group.php:214 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:4312 +#: ../../include/items.php:4481 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4319 +#: ../../include/items.php:4488 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4329 ../../Zotlabs/Module/Connedit.php:867 +#: ../../include/items.php:4498 ../../Zotlabs/Module/Connedit.php:868 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4331 +#: ../../include/items.php:4500 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4673 ../../Zotlabs/Module/Cover_photo.php:303 +#: ../../include/items.php:4834 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "" -#: ../../include/items.php:4674 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../include/items.php:4675 ../../Zotlabs/Module/Cover_photo.php:305 +#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "" -#: ../../include/items.php:4676 ../../Zotlabs/Module/Cover_photo.php:306 +#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../include/items.php:4678 ../../Zotlabs/Module/Cover_photo.php:308 +#: ../../include/items.php:4839 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../include/items.php:4680 +#: ../../include/items.php:4841 msgid "profile photo" msgstr "" -#: ../../include/items.php:4872 +#: ../../include/items.php:5033 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4872 +#: ../../include/items.php:5033 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4872 +#: ../../include/items.php:5033 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -6724,403 +6728,411 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/photo/photo_driver.php:367 -#: ../../Zotlabs/Module/Profile_photo.php:145 -#: ../../Zotlabs/Module/Profile_photo.php:282 +#: ../../include/photo/photo_driver.php:413 +#: ../../Zotlabs/Module/Profile_photo.php:147 +#: ../../Zotlabs/Module/Profile_photo.php:284 msgid "Profile Photos" msgstr "" -#: ../../include/attach.php:267 ../../include/attach.php:375 +#: ../../include/attach.php:273 ../../include/attach.php:381 msgid "Item was not found." msgstr "" -#: ../../include/attach.php:284 +#: ../../include/attach.php:290 msgid "Unknown error." msgstr "" -#: ../../include/attach.php:568 +#: ../../include/attach.php:574 msgid "No source file." msgstr "" -#: ../../include/attach.php:590 +#: ../../include/attach.php:596 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:609 +#: ../../include/attach.php:615 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:751 +#: ../../include/attach.php:759 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:772 +#: ../../include/attach.php:780 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:954 +#: ../../include/attach.php:968 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:983 +#: ../../include/attach.php:997 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:1057 ../../include/attach.php:1073 +#: ../../include/attach.php:1069 ../../include/attach.php:1085 msgid "Path not available." msgstr "" -#: ../../include/attach.php:1122 ../../include/attach.php:1285 +#: ../../include/attach.php:1134 ../../include/attach.php:1297 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1148 +#: ../../include/attach.php:1160 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1173 +#: ../../include/attach.php:1185 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1241 +#: ../../include/attach.php:1253 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1245 +#: ../../include/attach.php:1257 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1291 +#: ../../include/attach.php:1303 msgid "Empty path" msgstr "" +#: ../../include/attach.php:2035 +#, php-format +msgid "%s shared a %s with you" +msgstr "" + #: ../../include/bookmarks.php:34 #, php-format msgid "%1$s's bookmarks" msgstr "" -#: ../../include/menu.php:118 ../../include/channel.php:1426 -#: ../../include/channel.php:1430 ../../Zotlabs/Widget/Cdav.php:138 +#: ../../include/menu.php:120 ../../include/channel.php:1523 +#: ../../include/channel.php:1527 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:98 -#: ../../Zotlabs/Module/Group.php:252 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:255 #: ../../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:298 -#: ../../Zotlabs/Module/Connections.php:339 -#: ../../Zotlabs/Module/Connections.php:359 ../../Zotlabs/Module/Menu.php:176 -#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:266 +#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:362 +#: ../../Zotlabs/Module/Connections.php:382 ../../Zotlabs/Module/Menu.php:176 +#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:268 #: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:384 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:557 #: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:296 msgid "Edit" msgstr "" -#: ../../include/bbcode.php:221 ../../include/bbcode.php:1232 -#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1240 -#: ../../include/bbcode.php:1243 ../../include/bbcode.php:1246 -#: ../../include/bbcode.php:1249 ../../include/bbcode.php:1254 -#: ../../include/bbcode.php:1257 ../../include/bbcode.php:1262 -#: ../../include/bbcode.php:1265 ../../include/bbcode.php:1268 -#: ../../include/bbcode.php:1271 +#: ../../include/bbcode.php:221 ../../include/bbcode.php:896 +#: ../../include/bbcode.php:1486 ../../include/bbcode.php:1494 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:260 ../../include/bbcode.php:1282 +#: ../../include/bbcode.php:268 ../../include/bbcode.php:1511 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:292 +#: ../../include/bbcode.php:302 #, php-format msgid "Install %1$s element %2$s" msgstr "" -#: ../../include/bbcode.php:296 +#: ../../include/bbcode.php:306 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "" -#: ../../include/bbcode.php:306 ../../Zotlabs/Module/Impel.php:43 +#: ../../include/bbcode.php:316 ../../Zotlabs/Module/Impel.php:43 msgid "webpage" msgstr "" -#: ../../include/bbcode.php:309 ../../Zotlabs/Module/Impel.php:53 +#: ../../include/bbcode.php:319 ../../Zotlabs/Module/Impel.php:53 msgid "layout" msgstr "" -#: ../../include/bbcode.php:312 ../../Zotlabs/Module/Impel.php:48 +#: ../../include/bbcode.php:322 ../../Zotlabs/Module/Impel.php:48 msgid "block" msgstr "" -#: ../../include/bbcode.php:315 ../../Zotlabs/Module/Impel.php:60 +#: ../../include/bbcode.php:325 ../../Zotlabs/Module/Impel.php:60 msgid "menu" msgstr "" -#: ../../include/bbcode.php:376 +#: ../../include/bbcode.php:519 msgid "card" msgstr "" -#: ../../include/bbcode.php:378 +#: ../../include/bbcode.php:521 msgid "article" msgstr "" -#: ../../include/bbcode.php:380 ../../include/markdown.php:204 -#: ../../Zotlabs/Module/Tagger.php:77 +#: ../../include/bbcode.php:523 ../../include/markdown.php:204 +#: ../../Zotlabs/Module/Tagger.php:79 msgid "post" msgstr "" -#: ../../include/bbcode.php:384 ../../include/markdown.php:202 +#: ../../include/bbcode.php:527 ../../include/markdown.php:202 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:461 ../../include/bbcode.php:469 +#: ../../include/bbcode.php:604 ../../include/bbcode.php:612 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:469 ../../include/markdown.php:251 +#: ../../include/bbcode.php:612 ../../include/markdown.php:251 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:482 +#: ../../include/bbcode.php:625 msgid "View article" msgstr "" -#: ../../include/bbcode.php:482 +#: ../../include/bbcode.php:625 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:772 ../../include/bbcode.php:942 -#: ../../Zotlabs/Lib/NativeWikiPage.php:603 +#: ../../include/bbcode.php:1018 ../../include/bbcode.php:1190 +#: ../../Zotlabs/Lib/NativeWikiPage.php:606 msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/bbcode.php:1220 +#: ../../include/bbcode.php:1474 msgid "$1 wrote:" msgstr "" -#: ../../include/channel.php:43 +#: ../../include/channel.php:46 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/channel.php:76 +#: ../../include/channel.php:79 msgid "Empty name" msgstr "" -#: ../../include/channel.php:79 +#: ../../include/channel.php:82 msgid "Name too long" msgstr "" -#: ../../include/channel.php:196 +#: ../../include/channel.php:199 msgid "No account identifier" msgstr "" -#: ../../include/channel.php:208 +#: ../../include/channel.php:211 msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:222 ../../include/channel.php:655 +#: ../../include/channel.php:225 ../../include/channel.php:705 #: ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/channel.php:227 ../../include/channel.php:660 +#: ../../include/channel.php:230 ../../include/channel.php:710 #: ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/channel.php:287 +#: ../../include/channel.php:294 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/channel.php:429 +#: ../../include/channel.php:440 msgid "Default Profile" msgstr "" -#: ../../include/channel.php:588 ../../include/channel.php:677 +#: ../../include/channel.php:638 ../../include/channel.php:727 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1419 ../../Zotlabs/Module/Profiles.php:728 +#: ../../include/channel.php:1370 +msgid "Requested channel is not available." +msgstr "" + +#: ../../include/channel.php:1516 ../../Zotlabs/Module/Profiles.php:730 msgid "Change profile photo" msgstr "" -#: ../../include/channel.php:1427 +#: ../../include/channel.php:1524 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1445 ../../Zotlabs/Module/Profiles.php:820 +#: ../../include/channel.php:1542 ../../Zotlabs/Module/Profiles.php:822 msgid "Profile Image" msgstr "" -#: ../../include/channel.php:1448 +#: ../../include/channel.php:1545 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1449 ../../Zotlabs/Module/Profiles.php:725 -#: ../../Zotlabs/Module/Profiles.php:824 +#: ../../include/channel.php:1546 ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:826 msgid "Edit visibility" msgstr "" -#: ../../include/channel.php:1525 ../../include/channel.php:1653 +#: ../../include/channel.php:1622 ../../include/channel.php:1750 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1527 ../../include/channel.php:1721 +#: ../../include/channel.php:1623 ../../include/channel.php:1794 +msgid "Status:" +msgstr "" + +#: ../../include/channel.php:1624 ../../include/channel.php:1818 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1528 +#: ../../include/channel.php:1625 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1581 +#: ../../include/channel.php:1678 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1612 +#: ../../include/channel.php:1709 msgid "Trans" msgstr "" -#: ../../include/channel.php:1651 ../../Zotlabs/Module/Settings/Channel.php:499 +#: ../../include/channel.php:1748 ../../Zotlabs/Module/Settings/Channel.php:500 msgid "Full Name:" msgstr "" -#: ../../include/channel.php:1658 +#: ../../include/channel.php:1755 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1682 +#: ../../include/channel.php:1779 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1683 +#: ../../include/channel.php:1780 msgid "j F" msgstr "" -#: ../../include/channel.php:1690 +#: ../../include/channel.php:1787 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1694 ../../Zotlabs/Module/Directory.php:334 +#: ../../include/channel.php:1791 ../../Zotlabs/Module/Directory.php:347 msgid "Age:" msgstr "" -#: ../../include/channel.php:1703 +#: ../../include/channel.php:1800 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1715 +#: ../../include/channel.php:1812 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1719 +#: ../../include/channel.php:1816 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1723 ../../Zotlabs/Module/Directory.php:350 +#: ../../include/channel.php:1820 ../../Zotlabs/Module/Directory.php:365 msgid "Hometown:" msgstr "" -#: ../../include/channel.php:1725 +#: ../../include/channel.php:1822 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1727 +#: ../../include/channel.php:1824 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1729 ../../Zotlabs/Module/Directory.php:352 +#: ../../include/channel.php:1826 ../../Zotlabs/Module/Directory.php:367 msgid "About:" msgstr "" -#: ../../include/channel.php:1731 +#: ../../include/channel.php:1828 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1733 +#: ../../include/channel.php:1830 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1735 +#: ../../include/channel.php:1832 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1737 +#: ../../include/channel.php:1834 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1739 +#: ../../include/channel.php:1836 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1741 +#: ../../include/channel.php:1838 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1743 +#: ../../include/channel.php:1840 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1745 +#: ../../include/channel.php:1842 msgid "Television:" msgstr "" -#: ../../include/channel.php:1747 +#: ../../include/channel.php:1844 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1749 +#: ../../include/channel.php:1846 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1751 +#: ../../include/channel.php:1848 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1753 +#: ../../include/channel.php:1850 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1774 ../../Zotlabs/Module/Profperm.php:113 -#: ../../Zotlabs/Lib/Apps.php:361 +#: ../../include/channel.php:1871 ../../Zotlabs/Module/Profperm.php:113 +#: ../../Zotlabs/Lib/Apps.php:362 msgid "Profile" msgstr "" -#: ../../include/channel.php:1776 +#: ../../include/channel.php:1873 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:1777 ../../Zotlabs/Module/Events.php:699 +#: ../../include/channel.php:1874 ../../Zotlabs/Module/Events.php:699 msgid "Export" msgstr "" -#: ../../include/channel.php:2215 ../../Zotlabs/Module/Cover_photo.php:310 +#: ../../include/channel.php:2312 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "" -#: ../../include/channel.php:2483 ../../Zotlabs/Module/Rmagic.php:93 -#: ../../boot.php:1675 +#: ../../include/channel.php:2601 ../../Zotlabs/Module/Rmagic.php:93 +#: ../../boot.php:1699 msgid "Remote Authentication" msgstr "" -#: ../../include/channel.php:2484 ../../Zotlabs/Module/Rmagic.php:94 +#: ../../include/channel.php:2602 ../../Zotlabs/Module/Rmagic.php:94 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../include/channel.php:2485 ../../Zotlabs/Module/Rmagic.php:95 +#: ../../include/channel.php:2603 ../../Zotlabs/Module/Rmagic.php:95 msgid "Authenticate" msgstr "" -#: ../../include/channel.php:2640 ../../Zotlabs/Module/Admin/Accounts.php:91 +#: ../../include/channel.php:2758 ../../Zotlabs/Module/Admin/Accounts.php:91 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -7159,7 +7171,7 @@ msgstr "" msgid "Show" msgstr "" -#: ../../include/acl_selectors.php:117 +#: ../../include/acl_selectors.php:117 ../../Zotlabs/Widget/Pinned.php:158 msgid "Don't show" msgstr "" @@ -7206,7 +7218,7 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../include/zid.php:368 +#: ../../include/zid.php:370 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" @@ -7278,21 +7290,21 @@ msgid "Page name" msgstr "" #: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87 -#: ../../Zotlabs/Module/Embedphotos.php:168 ../../Zotlabs/Module/Photos.php:784 +#: ../../Zotlabs/Module/Embedphotos.php:170 ../../Zotlabs/Module/Photos.php:786 #: ../../Zotlabs/Module/Photos.php:1332 msgid "View Photo" msgstr "" #: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108 -#: ../../Zotlabs/Module/Embedphotos.php:184 ../../Zotlabs/Module/Photos.php:815 +#: ../../Zotlabs/Module/Embedphotos.php:186 ../../Zotlabs/Module/Photos.php:817 msgid "Edit Album" 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:186 -#: ../../Zotlabs/Module/Profile_photo.php:498 -#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Photos.php:685 +#: ../../Zotlabs/Module/Embedphotos.php:188 +#: ../../Zotlabs/Module/Profile_photo.php:500 +#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:687 #: ../../Zotlabs/Storage/Browser.php:398 msgid "Upload" msgstr "" @@ -7329,6 +7341,59 @@ msgstr "" msgid "Chat Members" msgstr "" +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:205 +msgid "I will attend" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:205 +msgid "I will not attend" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:205 +msgid "I might attend" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:219 +msgid "I agree" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:219 +msgid "I disagree" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:219 +msgid "I abstain" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:329 +msgid "Share This" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:329 +msgid "share" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:123 ../../Zotlabs/Widget/Pinned.php:124 +#, php-format +msgid "View %s's profile - %s" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:128 ../../Zotlabs/Lib/ThreadItem.php:413 +msgid "via" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:143 ../../Zotlabs/Lib/ThreadItem.php:443 +msgid "Attendance Options" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:144 ../../Zotlabs/Lib/ThreadItem.php:445 +msgid "Voting Options" +msgstr "" + +#: ../../Zotlabs/Widget/Pinned.php:156 ../../Zotlabs/Lib/ThreadItem.php:469 +msgid "Pinned post" +msgstr "" + #: ../../Zotlabs/Widget/Activity.php:50 msgctxt "widget" msgid "Activity" @@ -7351,7 +7416,7 @@ msgid "Channel Calendar" msgstr "" #: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143 -#: ../../Zotlabs/Module/Cdav.php:1078 +#: ../../Zotlabs/Module/Cdav.php:1051 msgid "CalDAV Calendars" msgstr "" @@ -7372,12 +7437,12 @@ msgid "Create new CalDAV calendar" msgstr "" #: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178 -#: ../../Zotlabs/Module/Cdav.php:1082 ../../Zotlabs/Module/Cdav.php:1388 +#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1383 #: ../../Zotlabs/Module/Webpages.php:254 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Cards.php:113 -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Menu.php:182 -#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Layouts.php:185 +#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Layouts.php:185 #: ../../Zotlabs/Storage/Browser.php:282 ../../Zotlabs/Storage/Browser.php:396 msgid "Create" msgstr "" @@ -7390,7 +7455,7 @@ msgstr "" msgid "Calendar Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1078 +#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1051 msgid "Channel Calendars" msgstr "" @@ -7471,9 +7536,9 @@ msgid "See more..." msgstr "" #: ../../Zotlabs/Widget/Forums.php:100 -#: ../../Zotlabs/Widget/Activity_filter.php:73 -#: ../../Zotlabs/Widget/Notifications.php:119 -#: ../../Zotlabs/Widget/Notifications.php:120 +#: ../../Zotlabs/Widget/Activity_filter.php:115 +#: ../../Zotlabs/Widget/Notifications.php:139 +#: ../../Zotlabs/Widget/Notifications.php:140 msgid "Forums" msgstr "" @@ -7482,23 +7547,23 @@ msgid "Bookmarked Chatrooms" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:23 -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 msgctxt "wiki_history" msgid "Message" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:24 -#: ../../Zotlabs/Lib/NativeWikiPage.php:563 +#: ../../Zotlabs/Lib/NativeWikiPage.php:566 msgid "Date" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:25 -#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:564 +#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:567 msgid "Revert" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:26 -#: ../../Zotlabs/Lib/NativeWikiPage.php:565 +#: ../../Zotlabs/Lib/NativeWikiPage.php:568 msgid "Compare" msgstr "" @@ -7534,7 +7599,7 @@ msgstr "" msgid "photo/image" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:286 msgid "Site" msgstr "" @@ -7555,11 +7620,11 @@ msgstr "" msgid "Channels" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:25 ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Widget/Admin.php:25 ../../Zotlabs/Module/Admin/Security.php:99 msgid "Security" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:358 msgid "Features" msgstr "" @@ -7594,61 +7659,85 @@ msgstr "" msgid "Addon Features" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:36 +#: ../../Zotlabs/Widget/Activity_filter.php:33 +msgid "Direct Messages" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:37 +msgid "Show direct (private) messages" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:42 +msgid "Events" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:46 +msgid "Show posts that include events" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:52 +msgid "Polls" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:56 +msgid "Show posts that include polls" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:77 #, php-format msgid "Show posts related to the %s privacy group" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:45 +#: ../../Zotlabs/Widget/Activity_filter.php:86 msgid "Show my privacy groups" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:66 +#: ../../Zotlabs/Widget/Activity_filter.php:108 msgid "Show posts to this forum" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:77 +#: ../../Zotlabs/Widget/Activity_filter.php:119 msgid "Show forums" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:91 +#: ../../Zotlabs/Widget/Activity_filter.php:133 msgid "Starred Posts" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:95 +#: ../../Zotlabs/Widget/Activity_filter.php:137 msgid "Show posts that I have starred" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:106 +#: ../../Zotlabs/Widget/Activity_filter.php:148 msgid "Personal Posts" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:110 +#: ../../Zotlabs/Widget/Activity_filter.php:152 msgid "Show posts that mention or involve me" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:131 +#: ../../Zotlabs/Widget/Activity_filter.php:173 #, php-format msgid "Show posts that I have filed to %s" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:141 +#: ../../Zotlabs/Widget/Activity_filter.php:183 msgid "Show filed post categories" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:155 +#: ../../Zotlabs/Widget/Activity_filter.php:197 msgid "Panel search" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:165 +#: ../../Zotlabs/Widget/Activity_filter.php:207 msgid "Filter by name" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:180 +#: ../../Zotlabs/Widget/Activity_filter.php:222 msgid "Remove active filter" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:196 +#: ../../Zotlabs/Widget/Activity_filter.php:238 msgid "Stream Filters" msgstr "" @@ -7770,25 +7859,25 @@ msgid "View public stream" msgstr "" #: ../../Zotlabs/Widget/Newmember.php:75 -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:206 msgid "New Member Links" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:723 +#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:724 msgid "Me" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:724 +#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:725 msgid "Family" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:726 +#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:727 msgid "Acquaintances" msgstr "" #: ../../Zotlabs/Widget/Affinity.php:34 ../../Zotlabs/Module/Connections.php:97 #: ../../Zotlabs/Module/Connections.php:111 -#: ../../Zotlabs/Module/Connedit.php:727 +#: ../../Zotlabs/Module/Connedit.php:728 msgid "All" msgstr "" @@ -7809,127 +7898,142 @@ msgid "View your network activity" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:23 +#: ../../Zotlabs/Widget/Notifications.php:62 msgid "Mark all notifications read" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:26 -#: ../../Zotlabs/Widget/Notifications.php:45 -#: ../../Zotlabs/Widget/Notifications.php:152 +#: ../../Zotlabs/Widget/Notifications.php:46 +#: ../../Zotlabs/Widget/Notifications.php:65 +#: ../../Zotlabs/Widget/Notifications.php:172 msgid "Show new posts only" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:27 -#: ../../Zotlabs/Widget/Notifications.php:46 -#: ../../Zotlabs/Widget/Notifications.php:122 -#: ../../Zotlabs/Widget/Notifications.php:153 +#: ../../Zotlabs/Widget/Notifications.php:47 +#: ../../Zotlabs/Widget/Notifications.php:66 +#: ../../Zotlabs/Widget/Notifications.php:142 +#: ../../Zotlabs/Widget/Notifications.php:173 msgid "Filter by name or address" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:35 +#: ../../Zotlabs/Widget/Notifications.php:36 msgid "New Home Activity" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:36 +#: ../../Zotlabs/Widget/Notifications.php:37 msgid "New Home Activity Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:39 +#: ../../Zotlabs/Widget/Notifications.php:40 msgid "View your home activity" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:42 -#: ../../Zotlabs/Widget/Notifications.php:149 +#: ../../Zotlabs/Widget/Notifications.php:43 +#: ../../Zotlabs/Widget/Notifications.php:169 msgid "Mark all notifications seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:54 +#: ../../Zotlabs/Widget/Notifications.php:55 +msgid "New Direct Messages" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:56 +msgid "New Direct Messages Notifications" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:59 +msgid "View your direct messages" +msgstr "" + +#: ../../Zotlabs/Widget/Notifications.php:74 msgid "New Mails" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:55 +#: ../../Zotlabs/Widget/Notifications.php:75 msgid "New Mails Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:58 +#: ../../Zotlabs/Widget/Notifications.php:78 msgid "View your private mails" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:61 +#: ../../Zotlabs/Widget/Notifications.php:81 msgid "Mark all messages seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:69 +#: ../../Zotlabs/Widget/Notifications.php:89 msgid "New Events" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:70 +#: ../../Zotlabs/Widget/Notifications.php:90 msgid "New Events Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:73 +#: ../../Zotlabs/Widget/Notifications.php:93 msgid "View events" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:76 +#: ../../Zotlabs/Widget/Notifications.php:96 msgid "Mark all events seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:84 +#: ../../Zotlabs/Widget/Notifications.php:104 #: ../../Zotlabs/Module/Connections.php:164 msgid "New Connections" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:85 +#: ../../Zotlabs/Widget/Notifications.php:105 msgid "New Connections Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:88 +#: ../../Zotlabs/Widget/Notifications.php:108 msgid "View all connections" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:96 +#: ../../Zotlabs/Widget/Notifications.php:116 msgid "New Files" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:97 +#: ../../Zotlabs/Widget/Notifications.php:117 msgid "New Files Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:104 -#: ../../Zotlabs/Widget/Notifications.php:105 +#: ../../Zotlabs/Widget/Notifications.php:124 +#: ../../Zotlabs/Widget/Notifications.php:125 msgid "Notices" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:108 +#: ../../Zotlabs/Widget/Notifications.php:128 msgid "View all notices" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:111 +#: ../../Zotlabs/Widget/Notifications.php:131 msgid "Mark all notices seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:132 +#: ../../Zotlabs/Widget/Notifications.php:152 msgid "New Registrations" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:133 +#: ../../Zotlabs/Widget/Notifications.php:153 msgid "New Registrations Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:142 -#: ../../Zotlabs/Module/Pubstream.php:109 ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Widget/Notifications.php:162 +#: ../../Zotlabs/Module/Pubstream.php:114 ../../Zotlabs/Lib/Apps.php:375 msgid "Public Stream" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:143 +#: ../../Zotlabs/Widget/Notifications.php:163 msgid "Public Stream Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:146 +#: ../../Zotlabs/Widget/Notifications.php:166 msgid "View the public stream" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:161 +#: ../../Zotlabs/Widget/Notifications.php:181 msgid "Sorry, you have got no notifications at the moment" msgstr "" @@ -7984,27 +8088,27 @@ msgstr "" msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:907 +#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:908 msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:121 -#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122 +#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:909 msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:123 -#: ../../Zotlabs/Module/Defperms.php:264 ../../Zotlabs/Module/Connedit.php:903 +#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124 +#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:904 msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:126 -#: ../../Zotlabs/Module/Defperms.php:269 ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127 +#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:911 msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:127 -#: ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:128 +#: ../../Zotlabs/Module/Connedit.php:912 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -8022,7 +8126,7 @@ msgstr "" #: ../../Zotlabs/Module/Article_edit.php:44 #: ../../Zotlabs/Module/Wall_upload.php:31 -#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:96 +#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:89 #: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Page.php:75 #: ../../Zotlabs/Module/Block.php:41 msgid "Channel not found." @@ -8032,29 +8136,29 @@ msgstr "" msgid "Edit Article" msgstr "" -#: ../../Zotlabs/Module/Network.php:109 +#: ../../Zotlabs/Module/Network.php:110 msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:158 +#: ../../Zotlabs/Module/Network.php:159 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:173 ../../Zotlabs/Module/Channel.php:183 +#: ../../Zotlabs/Module/Network.php:174 ../../Zotlabs/Module/Channel.php:195 msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:203 ../../Zotlabs/Module/Channel.php:218 -#: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Pubstream.php:94 +#: ../../Zotlabs/Module/Network.php:204 ../../Zotlabs/Module/Channel.php:230 +#: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Pubstream.php:99 #: ../../Zotlabs/Module/Display.php:80 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Network.php:242 +#: ../../Zotlabs/Module/Network.php:243 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:252 +#: ../../Zotlabs/Module/Network.php:253 msgid "Privacy group: " msgstr "" @@ -8089,55 +8193,55 @@ msgid "Use this form to import existing posts and content from an export file." msgstr "" #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:629 +#: ../../Zotlabs/Module/Import.php:632 msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Import.php:157 +#: ../../Zotlabs/Module/Import.php:162 #, php-format msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Import.php:184 +#: ../../Zotlabs/Module/Import.php:189 msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:622 +#: ../../Zotlabs/Module/Import.php:625 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:627 +#: ../../Zotlabs/Module/Import.php:630 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:628 +#: ../../Zotlabs/Module/Import.php:631 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "" -#: ../../Zotlabs/Module/Import.php:630 +#: ../../Zotlabs/Module/Import.php:633 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:632 +#: ../../Zotlabs/Module/Import.php:635 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:633 +#: ../../Zotlabs/Module/Import.php:636 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:634 +#: ../../Zotlabs/Module/Import.php:637 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:635 +#: ../../Zotlabs/Module/Import.php:638 msgid "Import a few months of posts if possible (limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Import.php:637 +#: ../../Zotlabs/Module/Import.php:640 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -8145,30 +8249,47 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:639 +#: ../../Zotlabs/Module/Import.php:642 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:640 +#: ../../Zotlabs/Module/Import.php:643 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Import.php:644 msgid "Use this channel nickname instead of the one provided" msgstr "" -#: ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Import.php:644 msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this site." msgstr "" -#: ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Import.php:646 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." msgstr "" +#: ../../Zotlabs/Module/Ochannel.php:32 ../../Zotlabs/Module/Channel.php:42 +#: ../../Zotlabs/Module/Chat.php:29 +msgid "You must be logged in to see this page." +msgstr "" + +#: ../../Zotlabs/Module/Z6trans.php:80 +msgid "Update to Hubzilla 5.0 setp 2" +msgstr "" + +#: ../../Zotlabs/Module/Z6trans.php:82 +msgid "To complete the update please run" +msgstr "" + +#: ../../Zotlabs/Module/Z6trans.php:88 +msgid "INFO: this command can take a very long time depending on your DB size." +msgstr "" + #: ../../Zotlabs/Module/Register.php:52 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" @@ -8273,7 +8394,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:264 #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Channel role and privacy" msgstr "" @@ -8297,7 +8418,7 @@ msgid "yes" msgstr "" #: ../../Zotlabs/Module/Register.php:277 -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "Registration" msgstr "" @@ -8310,17 +8431,17 @@ msgstr "" #: ../../Zotlabs/Module/Search.php:17 #: ../../Zotlabs/Module/Viewconnections.php:23 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Display.php:29 -#: ../../Zotlabs/Module/Directory.php:67 ../../Zotlabs/Module/Directory.php:72 -#: ../../Zotlabs/Module/Photos.php:516 +#: ../../Zotlabs/Module/Directory.php:71 ../../Zotlabs/Module/Directory.php:76 +#: ../../Zotlabs/Module/Photos.php:518 msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:230 +#: ../../Zotlabs/Module/Search.php:231 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Search.php:232 +#: ../../Zotlabs/Module/Search.php:233 #, php-format msgid "Search results for: %s" msgstr "" @@ -8362,9 +8483,9 @@ msgstr "" msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Setup.php:260 ../../Zotlabs/Module/Cdav.php:1059 +#: ../../Zotlabs/Module/Setup.php:260 ../../Zotlabs/Module/Cdav.php:1032 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Events.php:707 -#: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Photos.php:953 +#: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Photos.php:955 msgid "Next" msgstr "" @@ -8774,12 +8895,12 @@ msgstr "" msgid "No connections." msgstr "" -#: ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../Zotlabs/Module/Viewconnections.php:105 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../Zotlabs/Module/Viewconnections.php:113 +#: ../../Zotlabs/Module/Viewconnections.php:135 msgid "View Connections" msgstr "" @@ -8833,11 +8954,11 @@ msgstr "" msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:166 +#: ../../Zotlabs/Module/Channel.php:178 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:476 ../../Zotlabs/Module/Display.php:378 +#: ../../Zotlabs/Module/Channel.php:497 ../../Zotlabs/Module/Display.php:383 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -8863,72 +8984,72 @@ msgstr "" msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Group.php:45 +#: ../../Zotlabs/Module/Group.php:46 msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Group.php:48 +#: ../../Zotlabs/Module/Group.php:49 msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:80 +#: ../../Zotlabs/Module/Group.php:81 msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Group.php:106 +#: ../../Zotlabs/Module/Group.php:107 msgid "Privacy Groups App" msgstr "" -#: ../../Zotlabs/Module/Group.php:107 +#: ../../Zotlabs/Module/Group.php:108 msgid "Management of privacy groups" msgstr "" -#: ../../Zotlabs/Module/Group.php:142 +#: ../../Zotlabs/Module/Group.php:143 msgid "Add Group" msgstr "" -#: ../../Zotlabs/Module/Group.php:146 +#: ../../Zotlabs/Module/Group.php:147 msgid "Privacy group name" msgstr "" -#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:256 +#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:257 msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Help.php:81 +#: ../../Zotlabs/Module/Group.php:156 ../../Zotlabs/Module/Help.php:84 msgid "Members" msgstr "" -#: ../../Zotlabs/Module/Group.php:182 +#: ../../Zotlabs/Module/Group.php:183 msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Group.php:185 +#: ../../Zotlabs/Module/Group.php:186 msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:251 +#: ../../Zotlabs/Module/Group.php:252 #, php-format msgid "Privacy Group: %s" msgstr "" -#: ../../Zotlabs/Module/Group.php:253 +#: ../../Zotlabs/Module/Group.php:254 msgid "Privacy group name: " msgstr "" -#: ../../Zotlabs/Module/Group.php:258 +#: ../../Zotlabs/Module/Group.php:259 msgid "Delete Group" msgstr "" -#: ../../Zotlabs/Module/Group.php:269 +#: ../../Zotlabs/Module/Group.php:270 msgid "Group members" msgstr "" -#: ../../Zotlabs/Module/Group.php:271 +#: ../../Zotlabs/Module/Group.php:272 msgid "Not in this group" msgstr "" -#: ../../Zotlabs/Module/Group.php:303 +#: ../../Zotlabs/Module/Group.php:304 msgid "Click a channel to toggle membership" msgstr "" @@ -9004,10 +9125,10 @@ msgid "Key and Secret are required" msgstr "" #: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137 -#: ../../Zotlabs/Module/Cdav.php:1076 ../../Zotlabs/Module/Cdav.php:1389 +#: ../../Zotlabs/Module/Cdav.php:1049 ../../Zotlabs/Module/Cdav.php:1384 #: ../../Zotlabs/Module/Admin/Addons.php:457 -#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Oauth2.php:58 -#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:58 +#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:940 #: ../../Zotlabs/Lib/Apps.php:536 msgid "Update" msgstr "" @@ -9084,11 +9205,11 @@ msgstr "" msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 +#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:49 msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:33 +#: ../../Zotlabs/Module/Dirsearch.php:37 msgid "This directory server requires an access token" msgstr "" @@ -9100,172 +9221,176 @@ msgstr "" msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Chat.php:102 +#: ../../Zotlabs/Module/Pin.php:35 ../../Zotlabs/Module/Item.php:348 +msgid "Unable to locate original post." +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:100 msgid "Chatrooms App" msgstr "" -#: ../../Zotlabs/Module/Chat.php:103 +#: ../../Zotlabs/Module/Chat.php:101 msgid "Access Controlled Chatrooms" msgstr "" -#: ../../Zotlabs/Module/Chat.php:196 +#: ../../Zotlabs/Module/Chat.php:194 msgid "Room not found" msgstr "" -#: ../../Zotlabs/Module/Chat.php:212 +#: ../../Zotlabs/Module/Chat.php:210 msgid "Leave Room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:213 +#: ../../Zotlabs/Module/Chat.php:211 msgid "Delete Room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:214 +#: ../../Zotlabs/Module/Chat.php:212 msgid "I am away right now" msgstr "" -#: ../../Zotlabs/Module/Chat.php:215 +#: ../../Zotlabs/Module/Chat.php:213 msgid "I am online" msgstr "" -#: ../../Zotlabs/Module/Chat.php:217 +#: ../../Zotlabs/Module/Chat.php:215 msgid "Bookmark this room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:240 +#: ../../Zotlabs/Module/Chat.php:238 msgid "New Chatroom" msgstr "" -#: ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Chat.php:239 msgid "Chatroom name" msgstr "" -#: ../../Zotlabs/Module/Chat.php:242 +#: ../../Zotlabs/Module/Chat.php:240 msgid "Expiration of chats (minutes)" msgstr "" -#: ../../Zotlabs/Module/Chat.php:258 +#: ../../Zotlabs/Module/Chat.php:256 #, php-format msgid "%1$s's Chatrooms" msgstr "" -#: ../../Zotlabs/Module/Chat.php:263 +#: ../../Zotlabs/Module/Chat.php:261 msgid "No chatrooms available" msgstr "" -#: ../../Zotlabs/Module/Chat.php:264 ../../Zotlabs/Module/Manage.php:145 -#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Wiki.php:214 +#: ../../Zotlabs/Module/Chat.php:262 ../../Zotlabs/Module/Manage.php:145 +#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:214 msgid "Create New" msgstr "" -#: ../../Zotlabs/Module/Chat.php:267 +#: ../../Zotlabs/Module/Chat.php:265 msgid "Expiration" msgstr "" -#: ../../Zotlabs/Module/Chat.php:268 +#: ../../Zotlabs/Module/Chat.php:266 msgid "min" msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:51 +#: ../../Zotlabs/Module/Channel_calendar.php:57 #: ../../Zotlabs/Module/Events.php:113 msgid "Event can not end before it has started." msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:53 -#: ../../Zotlabs/Module/Channel_calendar.php:61 -#: ../../Zotlabs/Module/Channel_calendar.php:78 +#: ../../Zotlabs/Module/Channel_calendar.php:59 +#: ../../Zotlabs/Module/Channel_calendar.php:67 +#: ../../Zotlabs/Module/Channel_calendar.php:84 #: ../../Zotlabs/Module/Events.php:115 ../../Zotlabs/Module/Events.php:124 #: ../../Zotlabs/Module/Events.php:146 msgid "Unable to generate preview." msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:59 +#: ../../Zotlabs/Module/Channel_calendar.php:65 #: ../../Zotlabs/Module/Events.php:122 msgid "Event title and start time are required." msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:76 -#: ../../Zotlabs/Module/Channel_calendar.php:218 +#: ../../Zotlabs/Module/Channel_calendar.php:82 +#: ../../Zotlabs/Module/Channel_calendar.php:224 #: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Events.php:271 msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:370 +#: ../../Zotlabs/Module/Channel_calendar.php:371 #: ../../Zotlabs/Module/Events.php:641 msgid "Edit event" msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:372 +#: ../../Zotlabs/Module/Channel_calendar.php:373 #: ../../Zotlabs/Module/Events.php:643 msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:387 -#: ../../Zotlabs/Module/Cdav.php:966 ../../Zotlabs/Module/Cal.php:167 +#: ../../Zotlabs/Module/Channel_calendar.php:393 +#: ../../Zotlabs/Module/Cdav.php:939 ../../Zotlabs/Module/Cal.php:167 msgid "Link to source" msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:401 +#: ../../Zotlabs/Module/Channel_calendar.php:407 #: ../../Zotlabs/Module/Events.php:677 msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Channel_calendar.php:488 +#: ../../Zotlabs/Module/Channel_calendar.php:494 #: ../../Zotlabs/Module/Events.php:742 msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Like.php:56 +#: ../../Zotlabs/Module/Like.php:57 msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Like.php:61 +#: ../../Zotlabs/Module/Like.php:62 msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Like.php:62 +#: ../../Zotlabs/Module/Like.php:63 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:111 ../../Zotlabs/Module/Like.php:137 -#: ../../Zotlabs/Module/Like.php:175 +#: ../../Zotlabs/Module/Like.php:117 ../../Zotlabs/Module/Like.php:143 +#: ../../Zotlabs/Module/Like.php:181 msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Like.php:152 +#: ../../Zotlabs/Module/Like.php:158 msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Like.php:198 +#: ../../Zotlabs/Module/Like.php:204 msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Like.php:246 +#: ../../Zotlabs/Module/Like.php:240 msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:451 +#: ../../Zotlabs/Module/Like.php:426 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:453 +#: ../../Zotlabs/Module/Like.php:428 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:455 +#: ../../Zotlabs/Module/Like.php:430 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:572 +#: ../../Zotlabs/Module/Like.php:547 msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Like.php:573 +#: ../../Zotlabs/Module/Like.php:548 msgid "Thank you." msgstr "" @@ -9301,187 +9426,168 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:807 ../../Zotlabs/Module/Events.php:28 +#: ../../Zotlabs/Module/Cdav.php:814 ../../Zotlabs/Module/Events.php:28 msgid "Calendar entries imported." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:30 +#: ../../Zotlabs/Module/Cdav.php:816 ../../Zotlabs/Module/Events.php:30 msgid "No calendar entries found." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:870 -msgid "INVALID EVENT DISMISSED!" -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:871 -msgid "Summary: " -msgstr "" - #: ../../Zotlabs/Module/Cdav.php:872 -msgid "Date: " -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:873 ../../Zotlabs/Module/Cdav.php:880 -msgid "Reason: " -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:878 -msgid "INVALID CARD DISMISSED!" -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:879 -msgid "Name: " -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:899 msgid "CardDAV App" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:900 +#: ../../Zotlabs/Module/Cdav.php:873 msgid "CalDAV capable addressbook" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Cdav.php:1005 ../../Zotlabs/Module/Events.php:468 msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Events.php:474 +#: ../../Zotlabs/Module/Cdav.php:1006 ../../Zotlabs/Module/Events.php:474 msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1034 +#: ../../Zotlabs/Module/Cdav.php:1007 msgid "End date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:497 +#: ../../Zotlabs/Module/Cdav.php:1008 ../../Zotlabs/Module/Events.php:497 msgid "Timezone:" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Events.php:697 +#: ../../Zotlabs/Module/Cdav.php:1031 ../../Zotlabs/Module/Events.php:697 #: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Cal.php:205 -#: ../../Zotlabs/Module/Photos.php:944 +#: ../../Zotlabs/Module/Photos.php:946 msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Events.php:708 +#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Events.php:708 #: ../../Zotlabs/Module/Cal.php:207 msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1061 ../../Zotlabs/Module/Events.php:703 +#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Events.php:703 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1062 ../../Zotlabs/Module/Events.php:704 +#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:704 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1063 ../../Zotlabs/Module/Events.php:705 +#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:705 msgid "Day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1064 +#: ../../Zotlabs/Module/Cdav.php:1037 msgid "List month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1065 +#: ../../Zotlabs/Module/Cdav.php:1038 msgid "List week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1066 +#: ../../Zotlabs/Module/Cdav.php:1039 msgid "List day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1074 +#: ../../Zotlabs/Module/Cdav.php:1047 msgid "More" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1075 +#: ../../Zotlabs/Module/Cdav.php:1048 msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1077 +#: ../../Zotlabs/Module/Cdav.php:1050 msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1080 +#: ../../Zotlabs/Module/Cdav.php:1053 msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1083 +#: ../../Zotlabs/Module/Cdav.php:1056 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:925 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:786 -#: ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Connedit.php:927 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:788 -#: ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Connedit.php:929 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:789 -#: ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Connedit.php:930 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1380 +#: ../../Zotlabs/Module/Cdav.php:1375 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:790 -#: ../../Zotlabs/Module/Connedit.php:930 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Locs.php:118 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:791 -#: ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Connedit.php:932 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Connedit.php:937 +msgid "Add Contact" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Connedit.php:938 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:942 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:943 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:943 +#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:944 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:945 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:946 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:946 +#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:947 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:947 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:948 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:757 -#: ../../Zotlabs/Module/Connedit.php:948 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Connedit.php:949 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1445 +#: ../../Zotlabs/Module/Cdav.php:1452 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1456 +#: ../../Zotlabs/Module/Cdav.php:1463 msgid "Default Addressbook" msgstr "" @@ -9493,36 +9599,32 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../Zotlabs/Module/Item.php:382 -msgid "Unable to locate original post." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:668 +#: ../../Zotlabs/Module/Item.php:634 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1077 +#: ../../Zotlabs/Module/Item.php:1086 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1222 +#: ../../Zotlabs/Module/Item.php:1231 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1252 +#: ../../Zotlabs/Module/Item.php:1265 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1369 +#: ../../Zotlabs/Module/Item.php:1382 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1376 +#: ../../Zotlabs/Module/Item.php:1389 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1383 +#: ../../Zotlabs/Module/Item.php:1396 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -9553,7 +9655,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "(click to open/close)" msgstr "" @@ -9657,24 +9759,24 @@ msgstr "" msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:103 +#: ../../Zotlabs/Module/Sharedwithme.php:105 msgid "Files: shared with me" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Sharedwithme.php:107 msgid "NEW" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:107 +#: ../../Zotlabs/Module/Sharedwithme.php:109 #: ../../Zotlabs/Storage/Browser.php:294 msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../Zotlabs/Module/Sharedwithme.php:110 msgid "Remove all files" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:109 +#: ../../Zotlabs/Module/Sharedwithme.php:111 msgid "Remove this file" msgstr "" @@ -9682,23 +9784,23 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:82 +#: ../../Zotlabs/Module/Help.php:85 msgid "Administrators" msgstr "" -#: ../../Zotlabs/Module/Help.php:83 +#: ../../Zotlabs/Module/Help.php:86 msgid "Developers" msgstr "" -#: ../../Zotlabs/Module/Help.php:84 +#: ../../Zotlabs/Module/Help.php:87 msgid "Tutorials" msgstr "" -#: ../../Zotlabs/Module/Help.php:95 +#: ../../Zotlabs/Module/Help.php:98 msgid "$Projectname Documentation" msgstr "" -#: ../../Zotlabs/Module/Help.php:96 +#: ../../Zotlabs/Module/Help.php:99 msgid "Contents" msgstr "" @@ -9821,56 +9923,46 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Connect.php:73 ../../Zotlabs/Module/Connect.php:135 +#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118 msgid "Continue" msgstr "" -#: ../../Zotlabs/Module/Connect.php:104 -msgid "Premium Channel App" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:105 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:116 +#: ../../Zotlabs/Module/Connect.php:99 msgid "Premium Channel Setup" msgstr "" -#: ../../Zotlabs/Module/Connect.php:118 +#: ../../Zotlabs/Module/Connect.php:101 msgid "Enable premium channel connection restrictions" msgstr "" -#: ../../Zotlabs/Module/Connect.php:119 +#: ../../Zotlabs/Module/Connect.php:102 msgid "" "Please enter your restrictions or conditions, such as paypal receipt, usage " "guidelines, etc." msgstr "" -#: ../../Zotlabs/Module/Connect.php:121 ../../Zotlabs/Module/Connect.php:141 +#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124 msgid "" "This channel may require additional steps or acknowledgement of the " "following conditions prior to connecting:" msgstr "" -#: ../../Zotlabs/Module/Connect.php:122 +#: ../../Zotlabs/Module/Connect.php:105 msgid "" "Potential connections will then see the following text before proceeding:" msgstr "" -#: ../../Zotlabs/Module/Connect.php:123 ../../Zotlabs/Module/Connect.php:144 +#: ../../Zotlabs/Module/Connect.php:106 ../../Zotlabs/Module/Connect.php:127 msgid "" "By continuing, I certify that I have complied with any instructions provided " "on this page." msgstr "" -#: ../../Zotlabs/Module/Connect.php:132 +#: ../../Zotlabs/Module/Connect.php:115 msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: ../../Zotlabs/Module/Connect.php:140 +#: ../../Zotlabs/Module/Connect.php:123 msgid "Restricted or Premium Channel" msgstr "" @@ -9886,16 +9978,16 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1671 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2068 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Module/Share.php:119 +#: ../../Zotlabs/Module/Share.php:120 msgid "Post repeated" msgstr "" -#: ../../Zotlabs/Module/Acl.php:360 +#: ../../Zotlabs/Module/Acl.php:361 msgid "network" msgstr "" @@ -9907,11 +9999,11 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:48 +#: ../../Zotlabs/Module/Tagger.php:50 msgid "Post not found." msgstr "" -#: ../../Zotlabs/Module/Tagger.php:119 +#: ../../Zotlabs/Module/Tagger.php:121 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -9990,9 +10082,9 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:98 #: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:285 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Addons.php:342 @@ -10032,126 +10124,138 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:83 +#: ../../Zotlabs/Module/Admin/Security.php:89 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:86 +#: ../../Zotlabs/Module/Admin/Security.php:92 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:87 +#: ../../Zotlabs/Module/Admin/Security.php:93 msgid "" "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/" "<br />https://vimeo.com/<br />https://soundcloud.com/<br />" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:88 +#: ../../Zotlabs/Module/Admin/Security.php:94 msgid "" "All other embedded content will be filtered, <strong>unless</strong> " "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:95 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "Block public" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:95 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently authenticated." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "Provide a cloud root directory" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "" "The cloud root directory lists all channel names which provide public files" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:97 +#: ../../Zotlabs/Module/Admin/Security.php:103 msgid "Show total disk space available to cloud uploads" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:98 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "Set \"Transport Security\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:105 msgid "Set \"Content Security Policy\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "Allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:101 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "Not allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:101 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:102 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "Allow communications only from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:102 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:103 +#: ../../Zotlabs/Module/Admin/Security.php:109 msgid "Block communications from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:110 msgid "Allow communications only from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:110 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:105 +#: ../../Zotlabs/Module/Admin/Security.php:111 msgid "Block communications from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:106 +#: ../../Zotlabs/Module/Admin/Security.php:112 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:107 +#: ../../Zotlabs/Module/Admin/Security.php:113 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:107 +#: ../../Zotlabs/Module/Admin/Security.php:113 msgid "One site per line. By default embedded content is filtered." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:108 +#: ../../Zotlabs/Module/Admin/Security.php:114 msgid "Block embedded HTML from these domains" msgstr "" +#: ../../Zotlabs/Module/Admin/Security.php:115 +msgid "Allow SVG thumbnails in file browser" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:115 +msgid "WARNING: SVG images may contain malicious code." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:116 +msgid "Allow embedded (inline) PDF files" +msgstr "" + #: ../../Zotlabs/Module/Admin/Accounts.php:37 #, php-format msgid "%s account blocked/unblocked" @@ -10198,12 +10302,12 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:176 -#: ../../Zotlabs/Module/Connedit.php:636 +#: ../../Zotlabs/Module/Connedit.php:637 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:177 -#: ../../Zotlabs/Module/Connedit.php:636 +#: ../../Zotlabs/Module/Connedit.php:637 msgid "Unblock" msgstr "" @@ -10243,428 +10347,420 @@ msgid "" "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:161 +#: ../../Zotlabs/Module/Admin/Site.php:159 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:198 -#: ../../Zotlabs/Module/Settings/Display.php:119 +#: ../../Zotlabs/Module/Admin/Site.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:120 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:205 +#: ../../Zotlabs/Module/Admin/Site.php:203 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:207 +#: ../../Zotlabs/Module/Admin/Site.php:205 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:209 +#: ../../Zotlabs/Module/Admin/Site.php:207 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:256 +#: ../../Zotlabs/Module/Admin/Site.php:254 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:263 +#: ../../Zotlabs/Module/Admin/Site.php:261 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:264 +#: ../../Zotlabs/Module/Admin/Site.php:262 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:265 +#: ../../Zotlabs/Module/Admin/Site.php:263 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:277 msgid "Default permission role for new accounts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:277 msgid "" "This role will be used for the first channel created after registration." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 ../../Zotlabs/Module/Siteinfo.php:24 +#: ../../Zotlabs/Module/Admin/Site.php:299 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "This is displayed on the public server site list." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "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 "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Site only Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Allow anybody on the internet to access the Public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Only import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 -#: ../../Zotlabs/Module/Admin/Site.php:324 -#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Connedit.php:893 +#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Connedit.php:894 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Do not import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "Queue Threshold" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 -msgid "Allow SVG thumbnails in file browser" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:344 -msgid "WARNING: SVG images may contain malicious code." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:346 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Default: profiles" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Region or country" msgstr "" @@ -10745,10 +10841,12 @@ msgid "Channel '%s' code disallowed" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:150 +#: ../../Zotlabs/Module/Directory.php:360 msgid "Censor" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:151 +#: ../../Zotlabs/Module/Directory.php:360 msgid "Uncensor" msgstr "" @@ -11081,7 +11179,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Remove Channel" msgstr "" @@ -11194,7 +11292,7 @@ msgstr "" msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Chanview.php:139 +#: ../../Zotlabs/Module/Chanview.php:128 msgid "toggle full screen mode" msgstr "" @@ -11214,33 +11312,33 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:28 +#: ../../Zotlabs/Module/Permcats.php:29 msgid "Permission category name is required." msgstr "" -#: ../../Zotlabs/Module/Permcats.php:47 +#: ../../Zotlabs/Module/Permcats.php:48 msgid "Permission category saved." msgstr "" -#: ../../Zotlabs/Module/Permcats.php:62 +#: ../../Zotlabs/Module/Permcats.php:63 msgid "Permission Categories App" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:63 +#: ../../Zotlabs/Module/Permcats.php:64 msgid "Create custom connection permission limits" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:79 +#: ../../Zotlabs/Module/Permcats.php:80 msgid "" "Use this form to create permission rules for various classes of people or " "connections." msgstr "" -#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:373 +#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374 msgid "Permission Categories" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:120 +#: ../../Zotlabs/Module/Permcats.php:121 msgid "Permission category name" msgstr "" @@ -11307,11 +11405,11 @@ msgstr "" msgid "Post successful." msgstr "" -#: ../../Zotlabs/Module/Moderate.php:65 +#: ../../Zotlabs/Module/Moderate.php:67 msgid "Comment approved" msgstr "" -#: ../../Zotlabs/Module/Moderate.php:69 +#: ../../Zotlabs/Module/Moderate.php:71 msgid "Comment deleted" msgstr "" @@ -11422,11 +11520,11 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Display.php:396 +#: ../../Zotlabs/Module/Display.php:401 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:448 +#: ../../Zotlabs/Module/Display.php:453 msgid "Item has been removed." msgstr "" @@ -11505,42 +11603,51 @@ msgstr "" msgid "Hub not found." msgstr "" -#: ../../Zotlabs/Module/Ping.php:337 +#: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948 msgid "sent you a private message" msgstr "" -#: ../../Zotlabs/Module/Ping.php:393 +#: ../../Zotlabs/Module/Ping.php:393 ../../Zotlabs/Lib/Enotify.php:914 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:418 +#: ../../Zotlabs/Module/Ping.php:418 ../../Zotlabs/Lib/Enotify.php:986 msgid "requires approval" msgstr "" -#: ../../Zotlabs/Module/Ping.php:428 +#: ../../Zotlabs/Module/Ping.php:428 ../../Zotlabs/Lib/Enotify.php:957 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Module/Ping.php:446 +#: ../../Zotlabs/Module/Ping.php:446 ../../Zotlabs/Lib/Enotify.php:960 msgid "[today]" msgstr "" -#: ../../Zotlabs/Module/Ping.php:456 +#: ../../Zotlabs/Module/Ping.php:456 ../../Zotlabs/Lib/Enotify.php:970 msgid "posted an event" msgstr "" -#: ../../Zotlabs/Module/Ping.php:490 +#: ../../Zotlabs/Module/Ping.php:490 ../../Zotlabs/Lib/Enotify.php:829 +#: ../../Zotlabs/Lib/Enotify.php:931 msgid "shared a file with you" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 msgid "Private forum" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 msgid "Public forum" msgstr "" +#: ../../Zotlabs/Module/Dircensor.php:42 +msgid "Entry censored" +msgstr "" + +#: ../../Zotlabs/Module/Dircensor.php:45 +msgid "Entry uncensored" +msgstr "" + #: ../../Zotlabs/Module/Service_limits.php:23 msgid "No service class restrictions found." msgstr "" @@ -11553,7 +11660,7 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:349 +#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:350 msgid "Mood" msgstr "" @@ -11715,90 +11822,90 @@ msgstr "" msgid "Add Card" msgstr "" -#: ../../Zotlabs/Module/Directory.php:116 +#: ../../Zotlabs/Module/Directory.php:120 msgid "No default suggestions were found." msgstr "" -#: ../../Zotlabs/Module/Directory.php:270 +#: ../../Zotlabs/Module/Directory.php:280 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Directory.php:281 +#: ../../Zotlabs/Module/Directory.php:291 msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:283 +#: ../../Zotlabs/Module/Directory.php:293 msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:285 +#: ../../Zotlabs/Module/Directory.php:295 msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:345 +#: ../../Zotlabs/Module/Directory.php:358 msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:354 +#: ../../Zotlabs/Module/Directory.php:369 msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:357 +#: ../../Zotlabs/Module/Directory.php:372 msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:360 +#: ../../Zotlabs/Module/Directory.php:375 msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:362 +#: ../../Zotlabs/Module/Directory.php:377 msgid "Common connections (estimated):" msgstr "" -#: ../../Zotlabs/Module/Directory.php:411 +#: ../../Zotlabs/Module/Directory.php:426 msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:411 +#: ../../Zotlabs/Module/Directory.php:426 msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:417 +#: ../../Zotlabs/Module/Directory.php:432 msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:422 +#: ../../Zotlabs/Module/Directory.php:437 msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:422 +#: ../../Zotlabs/Module/Directory.php:437 msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:423 +#: ../../Zotlabs/Module/Directory.php:438 msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:424 +#: ../../Zotlabs/Module/Directory.php:439 msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:425 +#: ../../Zotlabs/Module/Directory.php:440 msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:426 +#: ../../Zotlabs/Module/Directory.php:441 msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:427 +#: ../../Zotlabs/Module/Directory.php:442 msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:444 +#: ../../Zotlabs/Module/Directory.php:459 msgid "No entries (some entries may be hidden)." msgstr "" @@ -11857,96 +11964,108 @@ msgstr "" msgid "Item not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:91 -#: ../../Zotlabs/Module/Cover_photo.php:83 +#: ../../Zotlabs/Module/Vote.php:40 +msgid "Poll not found." +msgstr "" + +#: ../../Zotlabs/Module/Vote.php:71 +msgid "Invalid response." +msgstr "" + +#: ../../Zotlabs/Module/Vote.php:132 +msgid "Response submitted. Updates may not appear instantly." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:93 +#: ../../Zotlabs/Module/Cover_photo.php:85 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:164 -#: ../../Zotlabs/Module/Cover_photo.php:210 +#: ../../Zotlabs/Module/Profile_photo.php:166 +#: ../../Zotlabs/Module/Cover_photo.php:212 msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:294 -#: ../../Zotlabs/Module/Cover_photo.php:263 +#: ../../Zotlabs/Module/Profile_photo.php:296 +#: ../../Zotlabs/Module/Cover_photo.php:265 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:313 -#: ../../Zotlabs/Module/Cover_photo.php:280 +#: ../../Zotlabs/Module/Profile_photo.php:315 +#: ../../Zotlabs/Module/Cover_photo.php:282 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:377 -#: ../../Zotlabs/Module/Profile_photo.php:429 -#: ../../Zotlabs/Module/Cover_photo.php:373 -#: ../../Zotlabs/Module/Cover_photo.php:388 +#: ../../Zotlabs/Module/Profile_photo.php:379 +#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Cover_photo.php:367 +#: ../../Zotlabs/Module/Cover_photo.php:382 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../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:493 +#: ../../Zotlabs/Module/Profile_photo.php:495 msgid "" "Your profile photo is visible to anybody on the internet and may be " "distributed to other websites." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:495 -#: ../../Zotlabs/Module/Cover_photo.php:426 +#: ../../Zotlabs/Module/Profile_photo.php:497 +#: ../../Zotlabs/Module/Cover_photo.php:420 msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:496 -#: ../../Zotlabs/Module/Cover_photo.php:427 +#: ../../Zotlabs/Module/Profile_photo.php:498 +#: ../../Zotlabs/Module/Cover_photo.php:421 msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:497 +#: ../../Zotlabs/Module/Profile_photo.php:499 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:497 +#: ../../Zotlabs/Module/Profile_photo.php:499 msgid "Change Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:498 +#: ../../Zotlabs/Module/Profile_photo.php:500 msgid "Use" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:503 -#: ../../Zotlabs/Module/Profile_photo.php:504 -#: ../../Zotlabs/Module/Cover_photo.php:432 -#: ../../Zotlabs/Module/Cover_photo.php:433 +#: ../../Zotlabs/Module/Profile_photo.php:505 +#: ../../Zotlabs/Module/Profile_photo.php:506 +#: ../../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:509 -#: ../../Zotlabs/Module/Cover_photo.php:438 ../../Zotlabs/Module/Wiki.php:405 +#: ../../Zotlabs/Module/Profile_photo.php:511 +#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:405 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:514 -#: ../../Zotlabs/Module/Cover_photo.php:444 +#: ../../Zotlabs/Module/Profile_photo.php:516 +#: ../../Zotlabs/Module/Cover_photo.php:438 msgid "Select existing photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:533 -#: ../../Zotlabs/Module/Cover_photo.php:461 +#: ../../Zotlabs/Module/Profile_photo.php:535 +#: ../../Zotlabs/Module/Cover_photo.php:455 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:534 -#: ../../Zotlabs/Module/Cover_photo.php:462 +#: ../../Zotlabs/Module/Profile_photo.php:536 +#: ../../Zotlabs/Module/Cover_photo.php:456 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:536 -#: ../../Zotlabs/Module/Cover_photo.php:464 +#: ../../Zotlabs/Module/Profile_photo.php:538 +#: ../../Zotlabs/Module/Cover_photo.php:458 msgid "Done Editing" msgstr "" @@ -11962,7 +12081,7 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:184 msgid "Save to Folder" msgstr "" @@ -12058,218 +12177,218 @@ msgstr "" msgid "Not connected at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:296 +#: ../../Zotlabs/Module/Connections.php:318 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:297 +#: ../../Zotlabs/Module/Connections.php:319 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:299 +#: ../../Zotlabs/Module/Connections.php:321 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:308 +#: ../../Zotlabs/Module/Connections.php:330 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:313 +#: ../../Zotlabs/Module/Connections.php:335 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:315 +#: ../../Zotlabs/Module/Connections.php:337 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:317 +#: ../../Zotlabs/Module/Connections.php:339 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:341 msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:321 +#: ../../Zotlabs/Module/Connections.php:343 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:322 -#: ../../Zotlabs/Module/Connedit.php:644 +#: ../../Zotlabs/Module/Connections.php:344 +#: ../../Zotlabs/Module/Connedit.php:645 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connections.php:323 +#: ../../Zotlabs/Module/Connections.php:345 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:328 +#: ../../Zotlabs/Module/Connections.php:351 msgid "Connect at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:356 +#: ../../Zotlabs/Module/Connections.php:379 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:357 +#: ../../Zotlabs/Module/Connections.php:380 msgid "Connections search" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:194 -#: ../../Zotlabs/Module/Cover_photo.php:252 +#: ../../Zotlabs/Module/Cover_photo.php:196 +#: ../../Zotlabs/Module/Cover_photo.php:254 msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:424 +#: ../../Zotlabs/Module/Cover_photo.php:418 msgid "Your cover photo may be visible to anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:428 +#: ../../Zotlabs/Module/Cover_photo.php:422 msgid "Change Cover Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:78 +#: ../../Zotlabs/Module/Photos.php:80 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113 +#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115 msgid "Album not found." msgstr "" -#: ../../Zotlabs/Module/Photos.php:103 +#: ../../Zotlabs/Module/Photos.php:105 msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1056 +#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1058 msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:527 +#: ../../Zotlabs/Module/Photos.php:529 msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Photos.php:576 +#: ../../Zotlabs/Module/Photos.php:578 msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:619 +#: ../../Zotlabs/Module/Photos.php:621 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:622 +#: ../../Zotlabs/Module/Photos.php:624 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:664 +#: ../../Zotlabs/Module/Photos.php:666 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:668 +#: ../../Zotlabs/Module/Photos.php:670 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:669 +#: ../../Zotlabs/Module/Photos.php:671 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:670 +#: ../../Zotlabs/Module/Photos.php:672 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:672 +#: ../../Zotlabs/Module/Photos.php:674 msgid "Description (optional)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:758 +#: ../../Zotlabs/Module/Photos.php:760 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:760 +#: ../../Zotlabs/Module/Photos.php:762 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:819 ../../Zotlabs/Module/Photos.php:1363 msgid "Add Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:865 +#: ../../Zotlabs/Module/Photos.php:867 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:867 +#: ../../Zotlabs/Module/Photos.php:869 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:925 +#: ../../Zotlabs/Module/Photos.php:927 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:926 +#: ../../Zotlabs/Module/Photos.php:928 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:933 +#: ../../Zotlabs/Module/Photos.php:935 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:948 +#: ../../Zotlabs/Module/Photos.php:950 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1030 +#: ../../Zotlabs/Module/Photos.php:1032 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1032 +#: ../../Zotlabs/Module/Photos.php:1034 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1033 +#: ../../Zotlabs/Module/Photos.php:1035 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1036 +#: ../../Zotlabs/Module/Photos.php:1038 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1037 +#: ../../Zotlabs/Module/Photos.php:1039 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1038 +#: ../../Zotlabs/Module/Photos.php:1040 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1043 +#: ../../Zotlabs/Module/Photos.php:1045 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1051 +#: ../../Zotlabs/Module/Photos.php:1053 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1054 +#: ../../Zotlabs/Module/Photos.php:1056 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:307 +#: ../../Zotlabs/Module/Photos.php:1075 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:308 +#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1212 -#: ../../Zotlabs/Lib/ThreadItem.php:793 +#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Lib/ThreadItem.php:822 msgid "This is you" msgstr "" #: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Module/Photos.php:1143 -#: ../../Zotlabs/Lib/ThreadItem.php:232 ../../Zotlabs/Lib/ThreadItem.php:244 +#: ../../Zotlabs/Lib/ThreadItem.php:238 ../../Zotlabs/Lib/ThreadItem.php:250 msgid "View all" msgstr "" @@ -12285,12 +12404,12 @@ msgstr "" msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:457 +#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:489 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:458 +#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:490 msgctxt "noun" msgid "Dislikes" msgstr "" @@ -12319,7 +12438,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1683 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1707 msgid "Password Reset" msgstr "" @@ -12364,11 +12483,11 @@ msgstr "" msgid "Email Address" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:77 +#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:78 msgid "Reset" msgstr "" -#: ../../Zotlabs/Module/Follow.php:36 +#: ../../Zotlabs/Module/Follow.php:93 msgid "Connection added." msgstr "" @@ -12386,248 +12505,248 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 -#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 +#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186 +#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661 msgid "Profile not found." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:44 +#: ../../Zotlabs/Module/Profiles.php:46 msgid "Profile deleted." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105 +#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107 msgid "Profile-" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127 +#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129 msgid "New profile created." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:111 +#: ../../Zotlabs/Module/Profiles.php:113 msgid "Profile unavailable to clone." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:146 +#: ../../Zotlabs/Module/Profiles.php:148 msgid "Profile unavailable to export." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:252 +#: ../../Zotlabs/Module/Profiles.php:254 msgid "Profile Name is required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:459 +#: ../../Zotlabs/Module/Profiles.php:461 msgid "Marital Status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:463 +#: ../../Zotlabs/Module/Profiles.php:465 msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774 msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775 msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782 msgid "Work/Employment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:478 +#: ../../Zotlabs/Module/Profiles.php:480 msgid "Religion" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:482 +#: ../../Zotlabs/Module/Profiles.php:484 msgid "Political Views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:490 +#: ../../Zotlabs/Module/Profiles.php:492 msgid "Sexual Preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:494 +#: ../../Zotlabs/Module/Profiles.php:496 msgid "Homepage" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:498 +#: ../../Zotlabs/Module/Profiles.php:500 msgid "Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:594 +#: ../../Zotlabs/Module/Profiles.php:596 msgid "Profile updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:678 +#: ../../Zotlabs/Module/Profiles.php:680 msgid "Hide your connections list from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:722 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:726 msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 +#: ../../Zotlabs/Module/Profiles.php:728 msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:729 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:732 msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 +#: ../../Zotlabs/Module/Profiles.php:733 msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:734 msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:735 msgid "Personal" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Relationship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "This is your default profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:752 msgid "Title/Description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:754 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:755 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:758 msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:762 +#: ../../Zotlabs/Module/Profiles.php:764 msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:762 +#: ../../Zotlabs/Module/Profiles.php:764 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:763 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:768 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:772 msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:773 msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:773 msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:776 msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:780 msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:784 msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Communications" msgstr "" @@ -12747,10 +12866,6 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:157 ../../Zotlabs/Module/Mail.php:289 -msgid "Your message:" -msgstr "" - #: ../../Zotlabs/Module/Invite.php:158 msgid "Please join my community on $Projectname." msgstr "" @@ -12775,11 +12890,11 @@ msgstr "" msgid "3. Click [Connect]" msgstr "" -#: ../../Zotlabs/Module/Notes.php:56 +#: ../../Zotlabs/Module/Notes.php:57 msgid "Notes App" msgstr "" -#: ../../Zotlabs/Module/Notes.php:57 +#: ../../Zotlabs/Module/Notes.php:58 msgid "A simple notes app with a widget (note: notes are not encrypted)" msgstr "" @@ -12791,101 +12906,6 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../Zotlabs/Module/Mail.php:77 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:84 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:91 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:109 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:164 -msgid "Messages" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:177 -msgid "message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:218 -msgid "Message recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:231 -msgid "Conversation removed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:367 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:274 -msgid "Requested channel is not in this network" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:282 -msgid "Send Private Message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:283 ../../Zotlabs/Module/Mail.php:426 -msgid "To:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:428 -msgid "Subject:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:434 -msgid "Attach file" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:293 -msgid "Send" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:397 -msgid "Delete message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:398 -msgid "Delivery report" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:399 -msgid "Recall message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:401 -msgid "Message has been recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:419 -msgid "Delete Conversation" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:421 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:425 -msgid "Send Reply" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:430 -#, php-format -msgid "Your message for %s (%s):" -msgstr "" - #: ../../Zotlabs/Module/Affinity.php:35 msgid "Affinity Tool settings updated." msgstr "" @@ -12954,404 +12974,411 @@ msgstr "" msgid "Optionally explain your rating (this information is public)" msgstr "" -#: ../../Zotlabs/Module/Settings/Network.php:41 -#: ../../Zotlabs/Module/Settings/Channel_home.php:44 +#: ../../Zotlabs/Module/Settings/Network.php:42 +#: ../../Zotlabs/Module/Settings/Channel_home.php:46 msgid "Max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings/Network.php:43 -#: ../../Zotlabs/Module/Settings/Channel_home.php:46 +#: ../../Zotlabs/Module/Settings/Network.php:44 +#: ../../Zotlabs/Module/Settings/Channel_home.php:48 msgid "Click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Settings/Network.php:58 +#: ../../Zotlabs/Module/Settings/Network.php:59 msgid "Stream Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Features.php:43 +#: ../../Zotlabs/Module/Settings/Features.php:45 msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:327 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:331 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:332 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:335 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:409 +#: ../../Zotlabs/Module/Settings/Channel.php:410 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:414 +#: ../../Zotlabs/Module/Settings/Channel.php:415 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:418 +#: ../../Zotlabs/Module/Settings/Channel.php:419 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:427 +#: ../../Zotlabs/Module/Settings/Channel.php:428 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:430 +#: ../../Zotlabs/Module/Settings/Channel.php:431 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:470 +#: ../../Zotlabs/Module/Settings/Channel.php:471 msgid "Automatic membership approval" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:470 -#: ../../Zotlabs/Module/Defperms.php:255 +#: ../../Zotlabs/Module/Settings/Channel.php:471 +#: ../../Zotlabs/Module/Defperms.php:256 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:491 +#: ../../Zotlabs/Module/Settings/Channel.php:492 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:499 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:501 #: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:506 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:507 +#: ../../Zotlabs/Module/Settings/Channel.php:508 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:515 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:522 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "Default permissions category" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:546 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Unseen stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Unseen private messages" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:568 -msgid "Upcoming events" +#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:575 +msgid "Recommended" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:569 -msgid "Events today" +msgid "Upcoming events" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:570 +msgid "Events today" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen public stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:581 #, 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:581 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:584 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:584 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 #: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Remove this channel." msgstr "" @@ -13411,154 +13438,154 @@ msgstr "" msgid "Remove this account including all its channels" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:24 +#: ../../Zotlabs/Module/Settings/Featured.php:25 msgid "No feature settings configured" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:33 +#: ../../Zotlabs/Module/Settings/Featured.php:34 msgid "Addon Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:34 +#: ../../Zotlabs/Module/Settings/Featured.php:35 msgid "Please save/submit changes to any panel before opening another." msgstr "" -#: ../../Zotlabs/Module/Settings/Events.php:39 +#: ../../Zotlabs/Module/Settings/Events.php:40 msgid "Events Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Manage.php:39 +#: ../../Zotlabs/Module/Settings/Manage.php:41 msgid "Channel Manager Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:59 +#: ../../Zotlabs/Module/Settings/Channel_home.php:61 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel_home.php:86 +#: ../../Zotlabs/Module/Settings/Channel_home.php:88 msgid "Channel Home Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Calendar.php:39 +#: ../../Zotlabs/Module/Settings/Calendar.php:40 msgid "Calendar Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:128 +#: ../../Zotlabs/Module/Settings/Display.php:129 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:184 +#: ../../Zotlabs/Module/Settings/Display.php:185 msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:185 +#: ../../Zotlabs/Module/Settings/Display.php:186 msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:186 +#: ../../Zotlabs/Module/Settings/Display.php:187 msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:187 +#: ../../Zotlabs/Module/Settings/Display.php:188 msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:193 +#: ../../Zotlabs/Module/Settings/Display.php:194 msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:194 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "Select scheme" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 -msgid "Maximum of 100 items" +#: ../../Zotlabs/Module/Settings/Display.php:200 +msgid "Maximum of 30 items" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:200 +#: ../../Zotlabs/Module/Settings/Display.php:201 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Provide channel menu in navigation bar" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Default: channel menu located in app menu" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Manual conversation updates" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Default is on, turning this off may increase screen jumping" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:203 +#: ../../Zotlabs/Module/Settings/Display.php:204 msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:206 msgid "Display new member quick links menu" msgstr "" -#: ../../Zotlabs/Module/Settings/Directory.php:39 +#: ../../Zotlabs/Module/Settings/Directory.php:40 msgid "Directory Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Editor.php:39 +#: ../../Zotlabs/Module/Settings/Editor.php:40 msgid "Editor Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Connections.php:39 +#: ../../Zotlabs/Module/Settings/Connections.php:40 msgid "Connections Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Photos.php:39 +#: ../../Zotlabs/Module/Settings/Photos.php:40 msgid "Photos Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Profiles.php:47 +#: ../../Zotlabs/Module/Settings/Profiles.php:49 msgid "Profiles Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Conversation.php:22 +#: ../../Zotlabs/Module/Settings/Conversation.php:23 msgid "Settings saved." msgstr "" -#: ../../Zotlabs/Module/Settings/Conversation.php:24 +#: ../../Zotlabs/Module/Settings/Conversation.php:25 msgid "Settings saved. Reload page please." msgstr "" -#: ../../Zotlabs/Module/Settings/Conversation.php:46 +#: ../../Zotlabs/Module/Settings/Conversation.php:47 msgid "Conversation Settings" msgstr "" @@ -13650,45 +13677,45 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:67 ../../Zotlabs/Module/Connedit.php:81 +#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:82 msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Defperms.php:189 +#: ../../Zotlabs/Module/Defperms.php:190 msgid "Default Permissions App" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:190 +#: ../../Zotlabs/Module/Defperms.php:191 msgid "Set custom default permissions for new connections" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:254 ../../Zotlabs/Module/Connedit.php:867 +#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:868 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:871 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:261 ../../Zotlabs/Module/Connedit.php:883 +#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:884 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -#: ../../Zotlabs/Module/Defperms.php:262 +#: ../../Zotlabs/Module/Defperms.php:263 msgid "Automatic approval settings" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:270 +#: ../../Zotlabs/Module/Defperms.php:271 msgid "" "Some individual permissions may have been preset or locked based on your " "channel type and privacy settings." @@ -13818,60 +13845,60 @@ msgstr "" msgid "Redeliver" msgstr "" -#: ../../Zotlabs/Module/Thing.php:120 +#: ../../Zotlabs/Module/Thing.php:122 msgid "Thing updated" msgstr "" -#: ../../Zotlabs/Module/Thing.php:172 +#: ../../Zotlabs/Module/Thing.php:174 msgid "Object store: failed" msgstr "" -#: ../../Zotlabs/Module/Thing.php:176 +#: ../../Zotlabs/Module/Thing.php:178 msgid "Thing added" msgstr "" -#: ../../Zotlabs/Module/Thing.php:202 +#: ../../Zotlabs/Module/Thing.php:204 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../Zotlabs/Module/Thing.php:265 +#: ../../Zotlabs/Module/Thing.php:267 msgid "Show Thing" msgstr "" -#: ../../Zotlabs/Module/Thing.php:272 +#: ../../Zotlabs/Module/Thing.php:274 msgid "item not found." msgstr "" -#: ../../Zotlabs/Module/Thing.php:305 +#: ../../Zotlabs/Module/Thing.php:307 msgid "Edit Thing" msgstr "" -#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364 +#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366 msgid "Select a profile" msgstr "" -#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 msgid "Post an activity" msgstr "" -#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 msgid "Only sends to viewers of the applicable profile" msgstr "" -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 +#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371 msgid "Name of thing e.g. something" msgstr "" -#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370 +#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372 msgid "URL of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371 +#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373 msgid "URL for photo of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:364 msgid "Add Thing to your Profile" msgstr "" @@ -13879,43 +13906,43 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:26 +#: ../../Zotlabs/Module/Pdledit.php:27 msgid "Layout updated." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:42 +#: ../../Zotlabs/Module/Pdledit.php:43 msgid "PDL Editor App" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:43 +#: ../../Zotlabs/Module/Pdledit.php:44 msgid "Provides the ability to edit system page layouts" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:56 ../../Zotlabs/Module/Pdledit.php:99 +#: ../../Zotlabs/Module/Pdledit.php:57 ../../Zotlabs/Module/Pdledit.php:100 msgid "Edit System Page Description" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:77 +#: ../../Zotlabs/Module/Pdledit.php:78 msgid "(modified)" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:94 +#: ../../Zotlabs/Module/Pdledit.php:95 msgid "Layout not found." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:100 +#: ../../Zotlabs/Module/Pdledit.php:101 msgid "Module Name:" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:101 +#: ../../Zotlabs/Module/Pdledit.php:102 msgid "Layout Help" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:102 +#: ../../Zotlabs/Module/Pdledit.php:103 msgid "Edit another layout" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:103 +#: ../../Zotlabs/Module/Pdledit.php:104 msgid "System layout" msgstr "" @@ -13995,10 +14022,6 @@ msgstr "" msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:384 -msgid "Source" -msgstr "" - #: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "" @@ -14084,244 +14107,244 @@ msgid "" "hours." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:112 +#: ../../Zotlabs/Module/Connedit.php:113 msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:256 +#: ../../Zotlabs/Module/Connedit.php:257 msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:258 +#: ../../Zotlabs/Module/Connedit.php:259 msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:312 +#: ../../Zotlabs/Module/Connedit.php:313 msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:437 +#: ../../Zotlabs/Module/Connedit.php:438 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:485 ../../Zotlabs/Module/Connedit.php:489 +#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:490 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513 -#: ../../Zotlabs/Module/Connedit.php:522 ../../Zotlabs/Module/Connedit.php:531 -#: ../../Zotlabs/Module/Connedit.php:544 +#: ../../Zotlabs/Module/Connedit.php:505 ../../Zotlabs/Module/Connedit.php:514 +#: ../../Zotlabs/Module/Connedit.php:523 ../../Zotlabs/Module/Connedit.php:532 +#: ../../Zotlabs/Module/Connedit.php:545 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:568 +#: ../../Zotlabs/Module/Connedit.php:569 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:611 +#: ../../Zotlabs/Module/Connedit.php:612 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:615 +#: ../../Zotlabs/Module/Connedit.php:616 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:618 +#: ../../Zotlabs/Module/Connedit.php:619 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Connedit.php:623 msgid "Refresh Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:625 +#: ../../Zotlabs/Module/Connedit.php:626 msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:632 +#: ../../Zotlabs/Module/Connedit.php:633 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:639 +#: ../../Zotlabs/Module/Connedit.php:640 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:640 +#: ../../Zotlabs/Module/Connedit.php:641 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:644 +#: ../../Zotlabs/Module/Connedit.php:645 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:647 +#: ../../Zotlabs/Module/Connedit.php:648 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:648 +#: ../../Zotlabs/Module/Connedit.php:649 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:652 +#: ../../Zotlabs/Module/Connedit.php:653 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:652 +#: ../../Zotlabs/Module/Connedit.php:653 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:655 +#: ../../Zotlabs/Module/Connedit.php:656 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:656 +#: ../../Zotlabs/Module/Connedit.php:657 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:660 +#: ../../Zotlabs/Module/Connedit.php:661 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:660 +#: ../../Zotlabs/Module/Connedit.php:661 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:663 +#: ../../Zotlabs/Module/Connedit.php:664 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:664 +#: ../../Zotlabs/Module/Connedit.php:665 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:671 +#: ../../Zotlabs/Module/Connedit.php:672 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:679 +#: ../../Zotlabs/Module/Connedit.php:680 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:682 +#: ../../Zotlabs/Module/Connedit.php:683 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:693 +#: ../../Zotlabs/Module/Connedit.php:694 msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:716 +#: ../../Zotlabs/Module/Connedit.php:717 msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:719 +#: ../../Zotlabs/Module/Connedit.php:720 msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:756 +#: ../../Zotlabs/Module/Connedit.php:757 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:759 +#: ../../Zotlabs/Module/Connedit.php:760 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:796 +#: ../../Zotlabs/Module/Connedit.php:797 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:796 +#: ../../Zotlabs/Module/Connedit.php:797 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:801 +#: ../../Zotlabs/Module/Connedit.php:802 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:804 +#: ../../Zotlabs/Module/Connedit.php:805 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:807 +#: ../../Zotlabs/Module/Connedit.php:808 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:855 +#: ../../Zotlabs/Module/Connedit.php:856 msgid "This connection is unreachable from this location." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:856 +#: ../../Zotlabs/Module/Connedit.php:857 msgid "This connection may be unreachable from other channel locations." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:858 +#: ../../Zotlabs/Module/Connedit.php:859 msgid "Location independence is not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:864 +#: ../../Zotlabs/Module/Connedit.php:865 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Connedit.php:869 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:877 +#: ../../Zotlabs/Module/Connedit.php:878 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Connedit.php:879 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:884 +#: ../../Zotlabs/Module/Connedit.php:885 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:886 +#: ../../Zotlabs/Module/Connedit.php:887 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Connedit.php:889 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:889 ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Connedit.php:895 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:891 +#: ../../Zotlabs/Module/Connedit.php:892 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:892 +#: ../../Zotlabs/Module/Connedit.php:893 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:893 +#: ../../Zotlabs/Module/Connedit.php:894 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:895 +#: ../../Zotlabs/Module/Connedit.php:896 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:900 +#: ../../Zotlabs/Module/Connedit.php:901 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:905 +#: ../../Zotlabs/Module/Connedit.php:906 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Connedit.php:913 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -14329,11 +14352,11 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:913 +#: ../../Zotlabs/Module/Connedit.php:914 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:921 +#: ../../Zotlabs/Module/Connedit.php:922 msgid "Details" msgstr "" @@ -14346,7 +14369,7 @@ msgid "System Notifications" msgstr "" #: ../../Zotlabs/Module/Notifications.php:60 -#: ../../Zotlabs/Lib/ThreadItem.php:450 +#: ../../Zotlabs/Lib/ThreadItem.php:482 msgid "Mark all seen" msgstr "" @@ -14430,7 +14453,7 @@ msgstr "" msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:367 +#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:368 msgid "Channel Sources" msgstr "" @@ -14516,6 +14539,33 @@ msgid "" "logout and retry." msgstr "" +#: ../../Zotlabs/Lib/AccessList.php:28 +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" +msgstr "" + +#: ../../Zotlabs/Lib/AccessList.php:333 +msgid "Create new list" +msgstr "" + +#: ../../Zotlabs/Lib/AccessList.php:334 +msgid "Channels not in any access list" +msgstr "" + #: ../../Zotlabs/Lib/Permcat.php:82 msgctxt "permcat" msgid "default" @@ -14536,29 +14586,34 @@ msgctxt "permcat" msgid "publisher" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1656 +#: ../../Zotlabs/Lib/Activity.php:2045 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1659 +#: ../../Zotlabs/Lib/Activity.php:2048 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1662 +#: ../../Zotlabs/Lib/Activity.php:2054 #, php-format -msgid "Will attend %1$s's %2$s" +msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1665 +#: ../../Zotlabs/Lib/Activity.php:2057 #, php-format -msgid "Will not attend %1$s's %2$s" +msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1668 +#: ../../Zotlabs/Lib/Activity.php:2060 #, php-format -msgid "May attend %1$s's %2$s" +msgid "May attend %s's event" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:2063 +#, php-format +msgid "May not attend %s's event" msgstr "" #: ../../Zotlabs/Lib/Enotify.php:60 @@ -14619,326 +14674,339 @@ msgstr "" msgid "commented on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:155 +#: ../../Zotlabs/Lib/Enotify.php:157 msgid "liked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:158 +#: ../../Zotlabs/Lib/Enotify.php:160 msgid "disliked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:201 +#: ../../Zotlabs/Lib/Enotify.php:165 +msgid "voted on" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:208 #, php-format msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:209 +#: ../../Zotlabs/Lib/Enotify.php:216 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:218 +#: ../../Zotlabs/Lib/Enotify.php:225 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:230 +#: ../../Zotlabs/Lib/Enotify.php:237 #, php-format msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:232 +#: ../../Zotlabs/Lib/Enotify.php:239 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:233 +#: ../../Zotlabs/Lib/Enotify.php:240 #, php-format msgid "%1$s commented on an item/conversation you have been following." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317 -#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358 -#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388 +#: ../../Zotlabs/Lib/Enotify.php:243 ../../Zotlabs/Lib/Enotify.php:324 +#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:365 +#: ../../Zotlabs/Lib/Enotify.php:382 ../../Zotlabs/Lib/Enotify.php:395 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241 +#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248 #, php-format msgid "Please visit %s to approve or reject this comment." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:299 +#: ../../Zotlabs/Lib/Enotify.php:306 #, php-format msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:313 +#: ../../Zotlabs/Lib/Enotify.php:320 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:321 #, php-format msgid "%1$s liked an item/conversation you created." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:325 +#: ../../Zotlabs/Lib/Enotify.php:332 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:327 +#: ../../Zotlabs/Lib/Enotify.php:334 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:329 +#: ../../Zotlabs/Lib/Enotify.php:336 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:352 +#: ../../Zotlabs/Lib/Enotify.php:359 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:353 +#: ../../Zotlabs/Lib/Enotify.php:360 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:354 +#: ../../Zotlabs/Lib/Enotify.php:361 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:365 +#: ../../Zotlabs/Lib/Enotify.php:372 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:366 +#: ../../Zotlabs/Lib/Enotify.php:373 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:367 +#: ../../Zotlabs/Lib/Enotify.php:374 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:382 +#: ../../Zotlabs/Lib/Enotify.php:389 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:383 +#: ../../Zotlabs/Lib/Enotify.php:390 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:384 +#: ../../Zotlabs/Lib/Enotify.php:391 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:395 +#: ../../Zotlabs/Lib/Enotify.php:402 msgid "[$Projectname:Notify] Introduction received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:396 +#: ../../Zotlabs/Lib/Enotify.php:403 #, php-format msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:397 +#: ../../Zotlabs/Lib/Enotify.php:404 #, php-format msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418 +#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:402 +#: ../../Zotlabs/Lib/Enotify.php:409 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:409 +#: ../../Zotlabs/Lib/Enotify.php:416 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:410 +#: ../../Zotlabs/Lib/Enotify.php:417 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:411 +#: ../../Zotlabs/Lib/Enotify.php:418 #, php-format msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:416 +#: ../../Zotlabs/Lib/Enotify.php:423 msgid "Name:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:417 +#: ../../Zotlabs/Lib/Enotify.php:424 msgid "Photo:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:420 +#: ../../Zotlabs/Lib/Enotify.php:427 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:640 +#: ../../Zotlabs/Lib/Enotify.php:652 msgid "[$Projectname:Notify]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:808 +#: ../../Zotlabs/Lib/Enotify.php:820 +msgid "created a new poll" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:820 msgid "created a new post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:809 +#: ../../Zotlabs/Lib/Enotify.php:821 +#, php-format +msgid "voted on %s's poll" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:821 #, php-format msgid "commented on %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:812 +#: ../../Zotlabs/Lib/Enotify.php:825 #, php-format msgid "repeated %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:821 +#: ../../Zotlabs/Lib/Enotify.php:837 #, php-format msgid "edited a post dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:825 +#: ../../Zotlabs/Lib/Enotify.php:841 #, php-format msgid "edited a comment dated %s" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:23 +#: ../../Zotlabs/Lib/Connect.php:275 +msgid "error saving data" +msgstr "" + +#: ../../Zotlabs/Lib/Chatroom.php:25 msgid "Missing room name" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:32 +#: ../../Zotlabs/Lib/Chatroom.php:34 msgid "Duplicate room name" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90 +#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92 msgid "Invalid room specifier." msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:122 +#: ../../Zotlabs/Lib/Chatroom.php:124 msgid "Room not found." msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:143 +#: ../../Zotlabs/Lib/Chatroom.php:145 msgid "Room is full" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:143 +#: ../../Zotlabs/Lib/NativeWiki.php:145 msgid "Wiki updated successfully" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:197 +#: ../../Zotlabs/Lib/NativeWiki.php:199 msgid "Wiki files deleted successfully" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:322 +#: ../../Zotlabs/Lib/Apps.php:323 msgid "Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:323 +#: ../../Zotlabs/Lib/Apps.php:324 msgid "Affinity Tool" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:326 +#: ../../Zotlabs/Lib/Apps.php:327 msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:330 +#: ../../Zotlabs/Lib/Apps.php:331 msgid "Content Filter" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:333 +#: ../../Zotlabs/Lib/Apps.php:334 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:334 +#: ../../Zotlabs/Lib/Apps.php:335 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:337 +#: ../../Zotlabs/Lib/Apps.php:338 msgid "Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:348 +#: ../../Zotlabs/Lib/Apps.php:349 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:351 +#: ../../Zotlabs/Lib/Apps.php:352 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:353 +#: ../../Zotlabs/Lib/Apps.php:354 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:354 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:355 +#: ../../Zotlabs/Lib/Apps.php:356 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:356 +#: ../../Zotlabs/Lib/Apps.php:357 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Lib/Apps.php:360 msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:364 +#: ../../Zotlabs/Lib/Apps.php:365 msgid "Notifications" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:365 +#: ../../Zotlabs/Lib/Apps.php:366 msgid "Order Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Lib/Apps.php:367 msgid "CardDAV" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:368 +#: ../../Zotlabs/Lib/Apps.php:369 msgid "Guest Access" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:370 +#: ../../Zotlabs/Lib/Apps.php:371 msgid "OAuth Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:372 msgid "OAuth2 Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Lib/Apps.php:373 msgid "PDL Editor" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:374 -msgid "Premium Channel" -msgstr "" - #: ../../Zotlabs/Lib/Apps.php:376 msgid "My Chatrooms" msgstr "" @@ -14955,19 +15023,19 @@ msgstr "" msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:568 +#: ../../Zotlabs/Lib/Apps.php:569 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:569 +#: ../../Zotlabs/Lib/Apps.php:570 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:570 +#: ../../Zotlabs/Lib/Apps.php:571 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:571 +#: ../../Zotlabs/Lib/Apps.php:572 msgid "Unpin from navbar" msgstr "" @@ -15056,135 +15124,83 @@ msgstr "" msgid "Privacy conflict. Discretion advised." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:174 ../../Zotlabs/Storage/Browser.php:286 msgid "Admin Delete" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:203 -msgid "I will attend" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:203 -msgid "I will not attend" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:203 -msgid "I might attend" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:213 -msgid "I agree" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:213 -msgid "I disagree" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:213 -msgid "I abstain" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:287 -msgid "Add Tag" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:309 +#: ../../Zotlabs/Lib/ThreadItem.php:319 msgid "Reply on this comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:309 -msgid "reply" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:309 -msgid "Reply to" -msgstr "" - #: ../../Zotlabs/Lib/ThreadItem.php:319 -msgid "Share This" +msgid "reply" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:319 -msgid "share" +msgid "Reply to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:329 +#: ../../Zotlabs/Lib/ThreadItem.php:339 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:348 +#: ../../Zotlabs/Lib/ThreadItem.php:358 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:380 ../../Zotlabs/Lib/ThreadItem.php:381 +#: ../../Zotlabs/Lib/ThreadItem.php:359 #, php-format -msgid "View %s's profile - %s" +msgid "%d unseen" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:384 +#: ../../Zotlabs/Lib/ThreadItem.php:412 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:385 -msgid "via" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:386 +#: ../../Zotlabs/Lib/ThreadItem.php:414 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:387 +#: ../../Zotlabs/Lib/ThreadItem.php:415 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:413 +#: ../../Zotlabs/Lib/ThreadItem.php:442 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:414 -msgid "Attendance Options" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:415 -msgid "Vote" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:416 -msgid "Voting Options" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:431 +#: ../../Zotlabs/Lib/ThreadItem.php:460 msgid "Go to previous comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:441 +#: ../../Zotlabs/Lib/ThreadItem.php:473 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:802 +#: ../../Zotlabs/Lib/ThreadItem.php:831 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:804 +#: ../../Zotlabs/Lib/ThreadItem.php:833 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:805 +#: ../../Zotlabs/Lib/ThreadItem.php:834 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:815 +#: ../../Zotlabs/Lib/ThreadItem.php:844 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:816 +#: ../../Zotlabs/Lib/ThreadItem.php:845 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:817 +#: ../../Zotlabs/Lib/ThreadItem.php:846 msgid "Your website URL (optional)" msgstr "" @@ -15255,67 +15271,67 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:283 +#: ../../Zotlabs/Access/PermissionRoles.php:287 msgid "Social Networking" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:284 +#: ../../Zotlabs/Access/PermissionRoles.php:288 msgid "Social - Federation" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:285 +#: ../../Zotlabs/Access/PermissionRoles.php:289 msgid "Social - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:286 +#: ../../Zotlabs/Access/PermissionRoles.php:290 msgid "Social - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:287 +#: ../../Zotlabs/Access/PermissionRoles.php:291 msgid "Social - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:290 +#: ../../Zotlabs/Access/PermissionRoles.php:294 msgid "Community Forum" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:291 +#: ../../Zotlabs/Access/PermissionRoles.php:295 msgid "Forum - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:292 +#: ../../Zotlabs/Access/PermissionRoles.php:296 msgid "Forum - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:293 +#: ../../Zotlabs/Access/PermissionRoles.php:297 msgid "Forum - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:296 +#: ../../Zotlabs/Access/PermissionRoles.php:300 msgid "Feed Republish" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:297 +#: ../../Zotlabs/Access/PermissionRoles.php:301 msgid "Feed - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:298 +#: ../../Zotlabs/Access/PermissionRoles.php:302 msgid "Feed - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:301 +#: ../../Zotlabs/Access/PermissionRoles.php:305 msgid "Special Purpose" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:302 +#: ../../Zotlabs/Access/PermissionRoles.php:306 msgid "Special - Celebrity/Soapbox" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:303 +#: ../../Zotlabs/Access/PermissionRoles.php:307 msgid "Special - Group Repository" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:307 +#: ../../Zotlabs/Access/PermissionRoles.php:311 msgid "Custom/Expert Mode" msgstr "" @@ -15449,40 +15465,40 @@ msgstr "" msgid "Drop files here to immediately upload" msgstr "" -#: ../../boot.php:1653 +#: ../../boot.php:1677 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1677 +#: ../../boot.php:1701 msgid "Login/Email" msgstr "" -#: ../../boot.php:1678 +#: ../../boot.php:1702 msgid "Password" msgstr "" -#: ../../boot.php:1679 +#: ../../boot.php:1703 msgid "Remember me" msgstr "" -#: ../../boot.php:1682 +#: ../../boot.php:1706 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2478 +#: ../../boot.php:2575 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2483 +#: ../../boot.php:2580 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2599 +#: ../../boot.php:2696 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2604 +#: ../../boot.php:2701 msgid "Cron/Scheduled tasks not running." msgstr "" diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index fce8549f0..03b9bb9c4 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -60,7 +60,7 @@ class ClassLoader public function getPrefixes() { if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); } return array(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 54a5ea11d..76f79059b 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -371,6 +371,9 @@ return array( 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php', + 'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', + 'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php', 'Ramsey\\Uuid\\BinaryUtils' => $vendorDir . '/ramsey/uuid/src/BinaryUtils.php', 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index fd44b4266..afdda7129 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -539,6 +539,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php', + 'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', + 'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php', 'Ramsey\\Uuid\\BinaryUtils' => __DIR__ . '/..' . '/ramsey/uuid/src/BinaryUtils.php', 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index c967fa02c..8add9bb9d 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -294,7 +294,11 @@ {{if $fields.sexual}} <div id="profile-edit-sexual-wrapper" class="form-group field" > <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label> + {{if $advanced}} {{$sexual}} + {{else}} + {{$sexual_min}} + {{/if}} </div> <div class="clear"></div> {{/if}} |