diff options
| author | zotlabs <mike@macgirvin.com> | 2018-07-18 19:14:21 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-07-18 19:14:21 -0700 |
| commit | 13d19d42cbdf9af34784ee991f7c0c11384ad504 (patch) | |
| tree | 700ad3d11c0a1720bc776004d68fda3b3a68dddf | |
| parent | ec852b0c8d6c8e566b2a5fb279ed359630afb5ee (diff) | |
| parent | eb322e831297ee8fd773049c1a00c915c49dc93e (diff) | |
| download | volse-hubzilla-13d19d42cbdf9af34784ee991f7c0c11384ad504.tar.gz volse-hubzilla-13d19d42cbdf9af34784ee991f7c0c11384ad504.tar.bz2 volse-hubzilla-13d19d42cbdf9af34784ee991f7c0c11384ad504.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/attach.php | 4 | ||||
| -rw-r--r-- | util/hmessages.po | 3593 | ||||
| -rw-r--r-- | vendor/composer/autoload_classmap.php | 10 | ||||
| -rw-r--r-- | vendor/composer/autoload_static.php | 10 | ||||
| -rw-r--r-- | view/ru/hmessages.po | 2 |
6 files changed, 2048 insertions, 1573 deletions
@@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.5.8' ); +define ( 'STD_VERSION', '3.7' ); define ( 'ZOT_REVISION', '6.0a' ); diff --git a/include/attach.php b/include/attach.php index 2a9badaac..202412263 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2325,6 +2325,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { return false; $newdirname = $n[0]['filename']; + $newalbumname = $n[0]['display_path']; $newstorepath = dbunescbin($n[0]['content']) . '/' . $resource_id; } else { @@ -2332,6 +2333,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { // root directory $newdirname = EMPTY_STR; + $newalbumname = EMPTY_STR; $newstorepath = 'store/' . $c['channel_address'] . '/' . $resource_id; } @@ -2419,7 +2421,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { if($r[0]['is_photo']) { $t = q("update photo set album = '%s', filename = '%s', os_path = '%s', display_path = '%s' where resource_id = '%s' and uid = %d", - dbesc($newdirname), + dbesc($newalbumname), dbesc($filename), dbesc($x['os_path']), dbesc($x['path']), diff --git a/util/hmessages.po b/util/hmessages.po index 03c8d92da..98dbc59e6 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.5\n" +"Project-Id-Version: 3.6RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"POT-Creation-Date: 2018-07-18 11:47+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" @@ -74,7 +74,7 @@ msgid "Can like/dislike profiles and profile things" msgstr "" #: ../../Zotlabs/Access/Permissions.php:70 -msgid "Can forward to all my channel connections via @+ mentions in posts" +msgid "Can forward to all my channel connections via ! mentions in posts" msgstr "" #: ../../Zotlabs/Access/Permissions.php:71 @@ -150,14 +150,14 @@ msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:306 -#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144 -#: ../../Zotlabs/Module/Settings/Channel.php:479 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:172 +#: ../../Zotlabs/Module/Settings/Channel.php:496 #: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Register.php:233 ../../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:697 -#: ../../include/connections.php:704 +#: ../../include/event.php:1322 ../../include/connections.php:703 +#: ../../include/connections.php:710 msgid "Other" msgstr "" @@ -169,23 +169,24 @@ msgstr "" #: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 -#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197 +#: ../../Zotlabs/Module/Menu.php:91 ../../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:1197 msgid "Requested profile is not available." msgstr "" #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 #: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67 -#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110 -#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 +#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115 +#: ../../Zotlabs/Module/Channel.php:281 ../../Zotlabs/Module/Channel.php:320 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Article_edit.php:51 -#: ../../Zotlabs/Module/New_channel.php:91 -#: ../../Zotlabs/Module/New_channel.php:116 +#: ../../Zotlabs/Module/New_channel.php:105 +#: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 #: ../../Zotlabs/Module/Settings/Features.php:38 @@ -202,30 +203,32 @@ msgstr "" #: ../../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:1106 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Item.php:1108 ../../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 -#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140 +#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 +#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40 +#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:12 +#: ../../Zotlabs/Module/Group.php:24 ../../Zotlabs/Module/Profiles.php:198 +#: ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:77 #: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 #: ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Cover_photo.php:281 -#: ../../Zotlabs/Module/Cover_photo.php:294 +#: ../../Zotlabs/Module/Cover_photo.php:313 +#: ../../Zotlabs/Module/Cover_photo.php:326 #: ../../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 -#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Filestorage.php:96 +#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Rate.php:113 @@ -234,12 +237,11 @@ msgstr "" #: ../../Zotlabs/Web/WebServer.php:123 ../../addon/keepout/keepout.php:36 #: ../../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:1029 -#: ../../include/attach.php:1103 ../../include/attach.php:1268 -#: ../../include/items.php:3706 ../../include/photos.php:27 +#: ../../include/attach.php:270 ../../include/attach.php:379 +#: ../../include/attach.php:393 ../../include/attach.php:400 +#: ../../include/attach.php:482 ../../include/attach.php:1042 +#: ../../include/attach.php:1116 ../../include/attach.php:1281 +#: ../../include/items.php:3653 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -248,7 +250,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2458 msgid "Blocks" msgstr "" @@ -256,22 +258,22 @@ msgstr "" msgid "Block Title" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177 #: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 msgid "Created" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115 +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178 #: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 msgid "Edited" msgstr "" #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 -#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160 -#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:188 +#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:181 #: ../../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/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 msgid "Create" msgstr "" @@ -279,27 +281,27 @@ msgstr "" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Article_edit.php:99 #: ../../Zotlabs/Module/Admin/Profs.php:175 -#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 #: ../../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/Wiki.php:362 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:216 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../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/Lib/Apps.php:475 ../../Zotlabs/Lib/ThreadItem.php:128 +#: ../../Zotlabs/Storage/Browser.php:290 ../../Zotlabs/Widget/Cdav.php:126 #: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 -#: ../../include/channel.php:1300 ../../include/menu.php:113 +#: ../../include/channel.php:1300 ../../include/menu.php:118 msgid "Edit" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1107 #: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 -#: ../../include/conversation.php:1366 +#: ../../include/conversation.php:1374 msgid "Share" msgstr "" @@ -309,18 +311,17 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 -#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 #: ../../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:800 +#: ../../Zotlabs/Module/Photos.php:1208 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:923 ../../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 -#: ../../Zotlabs/Storage/Browser.php:289 ../../include/conversation.php:690 -#: ../../include/conversation.php:733 +#: ../../Zotlabs/Lib/Apps.php:476 ../../Zotlabs/Lib/ThreadItem.php:148 +#: ../../Zotlabs/Storage/Browser.php:291 ../../include/conversation.php:691 +#: ../../include/conversation.php:736 msgid "Delete" msgstr "" @@ -401,49 +402,49 @@ msgid "3. Click [Connect]" msgstr "" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Events.php:493 #: ../../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:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Addons.php:438 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:112 #: ../../Zotlabs/Module/Settings/Permcats.php:115 -#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Channel.php:516 #: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Oauth2.php:84 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:54 #: ../../Zotlabs/Module/Settings/Display.php:192 #: ../../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/Import.php:565 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1087 +#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1245 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 #: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887 #: ../../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: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/Module/Group.php:121 ../../Zotlabs/Module/Group.php:137 +#: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 +#: ../../Zotlabs/Module/Sources.php:117 ../../Zotlabs/Module/Sources.php:154 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 +#: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../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:275 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:284 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 @@ -451,7 +452,7 @@ msgstr "" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/diaspora/diaspora.php:830 #: ../../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 @@ -460,7 +461,7 @@ msgstr "" #: ../../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:97 ../../addon/pubcrawl/pubcrawl.php:1072 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1159 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -468,7 +469,10 @@ 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/cart/cart.php:1104 +#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/cart/cart.php:1251 +#: ../../addon/cart/submodules/paypalbutton.php:144 +#: ../../addon/cart/submodules/hzservices.php:78 +#: ../../addon/cart/submodules/hzservices.php:647 #: ../../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 @@ -477,8 +481,8 @@ msgid "Submit" msgstr "" #: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133 -#: ../../include/nav.php:469 +#: ../../Zotlabs/Lib/Apps.php:292 ../../include/features.php:133 +#: ../../include/nav.php:461 msgid "Articles" msgstr "" @@ -508,13 +512,32 @@ msgstr "" msgid "Edit Layout" msgstr "" +#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:899 +#: ../../Zotlabs/Module/Cdav.php:1188 ../../Zotlabs/Module/Article_edit.php:131 +#: ../../Zotlabs/Module/Admin/Addons.php:423 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:347 +#: ../../Zotlabs/Module/Wiki.php:379 ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Editwebpage.php:169 +#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131 +#: ../../include/conversation.php:1397 ../../include/conversation.php:1446 +msgid "Cancel" +msgstr "" + #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:117 -#: ../../Zotlabs/Module/Group.php:74 ../../Zotlabs/Module/Dreport.php:10 +#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:126 +#: ../../Zotlabs/Module/Group.php:83 ../../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:82 -#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:358 +#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:364 msgid "Permission denied" msgstr "" @@ -553,11 +576,11 @@ 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:833 +#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278 +#: ../../Zotlabs/Lib/Apps.php:819 ../../Zotlabs/Lib/Apps.php:898 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 -#: ../../include/conversation.php:1160 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:961 +#: ../../include/conversation.php:1165 msgid "Unknown" msgstr "" @@ -596,6 +619,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 +#: ../../addon/cart/submodules/hzservices.php:659 msgid "Description" msgstr "" @@ -608,14 +632,14 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339 -#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971 +#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:976 msgid "Previous" msgstr "" #: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 #: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 -#: ../../Zotlabs/Module/Photos.php:980 +#: ../../Zotlabs/Module/Photos.php:985 msgid "Next" msgstr "" @@ -664,35 +688,20 @@ msgstr "" msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 -#: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../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:801 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 -#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../include/conversation.php:1389 ../../include/conversation.php:1438 -msgid "Cancel" -msgstr "" - #: ../../Zotlabs/Module/Cdav.php:900 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" #: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Sharedwithme.php:105 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth2.php:86 -#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 #: ../../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/Module/Chat.php:251 ../../Zotlabs/Module/Group.php:125 +#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 msgid "Name" @@ -717,7 +726,7 @@ msgstr "" #: ../../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:1770 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 msgid "Email" msgstr "" @@ -745,19 +754,19 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 -#: ../../include/connections.php:690 +#: ../../include/connections.php:696 msgid "Mobile" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 #: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 -#: ../../include/connections.php:691 +#: ../../include/connections.php:697 msgid "Home" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 #: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 -#: ../../include/connections.php:694 +#: ../../include/connections.php:700 msgid "Work" msgstr "" @@ -772,14 +781,13 @@ msgstr "" msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1186 -#: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth2.php:39 -#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Cdav.php:1186 ../../Zotlabs/Module/Admin/Addons.php:453 +#: ../../Zotlabs/Module/Settings/Oauth2.php:40 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 #: ../../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 +#: ../../Zotlabs/Lib/Apps.php:456 msgid "Update" msgstr "" @@ -824,25 +832,35 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Channel.php:35 ../../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 "" -#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37 #: ../../Zotlabs/Module/Profile.php:45 msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44 #: ../../Zotlabs/Module/Profile.php:52 msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:107 +#: ../../Zotlabs/Module/Channel.php:112 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" +#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174 +msgid "Search Results For:" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:164 ../../Zotlabs/Module/Hq.php:134 +#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Display.php:81 +#: ../../Zotlabs/Module/Network.php:204 +msgid "Reset form" +msgstr "" + #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 msgid "Export Channel" msgstr "" @@ -909,7 +927,7 @@ msgstr "" msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540 +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:545 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 #: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30 #: ../../Zotlabs/Module/Viewconnections.php:23 @@ -917,9 +935,10 @@ msgid "Public access denied." msgstr "" #: ../../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 +#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:148 ../../include/text.php:1062 +#: ../../include/text.php:1074 ../../include/acl_selectors.php:118 +#: ../../include/nav.php:185 msgid "Search" msgstr "" @@ -934,7 +953,7 @@ msgid "Search results for: %s" msgstr "" #: ../../Zotlabs/Module/Pubstream.php:95 -#: ../../Zotlabs/Widget/Notifications.php:131 +#: ../../Zotlabs/Widget/Notifications.php:142 msgid "Public Stream" msgstr "" @@ -964,11 +983,11 @@ msgstr "" msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111 +#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:115 msgid "Primary" msgstr "" -#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:176 msgid "Drop" msgstr "" @@ -1008,66 +1027,69 @@ msgstr "" msgid "Use arrows to move the corresponding app up or down in the app tray" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 +#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:208 msgid "Menu not found." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:52 +#: ../../Zotlabs/Module/Mitem.php:63 msgid "Unable to create element." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:76 +#: ../../Zotlabs/Module/Mitem.php:87 msgid "Unable to update menu element." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:92 +#: ../../Zotlabs/Module/Mitem.php:103 msgid "Unable to add menu element." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166 +#: ../../Zotlabs/Module/Mitem.php:134 ../../Zotlabs/Module/Menu.php:231 #: ../../Zotlabs/Module/Xchan.php:41 msgid "Not found." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 +#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246 msgid "Menu Item Permissions" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "(click to open/close)" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191 msgid "Link Name" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 +#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255 msgid "Link or Submenu Target" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 +#: ../../Zotlabs/Module/Mitem.php:175 msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256 msgid "Use magic-auth if available" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:259 -#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Settings/Channel.php:315 #: ../../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 -#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../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:1594 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 +#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Menu.php:162 +#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:180 +#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:116 +#: ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1095,8 +1117,13 @@ 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/cart/cart.php:1075 -#: ../../addon/cart/cart.php:1082 ../../addon/cart/cart.php:1090 +#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206 +#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221 +#: ../../addon/cart/submodules/paypalbutton.php:99 +#: ../../addon/cart/submodules/paypalbutton.php:104 +#: ../../addon/cart/submodules/hzservices.php:73 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/hzservices.php:657 #: ../../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 @@ -1105,20 +1132,22 @@ msgstr "" msgid "No" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:261 -#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Settings/Channel.php:315 #: ../../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 -#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../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:1594 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 +#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1146,8 +1175,13 @@ 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/cart/cart.php:1075 -#: ../../addon/cart/cart.php:1082 ../../addon/cart/cart.php:1090 +#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206 +#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221 +#: ../../addon/cart/submodules/paypalbutton.php:99 +#: ../../addon/cart/submodules/paypalbutton.php:104 +#: ../../addon/cart/submodules/hzservices.php:73 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/hzservices.php:657 #: ../../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 @@ -1156,83 +1190,83 @@ msgstr "" msgid "Yes" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257 msgid "Open link in new window" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 msgid "Order in list" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:165 +#: ../../Zotlabs/Module/Mitem.php:179 msgid "Submit and finish" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:166 +#: ../../Zotlabs/Module/Mitem.php:180 msgid "Submit and continue" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:174 +#: ../../Zotlabs/Module/Mitem.php:189 msgid "Menu:" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:192 msgid "Link Target" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:180 +#: ../../Zotlabs/Module/Mitem.php:195 msgid "Edit menu" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:183 +#: ../../Zotlabs/Module/Mitem.php:198 msgid "Edit element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:184 +#: ../../Zotlabs/Module/Mitem.php:199 msgid "Drop element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:185 +#: ../../Zotlabs/Module/Mitem.php:200 msgid "New element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:186 +#: ../../Zotlabs/Module/Mitem.php:201 msgid "Edit this menu container" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:187 +#: ../../Zotlabs/Module/Mitem.php:202 msgid "Add menu element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:188 +#: ../../Zotlabs/Module/Mitem.php:203 msgid "Delete this menu item" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:189 +#: ../../Zotlabs/Module/Mitem.php:204 msgid "Edit this menu item" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:206 +#: ../../Zotlabs/Module/Mitem.php:222 msgid "Menu item not found." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:219 +#: ../../Zotlabs/Module/Mitem.php:235 msgid "Menu item deleted." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:221 +#: ../../Zotlabs/Module/Mitem.php:237 msgid "Menu item could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:228 +#: ../../Zotlabs/Module/Mitem.php:244 msgid "Edit Menu Element" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:238 +#: ../../Zotlabs/Module/Mitem.php:254 msgid "Link text" msgstr "" @@ -1263,7 +1297,7 @@ msgstr "" #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 #: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 -#: ../../include/text.php:2008 ../../include/event.php:1153 +#: ../../include/text.php:2025 ../../include/event.php:1153 msgid "event" msgstr "" @@ -1324,13 +1358,13 @@ msgstr "" msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762 -#: ../../include/conversation.php:1333 +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1128 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:767 +#: ../../include/conversation.php:1341 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1413 msgid "Permission settings" msgstr "" @@ -1355,7 +1389,7 @@ msgid "Delete event" msgstr "" #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 -#: ../../include/text.php:1827 +#: ../../include/text.php:1844 msgid "Link to Source" msgstr "" @@ -1440,21 +1474,21 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../Zotlabs/Module/Magic.php:72 +#: ../../Zotlabs/Module/Magic.php:76 msgid "Hub not found." msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 -#: ../../include/conversation.php:116 ../../include/text.php:2005 +#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 +#: ../../include/conversation.php:116 ../../include/text.php:2022 msgid "photo" msgstr "" #: ../../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 +#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 +#: ../../include/conversation.php:144 ../../include/text.php:2028 msgid "status" msgstr "" @@ -1479,14 +1513,14 @@ msgstr "" #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 #: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 -#: ../../include/conversation.php:1278 +#: ../../include/conversation.php:1283 msgid "Insert web link" msgstr "" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../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 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:703 +#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../include/conversation.php:1409 msgid "Title (optional)" msgstr "" @@ -1494,16 +1528,16 @@ msgstr "" msgid "Edit Article" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 +#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:66 msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 -#: ../../Zotlabs/Module/Import.php:95 +#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:81 +#: ../../Zotlabs/Module/Import.php:97 msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:102 +#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:104 msgid "Imported file is empty." msgstr "" @@ -1525,81 +1559,84 @@ 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:517 +#: ../../Zotlabs/Module/Import.php:548 msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:133 ../../Zotlabs/Module/Manage.php:138 +#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:138 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:146 -#: ../../Zotlabs/Module/Register.php:254 -msgid "Name or caption" +#: ../../Zotlabs/Module/New_channel.php:154 +#: ../../Zotlabs/Module/New_channel.php:161 +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:276 +msgid "Loading" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:146 -#: ../../Zotlabs/Module/Register.php:254 +#: ../../Zotlabs/Module/New_channel.php:156 +msgid "Your real name is recommended." +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:157 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:148 -#: ../../Zotlabs/Module/Register.php:256 -msgid "Choose a short nickname" +#: ../../Zotlabs/Module/New_channel.php:162 +msgid "" +"This will be used to create a unique network address (like an email address)." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:148 -#: ../../Zotlabs/Module/Register.php:256 -#, php-format -msgid "" -"Your nickname will be used to create an easy to remember channel address e." -"g. nickname%s" +#: ../../Zotlabs/Module/New_channel.php:164 +msgid "Allowed characters are a-z 0-9, - and _" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Settings/Channel.php:539 -#: ../../Zotlabs/Module/Register.php:257 +#: ../../Zotlabs/Module/New_channel.php:174 +msgid "Channel name" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:176 +#: ../../Zotlabs/Module/Register.php:265 +msgid "Choose a short nickname" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Register.php:266 msgid "Channel role and privacy" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Register.php:257 -msgid "Select a channel role with your privacy requirements." +#: ../../Zotlabs/Module/New_channel.php:177 +msgid "" +"Select a channel permission role compatible with your usage needs and " +"privacy requirements." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Register.php:257 -msgid "Read more about roles" +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Register.php:266 +msgid "Read more about channel permission roles" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:152 -msgid "Create Channel" +#: ../../Zotlabs/Module/New_channel.php:180 +msgid "Create a Channel" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:153 +#: ../../Zotlabs/Module/New_channel.php:181 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." +"and many other things." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:153 -msgid "" -"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:154 +#: ../../Zotlabs/Module/New_channel.php:182 msgid "" "or <a href=\"import\">import an existing channel</a> from another location." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:159 +#: ../../Zotlabs/Module/New_channel.php:187 msgid "Validate" msgstr "" @@ -1645,7 +1682,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:622 msgid "Remove Channel" msgstr "" @@ -1658,12 +1695,12 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434 +#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1451 msgid "Size" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Storage/Browser.php:288 msgid "Last Modified" msgstr "" @@ -2238,150 +2275,6 @@ msgstr "" msgid "No failed updates." msgstr "" -#: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../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:453 ../../Zotlabs/Module/Filestorage.php:24 -#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3619 -msgid "Item not found." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:289 -#, php-format -msgid "Plugin %s disabled." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:294 -#, php-format -msgid "Plugin %s enabled." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:310 -#: ../../Zotlabs/Module/Admin/Themes.php:95 -msgid "Disable" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:313 -#: ../../Zotlabs/Module/Admin/Themes.php:97 -msgid "Enable" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:341 -#: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../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:294 -#: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin.php:136 -msgid "Administration" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:342 -#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../Zotlabs/Widget/Admin.php:27 -msgid "Plugins" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:343 -#: ../../Zotlabs/Module/Admin/Themes.php:124 -msgid "Toggle" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 -#: ../../Zotlabs/Widget/Newmember.php:46 -#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105 -#: ../../include/nav.php:192 -msgid "Settings" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:351 -#: ../../Zotlabs/Module/Admin/Themes.php:134 -msgid "Author: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:352 -#: ../../Zotlabs/Module/Admin/Themes.php:135 -msgid "Maintainer: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:353 -msgid "Minimum project version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:354 -msgid "Maximum project version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:355 -msgid "Minimum PHP version: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:356 -msgid "Compatible Server Roles: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:357 -msgid "Requires: " -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:358 -#: ../../Zotlabs/Module/Admin/Plugins.php:442 -msgid "Disabled - version incompatibility" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:411 -msgid "Enter the public git repository URL of the plugin repo." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:412 -msgid "Plugin repo git URL" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "Custom repo name" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "(optional)" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:414 -msgid "Download Plugin Repo" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:421 -msgid "Install new repo" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393 -msgid "Install" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:445 -msgid "Manage Repos" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:446 -msgid "Installed Plugin Repositories" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:447 -msgid "Install a New Plugin Repository" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:454 -msgid "Switch branch" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137 -#: ../../addon/superblock/superblock.php:116 -msgid "Remove" -msgstr "" - #: ../../Zotlabs/Module/Admin/Accounts.php:37 #, php-format msgid "%s account blocked/unblocked" @@ -2400,7 +2293,7 @@ msgstr[1] "" msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2490 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -2415,6 +2308,19 @@ msgstr "" msgid "Account '%s' unblocked" msgstr "" +#: ../../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:307 +#: ../../Zotlabs/Module/Admin/Addons.php:341 +#: ../../Zotlabs/Module/Admin/Addons.php:436 +#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin.php:140 +msgid "Administration" +msgstr "" + #: ../../Zotlabs/Module/Admin/Accounts.php:167 #: ../../Zotlabs/Module/Admin/Accounts.php:180 #: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 @@ -2439,7 +2345,7 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732 +#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:735 msgid "Approve" msgstr "" @@ -2462,7 +2368,7 @@ msgstr "" msgid "ID" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284 +#: ../../Zotlabs/Module/Admin/Accounts.php:184 msgid "All Channels" msgstr "" @@ -2576,7 +2482,7 @@ msgid "Channel '%s' code disallowed" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24 +#: ../../Zotlabs/Module/Admin.php:114 ../../Zotlabs/Widget/Admin.php:24 msgid "Channels" msgstr "" @@ -2597,7 +2503,7 @@ msgid "Disallow Code" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1811 ../../include/nav.php:378 +#: ../../include/conversation.php:1820 ../../include/nav.php:370 msgid "Channel" msgstr "" @@ -2625,6 +2531,24 @@ msgstr "" msgid "No themes found." msgstr "" +#: ../../Zotlabs/Module/Admin/Themes.php:72 +#: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 +#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3566 +msgid "Item not found." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:95 +#: ../../Zotlabs/Module/Admin/Addons.php:310 +msgid "Disable" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:97 +#: ../../Zotlabs/Module/Admin/Addons.php:313 +msgid "Enable" +msgstr "" + #: ../../Zotlabs/Module/Admin/Themes.php:116 msgid "Screenshot" msgstr "" @@ -2634,6 +2558,28 @@ msgstr "" msgid "Themes" msgstr "" +#: ../../Zotlabs/Module/Admin/Themes.php:124 +#: ../../Zotlabs/Module/Admin/Addons.php:343 +msgid "Toggle" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:125 +#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:304 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:99 +msgid "Settings" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:134 +#: ../../Zotlabs/Module/Admin/Addons.php:351 +msgid "Author: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Themes.php:135 +#: ../../Zotlabs/Module/Admin/Addons.php:352 +msgid "Maintainer: " +msgstr "" + #: ../../Zotlabs/Module/Admin/Themes.php:162 msgid "[Experimental]" msgstr "" @@ -2642,466 +2588,581 @@ msgstr "" msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:165 +#: ../../Zotlabs/Module/Admin/Site.php:172 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:191 +#: ../../Zotlabs/Module/Admin/Site.php:198 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Admin/Site.php:209 #: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:209 +#: ../../Zotlabs/Module/Admin/Site.php:216 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:211 +#: ../../Zotlabs/Module/Admin/Site.php:218 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:213 +#: ../../Zotlabs/Module/Admin/Site.php:220 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Admin/Site.php:273 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:267 +#: ../../Zotlabs/Module/Admin/Site.php:274 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Admin/Site.php:275 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:276 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:281 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "Beginner/Basic" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:282 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "Novice - not skilled but willing to learn" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Intermediate - somewhat comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:284 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "Advanced - very comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Expert - I can write computer code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:286 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:299 +msgid "Default permission role for new accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:299 +msgid "" +"This role will be used for the first channel created after registration." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:308 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 -#: ../../Zotlabs/Module/Register.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Register.php:278 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin/Site.php:313 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:317 #: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Site default technical skill level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Used to provide a member experience matched to technical comfort level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Lock the technical skill level setting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Members can set their own technical comfort level by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 ../../Zotlabs/Module/Siteinfo.php:21 +#: ../../Zotlabs/Module/Admin/Site.php:325 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:327 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:317 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:338 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:325 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:341 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:328 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Site only Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Allow anybody on the internet to access the Public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:347 +msgid "Only import Public stream posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:348 +msgid "Do not import Public stream posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:354 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:360 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:361 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:362 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:362 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:363 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:363 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:346 +#: ../../Zotlabs/Module/Admin/Site.php:364 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:364 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:347 +#: ../../Zotlabs/Module/Admin/Site.php:365 msgid "Queue Threshold" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:365 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:366 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:366 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:367 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:367 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:350 +#: ../../Zotlabs/Module/Admin/Site.php:368 msgid "Allow SVG thumbnails in file browser" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:368 msgid "WARNING: SVG images may contain malicious code." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:369 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:369 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:370 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:370 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:353 +#: ../../Zotlabs/Module/Admin/Site.php:371 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:373 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:373 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:356 +#: ../../Zotlabs/Module/Admin/Site.php:374 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:356 -msgid "Recommend: profiles, go, or settings" +#: ../../Zotlabs/Module/Admin/Site.php:374 +msgid "Default: profiles" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:376 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:376 msgid "Region or country" msgstr "" +#: ../../Zotlabs/Module/Admin/Addons.php:289 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:294 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:342 +#: ../../Zotlabs/Module/Admin/Addons.php:437 ../../Zotlabs/Widget/Admin.php:27 +msgid "Addons" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:353 +msgid "Minimum project version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:354 +msgid "Maximum project version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:355 +msgid "Minimum PHP version: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:356 +msgid "Compatible Server Roles: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:357 +msgid "Requires: " +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:358 +#: ../../Zotlabs/Module/Admin/Addons.php:442 +msgid "Disabled - version incompatibility" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:411 +msgid "Enter the public git repository URL of the addon repo." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:412 +msgid "Addon repo git URL" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "Custom repo name" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "(optional)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:414 +msgid "Download Addon Repo" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:421 +msgid "Install new repo" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:456 +msgid "Install" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:445 +msgid "Manage Repos" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:446 +msgid "Installed Addon Repositories" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:447 +msgid "Install a New Addon Repository" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:454 +msgid "Switch branch" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Addons.php:455 +#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../addon/superblock/superblock.php:116 +msgid "Remove" +msgstr "" + #: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "New Profile Field" msgstr "" @@ -3144,8 +3205,8 @@ msgstr "" #: ../../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 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1063 +#: ../../include/text.php:1075 msgid "Save" msgstr "" @@ -3222,114 +3283,127 @@ msgstr "" msgid "Service class" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:77 +#: ../../Zotlabs/Module/Admin/Security.php:83 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:80 +#: ../../Zotlabs/Module/Admin/Security.php:86 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:81 +#: ../../Zotlabs/Module/Admin/Security.php:87 msgid "" "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/" "<br />https://vimeo.com/<br />https://soundcloud.com/<br />" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:82 +#: ../../Zotlabs/Module/Admin/Security.php:88 msgid "" "All other embedded content will be filtered, <strong>unless</strong> " "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:87 ../../Zotlabs/Widget/Admin.php:25 +#: ../../Zotlabs/Module/Admin/Security.php:93 ../../Zotlabs/Widget/Admin.php:25 msgid "Security" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:89 +#: ../../Zotlabs/Module/Admin/Security.php:95 msgid "Block public" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:89 +#: ../../Zotlabs/Module/Admin/Security.php:95 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently authenticated." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:90 +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "Provide a cloud root directory" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "" +"The cloud root directory lists all channel names which provide public files" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:97 +msgid "Show total disk space available to cloud uploads" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:98 msgid "Set \"Transport Security\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:91 +#: ../../Zotlabs/Module/Admin/Security.php:99 msgid "Set \"Content Security Policy\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "Allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "Not allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:94 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "Allow communications only from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:94 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:95 +#: ../../Zotlabs/Module/Admin/Security.php:103 msgid "Block communications from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "Allow communications only from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:97 +#: ../../Zotlabs/Module/Admin/Security.php:105 msgid "Block communications from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:98 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "One site per line. By default embedded content is filtered." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "Block embedded HTML from these domains" msgstr "" @@ -3342,7 +3416,7 @@ msgid "Visible to:" msgstr "" #: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 -#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88 +#: ../../Zotlabs/Module/Acl.php:120 ../../include/acl_selectors.php:88 msgctxt "acl" msgid "Profile" msgstr "" @@ -3370,6 +3444,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Settings/Permcats.php:99 +#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 msgid "Permission Categories" msgstr "" @@ -3404,18 +3479,18 @@ msgid "" "individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:64 #: ../../Zotlabs/Module/Settings/Channel.php:68 -#: ../../Zotlabs/Module/Settings/Channel.php:69 #: ../../Zotlabs/Module/Settings/Channel.php:72 -#: ../../Zotlabs/Module/Settings/Channel.php:83 +#: ../../Zotlabs/Module/Settings/Channel.php:73 +#: ../../Zotlabs/Module/Settings/Channel.php:76 +#: ../../Zotlabs/Module/Settings/Channel.php:87 #: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24 #: ../../include/selectors.php:123 ../../include/channel.php:437 #: ../../include/channel.php:438 ../../include/channel.php:445 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:264 +#: ../../Zotlabs/Module/Settings/Channel.php:272 #: ../../Zotlabs/Module/Defperms.php:103 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3425,400 +3500,414 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:325 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:326 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:327 +#: ../../Zotlabs/Module/Settings/Channel.php:335 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:336 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:337 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:338 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:331 +#: ../../Zotlabs/Module/Settings/Channel.php:339 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:332 +#: ../../Zotlabs/Module/Settings/Channel.php:340 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:407 +#: ../../Zotlabs/Module/Settings/Channel.php:415 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:412 +#: ../../Zotlabs/Module/Settings/Channel.php:420 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:416 +#: ../../Zotlabs/Module/Settings/Channel.php:424 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:425 +#: ../../Zotlabs/Module/Settings/Channel.php:433 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:428 +#: ../../Zotlabs/Module/Settings/Channel.php:436 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:493 +#: ../../Zotlabs/Module/Settings/Channel.php:488 +msgid "Automatic membership approval" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Defperms.php:239 +msgid "" +"If enabled, connection requests will be approved without your interaction" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1521 +#: ../../Zotlabs/Module/Settings/Channel.php:522 ../../include/channel.php:1521 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:523 #: ../../Zotlabs/Module/Settings/Account.php:119 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:528 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:509 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:532 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:515 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:539 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Profile to assign new connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Default Permissions Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:570 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 -#: ../../Zotlabs/Module/Settings/Channel.php:576 -#: ../../Zotlabs/Module/Settings/Channel.php:577 -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:599 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:598 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:599 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:600 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:602 msgid "Unseen public activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:604 +msgid "Unseen forum posts" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:605 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:605 #, 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:584 +#: ../../Zotlabs/Module/Settings/Channel.php:606 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:608 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:608 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:614 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:615 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:617 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:618 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:621 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:601 +#: ../../Zotlabs/Module/Settings/Channel.php:623 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:602 +#: ../../Zotlabs/Module/Settings/Channel.php:624 msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:625 msgid "Start calendar week on Monday" msgstr "" @@ -3887,93 +3976,93 @@ msgstr "" msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:35 +#: ../../Zotlabs/Module/Settings/Oauth2.php:36 msgid "Name and Secret are required" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:83 +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 msgid "Add OAuth2 application" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:86 -#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 #: ../../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/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 #: ../../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/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 #: ../../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/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 #: ../../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/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 #: ../../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 +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 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:91 #: ../../Zotlabs/Module/Settings/Oauth2.php:118 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 msgid "leave blank unless your application sepcifically requires this" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +#: ../../Zotlabs/Module/Settings/Oauth2.php:91 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 msgid "Authorization scope" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +#: ../../Zotlabs/Module/Settings/Oauth2.php:103 msgid "OAuth2 Application not found." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:111 -#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 #: ../../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 +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 msgid "Connected OAuth2 Apps" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 #: ../../Zotlabs/Module/Settings/Oauth.php:152 msgid "Client key starts with" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 #: ../../Zotlabs/Module/Settings/Oauth.php:153 msgid "No name" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth2.php:154 #: ../../Zotlabs/Module/Settings/Oauth.php:154 msgid "Remove authorization" msgstr "" @@ -4212,7 +4301,7 @@ msgid "Icon url" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:94 -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 msgid "Optional" msgstr "" @@ -4224,21 +4313,21 @@ msgstr "" msgid "Connected Apps" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:811 -#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Widget/Portfolio.php:87 +#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:816 +#: ../../Zotlabs/Module/Photos.php:1355 ../../Zotlabs/Widget/Portfolio.php:87 #: ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:842 +#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:847 #: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:712 -#: ../../Zotlabs/Module/Profile_photo.php:458 -#: ../../Zotlabs/Module/Cover_photo.php:362 -#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:717 +#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Cover_photo.php:395 +#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133 #: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 #: ../../Zotlabs/Widget/Album.php:97 msgid "Upload" @@ -4302,9 +4391,9 @@ msgid "URL for photo of thing (optional)" msgstr "" #: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 -#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 +#: ../../Zotlabs/Module/Photos.php:707 ../../Zotlabs/Module/Photos.php:1076 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 -#: ../../Zotlabs/Module/Filestorage.php:147 ../../include/acl_selectors.php:123 +#: ../../Zotlabs/Module/Filestorage.php:170 ../../include/acl_selectors.php:123 msgid "Permissions" msgstr "" @@ -4312,11 +4401,11 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:57 +#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:55 msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:61 +#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:59 msgid "System Notifications" msgstr "" @@ -4324,52 +4413,56 @@ msgstr "" msgid "Connection added." msgstr "" -#: ../../Zotlabs/Module/Import.php:144 +#: ../../Zotlabs/Module/Import.php:146 #, php-format msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Import.php:158 +#: ../../Zotlabs/Module/Import.php:173 msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:482 +#: ../../Zotlabs/Module/Import.php:513 #: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Import.php:510 +#: ../../Zotlabs/Module/Import.php:541 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:515 +#: ../../Zotlabs/Module/Import.php:546 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:516 +#: ../../Zotlabs/Module/Import.php:547 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:518 +#: ../../Zotlabs/Module/Import.php:549 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:519 +#: ../../Zotlabs/Module/Import.php:551 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:520 +#: ../../Zotlabs/Module/Import.php:552 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:521 +#: ../../Zotlabs/Module/Import.php:553 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:522 +#: ../../Zotlabs/Module/Import.php:554 +msgid "Import a few months of posts if possible (limited by available memory" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:556 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 " @@ -4377,19 +4470,25 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:523 +#: ../../Zotlabs/Module/Import.php:558 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:524 +#: ../../Zotlabs/Module/Import.php:559 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:525 -msgid "Import a few months of posts if possible (limited by available memory" +#: ../../Zotlabs/Module/Import.php:560 +msgid "Use this channel nickname instead of the one provided" msgstr "" -#: ../../Zotlabs/Module/Import.php:526 +#: ../../Zotlabs/Module/Import.php:560 +msgid "" +"Leave blank to keep your existing channel nickname. You will be randomly " +"assigned a similar nickname if either name is already allocated on this site." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:562 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4399,16 +4498,16 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590 -#: ../../include/channel.php:2318 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1614 +#: ../../include/channel.php:2334 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2335 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2336 msgid "Authenticate" msgstr "" @@ -4416,7 +4515,7 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2482 msgid "Import" msgstr "" @@ -4450,15 +4549,15 @@ msgstr "" msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228 +#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Lib/Apps.php:291 msgid "Apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:51 +#: ../../Zotlabs/Module/Apps.php:53 msgid "Manage apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:52 +#: ../../Zotlabs/Module/Apps.php:54 msgid "Create new app" msgstr "" @@ -4468,7 +4567,7 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253 +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:315 msgid "Mood" msgstr "" @@ -4506,9 +4605,9 @@ msgid "Archived/Unreachable" msgstr "" #: ../../Zotlabs/Module/Connections.php:80 -#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 -#: ../../Zotlabs/Module/Notifications.php:52 -#: ../../include/conversation.php:1717 +#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:179 +#: ../../Zotlabs/Module/Notifications.php:50 +#: ../../include/conversation.php:1726 msgid "New" msgstr "" @@ -4617,8 +4716,8 @@ msgstr "" msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235 -#: ../../include/text.php:973 +#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:298 +#: ../../include/text.php:975 msgid "Connections" msgstr "" @@ -4640,10 +4739,6 @@ msgstr "" msgid "item" msgstr "" -#: ../../Zotlabs/Module/Viewsrc.php:55 -msgid "Source of Item" -msgstr "" - #: ../../Zotlabs/Module/Bookmarks.php:56 msgid "Bookmark added" msgstr "" @@ -4688,7 +4783,7 @@ msgstr "" msgid "Page owner information could not be retrieved." msgstr "" -#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120 +#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113 msgid "Album not found." msgstr "" @@ -4696,190 +4791,190 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088 msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:551 +#: ../../Zotlabs/Module/Photos.php:556 msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Photos.php:600 +#: ../../Zotlabs/Module/Photos.php:605 msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:646 +#: ../../Zotlabs/Module/Photos.php:651 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:649 +#: ../../Zotlabs/Module/Photos.php:654 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:691 +#: ../../Zotlabs/Module/Photos.php:696 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:695 +#: ../../Zotlabs/Module/Photos.php:700 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:696 +#: ../../Zotlabs/Module/Photos.php:701 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:697 +#: ../../Zotlabs/Module/Photos.php:702 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:699 +#: ../../Zotlabs/Module/Photos.php:704 msgid "Description (optional)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:785 +#: ../../Zotlabs/Module/Photos.php:790 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:787 +#: ../../Zotlabs/Module/Photos.php:792 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386 msgid "Add Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:892 +#: ../../Zotlabs/Module/Photos.php:897 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:894 +#: ../../Zotlabs/Module/Photos.php:899 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:952 +#: ../../Zotlabs/Module/Photos.php:957 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:953 +#: ../../Zotlabs/Module/Photos.php:958 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:960 +#: ../../Zotlabs/Module/Photos.php:965 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:975 +#: ../../Zotlabs/Module/Photos.php:980 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1057 +#: ../../Zotlabs/Module/Photos.php:1062 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1059 +#: ../../Zotlabs/Module/Photos.php:1064 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1060 +#: ../../Zotlabs/Module/Photos.php:1065 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1063 +#: ../../Zotlabs/Module/Photos.php:1068 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1064 +#: ../../Zotlabs/Module/Photos.php:1069 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1065 +#: ../../Zotlabs/Module/Photos.php:1070 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1070 +#: ../../Zotlabs/Module/Photos.php:1075 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1078 +#: ../../Zotlabs/Module/Photos.php:1083 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1081 +#: ../../Zotlabs/Module/Photos.php:1086 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281 +#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:285 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282 +#: ../../Zotlabs/Module/Photos.php:1106 ../../Zotlabs/Lib/ThreadItem.php:286 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427 -#: ../../include/conversation.php:785 +#: ../../Zotlabs/Module/Photos.php:1108 ../../Zotlabs/Lib/ThreadItem.php:432 +#: ../../include/conversation.php:787 msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 -#: ../../Zotlabs/Lib/ThreadItem.php:749 +#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242 +#: ../../Zotlabs/Lib/ThreadItem.php:754 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 -#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168 -#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213 +#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173 +#: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 -#: ../../include/conversation.php:1981 ../../include/channel.php:1539 +#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:216 +#: ../../include/conversation.php:1990 ../../include/channel.php:1539 #: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" @@ -4887,56 +4982,58 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 -#: ../../include/conversation.php:1984 +#: ../../Zotlabs/Module/Photos.php:1170 ../../Zotlabs/Lib/ThreadItem.php:221 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1265 +#: ../../Zotlabs/Module/Photos.php:1270 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1274 +#: ../../Zotlabs/Module/Photos.php:1279 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1279 +#: ../../Zotlabs/Module/Photos.php:1284 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415 +#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Lib/ThreadItem.php:420 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416 +#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 +#: ../../Zotlabs/Module/Photos.php:1298 ../../Zotlabs/Lib/ThreadItem.php:426 #: ../../include/acl_selectors.php:125 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 +#: ../../Zotlabs/Module/Photos.php:1370 ../../Zotlabs/Module/Photos.php:1383 +#: ../../Zotlabs/Module/Photos.php:1384 ../../include/photos.php:668 msgid "Recent Photos" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135 +#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1293 msgid "Profile Unavailable." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123 msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114 -#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58 +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:51 +#: ../../addon/cart/cart.php:1420 +#: ../../addon/cart/submodules/paypalbutton.php:481 +#: ../../addon/cart/manual_payments.php:62 msgid "Invalid channel" msgstr "" @@ -4952,8 +5049,8 @@ msgstr "" msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928 -#: ../../include/nav.php:494 +#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1937 +#: ../../include/nav.php:486 msgid "Wikis" msgstr "" @@ -4977,22 +5074,22 @@ msgstr "" #: ../../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:1869 +#: ../../include/text.php:1886 msgid "Markdown" msgstr "" #: ../../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:1867 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1884 msgid "BBcode" msgstr "" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1887 msgid "Text" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284 +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286 msgid "Type" msgstr "" @@ -5048,47 +5145,47 @@ msgstr "" msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282 +#: ../../Zotlabs/Module/Wiki.php:377 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388 +#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1396 msgid "Embed an image from your albums" msgstr "" -#: ../../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 +#: ../../Zotlabs/Module/Wiki.php:380 ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:400 ../../include/conversation.php:1398 +#: ../../include/conversation.php:1445 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:381 ../../Zotlabs/Module/Profile_photo.php:466 -#: ../../Zotlabs/Module/Cover_photo.php:368 ../../include/conversation.php:1320 +#: ../../Zotlabs/Module/Wiki.php:381 ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:401 ../../include/conversation.php:1327 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:382 ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:369 ../../include/conversation.php:1321 +#: ../../Zotlabs/Module/Wiki.php:382 ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:402 ../../include/conversation.php:1328 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:383 ../../Zotlabs/Module/Profile_photo.php:468 -#: ../../Zotlabs/Module/Cover_photo.php:370 +#: ../../Zotlabs/Module/Wiki.php:383 ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Profile_photo.php:469 -#: ../../Zotlabs/Module/Cover_photo.php:371 ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:404 ../../include/conversation.php:1330 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:385 ../../Zotlabs/Module/Profile_photo.php:470 -#: ../../Zotlabs/Module/Cover_photo.php:372 ../../include/conversation.php:1324 +#: ../../Zotlabs/Module/Wiki.php:385 ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:405 ../../include/conversation.php:1331 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:386 ../../Zotlabs/Module/Profile_photo.php:471 -#: ../../Zotlabs/Module/Cover_photo.php:373 ../../include/conversation.php:1325 +#: ../../Zotlabs/Module/Wiki.php:386 ../../Zotlabs/Module/Profile_photo.php:472 +#: ../../Zotlabs/Module/Cover_photo.php:406 ../../include/conversation.php:1332 msgid "Error getting album" msgstr "" @@ -5188,8 +5285,8 @@ msgstr "" msgid "System layout" msgstr "" -#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254 -#: ../../include/conversation.php:1092 +#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:316 +#: ../../include/conversation.php:1097 msgid "Poke" msgstr "" @@ -5218,7 +5315,7 @@ msgid "Make this post private" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:66 -#: ../../Zotlabs/Module/Cover_photo.php:56 +#: ../../Zotlabs/Module/Cover_photo.php:57 msgid "Image uploaded but image cropping failed." msgstr "" @@ -5229,7 +5326,7 @@ msgid "Profile Photos" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:142 -#: ../../Zotlabs/Module/Cover_photo.php:159 +#: ../../Zotlabs/Module/Cover_photo.php:191 msgid "Image resize failed." msgstr "" @@ -5241,73 +5338,85 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:225 -#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195 +#: ../../Zotlabs/Module/Cover_photo.php:205 ../../include/photos.php:196 msgid "Unable to process image" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:260 -#: ../../Zotlabs/Module/Cover_photo.php:197 +#: ../../Zotlabs/Module/Cover_photo.php:229 msgid "Image upload failed." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:279 -#: ../../Zotlabs/Module/Cover_photo.php:214 +#: ../../Zotlabs/Module/Cover_photo.php:246 msgid "Unable to process image." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:343 #: ../../Zotlabs/Module/Profile_photo.php:390 -#: ../../Zotlabs/Module/Cover_photo.php:307 -#: ../../Zotlabs/Module/Cover_photo.php:322 +#: ../../Zotlabs/Module/Cover_photo.php:339 +#: ../../Zotlabs/Module/Cover_photo.php:354 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:455 -#: ../../Zotlabs/Module/Cover_photo.php:359 -msgid "Upload File:" +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your default profile photo is visible to anybody on the internet. Profile " +"photos for alternate profiles will inherit the permissions of the profile" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your profile photo is visible to anybody on the internet and may be " +"distributed to other websites." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:360 -msgid "Select a profile:" +#: ../../Zotlabs/Module/Cover_photo.php:392 +msgid "Upload File:" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Cover_photo.php:393 +msgid "Select a profile:" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:458 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Profile_photo.php:458 msgid "Change Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:458 +#: ../../Zotlabs/Module/Profile_photo.php:459 msgid "Use" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Cover_photo.php:364 -#: ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:464 +#: ../../Zotlabs/Module/Cover_photo.php:397 +#: ../../Zotlabs/Module/Cover_photo.php:398 msgid "Use a photo from your albums" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:473 -#: ../../Zotlabs/Module/Cover_photo.php:376 +#: ../../Zotlabs/Module/Profile_photo.php:474 +#: ../../Zotlabs/Module/Cover_photo.php:409 msgid "Select existing photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:492 -#: ../../Zotlabs/Module/Cover_photo.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:426 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:493 -#: ../../Zotlabs/Module/Cover_photo.php:394 +#: ../../Zotlabs/Module/Profile_photo.php:494 +#: ../../Zotlabs/Module/Cover_photo.php:427 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:495 -#: ../../Zotlabs/Module/Cover_photo.php:396 +#: ../../Zotlabs/Module/Profile_photo.php:496 +#: ../../Zotlabs/Module/Cover_photo.php:429 msgid "Done Editing" msgstr "" @@ -5327,60 +5436,68 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:874 +#: ../../Zotlabs/Module/Item.php:864 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1019 +#: ../../Zotlabs/Module/Item.php:1009 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1055 +#: ../../Zotlabs/Module/Item.php:1045 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1160 +#: ../../Zotlabs/Module/Item.php:1162 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1189 +#: ../../Zotlabs/Module/Item.php:1191 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1196 +#: ../../Zotlabs/Module/Item.php:1198 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Ping.php:330 +#: ../../Zotlabs/Module/Ping.php:332 msgid "sent you a private message" msgstr "" -#: ../../Zotlabs/Module/Ping.php:383 +#: ../../Zotlabs/Module/Ping.php:385 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:407 +#: ../../Zotlabs/Module/Ping.php:409 msgid "requires approval" msgstr "" -#: ../../Zotlabs/Module/Ping.php:417 +#: ../../Zotlabs/Module/Ping.php:419 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Module/Ping.php:435 +#: ../../Zotlabs/Module/Ping.php:437 msgid "[today]" msgstr "" -#: ../../Zotlabs/Module/Ping.php:444 +#: ../../Zotlabs/Module/Ping.php:446 msgid "posted an event" msgstr "" -#: ../../Zotlabs/Module/Ping.php:477 +#: ../../Zotlabs/Module/Ping.php:479 msgid "shared a file with you" msgstr "" +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Private forum" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Public forum" +msgstr "" + #: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29 msgid "Invalid item." msgstr "" @@ -5441,9 +5558,9 @@ msgstr "" msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247 +#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:309 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:1032 ../../include/nav.php:114 +#: ../../include/conversation.php:1037 ../../include/nav.php:108 msgid "View Profile" msgstr "" @@ -5468,7 +5585,7 @@ msgstr "" msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042 +#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1047 msgid "Recent Activity" msgstr "" @@ -5616,7 +5733,7 @@ msgstr "" msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214 +#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4158 #, php-format msgid "Connection: %s" msgstr "" @@ -5633,11 +5750,6 @@ msgstr "" msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 -#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284 -msgid "Loading" -msgstr "" - #: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241 msgid "Add permission role" msgstr "" @@ -5685,12 +5797,6 @@ msgstr "" msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - #: ../../Zotlabs/Module/Connedit.php:876 msgid "Do not import posts with this text" msgstr "" @@ -5751,13 +5857,13 @@ msgid "Bookmark this room" msgstr "" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1322 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:766 -#: ../../include/conversation.php:1435 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../include/conversation.php:1443 msgid "Encrypt text" msgstr "" @@ -5790,111 +5896,111 @@ msgstr "" msgid "min" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1834 ../../include/nav.php:401 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:310 +#: ../../include/conversation.php:1843 ../../include/nav.php:393 msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842 -#: ../../include/nav.php:409 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:305 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1851 +#: ../../include/nav.php:401 msgid "Files" msgstr "" -#: ../../Zotlabs/Module/Menu.php:49 +#: ../../Zotlabs/Module/Menu.php:67 msgid "Unable to update menu." msgstr "" -#: ../../Zotlabs/Module/Menu.php:60 +#: ../../Zotlabs/Module/Menu.php:78 msgid "Unable to create menu." msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +#: ../../Zotlabs/Module/Menu.php:160 ../../Zotlabs/Module/Menu.php:173 msgid "Menu Name" msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 +#: ../../Zotlabs/Module/Menu.php:160 msgid "Unique name (not visible on webpage) - required" msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174 msgid "Menu Title" msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 +#: ../../Zotlabs/Module/Menu.php:161 msgid "Visible on webpage - leave empty for no title" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:162 msgid "Allow Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 +#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:224 msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 +#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2459 msgid "Menus" msgstr "" -#: ../../Zotlabs/Module/Menu.php:117 +#: ../../Zotlabs/Module/Menu.php:180 msgid "Bookmarks allowed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:119 +#: ../../Zotlabs/Module/Menu.php:182 msgid "Delete this menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 +#: ../../Zotlabs/Module/Menu.php:183 ../../Zotlabs/Module/Menu.php:218 msgid "Edit menu contents" msgstr "" -#: ../../Zotlabs/Module/Menu.php:121 +#: ../../Zotlabs/Module/Menu.php:184 msgid "Edit this menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:136 +#: ../../Zotlabs/Module/Menu.php:200 msgid "Menu could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Menu.php:149 +#: ../../Zotlabs/Module/Menu.php:213 msgid "Edit Menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:153 +#: ../../Zotlabs/Module/Menu.php:217 msgid "Add or remove entries to this menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 +#: ../../Zotlabs/Module/Menu.php:219 msgid "Menu name" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 +#: ../../Zotlabs/Module/Menu.php:219 msgid "Must be unique, only seen by you" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 +#: ../../Zotlabs/Module/Menu.php:220 msgid "Menu title" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 +#: ../../Zotlabs/Module/Menu.php:220 msgid "Menu title as seen by others" msgstr "" -#: ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Menu.php:221 msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2460 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251 -#: ../../include/nav.php:176 ../../include/nav.php:280 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:313 +#: ../../include/nav.php:170 ../../include/nav.php:272 #: ../../include/help.php:68 ../../include/help.php:74 msgid "Help" msgstr "" @@ -5911,11 +6017,11 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:120 +#: ../../Zotlabs/Module/Cloud.php:129 msgid "Please refresh page" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:123 +#: ../../Zotlabs/Module/Cloud.php:132 msgid "Unknown error" msgstr "" @@ -5949,12 +6055,12 @@ msgid "Post not found." msgstr "" #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 -#: ../../include/bbcode.php:352 +#: ../../include/bbcode.php:354 msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2013 +#: ../../include/text.php:2030 msgid "comment" msgstr "" @@ -5978,11 +6084,6 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../Zotlabs/Module/Defperms.php:239 -msgid "" -"If enabled, connection requests will be approved without your interaction" -msgstr "" - #: ../../Zotlabs/Module/Defperms.php:246 msgid "Automatic approval settings" msgstr "" @@ -6010,57 +6111,76 @@ msgstr "" msgid "Allow" msgstr "" -#: ../../Zotlabs/Module/Group.php:24 +#: ../../Zotlabs/Module/Group.php:35 msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Group.php:30 +#: ../../Zotlabs/Module/Group.php:38 msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:4181 +#: ../../Zotlabs/Module/Group.php:51 ../../Zotlabs/Module/Group.php:181 +#: ../../include/items.php:4125 msgid "Privacy group not found." msgstr "" -#: ../../Zotlabs/Module/Group.php:58 +#: ../../Zotlabs/Module/Group.php:67 msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Group.php:92 -msgid "Create a group of channels." +#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124 +#: ../../Zotlabs/Widget/Activity_filter.php:68 ../../include/features.php:221 +#: ../../include/nav.php:97 ../../include/group.php:320 +msgid "Privacy Groups" msgstr "" -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186 -msgid "Privacy group name: " +#: ../../Zotlabs/Module/Group.php:114 +msgid "Add Group" msgstr "" -#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189 +#: ../../Zotlabs/Module/Group.php:118 +msgid "Privacy group name" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220 msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Group.php:113 +#: ../../Zotlabs/Module/Group.php:126 ../../Zotlabs/Module/Help.php:81 +msgid "Members" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:151 msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Group.php:115 +#: ../../Zotlabs/Module/Group.php:153 msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:185 -msgid "Privacy group editor" +#: ../../Zotlabs/Module/Group.php:215 +#, php-format +msgid "Privacy Group: %s" msgstr "" -#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81 -msgid "Members" +#: ../../Zotlabs/Module/Group.php:217 +msgid "Privacy group name: " +msgstr "" + +#: ../../Zotlabs/Module/Group.php:222 +msgid "Delete Group" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:232 +msgid "Group members" msgstr "" -#: ../../Zotlabs/Module/Group.php:201 -msgid "All Connected Channels" +#: ../../Zotlabs/Module/Group.php:234 +msgid "Not in this group" msgstr "" -#: ../../Zotlabs/Module/Group.php:233 -msgid "Click on a channel to add or remove." +#: ../../Zotlabs/Module/Group.php:266 +msgid "Click a channel to toggle membership" msgstr "" #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 @@ -6186,7 +6306,7 @@ msgstr "" msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708 +#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1717 msgid "Personal" msgstr "" @@ -6337,7 +6457,7 @@ msgid "Profile Image" msgstr "" #: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 -#: ../../include/nav.php:117 +#: ../../include/nav.php:111 msgid "Edit Profiles" msgstr "" @@ -6416,8 +6536,8 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240 -#: ../../include/nav.php:102 ../../include/nav.php:190 +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:302 +#: ../../include/nav.php:94 msgid "Channel Manager" msgstr "" @@ -6452,8 +6572,8 @@ msgid "Delegated Channel" msgstr "" #: ../../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 +#: ../../Zotlabs/Lib/Apps.php:293 ../../include/conversation.php:1902 +#: ../../include/features.php:123 ../../include/nav.php:450 msgid "Cards" msgstr "" @@ -6465,45 +6585,49 @@ msgstr "" msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:18 +#: ../../Zotlabs/Module/Siteinfo.php:21 msgid "About this site" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:19 +#: ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Name" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:23 +#: ../../Zotlabs/Module/Siteinfo.php:26 msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232 +#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241 msgid "Terms of Service" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:26 +#: ../../Zotlabs/Module/Siteinfo.php:29 msgid "Software and Project information" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:27 +#: ../../Zotlabs/Module/Siteinfo.php:30 msgid "This site is powered by $Projectname" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:28 +#: ../../Zotlabs/Module/Siteinfo.php:31 msgid "" "Federated and decentralised networking and identity services provided by Zot" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:30 +#: ../../Zotlabs/Module/Siteinfo.php:34 +msgid "Additional federated transport protocols:" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:36 #, php-format msgid "Version %s" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:31 +#: ../../Zotlabs/Module/Siteinfo.php:37 msgid "Project homepage" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:32 +#: ../../Zotlabs/Module/Siteinfo.php:38 msgid "Developer homepage" msgstr "" @@ -6512,7 +6636,7 @@ msgid "No ratings" msgstr "" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1082 +#: ../../include/conversation.php:1087 msgid "Ratings" msgstr "" @@ -6544,8 +6668,8 @@ msgstr "" msgid "Export selected" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244 -#: ../../include/conversation.php:1915 ../../include/nav.php:481 +#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:306 +#: ../../include/conversation.php:1924 ../../include/nav.php:473 msgid "Webpages" msgstr "" @@ -6688,76 +6812,84 @@ msgstr "" msgid "Redeliver" msgstr "" -#: ../../Zotlabs/Module/Sources.php:37 +#: ../../Zotlabs/Module/Sources.php:38 msgid "Failed to create source. No channel selected." msgstr "" -#: ../../Zotlabs/Module/Sources.php:51 +#: ../../Zotlabs/Module/Sources.php:54 msgid "Source created." msgstr "" -#: ../../Zotlabs/Module/Sources.php:64 +#: ../../Zotlabs/Module/Sources.php:67 msgid "Source updated." msgstr "" -#: ../../Zotlabs/Module/Sources.php:90 +#: ../../Zotlabs/Module/Sources.php:93 msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:96 +#: ../../Zotlabs/Module/Sources.php:99 #: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 msgid "Channel Sources" msgstr "" -#: ../../Zotlabs/Module/Sources.php:97 +#: ../../Zotlabs/Module/Sources.php:100 msgid "Manage remote sources of content for your channel." msgstr "" -#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108 +#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111 msgid "New Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." msgstr "" -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 msgid "Only import content with these words (one per line)" msgstr "" -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 msgid "Leave blank to import all public content" msgstr "" -#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148 +#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153 msgid "Channel Name" msgstr "" -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 msgid "" "Add the following categories to posts imported from this source (comma " "separated)" msgstr "" -#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Resend posts with this channel as author" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Copyrights may apply" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166 msgid "Source not found." msgstr "" -#: ../../Zotlabs/Module/Sources.php:140 +#: ../../Zotlabs/Module/Sources.php:143 msgid "Edit Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:141 +#: ../../Zotlabs/Module/Sources.php:144 msgid "Delete Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:169 +#: ../../Zotlabs/Module/Sources.php:174 msgid "Source removed" msgstr "" -#: ../../Zotlabs/Module/Sources.php:171 +#: ../../Zotlabs/Module/Sources.php:176 msgid "Unable to remove source." msgstr "" @@ -6796,13 +6928,13 @@ msgstr "" msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 -#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1559 +#: ../../addon/pubcrawl/as.php:1544 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1546 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -6823,17 +6955,17 @@ msgstr "" msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072 +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2102 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074 +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2104 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076 +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2106 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -6892,7 +7024,7 @@ msgstr "" #: ../../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:1376 +#: ../../include/conversation.php:1057 ../../include/channel.php:1376 #: ../../include/connections.php:110 msgid "Connect" msgstr "" @@ -7041,7 +7173,6 @@ msgid "Subject:" msgstr "" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1385 msgid "Attach file" msgstr "" @@ -7050,7 +7181,7 @@ msgid "Send" msgstr "" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1430 +#: ../../include/conversation.php:1438 msgid "Set expiration date" msgstr "" @@ -7126,19 +7257,19 @@ msgstr "" msgid "Rate" msgstr "" -#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267 +#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:269 msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273 +#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:275 msgid "block" msgstr "" -#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270 +#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:272 msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276 +#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:278 msgid "menu" msgstr "" @@ -7176,7 +7307,7 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:162 msgid "Save to Folder" msgstr "" @@ -7223,98 +7354,123 @@ msgstr "" msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:202 +#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" msgstr "" -#: ../../Zotlabs/Module/Register.php:212 +#: ../../Zotlabs/Module/Register.php:210 +msgid "Registration on this hub is by invitation only." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:221 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:238 +#: ../../Zotlabs/Module/Register.php:247 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:245 +#: ../../Zotlabs/Module/Register.php:254 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:250 +#: ../../Zotlabs/Module/Register.php:259 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:251 +#: ../../Zotlabs/Module/Register.php:260 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:252 +#: ../../Zotlabs/Module/Register.php:261 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:253 +#: ../../Zotlabs/Module/Register.php:262 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 -msgid "no" +#: ../../Zotlabs/Module/Register.php:263 +msgid "Your Name" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 -msgid "yes" +#: ../../Zotlabs/Module/Register.php:263 +msgid "Real names are preferred." msgstr "" -#: ../../Zotlabs/Module/Register.php:274 -msgid "Membership on this site is by invitation only." +#: ../../Zotlabs/Module/Register.php:265 +#, php-format +msgid "" +"Your nickname will be used to create an easy to remember channel address e." +"g. nickname%s" msgstr "" -#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570 -#: ../../include/nav.php:164 +#: ../../Zotlabs/Module/Register.php:266 +msgid "" +"Select a channel permission role for your usage needs and privacy " +"requirements." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:267 +msgid "no" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:267 +msgid "yes" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:294 ../../boot.php:1593 +#: ../../include/nav.php:158 msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Register.php:287 +#: ../../Zotlabs/Module/Register.php:295 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:136 -#: ../../Zotlabs/Module/Cover_photo.php:186 +#: ../../Zotlabs/Module/Cover_photo.php:168 +#: ../../Zotlabs/Module/Cover_photo.php:218 msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558 +#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4502 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559 +#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4503 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560 +#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4504 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561 +#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4505 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563 +#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4507 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070 +#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2081 msgid "cover photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Cover_photo.php:390 +msgid "Your cover photo may be visible to anybody on the internet" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Change Cover Photo" msgstr "" @@ -7322,8 +7478,8 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824 -#: ../../include/nav.php:391 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1833 +#: ../../include/nav.php:383 msgid "About" msgstr "" @@ -7367,39 +7523,27 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Network.php:100 +#: ../../Zotlabs/Module/Network.php:116 msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:142 +#: ../../Zotlabs/Module/Network.php:157 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:147 -msgid "forum" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:159 -msgid "Search Results For:" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:229 +#: ../../Zotlabs/Module/Network.php:242 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:238 +#: ../../Zotlabs/Module/Network.php:253 msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Network.php:265 -msgid "Invalid connection." -msgstr "" - -#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:304 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "" -#: ../../Zotlabs/Module/Acl.php:361 +#: ../../Zotlabs/Module/Acl.php:359 msgid "network" msgstr "" @@ -7417,44 +7561,44 @@ msgstr "" msgid "Permission Denied." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:95 +#: ../../Zotlabs/Module/Filestorage.php:112 msgid "File not found." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:142 +#: ../../Zotlabs/Module/Filestorage.php:165 msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:154 +#: ../../Zotlabs/Module/Filestorage.php:177 msgid "Set/edit permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:178 msgid "Include all files and sub folders" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:156 +#: ../../Zotlabs/Module/Filestorage.php:179 msgid "Return to file list" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:158 +#: ../../Zotlabs/Module/Filestorage.php:181 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:159 +#: ../../Zotlabs/Module/Filestorage.php:182 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:161 +#: ../../Zotlabs/Module/Filestorage.php:184 msgid "Share this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:162 +#: ../../Zotlabs/Module/Filestorage.php:185 msgid "Show URL to this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 msgid "Show in your contacts shared folder" msgstr "" @@ -7503,47 +7647,47 @@ msgstr "" msgid "Expiring accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:112 +#: ../../Zotlabs/Module/Admin.php:116 msgid "Clones" msgstr "" -#: ../../Zotlabs/Module/Admin.php:118 +#: ../../Zotlabs/Module/Admin.php:122 msgid "Message queues" msgstr "" -#: ../../Zotlabs/Module/Admin.php:132 +#: ../../Zotlabs/Module/Admin.php:136 msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Admin.php:137 +#: ../../Zotlabs/Module/Admin.php:141 msgid "Summary" msgstr "" -#: ../../Zotlabs/Module/Admin.php:140 +#: ../../Zotlabs/Module/Admin.php:144 msgid "Registered accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:141 +#: ../../Zotlabs/Module/Admin.php:145 msgid "Pending registrations" msgstr "" -#: ../../Zotlabs/Module/Admin.php:142 +#: ../../Zotlabs/Module/Admin.php:146 msgid "Registered channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:143 -msgid "Active plugins" +#: ../../Zotlabs/Module/Admin.php:147 +msgid "Active addons" msgstr "" -#: ../../Zotlabs/Module/Admin.php:144 +#: ../../Zotlabs/Module/Admin.php:148 msgid "Version" msgstr "" -#: ../../Zotlabs/Module/Admin.php:145 +#: ../../Zotlabs/Module/Admin.php:149 msgid "Repository version (master)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:146 +#: ../../Zotlabs/Module/Admin.php:150 msgid "Repository version (dev)" msgstr "" @@ -7596,7 +7740,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1622 msgid "Password Reset" msgstr "" @@ -7641,8 +7785,8 @@ msgstr "" msgid "Email Address" msgstr "" -#: ../../Zotlabs/Module/Notifications.php:62 -#: ../../Zotlabs/Lib/ThreadItem.php:408 +#: ../../Zotlabs/Module/Notifications.php:60 +#: ../../Zotlabs/Lib/ThreadItem.php:413 msgid "Mark all seen" msgstr "" @@ -7670,124 +7814,120 @@ msgstr "" msgid "5. Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:231 +#: ../../Zotlabs/Lib/Apps.php:294 msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16 +#: ../../Zotlabs/Lib/Apps.php:295 ../../addon/buglink/buglink.php:16 msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:233 +#: ../../Zotlabs/Lib/Apps.php:296 msgid "View Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:234 +#: ../../Zotlabs/Lib/Apps.php:297 msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:236 -msgid "Firefox Share" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:237 +#: ../../Zotlabs/Lib/Apps.php:299 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417 +#: ../../Zotlabs/Lib/Apps.php:300 ../../include/features.php:435 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589 ../../include/nav.php:126 -#: ../../include/nav.php:130 +#: ../../Zotlabs/Lib/Apps.php:301 ../../boot.php:1613 ../../include/nav.php:120 +#: ../../include/nav.php:124 msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:241 +#: ../../Zotlabs/Lib/Apps.php:303 msgid "Activity" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931 -#: ../../include/features.php:96 ../../include/nav.php:497 +#: ../../Zotlabs/Lib/Apps.php:307 ../../include/conversation.php:1940 +#: ../../include/features.php:96 ../../include/nav.php:489 msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:246 +#: ../../Zotlabs/Lib/Apps.php:308 msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853 -#: ../../include/conversation.php:1856 +#: ../../Zotlabs/Lib/Apps.php:311 ../../include/conversation.php:1862 +#: ../../include/conversation.php:1865 msgid "Events" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:250 +#: ../../Zotlabs/Lib/Apps.php:312 msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:252 +#: ../../Zotlabs/Lib/Apps.php:314 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:255 +#: ../../Zotlabs/Lib/Apps.php:317 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:257 +#: ../../Zotlabs/Lib/Apps.php:319 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:258 +#: ../../Zotlabs/Lib/Apps.php:320 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:259 +#: ../../Zotlabs/Lib/Apps.php:321 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:260 +#: ../../Zotlabs/Lib/Apps.php:322 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:261 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69 +#: ../../Zotlabs/Lib/Apps.php:324 ../../addon/openid/MysqlProvider.php:69 msgid "Language" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:263 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58 +#: ../../Zotlabs/Lib/Apps.php:326 ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 #: ../../addon/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:407 +#: ../../Zotlabs/Lib/Apps.php:473 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:411 +#: ../../Zotlabs/Lib/Apps.php:477 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:419 +#: ../../Zotlabs/Lib/Apps.php:485 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:420 +#: ../../Zotlabs/Lib/Apps.php:486 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:421 +#: ../../Zotlabs/Lib/Apps.php:487 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:422 +#: ../../Zotlabs/Lib/Apps.php:488 msgid "Unpin from navbar" msgstr "" @@ -7874,8 +8014,8 @@ msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744 -#: ../../include/bbcode.php:914 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:746 +#: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "" @@ -8247,208 +8387,200 @@ msgstr "" msgid "Update %s failed. See error logs." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697 +#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:700 msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689 +#: ../../Zotlabs/Lib/ThreadItem.php:152 ../../Zotlabs/Storage/Browser.php:280 +msgid "Admin Delete" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:158 ../../include/conversation.php:690 msgid "Select" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I will attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I might attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I agree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I disagree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I abstain" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:238 -msgid "Add Star" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:239 -msgid "Remove Star" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:240 +#: ../../Zotlabs/Lib/ThreadItem.php:247 ../../include/conversation.php:695 msgid "Toggle Star Status" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:244 -msgid "starred" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704 +#: ../../Zotlabs/Lib/ThreadItem.php:258 ../../include/conversation.php:707 msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705 +#: ../../Zotlabs/Lib/ThreadItem.php:259 ../../include/conversation.php:708 msgid "Message signature incorrect" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:263 +#: ../../Zotlabs/Lib/ThreadItem.php:267 msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 +#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../include/taxonomy.php:575 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 +#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../include/taxonomy.php:576 msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:290 msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:290 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:295 +#: ../../Zotlabs/Lib/ThreadItem.php:299 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:313 +#: ../../Zotlabs/Lib/ThreadItem.php:317 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344 +#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:347 +#: ../../Zotlabs/Lib/ThreadItem.php:351 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:348 +#: ../../Zotlabs/Lib/ThreadItem.php:352 msgid "via" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:349 +#: ../../Zotlabs/Lib/ThreadItem.php:353 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:350 +#: ../../Zotlabs/Lib/ThreadItem.php:354 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763 +#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:766 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766 +#: ../../Zotlabs/Lib/ThreadItem.php:370 ../../include/conversation.php:769 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767 +#: ../../Zotlabs/Lib/ThreadItem.php:371 ../../include/conversation.php:770 #, php-format msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:374 +#: ../../Zotlabs/Lib/ThreadItem.php:379 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:375 +#: ../../Zotlabs/Lib/ThreadItem.php:380 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:376 +#: ../../Zotlabs/Lib/ThreadItem.php:381 msgid "Vote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:377 +#: ../../Zotlabs/Lib/ThreadItem.php:382 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:398 +#: ../../Zotlabs/Lib/ThreadItem.php:403 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:399 +#: ../../Zotlabs/Lib/ThreadItem.php:404 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483 +#: ../../Zotlabs/Lib/ThreadItem.php:431 ../../include/conversation.php:483 msgid "This is an unsaved preview" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:463 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380 +#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1388 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381 +#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1389 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382 +#: ../../Zotlabs/Lib/ThreadItem.php:760 ../../include/conversation.php:1390 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383 +#: ../../Zotlabs/Lib/ThreadItem.php:761 ../../include/conversation.php:1391 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384 +#: ../../Zotlabs/Lib/ThreadItem.php:762 ../../include/conversation.php:1392 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:758 +#: ../../Zotlabs/Lib/ThreadItem.php:763 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:759 -msgid "Attach File" +#: ../../Zotlabs/Lib/ThreadItem.php:764 ../../include/conversation.php:1393 +msgid "Attach/Upload file" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:760 +#: ../../Zotlabs/Lib/ThreadItem.php:765 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:761 +#: ../../Zotlabs/Lib/ThreadItem.php:766 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../Zotlabs/Lib/ThreadItem.php:776 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:772 +#: ../../Zotlabs/Lib/ThreadItem.php:777 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:773 +#: ../../Zotlabs/Lib/ThreadItem.php:778 msgid "Your website URL (optional)" msgstr "" @@ -8464,11 +8596,11 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289 msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2817 msgid "Collection" msgstr "" @@ -8480,8 +8612,8 @@ msgstr "" msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420 -#: ../../include/nav.php:423 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:412 +#: ../../include/nav.php:415 msgid "Calendar" msgstr "" @@ -8505,33 +8637,36 @@ msgstr "" msgid "Add Files" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:353 +#: ../../Zotlabs/Storage/Browser.php:361 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:358 +#: ../../Zotlabs/Storage/Browser.php:366 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:369 +#: ../../Zotlabs/Storage/Browser.php:377 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Storage/Browser.php:389 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:383 +#: ../../Zotlabs/Storage/Browser.php:391 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:396 +#: ../../Zotlabs/Storage/Browser.php:404 msgid "Drop files here to immediately upload" msgstr "" #: ../../Zotlabs/Widget/Forums.php:100 +#: ../../Zotlabs/Widget/Activity_filter.php:100 +#: ../../Zotlabs/Widget/Notifications.php:119 +#: ../../Zotlabs/Widget/Notifications.php:120 msgid "Forums" msgstr "" @@ -8611,7 +8746,7 @@ msgstr "" msgid "Select an addressbook to import to" msgstr "" -#: ../../Zotlabs/Widget/Appcategories.php:40 +#: ../../Zotlabs/Widget/Appcategories.php:43 #: ../../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 @@ -8619,7 +8754,8 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31 +#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31 +#: ../../widgets/Netselect/Netselect.php:26 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 msgid "Everything" @@ -8670,8 +8806,8 @@ msgid "New Message" msgstr "" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1867 ../../include/conversation.php:1870 -#: ../../include/nav.php:434 ../../include/nav.php:437 +#: ../../include/conversation.php:1876 ../../include/conversation.php:1879 +#: ../../include/nav.php:426 ../../include/nav.php:429 msgid "Chatrooms" msgstr "" @@ -8696,6 +8832,74 @@ msgctxt "widget" msgid "Activity" msgstr "" +#: ../../Zotlabs/Widget/Activity_filter.php:24 +msgid "Personal Posts" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:28 +msgid "Show posts that mention or involve me" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:39 +msgid "Starred Posts" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:43 +msgid "Show posts that I have starred" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:63 +#, php-format +msgid "Show posts related to the %s privacy group" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:72 +msgid "Show my privacy groups" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:93 +msgid "Show posts to this forum" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:104 +msgid "Show forums" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:128 +#, php-format +msgid "Show posts that I have filed to %s" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:134 +#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 +#: ../../include/features.php:488 +msgid "Saved Folders" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:138 +msgid "Show filed post categories" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:152 +msgid "Panel search" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:162 +#: ../../Zotlabs/Widget/Notifications.php:27 +#: ../../Zotlabs/Widget/Notifications.php:46 +#: ../../Zotlabs/Widget/Notifications.php:122 +#: ../../Zotlabs/Widget/Notifications.php:153 +msgid "Filter by name" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:177 +msgid "Remove active filter" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_filter.php:193 +msgid "Activity Filters" +msgstr "" + #: ../../Zotlabs/Widget/Follow.php:22 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." @@ -8757,7 +8961,7 @@ msgstr "" msgid "Saved Searches" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333 +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:325 msgid "add" msgstr "" @@ -8794,9 +8998,32 @@ msgstr "" msgid "See more..." msgstr "" -#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:470 -msgid "Saved Folders" +#: ../../Zotlabs/Widget/Activity_order.php:86 +msgid "Commented Date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:90 +msgid "Order by last commented date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:93 +msgid "Posted Date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:97 +msgid "Order by last posted date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:100 +msgid "Date Unthreaded" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:104 +msgid "Order unthreaded by date" +msgstr "" + +#: ../../Zotlabs/Widget/Activity_order.php:119 +msgid "Activity Order" msgstr "" #: ../../Zotlabs/Widget/Cover_photo.php:54 @@ -8808,6 +9035,18 @@ msgstr "" msgid "Tags" msgstr "" +#: ../../Zotlabs/Widget/Appstore.php:11 +msgid "App Collections" +msgstr "" + +#: ../../Zotlabs/Widget/Appstore.php:13 +msgid "Available Apps" +msgstr "" + +#: ../../Zotlabs/Widget/Appstore.php:14 +msgid "Installed apps" +msgstr "" + #: ../../Zotlabs/Widget/Newmember.php:24 msgid "Profile Creation" msgstr "" @@ -8820,7 +9059,7 @@ msgstr "" msgid "Upload cover photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:113 msgid "Edit your profile" msgstr "" @@ -8872,12 +9111,12 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:191 msgid "Admin" msgstr "" #: ../../Zotlabs/Widget/Admin.php:56 -msgid "Plugin Features" +msgid "Addon Features" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:35 @@ -8916,10 +9155,6 @@ msgstr "" msgid "OAuth2 apps" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 -msgid "Permission Groups" -msgstr "" - #: ../../Zotlabs/Widget/Settings_menu.php:125 msgid "Premium Channel Settings" msgstr "" @@ -8946,16 +9181,10 @@ msgstr "" #: ../../Zotlabs/Widget/Notifications.php:26 #: ../../Zotlabs/Widget/Notifications.php:45 -#: ../../Zotlabs/Widget/Notifications.php:141 +#: ../../Zotlabs/Widget/Notifications.php:152 msgid "Show new posts only" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:27 -#: ../../Zotlabs/Widget/Notifications.php:46 -#: ../../Zotlabs/Widget/Notifications.php:142 -msgid "Filter by name" -msgstr "" - #: ../../Zotlabs/Widget/Notifications.php:35 msgid "New Home Activity" msgstr "" @@ -8969,7 +9198,7 @@ msgid "View your home activity" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:42 -#: ../../Zotlabs/Widget/Notifications.php:138 +#: ../../Zotlabs/Widget/Notifications.php:149 msgid "Mark all notifications seen" msgstr "" @@ -9034,23 +9263,23 @@ msgstr "" msgid "Mark all notices seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:121 +#: ../../Zotlabs/Widget/Notifications.php:132 msgid "New Registrations" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:122 +#: ../../Zotlabs/Widget/Notifications.php:133 msgid "New Registrations Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:132 +#: ../../Zotlabs/Widget/Notifications.php:143 msgid "Public Stream Notifications" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:135 +#: ../../Zotlabs/Widget/Notifications.php:146 msgid "View the public stream" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:150 +#: ../../Zotlabs/Widget/Notifications.php:161 msgid "Sorry, you have got no notifications at the moment" msgstr "" @@ -9058,57 +9287,53 @@ msgstr "" msgid "Source channel not found." msgstr "" -#: ../../boot.php:1569 +#: ../../boot.php:1592 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140 -#: ../../include/nav.php:159 +#: ../../boot.php:1612 ../../include/nav.php:105 ../../include/nav.php:134 +#: ../../include/nav.php:153 msgid "Logout" msgstr "" -#: ../../boot.php:1592 +#: ../../boot.php:1616 msgid "Login/Email" msgstr "" -#: ../../boot.php:1593 +#: ../../boot.php:1617 msgid "Password" msgstr "" -#: ../../boot.php:1594 +#: ../../boot.php:1618 msgid "Remember me" msgstr "" -#: ../../boot.php:1597 +#: ../../boot.php:1621 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2354 +#: ../../boot.php:2405 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2359 +#: ../../boot.php:2410 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2475 +#: ../../boot.php:2526 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2480 +#: ../../boot.php:2531 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2481 ../../include/datetime.php:238 +#: ../../boot.php:2532 ../../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 @@ -9225,6 +9450,33 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" +#: ../../widgets/Netselect/Netselect.php:24 +msgid "Network/Protocol" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:28 ../../include/network.php:1772 +msgid "Zot" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:31 ../../include/network.php:1770 +msgid "Diaspora" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:33 ../../include/network.php:1763 +#: ../../include/network.php:1764 +msgid "Friendica" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:38 ../../include/network.php:1765 +msgid "OStatus" +msgstr "" + +#: ../../widgets/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1219 +#: ../../addon/pubcrawl/as.php:1374 ../../addon/pubcrawl/as.php:1553 +#: ../../include/network.php:1768 +msgid "ActivityPub" +msgstr "" + #: ../../addon/rendezvous/rendezvous.php:57 msgid "Errors encountered deleting database table " msgstr "" @@ -9366,30 +9618,30 @@ msgstr "" msgid "Skeleton Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:249 +#: ../../addon/gnusoc/gnusoc.php:258 msgid "GNU-Social Protocol Settings updated." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:268 +#: ../../addon/gnusoc/gnusoc.php:277 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:271 +#: ../../addon/gnusoc/gnusoc.php:280 msgid "Enable the GNU-Social protocol for this channel" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:275 +#: ../../addon/gnusoc/gnusoc.php:284 msgid "GNU-Social Protocol Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:471 +#: ../../addon/gnusoc/gnusoc.php:480 msgid "Follow" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:474 +#: ../../addon/gnusoc/gnusoc.php:483 #, php-format msgid "%1$s is now following %2$s" msgstr "" @@ -9436,7 +9688,7 @@ msgid "Page to load after image selection." msgstr "" #: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 -#: ../../include/nav.php:119 +#: ../../include/nav.php:113 msgid "Edit Profile" msgstr "" @@ -9822,6 +10074,14 @@ msgstr "" msgid "IRC Chatroom" msgstr "" +#: ../../addon/gallery/gallery.php:42 ../../addon/gallery/Mod_Gallery.php:111 +msgid "Gallery" +msgstr "" + +#: ../../addon/gallery/gallery.php:45 +msgid "Photo Gallery" +msgstr "" + #: ../../addon/ljpost/ljpost.php:42 msgid "Post to LiveJournal" msgstr "" @@ -9924,7 +10184,7 @@ msgstr "" msgid "OpenID protocol error. No ID returned." msgstr "" -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:317 msgid "Login failed." msgstr "" @@ -10121,38 +10381,38 @@ msgstr "" msgid "declared undying love for" msgstr "" -#: ../../addon/diaspora/diaspora.php:781 +#: ../../addon/diaspora/diaspora.php:786 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../addon/diaspora/diaspora.php:800 +#: ../../addon/diaspora/diaspora.php:805 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:803 +#: ../../addon/diaspora/diaspora.php:808 msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../addon/diaspora/diaspora.php:807 +#: ../../addon/diaspora/diaspora.php:812 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../addon/diaspora/diaspora.php:811 +#: ../../addon/diaspora/diaspora.php:816 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/diaspora.php:815 +#: ../../addon/diaspora/diaspora.php:820 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/diaspora.php:820 +#: ../../addon/diaspora/diaspora.php:825 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/diaspora/diaspora.php:830 msgid "Diaspora Protocol Settings" msgstr "" @@ -10160,7 +10420,7 @@ msgstr "" msgid "No username found in import file." msgstr "" -#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67 +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:72 msgid "Unable to create a unique channel address. Import failed." msgstr "" @@ -10623,35 +10883,40 @@ msgstr "" msgid "Friendica Login Password" msgstr "" -#: ../../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:1053 +#: ../../addon/pubcrawl/pubcrawl.php:1136 msgid "ActivityPub Protocol Settings updated." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1062 +#: ../../addon/pubcrawl/pubcrawl.php:1145 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:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1148 msgid "Enable the ActivityPub protocol for this channel" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1068 +#: ../../addon/pubcrawl/pubcrawl.php:1151 +msgid "Deliver to ActivityPub recipients in privacy groups" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1151 +msgid "" +"May result in a large number of mentions and expose all the members of your " +"privacy group" +msgstr "" + +#: ../../addon/pubcrawl/pubcrawl.php:1155 msgid "Send multi-media HTML articles" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1068 +#: ../../addon/pubcrawl/pubcrawl.php:1155 msgid "Not supported by some microblog services such as Mastodon" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1072 +#: ../../addon/pubcrawl/pubcrawl.php:1159 msgid "ActivityPub Protocol Settings" msgstr "" @@ -11135,75 +11400,206 @@ msgstr "" msgid "Smileybutton Settings" msgstr "" -#: ../../addon/cart/myshop.php:138 +#: ../../addon/cart/myshop.php:44 +msgid "Access Denied." +msgstr "" + +#: ../../addon/cart/myshop.php:125 ../../addon/cart/cart.php:1324 msgid "Order Not Found" msgstr "" -#: ../../addon/cart/cart.php:810 -msgid "Order cannot be checked out." +#: ../../addon/cart/myshop.php:155 ../../addon/cart/myshop.php:191 +#: ../../addon/cart/myshop.php:225 ../../addon/cart/myshop.php:273 +#: ../../addon/cart/myshop.php:308 ../../addon/cart/myshop.php:331 +msgid "Access Denied" msgstr "" -#: ../../addon/cart/cart.php:1073 +#: ../../addon/cart/myshop.php:200 ../../addon/cart/myshop.php:234 +#: ../../addon/cart/myshop.php:283 ../../addon/cart/myshop.php:341 +msgid "Invalid Item" +msgstr "" + +#: ../../addon/cart/cart.php:467 +msgid "[cart] Item Added" +msgstr "" + +#: ../../addon/cart/cart.php:851 +msgid "Order already checked out." +msgstr "" + +#: ../../addon/cart/cart.php:1204 msgid "Enable Shopping Cart" msgstr "" -#: ../../addon/cart/cart.php:1080 +#: ../../addon/cart/cart.php:1211 msgid "Enable Test Catalog" msgstr "" -#: ../../addon/cart/cart.php:1088 +#: ../../addon/cart/cart.php:1219 msgid "Enable Manual Payments" msgstr "" -#: ../../addon/cart/cart.php:1103 -msgid "Base Cart Settings" +#: ../../addon/cart/cart.php:1238 +msgid "Base Merchant Currency" msgstr "" -#: ../../addon/cart/cart.php:1151 -msgid "Add Item" +#: ../../addon/cart/cart.php:1250 +msgid "Cart - Base Settings" msgstr "" -#: ../../addon/cart/cart.php:1165 -msgid "Call cart_post_" +#: ../../addon/cart/cart.php:1271 ../../addon/cart/cart.php:1274 +msgid "Shop" msgstr "" -#: ../../addon/cart/cart.php:1195 +#: ../../addon/cart/cart.php:1401 +msgid "You must be logged into the Grid to shop." +msgstr "" + +#: ../../addon/cart/cart.php:1411 msgid "Cart Not Enabled (profile: " msgstr "" -#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36 +#: ../../addon/cart/cart.php:1442 +#: ../../addon/cart/submodules/paypalbutton.php:417 +#: ../../addon/cart/manual_payments.php:37 msgid "Order not found." msgstr "" -#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389 -msgid "No Order Found" +#: ../../addon/cart/cart.php:1451 +msgid "Access denied." msgstr "" -#: ../../addon/cart/cart.php:1270 -msgid "call: " +#: ../../addon/cart/cart.php:1503 ../../addon/cart/cart.php:1647 +msgid "No Order Found" msgstr "" -#: ../../addon/cart/cart.php:1273 +#: ../../addon/cart/cart.php:1512 msgid "An unknown error has occurred Please start again." msgstr "" -#: ../../addon/cart/cart.php:1414 +#: ../../addon/cart/cart.php:1680 msgid "Invalid Payment Type. Please start again." msgstr "" -#: ../../addon/cart/cart.php:1421 +#: ../../addon/cart/cart.php:1687 msgid "Order not found" msgstr "" -#: ../../addon/cart/manual_payments.php:9 +#: ../../addon/cart/submodules/paypalbutton.php:97 +msgid "Enable Paypal Button Module" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:102 +msgid "Use Production Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:109 +msgid "Paypal Sandbox Client Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:116 +msgid "Paypal Sandbox Secret Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:122 +msgid "Paypal Production Client Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:129 +msgid "Paypal Production Secret Key" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:143 +msgid "Cart - Paypal Addon" +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:277 +msgid "Paypal button payments are not enabled." +msgstr "" + +#: ../../addon/cart/submodules/paypalbutton.php:295 +msgid "" +"Paypal button payments are not properly configured. Please choose another " +"payment option." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:71 +msgid "Enable Hubzilla Services Module" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:77 +msgid "Cart - Hubzilla Services Addon" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:169 +msgid "New Sku" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:204 +msgid "Cannot save edits to locked item." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:252 +#: ../../addon/cart/submodules/hzservices.php:339 +msgid "SKU not found." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:305 +#: ../../addon/cart/submodules/hzservices.php:309 +msgid "Invalid Activation Directive." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:380 +#: ../../addon/cart/submodules/hzservices.php:384 +msgid "Invalid Deactivation Directive." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:570 +msgid "Add to this privacy group" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:586 +msgid "Set user service class" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:613 +msgid "You must be using a local account to purchase this service." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:651 +msgid "Changes Locked" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:655 +msgid "Item available for purchase." +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:662 +msgid "Price" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:665 +msgid "Add buyer to privacy group" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:670 +msgid "Add buyer as connection" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:677 +#: ../../addon/cart/submodules/hzservices.php:718 +msgid "Set Service Class" +msgstr "" + +#: ../../addon/cart/manual_payments.php:7 msgid "Error: order mismatch. Please try again." msgstr "" -#: ../../addon/cart/manual_payments.php:29 +#: ../../addon/cart/manual_payments.php:30 msgid "Manual payments are not enabled." msgstr "" -#: ../../addon/cart/manual_payments.php:44 +#: ../../addon/cart/manual_payments.php:46 msgid "Finished" msgstr "" @@ -11688,11 +12084,11 @@ msgstr "" msgid "PumpIO Settings saved." msgstr "" -#: ../../addon/ldapauth/ldapauth.php:61 +#: ../../addon/ldapauth/ldapauth.php:70 msgid "An account has been created for you." msgstr "" -#: ../../addon/ldapauth/ldapauth.php:68 +#: ../../addon/ldapauth/ldapauth.php:77 msgid "Authentication successful but rejected: account creation is disabled." msgstr "" @@ -12004,282 +12400,286 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:251 ../../include/text.php:1129 -#: ../../include/text.php:1133 +#: ../../include/conversation.php:251 ../../include/text.php:1140 +#: ../../include/text.php:1144 msgid "poked" msgstr "" -#: ../../include/conversation.php:736 +#: ../../include/conversation.php:739 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:756 +#: ../../include/conversation.php:759 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:757 +#: ../../include/conversation.php:760 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:785 msgid "View in context" msgstr "" -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:886 msgid "remove" msgstr "" -#: ../../include/conversation.php:888 +#: ../../include/conversation.php:890 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:889 +#: ../../include/conversation.php:891 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:932 +#: ../../include/conversation.php:934 msgid "View Source" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:944 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:951 +#: ../../include/conversation.php:953 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1067 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1072 +#: ../../include/conversation.php:1077 msgid "Message" msgstr "" -#: ../../include/conversation.php:1206 +#: ../../include/conversation.php:1211 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1206 +#: ../../include/conversation.php:1211 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1210 +#: ../../include/conversation.php:1215 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1217 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1218 +#: ../../include/conversation.php:1223 msgid "and" msgstr "" -#: ../../include/conversation.php:1221 +#: ../../include/conversation.php:1226 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1227 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1227 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1270 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1266 +#: ../../include/conversation.php:1271 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1316 +#: ../../include/conversation.php:1287 +msgid "Embed (existing) photo from your photo albums" +msgstr "" + +#: ../../include/conversation.php:1323 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1317 +#: ../../include/conversation.php:1324 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1322 +#: ../../include/conversation.php:1329 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1326 +#: ../../include/conversation.php:1333 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1327 +#: ../../include/conversation.php:1334 msgid "Comments disabled" msgstr "" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1383 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1378 +#: ../../include/conversation.php:1386 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1392 +#: ../../include/conversation.php:1400 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1395 +#: ../../include/conversation.php:1403 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1396 +#: ../../include/conversation.php:1404 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1404 +#: ../../include/conversation.php:1412 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1435 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1433 +#: ../../include/conversation.php:1441 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1693 +#: ../../include/conversation.php:1702 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1696 +#: ../../include/conversation.php:1705 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1709 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1703 +#: ../../include/conversation.php:1712 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1711 +#: ../../include/conversation.php:1720 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1720 +#: ../../include/conversation.php:1729 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1726 +#: ../../include/conversation.php:1735 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1729 +#: ../../include/conversation.php:1738 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1736 +#: ../../include/conversation.php:1745 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1739 +#: ../../include/conversation.php:1748 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1814 ../../include/nav.php:381 +#: ../../include/conversation.php:1823 ../../include/nav.php:373 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1827 ../../include/nav.php:394 +#: ../../include/conversation.php:1836 ../../include/nav.php:386 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1837 ../../include/nav.php:404 -#: ../../include/photos.php:666 +#: ../../include/conversation.php:1846 ../../include/nav.php:396 +#: ../../include/photos.php:667 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1845 ../../include/nav.php:412 +#: ../../include/conversation.php:1854 ../../include/nav.php:404 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1882 ../../include/nav.php:447 +#: ../../include/conversation.php:1891 ../../include/nav.php:439 msgid "Bookmarks" msgstr "" -#: ../../include/conversation.php:1885 ../../include/nav.php:450 +#: ../../include/conversation.php:1894 ../../include/nav.php:442 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1896 ../../include/nav.php:461 +#: ../../include/conversation.php:1905 ../../include/nav.php:453 msgid "View Cards" msgstr "" -#: ../../include/conversation.php:1904 +#: ../../include/conversation.php:1913 msgid "articles" msgstr "" -#: ../../include/conversation.php:1907 ../../include/nav.php:472 +#: ../../include/conversation.php:1916 ../../include/nav.php:464 msgid "View Articles" msgstr "" -#: ../../include/conversation.php:1918 ../../include/nav.php:484 +#: ../../include/conversation.php:1927 ../../include/nav.php:476 msgid "View Webpages" msgstr "" -#: ../../include/conversation.php:1987 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1990 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1993 +#: ../../include/conversation.php:2002 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1996 +#: ../../include/conversation.php:2005 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1999 +#: ../../include/conversation.php:2008 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2002 +#: ../../include/conversation.php:2011 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -12311,12 +12711,12 @@ msgstr "" msgid "Unable to import a removed channel." msgstr "" -#: ../../include/import.php:46 +#: ../../include/import.php:51 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/import.php:111 +#: ../../include/import.php:116 msgid "Cloned channel not found. Import failed." msgstr "" @@ -12344,340 +12744,345 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:961 +#: ../../include/text.php:963 msgid "No connections" msgstr "" -#: ../../include/text.php:993 +#: ../../include/text.php:995 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1129 ../../include/text.php:1133 +#: ../../include/text.php:1051 +#, php-format +msgid "Network: %s" +msgstr "" + +#: ../../include/text.php:1140 ../../include/text.php:1144 msgid "poke" msgstr "" -#: ../../include/text.php:1134 +#: ../../include/text.php:1145 msgid "ping" msgstr "" -#: ../../include/text.php:1134 +#: ../../include/text.php:1145 msgid "pinged" msgstr "" -#: ../../include/text.php:1135 +#: ../../include/text.php:1146 msgid "prod" msgstr "" -#: ../../include/text.php:1135 +#: ../../include/text.php:1146 msgid "prodded" msgstr "" -#: ../../include/text.php:1136 +#: ../../include/text.php:1147 msgid "slap" msgstr "" -#: ../../include/text.php:1136 +#: ../../include/text.php:1147 msgid "slapped" msgstr "" -#: ../../include/text.php:1137 +#: ../../include/text.php:1148 msgid "finger" msgstr "" -#: ../../include/text.php:1137 +#: ../../include/text.php:1148 msgid "fingered" msgstr "" -#: ../../include/text.php:1138 +#: ../../include/text.php:1149 msgid "rebuff" msgstr "" -#: ../../include/text.php:1138 +#: ../../include/text.php:1149 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1161 +#: ../../include/text.php:1172 msgid "happy" msgstr "" -#: ../../include/text.php:1162 +#: ../../include/text.php:1173 msgid "sad" msgstr "" -#: ../../include/text.php:1163 +#: ../../include/text.php:1174 msgid "mellow" msgstr "" -#: ../../include/text.php:1164 +#: ../../include/text.php:1175 msgid "tired" msgstr "" -#: ../../include/text.php:1165 +#: ../../include/text.php:1176 msgid "perky" msgstr "" -#: ../../include/text.php:1166 +#: ../../include/text.php:1177 msgid "angry" msgstr "" -#: ../../include/text.php:1167 +#: ../../include/text.php:1178 msgid "stupefied" msgstr "" -#: ../../include/text.php:1168 +#: ../../include/text.php:1179 msgid "puzzled" msgstr "" -#: ../../include/text.php:1169 +#: ../../include/text.php:1180 msgid "interested" msgstr "" -#: ../../include/text.php:1170 +#: ../../include/text.php:1181 msgid "bitter" msgstr "" -#: ../../include/text.php:1171 +#: ../../include/text.php:1182 msgid "cheerful" msgstr "" -#: ../../include/text.php:1172 +#: ../../include/text.php:1183 msgid "alive" msgstr "" -#: ../../include/text.php:1173 +#: ../../include/text.php:1184 msgid "annoyed" msgstr "" -#: ../../include/text.php:1174 +#: ../../include/text.php:1185 msgid "anxious" msgstr "" -#: ../../include/text.php:1175 +#: ../../include/text.php:1186 msgid "cranky" msgstr "" -#: ../../include/text.php:1176 +#: ../../include/text.php:1187 msgid "disturbed" msgstr "" -#: ../../include/text.php:1177 +#: ../../include/text.php:1188 msgid "frustrated" msgstr "" -#: ../../include/text.php:1178 +#: ../../include/text.php:1189 msgid "depressed" msgstr "" -#: ../../include/text.php:1179 +#: ../../include/text.php:1190 msgid "motivated" msgstr "" -#: ../../include/text.php:1180 +#: ../../include/text.php:1191 msgid "relaxed" msgstr "" -#: ../../include/text.php:1181 +#: ../../include/text.php:1192 msgid "surprised" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:76 +#: ../../include/text.php:1371 ../../include/js_strings.php:86 msgid "Monday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:77 +#: ../../include/text.php:1371 ../../include/js_strings.php:87 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:78 +#: ../../include/text.php:1371 ../../include/js_strings.php:88 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:79 +#: ../../include/text.php:1371 ../../include/js_strings.php:89 msgid "Thursday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:80 +#: ../../include/text.php:1371 ../../include/js_strings.php:90 msgid "Friday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:81 +#: ../../include/text.php:1371 ../../include/js_strings.php:91 msgid "Saturday" msgstr "" -#: ../../include/text.php:1360 ../../include/js_strings.php:75 +#: ../../include/text.php:1371 ../../include/js_strings.php:85 msgid "Sunday" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:51 +#: ../../include/text.php:1375 ../../include/js_strings.php:61 msgid "January" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:52 +#: ../../include/text.php:1375 ../../include/js_strings.php:62 msgid "February" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:53 +#: ../../include/text.php:1375 ../../include/js_strings.php:63 msgid "March" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:54 +#: ../../include/text.php:1375 ../../include/js_strings.php:64 msgid "April" msgstr "" -#: ../../include/text.php:1364 +#: ../../include/text.php:1375 msgid "May" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:56 +#: ../../include/text.php:1375 ../../include/js_strings.php:66 msgid "June" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:57 +#: ../../include/text.php:1375 ../../include/js_strings.php:67 msgid "July" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:58 +#: ../../include/text.php:1375 ../../include/js_strings.php:68 msgid "August" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:59 +#: ../../include/text.php:1375 ../../include/js_strings.php:69 msgid "September" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:60 +#: ../../include/text.php:1375 ../../include/js_strings.php:70 msgid "October" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:61 +#: ../../include/text.php:1375 ../../include/js_strings.php:71 msgid "November" msgstr "" -#: ../../include/text.php:1364 ../../include/js_strings.php:62 +#: ../../include/text.php:1375 ../../include/js_strings.php:72 msgid "December" msgstr "" -#: ../../include/text.php:1428 ../../include/text.php:1432 +#: ../../include/text.php:1449 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1434 ../../include/feedutils.php:860 +#: ../../include/text.php:1451 ../../include/feedutils.php:860 msgid "unknown" msgstr "" -#: ../../include/text.php:1470 +#: ../../include/text.php:1487 msgid "remove category" msgstr "" -#: ../../include/text.php:1544 +#: ../../include/text.php:1561 msgid "remove from file" msgstr "" -#: ../../include/text.php:1686 ../../include/message.php:12 +#: ../../include/text.php:1703 ../../include/message.php:12 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1849 ../../include/language.php:397 +#: ../../include/text.php:1866 ../../include/language.php:397 msgid "default" msgstr "" -#: ../../include/text.php:1857 +#: ../../include/text.php:1874 msgid "Page layout" msgstr "" -#: ../../include/text.php:1857 +#: ../../include/text.php:1874 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1868 +#: ../../include/text.php:1885 msgid "HTML" msgstr "" -#: ../../include/text.php:1871 +#: ../../include/text.php:1888 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:1876 +#: ../../include/text.php:1893 msgid "PHP" msgstr "" -#: ../../include/text.php:1885 +#: ../../include/text.php:1902 msgid "Page content type" msgstr "" -#: ../../include/text.php:2018 +#: ../../include/text.php:2035 msgid "activity" msgstr "" -#: ../../include/text.php:2100 +#: ../../include/text.php:2135 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2419 +#: ../../include/text.php:2455 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2425 +#: ../../include/text.php:2461 msgid "Pages" msgstr "" -#: ../../include/text.php:2447 +#: ../../include/text.php:2483 msgid "Import website..." msgstr "" -#: ../../include/text.php:2448 +#: ../../include/text.php:2484 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2449 +#: ../../include/text.php:2485 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2450 +#: ../../include/text.php:2486 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2451 +#: ../../include/text.php:2487 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2452 +#: ../../include/text.php:2488 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2453 +#: ../../include/text.php:2489 msgid "Select folder" msgstr "" -#: ../../include/text.php:2454 +#: ../../include/text.php:2490 msgid "Export website..." msgstr "" -#: ../../include/text.php:2455 +#: ../../include/text.php:2491 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2456 +#: ../../include/text.php:2492 msgid "website.zip" msgstr "" -#: ../../include/text.php:2457 +#: ../../include/text.php:2493 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2458 +#: ../../include/text.php:2494 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2459 +#: ../../include/text.php:2495 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2460 +#: ../../include/text.php:2496 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2461 +#: ../../include/text.php:2497 msgid "Specify folder" msgstr "" @@ -12725,7 +13130,7 @@ msgstr "" msgid "View all %d common connections" msgstr "" -#: ../../include/markdown.php:158 ../../include/bbcode.php:356 +#: ../../include/markdown.php:158 ../../include/bbcode.php:358 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" @@ -12833,182 +13238,224 @@ msgstr "" msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" +#: ../../include/js_strings.php:26 +msgid "lovely" +msgstr "" + +#: ../../include/js_strings.php:27 +msgid "wonderful" +msgstr "" + +#: ../../include/js_strings.php:28 +msgid "fantastic" +msgstr "" + +#: ../../include/js_strings.php:29 +msgid "great" +msgstr "" + +#: ../../include/js_strings.php:30 +msgid "" +"Your chosen nickname was either already taken or not valid. Please use our " +"suggestion (" +msgstr "" + #: ../../include/js_strings.php:31 -msgid "timeago.prefixAgo" +msgid ") or enter a new one." msgstr "" #: ../../include/js_strings.php:32 -msgid "timeago.prefixFromNow" +msgid "Thank you, this nickname is valid." msgstr "" #: ../../include/js_strings.php:33 -msgid "timeago.suffixAgo" +msgid "A channel name is required." msgstr "" #: ../../include/js_strings.php:34 +msgid "This is a " +msgstr "" + +#: ../../include/js_strings.php:35 +msgid " channel name" +msgstr "" + +#: ../../include/js_strings.php:41 +msgid "timeago.prefixAgo" +msgstr "" + +#: ../../include/js_strings.php:42 +msgid "timeago.prefixFromNow" +msgstr "" + +#: ../../include/js_strings.php:43 +msgid "timeago.suffixAgo" +msgstr "" + +#: ../../include/js_strings.php:44 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:37 +#: ../../include/js_strings.php:47 msgid "less than a minute" msgstr "" -#: ../../include/js_strings.php:38 +#: ../../include/js_strings.php:48 msgid "about a minute" msgstr "" -#: ../../include/js_strings.php:39 +#: ../../include/js_strings.php:49 #, php-format msgid "%d minutes" msgstr "" -#: ../../include/js_strings.php:40 +#: ../../include/js_strings.php:50 msgid "about an hour" msgstr "" -#: ../../include/js_strings.php:41 +#: ../../include/js_strings.php:51 #, php-format msgid "about %d hours" msgstr "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:52 msgid "a day" msgstr "" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:53 #, php-format msgid "%d days" msgstr "" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:54 msgid "about a month" msgstr "" -#: ../../include/js_strings.php:45 +#: ../../include/js_strings.php:55 #, php-format msgid "%d months" msgstr "" -#: ../../include/js_strings.php:46 +#: ../../include/js_strings.php:56 msgid "about a year" msgstr "" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:57 #, php-format msgid "%d years" msgstr "" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:58 msgid " " msgstr "" -#: ../../include/js_strings.php:49 +#: ../../include/js_strings.php:59 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:55 +#: ../../include/js_strings.php:65 msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:63 +#: ../../include/js_strings.php:73 msgid "Jan" msgstr "" -#: ../../include/js_strings.php:64 +#: ../../include/js_strings.php:74 msgid "Feb" msgstr "" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:75 msgid "Mar" msgstr "" -#: ../../include/js_strings.php:66 +#: ../../include/js_strings.php:76 msgid "Apr" msgstr "" -#: ../../include/js_strings.php:67 +#: ../../include/js_strings.php:77 msgctxt "short" msgid "May" msgstr "" -#: ../../include/js_strings.php:68 +#: ../../include/js_strings.php:78 msgid "Jun" msgstr "" -#: ../../include/js_strings.php:69 +#: ../../include/js_strings.php:79 msgid "Jul" msgstr "" -#: ../../include/js_strings.php:70 +#: ../../include/js_strings.php:80 msgid "Aug" msgstr "" -#: ../../include/js_strings.php:71 +#: ../../include/js_strings.php:81 msgid "Sep" msgstr "" -#: ../../include/js_strings.php:72 +#: ../../include/js_strings.php:82 msgid "Oct" msgstr "" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:83 msgid "Nov" msgstr "" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:84 msgid "Dec" msgstr "" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:92 msgid "Sun" msgstr "" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:93 msgid "Mon" msgstr "" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:94 msgid "Tue" msgstr "" -#: ../../include/js_strings.php:85 +#: ../../include/js_strings.php:95 msgid "Wed" msgstr "" -#: ../../include/js_strings.php:86 +#: ../../include/js_strings.php:96 msgid "Thu" msgstr "" -#: ../../include/js_strings.php:87 +#: ../../include/js_strings.php:97 msgid "Fri" msgstr "" -#: ../../include/js_strings.php:88 +#: ../../include/js_strings.php:98 msgid "Sat" msgstr "" -#: ../../include/js_strings.php:89 +#: ../../include/js_strings.php:99 msgctxt "calendar" msgid "today" msgstr "" -#: ../../include/js_strings.php:90 +#: ../../include/js_strings.php:100 msgctxt "calendar" msgid "month" msgstr "" -#: ../../include/js_strings.php:91 +#: ../../include/js_strings.php:101 msgctxt "calendar" msgid "week" msgstr "" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:102 msgctxt "calendar" msgid "day" msgstr "" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:103 msgctxt "calendar" msgid "All day" msgstr "" @@ -13052,65 +13499,69 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/attach.php:265 ../../include/attach.php:361 +#: ../../include/attach.php:265 ../../include/attach.php:374 msgid "Item was not found." msgstr "" -#: ../../include/attach.php:554 +#: ../../include/attach.php:282 +msgid "Unknown error." +msgstr "" + +#: ../../include/attach.php:567 msgid "No source file." msgstr "" -#: ../../include/attach.php:576 +#: ../../include/attach.php:589 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:595 +#: ../../include/attach.php:608 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:737 +#: ../../include/attach.php:750 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:758 +#: ../../include/attach.php:771 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:940 +#: ../../include/attach.php:953 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:969 +#: ../../include/attach.php:982 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:1043 ../../include/attach.php:1059 +#: ../../include/attach.php:1056 ../../include/attach.php:1072 msgid "Path not available." msgstr "" -#: ../../include/attach.php:1108 ../../include/attach.php:1273 +#: ../../include/attach.php:1121 ../../include/attach.php:1286 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1134 +#: ../../include/attach.php:1147 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1159 +#: ../../include/attach.php:1172 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1227 +#: ../../include/attach.php:1240 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1231 +#: ../../include/attach.php:1244 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1279 +#: ../../include/attach.php:1292 msgid "Empty path" msgstr "" @@ -13120,71 +13571,71 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/items.php:885 ../../include/items.php:945 +#: ../../include/items.php:891 ../../include/items.php:951 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1133 +#: ../../include/items.php:1137 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1135 +#: ../../include/items.php:1139 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1137 +#: ../../include/items.php:1141 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1139 +#: ../../include/items.php:1143 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1141 +#: ../../include/items.php:1145 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1143 +#: ../../include/items.php:1147 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1145 +#: ../../include/items.php:1149 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1147 +#: ../../include/items.php:1151 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4197 +#: ../../include/items.php:4141 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4204 +#: ../../include/items.php:4148 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4216 +#: ../../include/items.php:4160 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4565 +#: ../../include/items.php:4509 msgid "profile photo" msgstr "" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -13374,63 +13825,47 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/event.php:1310 ../../include/connections.php:692 +#: ../../include/event.php:1310 ../../include/connections.php:698 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1311 ../../include/connections.php:693 +#: ../../include/event.php:1311 ../../include/connections.php:699 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1313 ../../include/connections.php:695 +#: ../../include/event.php:1313 ../../include/connections.php:701 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1314 ../../include/connections.php:696 +#: ../../include/event.php:1314 ../../include/connections.php:702 msgid "Work, Fax" msgstr "" -#: ../../include/network.php:762 +#: ../../include/network.php:760 msgid "view full size" msgstr "" -#: ../../include/network.php:1764 ../../include/network.php:1765 -msgid "Friendica" -msgstr "" - #: ../../include/network.php:1766 -msgid "OStatus" -msgstr "" - -#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1768 +#: ../../include/network.php:1767 msgid "RSS/Atom" msgstr "" #: ../../include/network.php:1771 -msgid "Diaspora" -msgstr "" - -#: ../../include/network.php:1772 msgid "Facebook" msgstr "" #: ../../include/network.php:1773 -msgid "Zot" -msgstr "" - -#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1775 +#: ../../include/network.php:1774 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1776 +#: ../../include/network.php:1775 msgid "MySpace" msgstr "" @@ -13472,77 +13907,81 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../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 +#: ../../include/bbcode.php:200 ../../include/bbcode.php:1202 +#: ../../include/bbcode.php:1205 ../../include/bbcode.php:1210 +#: ../../include/bbcode.php:1213 ../../include/bbcode.php:1216 +#: ../../include/bbcode.php:1219 ../../include/bbcode.php:1224 +#: ../../include/bbcode.php:1227 ../../include/bbcode.php:1232 +#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1238 +#: ../../include/bbcode.php:1241 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250 +#: ../../include/bbcode.php:239 ../../include/bbcode.php:1252 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:253 +#: ../../include/bbcode.php:255 #, php-format msgid "Install %1$s element %2$s" msgstr "" -#: ../../include/bbcode.php:257 +#: ../../include/bbcode.php:259 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "" -#: ../../include/bbcode.php:348 +#: ../../include/bbcode.php:350 msgid "card" msgstr "" -#: ../../include/bbcode.php:350 +#: ../../include/bbcode.php:352 msgid "article" msgstr "" -#: ../../include/bbcode.php:433 ../../include/bbcode.php:441 +#: ../../include/bbcode.php:435 ../../include/bbcode.php:443 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:443 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:454 +#: ../../include/bbcode.php:456 msgid "View article" msgstr "" -#: ../../include/bbcode.php:454 +#: ../../include/bbcode.php:456 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1188 +#: ../../include/bbcode.php:1190 msgid "$1 wrote:" msgstr "" -#: ../../include/oembed.php:329 +#: ../../include/oembed.php:224 +msgid "View PDF" +msgstr "" + +#: ../../include/oembed.php:347 msgid " by " msgstr "" -#: ../../include/oembed.php:330 +#: ../../include/oembed.php:348 msgid " on " msgstr "" -#: ../../include/oembed.php:359 +#: ../../include/oembed.php:377 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:368 +#: ../../include/oembed.php:386 msgid "Embedding disabled" msgstr "" -#: ../../include/zid.php:347 +#: ../../include/zid.php:351 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" @@ -13671,10 +14110,6 @@ msgstr "" msgid "Access Control and Permissions" msgstr "" -#: ../../include/features.php:221 ../../include/group.php:328 -msgid "Privacy Groups" -msgstr "" - #: ../../include/features.php:222 msgid "Enable management and selection of privacy groups" msgstr "" @@ -13688,7 +14123,7 @@ msgid "Ability to create multiple profiles" msgstr "" #: ../../include/features.php:241 -msgid "Provide alternate connection permission roles." +msgid "Create custom connection permission limits" msgstr "" #: ../../include/features.php:249 @@ -13811,94 +14246,112 @@ msgid "Save search terms for re-use" msgstr "" #: ../../include/features.php:390 -msgid "Network Personal Tab" +msgid "Alternate Stream Order" msgstr "" #: ../../include/features.php:391 -msgid "Enable tab to display only Network posts that you've interacted on" +msgid "" +"Ability to order the stream by last post date, last comment date or " +"unthreaded activities" msgstr "" #: ../../include/features.php:399 -msgid "Network New Tab" +msgid "Contact Filter" msgstr "" #: ../../include/features.php:400 -msgid "Enable tab to display all new Network activity" +msgid "Ability to display only posts of a selected contact" msgstr "" #: ../../include/features.php:408 -msgid "Affinity Tool" +msgid "Forum Filter" msgstr "" #: ../../include/features.php:409 -msgid "Filter stream activity by depth of relationships" +msgid "Ability to display only posts of a specific forum" +msgstr "" + +#: ../../include/features.php:417 +msgid "Personal Posts Filter" msgstr "" #: ../../include/features.php:418 -msgid "Show friend and connection suggestions" +msgid "Ability to display only posts that you've interacted on" msgstr "" #: ../../include/features.php:426 -msgid "Connection Filtering" +msgid "Affinity Tool" msgstr "" #: ../../include/features.php:427 +msgid "Filter stream activity by depth of relationships" +msgstr "" + +#: ../../include/features.php:436 +msgid "Show friend and connection suggestions" +msgstr "" + +#: ../../include/features.php:444 +msgid "Connection Filtering" +msgstr "" + +#: ../../include/features.php:445 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:439 +#: ../../include/features.php:457 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:443 +#: ../../include/features.php:461 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:444 +#: ../../include/features.php:462 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:452 +#: ../../include/features.php:470 msgid "Post Categories" msgstr "" -#: ../../include/features.php:453 +#: ../../include/features.php:471 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:461 +#: ../../include/features.php:479 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:462 +#: ../../include/features.php:480 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:471 +#: ../../include/features.php:489 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:479 +#: ../../include/features.php:497 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:480 +#: ../../include/features.php:498 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:488 +#: ../../include/features.php:506 msgid "Star Posts" msgstr "" -#: ../../include/features.php:489 +#: ../../include/features.php:507 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:497 +#: ../../include/features.php:515 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:498 +#: ../../include/features.php:516 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -13967,38 +14420,38 @@ msgstr "" msgid "Registration confirmation for %s" msgstr "" -#: ../../include/account.php:383 +#: ../../include/account.php:385 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../include/account.php:405 +#: ../../include/account.php:407 msgid "your registration password" msgstr "" -#: ../../include/account.php:411 ../../include/account.php:473 +#: ../../include/account.php:413 ../../include/account.php:475 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../include/account.php:484 +#: ../../include/account.php:486 msgid "Account approved." msgstr "" -#: ../../include/account.php:524 +#: ../../include/account.php:526 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../include/account.php:803 ../../include/account.php:805 +#: ../../include/account.php:805 ../../include/account.php:807 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:811 +#: ../../include/account.php:813 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:816 +#: ../../include/account.php:818 msgid "This action is not available under your subscription plan." msgstr "" @@ -14083,106 +14536,110 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/nav.php:96 +#: ../../include/nav.php:88 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:96 +#: ../../include/nav.php:88 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:102 ../../include/nav.php:190 -msgid "Manage Your Channels" +#: ../../include/nav.php:94 +msgid "Manage your channels" +msgstr "" + +#: ../../include/nav.php:97 +msgid "Manage your privacy groups" msgstr "" -#: ../../include/nav.php:105 ../../include/nav.php:192 +#: ../../include/nav.php:99 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:111 ../../include/nav.php:140 +#: ../../include/nav.php:105 ../../include/nav.php:134 msgid "End this session" msgstr "" -#: ../../include/nav.php:114 +#: ../../include/nav.php:108 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:117 +#: ../../include/nav.php:111 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:126 ../../include/nav.php:130 +#: ../../include/nav.php:120 ../../include/nav.php:124 msgid "Sign in" msgstr "" -#: ../../include/nav.php:157 +#: ../../include/nav.php:151 msgid "Take me home" msgstr "" -#: ../../include/nav.php:159 +#: ../../include/nav.php:153 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:164 +#: ../../include/nav.php:158 msgid "Create an account" msgstr "" -#: ../../include/nav.php:176 +#: ../../include/nav.php:170 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:179 +#: ../../include/nav.php:185 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:199 +#: ../../include/nav.php:191 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:290 +#: ../../include/nav.php:282 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:291 +#: ../../include/nav.php:283 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:297 +#: ../../include/nav.php:289 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:298 +#: ../../include/nav.php:290 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:299 +#: ../../include/nav.php:291 msgid "Toggle System Apps" msgstr "" -#: ../../include/photos.php:150 +#: ../../include/photos.php:151 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/photos.php:161 +#: ../../include/photos.php:162 msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:326 +#: ../../include/photos.php:327 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:375 +#: ../../include/photos.php:376 msgid "a new photo" msgstr "" -#: ../../include/photos.php:379 +#: ../../include/photos.php:380 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:671 +#: ../../include/photos.php:672 msgid "Upload New Photos" msgstr "" @@ -14194,12 +14651,12 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2552 +#: ../../include/zot.php:2557 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:4219 +#: ../../include/zot.php:4221 msgid "invalid target signature" msgstr "" @@ -14214,19 +14671,19 @@ msgstr "" msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/group.php:306 +#: ../../include/group.php:298 msgid "edit" msgstr "" -#: ../../include/group.php:329 +#: ../../include/group.php:321 msgid "Edit group" msgstr "" -#: ../../include/group.php:330 +#: ../../include/group.php:322 msgid "Add privacy group" msgstr "" -#: ../../include/group.php:331 +#: ../../include/group.php:323 msgid "Channels not in any privacy group" msgstr "" @@ -14238,19 +14695,19 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/auth.php:152 +#: ../../include/auth.php:192 msgid "Delegation session ended." msgstr "" -#: ../../include/auth.php:156 +#: ../../include/auth.php:196 msgid "Logged out." msgstr "" -#: ../../include/auth.php:273 +#: ../../include/auth.php:291 msgid "Email validation is incomplete. Please check your email." msgstr "" -#: ../../include/auth.php:289 +#: ../../include/auth.php:307 msgid "Failed authentication" msgstr "" diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index e7e1de1d0..dca528ad4 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -807,6 +807,7 @@ return array( 'Zotlabs\\Lib\\JSalmon' => $baseDir . '/Zotlabs/Lib/JSalmon.php', 'Zotlabs\\Lib\\LDSignatures' => $baseDir . '/Zotlabs/Lib/LDSignatures.php', 'Zotlabs\\Lib\\MarkdownSoap' => $baseDir . '/Zotlabs/Lib/MarkdownSoap.php', + 'Zotlabs\\Lib\\MessageFilter' => $baseDir . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\NativeWiki' => $baseDir . '/Zotlabs/Lib/NativeWiki.php', 'Zotlabs\\Lib\\NativeWikiPage' => $baseDir . '/Zotlabs/Lib/NativeWikiPage.php', 'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php', @@ -826,11 +827,11 @@ return array( 'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php', 'Zotlabs\\Module\\Admin\\Account_edit' => $baseDir . '/Zotlabs/Module/Admin/Account_edit.php', 'Zotlabs\\Module\\Admin\\Accounts' => $baseDir . '/Zotlabs/Module/Admin/Accounts.php', + 'Zotlabs\\Module\\Admin\\Addons' => $baseDir . '/Zotlabs/Module/Admin/Addons.php', 'Zotlabs\\Module\\Admin\\Channels' => $baseDir . '/Zotlabs/Module/Admin/Channels.php', 'Zotlabs\\Module\\Admin\\Dbsync' => $baseDir . '/Zotlabs/Module/Admin/Dbsync.php', 'Zotlabs\\Module\\Admin\\Features' => $baseDir . '/Zotlabs/Module/Admin/Features.php', 'Zotlabs\\Module\\Admin\\Logs' => $baseDir . '/Zotlabs/Module/Admin/Logs.php', - 'Zotlabs\\Module\\Admin\\Plugins' => $baseDir . '/Zotlabs/Module/Admin/Plugins.php', 'Zotlabs\\Module\\Admin\\Profs' => $baseDir . '/Zotlabs/Module/Admin/Profs.php', 'Zotlabs\\Module\\Admin\\Queue' => $baseDir . '/Zotlabs/Module/Admin/Queue.php', 'Zotlabs\\Module\\Admin\\Security' => $baseDir . '/Zotlabs/Module/Admin/Security.php', @@ -926,6 +927,7 @@ return array( 'Zotlabs\\Module\\Notifications' => $baseDir . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => $baseDir . '/Zotlabs/Module/Notify.php', 'Zotlabs\\Module\\OAuth2TestVehicle' => $baseDir . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Oauthinfo' => $baseDir . '/Zotlabs/Module/Oauthinfo.php', 'Zotlabs\\Module\\Ochannel' => $baseDir . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php', @@ -1250,6 +1252,9 @@ return array( 'Zotlabs\\Update\\_1210' => $baseDir . '/Zotlabs/Update/_1210.php', 'Zotlabs\\Update\\_1211' => $baseDir . '/Zotlabs/Update/_1211.php', 'Zotlabs\\Update\\_1212' => $baseDir . '/Zotlabs/Update/_1212.php', + 'Zotlabs\\Update\\_1213' => $baseDir . '/Zotlabs/Update/_1213.php', + 'Zotlabs\\Update\\_1214' => $baseDir . '/Zotlabs/Update/_1214.php', + 'Zotlabs\\Update\\_1215' => $baseDir . '/Zotlabs/Update/_1215.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', @@ -1261,11 +1266,14 @@ return array( 'Zotlabs\\Web\\SubModule' => $baseDir . '/Zotlabs/Web/SubModule.php', 'Zotlabs\\Web\\WebServer' => $baseDir . '/Zotlabs/Web/WebServer.php', 'Zotlabs\\Widget\\Activity' => $baseDir . '/Zotlabs/Widget/Activity.php', + 'Zotlabs\\Widget\\Activity_filter' => $baseDir . '/Zotlabs/Widget/Activity_filter.php', + 'Zotlabs\\Widget\\Activity_order' => $baseDir . '/Zotlabs/Widget/Activity_order.php', 'Zotlabs\\Widget\\Admin' => $baseDir . '/Zotlabs/Widget/Admin.php', 'Zotlabs\\Widget\\Affinity' => $baseDir . '/Zotlabs/Widget/Affinity.php', 'Zotlabs\\Widget\\Album' => $baseDir . '/Zotlabs/Widget/Album.php', 'Zotlabs\\Widget\\Appcategories' => $baseDir . '/Zotlabs/Widget/Appcategories.php', 'Zotlabs\\Widget\\Appcloud' => $baseDir . '/Zotlabs/Widget/Appcloud.php', + 'Zotlabs\\Widget\\Appstore' => $baseDir . '/Zotlabs/Widget/Appstore.php', 'Zotlabs\\Widget\\Archive' => $baseDir . '/Zotlabs/Widget/Archive.php', 'Zotlabs\\Widget\\Bookmarkedchats' => $baseDir . '/Zotlabs/Widget/Bookmarkedchats.php', 'Zotlabs\\Widget\\Catcloud' => $baseDir . '/Zotlabs/Widget/Catcloud.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 11f2c01d6..cd4782104 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -961,6 +961,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\JSalmon' => __DIR__ . '/../..' . '/Zotlabs/Lib/JSalmon.php', 'Zotlabs\\Lib\\LDSignatures' => __DIR__ . '/../..' . '/Zotlabs/Lib/LDSignatures.php', 'Zotlabs\\Lib\\MarkdownSoap' => __DIR__ . '/../..' . '/Zotlabs/Lib/MarkdownSoap.php', + 'Zotlabs\\Lib\\MessageFilter' => __DIR__ . '/../..' . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\NativeWiki' => __DIR__ . '/../..' . '/Zotlabs/Lib/NativeWiki.php', 'Zotlabs\\Lib\\NativeWikiPage' => __DIR__ . '/../..' . '/Zotlabs/Lib/NativeWikiPage.php', 'Zotlabs\\Lib\\PConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/PConfig.php', @@ -980,11 +981,11 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Admin' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin.php', 'Zotlabs\\Module\\Admin\\Account_edit' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Account_edit.php', 'Zotlabs\\Module\\Admin\\Accounts' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Accounts.php', + 'Zotlabs\\Module\\Admin\\Addons' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Addons.php', 'Zotlabs\\Module\\Admin\\Channels' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Channels.php', 'Zotlabs\\Module\\Admin\\Dbsync' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Dbsync.php', 'Zotlabs\\Module\\Admin\\Features' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Features.php', 'Zotlabs\\Module\\Admin\\Logs' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Logs.php', - 'Zotlabs\\Module\\Admin\\Plugins' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Plugins.php', 'Zotlabs\\Module\\Admin\\Profs' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Profs.php', 'Zotlabs\\Module\\Admin\\Queue' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Queue.php', 'Zotlabs\\Module\\Admin\\Security' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Security.php', @@ -1080,6 +1081,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Notifications' => __DIR__ . '/../..' . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => __DIR__ . '/../..' . '/Zotlabs/Module/Notify.php', 'Zotlabs\\Module\\OAuth2TestVehicle' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Oauthinfo' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauthinfo.php', 'Zotlabs\\Module\\Ochannel' => __DIR__ . '/../..' . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => __DIR__ . '/../..' . '/Zotlabs/Module/Oembed.php', 'Zotlabs\\Module\\Oep' => __DIR__ . '/../..' . '/Zotlabs/Module/Oep.php', @@ -1404,6 +1406,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1210' => __DIR__ . '/../..' . '/Zotlabs/Update/_1210.php', 'Zotlabs\\Update\\_1211' => __DIR__ . '/../..' . '/Zotlabs/Update/_1211.php', 'Zotlabs\\Update\\_1212' => __DIR__ . '/../..' . '/Zotlabs/Update/_1212.php', + 'Zotlabs\\Update\\_1213' => __DIR__ . '/../..' . '/Zotlabs/Update/_1213.php', + 'Zotlabs\\Update\\_1214' => __DIR__ . '/../..' . '/Zotlabs/Update/_1214.php', + 'Zotlabs\\Update\\_1215' => __DIR__ . '/../..' . '/Zotlabs/Update/_1215.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', @@ -1415,11 +1420,14 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Web\\SubModule' => __DIR__ . '/../..' . '/Zotlabs/Web/SubModule.php', 'Zotlabs\\Web\\WebServer' => __DIR__ . '/../..' . '/Zotlabs/Web/WebServer.php', 'Zotlabs\\Widget\\Activity' => __DIR__ . '/../..' . '/Zotlabs/Widget/Activity.php', + 'Zotlabs\\Widget\\Activity_filter' => __DIR__ . '/../..' . '/Zotlabs/Widget/Activity_filter.php', + 'Zotlabs\\Widget\\Activity_order' => __DIR__ . '/../..' . '/Zotlabs/Widget/Activity_order.php', 'Zotlabs\\Widget\\Admin' => __DIR__ . '/../..' . '/Zotlabs/Widget/Admin.php', 'Zotlabs\\Widget\\Affinity' => __DIR__ . '/../..' . '/Zotlabs/Widget/Affinity.php', 'Zotlabs\\Widget\\Album' => __DIR__ . '/../..' . '/Zotlabs/Widget/Album.php', 'Zotlabs\\Widget\\Appcategories' => __DIR__ . '/../..' . '/Zotlabs/Widget/Appcategories.php', 'Zotlabs\\Widget\\Appcloud' => __DIR__ . '/../..' . '/Zotlabs/Widget/Appcloud.php', + 'Zotlabs\\Widget\\Appstore' => __DIR__ . '/../..' . '/Zotlabs/Widget/Appstore.php', 'Zotlabs\\Widget\\Archive' => __DIR__ . '/../..' . '/Zotlabs/Widget/Archive.php', 'Zotlabs\\Widget\\Bookmarkedchats' => __DIR__ . '/../..' . '/Zotlabs/Widget/Bookmarkedchats.php', 'Zotlabs\\Widget\\Catcloud' => __DIR__ . '/../..' . '/Zotlabs/Widget/Catcloud.php', diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 0ff952e8d..023e2674f 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))\n #: ../../include/dba/dba_driver.php:50 #, php-format |