diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/dcp | 64 | ||||
| -rw-r--r-- | util/hmessages.po | 3061 |
2 files changed, 1689 insertions, 1436 deletions
@@ -28,9 +28,14 @@ if($argc < 3) { if(strpos($dstfile,'store/') === 0) $dstfile = substr($dstfile,6); - $nick = substr($dstfile,0,strpos($dstfile,'/')); - - $dstfile = substr($dstfile,strlen($nick)+1); + if(strpos($dstfile,'/')) + $nick = substr($dstfile,0,strpos($dstfile,'/')); + $dstfile = substr($dstfile,strlen($nick)+1); + } + else { + $nick = $dstfile; + $dstfile = ''; + } $channel = channelx_by_nick($nick); if(! $channel) @@ -43,38 +48,45 @@ if($argc < 3) { } } - + $rootdir = ((strlen(trim($dstfile,'/'))) ? false : true); + $isadir = false; if(($recursive) || ($argc > 3)) $isadir = true; - $r = q("select * from attach where display_path = '%s' and uid = %d limit 1", - dbesc($dstfile), - intval($channel['channel_id']) - ); - - if($r && $r[0]['is_dir']) { - $isadir = true; - $basepath = $dstfile; - $folder = $r[0]['hash']; + if($rootdir) { + $folder = ''; } else { - $pathname = (($isadir) ? $dstfile : dirname($dstfile)); - $arr = [ - 'pathname' => $pathname, - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'], - ]; - $folder = ''; - if($pathname && $isadir) { - $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); - if($x['success']) - $folder = $x['data']['hash']; + $r = q("select * from attach where display_path = '%s' and uid = %d limit 1", + dbesc($dstfile), + intval($channel['channel_id']) + ); + + if($r && $r[0]['is_dir']) { + $isadir = true; + $basepath = $dstfile; + $folder = $r[0]['hash']; + } + else { + $pathname = (($isadir) ? $dstfile : dirname($dstfile)); + $arr = [ + 'pathname' => $pathname, + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'], + ]; + + $folder = ''; + if($pathname && $isadir) { + $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); + if($x['success']) + $folder = $x['data']['hash']; + } } } diff --git a/util/hmessages.po b/util/hmessages.po index b3f7ba431..adf2c2459 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.3.1\n" +"Project-Id-Version: 3.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 08:51+0100\n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -89,75 +89,79 @@ msgstr "" msgid "Can administer my channel" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:265 +#: ../../Zotlabs/Access/PermissionRoles.php:283 msgid "Social Networking" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:266 +#: ../../Zotlabs/Access/PermissionRoles.php:284 +msgid "Social - Federation" +msgstr "" + +#: ../../Zotlabs/Access/PermissionRoles.php:285 msgid "Social - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:267 +#: ../../Zotlabs/Access/PermissionRoles.php:286 msgid "Social - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:268 +#: ../../Zotlabs/Access/PermissionRoles.php:287 msgid "Social - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:271 +#: ../../Zotlabs/Access/PermissionRoles.php:290 msgid "Community Forum" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:272 +#: ../../Zotlabs/Access/PermissionRoles.php:291 msgid "Forum - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:273 +#: ../../Zotlabs/Access/PermissionRoles.php:292 msgid "Forum - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:274 +#: ../../Zotlabs/Access/PermissionRoles.php:293 msgid "Forum - Private" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:277 +#: ../../Zotlabs/Access/PermissionRoles.php:296 msgid "Feed Republish" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:278 +#: ../../Zotlabs/Access/PermissionRoles.php:297 msgid "Feed - Mostly Public" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:279 +#: ../../Zotlabs/Access/PermissionRoles.php:298 msgid "Feed - Restricted" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:282 +#: ../../Zotlabs/Access/PermissionRoles.php:301 msgid "Special Purpose" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:283 +#: ../../Zotlabs/Access/PermissionRoles.php:302 msgid "Special - Celebrity/Soapbox" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:284 +#: ../../Zotlabs/Access/PermissionRoles.php:303 msgid "Special - Group Repository" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:287 -#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130 -#: ../../Zotlabs/Module/Settings/Channel.php:473 -#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144 +#: ../../Zotlabs/Module/Settings/Channel.php:479 +#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 #: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 -#: ../../include/event.php:1322 ../../include/connections.php:689 -#: ../../include/connections.php:696 +#: ../../include/event.php:1322 ../../include/connections.php:697 +#: ../../include/connections.php:704 msgid "Other" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:288 +#: ../../Zotlabs/Access/PermissionRoles.php:307 msgid "Custom/Expert Mode" msgstr "" @@ -167,7 +171,7 @@ msgstr "" #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1198 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197 msgid "Requested profile is not available." msgstr "" @@ -178,26 +182,27 @@ msgstr "" #: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:86 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21 #: ../../Zotlabs/Module/Article_edit.php:51 -#: ../../Zotlabs/Module/New_channel.php:77 -#: ../../Zotlabs/Module/New_channel.php:102 +#: ../../Zotlabs/Module/New_channel.php:91 +#: ../../Zotlabs/Module/New_channel.php:116 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:275 -#: ../../Zotlabs/Module/Thing.php:295 ../../Zotlabs/Module/Thing.php:336 +#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280 +#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229 #: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 -#: ../../Zotlabs/Module/Item.php:1099 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 #: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 @@ -216,7 +221,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:85 @@ -227,15 +232,14 @@ msgstr "" #: ../../Zotlabs/Module/Card_edit.php:51 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Lib/Chatroom.php:133 #: ../../Zotlabs/Web/WebServer.php:123 ../../addon/keepout/keepout.php:36 -#: ../../addon/openid/Mod_Id.php:53 ../../addon/gitwiki/Mod_Gitwiki.php:196 -#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40 +#: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:40 #: ../../include/attach.php:150 ../../include/attach.php:197 #: ../../include/attach.php:270 ../../include/attach.php:284 #: ../../include/attach.php:293 ../../include/attach.php:366 #: ../../include/attach.php:380 ../../include/attach.php:387 -#: ../../include/attach.php:469 ../../include/attach.php:1019 -#: ../../include/attach.php:1093 ../../include/attach.php:1258 -#: ../../include/items.php:3656 ../../include/photos.php:27 +#: ../../include/attach.php:469 ../../include/attach.php:1029 +#: ../../include/attach.php:1103 ../../include/attach.php:1268 +#: ../../include/items.php:3706 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -244,7 +248,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2402 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 msgid "Blocks" msgstr "" @@ -263,9 +267,9 @@ msgid "Edited" msgstr "" #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 -#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:146 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160 #: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118 -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239 #: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 @@ -274,43 +278,44 @@ msgstr "" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Article_edit.php:99 -#: ../../Zotlabs/Module/Admin/Profs.php:154 -#: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Connections.php:265 -#: ../../Zotlabs/Module/Connections.php:303 -#: ../../Zotlabs/Module/Connections.php:323 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:358 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Admin/Profs.php:175 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth.php:150 +#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114 +#: ../../Zotlabs/Module/Connections.php:281 +#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202 +#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Layouts.php:193 #: ../../Zotlabs/Module/Editwebpage.php:142 -#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85 -#: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:409 -#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:288 -#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162 -#: ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1297 -#: ../../include/channel.php:1301 ../../include/menu.php:113 +#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121 +#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 +#: ../../include/channel.php:1300 ../../include/menu.php:113 msgid "Edit" msgstr "" #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 -#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 -#: ../../Zotlabs/Widget/Cdav.php:124 ../../include/conversation.php:1363 +#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 +#: ../../include/conversation.php:1366 msgid "Share" msgstr "" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 #: ../../Zotlabs/Module/Article_edit.php:129 -#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Admin/Profs.php:155 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connections.php:273 +#: ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth.php:151 +#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Connections.php:289 #: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 #: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179 -#: ../../Zotlabs/Module/Profiles.php:803 +#: ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Module/Card_edit.php:129 #: ../../Zotlabs/Lib/Apps.php:410 ../../Zotlabs/Lib/ThreadItem.php:141 @@ -322,7 +327,6 @@ msgstr "" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 #: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198 #: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60 -#: ../../addon/gitwiki/Mod_Gitwiki.php:153 msgid "View" msgstr "" @@ -398,29 +402,30 @@ msgstr "" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:152 +#: ../../Zotlabs/Module/Appman.php:153 #: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:308 #: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Plugins.php:438 -#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:289 -#: ../../Zotlabs/Module/Admin/Profs.php:157 +#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 -#: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Channel.php:488 -#: ../../Zotlabs/Module/Settings/Features.php:47 +#: ../../Zotlabs/Module/Settings/Permcats.php:115 +#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:54 #: ../../Zotlabs/Module/Settings/Display.php:192 -#: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374 -#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 +#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345 #: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 #: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 @@ -428,16 +433,17 @@ msgstr "" #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 -#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 -#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:750 ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752 +#: ../../Zotlabs/Widget/Eventstools.php:16 #: ../../Zotlabs/Widget/Wiki_pages.php:40 #: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:273 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 @@ -445,16 +451,16 @@ msgstr "" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:822 -#: ../../addon/gitwiki/Mod_Gitwiki.php:155 +#: ../../addon/diaspora/diaspora.php:825 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 -#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 +#: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -462,16 +468,16 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:432 #: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218 #: ../../addon/twitter/twitter.php:265 -#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/piwik/piwik.php:95 -#: ../../addon/pageheader/pageheader.php:48 +#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/cart/cart.php:1104 +#: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 #: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 #: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 #: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124 +#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133 #: ../../include/nav.php:469 msgid "Articles" msgstr "" @@ -503,11 +509,11 @@ msgid "Edit Layout" msgstr "" #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:111 +#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:117 #: ../../Zotlabs/Module/Group.php:74 ../../Zotlabs/Module/Dreport.php:10 #: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Like.php:296 #: ../../Zotlabs/Web/WebServer.php:122 ../../addon/redphotos/redphotos.php:119 -#: ../../addon/hzfiles/hzfiles.php:73 ../../addon/frphotos/frphotos.php:81 +#: ../../addon/hzfiles/hzfiles.php:73 ../../addon/frphotos/frphotos.php:82 #: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:358 msgid "Permission denied" msgstr "" @@ -520,7 +526,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1634 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644 msgid "Profile" msgstr "" @@ -533,7 +539,7 @@ msgid "Visible To" msgstr "" #: ../../Zotlabs/Module/Profperm.php:140 -#: ../../Zotlabs/Module/Connections.php:140 +#: ../../Zotlabs/Module/Connections.php:200 msgid "All Connections" msgstr "" @@ -548,9 +554,9 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 #: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 #: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 -#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:832 +#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:853 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 #: ../../include/conversation.php:1160 msgid "Unknown" msgstr "" @@ -588,14 +594,14 @@ msgid "End date and time" msgstr "" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 msgid "Description" msgstr "" #: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117 #: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 -#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:52 +#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52 #: ../../include/js_strings.php:25 msgid "Location" msgstr "" @@ -660,17 +666,17 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 #: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:345 ../../Zotlabs/Module/Wiki.php:375 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379 #: ../../Zotlabs/Module/Profile_photo.php:464 #: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1386 -#: ../../include/conversation.php:1435 +#: ../../include/conversation.php:1389 ../../include/conversation.php:1438 msgid "Cancel" msgstr "" @@ -680,14 +686,15 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Sharedwithme.php:105 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +#: ../../Zotlabs/Module/Settings/Oauth.php:116 #: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906 #: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 #: ../../Zotlabs/Storage/Browser.php:283 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 -#: ../../addon/gitwiki/Mod_Gitwiki.php:158 msgid "Name" msgstr "" @@ -700,76 +707,78 @@ msgid "Title" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909 -#: ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Phone" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1174 -#: ../../Zotlabs/Module/Admin/Accounts.php:170 -#: ../../Zotlabs/Module/Admin/Accounts.php:182 -#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:183 +#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1775 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 msgid "Email" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911 -#: ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Profiles.php:788 msgid "Instant messenger" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912 -#: ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Profiles.php:789 msgid "Website" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502 -#: ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Profiles.php:790 msgid "Address" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914 -#: ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Profiles.php:791 msgid "Note" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1308 -#: ../../include/connections.php:682 +#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 +#: ../../include/connections.php:690 msgid "Mobile" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 -#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1309 -#: ../../include/connections.php:683 +#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 +#: ../../include/connections.php:691 msgid "Home" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 -#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1312 -#: ../../include/connections.php:686 +#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 +#: ../../include/connections.php:694 msgid "Work" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Profiles.php:796 #: ../../addon/jappixmini/jappixmini.php:368 msgid "Add Contact" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920 -#: ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Profiles.php:797 msgid "Add Field" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1186 #: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Settings/Oauth2.php:39 +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth.php:43 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799 #: ../../Zotlabs/Lib/Apps.php:393 msgid "Update" msgstr "" @@ -799,7 +808,7 @@ msgid "ZIP Code" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931 -#: ../../Zotlabs/Module/Profiles.php:760 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Country" msgstr "" @@ -815,8 +824,8 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 -#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:508 +#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508 msgid "You must be logged in to see this page." msgstr "" @@ -907,24 +916,24 @@ msgstr "" msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335 #: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../include/text.php:1051 ../../include/text.php:1063 #: ../../include/acl_selectors.php:118 ../../include/nav.php:179 msgid "Search" msgstr "" -#: ../../Zotlabs/Module/Search.php:226 +#: ../../Zotlabs/Module/Search.php:230 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Search.php:228 +#: ../../Zotlabs/Module/Search.php:232 #, php-format msgid "Search results for: %s" msgstr "" -#: ../../Zotlabs/Module/Pubstream.php:93 +#: ../../Zotlabs/Module/Pubstream.php:95 #: ../../Zotlabs/Widget/Notifications.php:131 msgid "Public Stream" msgstr "" @@ -1025,7 +1034,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "(click to open/close)" msgstr "" @@ -1048,8 +1057,8 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:252 -#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Settings/Channel.php:307 #: ../../Zotlabs/Module/Settings/Display.php:100 #: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 @@ -1058,7 +1067,7 @@ msgstr "" #: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Filestorage.php:155 #: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1067,9 +1076,9 @@ msgstr "" #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 #: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 @@ -1086,7 +1095,8 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 -#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1075 +#: ../../addon/cart/cart.php:1082 ../../addon/cart/cart.php:1090 #: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 @@ -1098,8 +1108,8 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:254 -#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Settings/Channel.php:307 #: ../../Zotlabs/Module/Settings/Display.php:100 #: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 @@ -1108,7 +1118,7 @@ msgstr "" #: ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Filestorage.php:155 #: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587 +#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1117,9 +1127,9 @@ msgstr "" #: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 +#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 #: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 @@ -1136,7 +1146,8 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 -#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1075 +#: ../../addon/cart/cart.php:1082 ../../addon/cart/cart.php:1090 #: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 #: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 #: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 @@ -1251,8 +1262,8 @@ msgid "Event not found." msgstr "" #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 -#: ../../Zotlabs/Module/Like.php:385 ../../include/conversation.php:119 -#: ../../include/text.php:2007 ../../include/event.php:1153 +#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 +#: ../../include/text.php:2008 ../../include/event.php:1153 msgid "event" msgstr "" @@ -1261,9 +1272,9 @@ msgid "Edit event title" msgstr "" #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../Zotlabs/Module/Appman.php:140 ../../Zotlabs/Module/Appman.php:141 -#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../include/datetime.php:205 +#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749 +#: ../../include/datetime.php:211 msgid "Required" msgstr "" @@ -1314,12 +1325,12 @@ msgid "Edit Location" msgstr "" #: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:760 -#: ../../include/conversation.php:1330 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762 +#: ../../include/conversation.php:1333 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1402 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405 msgid "Permission settings" msgstr "" @@ -1344,7 +1355,7 @@ msgid "Delete event" msgstr "" #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 -#: ../../include/text.php:1826 +#: ../../include/text.php:1827 msgid "Link to Source" msgstr "" @@ -1361,7 +1372,7 @@ msgid "Create Event" msgstr "" #: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 -#: ../../include/channel.php:1637 +#: ../../include/channel.php:1647 msgid "Export" msgstr "" @@ -1373,55 +1384,55 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55 +#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56 msgid "App installed." msgstr "" -#: ../../Zotlabs/Module/Appman.php:48 +#: ../../Zotlabs/Module/Appman.php:49 msgid "Malformed app." msgstr "" -#: ../../Zotlabs/Module/Appman.php:129 +#: ../../Zotlabs/Module/Appman.php:130 msgid "Embed code" msgstr "" -#: ../../Zotlabs/Module/Appman.php:135 +#: ../../Zotlabs/Module/Appman.php:136 msgid "Edit App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:135 +#: ../../Zotlabs/Module/Appman.php:136 msgid "Create App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:140 +#: ../../Zotlabs/Module/Appman.php:141 msgid "Name of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:141 +#: ../../Zotlabs/Module/Appman.php:142 msgid "Location (URL) of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 msgid "Photo icon URL" msgstr "" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 msgid "80 x 80 pixels - optional" msgstr "" -#: ../../Zotlabs/Module/Appman.php:144 +#: ../../Zotlabs/Module/Appman.php:145 msgid "Categories (optional, comma separated list)" msgstr "" -#: ../../Zotlabs/Module/Appman.php:145 +#: ../../Zotlabs/Module/Appman.php:146 msgid "Version ID" msgstr "" -#: ../../Zotlabs/Module/Appman.php:146 +#: ../../Zotlabs/Module/Appman.php:147 msgid "Price of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:147 +#: ../../Zotlabs/Module/Appman.php:148 msgid "Location (URL) to purchase app" msgstr "" @@ -1434,16 +1445,16 @@ msgid "Hub not found." msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 -#: ../../Zotlabs/Module/Like.php:383 +#: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359 -#: ../../include/conversation.php:116 ../../include/text.php:2004 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:116 ../../include/text.php:2005 msgid "photo" msgstr "" -#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:383 -#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359 -#: ../../include/conversation.php:144 ../../include/text.php:2010 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 +#: ../../include/conversation.php:144 ../../include/text.php:2011 msgid "status" msgstr "" @@ -1473,8 +1484,9 @@ msgid "Insert web link" msgstr "" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 -#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1398 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698 +#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../include/conversation.php:1401 msgid "Title (optional)" msgstr "" @@ -1495,7 +1507,7 @@ msgstr "" msgid "Imported file is empty." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:93 ../../Zotlabs/Module/Import.php:121 +#: ../../Zotlabs/Module/Import_items.php:93 #, php-format msgid "Warning: Database versions differ by %1$d updates." msgstr "" @@ -1513,33 +1525,33 @@ 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:516 +#: ../../Zotlabs/Module/Import.php:517 msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:119 ../../Zotlabs/Module/Manage.php:138 +#: ../../Zotlabs/Module/New_channel.php:133 ../../Zotlabs/Module/Manage.php:138 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/New_channel.php:146 #: ../../Zotlabs/Module/Register.php:254 msgid "Name or caption" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/New_channel.php:146 #: ../../Zotlabs/Module/Register.php:254 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/New_channel.php:148 #: ../../Zotlabs/Module/Register.php:256 msgid "Choose a short nickname" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/New_channel.php:148 #: ../../Zotlabs/Module/Register.php:256 #, php-format msgid "" @@ -1547,38 +1559,47 @@ msgid "" "g. nickname%s" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Settings/Channel.php:539 #: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 #: ../../Zotlabs/Module/Register.php:257 msgid "Select a channel role with your privacy requirements." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:135 +#: ../../Zotlabs/Module/New_channel.php:149 #: ../../Zotlabs/Module/Register.php:257 msgid "Read more about roles" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:138 +#: ../../Zotlabs/Module/New_channel.php:152 msgid "Create Channel" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:139 +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed, " +"and many other things. Channels can make connections with other channels to " +"share information with each other." +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:153 msgid "" -"A channel is your identity on this network. It can represent a person, a " -"blog, or a forum to name a few. Channels can make connections with other " -"channels to share information with highly detailed permissions." +"The type of channel you create affects the basic privacy settings, the " +"permissions that are granted to connections/friends, and also the channel's " +"visibility across the network." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:140 +#: ../../Zotlabs/Module/New_channel.php:154 msgid "" "or <a href=\"import\">import an existing channel</a> from another location." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:145 +#: ../../Zotlabs/Module/New_channel.php:159 msgid "Validate" msgstr "" @@ -1624,7 +1645,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:600 msgid "Remove Channel" msgstr "" @@ -1683,7 +1704,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 -#: ../../Zotlabs/Module/Setup.php:745 +#: ../../Zotlabs/Module/Setup.php:749 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" @@ -1944,114 +1965,106 @@ msgstr "" msgid "Error: zip PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:569 +#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579 +msgid ".htconfig.php is writable" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:575 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../Zotlabs/Module/Setup.php:570 +#: ../../Zotlabs/Module/Setup.php:576 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../Zotlabs/Module/Setup.php:571 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:572 -msgid "" -"You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:575 -msgid ".htconfig.php is writable" +#: ../../Zotlabs/Module/Setup.php:577 +msgid "Please see install/INSTALL.txt for additional information." msgstr "" -#: ../../Zotlabs/Module/Setup.php:589 +#: ../../Zotlabs/Module/Setup.php:593 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "" -#: ../../Zotlabs/Module/Setup.php:590 +#: ../../Zotlabs/Module/Setup.php:594 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612 +#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:592 +#: ../../Zotlabs/Module/Setup.php:596 #, php-format msgid "" "Note: as a security measure, you should give the web server write access to " "%s only--not the template files (.tpl) that it contains." msgstr "" -#: ../../Zotlabs/Module/Setup.php:595 +#: ../../Zotlabs/Module/Setup.php:599 #, php-format msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:611 +#: ../../Zotlabs/Module/Setup.php:615 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level " "web folder" msgstr "" -#: ../../Zotlabs/Module/Setup.php:615 +#: ../../Zotlabs/Module/Setup.php:619 msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:647 +#: ../../Zotlabs/Module/Setup.php:651 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../Zotlabs/Module/Setup.php:648 +#: ../../Zotlabs/Module/Setup.php:652 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "" -#: ../../Zotlabs/Module/Setup.php:649 +#: ../../Zotlabs/Module/Setup.php:653 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "" -#: ../../Zotlabs/Module/Setup.php:650 +#: ../../Zotlabs/Module/Setup.php:654 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "" -#: ../../Zotlabs/Module/Setup.php:651 +#: ../../Zotlabs/Module/Setup.php:655 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Setup.php:652 +#: ../../Zotlabs/Module/Setup.php:656 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Setup.php:654 +#: ../../Zotlabs/Module/Setup.php:658 msgid "" "If you are confident that the certificate is valid and signed by a trusted " "authority, check to see if you have failed to install an intermediate cert. " @@ -2059,36 +2072,36 @@ msgid "" "server communications." msgstr "" -#: ../../Zotlabs/Module/Setup.php:656 +#: ../../Zotlabs/Module/Setup.php:660 msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Setup.php:662 +#: ../../Zotlabs/Module/Setup.php:666 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: ../../Zotlabs/Module/Setup.php:665 +#: ../../Zotlabs/Module/Setup.php:669 msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Setup.php:679 +#: ../../Zotlabs/Module/Setup.php:683 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: ../../Zotlabs/Module/Setup.php:703 ../../addon/rendezvous/rendezvous.php:401 +#: ../../Zotlabs/Module/Setup.php:707 ../../addon/rendezvous/rendezvous.php:401 msgid "Errors encountered creating database tables." msgstr "" -#: ../../Zotlabs/Module/Setup.php:743 +#: ../../Zotlabs/Module/Setup.php:747 msgid "<h1>What next?</h1>" msgstr "" -#: ../../Zotlabs/Module/Setup.php:744 +#: ../../Zotlabs/Module/Setup.php:748 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -2166,13 +2179,13 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Settings/Features.php:65 msgid "Off" msgstr "" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:38 +#: ../../Zotlabs/Module/Settings/Features.php:65 msgid "On" msgstr "" @@ -2226,10 +2239,10 @@ msgid "No failed updates." msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 +#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 -#: ../../Zotlabs/Module/Display.php:410 ../../Zotlabs/Module/Filestorage.php:24 -#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3569 +#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3619 msgid "Item not found." msgstr "" @@ -2255,12 +2268,12 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:341 #: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Accounts.php:165 +#: ../../Zotlabs/Module/Admin/Accounts.php:166 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:294 #: ../../Zotlabs/Module/Admin/Security.php:86 #: ../../Zotlabs/Module/Admin.php:136 msgid "Administration" @@ -2278,8 +2291,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 -#: ../../Zotlabs/Widget/Newmember.php:55 -#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105 #: ../../include/nav.php:192 msgid "Settings" msgstr "" @@ -2387,7 +2400,7 @@ msgstr[1] "" msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2462 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -2402,79 +2415,80 @@ msgstr "" msgid "Account '%s' unblocked" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Accounts.php:179 +#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Accounts.php:180 #: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 msgid "Accounts" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:168 +#: ../../Zotlabs/Module/Admin/Accounts.php:169 #: ../../Zotlabs/Module/Admin/Channels.php:148 msgid "select all" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:169 +#: ../../Zotlabs/Module/Admin/Accounts.php:170 msgid "Registrations waiting for confirm" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:170 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 msgid "Request date" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:172 msgid "No registrations." msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:172 -#: ../../Zotlabs/Module/Connections.php:287 ../../include/conversation.php:732 +#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732 msgid "Approve" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Authorize.php:26 msgid "Deny" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Admin/Accounts.php:176 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Block" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:176 +#: ../../Zotlabs/Module/Admin/Accounts.php:177 #: ../../Zotlabs/Module/Connedit.php:622 msgid "Unblock" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:181 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 msgid "ID" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:183 ../../include/group.php:284 +#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284 msgid "All Channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../Zotlabs/Module/Admin/Accounts.php:185 msgid "Register date" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:185 +#: ../../Zotlabs/Module/Admin/Accounts.php:186 msgid "Last login" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:186 +#: ../../Zotlabs/Module/Admin/Accounts.php:187 msgid "Expires" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:187 +#: ../../Zotlabs/Module/Admin/Accounts.php:188 msgid "Service Class" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:189 +#: ../../Zotlabs/Module/Admin/Accounts.php:190 msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted " "on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:190 +#: ../../Zotlabs/Module/Admin/Accounts.php:191 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" @@ -2583,7 +2597,7 @@ msgid "Disallow Code" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1808 ../../include/nav.php:378 +#: ../../include/conversation.php:1811 ../../include/nav.php:378 msgid "Channel" msgstr "" @@ -2628,549 +2642,546 @@ msgstr "" msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:158 +#: ../../Zotlabs/Module/Admin/Site.php:165 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:184 +#: ../../Zotlabs/Module/Admin/Site.php:191 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3082 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:195 +#: ../../Zotlabs/Module/Admin/Site.php:202 #: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Admin/Site.php:209 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:204 +#: ../../Zotlabs/Module/Admin/Site.php:211 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:206 +#: ../../Zotlabs/Module/Admin/Site.php:213 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:253 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:268 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:269 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:274 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Beginner/Basic" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:275 +#: ../../Zotlabs/Module/Admin/Site.php:282 msgid "Novice - not skilled but willing to learn" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:276 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Intermediate - somewhat comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:284 msgid "Advanced - very comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:278 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Expert - I can write computer code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:297 #: ../../Zotlabs/Module/Register.php:269 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:293 ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin/Site.php:300 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:304 #: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Site default technical skill level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Used to provide a member experience matched to technical comfort level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Lock the technical skill level setting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Members can set their own technical comfort level by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 ../../Zotlabs/Module/Siteinfo.php:21 +#: ../../Zotlabs/Module/Admin/Site.php:312 ../../Zotlabs/Module/Siteinfo.php:21 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:314 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:308 -msgid "Mobile system theme" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:308 -msgid "Theme for mobile devices" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:327 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:321 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Site only Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Allow anybody on the internet to access the Public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:345 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:339 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:346 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:340 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Queue Threshold" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:348 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:349 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:343 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "Allow SVG thumbnails in file browser" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "WARNING: SVG images may contain malicious code." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:353 +msgid "" +"Do not expire any posts which have comments less than this many days ago" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:355 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Recommend: profiles, go, or settings" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Region or country" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:69 +#: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "New Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:70 #: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 msgid "Field nickname" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:70 #: ../../Zotlabs/Module/Admin/Profs.php:90 +#: ../../Zotlabs/Module/Admin/Profs.php:110 msgid "System name of field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:71 #: ../../Zotlabs/Module/Admin/Profs.php:91 +#: ../../Zotlabs/Module/Admin/Profs.php:111 msgid "Input type" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:72 #: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 msgid "Field Name" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:72 #: ../../Zotlabs/Module/Admin/Profs.php:92 +#: ../../Zotlabs/Module/Admin/Profs.php:112 msgid "Label on profile pages" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 msgid "Help text" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:93 +#: ../../Zotlabs/Module/Admin/Profs.php:113 msgid "Additional info (optional)" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:74 -#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052 #: ../../include/text.php:1064 msgid "Save" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:83 +#: ../../Zotlabs/Module/Admin/Profs.php:103 msgid "Field definition not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:89 +#: ../../Zotlabs/Module/Admin/Profs.php:109 msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30 +#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30 msgid "Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:148 +#: ../../Zotlabs/Module/Admin/Profs.php:169 msgid "Basic Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:170 msgid "Advanced Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:170 msgid "(In addition to basic fields)" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:151 +#: ../../Zotlabs/Module/Admin/Profs.php:172 msgid "All available fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:152 +#: ../../Zotlabs/Module/Admin/Profs.php:173 msgid "Custom Fields" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:156 +#: ../../Zotlabs/Module/Admin/Profs.php:177 msgid "Create Custom Field" msgstr "" @@ -3336,51 +3347,55 @@ msgctxt "acl" msgid "Profile" msgstr "" -#: ../../Zotlabs/Module/Moderate.php:55 +#: ../../Zotlabs/Module/Moderate.php:65 msgid "Comment approved" msgstr "" -#: ../../Zotlabs/Module/Moderate.php:59 +#: ../../Zotlabs/Module/Moderate.php:69 msgid "Comment deleted" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:37 +#: ../../Zotlabs/Module/Settings/Permcats.php:23 +msgid "Permission Name is required." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:42 msgid "Permission category saved." msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:61 +#: ../../Zotlabs/Module/Settings/Permcats.php:66 msgid "" "Use this form to create permission rules for various classes of people or " "connections." msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:94 +#: ../../Zotlabs/Module/Settings/Permcats.php:99 msgid "Permission Categories" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:102 +#: ../../Zotlabs/Module/Settings/Permcats.php:107 msgid "Permission Name" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:103 +#: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:161 #: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:105 +#: ../../Zotlabs/Module/Settings/Permcats.php:110 #: ../../Zotlabs/Module/Settings/Tokens.php:163 #: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248 msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:108 +#: ../../Zotlabs/Module/Settings/Permcats.php:113 #: ../../Zotlabs/Module/Settings/Tokens.php:166 #: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253 msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:109 +#: ../../Zotlabs/Module/Settings/Permcats.php:114 #: ../../Zotlabs/Module/Settings/Tokens.php:167 #: ../../Zotlabs/Module/Connedit.php:894 msgid "" @@ -3400,7 +3415,7 @@ msgstr "" msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:262 +#: ../../Zotlabs/Module/Settings/Channel.php:264 #: ../../Zotlabs/Module/Defperms.php:103 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3410,408 +3425,419 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:323 +#: ../../Zotlabs/Module/Settings/Channel.php:325 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:324 +#: ../../Zotlabs/Module/Settings/Channel.php:326 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:325 +#: ../../Zotlabs/Module/Settings/Channel.php:327 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:326 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:327 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:405 +#: ../../Zotlabs/Module/Settings/Channel.php:407 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:410 +#: ../../Zotlabs/Module/Settings/Channel.php:412 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:414 +#: ../../Zotlabs/Module/Settings/Channel.php:416 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:419 +#: ../../Zotlabs/Module/Settings/Channel.php:425 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:422 +#: ../../Zotlabs/Module/Settings/Channel.php:428 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:486 +#: ../../Zotlabs/Module/Settings/Channel.php:493 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:493 +#: ../../Zotlabs/Module/Settings/Channel.php:500 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:494 ../../include/channel.php:1522 +#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1521 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Channel.php:502 #: ../../Zotlabs/Module/Settings/Account.php:119 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:496 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:497 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:497 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:507 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:502 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:522 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "Profile to assign new connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:532 -msgid "Channel permissions category:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Default Permissions Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:549 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:564 -#: ../../Zotlabs/Module/Settings/Channel.php:569 -#: ../../Zotlabs/Module/Settings/Channel.php:570 #: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Unseen public activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:582 +msgid "Unseen likes and dislikes" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:583 #, 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:576 -msgid "" -"Also show new wall posts, private messages and connections under Notices" +#: ../../Zotlabs/Module/Settings/Channel.php:584 +msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:599 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:602 msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Start calendar week on Monday" msgstr "" -#: ../../Zotlabs/Module/Settings/Features.php:45 +#: ../../Zotlabs/Module/Settings/Features.php:73 msgid "Additional Features" msgstr "" +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "Your technical skill level" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Features.php:74 +#: ../../Zotlabs/Module/Settings/Account.php:116 +msgid "" +"Used to provide a member experience and additional features consistent with " +"your comfort level" +msgstr "" + #: ../../Zotlabs/Module/Settings/Tokens.php:31 #, php-format msgid "This channel is limited to %d tokens" @@ -3840,7 +3866,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Settings/Tokens.php:150 -#: ../../Zotlabs/Widget/Settings_menu.php:92 +#: ../../Zotlabs/Widget/Settings_menu.php:100 msgid "Guest Access Tokens" msgstr "" @@ -3861,6 +3887,97 @@ msgstr "" msgid "Their Settings" msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth2.php:35 +msgid "Name and Secret are required" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:83 +msgid "Add OAuth2 application" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +msgid "Name of application" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +#: ../../Zotlabs/Module/Settings/Oauth.php:118 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 +msgid "Consumer Secret" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:119 +msgid "Redirect" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +msgid "Grant Types" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "leave blank unless your application sepcifically requires this" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "Authorization scope" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +msgid "OAuth2 Application not found." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:111 +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +#: ../../Zotlabs/Module/Settings/Oauth.php:87 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:149 +msgid "Add application" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:147 +msgid "Connected OAuth2 Apps" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth.php:152 +msgid "Client key starts with" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth.php:153 +msgid "No name" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth.php:154 +msgid "Remove authorization" +msgstr "" + #: ../../Zotlabs/Module/Settings/Account.php:20 msgid "Not valid email." msgstr "" @@ -3917,16 +4034,6 @@ msgstr "" msgid "Leave password fields blank unless changing" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "Your technical skill level" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "" -"Used to provide a member experience and additional features consistent with " -"your comfort level" -msgstr "" - #: ../../Zotlabs/Module/Settings/Account.php:120 #: ../../Zotlabs/Module/Removeaccount.php:61 msgid "Remove Account" @@ -3964,11 +4071,11 @@ msgstr "" msgid "Affinity Slider Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:64 +#: ../../Zotlabs/Module/Settings/Featured.php:67 msgid "Addon Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:65 +#: ../../Zotlabs/Module/Settings/Featured.php:68 msgid "Please save/submit changes to any panel before opening another." msgstr "" @@ -4085,81 +4192,38 @@ msgstr "" msgid "Grid page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:34 +#: ../../Zotlabs/Module/Settings/Oauth.php:35 msgid "Name is required" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:38 +#: ../../Zotlabs/Module/Settings/Oauth.php:39 msgid "Key and Secret are required" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:86 -#: ../../Zotlabs/Module/Settings/Oauth.php:112 -#: ../../Zotlabs/Module/Settings/Oauth.php:148 -msgid "Add application" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -msgid "Name of application" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:116 -#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781 -msgid "Consumer Key" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - #: ../../Zotlabs/Module/Settings/Oauth.php:91 #: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 -msgid "Consumer Secret" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -#: ../../Zotlabs/Module/Settings/Oauth.php:118 -msgid "Redirect" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" +#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781 +msgid "Consumer Key" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -#: ../../Zotlabs/Module/Settings/Oauth.php:119 +#: ../../Zotlabs/Module/Settings/Oauth.php:94 +#: ../../Zotlabs/Module/Settings/Oauth.php:120 msgid "Icon url" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:94 #: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 msgid "Optional" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:104 +#: ../../Zotlabs/Module/Settings/Oauth.php:105 msgid "Application not found." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:147 +#: ../../Zotlabs/Module/Settings/Oauth.php:148 msgid "Connected Apps" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:151 -msgid "Client key starts with" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:152 -msgid "No name" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:153 -msgid "Remove authorization" -msgstr "" - #: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:811 #: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Widget/Portfolio.php:87 #: ../../Zotlabs/Widget/Album.php:78 @@ -4172,12 +4236,11 @@ msgid "Edit Album" msgstr "" #: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:712 -#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 #: ../../Zotlabs/Module/Profile_photo.php:458 -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Storage/Browser.php:277 ../../Zotlabs/Storage/Browser.php:384 -#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169 -#: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Album.php:97 +#: ../../Zotlabs/Module/Cover_photo.php:362 +#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 +#: ../../Zotlabs/Widget/Album.php:97 msgid "Upload" msgstr "" @@ -4185,67 +4248,67 @@ msgstr "" msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../Zotlabs/Module/Thing.php:115 +#: ../../Zotlabs/Module/Thing.php:120 msgid "Thing updated" msgstr "" -#: ../../Zotlabs/Module/Thing.php:167 +#: ../../Zotlabs/Module/Thing.php:172 msgid "Object store: failed" msgstr "" -#: ../../Zotlabs/Module/Thing.php:171 +#: ../../Zotlabs/Module/Thing.php:176 msgid "Thing added" msgstr "" -#: ../../Zotlabs/Module/Thing.php:197 +#: ../../Zotlabs/Module/Thing.php:202 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../Zotlabs/Module/Thing.php:260 +#: ../../Zotlabs/Module/Thing.php:265 msgid "Show Thing" msgstr "" -#: ../../Zotlabs/Module/Thing.php:267 +#: ../../Zotlabs/Module/Thing.php:272 msgid "item not found." msgstr "" -#: ../../Zotlabs/Module/Thing.php:300 +#: ../../Zotlabs/Module/Thing.php:305 msgid "Edit Thing" msgstr "" -#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:359 +#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364 msgid "Select a profile" msgstr "" -#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 msgid "Post an activity" msgstr "" -#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 msgid "Only sends to viewers of the applicable profile" msgstr "" -#: ../../Zotlabs/Module/Thing.php:308 ../../Zotlabs/Module/Thing.php:364 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 msgid "Name of thing e.g. something" msgstr "" -#: ../../Zotlabs/Module/Thing.php:310 ../../Zotlabs/Module/Thing.php:365 +#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370 msgid "URL of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Thing.php:312 ../../Zotlabs/Module/Thing.php:366 +#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371 msgid "URL for photo of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Thing.php:314 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 #: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 #: ../../Zotlabs/Module/Filestorage.php:147 ../../include/acl_selectors.php:123 msgid "Permissions" msgstr "" -#: ../../Zotlabs/Module/Thing.php:357 +#: ../../Zotlabs/Module/Thing.php:362 msgid "Add Thing to your Profile" msgstr "" @@ -4257,56 +4320,56 @@ msgstr "" msgid "System Notifications" msgstr "" -#: ../../Zotlabs/Module/Follow.php:31 -msgid "Channel added." +#: ../../Zotlabs/Module/Follow.php:36 +msgid "Connection added." msgstr "" -#: ../../Zotlabs/Module/Import.php:143 +#: ../../Zotlabs/Module/Import.php:144 #, php-format msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Import.php:157 +#: ../../Zotlabs/Module/Import.php:158 msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:481 +#: ../../Zotlabs/Module/Import.php:482 #: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Import.php:509 +#: ../../Zotlabs/Module/Import.php:510 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:514 +#: ../../Zotlabs/Module/Import.php:515 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:515 +#: ../../Zotlabs/Module/Import.php:516 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:517 +#: ../../Zotlabs/Module/Import.php:518 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:518 +#: ../../Zotlabs/Module/Import.php:519 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:519 +#: ../../Zotlabs/Module/Import.php:520 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:520 +#: ../../Zotlabs/Module/Import.php:521 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:521 +#: ../../Zotlabs/Module/Import.php:522 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 " @@ -4314,19 +4377,19 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:522 +#: ../../Zotlabs/Module/Import.php:523 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:523 +#: ../../Zotlabs/Module/Import.php:524 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:524 +#: ../../Zotlabs/Module/Import.php:525 msgid "Import a few months of posts if possible (limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Import.php:525 +#: ../../Zotlabs/Module/Import.php:526 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4336,16 +4399,16 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1583 -#: ../../include/channel.php:2307 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590 +#: ../../include/channel.php:2318 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2308 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2309 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320 msgid "Authenticate" msgstr "" @@ -4353,7 +4416,7 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2426 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 msgid "Import" msgstr "" @@ -4413,149 +4476,163 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Connections.php:54 -#: ../../Zotlabs/Module/Connections.php:156 -#: ../../Zotlabs/Module/Connections.php:245 +#: ../../Zotlabs/Module/Connections.php:55 +#: ../../Zotlabs/Module/Connections.php:112 +#: ../../Zotlabs/Module/Connections.php:256 +msgid "Active" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:60 +#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:261 msgid "Blocked" msgstr "" -#: ../../Zotlabs/Module/Connections.php:59 -#: ../../Zotlabs/Module/Connections.php:163 -#: ../../Zotlabs/Module/Connections.php:244 +#: ../../Zotlabs/Module/Connections.php:65 +#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:260 msgid "Ignored" msgstr "" -#: ../../Zotlabs/Module/Connections.php:64 -#: ../../Zotlabs/Module/Connections.php:177 -#: ../../Zotlabs/Module/Connections.php:243 +#: ../../Zotlabs/Module/Connections.php:70 +#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:259 msgid "Hidden" msgstr "" -#: ../../Zotlabs/Module/Connections.php:69 -#: ../../Zotlabs/Module/Connections.php:170 +#: ../../Zotlabs/Module/Connections.php:75 +#: ../../Zotlabs/Module/Connections.php:178 msgid "Archived/Unreachable" msgstr "" -#: ../../Zotlabs/Module/Connections.php:74 -#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 +#: ../../Zotlabs/Module/Connections.php:80 +#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 #: ../../Zotlabs/Module/Notifications.php:52 -#: ../../include/conversation.php:1714 +#: ../../include/conversation.php:1717 msgid "New" msgstr "" -#: ../../Zotlabs/Module/Connections.php:88 -#: ../../Zotlabs/Module/Connections.php:102 +#: ../../Zotlabs/Module/Connections.php:94 +#: ../../Zotlabs/Module/Connections.php:108 #: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26 msgid "All" msgstr "" -#: ../../Zotlabs/Module/Connections.php:133 +#: ../../Zotlabs/Module/Connections.php:140 +msgid "Active Connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:143 +msgid "Show active connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:147 #: ../../Zotlabs/Widget/Notifications.php:84 msgid "New Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:136 +#: ../../Zotlabs/Module/Connections.php:150 msgid "Show pending (new) connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:143 -msgid "Show all connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:159 +#: ../../Zotlabs/Module/Connections.php:167 msgid "Only show blocked connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:166 +#: ../../Zotlabs/Module/Connections.php:174 msgid "Only show ignored connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:173 +#: ../../Zotlabs/Module/Connections.php:181 msgid "Only show archived/unreachable connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:180 +#: ../../Zotlabs/Module/Connections.php:188 msgid "Only show hidden connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:241 +#: ../../Zotlabs/Module/Connections.php:203 +msgid "Show all connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:257 msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Connections.php:242 +#: ../../Zotlabs/Module/Connections.php:258 msgid "Archived" msgstr "" -#: ../../Zotlabs/Module/Connections.php:246 +#: ../../Zotlabs/Module/Connections.php:262 msgid "Not connected at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Connections.php:279 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:264 +#: ../../Zotlabs/Module/Connections.php:280 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:266 +#: ../../Zotlabs/Module/Connections.php:282 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:275 +#: ../../Zotlabs/Module/Connections.php:291 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Connections.php:293 msgid "Network" msgstr "" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:296 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:298 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:300 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:286 +#: ../../Zotlabs/Module/Connections.php:302 msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:288 +#: ../../Zotlabs/Module/Connections.php:304 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:289 +#: ../../Zotlabs/Module/Connections.php:305 #: ../../Zotlabs/Module/Connedit.php:630 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connections.php:290 +#: ../../Zotlabs/Module/Connections.php:306 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:315 ../../Zotlabs/Lib/Apps.php:235 +#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235 #: ../../include/text.php:973 msgid "Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:336 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:321 +#: ../../Zotlabs/Module/Connections.php:337 msgid "Connections search" msgstr "" -#: ../../Zotlabs/Module/Connections.php:322 -#: ../../Zotlabs/Module/Directory.php:396 -#: ../../Zotlabs/Module/Directory.php:401 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23 msgid "Find" msgstr "" @@ -4657,12 +4734,8 @@ msgstr "" msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:698 -msgid "Caption (optional):" -msgstr "" - #: ../../Zotlabs/Module/Photos.php:699 -msgid "Description (optional):" +msgid "Description (optional)" msgstr "" #: ../../Zotlabs/Module/Photos.php:785 @@ -4673,6 +4746,10 @@ msgstr "" msgid "Show Oldest First" msgstr "" +#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +msgid "Add Photos" +msgstr "" + #: ../../Zotlabs/Module/Photos.php:892 msgid "Permission denied. Access to this item may be restricted." msgstr "" @@ -4721,10 +4798,6 @@ msgstr "" msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1068 -msgid "Caption" -msgstr "" - #: ../../Zotlabs/Module/Photos.php:1070 msgid "Add a Tag" msgstr "" @@ -4751,12 +4824,12 @@ msgid "Please wait" msgstr "" #: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 -#: ../../Zotlabs/Lib/ThreadItem.php:747 +#: ../../Zotlabs/Lib/ThreadItem.php:749 msgid "This is you" msgstr "" #: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 -#: ../../Zotlabs/Lib/ThreadItem.php:749 ../../include/js_strings.php:6 +#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6 msgid "Comment" msgstr "" @@ -4806,8 +4879,8 @@ msgid "View all" msgstr "" #: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 -#: ../../include/conversation.php:1978 ../../include/channel.php:1540 -#: ../../include/taxonomy.php:597 +#: ../../include/conversation.php:1981 ../../include/channel.php:1539 +#: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -4815,7 +4888,7 @@ msgstr[0] "" msgstr[1] "" #: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 -#: ../../include/conversation.php:1981 +#: ../../include/conversation.php:1984 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -4850,78 +4923,76 @@ msgid "Close" msgstr "" #: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:656 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 msgid "Recent Photos" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:30 +#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135 msgid "Profile Unavailable." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:108 -#: ../../addon/gitwiki/Mod_Gitwiki.php:42 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114 msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/gitwiki/Mod_Gitwiki.php:62 +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114 +#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58 msgid "Invalid channel" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:124 ../../addon/gitwiki/Mod_Gitwiki.php:107 +#: ../../Zotlabs/Module/Wiki.php:124 msgid "Error retrieving wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:131 ../../addon/gitwiki/Mod_Gitwiki.php:114 +#: ../../Zotlabs/Module/Wiki.php:131 msgid "Error creating zip file export folder" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:132 +#: ../../Zotlabs/Module/Wiki.php:182 msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1925 ../../include/nav.php:494 +#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928 +#: ../../include/nav.php:494 msgid "Wikis" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:203 ../../addon/gitwiki/Mod_Gitwiki.php:152 +#: ../../Zotlabs/Module/Wiki.php:203 msgid "Download" msgstr "" #: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256 -#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145 -#: ../../addon/gitwiki/Mod_Gitwiki.php:154 +#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145 msgid "Create New" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:207 ../../addon/gitwiki/Mod_Gitwiki.php:156 +#: ../../Zotlabs/Module/Wiki.php:207 msgid "Wiki name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../addon/gitwiki/Mod_Gitwiki.php:157 +#: ../../Zotlabs/Module/Wiki.php:208 msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 #: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40 -#: ../../include/text.php:1868 +#: ../../include/text.php:1869 msgid "Markdown" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1866 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867 msgid "BBcode" msgstr "" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1869 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870 msgid "Text" msgstr "" #: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284 -#: ../../addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" msgstr "" @@ -4933,7 +5004,7 @@ msgstr "" msgid "Lock content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:219 ../../addon/gitwiki/Mod_Gitwiki.php:166 +#: ../../Zotlabs/Module/Wiki.php:219 msgid "Create a status post for this wiki" msgstr "" @@ -4941,137 +5012,135 @@ msgstr "" msgid "Edit Wiki Name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:262 ../../addon/gitwiki/Mod_Gitwiki.php:185 +#: ../../Zotlabs/Module/Wiki.php:262 msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:286 ../../addon/gitwiki/Mod_Gitwiki.php:210 +#: ../../Zotlabs/Module/Wiki.php:286 msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:305 ../../addon/gitwiki/Mod_Gitwiki.php:214 +#: ../../Zotlabs/Module/Wiki.php:307 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:313 ../../Zotlabs/Module/Wiki.php:315 +#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317 msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:343 ../../addon/gitwiki/Mod_Gitwiki.php:242 +#: ../../Zotlabs/Module/Wiki.php:345 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:344 ../../addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../Zotlabs/Module/Wiki.php:346 msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:351 +#: ../../Zotlabs/Module/Wiki.php:353 msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:358 ../../addon/gitwiki/Mod_Gitwiki.php:252 +#: ../../Zotlabs/Module/Wiki.php:362 msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:260 +#: ../../Zotlabs/Module/Wiki.php:372 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:373 ../../addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1282 +#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:374 ../../addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1385 +#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:376 ../../Zotlabs/Module/Profile_photo.php:465 -#: ../../Zotlabs/Module/Cover_photo.php:366 -#: ../../addon/gitwiki/Mod_Gitwiki.php:268 ../../include/conversation.php:1387 -#: ../../include/conversation.php:1434 +#: ../../Zotlabs/Module/Wiki.php:380 ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Cover_photo.php:367 ../../include/conversation.php:1390 +#: ../../include/conversation.php:1437 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:377 ../../addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1318 +#: ../../Zotlabs/Module/Wiki.php:381 ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:368 ../../include/conversation.php:1320 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:378 ../../addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1319 +#: ../../Zotlabs/Module/Wiki.php:382 ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:369 ../../include/conversation.php:1321 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:379 ../../addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:383 ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:370 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:380 ../../addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1321 +#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:371 ../../include/conversation.php:1323 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:381 ../../addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1322 +#: ../../Zotlabs/Module/Wiki.php:385 ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:372 ../../include/conversation.php:1324 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:382 ../../addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Wiki.php:386 ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:373 ../../include/conversation.php:1325 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:458 ../../addon/gitwiki/Mod_Gitwiki.php:337 +#: ../../Zotlabs/Module/Wiki.php:462 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:465 +#: ../../Zotlabs/Module/Wiki.php:469 msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:478 ../../addon/gitwiki/Mod_Gitwiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:482 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:485 ../../addon/gitwiki/Mod_Gitwiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:489 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:508 +#: ../../Zotlabs/Module/Wiki.php:512 msgid "Error updating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:528 +#: ../../Zotlabs/Module/Wiki.php:532 msgid "Error updating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:547 msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:553 +#: ../../Zotlabs/Module/Wiki.php:557 msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:586 ../../addon/gitwiki/Mod_Gitwiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:590 msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:707 +#: ../../Zotlabs/Module/Wiki.php:711 msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:771 +#: ../../Zotlabs/Module/Wiki.php:775 msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:771 +#: ../../Zotlabs/Module/Wiki.php:775 msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:821 +#: ../../Zotlabs/Module/Wiki.php:825 msgid "You must be authenticated." msgstr "" @@ -5155,7 +5224,7 @@ msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:120 #: ../../Zotlabs/Module/Profile_photo.php:248 -#: ../../include/photo/photo_driver.php:740 +#: ../../include/photo/photo_driver.php:741 msgid "Profile Photos" msgstr "" @@ -5194,12 +5263,12 @@ msgid "Photo not available." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:455 -#: ../../Zotlabs/Module/Cover_photo.php:358 +#: ../../Zotlabs/Module/Cover_photo.php:359 msgid "Upload File:" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:359 +#: ../../Zotlabs/Module/Cover_photo.php:360 msgid "Select a profile:" msgstr "" @@ -5217,28 +5286,28 @@ msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Cover_photo.php:363 #: ../../Zotlabs/Module/Cover_photo.php:364 +#: ../../Zotlabs/Module/Cover_photo.php:365 msgid "Use a photo from your albums" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:369 +#: ../../Zotlabs/Module/Profile_photo.php:473 +#: ../../Zotlabs/Module/Cover_photo.php:376 msgid "Select existing photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:486 -#: ../../Zotlabs/Module/Cover_photo.php:386 +#: ../../Zotlabs/Module/Profile_photo.php:492 +#: ../../Zotlabs/Module/Cover_photo.php:393 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:487 -#: ../../Zotlabs/Module/Cover_photo.php:387 +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:489 -#: ../../Zotlabs/Module/Cover_photo.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:495 +#: ../../Zotlabs/Module/Cover_photo.php:396 msgid "Done Editing" msgstr "" @@ -5254,61 +5323,61 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:476 +#: ../../Zotlabs/Module/Item.php:477 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:867 +#: ../../Zotlabs/Module/Item.php:874 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1012 +#: ../../Zotlabs/Module/Item.php:1019 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1048 +#: ../../Zotlabs/Module/Item.php:1055 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1153 +#: ../../Zotlabs/Module/Item.php:1160 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1182 +#: ../../Zotlabs/Module/Item.php:1189 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1189 +#: ../../Zotlabs/Module/Item.php:1196 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Ping.php:320 +#: ../../Zotlabs/Module/Ping.php:330 msgid "sent you a private message" msgstr "" -#: ../../Zotlabs/Module/Ping.php:372 +#: ../../Zotlabs/Module/Ping.php:383 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:396 +#: ../../Zotlabs/Module/Ping.php:407 msgid "requires approval" msgstr "" -#: ../../Zotlabs/Module/Ping.php:406 +#: ../../Zotlabs/Module/Ping.php:417 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Module/Ping.php:424 +#: ../../Zotlabs/Module/Ping.php:435 msgid "[today]" msgstr "" -#: ../../Zotlabs/Module/Ping.php:433 +#: ../../Zotlabs/Module/Ping.php:444 msgid "posted an event" msgstr "" -#: ../../Zotlabs/Module/Ping.php:466 +#: ../../Zotlabs/Module/Ping.php:477 msgid "shared a file with you" msgstr "" @@ -5317,7 +5386,8 @@ msgid "Invalid item." msgstr "" #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Display.php:133 +#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158 +#: ../../Zotlabs/Module/Display.php:175 #: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167 #: ../../include/help.php:81 msgid "Page not found." @@ -5398,7 +5468,7 @@ msgstr "" msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:615 +#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042 msgid "Recent Activity" msgstr "" @@ -5542,11 +5612,11 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238 -#: ../../Zotlabs/Widget/Settings_menu.php:109 +#: ../../Zotlabs/Widget/Settings_menu.php:117 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4164 +#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214 #, php-format msgid "Connection: %s" msgstr "" @@ -5681,13 +5751,13 @@ msgid "Bookmark this room" msgstr "" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1313 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315 msgid "Please enter a link URL:" msgstr "" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:764 -#: ../../include/conversation.php:1432 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766 +#: ../../include/conversation.php:1435 msgid "Encrypt text" msgstr "" @@ -5721,12 +5791,12 @@ msgid "min" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1831 ../../include/nav.php:401 +#: ../../include/conversation.php:1834 ../../include/nav.php:401 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1839 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842 #: ../../include/nav.php:409 msgid "Files" msgstr "" @@ -5767,7 +5837,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2403 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 msgid "Menus" msgstr "" @@ -5819,7 +5889,7 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2404 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 msgid "Layouts" msgstr "" @@ -5841,11 +5911,11 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:114 +#: ../../Zotlabs/Module/Cloud.php:120 msgid "Please refresh page" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:117 +#: ../../Zotlabs/Module/Cloud.php:123 msgid "Unknown error" msgstr "" @@ -5879,16 +5949,16 @@ msgid "Post not found." msgstr "" #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 -#: ../../include/bbcode.php:339 +#: ../../include/bbcode.php:352 msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2012 +#: ../../include/text.php:2013 msgid "comment" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:117 +#: ../../Zotlabs/Module/Tagger.php:119 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -5923,6 +5993,23 @@ msgid "" "channel type and privacy settings." msgstr "" +#: ../../Zotlabs/Module/Authorize.php:17 +msgid "Unknown App" +msgstr "" + +#: ../../Zotlabs/Module/Authorize.php:22 +msgid "Authorize" +msgstr "" + +#: ../../Zotlabs/Module/Authorize.php:23 +#, php-format +msgid "Do you authorize the app %s to access your channel data?" +msgstr "" + +#: ../../Zotlabs/Module/Authorize.php:25 +msgid "Allow" +msgstr "" + #: ../../Zotlabs/Module/Group.php:24 msgid "Privacy group created." msgstr "" @@ -5932,7 +6019,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:4131 +#: ../../include/items.php:4181 msgid "Privacy group not found." msgstr "" @@ -6013,15 +6100,15 @@ msgstr "" msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772 msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773 msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780 msgid "Work/Employment" msgstr "" @@ -6058,198 +6145,198 @@ msgstr "" msgid "Hide your connections list from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1320 +#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824 +#: ../../include/channel.php:1319 msgid "Edit visibility" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:726 msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:727 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1290 +#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289 msgid "Change profile photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:729 msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:732 msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1705 +#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708 msgid "Personal" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Relation" +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Relationship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53 +#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44 #: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "This is your default profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Title/Description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:753 msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:763 msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:767 #: ../../addon/openid/MysqlProvider.php:68 msgid "Homepage URL" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:775 msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:776 msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1316 +#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1297 +#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 #: ../../include/nav.php:117 msgid "Edit Profiles" msgstr "" @@ -6283,11 +6370,11 @@ msgstr "" msgid "Edit your default profile" msgstr "" -#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43 +#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34 msgid "View friend suggestions" msgstr "" -#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42 +#: ../../Zotlabs/Module/Go.php:39 msgid "View the channel directory" msgstr "" @@ -6364,9 +6451,9 @@ msgstr "" msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890 -#: ../../include/features.php:114 ../../include/nav.php:458 +#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893 +#: ../../include/features.php:123 ../../include/nav.php:458 msgid "Cards" msgstr "" @@ -6458,7 +6545,7 @@ msgid "Export selected" msgstr "" #: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244 -#: ../../include/conversation.php:1912 ../../include/nav.php:481 +#: ../../include/conversation.php:1915 ../../include/nav.php:481 msgid "Webpages" msgstr "" @@ -6531,7 +6618,7 @@ msgstr "" msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:178 +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144 msgid "Edit post" msgstr "" @@ -6619,7 +6706,7 @@ msgid "Change profile photo" msgstr "" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 msgid "Channel Sources" msgstr "" @@ -6702,165 +6789,169 @@ msgstr "" msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:436 ../../addon/diaspora/Receiver.php:1547 -#: ../../addon/pubcrawl/as.php:1394 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 +#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:438 ../../addon/pubcrawl/as.php:1396 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:440 +#: ../../Zotlabs/Module/Like.php:442 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:442 +#: ../../Zotlabs/Module/Like.php:444 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:444 +#: ../../Zotlabs/Module/Like.php:446 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:446 ../../addon/diaspora/Receiver.php:2031 +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2033 +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2035 +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:562 +#: ../../Zotlabs/Module/Like.php:564 msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Like.php:563 +#: ../../Zotlabs/Module/Like.php:565 msgid "Thank you." msgstr "" -#: ../../Zotlabs/Module/Directory.php:250 +#: ../../Zotlabs/Module/Directory.php:106 +msgid "No default suggestions were found." +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:255 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Directory.php:261 +#: ../../Zotlabs/Module/Directory.php:266 msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:263 +#: ../../Zotlabs/Module/Directory.php:268 msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:265 +#: ../../Zotlabs/Module/Directory.php:270 msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1565 +#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1392 +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391 #: ../../include/event.php:54 ../../include/event.php:86 msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:325 +#: ../../Zotlabs/Module/Directory.php:330 msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1581 +#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1589 +#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599 msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:333 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1052 ../../include/channel.php:1377 -#: ../../include/connections.php:111 +#: ../../include/conversation.php:1052 ../../include/channel.php:1376 +#: ../../include/connections.php:110 msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Directory.php:334 +#: ../../Zotlabs/Module/Directory.php:339 msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:337 +#: ../../Zotlabs/Module/Directory.php:342 msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:340 +#: ../../Zotlabs/Module/Directory.php:345 msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:342 +#: ../../Zotlabs/Module/Directory.php:347 msgid "Common connections (estimated):" msgstr "" -#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:402 msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:400 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:403 +#: ../../Zotlabs/Module/Directory.php:408 msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:404 +#: ../../Zotlabs/Module/Directory.php:409 msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:405 +#: ../../Zotlabs/Module/Directory.php:410 msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:406 +#: ../../Zotlabs/Module/Directory.php:411 msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:407 +#: ../../Zotlabs/Module/Directory.php:412 msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:424 +#: ../../Zotlabs/Module/Directory.php:429 msgid "No entries (some entries may be hidden)." msgstr "" @@ -6943,7 +7034,7 @@ msgid "Subject:" msgstr "" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1382 +#: ../../include/conversation.php:1385 msgid "Attach file" msgstr "" @@ -6952,7 +7043,7 @@ msgid "Send" msgstr "" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1430 msgid "Set expiration date" msgstr "" @@ -7173,7 +7264,7 @@ msgstr "" msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563 +#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570 #: ../../include/nav.php:164 msgid "Register" msgstr "" @@ -7189,34 +7280,34 @@ msgstr "" msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4508 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4509 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4510 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4511 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4513 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2059 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070 msgid "cover photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:360 +#: ../../Zotlabs/Module/Cover_photo.php:361 msgid "Change Cover Photo" msgstr "" @@ -7224,7 +7315,7 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1821 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824 #: ../../include/nav.php:391 msgid "About" msgstr "" @@ -7249,11 +7340,11 @@ msgstr "" msgid "Contents" msgstr "" -#: ../../Zotlabs/Module/Display.php:351 +#: ../../Zotlabs/Module/Display.php:394 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:403 +#: ../../Zotlabs/Module/Display.php:446 msgid "Item has been removed." msgstr "" @@ -7285,19 +7376,19 @@ msgstr "" msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:230 +#: ../../Zotlabs/Module/Network.php:229 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:240 +#: ../../Zotlabs/Module/Network.php:238 msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Network.php:268 +#: ../../Zotlabs/Module/Network.php:265 msgid "Invalid connection." msgstr "" -#: ../../Zotlabs/Module/Network.php:289 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "" @@ -7498,7 +7589,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1591 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598 msgid "Password Reset" msgstr "" @@ -7596,11 +7687,11 @@ msgstr "" msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390 +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1582 ../../include/nav.php:126 +#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589 ../../include/nav.php:126 #: ../../include/nav.php:130 msgid "Login" msgstr "" @@ -7609,8 +7700,8 @@ msgstr "" msgid "Activity" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928 -#: ../../include/features.php:87 ../../include/nav.php:497 +#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931 +#: ../../include/features.php:96 ../../include/nav.php:497 msgid "Wiki" msgstr "" @@ -7618,8 +7709,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1850 -#: ../../include/conversation.php:1853 +#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853 +#: ../../include/conversation.php:1856 msgid "Events" msgstr "" @@ -7776,9 +7867,8 @@ msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:597 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:706 -#: ../../include/bbcode.php:865 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744 +#: ../../include/bbcode.php:914 msgid "Different viewers will see this text differently" msgstr "" @@ -7900,60 +7990,60 @@ msgstr "" msgid "To stop receiving these messages, please adjust your %s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:120 +#: ../../Zotlabs/Lib/Enotify.php:123 #, php-format msgid "%s <!item_type!>" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:124 +#: ../../Zotlabs/Lib/Enotify.php:127 #, php-format msgid "[$Projectname:Notify] New mail received at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:126 +#: ../../Zotlabs/Lib/Enotify.php:129 #, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." +msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:130 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:130 msgid "a private message" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:128 +#: ../../Zotlabs/Lib/Enotify.php:131 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:141 +#: ../../Zotlabs/Lib/Enotify.php:144 msgid "commented on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:152 +#: ../../Zotlabs/Lib/Enotify.php:155 msgid "liked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:155 +#: ../../Zotlabs/Lib/Enotify.php:158 msgid "disliked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:198 +#: ../../Zotlabs/Lib/Enotify.php:201 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:207 +#: ../../Zotlabs/Lib/Enotify.php:209 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:217 +#: ../../Zotlabs/Lib/Enotify.php:218 #, php-format -msgid "%1$s, %2$s %3$s [zrl=%4$s]your %5$s[/zrl]" +msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "" #: ../../Zotlabs/Lib/Enotify.php:230 @@ -7968,12 +8058,12 @@ msgstr "" #: ../../Zotlabs/Lib/Enotify.php:233 #, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." +msgid "%1$s commented on an item/conversation you have been following." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:318 -#: ../../Zotlabs/Lib/Enotify.php:335 ../../Zotlabs/Lib/Enotify.php:361 -#: ../../Zotlabs/Lib/Enotify.php:379 ../../Zotlabs/Lib/Enotify.php:393 +#: ../../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 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" @@ -7985,151 +8075,149 @@ msgstr "" #: ../../Zotlabs/Lib/Enotify.php:299 #, php-format -msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]" +msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:313 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:315 +#: ../../Zotlabs/Lib/Enotify.php:314 #, php-format -msgid "%1$s, %2$s liked an item/conversation you created." +msgid "%1$s liked an item/conversation you created." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:326 +#: ../../Zotlabs/Lib/Enotify.php:325 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:328 +#: ../../Zotlabs/Lib/Enotify.php:327 #, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" +msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:330 +#: ../../Zotlabs/Lib/Enotify.php:329 #, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:354 +#: ../../Zotlabs/Lib/Enotify.php:352 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:355 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format -msgid "%1$s, %2$s tagged you at %3$s" +msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:356 +#: ../../Zotlabs/Lib/Enotify.php:354 #, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:368 +#: ../../Zotlabs/Lib/Enotify.php:365 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:369 +#: ../../Zotlabs/Lib/Enotify.php:366 #, php-format -msgid "%1$s, %2$s poked you at %3$s" +msgid "%1$s poked you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:370 +#: ../../Zotlabs/Lib/Enotify.php:367 #, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:386 +#: ../../Zotlabs/Lib/Enotify.php:382 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:387 +#: ../../Zotlabs/Lib/Enotify.php:383 #, php-format -msgid "%1$s, %2$s tagged your post at %3$s" +msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:388 +#: ../../Zotlabs/Lib/Enotify.php:384 #, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:400 +#: ../../Zotlabs/Lib/Enotify.php:395 msgid "[$Projectname:Notify] Introduction received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:401 +#: ../../Zotlabs/Lib/Enotify.php:396 #, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:402 +#: ../../Zotlabs/Lib/Enotify.php:397 #, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:425 +#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:408 +#: ../../Zotlabs/Lib/Enotify.php:402 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:415 +#: ../../Zotlabs/Lib/Enotify.php:409 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:416 +#: ../../Zotlabs/Lib/Enotify.php:410 #, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:417 +#: ../../Zotlabs/Lib/Enotify.php:411 #, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:423 +#: ../../Zotlabs/Lib/Enotify.php:416 msgid "Name:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:424 +#: ../../Zotlabs/Lib/Enotify.php:417 msgid "Photo:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:427 +#: ../../Zotlabs/Lib/Enotify.php:420 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:647 +#: ../../Zotlabs/Lib/Enotify.php:640 msgid "[$Projectname:Notify]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:815 +#: ../../Zotlabs/Lib/Enotify.php:808 msgid "created a new post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:816 +#: ../../Zotlabs/Lib/Enotify.php:809 #, php-format msgid "commented on %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:823 +#: ../../Zotlabs/Lib/Enotify.php:816 #, php-format msgid "edited a post dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:827 +#: ../../Zotlabs/Lib/Enotify.php:820 #, php-format msgid "edited a comment dated %s" msgstr "" @@ -8138,7 +8226,7 @@ msgstr "" msgid "Wiki updated successfully" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:198 +#: ../../Zotlabs/Lib/NativeWiki.php:205 msgid "Wiki files deleted successfully" msgstr "" @@ -8212,11 +8300,11 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:510 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:511 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 msgid "dislike" msgstr "" @@ -8309,51 +8397,51 @@ msgstr "" msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/conversation.php:1377 +#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:752 ../../include/conversation.php:1378 +#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1379 +#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1380 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1381 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:756 +#: ../../Zotlabs/Lib/ThreadItem.php:758 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:757 +#: ../../Zotlabs/Lib/ThreadItem.php:759 msgid "Attach File" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:758 +#: ../../Zotlabs/Lib/ThreadItem.php:760 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:759 +#: ../../Zotlabs/Lib/ThreadItem.php:761 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:769 +#: ../../Zotlabs/Lib/ThreadItem.php:771 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:770 +#: ../../Zotlabs/Lib/ThreadItem.php:772 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../Zotlabs/Lib/ThreadItem.php:773 msgid "Your website URL (optional)" msgstr "" @@ -8373,7 +8461,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2821 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 msgid "Collection" msgstr "" @@ -8406,6 +8494,10 @@ msgstr "" msgid "Shared" msgstr "" +#: ../../Zotlabs/Storage/Browser.php:277 +msgid "Add Files" +msgstr "" + #: ../../Zotlabs/Storage/Browser.php:353 #, php-format msgid "You are using %1$s of your available file storage." @@ -8513,10 +8605,10 @@ msgid "Select an addressbook to import to" msgstr "" #: ../../Zotlabs/Widget/Appcategories.php:40 -#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97 -#: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186 -#: ../../include/taxonomy.php:344 ../../include/taxonomy.php:426 -#: ../../include/taxonomy.php:446 ../../include/taxonomy.php:467 +#: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 +#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 msgid "Categories" msgstr "" @@ -8571,7 +8663,7 @@ msgid "New Message" msgstr "" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1864 ../../include/conversation.php:1867 +#: ../../include/conversation.php:1867 ../../include/conversation.php:1870 #: ../../include/nav.php:434 ../../include/nav.php:437 msgid "Chatrooms" msgstr "" @@ -8614,7 +8706,7 @@ msgstr "" msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95 +#: ../../Zotlabs/Widget/Wiki_list.php:15 msgid "Wiki List" msgstr "" @@ -8654,7 +8746,7 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381 msgid "Saved Searches" msgstr "" @@ -8667,15 +8759,15 @@ msgid "Notes" msgstr "" #: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81 +#: ../../Zotlabs/Widget/Wiki_pages.php:89 msgid "Add new page" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76 +#: ../../Zotlabs/Widget/Wiki_pages.php:83 msgid "Wiki Pages" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82 +#: ../../Zotlabs/Widget/Wiki_pages.php:94 msgid "Page name" msgstr "" @@ -8696,7 +8788,7 @@ msgid "See more..." msgstr "" #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:443 +#: ../../include/features.php:470 msgid "Saved Folders" msgstr "" @@ -8704,51 +8796,60 @@ msgstr "" msgid "Click to show more" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:33 +#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470 +msgid "Tags" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:24 msgid "Profile Creation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:35 +#: ../../Zotlabs/Widget/Newmember.php:26 msgid "Upload profile photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:36 +#: ../../Zotlabs/Widget/Newmember.php:27 msgid "Upload cover photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119 msgid "Edit your profile" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:40 +#: ../../Zotlabs/Widget/Newmember.php:31 msgid "Find and Connect with others" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:44 +#: ../../Zotlabs/Widget/Newmember.php:33 +msgid "View the directory" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:35 msgid "Manage your connections" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:47 +#: ../../Zotlabs/Widget/Newmember.php:38 msgid "Communicate" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:49 +#: ../../Zotlabs/Widget/Newmember.php:40 msgid "View your channel homepage" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:50 +#: ../../Zotlabs/Widget/Newmember.php:41 msgid "View your network stream" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:56 +#: ../../Zotlabs/Widget/Newmember.php:47 msgid "Documentation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:67 -msgid "View public stream. Warning: not moderated" +#: ../../Zotlabs/Widget/Newmember.php:58 +msgid "View public stream" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:71 +#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60 msgid "New Member Links" msgstr "" @@ -8801,14 +8902,18 @@ msgid "Export channel" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:84 -msgid "Connected apps" +msgid "OAuth1 apps" +msgstr "" + +#: ../../Zotlabs/Widget/Settings_menu.php:92 +msgid "OAuth2 apps" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231 +#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 msgid "Permission Groups" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:117 +#: ../../Zotlabs/Widget/Settings_menu.php:125 msgid "Premium Channel Settings" msgstr "" @@ -8946,53 +9051,57 @@ msgstr "" msgid "Source channel not found." msgstr "" -#: ../../boot.php:1562 +#: ../../boot.php:1569 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1581 ../../include/nav.php:111 ../../include/nav.php:140 +#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140 #: ../../include/nav.php:159 msgid "Logout" msgstr "" -#: ../../boot.php:1585 +#: ../../boot.php:1592 msgid "Login/Email" msgstr "" -#: ../../boot.php:1586 +#: ../../boot.php:1593 msgid "Password" msgstr "" -#: ../../boot.php:1587 +#: ../../boot.php:1594 msgid "Remember me" msgstr "" -#: ../../boot.php:1590 +#: ../../boot.php:1597 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2347 +#: ../../boot.php:2354 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2352 +#: ../../boot.php:2359 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2468 +#: ../../boot.php:2475 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2473 +#: ../../boot.php:2480 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2474 ../../include/datetime.php:232 +#: ../../boot.php:2481 ../../include/datetime.php:238 msgid "never" msgstr "" +#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:123 +msgid "Cover Photo" +msgstr "" + #: ../../view/theme/redbasic_c/php/config.php:16 #: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 @@ -9234,6 +9343,10 @@ msgid "" "share their own locations with the group." msgstr "" +#: ../../addon/rendezvous/rendezvous.php:232 +msgid "You have no rendezvous. Press the button above to create a rendezvous!" +msgstr "" + #: ../../addon/skeleton/skeleton.php:59 msgid "Some setting" msgstr "" @@ -9246,30 +9359,30 @@ msgstr "" msgid "Skeleton Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:247 +#: ../../addon/gnusoc/gnusoc.php:249 msgid "GNU-Social Protocol Settings updated." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:266 +#: ../../addon/gnusoc/gnusoc.php:268 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:269 +#: ../../addon/gnusoc/gnusoc.php:271 msgid "Enable the GNU-Social protocol for this channel" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:273 +#: ../../addon/gnusoc/gnusoc.php:275 msgid "GNU-Social Protocol Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:464 +#: ../../addon/gnusoc/gnusoc.php:471 msgid "Follow" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:467 +#: ../../addon/gnusoc/gnusoc.php:474 #, php-format msgid "%1$s is now following %2$s" msgstr "" @@ -9315,7 +9428,7 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1301 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 #: ../../include/nav.php:119 msgid "Edit Profile" msgstr "" @@ -9804,17 +9917,17 @@ msgstr "" msgid "OpenID protocol error. No ID returned." msgstr "" -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:290 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300 msgid "Login failed." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1481 +#: ../../include/selectors.php:66 ../../include/channel.php:1480 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1479 +#: ../../include/selectors.php:66 ../../include/channel.php:1478 msgid "Female" msgstr "" @@ -10001,38 +10114,38 @@ msgstr "" msgid "declared undying love for" msgstr "" -#: ../../addon/diaspora/diaspora.php:778 +#: ../../addon/diaspora/diaspora.php:781 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../addon/diaspora/diaspora.php:797 +#: ../../addon/diaspora/diaspora.php:800 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/diaspora/diaspora.php:800 +#: ../../addon/diaspora/diaspora.php:803 msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../addon/diaspora/diaspora.php:804 +#: ../../addon/diaspora/diaspora.php:807 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../addon/diaspora/diaspora.php:808 +#: ../../addon/diaspora/diaspora.php:811 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/diaspora.php:812 +#: ../../addon/diaspora/diaspora.php:815 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/diaspora.php:817 +#: ../../addon/diaspora/diaspora.php:820 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/diaspora.php:822 +#: ../../addon/diaspora/diaspora.php:825 msgid "Diaspora Protocol Settings" msgstr "" @@ -10040,7 +10153,7 @@ msgstr "" msgid "No username found in import file." msgstr "" -#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62 +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67 msgid "Unable to create a unique channel address. Import failed." msgstr "" @@ -10335,6 +10448,32 @@ msgstr "" msgid "text to include in all outgoing posts from this site" msgstr "" +#: ../../addon/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "" + +#: ../../addon/fuzzloc/fuzzloc.php:175 +msgid "" +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "" + +#: ../../addon/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "" + +#: ../../addon/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "" + +#: ../../addon/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "" + +#: ../../addon/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "" + #: ../../addon/rtof/rtof.php:45 msgid "Post to Friendica" msgstr "" @@ -10371,8 +10510,8 @@ msgstr "" msgid "Hubzilla to Friendica Post Settings" msgstr "" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1397 -#: ../../include/channel.php:1568 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1396 +#: ../../include/channel.php:1567 msgid "Status:" msgstr "" @@ -10434,7 +10573,7 @@ msgid "No channels currently blocked" msgstr "" #: ../../addon/superblock/superblock.php:120 -msgid "\"Superblock\" Settings" +msgid "Superblock Settings" msgstr "" #: ../../addon/superblock/superblock.php:345 @@ -10517,55 +10656,55 @@ msgstr "" msgid "Number of logfiles to retain" msgstr "" -#: ../../addon/frphotos/frphotos.php:91 +#: ../../addon/frphotos/frphotos.php:92 msgid "Friendica Photo Album Import" msgstr "" -#: ../../addon/frphotos/frphotos.php:92 +#: ../../addon/frphotos/frphotos.php:93 msgid "This will import all your Friendica photo albums to this Red channel." msgstr "" -#: ../../addon/frphotos/frphotos.php:93 +#: ../../addon/frphotos/frphotos.php:94 msgid "Friendica Server base URL" msgstr "" -#: ../../addon/frphotos/frphotos.php:94 +#: ../../addon/frphotos/frphotos.php:95 msgid "Friendica Login Username" msgstr "" -#: ../../addon/frphotos/frphotos.php:95 +#: ../../addon/frphotos/frphotos.php:96 msgid "Friendica Login Password" msgstr "" -#: ../../addon/pubcrawl/as.php:1101 ../../addon/pubcrawl/as.php:1228 -#: ../../addon/pubcrawl/as.php:1403 ../../include/network.php:1774 +#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 +#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1034 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings updated." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1043 +#: ../../addon/pubcrawl/pubcrawl.php:1062 msgid "" "The ActivityPub protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1046 +#: ../../addon/pubcrawl/pubcrawl.php:1065 msgid "Enable the ActivityPub protocol for this channel" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Send multi-media HTML articles" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Not supported by some microblog services such as Mastodon" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/pubcrawl/pubcrawl.php:1072 msgid "ActivityPub Protocol Settings" msgstr "" @@ -10954,7 +11093,7 @@ msgstr "" msgid "Error creating new game." msgstr "" -#: ../../addon/chess/chess.php:486 ../../include/channel.php:1152 +#: ../../addon/chess/chess.php:486 ../../include/channel.php:1151 msgid "Requested channel is not available." msgstr "" @@ -11008,8 +11147,8 @@ msgstr "" #: ../../addon/twitter/twitter.php:243 msgid "" -"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " -"E7b13b11 ..." +"If enabled your public postings can be posted to the associated Twitter " +"account" msgstr "" #: ../../addon/twitter/twitter.php:247 @@ -11046,6 +11185,78 @@ msgstr "" msgid "Smileybutton Settings" msgstr "" +#: ../../addon/cart/myshop.php:138 +msgid "Order Not Found" +msgstr "" + +#: ../../addon/cart/cart.php:810 +msgid "Order cannot be checked out." +msgstr "" + +#: ../../addon/cart/cart.php:1073 +msgid "Enable Shopping Cart" +msgstr "" + +#: ../../addon/cart/cart.php:1080 +msgid "Enable Test Catalog" +msgstr "" + +#: ../../addon/cart/cart.php:1088 +msgid "Enable Manual Payments" +msgstr "" + +#: ../../addon/cart/cart.php:1103 +msgid "Base Cart Settings" +msgstr "" + +#: ../../addon/cart/cart.php:1151 +msgid "Add Item" +msgstr "" + +#: ../../addon/cart/cart.php:1165 +msgid "Call cart_post_" +msgstr "" + +#: ../../addon/cart/cart.php:1195 +msgid "Cart Not Enabled (profile: " +msgstr "" + +#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36 +msgid "Order not found." +msgstr "" + +#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389 +msgid "No Order Found" +msgstr "" + +#: ../../addon/cart/cart.php:1270 +msgid "call: " +msgstr "" + +#: ../../addon/cart/cart.php:1273 +msgid "An unknown error has occurred Please start again." +msgstr "" + +#: ../../addon/cart/cart.php:1414 +msgid "Invalid Payment Type. Please start again." +msgstr "" + +#: ../../addon/cart/cart.php:1421 +msgid "Order not found" +msgstr "" + +#: ../../addon/cart/manual_payments.php:9 +msgid "Error: order mismatch. Please try again." +msgstr "" + +#: ../../addon/cart/manual_payments.php:29 +msgid "Manual payments are not enabled." +msgstr "" + +#: ../../addon/cart/manual_payments.php:44 +msgid "Finished" +msgstr "" + #: ../../addon/piwik/piwik.php:85 msgid "" "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> " @@ -11090,157 +11301,157 @@ msgstr "" msgid "This feature requires Piwik >= 2.2.0" msgstr "" -#: ../../addon/tour/tour.php:75 +#: ../../addon/tour/tour.php:76 msgid "Edit your profile and change settings." msgstr "" -#: ../../addon/tour/tour.php:76 +#: ../../addon/tour/tour.php:77 msgid "Click here to see activity from your connections." msgstr "" -#: ../../addon/tour/tour.php:77 +#: ../../addon/tour/tour.php:78 msgid "Click here to see your channel home." msgstr "" -#: ../../addon/tour/tour.php:78 +#: ../../addon/tour/tour.php:79 msgid "You can access your private messages from here." msgstr "" -#: ../../addon/tour/tour.php:79 +#: ../../addon/tour/tour.php:80 msgid "Create new events here." msgstr "" -#: ../../addon/tour/tour.php:80 +#: ../../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:81 +#: ../../addon/tour/tour.php:82 msgid "System notifications will arrive here" msgstr "" -#: ../../addon/tour/tour.php:82 +#: ../../addon/tour/tour.php:83 msgid "Search for content and users" msgstr "" -#: ../../addon/tour/tour.php:83 +#: ../../addon/tour/tour.php:84 msgid "Browse for new contacts" msgstr "" -#: ../../addon/tour/tour.php:84 +#: ../../addon/tour/tour.php:85 msgid "Launch installed apps" msgstr "" -#: ../../addon/tour/tour.php:85 +#: ../../addon/tour/tour.php:86 msgid "Looking for help? Click here." msgstr "" -#: ../../addon/tour/tour.php:86 +#: ../../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:87 +#: ../../addon/tour/tour.php:88 msgid "You have received a new private message. Click here to see from who!" msgstr "" -#: ../../addon/tour/tour.php:88 +#: ../../addon/tour/tour.php:89 msgid "There are events this week. Click here too see which!" msgstr "" -#: ../../addon/tour/tour.php:89 +#: ../../addon/tour/tour.php:90 msgid "You have received a new introduction. Click here to see who!" msgstr "" -#: ../../addon/tour/tour.php:90 +#: ../../addon/tour/tour.php:91 msgid "" "There is a new system notification. Click here to see what has happened!" msgstr "" -#: ../../addon/tour/tour.php:93 +#: ../../addon/tour/tour.php:94 msgid "Click here to share text, images, videos and sound." msgstr "" -#: ../../addon/tour/tour.php:94 +#: ../../addon/tour/tour.php:95 msgid "You can write an optional title for your update (good for long posts)." msgstr "" -#: ../../addon/tour/tour.php:95 +#: ../../addon/tour/tour.php:96 msgid "Entering some categories here makes it easier to find your post later." msgstr "" -#: ../../addon/tour/tour.php:96 +#: ../../addon/tour/tour.php:97 msgid "Share photos, links, location, etc." msgstr "" -#: ../../addon/tour/tour.php:97 +#: ../../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:98 +#: ../../addon/tour/tour.php:99 msgid "You can password protect content." msgstr "" -#: ../../addon/tour/tour.php:99 +#: ../../addon/tour/tour.php:100 msgid "Choose who you share with." msgstr "" -#: ../../addon/tour/tour.php:101 +#: ../../addon/tour/tour.php:102 msgid "Click here when you are done." msgstr "" -#: ../../addon/tour/tour.php:104 +#: ../../addon/tour/tour.php:105 msgid "Adjust from which channels posts should be displayed." msgstr "" -#: ../../addon/tour/tour.php:105 +#: ../../addon/tour/tour.php:106 msgid "Only show posts from channels in the specified privacy group." msgstr "" -#: ../../addon/tour/tour.php:109 +#: ../../addon/tour/tour.php:110 msgid "" "Easily find posts containing tags (keywords preceded by the \"#\" symbol)." msgstr "" -#: ../../addon/tour/tour.php:110 +#: ../../addon/tour/tour.php:111 msgid "Easily find posts in given category." msgstr "" -#: ../../addon/tour/tour.php:111 +#: ../../addon/tour/tour.php:112 msgid "Easily find posts by date." msgstr "" -#: ../../addon/tour/tour.php:112 +#: ../../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:113 +#: ../../addon/tour/tour.php:114 msgid "Here you see channels you have connected to." msgstr "" -#: ../../addon/tour/tour.php:114 +#: ../../addon/tour/tour.php:115 msgid "Save your search so you can repeat it at a later date." msgstr "" -#: ../../addon/tour/tour.php:117 +#: ../../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:118 +#: ../../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:125 +#: ../../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, " @@ -11639,11 +11850,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1485 +#: ../../include/selectors.php:49 ../../include/channel.php:1484 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1487 +#: ../../include/selectors.php:49 ../../include/channel.php:1486 msgid "Non-specific" msgstr "" @@ -11889,10 +12100,6 @@ msgstr "" msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1042 -msgid "Activity/Posts" -msgstr "" - #: ../../include/conversation.php:1062 msgid "Edit Connection" msgstr "" @@ -11954,175 +12161,175 @@ msgstr "" msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1314 +#: ../../include/conversation.php:1316 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1315 +#: ../../include/conversation.php:1317 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1320 +#: ../../include/conversation.php:1322 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1324 +#: ../../include/conversation.php:1326 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1325 +#: ../../include/conversation.php:1327 msgid "Comments disabled" msgstr "" -#: ../../include/conversation.php:1372 +#: ../../include/conversation.php:1375 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1378 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1389 +#: ../../include/conversation.php:1392 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1392 +#: ../../include/conversation.php:1395 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1393 +#: ../../include/conversation.php:1396 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1401 +#: ../../include/conversation.php:1404 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1424 +#: ../../include/conversation.php:1427 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1430 +#: ../../include/conversation.php:1433 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1690 +#: ../../include/conversation.php:1693 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1693 +#: ../../include/conversation.php:1696 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1697 +#: ../../include/conversation.php:1700 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1703 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1708 +#: ../../include/conversation.php:1711 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1717 +#: ../../include/conversation.php:1720 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1723 +#: ../../include/conversation.php:1726 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1726 +#: ../../include/conversation.php:1729 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1733 +#: ../../include/conversation.php:1736 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1736 +#: ../../include/conversation.php:1739 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1811 ../../include/nav.php:381 +#: ../../include/conversation.php:1814 ../../include/nav.php:381 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1824 ../../include/nav.php:394 +#: ../../include/conversation.php:1827 ../../include/nav.php:394 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1834 ../../include/nav.php:404 -#: ../../include/photos.php:655 +#: ../../include/conversation.php:1837 ../../include/nav.php:404 +#: ../../include/photos.php:666 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1842 ../../include/nav.php:412 +#: ../../include/conversation.php:1845 ../../include/nav.php:412 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1879 ../../include/nav.php:447 +#: ../../include/conversation.php:1882 ../../include/nav.php:447 msgid "Bookmarks" msgstr "" -#: ../../include/conversation.php:1882 ../../include/nav.php:450 +#: ../../include/conversation.php:1885 ../../include/nav.php:450 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1893 ../../include/nav.php:461 +#: ../../include/conversation.php:1896 ../../include/nav.php:461 msgid "View Cards" msgstr "" -#: ../../include/conversation.php:1901 +#: ../../include/conversation.php:1904 msgid "articles" msgstr "" -#: ../../include/conversation.php:1904 ../../include/nav.php:472 +#: ../../include/conversation.php:1907 ../../include/nav.php:472 msgid "View Articles" msgstr "" -#: ../../include/conversation.php:1915 ../../include/nav.php:484 +#: ../../include/conversation.php:1918 ../../include/nav.php:484 msgid "View Webpages" msgstr "" -#: ../../include/conversation.php:1984 +#: ../../include/conversation.php:1987 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1987 +#: ../../include/conversation.php:1990 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1990 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1993 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1996 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1999 +#: ../../include/conversation.php:2002 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -12150,12 +12357,16 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/import.php:41 +#: ../../include/import.php:25 +msgid "Unable to import a removed channel." +msgstr "" + +#: ../../include/import.php:46 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/import.php:106 +#: ../../include/import.php:111 msgid "Cloned channel not found. Import failed." msgstr "" @@ -12400,7 +12611,7 @@ msgstr "" msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1434 ../../include/feedutils.php:852 +#: ../../include/text.php:1434 ../../include/feedutils.php:860 msgid "unknown" msgstr "" @@ -12416,107 +12627,107 @@ msgstr "" msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1848 ../../include/language.php:397 +#: ../../include/text.php:1849 ../../include/language.php:397 msgid "default" msgstr "" -#: ../../include/text.php:1856 +#: ../../include/text.php:1857 msgid "Page layout" msgstr "" -#: ../../include/text.php:1856 +#: ../../include/text.php:1857 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1867 +#: ../../include/text.php:1868 msgid "HTML" msgstr "" -#: ../../include/text.php:1870 +#: ../../include/text.php:1871 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:1875 +#: ../../include/text.php:1876 msgid "PHP" msgstr "" -#: ../../include/text.php:1884 +#: ../../include/text.php:1885 msgid "Page content type" msgstr "" -#: ../../include/text.php:2017 +#: ../../include/text.php:2018 msgid "activity" msgstr "" -#: ../../include/text.php:2099 +#: ../../include/text.php:2100 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2399 +#: ../../include/text.php:2419 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2405 +#: ../../include/text.php:2425 msgid "Pages" msgstr "" -#: ../../include/text.php:2427 +#: ../../include/text.php:2447 msgid "Import website..." msgstr "" -#: ../../include/text.php:2428 +#: ../../include/text.php:2448 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2429 +#: ../../include/text.php:2449 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2430 +#: ../../include/text.php:2450 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2431 +#: ../../include/text.php:2451 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2432 +#: ../../include/text.php:2452 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2433 +#: ../../include/text.php:2453 msgid "Select folder" msgstr "" -#: ../../include/text.php:2434 +#: ../../include/text.php:2454 msgid "Export website..." msgstr "" -#: ../../include/text.php:2435 +#: ../../include/text.php:2455 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2436 +#: ../../include/text.php:2456 msgid "website.zip" msgstr "" -#: ../../include/text.php:2437 +#: ../../include/text.php:2457 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2438 +#: ../../include/text.php:2458 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2439 +#: ../../include/text.php:2459 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2440 +#: ../../include/text.php:2460 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2441 +#: ../../include/text.php:2461 msgid "Specify folder" msgstr "" @@ -12564,7 +12775,7 @@ msgstr "" msgid "View all %d common connections" msgstr "" -#: ../../include/markdown.php:158 ../../include/bbcode.php:343 +#: ../../include/markdown.php:158 ../../include/bbcode.php:356 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" @@ -12581,23 +12792,27 @@ msgstr "" msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:101 +#: ../../include/follow.php:96 +msgid "Premium channel - please visit:" +msgstr "" + +#: ../../include/follow.php:110 msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:156 +#: ../../include/follow.php:165 msgid "Remote channel or protocol unavailable." msgstr "" -#: ../../include/follow.php:179 +#: ../../include/follow.php:188 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:191 +#: ../../include/follow.php:200 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:202 +#: ../../include/follow.php:211 msgid "Cannot connect to yourself." msgstr "" @@ -12917,39 +13132,39 @@ msgstr "" msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:959 +#: ../../include/attach.php:969 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:1033 ../../include/attach.php:1049 +#: ../../include/attach.php:1043 ../../include/attach.php:1059 msgid "Path not available." msgstr "" -#: ../../include/attach.php:1098 ../../include/attach.php:1263 +#: ../../include/attach.php:1108 ../../include/attach.php:1273 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1124 +#: ../../include/attach.php:1134 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1149 +#: ../../include/attach.php:1159 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1217 +#: ../../include/attach.php:1227 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1221 +#: ../../include/attach.php:1231 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1269 +#: ../../include/attach.php:1279 msgid "Empty path" msgstr "" -#: ../../include/security.php:532 +#: ../../include/security.php:541 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." @@ -12959,67 +13174,67 @@ msgstr "" msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1129 +#: ../../include/items.php:1133 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1131 +#: ../../include/items.php:1135 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1133 +#: ../../include/items.php:1137 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1135 +#: ../../include/items.php:1139 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1137 +#: ../../include/items.php:1141 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1139 +#: ../../include/items.php:1143 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1141 +#: ../../include/items.php:1145 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1143 +#: ../../include/items.php:1147 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4147 +#: ../../include/items.php:4197 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4154 +#: ../../include/items.php:4204 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4166 +#: ../../include/items.php:4216 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4515 +#: ../../include/items.php:4565 msgid "profile photo" msgstr "" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4706 +#: ../../include/items.php:4756 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -13056,120 +13271,120 @@ msgstr "" msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1298 +#: ../../include/channel.php:1297 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1319 +#: ../../include/channel.php:1318 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1396 ../../include/channel.php:1524 +#: ../../include/channel.php:1395 ../../include/channel.php:1523 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1398 ../../include/channel.php:1579 +#: ../../include/channel.php:1397 ../../include/channel.php:1591 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1399 +#: ../../include/channel.php:1398 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1452 +#: ../../include/channel.php:1451 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1483 +#: ../../include/channel.php:1482 msgid "Trans" msgstr "" -#: ../../include/channel.php:1529 +#: ../../include/channel.php:1528 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1553 +#: ../../include/channel.php:1552 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1554 +#: ../../include/channel.php:1553 msgid "j F" msgstr "" -#: ../../include/channel.php:1561 +#: ../../include/channel.php:1560 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1574 +#: ../../include/channel.php:1573 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1577 -msgid "Sexual Preference:" +#: ../../include/channel.php:1585 +msgid "Tags:" msgstr "" -#: ../../include/channel.php:1583 -msgid "Tags:" +#: ../../include/channel.php:1589 +msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1585 +#: ../../include/channel.php:1595 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1587 +#: ../../include/channel.php:1597 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1591 +#: ../../include/channel.php:1601 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1593 +#: ../../include/channel.php:1603 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1595 +#: ../../include/channel.php:1605 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1597 +#: ../../include/channel.php:1607 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1599 +#: ../../include/channel.php:1609 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1601 +#: ../../include/channel.php:1611 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1603 +#: ../../include/channel.php:1613 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1605 +#: ../../include/channel.php:1615 msgid "Television:" msgstr "" -#: ../../include/channel.php:1607 +#: ../../include/channel.php:1617 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1609 +#: ../../include/channel.php:1619 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1611 +#: ../../include/channel.php:1621 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1613 +#: ../../include/channel.php:1623 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1636 +#: ../../include/channel.php:1646 msgid "Like this thing" msgstr "" @@ -13209,19 +13424,19 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/event.php:1310 ../../include/connections.php:684 +#: ../../include/event.php:1310 ../../include/connections.php:692 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1311 ../../include/connections.php:685 +#: ../../include/event.php:1311 ../../include/connections.php:693 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1313 ../../include/connections.php:687 +#: ../../include/event.php:1313 ../../include/connections.php:695 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1314 ../../include/connections.php:688 +#: ../../include/event.php:1314 ../../include/connections.php:696 msgid "Work, Fax" msgstr "" @@ -13229,43 +13444,43 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/network.php:1769 ../../include/network.php:1770 +#: ../../include/network.php:1764 ../../include/network.php:1765 msgid "Friendica" msgstr "" -#: ../../include/network.php:1771 +#: ../../include/network.php:1766 msgid "OStatus" msgstr "" -#: ../../include/network.php:1772 +#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1773 +#: ../../include/network.php:1768 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1776 +#: ../../include/network.php:1771 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1777 +#: ../../include/network.php:1772 msgid "Facebook" msgstr "" -#: ../../include/network.php:1778 +#: ../../include/network.php:1773 msgid "Zot" msgstr "" -#: ../../include/network.php:1779 +#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1780 +#: ../../include/network.php:1775 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1781 +#: ../../include/network.php:1776 msgid "MySpace" msgstr "" @@ -13307,17 +13522,17 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/bbcode.php:198 ../../include/bbcode.php:1151 -#: ../../include/bbcode.php:1154 ../../include/bbcode.php:1159 -#: ../../include/bbcode.php:1162 ../../include/bbcode.php:1165 -#: ../../include/bbcode.php:1168 ../../include/bbcode.php:1173 -#: ../../include/bbcode.php:1176 ../../include/bbcode.php:1181 -#: ../../include/bbcode.php:1184 ../../include/bbcode.php:1187 -#: ../../include/bbcode.php:1190 +#: ../../include/bbcode.php:198 ../../include/bbcode.php:1200 +#: ../../include/bbcode.php:1203 ../../include/bbcode.php:1208 +#: ../../include/bbcode.php:1211 ../../include/bbcode.php:1214 +#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222 +#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1230 +#: ../../include/bbcode.php:1233 ../../include/bbcode.php:1236 +#: ../../include/bbcode.php:1239 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:237 ../../include/bbcode.php:1201 +#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250 msgid "Encrypted content" msgstr "" @@ -13335,565 +13550,587 @@ msgstr "" msgid "card" msgstr "" -#: ../../include/bbcode.php:335 +#: ../../include/bbcode.php:348 msgid "card" msgstr "" -#: ../../include/bbcode.php:337 +#: ../../include/bbcode.php:350 msgid "article" msgstr "" -#: ../../include/bbcode.php:420 ../../include/bbcode.php:428 +#: ../../include/bbcode.php:433 ../../include/bbcode.php:441 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:428 +#: ../../include/bbcode.php:441 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:454 msgid "View article" msgstr "" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:454 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1139 +#: ../../include/bbcode.php:1188 msgid "$1 wrote:" msgstr "" -#: ../../include/oembed.php:328 +#: ../../include/oembed.php:329 msgid " by " msgstr "" -#: ../../include/oembed.php:329 +#: ../../include/oembed.php:330 msgid " on " msgstr "" -#: ../../include/oembed.php:358 +#: ../../include/oembed.php:359 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:367 +#: ../../include/oembed.php:368 msgid "Embedding disabled" msgstr "" -#: ../../include/zid.php:346 +#: ../../include/zid.php:347 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" -#: ../../include/features.php:54 +#: ../../include/features.php:56 msgid "General Features" msgstr "" -#: ../../include/features.php:60 +#: ../../include/features.php:61 +msgid "Display new member quick links menu" +msgstr "" + +#: ../../include/features.php:69 msgid "Advanced Profiles" msgstr "" -#: ../../include/features.php:61 +#: ../../include/features.php:70 msgid "Additional profile sections and selections" msgstr "" -#: ../../include/features.php:69 +#: ../../include/features.php:78 msgid "Profile Import/Export" msgstr "" -#: ../../include/features.php:70 +#: ../../include/features.php:79 msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/features.php:78 +#: ../../include/features.php:87 msgid "Web Pages" msgstr "" -#: ../../include/features.php:79 +#: ../../include/features.php:88 msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/features.php:88 +#: ../../include/features.php:97 msgid "Provide a wiki for your channel" msgstr "" -#: ../../include/features.php:105 +#: ../../include/features.php:114 msgid "Private Notes" msgstr "" -#: ../../include/features.php:106 +#: ../../include/features.php:115 msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/features.php:115 +#: ../../include/features.php:124 msgid "Create personal planning cards" msgstr "" -#: ../../include/features.php:125 +#: ../../include/features.php:134 msgid "Create interactive articles" msgstr "" -#: ../../include/features.php:133 +#: ../../include/features.php:142 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:134 +#: ../../include/features.php:143 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:142 +#: ../../include/features.php:151 msgid "Photo Location" msgstr "" -#: ../../include/features.php:143 +#: ../../include/features.php:152 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:151 +#: ../../include/features.php:160 msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/features.php:152 +#: ../../include/features.php:161 msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/features.php:161 +#: ../../include/features.php:170 msgid "Smart Birthdays" msgstr "" -#: ../../include/features.php:162 +#: ../../include/features.php:171 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "" -#: ../../include/features.php:170 +#: ../../include/features.php:179 msgid "Event Timezone Selection" msgstr "" -#: ../../include/features.php:171 +#: ../../include/features.php:180 msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:180 +#: ../../include/features.php:189 msgid "Premium Channel" msgstr "" -#: ../../include/features.php:181 +#: ../../include/features.php:190 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "" -#: ../../include/features.php:189 +#: ../../include/features.php:198 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:190 +#: ../../include/features.php:199 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:198 +#: ../../include/features.php:207 msgid "Advanced Theme and Layout Settings" msgstr "" -#: ../../include/features.php:199 +#: ../../include/features.php:208 msgid "Allows fine tuning of themes and page layouts" msgstr "" -#: ../../include/features.php:208 +#: ../../include/features.php:217 msgid "Access Control and Permissions" msgstr "" -#: ../../include/features.php:212 ../../include/group.php:328 +#: ../../include/features.php:221 ../../include/group.php:328 msgid "Privacy Groups" msgstr "" -#: ../../include/features.php:213 +#: ../../include/features.php:222 msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/features.php:221 +#: ../../include/features.php:230 msgid "Multiple Profiles" msgstr "" -#: ../../include/features.php:222 +#: ../../include/features.php:231 msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/features.php:232 +#: ../../include/features.php:241 msgid "Provide alternate connection permission roles." msgstr "" -#: ../../include/features.php:240 -msgid "OAuth Clients" +#: ../../include/features.php:249 +msgid "OAuth1 Clients" msgstr "" -#: ../../include/features.php:241 -msgid "Manage authenticatication tokens for mobile and remote apps." +#: ../../include/features.php:250 +msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps." msgstr "" -#: ../../include/features.php:249 +#: ../../include/features.php:258 +msgid "OAuth2 Clients" +msgstr "" + +#: ../../include/features.php:259 +msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." +msgstr "" + +#: ../../include/features.php:267 msgid "Access Tokens" msgstr "" -#: ../../include/features.php:250 +#: ../../include/features.php:268 msgid "Create access tokens so that non-members can access private content." msgstr "" -#: ../../include/features.php:261 +#: ../../include/features.php:279 msgid "Post Composition Features" msgstr "" -#: ../../include/features.php:265 +#: ../../include/features.php:283 msgid "Large Photos" msgstr "" -#: ../../include/features.php:266 +#: ../../include/features.php:284 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:275 +#: ../../include/features.php:293 msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/features.php:283 +#: ../../include/features.php:301 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:284 +#: ../../include/features.php:302 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:292 +#: ../../include/features.php:310 msgid "Enable Voting Tools" msgstr "" -#: ../../include/features.php:293 +#: ../../include/features.php:311 msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/features.php:301 +#: ../../include/features.php:319 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:302 +#: ../../include/features.php:320 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:310 +#: ../../include/features.php:328 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:311 +#: ../../include/features.php:329 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:319 +#: ../../include/features.php:337 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:320 +#: ../../include/features.php:338 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:328 +#: ../../include/features.php:346 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:329 +#: ../../include/features.php:347 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:340 +#: ../../include/features.php:355 +msgid "Auto-save drafts of posts and comments" +msgstr "" + +#: ../../include/features.php:356 +msgid "" +"Automatically saves post and comment drafts in local browser storage to help " +"prevent accidental loss of compositions" +msgstr "" + +#: ../../include/features.php:367 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:344 +#: ../../include/features.php:371 msgid "Search by Date" msgstr "" -#: ../../include/features.php:345 +#: ../../include/features.php:372 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:355 +#: ../../include/features.php:382 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:363 +#: ../../include/features.php:390 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:364 +#: ../../include/features.php:391 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:372 +#: ../../include/features.php:399 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:373 +#: ../../include/features.php:400 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:381 +#: ../../include/features.php:408 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:382 +#: ../../include/features.php:409 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:391 +#: ../../include/features.php:418 msgid "Show friend and connection suggestions" msgstr "" -#: ../../include/features.php:399 +#: ../../include/features.php:426 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:400 +#: ../../include/features.php:427 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:412 +#: ../../include/features.php:439 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:416 +#: ../../include/features.php:443 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:417 +#: ../../include/features.php:444 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:425 +#: ../../include/features.php:452 msgid "Post Categories" msgstr "" -#: ../../include/features.php:426 +#: ../../include/features.php:453 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:434 +#: ../../include/features.php:461 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:435 +#: ../../include/features.php:462 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:444 +#: ../../include/features.php:471 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:452 +#: ../../include/features.php:479 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:453 +#: ../../include/features.php:480 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:461 +#: ../../include/features.php:488 msgid "Star Posts" msgstr "" -#: ../../include/features.php:462 +#: ../../include/features.php:489 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:470 +#: ../../include/features.php:497 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:471 +#: ../../include/features.php:498 msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/taxonomy.php:384 ../../include/taxonomy.php:405 -msgid "Tags" +#: ../../include/taxonomy.php:320 +msgid "Trending" msgstr "" -#: ../../include/taxonomy.php:487 +#: ../../include/taxonomy.php:552 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:508 +#: ../../include/taxonomy.php:573 msgid "have" msgstr "" -#: ../../include/taxonomy.php:508 +#: ../../include/taxonomy.php:573 msgid "has" msgstr "" -#: ../../include/taxonomy.php:509 +#: ../../include/taxonomy.php:574 msgid "want" msgstr "" -#: ../../include/taxonomy.php:509 +#: ../../include/taxonomy.php:574 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:510 +#: ../../include/taxonomy.php:575 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:576 msgid "dislikes" msgstr "" -#: ../../include/account.php:35 +#: ../../include/account.php:36 msgid "Not a valid email address" msgstr "" -#: ../../include/account.php:37 +#: ../../include/account.php:38 msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/account.php:43 +#: ../../include/account.php:44 msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/account.php:75 +#: ../../include/account.php:76 msgid "An invitation is required." msgstr "" -#: ../../include/account.php:79 +#: ../../include/account.php:80 msgid "Invitation could not be verified." msgstr "" -#: ../../include/account.php:157 +#: ../../include/account.php:158 msgid "Please enter the required information." msgstr "" -#: ../../include/account.php:224 +#: ../../include/account.php:225 msgid "Failed to store account information." msgstr "" -#: ../../include/account.php:313 +#: ../../include/account.php:314 #, php-format msgid "Registration confirmation for %s" msgstr "" -#: ../../include/account.php:382 +#: ../../include/account.php:383 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../include/account.php:404 +#: ../../include/account.php:405 msgid "your registration password" msgstr "" -#: ../../include/account.php:410 ../../include/account.php:472 +#: ../../include/account.php:411 ../../include/account.php:473 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../include/account.php:483 +#: ../../include/account.php:484 msgid "Account approved." msgstr "" -#: ../../include/account.php:523 +#: ../../include/account.php:524 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../include/account.php:802 ../../include/account.php:804 +#: ../../include/account.php:803 ../../include/account.php:805 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:810 +#: ../../include/account.php:811 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:815 +#: ../../include/account.php:816 msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "Birthday" msgstr "" -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "Age: " msgstr "" -#: ../../include/datetime.php:134 +#: ../../include/datetime.php:140 msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:238 +#: ../../include/datetime.php:244 msgid "less than a second ago" msgstr "" -#: ../../include/datetime.php:256 +#: ../../include/datetime.php:262 #, php-format msgctxt "e.g. 22 hours ago, 1 minute ago" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:267 +#: ../../include/datetime.php:273 msgctxt "relative_date" msgid "year" msgid_plural "years" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:270 +#: ../../include/datetime.php:276 msgctxt "relative_date" msgid "month" msgid_plural "months" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:273 +#: ../../include/datetime.php:279 msgctxt "relative_date" msgid "week" msgid_plural "weeks" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:276 +#: ../../include/datetime.php:282 msgctxt "relative_date" msgid "day" msgid_plural "days" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:279 +#: ../../include/datetime.php:285 msgctxt "relative_date" msgid "hour" msgid_plural "hours" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:282 +#: ../../include/datetime.php:288 msgctxt "relative_date" msgid "minute" msgid_plural "minutes" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:285 +#: ../../include/datetime.php:291 msgctxt "relative_date" msgid "second" msgid_plural "seconds" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:514 +#: ../../include/datetime.php:520 #, php-format msgid "%1$s's birthday" msgstr "" -#: ../../include/datetime.php:515 +#: ../../include/datetime.php:521 #, php-format msgid "Happy Birthday %1$s" msgstr "" @@ -13947,7 +14184,7 @@ msgid "Help and documentation" msgstr "" #: ../../include/nav.php:179 -msgid "Search site @name, #tag, ?docs, content" +msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" #: ../../include/nav.php:199 @@ -13955,7 +14192,7 @@ msgid "Site Setup and Configuration" msgstr "" #: ../../include/nav.php:290 -msgid "@name, #tag, ?doc, content" +msgid "@name, !forum, #tag, ?doc, content" msgstr "" #: ../../include/nav.php:291 @@ -13983,38 +14220,38 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:322 +#: ../../include/photos.php:326 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:364 +#: ../../include/photos.php:375 msgid "a new photo" msgstr "" -#: ../../include/photos.php:368 +#: ../../include/photos.php:379 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:660 +#: ../../include/photos.php:671 msgid "Upload New Photos" msgstr "" -#: ../../include/zot.php:767 +#: ../../include/zot.php:772 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:794 +#: ../../include/zot.php:799 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2529 +#: ../../include/zot.php:2552 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:4180 +#: ../../include/zot.php:4219 msgid "invalid target signature" msgstr "" @@ -14045,23 +14282,27 @@ msgstr "" msgid "Channels not in any privacy group" msgstr "" -#: ../../include/connections.php:128 +#: ../../include/connections.php:133 msgid "New window" msgstr "" -#: ../../include/connections.php:129 +#: ../../include/connections.php:134 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/auth.php:148 +#: ../../include/auth.php:152 +msgid "Delegation session ended." +msgstr "" + +#: ../../include/auth.php:156 msgid "Logged out." msgstr "" -#: ../../include/auth.php:263 +#: ../../include/auth.php:273 msgid "Email validation is incomplete. Please check your email." msgstr "" -#: ../../include/auth.php:279 +#: ../../include/auth.php:289 msgid "Failed authentication" msgstr "" |