aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-08-16 10:32:35 +0200
committerMario Vavti <mario@mariovavti.com>2017-08-16 10:32:35 +0200
commit4a7384bc0ce1893a432bf4b7d67bca23796fe9db (patch)
tree5623c66a3f66445284529d6207e4ab4a2edb2810 /util
parentc664a4bdcd1bd578f5ec3c2884f7c97e9f68d2d7 (diff)
parent90bc21f2d560d879d7eaf05a85af6d6dca53ebac (diff)
downloadvolse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.gz
volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.bz2
volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.zip
Merge branch '2.6RC'2.6
Diffstat (limited to 'util')
-rw-r--r--util/hmessages.po4164
-rw-r--r--util/typo.php1
2 files changed, 2087 insertions, 2078 deletions
diff --git a/util/hmessages.po b/util/hmessages.po
index 1a9559509..2fa62031d 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.3.5\n"
+"Project-Id-Version: 2.6RC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-01 15:36+0200\n"
+"POT-Creation-Date: 2017-08-01 11:59+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"
@@ -17,163 +17,147 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Zotlabs/Access/Permissions.php:46
+#: ../../Zotlabs/Access/Permissions.php:53
msgid "Can view my channel stream and posts"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:47 ../../include/permissions.php:42
+#: ../../Zotlabs/Access/Permissions.php:54
msgid "Can send me their channel stream and posts"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:48 ../../include/permissions.php:36
+#: ../../Zotlabs/Access/Permissions.php:55
msgid "Can view my default channel profile"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:49 ../../include/permissions.php:37
+#: ../../Zotlabs/Access/Permissions.php:56
msgid "Can view my connections"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:50 ../../include/permissions.php:38
+#: ../../Zotlabs/Access/Permissions.php:57
msgid "Can view my file storage and photos"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:51
+#: ../../Zotlabs/Access/Permissions.php:58
msgid "Can upload/modify my file storage and photos"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:52
+#: ../../Zotlabs/Access/Permissions.php:59
msgid "Can view my channel webpages"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:60
msgid "Can view my wiki pages"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:54
+#: ../../Zotlabs/Access/Permissions.php:61
msgid "Can create/edit my channel webpages"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:55
+#: ../../Zotlabs/Access/Permissions.php:62
msgid "Can write to my wiki pages"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Zotlabs/Access/Permissions.php:63
msgid "Can post on my channel (wall) page"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:44
+#: ../../Zotlabs/Access/Permissions.php:64
msgid "Can comment on or like my posts"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:58 ../../include/permissions.php:45
+#: ../../Zotlabs/Access/Permissions.php:65
msgid "Can send me private mail messages"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Zotlabs/Access/Permissions.php:66
msgid "Can like/dislike profiles and profile things"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Zotlabs/Access/Permissions.php:67
msgid "Can forward to all my channel connections via @+ mentions in posts"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Zotlabs/Access/Permissions.php:68
msgid "Can chat with me"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:62 ../../include/permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:69
msgid "Can source my public posts in derived channels"
msgstr ""
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Zotlabs/Access/Permissions.php:70
msgid "Can administer my channel"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:248
-#: ../../include/permissions.php:946
msgid "Social Networking"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../include/permissions.php:946
msgid "Social - Mostly Public"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:250
-#: ../../include/permissions.php:946
msgid "Social - Restricted"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:251
-#: ../../include/permissions.php:946
msgid "Social - Private"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:254
-#: ../../include/permissions.php:947
msgid "Community Forum"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:255
-#: ../../include/permissions.php:947
msgid "Forum - Mostly Public"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:256
-#: ../../include/permissions.php:947
msgid "Forum - Restricted"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:257
-#: ../../include/permissions.php:947
msgid "Forum - Private"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:260
-#: ../../include/permissions.php:948
msgid "Feed Republish"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:261
-#: ../../include/permissions.php:948
msgid "Feed - Mostly Public"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:262
-#: ../../include/permissions.php:948
msgid "Feed - Restricted"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:265
-#: ../../include/permissions.php:949
msgid "Special Purpose"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:266
-#: ../../include/permissions.php:949
msgid "Special - Celebrity/Soapbox"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:267
-#: ../../include/permissions.php:949
msgid "Special - Group Repository"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:270
-#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Cdav.php:1123 ../../Zotlabs/Module/New_channel.php:132
#: ../../Zotlabs/Module/Settings/Channel.php:463
-#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Register.php:213 ../../addon/cdav/Mod_Cdav.php:1148
-#: ../../addon/cdav/cdav.php:277 ../../addon/cdav/cdav.php:284
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:950 ../../include/connections.php:675
-#: ../../include/connections.php:682
+#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Register.php:213 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/event.php:1297
+#: ../../include/event.php:1304 ../../include/connections.php:681
+#: ../../include/connections.php:688
msgid "Other"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:271
-#: ../../include/permissions.php:950
msgid "Custom/Expert Mode"
msgstr ""
@@ -182,7 +166,7 @@ msgstr ""
#: ../../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/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945
+#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:960
msgid "Requested profile is not available."
msgstr ""
@@ -196,57 +180,57 @@ msgstr ""
#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21
#: ../../Zotlabs/Module/New_channel.php:77
#: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Setup.php:212
+#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
+#: ../../Zotlabs/Module/Moderate.php:13
#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274
#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
+#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:102
#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Wiki.php:235 ../../Zotlabs/Module/Wiki.php:341
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
#: ../../Zotlabs/Module/Profile_photo.php:280
#: ../../Zotlabs/Module/Profile_photo.php:293
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:221
-#: ../../Zotlabs/Module/Item.php:231 ../../Zotlabs/Module/Item.php:1038
-#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
-#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Chat.php:98
-#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223
+#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250
+#: ../../Zotlabs/Module/Item.php:1076 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:385
+#: ../../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/Group.php:13 ../../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/Webpages.php:116 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17
+#: ../../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/Like.php:181
#: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Register.php:77
#: ../../Zotlabs/Module/Cover_photo.php:281
#: ../../Zotlabs/Module/Cover_photo.php:294 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Filestorage.php:23
-#: ../../Zotlabs/Module/Filestorage.php:78
-#: ../../Zotlabs/Module/Filestorage.php:93
-#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Filestorage.php:15
+#: ../../Zotlabs/Module/Filestorage.php:70
+#: ../../Zotlabs/Module/Filestorage.php:85
+#: ../../Zotlabs/Module/Filestorage.php:112 ../../Zotlabs/Module/Common.php:39
#: ../../Zotlabs/Module/Viewconnections.php:28
#: ../../Zotlabs/Module/Viewconnections.php:33
#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Rate.php:113
#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Lib/Chatroom.php:137
#: ../../Zotlabs/Web/WebServer.php:131 ../../addon/keepout/keepout.php:36
#: ../../addon/openid/Mod_Id.php:53 ../../addon/gitwiki/Mod_Gitwiki.php:196
-#: ../../addon/gitwiki/Mod_Gitwiki.php:292
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:58
-#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:144
-#: ../../include/attach.php:191 ../../include/attach.php:255
-#: ../../include/attach.php:269 ../../include/attach.php:276
-#: ../../include/attach.php:344 ../../include/attach.php:358
-#: ../../include/attach.php:365 ../../include/attach.php:442
-#: ../../include/attach.php:909 ../../include/attach.php:983
-#: ../../include/attach.php:1148 ../../include/items.php:3470
-#: ../../include/photos.php:27
+#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40
+#: ../../include/attach.php:144 ../../include/attach.php:191
+#: ../../include/attach.php:255 ../../include/attach.php:269
+#: ../../include/attach.php:276 ../../include/attach.php:344
+#: ../../include/attach.php:358 ../../include/attach.php:365
+#: ../../include/attach.php:442 ../../include/attach.php:911
+#: ../../include/attach.php:985 ../../include/attach.php:1150
+#: ../../include/items.php:3440 ../../include/photos.php:28
msgid "Permission denied."
msgstr ""
@@ -255,7 +239,7 @@ msgstr ""
msgid "Block Name"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280
msgid "Blocks"
msgstr ""
@@ -264,24 +248,22 @@ msgid "Block Title"
msgstr ""
#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
-#: ../../include/page_widgets.php:47
+#: ../../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/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257
-#: ../../include/page_widgets.php:48
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
msgid "Edited"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1126
+#: ../../Zotlabs/Module/New_channel.php:147
+#: ../../Zotlabs/Module/Connedit.php:934 ../../Zotlabs/Module/Menu.php:118
#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Storage/Browser.php:228
-#: ../../Zotlabs/Storage/Browser.php:332 ../../addon/cdav/Mod_Cdav.php:1151
-#: ../../addon/cdav/include/widgets.php:127
-#: ../../addon/cdav/include/widgets.php:164
+#: ../../Zotlabs/Module/Webpages.php:239 ../../Zotlabs/Storage/Browser.php:229
+#: ../../Zotlabs/Storage/Browser.php:335 ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Zotlabs/Widget/Cdav.php:164
msgid "Create"
msgstr ""
@@ -289,51 +271,49 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Profs.php:154
#: ../../Zotlabs/Module/Settings/Oauth.php:149
#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:296
-#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Wiki.php:165
-#: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:297
+#: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:167
+#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Menu.php:112
#: ../../Zotlabs/Module/Layouts.php:193
#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:80
-#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Lib/ThreadItem.php:107
-#: ../../Zotlabs/Storage/Browser.php:238
-#: ../../addon/cdav/include/widgets.php:125
-#: ../../addon/cdav/include/widgets.php:161
-#: ../../addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1044
-#: ../../include/channel.php:1048 ../../include/menu.php:113
-#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
+#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85
+#: ../../Zotlabs/Lib/Apps.php:368 ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Zotlabs/Widget/Cdav.php:161 ../../addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1059
+#: ../../include/channel.php:1063 ../../include/menu.php:113
msgid "Edit"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042
-#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246
-#: ../../addon/cdav/include/widgets.php:123 ../../include/conversation.php:1311
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241
+#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308
msgid "Share"
msgstr ""
#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
+#: ../../Zotlabs/Module/Cdav.php:838 ../../Zotlabs/Module/Cdav.php:1128
#: ../../Zotlabs/Module/Admin/Accounts.php:173
#: ../../Zotlabs/Module/Admin/Channels.php:149
#: ../../Zotlabs/Module/Admin/Profs.php:155
#: ../../Zotlabs/Module/Settings/Oauth.php:150
#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:267
-#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:650
-#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Connections.php:268
+#: ../../Zotlabs/Module/Photos.php:1145 ../../Zotlabs/Module/Connedit.php:650
+#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Group.php:179
#: ../../Zotlabs/Module/Profiles.php:803
#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:368
-#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:239
-#: ../../addon/cdav/Mod_Cdav.php:864 ../../addon/cdav/Mod_Cdav.php:1153
-#: ../../include/conversation.php:654
+#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:369
+#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:240
+#: ../../include/conversation.php:649 ../../include/conversation.php:686
msgid "Delete"
msgstr ""
#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../addon/gitwiki/Mod_Gitwiki.php:153 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Layouts.php:198
+#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:59
+#: ../../addon/gitwiki/Mod_Gitwiki.php:153
msgid "View"
msgstr ""
@@ -366,58 +346,62 @@ msgid_plural "%d messages sent."
msgstr[0] ""
msgstr[1] ""
-#: ../../Zotlabs/Module/Invite.php:105
+#: ../../Zotlabs/Module/Invite.php:98 ../../Zotlabs/Lib/Apps.php:242
+msgid "Invite"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:107
msgid "You have no more invitations available"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:136
+#: ../../Zotlabs/Module/Invite.php:138
msgid "Send invitations"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:137
+#: ../../Zotlabs/Module/Invite.php:139
msgid "Enter email addresses, one per line:"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303
+#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
msgid "Your message:"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Zotlabs/Module/Invite.php:141
msgid "Please join my community on $Projectname."
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Zotlabs/Module/Invite.php:143
msgid "You will need to supply this invitation code:"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:142
+#: ../../Zotlabs/Module/Invite.php:144
msgid "1. Register at any $Projectname location (they are all inter-connected)"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Zotlabs/Module/Invite.php:146
msgid "2. Enter my $Projectname network address into the site searchbar."
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:145
+#: ../../Zotlabs/Module/Invite.php:147
msgid "or visit"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Zotlabs/Module/Invite.php:149
msgid "3. Click [Connect]"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:134
-#: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:309
-#: ../../Zotlabs/Module/Setup.php:357 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Appman.php:148
+#: ../../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:166
#: ../../Zotlabs/Module/Admin/Logs.php:84
#: ../../Zotlabs/Module/Admin/Channels.php:147
#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:279
+#: ../../Zotlabs/Module/Admin/Site.php:271
#: ../../Zotlabs/Module/Admin/Profs.php:157
#: ../../Zotlabs/Module/Admin/Account_edit.php:74
#: ../../Zotlabs/Module/Admin/Security.php:104
@@ -426,25 +410,25 @@ msgstr ""
#: ../../Zotlabs/Module/Settings/Features.php:47
#: ../../Zotlabs/Module/Settings/Tokens.php:168
#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Featured.php:52
#: ../../Zotlabs/Module/Settings/Display.php:203
#: ../../Zotlabs/Module/Settings/Oauth.php:87
#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Import.php:514 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:657
-#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062
-#: ../../Zotlabs/Module/Photos.php:1180 ../../Zotlabs/Module/Wiki.php:169
-#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Chat.php:194
-#: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:1024 ../../Zotlabs/Module/Photos.php:1064
+#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Module/Wiki.php:171
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:200
+#: ../../Zotlabs/Module/Connedit.php:899 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:242 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726
#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:449
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../view/theme/redbasic/php/config.php:84
-#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:134
-#: ../../addon/cdav/cdav.php:246 ../../addon/planets/planets.php:157
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
+#: ../../Zotlabs/Module/Filestorage.php:157 ../../Zotlabs/Module/Rate.php:166
+#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../Zotlabs/Widget/Eventstools.php:16
+#: ../../view/theme/redbasic/php/config.php:95
+#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:226
+#: ../../addon/planets/planets.php:153
#: ../../addon/openclipatar/openclipatar.php:53
#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
#: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89
@@ -452,7 +436,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:712
+#: ../../addon/diaspora/diaspora.php:759
#: ../../addon/gitwiki/Mod_Gitwiki.php:155
#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170
#: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100
@@ -468,8 +452,9 @@ msgstr ""
#: ../../addon/statusnet/statusnet.php:432
#: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217
#: ../../addon/twitter/twitter.php:259
-#: ../../addon/smileybutton/smileybutton.php:281 ../../addon/piwik/piwik.php:95
-#: ../../addon/pageheader/pageheader.php:48 ../../addon/xmpp/xmpp.php:69
+#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/piwik/piwik.php:95
+#: ../../addon/pageheader/pageheader.php:48
+#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69
#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124
#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22
msgid "Submit"
@@ -495,11 +480,11 @@ msgid "Edit Layout"
msgstr ""
#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:74
#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130
#: ../../addon/redphotos/redphotos.php:119 ../../addon/frphotos/frphotos.php:81
-#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:327
+#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:340
msgid "Permission denied"
msgstr ""
@@ -511,7 +496,7 @@ msgstr ""
msgid "Profile Visibility Editor"
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1383
msgid "Profile"
msgstr ""
@@ -524,10 +509,290 @@ msgid "Visible To"
msgstr ""
#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:141
+#: ../../Zotlabs/Module/Connections.php:140
msgid "All Connections"
msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:726
+msgid "INVALID EVENT DISMISSED!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:727
+msgid "Summary: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:727 ../../Zotlabs/Module/Cdav.php:728
+#: ../../Zotlabs/Module/Cdav.php:735 ../../Zotlabs/Module/Embedphotos.php:146
+#: ../../Zotlabs/Module/Photos.php:759 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Lib/Apps.php:696 ../../Zotlabs/Lib/Apps.php:774
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:86
+#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1107
+msgid "Unknown"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:728
+msgid "Date: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736
+msgid "Reason: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:734
+msgid "INVALID CARD DISMISSED!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:735
+msgid "Name: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:768
+msgid "CalDAV"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:460
+msgid "Event title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Events.php:466
+msgid "Start date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Cdav.php:811
+msgid "Example: YYYY-MM-DD HH:mm"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:811
+msgid "End date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:812 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../addon/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
+#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../include/js_strings.php:25
+msgid "Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:689
+#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:913
+msgid "Previous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Cal.php:345
+#: ../../Zotlabs/Module/Photos.php:922
+msgid "Next"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:822 ../../Zotlabs/Module/Events.php:700
+#: ../../Zotlabs/Module/Cal.php:346
+msgid "Today"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:823 ../../Zotlabs/Module/Events.php:695
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:824 ../../Zotlabs/Module/Events.php:696
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:825 ../../Zotlabs/Module/Events.php:697
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:826
+msgid "List month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:827
+msgid "List week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:828
+msgid "List day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:835
+msgid "More"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:836
+msgid "Less"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:837
+msgid "Select calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:839
+msgid "Delete all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:840 ../../Zotlabs/Module/Cdav.php:1129
+#: ../../Zotlabs/Module/Admin/Plugins.php:423
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Wiki.php:316
+#: ../../Zotlabs/Module/Connedit.php:937 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/js_upload/js_upload.php:46
+#: ../../addon/gitwiki/Mod_Gitwiki.php:244
+#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1324
+#: ../../include/conversation.php:1373
+msgid "Cancel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:841
+msgid "Sorry! Editing of recurrent events is not yet implemented."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:969
+msgid "CardDAV"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1111 ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+#: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Module/Wiki.php:174 ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:539
+#: ../../Zotlabs/Storage/Browser.php:234
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../addon/rendezvous/rendezvous.php:172
+#: ../../addon/gitwiki/Mod_Gitwiki.php:158
+msgid "Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1112 ../../Zotlabs/Module/Connedit.php:920
+msgid "Organisation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1113 ../../Zotlabs/Module/Connedit.php:921
+msgid "Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1114 ../../Zotlabs/Module/Connedit.php:922
+#: ../../Zotlabs/Module/Profiles.php:789
+msgid "Phone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1115
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:790
+#: ../../addon/openid/MysqlProvider.php:56
+#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
+#: ../../addon/redred/redred.php:107 ../../include/network.php:1696
+msgid "Email"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1116 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Profiles.php:791
+msgid "Instant messenger"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1117 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Profiles.php:792
+msgid "Website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1118 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Connedit.php:926 ../../Zotlabs/Module/Profiles.php:502
+#: ../../Zotlabs/Module/Profiles.php:793
+msgid "Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1119 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Zotlabs/Module/Profiles.php:794
+msgid "Note"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1120 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290
+#: ../../include/connections.php:674
+msgid "Mobile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1121 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291
+#: ../../include/connections.php:675
+msgid "Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1122 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294
+#: ../../include/connections.php:678
+msgid "Work"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Profiles.php:799
+#: ../../addon/jappixmini/jappixmini.php:368
+msgid "Add Contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Profiles.php:800
+msgid "Add Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1127
+#: ../../Zotlabs/Module/Admin/Plugins.php:453
+#: ../../Zotlabs/Module/Settings/Oauth.php:42
+#: ../../Zotlabs/Module/Settings/Oauth.php:113
+#: ../../Zotlabs/Module/Connedit.php:935 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Lib/Apps.php:359
+msgid "Update"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1130 ../../Zotlabs/Module/Connedit.php:938
+msgid "P.O. Box"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1131 ../../Zotlabs/Module/Connedit.php:939
+msgid "Additional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1132 ../../Zotlabs/Module/Connedit.php:940
+msgid "Street"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1133 ../../Zotlabs/Module/Connedit.php:941
+msgid "Locality"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1134 ../../Zotlabs/Module/Connedit.php:942
+msgid "Region"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1135 ../../Zotlabs/Module/Connedit.php:943
+msgid "ZIP Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1136 ../../Zotlabs/Module/Connedit.php:944
+#: ../../Zotlabs/Module/Profiles.php:760
+msgid "Country"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1183
+msgid "Default Calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cdav.php:1193
+msgid "Default Addressbook"
+msgstr ""
+
#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
msgid "This site is not a directory server"
msgstr ""
@@ -537,20 +802,30 @@ msgstr ""
msgid "You must be logged in to see this page."
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:35
-#: ../../Zotlabs/Module/Profile.php:43
+#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37
+#: ../../Zotlabs/Module/Profile.php:45
msgid "Posts and comments"
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:42
-#: ../../Zotlabs/Module/Profile.php:50
+#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44
+#: ../../Zotlabs/Module/Profile.php:52
msgid "Only posts"
msgstr ""
+#: ../../Zotlabs/Module/Channel.php:97 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/nav.php:175
+msgid "Channel Home"
+msgstr ""
+
#: ../../Zotlabs/Module/Channel.php:112
msgid "Insufficient permissions. Request redirected to profile page."
msgstr ""
+#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:244
+#: ../../addon/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr ""
+
#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
msgid "Export Channel"
msgstr ""
@@ -616,19 +891,20 @@ msgstr ""
msgid "Public access denied."
msgstr ""
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:312
-#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../include/text.php:1027 ../../include/text.php:1039
-#: ../../include/acl_selectors.php:213 ../../include/nav.php:164
+#: ../../Zotlabs/Module/Search.php:25 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Module/Connections.php:313 ../../Zotlabs/Lib/Apps.php:238
+#: ../../Zotlabs/Widget/Sitesearch.php:31 ../../include/text.php:1021
+#: ../../include/text.php:1033 ../../include/acl_selectors.php:213
+#: ../../include/nav.php:160
msgid "Search"
msgstr ""
-#: ../../Zotlabs/Module/Search.php:224
+#: ../../Zotlabs/Module/Search.php:225
#, php-format
msgid "Items tagged with: %s"
msgstr ""
-#: ../../Zotlabs/Module/Search.php:226
+#: ../../Zotlabs/Module/Search.php:227
#, php-format
msgid "Search results for: %s"
msgstr ""
@@ -659,21 +935,7 @@ msgstr ""
msgid "Manage Channel Locations"
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
-#: ../../Zotlabs/Module/Pubsites.php:51 ../../addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:909 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:793 ../../addon/cdav/Mod_Cdav.php:1143
-msgid "Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:119
+#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111
msgid "Primary"
msgstr ""
@@ -699,6 +961,14 @@ msgstr ""
msgid "Use this form to drop the location if the hub is no longer operating."
msgstr ""
+#: ../../Zotlabs/Module/Apporder.php:34
+msgid "Change Order of Navigation Apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Apporder.php:35
+msgid "Use arrows to move the corresponding app up or down in the display list"
+msgstr ""
+
#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
msgid "Menu not found."
msgstr ""
@@ -725,7 +995,7 @@ msgid "Menu Item Permissions"
msgstr ""
#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:510
+#: ../../Zotlabs/Module/Settings/Channel.php:509
msgid "(click to open/close)"
msgstr ""
@@ -748,18 +1018,18 @@ msgstr ""
#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:237
+#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:235
#: ../../Zotlabs/Module/Settings/Channel.php:294
#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392
#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100
#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
-#: ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
-#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Filestorage.php:160 ../../boot.php:1602
+#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:115
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
@@ -782,8 +1052,9 @@ msgstr ""
#: ../../addon/statusnet/statusnet.php:415
#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
-#: ../../addon/smileybutton/smileybutton.php:273
-#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:211
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../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
#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
@@ -794,18 +1065,18 @@ msgstr ""
#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:239
+#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:237
#: ../../Zotlabs/Module/Settings/Channel.php:294
#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:642
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392
#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
#: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633
-#: ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234
-#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82
+#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Filestorage.php:160 ../../boot.php:1602
+#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:115
+#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82
#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
@@ -828,8 +1099,9 @@ msgstr ""
#: ../../addon/statusnet/statusnet.php:415
#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
-#: ../../addon/smileybutton/smileybutton.php:273
-#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:211
+#: ../../addon/smileybutton/smileybutton.php:215
+#: ../../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
#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
@@ -944,20 +1216,23 @@ msgstr ""
#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51
#: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119
-#: ../../include/text.php:1940 ../../include/event.php:1141
+#: ../../include/text.php:1933 ../../include/event.php:1145
msgid "event"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:460
-msgid "Edit event title"
+#: ../../Zotlabs/Module/Events.php:275 ../../Zotlabs/Lib/Apps.php:231
+#: ../../include/conversation.php:1799 ../../include/conversation.php:1802
+#: ../../include/nav.php:195 ../../include/nav.php:391
+#: ../../include/nav.php:394
+msgid "Events"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:460 ../../addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit event title"
msgstr ""
#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137
#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
#: ../../include/datetime.php:259
msgid "Required"
@@ -979,10 +1254,6 @@ msgstr ""
msgid "Edit start date and time"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:466 ../../addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
-msgstr ""
-
#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
msgid "Finish date and time are not known or not relevant"
msgstr ""
@@ -1009,23 +1280,17 @@ msgstr ""
msgid "Edit Description"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:124
-#: ../../Zotlabs/Module/Rbmark.php:101
-#: ../../addon/rendezvous/rendezvous.php:173 ../../addon/cdav/Mod_Cdav.php:838
-msgid "Description"
-msgstr ""
-
#: ../../Zotlabs/Module/Events.php:475
msgid "Edit Location"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1063
-#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/ThreadItem.php:741
-#: ../../include/conversation.php:1280 ../../include/page_widgets.php:43
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1065
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../include/conversation.php:1277
msgid "Preview"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1343
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1340
msgid "Permission settings"
msgstr ""
@@ -1050,7 +1315,7 @@ msgid "Delete event"
msgstr ""
#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313
-#: ../../include/text.php:1759
+#: ../../include/text.php:1752
msgid "Link to Source"
msgstr ""
@@ -1066,41 +1331,11 @@ msgstr ""
msgid "Create Event"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Photos.php:911 ../../addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
-#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:920
-#: ../../addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr ""
-
#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339
-#: ../../include/channel.php:1365
+#: ../../include/channel.php:1386
msgid "Export"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:695 ../../addon/cdav/Mod_Cdav.php:849
-msgid "Month"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:696 ../../addon/cdav/Mod_Cdav.php:850
-msgid "Week"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:697 ../../addon/cdav/Mod_Cdav.php:851
-msgid "Day"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Cal.php:346
-#: ../../addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr ""
-
#: ../../Zotlabs/Module/Events.php:731
msgid "Event removed"
msgstr ""
@@ -1117,47 +1352,47 @@ msgstr ""
msgid "Malformed app."
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:111
+#: ../../Zotlabs/Module/Appman.php:125
msgid "Embed code"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:131
msgid "Edit App"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:131
msgid "Create App"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:122
+#: ../../Zotlabs/Module/Appman.php:136
msgid "Name of app"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Appman.php:137
msgid "Location (URL) of app"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:125
+#: ../../Zotlabs/Module/Appman.php:139
msgid "Photo icon URL"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:125
+#: ../../Zotlabs/Module/Appman.php:139
msgid "80 x 80 pixels - optional"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Appman.php:140
msgid "Categories (optional, comma separated list)"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:127
+#: ../../Zotlabs/Module/Appman.php:141
msgid "Version ID"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:128
+#: ../../Zotlabs/Module/Appman.php:142
msgid "Price of app"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:129
+#: ../../Zotlabs/Module/Appman.php:143
msgid "Location (URL) to purchase app"
msgstr ""
@@ -1172,14 +1407,14 @@ msgstr ""
#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47
#: ../../Zotlabs/Module/Like.php:370
#: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:116
-#: ../../include/text.php:1937
+#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:116
+#: ../../include/text.php:1930
msgid "photo"
msgstr ""
#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370
-#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:144
-#: ../../include/text.php:1943
+#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:144
+#: ../../include/text.php:1936
msgid "status"
msgstr ""
@@ -1224,11 +1459,11 @@ 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:501
+#: ../../Zotlabs/Module/Import.php:505
msgid "File to Upload"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:121 ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/New_channel.php:121 ../../Zotlabs/Module/Manage.php:138
#, php-format
msgid "You have created %1$.0f of %2$.0f allowed channels."
msgstr ""
@@ -1329,455 +1564,434 @@ msgid ""
msgstr ""
#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:574
msgid "Remove Channel"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:99
+#: ../../Zotlabs/Module/Sharedwithme.php:104
msgid "Files: shared with me"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:100
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902
-#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:539
-#: ../../Zotlabs/Storage/Browser.php:233
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../addon/rendezvous/rendezvous.php:172 ../../addon/cdav/Mod_Cdav.php:1136
-#: ../../addon/gitwiki/Mod_Gitwiki.php:158
-msgid "Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Sharedwithme.php:101
+#: ../../Zotlabs/Module/Sharedwithme.php:106
msgid "NEW"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:102
-#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1409
+#: ../../Zotlabs/Module/Sharedwithme.php:107
+#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1386
msgid "Size"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:103
-#: ../../Zotlabs/Storage/Browser.php:236
+#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Storage/Browser.php:237
msgid "Last Modified"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Zotlabs/Module/Sharedwithme.php:109
msgid "Remove all files"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Zotlabs/Module/Sharedwithme.php:110
msgid "Remove this file"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:176
+#: ../../Zotlabs/Module/Setup.php:170
msgid "$Projectname Server - Setup"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:180
+#: ../../Zotlabs/Module/Setup.php:174
msgid "Could not connect to database."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:184
+#: ../../Zotlabs/Module/Setup.php:178
msgid ""
"Could not connect to specified site URL. Possible SSL certificate or DNS "
"issue."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Zotlabs/Module/Setup.php:185
msgid "Could not create table."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:196
+#: ../../Zotlabs/Module/Setup.php:191
msgid "Your site database has been installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:200
+#: ../../Zotlabs/Module/Setup.php:197
msgid ""
"You may need to import the file \"install/schema_xxx.sql\" manually using a "
"database client."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
+#: ../../Zotlabs/Module/Setup.php:745
msgid "Please see the file \"install/INSTALL.txt\"."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:260
+#: ../../Zotlabs/Module/Setup.php:259
msgid "System check"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:265
+#: ../../Zotlabs/Module/Setup.php:264
msgid "Check again"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Zotlabs/Module/Setup.php:286
msgid "Database connection"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Zotlabs/Module/Setup.php:287
msgid ""
"In order to install $Projectname we need to know how to connect to your "
"database."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Zotlabs/Module/Setup.php:288
msgid ""
"Please contact your hosting provider or site administrator if you have "
"questions about these settings."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Setup.php:289
msgid ""
"The database you specify below should already exist. If it does not, please "
"create it before continuing."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:293
msgid "Database Server Name"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:293
msgid "Default is 127.0.0.1"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:294
msgid "Database Port"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:294
msgid "Communication port number - use 0 for default"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Zotlabs/Module/Setup.php:295
msgid "Database Login Name"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Zotlabs/Module/Setup.php:296
msgid "Database Login Password"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Zotlabs/Module/Setup.php:297
msgid "Database Name"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:299
+#: ../../Zotlabs/Module/Setup.php:298
msgid "Database Type"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
msgid "Site administrator email address"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
msgid ""
"Your account email address must match this in order to use the web admin "
"panel."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
msgid "Website URL"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
msgid "Please use SSL (https) URL if available."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
msgid "Please select a default timezone for your website"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Admin/Site.php:258
-msgid "Basic/Minimal Social Networking"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Admin/Site.php:259
-msgid "Standard Configuration (default)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:330 ../../Zotlabs/Module/Admin/Site.php:260
-msgid "Professional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:336
+#: ../../Zotlabs/Module/Setup.php:330
msgid "Site settings"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:351 ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Server Configuration/Role"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:392
+#: ../../Zotlabs/Module/Setup.php:384
msgid "PHP version 5.5 or greater is required."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:393
+#: ../../Zotlabs/Module/Setup.php:385
msgid "PHP version"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:409
+#: ../../Zotlabs/Module/Setup.php:401
msgid "Could not find a command line version of PHP in the web server PATH."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:410
+#: ../../Zotlabs/Module/Setup.php:402
msgid ""
"If you don't have a command line version of PHP installed on server, you "
"will not be able to run background polling via cron."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Zotlabs/Module/Setup.php:406
msgid "PHP executable path"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Zotlabs/Module/Setup.php:406
msgid ""
"Enter full path to php executable. You can leave this blank to continue the "
"installation."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:419
+#: ../../Zotlabs/Module/Setup.php:411
msgid "Command line PHP"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:429
+#: ../../Zotlabs/Module/Setup.php:421
msgid ""
"Unable to check command line PHP, as shell_exec() is disabled. This is "
"required."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:424
msgid ""
"The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:433
+#: ../../Zotlabs/Module/Setup.php:425
msgid "This is required for message delivery to work."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:436
+#: ../../Zotlabs/Module/Setup.php:428
msgid "PHP register_argc_argv"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:454
+#: ../../Zotlabs/Module/Setup.php:446
#, php-format
msgid ""
"Your max allowed total upload size is set to %s. Maximum size of one file to "
"upload is set to %s. You are allowed to upload up to %d files at once."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:459
+#: ../../Zotlabs/Module/Setup.php:451
msgid "You can adjust these settings in the server php.ini file."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:461
+#: ../../Zotlabs/Module/Setup.php:453
msgid "PHP upload limits"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:484
+#: ../../Zotlabs/Module/Setup.php:476
msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:485
+#: ../../Zotlabs/Module/Setup.php:477
msgid ""
"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
"installation.php\"."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:488
+#: ../../Zotlabs/Module/Setup.php:480
msgid "Generate encryption keys"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:497
msgid "libCurl PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:506
+#: ../../Zotlabs/Module/Setup.php:498
msgid "GD graphics PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:499
msgid "OpenSSL PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:508
+#: ../../Zotlabs/Module/Setup.php:500
msgid "PDO database PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:501
msgid "mb_string PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:502
msgid "xml PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "zip PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
msgid "Apache mod_rewrite module"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:507
msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
msgid "exec"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:520
+#: ../../Zotlabs/Module/Setup.php:513
msgid ""
"Error: exec is required but is either not installed or has been disabled in "
"php.ini"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
msgid "shell_exec"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:526
+#: ../../Zotlabs/Module/Setup.php:519
msgid ""
"Error: shell_exec is required but is either not installed or has been "
"disabled in php.ini"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:534
+#: ../../Zotlabs/Module/Setup.php:527
msgid "Error: libCURL PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:531
msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:542
+#: ../../Zotlabs/Module/Setup.php:535
msgid "Error: openssl PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:546
+#: ../../Zotlabs/Module/Setup.php:539
msgid "Error: PDO database PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:550
+#: ../../Zotlabs/Module/Setup.php:543
msgid "Error: mb_string PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:554
+#: ../../Zotlabs/Module/Setup.php:547
msgid "Error: xml PHP module required for DAV but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:572
+#: ../../Zotlabs/Module/Setup.php:551
+msgid "Error: zip PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:569
msgid ""
"The web installer needs to be able to create a file called \".htconfig.php\" "
"in the top folder of your web server and it is unable to do so."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:573
+#: ../../Zotlabs/Module/Setup.php:570
msgid ""
"This is most often a permission setting, as the web server may not be able "
"to write files in your folder - even if you can."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:574
+#: ../../Zotlabs/Module/Setup.php:571
msgid ""
"At the end of this procedure, we will give you a text to save in a file "
"named .htconfig.php in your Red top folder."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Zotlabs/Module/Setup.php:572
msgid ""
"You can alternatively skip this procedure and perform a manual installation. "
"Please see the file \"install/INSTALL.txt\" for instructions."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:575
msgid ".htconfig.php is writable"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:592
+#: ../../Zotlabs/Module/Setup.php:589
msgid ""
"This software uses the Smarty3 template engine to render its web views. "
"Smarty3 compiles templates to PHP to speed up rendering."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Zotlabs/Module/Setup.php:590
#, php-format
msgid ""
"In order to store these compiled templates, the web server needs to have "
"write access to the directory %s under the top level web folder."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
+#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612
msgid ""
"Please ensure that the user that your web server runs as (e.g. www-data) has "
"write access to this folder."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:595
+#: ../../Zotlabs/Module/Setup.php:592
#, php-format
msgid ""
"Note: as a security measure, you should give the web server write access to "
"%s only--not the template files (.tpl) that it contains."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:598
+#: ../../Zotlabs/Module/Setup.php:595
#, php-format
msgid "%s is writable"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:614
+#: ../../Zotlabs/Module/Setup.php:611
msgid ""
"This software uses the store directory to save uploaded files. The web "
"server needs to have write access to the store directory under the top level "
"web folder"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:618
+#: ../../Zotlabs/Module/Setup.php:615
msgid "store is writable"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:650
+#: ../../Zotlabs/Module/Setup.php:647
msgid ""
"SSL certificate cannot be validated. Fix certificate or disable https access "
"to this site."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Zotlabs/Module/Setup.php:648
msgid ""
"If you have https access to your website or allow connections to TCP port "
"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
"NOT use self-signed certificates!"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:649
msgid ""
"This restriction is incorporated because public posts from you may for "
"example contain references to images on your own hub."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Zotlabs/Module/Setup.php:650
msgid ""
"If your certificate is not recognized, members of other sites (who may "
"themselves have valid certificates) will get a warning message on their own "
"site complaining about security issues."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:651
msgid ""
"This can cause usability issues elsewhere (not just on your own site) so we "
"must insist on this requirement."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:652
msgid ""
"Providers are available that issue free certificates which are browser-valid."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:657
+#: ../../Zotlabs/Module/Setup.php:654
msgid ""
"If you are confident that the certificate is valid and signed by a trusted "
"authority, check to see if you have failed to install an intermediate cert. "
@@ -1785,37 +1999,36 @@ msgid ""
"server communications."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:656
msgid "SSL certificate validation"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:665
+#: ../../Zotlabs/Module/Setup.php:662
msgid ""
"Url rewrite in .htaccess is not working. Check your server configuration."
"Test: "
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:668
+#: ../../Zotlabs/Module/Setup.php:665
msgid "Url rewrite is working"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:682
+#: ../../Zotlabs/Module/Setup.php:679
msgid ""
"The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web "
"server root."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:706 ../../addon/rendezvous/rendezvous.php:401
-#: ../../addon/cdav/cdav.php:41
+#: ../../Zotlabs/Module/Setup.php:703 ../../addon/rendezvous/rendezvous.php:401
msgid "Errors encountered creating database tables."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:746
-msgid "<h1>What next</h1>"
+#: ../../Zotlabs/Module/Setup.php:743
+msgid "<h1>What next?</h1>"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Zotlabs/Module/Setup.php:744
msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr ""
@@ -1955,8 +2168,8 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Plugins.php:259
#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60
-#: ../../include/items.php:3391
+#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
+#: ../../include/items.php:3361
msgid "Item not found."
msgstr ""
@@ -1987,9 +2200,9 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Channels.php:145
#: ../../Zotlabs/Module/Admin/Themes.php:122
#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Admin/Site.php:269
#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Zotlabs/Module/Admin.php:136
msgid "Administration"
msgstr ""
@@ -2004,8 +2217,8 @@ msgid "Toggle"
msgstr ""
#: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
-#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:207
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:224
+#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:201
msgid "Settings"
msgstr ""
@@ -2068,25 +2281,10 @@ msgstr ""
msgid "Install new repo"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:359
msgid "Install"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
-#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/cdav/Mod_Cdav.php:866
-#: ../../addon/cdav/Mod_Cdav.php:1154 ../../addon/js_upload/js_upload.php:46
-#: ../../addon/gitwiki/Mod_Gitwiki.php:244
-#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1327
-#: ../../include/conversation.php:1376
-msgid "Cancel"
-msgstr ""
-
#: ../../Zotlabs/Module/Admin/Plugins.php:445
msgid "Manage Repos"
msgstr ""
@@ -2099,20 +2297,12 @@ msgstr ""
msgid "Install a New Plugin Repository"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/cdav/Mod_Cdav.php:1152
-msgid "Update"
-msgstr ""
-
#: ../../Zotlabs/Module/Admin/Plugins.php:454
msgid "Switch branch"
msgstr ""
#: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Tagrm.php:137
#: ../../addon/superblock/superblock.php:116
msgid "Remove"
msgstr ""
@@ -2152,7 +2342,7 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Accounts.php:165
#: ../../Zotlabs/Module/Admin/Accounts.php:178
-#: ../../Zotlabs/Widget/Admin.php:23
+#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
msgid "Accounts"
msgstr ""
@@ -2169,21 +2359,12 @@ msgstr ""
msgid "Request date"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:906 ../../Zotlabs/Module/Profiles.php:790
-#: ../../addon/cdav/Mod_Cdav.php:1140 ../../addon/openid/MysqlProvider.php:56
-#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
-#: ../../addon/redred/redred.php:107 ../../include/network.php:2315
-msgid "Email"
-msgstr ""
-
#: ../../Zotlabs/Module/Admin/Accounts.php:170
msgid "No registrations."
msgstr ""
#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:685
msgid "Approve"
msgstr ""
@@ -2205,7 +2386,7 @@ msgstr ""
msgid "ID"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
+#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:288
msgid "All Channels"
msgstr ""
@@ -2319,7 +2500,7 @@ msgid "Channel '%s' code disallowed"
msgstr ""
#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Widget/Admin.php:24
+#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24
msgid "Channels"
msgstr ""
@@ -2340,7 +2521,7 @@ msgid "Disallow Code"
msgstr ""
#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1760 ../../include/nav.php:369
+#: ../../include/conversation.php:1757 ../../include/nav.php:349
msgid "Channel"
msgstr ""
@@ -2385,378 +2566,379 @@ msgstr ""
msgid "[Unsupported]"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:144
+#: ../../Zotlabs/Module/Admin/Site.php:142
msgid "Site settings updated."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915
+#: ../../Zotlabs/Module/Admin/Site.php:168
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2928
msgid "Default"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:181
+#: ../../Zotlabs/Module/Admin/Site.php:179
#: ../../Zotlabs/Module/Settings/Display.php:137
#, php-format
msgid "%s - (Incompatible)"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:188
+#: ../../Zotlabs/Module/Admin/Site.php:186
#: ../../Zotlabs/Module/Settings/Display.php:151
msgid "mobile"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:190
+#: ../../Zotlabs/Module/Admin/Site.php:188
msgid "experimental"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:192
+#: ../../Zotlabs/Module/Admin/Site.php:190
msgid "unsupported"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:238
+#: ../../Zotlabs/Module/Admin/Site.php:236
msgid "Yes - with approval"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:244
+#: ../../Zotlabs/Module/Admin/Site.php:242
msgid "My site is not a public server"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:245
+#: ../../Zotlabs/Module/Admin/Site.php:243
msgid "My site has paid access only"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:246
+#: ../../Zotlabs/Module/Admin/Site.php:244
msgid "My site has free access only"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:247
+#: ../../Zotlabs/Module/Admin/Site.php:245
msgid "My site offers free accounts with optional paid upgrades"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Zotlabs/Module/Admin/Site.php:256
msgid "Beginner/Basic"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Zotlabs/Module/Admin/Site.php:257
msgid "Novice - not skilled but willing to learn"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Zotlabs/Module/Admin/Site.php:258
msgid "Intermediate - somewhat comfortable"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Zotlabs/Module/Admin/Site.php:259
msgid "Advanced - very comfortable"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Zotlabs/Module/Admin/Site.php:260
msgid "Expert - I can write computer code"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Zotlabs/Module/Admin/Site.php:261
msgid "Wizard - I probably know more than you do"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Widget/Admin.php:22
msgid "Site"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:280
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Zotlabs/Module/Admin/Site.php:272
+#: ../../Zotlabs/Module/Register.php:251
msgid "Registration"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:281
+#: ../../Zotlabs/Module/Admin/Site.php:273
msgid "File upload"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Zotlabs/Module/Admin/Site.php:274
msgid "Policies"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:283 ../../include/contact_widgets.php:16
+#: ../../Zotlabs/Module/Admin/Site.php:275 ../../include/contact_widgets.php:16
msgid "Advanced"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Admin/Site.php:279
#: ../../addon/statusnet/statusnet.php:890
msgid "Site name"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:281
msgid "Site default technical skill level"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:281
msgid "Used to provide a member experience matched to technical comfort level"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:283
msgid "Lock the technical skill level setting"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:283
msgid "Members can set their own technical comfort level by default"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:295
+#: ../../Zotlabs/Module/Admin/Site.php:285
msgid "Banner/Logo"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:286
msgid "Administrator Information"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:286
msgid ""
"Contact information for site administrators. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:297 ../../Zotlabs/Module/Siteinfo.php:23
+#: ../../Zotlabs/Module/Admin/Site.php:287 ../../Zotlabs/Module/Siteinfo.php:22
msgid "Site Information"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Admin/Site.php:287
msgid ""
"Publicly visible description of this site. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:288
msgid "System language"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:289
msgid "System theme"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:289
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:300
+#: ../../Zotlabs/Module/Admin/Site.php:290
msgid "Mobile system theme"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:290
msgid "Theme for mobile devices"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:292
msgid "Allow Feeds as Connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:292
msgid "(Heavy system resource usage)"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:293
msgid "Maximum image size"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:293
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:294
msgid "Does this site allow new member registration?"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:295
msgid "Invitation only"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:295
msgid ""
"Only allow new member registrations with an invitation code. Above register "
"policy must be set to Yes."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:296
msgid "Which best describes the types of account offered by this hub?"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:297
msgid "Register text"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:297
msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:298
msgid "Site homepage to show visitors (default: login box)"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:298
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:309
+#: ../../Zotlabs/Module/Admin/Site.php:299
msgid "Preserve site homepage URL"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:299
msgid ""
"Present the site homepage in a frame at the original location instead of "
"redirecting"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:300
msgid "Accounts abandoned after x days"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:300
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:301
msgid "Allowed friend domains"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:301
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:312
+#: ../../Zotlabs/Module/Admin/Site.php:302
msgid "Verify Email Addresses"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:302
msgid ""
"Check to verify email addresses used in account registration (recommended)."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:303
msgid "Force publish"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:303
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:304
msgid "Import Public Streams"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:304
msgid ""
"Import and allow access to public content pulled from other sites. Warning: "
"this content is unmoderated."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:305
msgid "Login on Homepage"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:305
msgid ""
"Present a login box to visitors on the home page if no other content has "
"been configured."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:306
msgid "Enable context help"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:306
msgid ""
"Display contextual help for the current page when the help button is pressed."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:308
msgid "Reply-to email address for system generated email."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Admin/Site.php:309
msgid "Sender (From) email address for system generated email."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:310
msgid "Name of email sender for system generated email."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:312
msgid "Directory Server URL"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:312
msgid "Default directory server"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:314
msgid "Proxy user"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:315
msgid "Proxy URL"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:316
msgid "Network timeout"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:316
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:317
msgid "Delivery interval"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:317
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:328
+#: ../../Zotlabs/Module/Admin/Site.php:318
msgid "Deliveries per process"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:318
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:329
+#: ../../Zotlabs/Module/Admin/Site.php:319
msgid "Poll interval"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:319
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:320
msgid "Maximum Load Average"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:320
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:321
msgid "Expiration period in days for imported (grid/network) content"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:321
msgid "0 for no expiration of imported content"
msgstr ""
@@ -2802,8 +2984,8 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Profs.php:74
#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028
-#: ../../include/text.php:1040
+#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022
+#: ../../include/text.php:1034
msgid "Save"
msgstr ""
@@ -3005,6 +3187,14 @@ msgctxt "acl"
msgid "Profile"
msgstr ""
+#: ../../Zotlabs/Module/Moderate.php:37
+msgid "Comment approved"
+msgstr ""
+
+#: ../../Zotlabs/Module/Moderate.php:41
+msgid "Comment deleted"
+msgstr ""
+
#: ../../Zotlabs/Module/Settings/Permcats.php:37
msgid "Permission category saved."
msgstr ""
@@ -3025,25 +3215,25 @@ msgstr ""
#: ../../Zotlabs/Module/Settings/Permcats.php:103
#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:903
msgid "My Settings"
msgstr ""
#: ../../Zotlabs/Module/Settings/Permcats.php:105
#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Connedit.php:898
msgid "inherited"
msgstr ""
#: ../../Zotlabs/Module/Settings/Permcats.php:108
#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Connedit.php:905
msgid "Individual Permissions"
msgstr ""
#: ../../Zotlabs/Module/Settings/Permcats.php:109
#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Connedit.php:906
msgid ""
"Some permissions may be inherited from your channel's <a href=\"settings"
"\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -3056,8 +3246,8 @@ msgstr ""
#: ../../Zotlabs/Module/Settings/Channel.php:70
#: ../../Zotlabs/Module/Settings/Channel.php:81
#: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28
-#: ../../include/selectors.php:123 ../../include/channel.php:406
-#: ../../include/channel.php:407 ../../include/channel.php:414
+#: ../../include/selectors.php:123 ../../include/channel.php:408
+#: ../../include/channel.php:409 ../../include/channel.php:416
msgid "Friends"
msgstr ""
@@ -3132,7 +3322,7 @@ msgstr ""
msgid "Basic Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:482 ../../include/channel.php:1250
+#: ../../Zotlabs/Module/Settings/Channel.php:482 ../../include/channel.php:1271
msgid "Full Name:"
msgstr ""
@@ -3171,278 +3361,278 @@ msgstr ""
msgid "Security and Privacy Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Zotlabs/Module/Settings/Channel.php:492
msgid "Your permissions are already configured. Click to view/adjust"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:494
msgid "Hide my online presence"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:494
msgid "Prevents displaying in your profile that you are online"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:496
msgid "Simple Privacy Settings:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:498
+#: ../../Zotlabs/Module/Settings/Channel.php:497
msgid ""
"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:499
+#: ../../Zotlabs/Module/Settings/Channel.php:498
msgid ""
"Typical - <em>default public, privacy when desired (similar to social "
"network permissions but with improved privacy)</em>"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Zotlabs/Module/Settings/Channel.php:499
msgid "Private - <em>default private, never open or public</em>"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Zotlabs/Module/Settings/Channel.php:500
msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:502
msgid "Allow others to tag your posts"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:502
msgid ""
"Often used by the community to retro-actively flag inappropriate content"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:505
+#: ../../Zotlabs/Module/Settings/Channel.php:504
msgid "Channel Permission Limits"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:506
msgid "Expire other channel content after this many days"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:506
msgid "0 or blank to use the website limit."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:506
#, php-format
msgid "This website expires after %d days."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:506
msgid "This website does not expire imported content."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:506
msgid "The website limit takes precedence if lower than your limit."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:507
msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:507
msgid "May reduce spam activity"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Zotlabs/Module/Settings/Channel.php:508
msgid "Default Access Control List (ACL)"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Zotlabs/Module/Settings/Channel.php:510
msgid "Use my default audience setting for the type of object published"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:517
msgid "Channel permissions category:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:518
msgid "Default Permissions Group"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:524
msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Zotlabs/Module/Settings/Channel.php:524
msgid "Useful to reduce spamming"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Zotlabs/Module/Settings/Channel.php:527
msgid "Notification Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Zotlabs/Module/Settings/Channel.php:528
msgid "By default post a status message when:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Zotlabs/Module/Settings/Channel.php:529
msgid "accepting a friend request"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:531
+#: ../../Zotlabs/Module/Settings/Channel.php:530
msgid "joining a forum/community"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Zotlabs/Module/Settings/Channel.php:531
msgid "making an <em>interesting</em> profile change"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:533
+#: ../../Zotlabs/Module/Settings/Channel.php:532
msgid "Send a notification email when:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Zotlabs/Module/Settings/Channel.php:533
msgid "You receive a connection request"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:535
+#: ../../Zotlabs/Module/Settings/Channel.php:534
msgid "Your connections are confirmed"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:536
+#: ../../Zotlabs/Module/Settings/Channel.php:535
msgid "Someone writes on your profile wall"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/Settings/Channel.php:536
msgid "Someone writes a followup comment"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:538
+#: ../../Zotlabs/Module/Settings/Channel.php:537
msgid "You receive a private message"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Zotlabs/Module/Settings/Channel.php:538
msgid "You receive a friend suggestion"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Zotlabs/Module/Settings/Channel.php:539
msgid "You are tagged in a post"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:541
+#: ../../Zotlabs/Module/Settings/Channel.php:540
msgid "You are poked/prodded/etc. in a post"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:543
+#: ../../Zotlabs/Module/Settings/Channel.php:542
msgid "Someone likes your post/comment"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:545
msgid "Show visual notifications including:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:547
msgid "Unseen grid activity"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:548
msgid "Unseen channel activity"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:549
msgid "Unseen private messages"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:554
#: ../../Zotlabs/Module/Settings/Channel.php:555
#: ../../Zotlabs/Module/Settings/Channel.php:556
-#: ../../Zotlabs/Module/Settings/Channel.php:557
#: ../../addon/jappixmini/jappixmini.php:343
msgid "Recommended"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Zotlabs/Module/Settings/Channel.php:550
msgid "Upcoming events"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Zotlabs/Module/Settings/Channel.php:551
msgid "Events today"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:552
msgid "Upcoming birthdays"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:552
msgid "Not available in all themes"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Zotlabs/Module/Settings/Channel.php:553
msgid "System (personal) notifications"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:554
msgid "System info messages"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:555
msgid "System critical alerts"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:556
msgid "New connections"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:557
msgid "System Registrations"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Zotlabs/Module/Settings/Channel.php:558
msgid ""
"Also show new wall posts, private messages and connections under Notices"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:560
msgid "Notify me of events this many days in advance"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:560
msgid "Must be greater than 0"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:566
msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:568
+#: ../../Zotlabs/Module/Settings/Channel.php:567
msgid "Change the behaviour of this account for special situations"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Zotlabs/Module/Settings/Channel.php:569
msgid "Miscellaneous Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:570
msgid "Default photo upload folder"
msgstr ""
+#: ../../Zotlabs/Module/Settings/Channel.php:570
#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:572
msgid "%Y - current year, %m - current month"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:571
msgid "Default file upload folder"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:573
msgid "Personal menu to display in your channel pages"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:575
msgid "Remove this channel."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:576
msgid "Firefox Share $Projectname provider"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:577
msgid "Start calendar week on Monday"
msgstr ""
@@ -3478,7 +3668,7 @@ msgid ""
msgstr ""
#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:90
+#: ../../Zotlabs/Widget/Settings_menu.php:92
msgid "Guest Access Tokens"
msgstr ""
@@ -3495,7 +3685,7 @@ msgid "Expires (yyyy-mm-dd)"
msgstr ""
#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:885
+#: ../../Zotlabs/Module/Connedit.php:902
msgid "Their Settings"
msgstr ""
@@ -3572,27 +3762,27 @@ msgstr ""
msgid "Remove this account including all its channels"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:20
+#: ../../Zotlabs/Module/Settings/Featured.php:21
msgid "Affinity Slider settings updated."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:34
+#: ../../Zotlabs/Module/Settings/Featured.php:36
msgid "No feature settings configured"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:41
+#: ../../Zotlabs/Module/Settings/Featured.php:43
msgid "Default maximum affinity level"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:46
+#: ../../Zotlabs/Module/Settings/Featured.php:48
msgid "Default minimum affinity level"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Featured.php:52
msgid "Affinity Slider Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:60
+#: ../../Zotlabs/Module/Settings/Featured.php:62
msgid "Feature/Addon Settings"
msgstr ""
@@ -3784,32 +3974,24 @@ msgstr ""
msgid "Remove authorization"
msgstr ""
-#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:751
-#: ../../Zotlabs/Module/Photos.php:1290 ../../Zotlabs/Widget/Album.php:78
+#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:753
+#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Widget/Portfolio.php:78
+#: ../../Zotlabs/Widget/Album.php:78
msgid "View Photo"
msgstr ""
-#: ../../Zotlabs/Module/Embedphotos.php:146 ../../Zotlabs/Module/Photos.php:757
-#: ../../Zotlabs/Module/Photos.php:1213 ../../Zotlabs/Lib/Apps.php:571
-#: ../../Zotlabs/Lib/Apps.php:649 ../../Zotlabs/Storage/Browser.php:163
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/cdav/Mod_Cdav.php:745
-#: ../../addon/cdav/Mod_Cdav.php:746 ../../addon/cdav/Mod_Cdav.php:753
-#: ../../include/conversation.php:1110
-msgid "Unknown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:782
-#: ../../Zotlabs/Widget/Album.php:95
+#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:784
+#: ../../Zotlabs/Widget/Portfolio.php:97 ../../Zotlabs/Widget/Album.php:95
msgid "Edit Album"
msgstr ""
-#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:784
-#: ../../Zotlabs/Module/Photos.php:1321
+#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:786
+#: ../../Zotlabs/Module/Photos.php:1323
#: ../../Zotlabs/Module/Profile_photo.php:423
#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334
-#: ../../Zotlabs/Widget/Album.php:97 ../../addon/cdav/include/widgets.php:132
-#: ../../addon/cdav/include/widgets.php:168
+#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:337
+#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97
msgid "Upload"
msgstr ""
@@ -3871,9 +4053,9 @@ msgid "URL for photo of thing (optional)"
msgstr ""
#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
-#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011
-#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:233
-#: ../../Zotlabs/Module/Filestorage.php:152 ../../include/acl_selectors.php:218
+#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1013
+#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:235
+#: ../../Zotlabs/Module/Filestorage.php:144 ../../include/acl_selectors.php:218
msgid "Permissions"
msgstr ""
@@ -3893,52 +4075,52 @@ msgstr ""
msgid "Channel added."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:144
+#: ../../Zotlabs/Module/Import.php:143
#, php-format
msgid "Your service plan only allows %d channels."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:158
+#: ../../Zotlabs/Module/Import.php:157
msgid "No channel. Import failed."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:466
+#: ../../Zotlabs/Module/Import.php:470
#: ../../addon/diaspora/import_diaspora.php:142
msgid "Import completed."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:494
+#: ../../Zotlabs/Module/Import.php:498
msgid "You must be logged in to use this feature."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:499
+#: ../../Zotlabs/Module/Import.php:503
msgid "Import Channel"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:500
+#: ../../Zotlabs/Module/Import.php:504
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:502
+#: ../../Zotlabs/Module/Import.php:506
msgid "Or provide the old server/hub details"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:503
+#: ../../Zotlabs/Module/Import.php:507
msgid "Your old identity address (xyz@example.com)"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:504
+#: ../../Zotlabs/Module/Import.php:508
msgid "Your old login email address"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:505
+#: ../../Zotlabs/Module/Import.php:509
msgid "Your old login password"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:506
+#: ../../Zotlabs/Module/Import.php:510
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 "
@@ -3946,19 +4128,19 @@ msgid ""
"location for files, photos, and media."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:507
+#: ../../Zotlabs/Module/Import.php:511
msgid "Make this hub my primary location"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:508
+#: ../../Zotlabs/Module/Import.php:512
msgid "Move this channel (disable all previous locations)"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:509
+#: ../../Zotlabs/Module/Import.php:513
msgid "Import a few months of posts if possible (limited by available memory"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Zotlabs/Module/Import.php:514
msgid ""
"This process may take several minutes to complete. Please submit the form "
"only once and leave this page open until finished."
@@ -3968,21 +4150,21 @@ msgstr ""
msgid "Authentication failed."
msgstr ""
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2000
msgid "Remote Authentication"
msgstr ""
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2001
msgid "Enter your channel address (e.g. channel@example.com)"
msgstr ""
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2002
msgid "Authenticate"
msgstr ""
#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:31
-#: ../../Zotlabs/Module/Block.php:43
+#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31
+#: ../../Zotlabs/Module/Block.php:41
msgid "Channel not found."
msgstr ""
@@ -3990,7 +4172,7 @@ msgstr ""
msgid "Permissions denied."
msgstr ""
-#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304
msgid "Import"
msgstr ""
@@ -4016,13 +4198,13 @@ msgstr ""
msgid "Item not available."
msgstr ""
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306
-#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228
+#: ../../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 ../../include/conversation.php:1225
msgid "Insert web link"
msgstr ""
-#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1336
msgid "Title (optional)"
msgstr ""
@@ -4030,11 +4212,11 @@ msgstr ""
msgid "Edit Block"
msgstr ""
-#: ../../Zotlabs/Module/Profile.php:91
+#: ../../Zotlabs/Module/Profile.php:93
msgid "vcard"
msgstr ""
-#: ../../Zotlabs/Module/Apps.php:45
+#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:212
msgid "Apps"
msgstr ""
@@ -4052,7 +4234,8 @@ msgctxt "mood"
msgid "%1$s is %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
+#: ../../Zotlabs/Module/Mood.php:120 ../../Zotlabs/Module/Mood.php:135
+#: ../../Zotlabs/Lib/Apps.php:235
msgid "Mood"
msgstr ""
@@ -4060,74 +4243,87 @@ msgstr ""
msgid "Set your current mood and tell your friends"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:52
-#: ../../Zotlabs/Module/Connections.php:157
-#: ../../Zotlabs/Module/Connections.php:246
-msgid "Blocked"
+#: ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:217
+#: ../../include/text.php:951 ../../include/nav.php:180
+msgid "Connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:57
-#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Zotlabs/Module/Connections.php:54
+#: ../../Zotlabs/Module/Connections.php:156
#: ../../Zotlabs/Module/Connections.php:245
-msgid "Ignored"
+msgid "Blocked"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:62
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Zotlabs/Module/Connections.php:59
+#: ../../Zotlabs/Module/Connections.php:163
#: ../../Zotlabs/Module/Connections.php:244
-msgid "Hidden"
+msgid "Ignored"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:67
-#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Zotlabs/Module/Connections.php:64
+#: ../../Zotlabs/Module/Connections.php:177
#: ../../Zotlabs/Module/Connections.php:243
-msgid "Archived"
+msgid "Hidden"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:72
-#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1666
+#: ../../Zotlabs/Module/Connections.php:69
+#: ../../Zotlabs/Module/Connections.php:170
+msgid "Archived/Unreachable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:74
+#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116
+#: ../../include/conversation.php:1663
msgid "New"
msgstr ""
#: ../../Zotlabs/Module/Connections.php:88
-#: ../../Zotlabs/Module/Connections.php:103
+#: ../../Zotlabs/Module/Connections.php:102
#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
msgid "All"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:134
+#: ../../Zotlabs/Module/Connections.php:133
msgid "New Connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:137
+#: ../../Zotlabs/Module/Connections.php:136
msgid "Show pending (new) connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:144
+#: ../../Zotlabs/Module/Connections.php:143
msgid "Show all connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:160
+#: ../../Zotlabs/Module/Connections.php:159
msgid "Only show blocked connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Zotlabs/Module/Connections.php:166
msgid "Only show ignored connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:174
-msgid "Only show archived connections"
+#: ../../Zotlabs/Module/Connections.php:173
+msgid "Only show archived/unreachable connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Zotlabs/Module/Connections.php:180
msgid "Only show hidden connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:242
+#: ../../Zotlabs/Module/Connections.php:241
msgid "Pending approval"
msgstr ""
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Archived"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:246
+msgid "Not connected at this location"
+msgstr ""
+
#: ../../Zotlabs/Module/Connections.php:258
#, php-format
msgid "%1$s [%2$s]"
@@ -4137,61 +4333,56 @@ msgstr ""
msgid "Edit connection"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:261
msgid "Delete connection"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:269
+#: ../../Zotlabs/Module/Connections.php:270
msgid "Channel address"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:271
+#: ../../Zotlabs/Module/Connections.php:272
msgid "Network"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Zotlabs/Module/Connections.php:275
msgid "Call"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Zotlabs/Module/Connections.php:277
msgid "Status"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Zotlabs/Module/Connections.php:279
msgid "Connected"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Zotlabs/Module/Connections.php:281
msgid "Approve connection"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Zotlabs/Module/Connections.php:283
msgid "Ignore connection"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connections.php:284
#: ../../Zotlabs/Module/Connedit.php:626
msgid "Ignore"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:284
+#: ../../Zotlabs/Module/Connections.php:285
msgid "Recent activity"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/text.php:957 ../../include/nav.php:185
-msgid "Connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:313
+#: ../../Zotlabs/Module/Connections.php:314
msgid "Search your connections"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:314
+#: ../../Zotlabs/Module/Connections.php:315
msgid "Connections search"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:315
+#: ../../Zotlabs/Module/Connections.php:316
#: ../../Zotlabs/Module/Directory.php:391
#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
msgid "Find"
@@ -4205,15 +4396,19 @@ msgstr ""
msgid "Source of Item"
msgstr ""
-#: ../../Zotlabs/Module/Bookmarks.php:53
+#: ../../Zotlabs/Module/Bookmarks.php:11 ../../Zotlabs/Lib/Apps.php:215
+msgid "View Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:56
msgid "Bookmark added"
msgstr ""
-#: ../../Zotlabs/Module/Bookmarks.php:76
+#: ../../Zotlabs/Module/Bookmarks.php:79
msgid "My Bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Bookmarks.php:87
+#: ../../Zotlabs/Module/Bookmarks.php:90
msgid "My Connections Bookmarks"
msgstr ""
@@ -4257,7 +4452,7 @@ msgstr ""
msgid "Delete Album"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1025
msgid "Delete Photo"
msgstr ""
@@ -4269,226 +4464,232 @@ msgstr ""
msgid "Access to this item is restricted."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:591
+#: ../../Zotlabs/Module/Photos.php:558 ../../Zotlabs/Module/Fbrowser.php:29
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1780
+#: ../../include/nav.php:372
+msgid "Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:593
#, php-format
msgid "%1$.2f MB of %2$.2f MB photo storage used."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:594
+#: ../../Zotlabs/Module/Photos.php:596
#, php-format
msgid "%1$.2f MB photo storage used."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:636
+#: ../../Zotlabs/Module/Photos.php:638
msgid "Upload Photos"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:640
+#: ../../Zotlabs/Module/Photos.php:642
msgid "Enter an album name"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:641
+#: ../../Zotlabs/Module/Photos.php:643
msgid "or select an existing album (doubleclick)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:642
+#: ../../Zotlabs/Module/Photos.php:644
msgid "Create a status post for this upload"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:643
+#: ../../Zotlabs/Module/Photos.php:645
msgid "Caption (optional):"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:644
+#: ../../Zotlabs/Module/Photos.php:646
msgid "Description (optional):"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:725
+#: ../../Zotlabs/Module/Photos.php:727
msgid "Show Newest First"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:727
+#: ../../Zotlabs/Module/Photos.php:729
msgid "Show Oldest First"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:832
+#: ../../Zotlabs/Module/Photos.php:834
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:834
+#: ../../Zotlabs/Module/Photos.php:836
msgid "Photo not available"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:892
+#: ../../Zotlabs/Module/Photos.php:894
msgid "Use as profile photo"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:893
+#: ../../Zotlabs/Module/Photos.php:895
msgid "Use as cover photo"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:900
+#: ../../Zotlabs/Module/Photos.php:902
msgid "Private Photo"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:915
+#: ../../Zotlabs/Module/Photos.php:917
msgid "View Full Size"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:997
+#: ../../Zotlabs/Module/Photos.php:999
msgid "Edit photo"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:999
+#: ../../Zotlabs/Module/Photos.php:1001
msgid "Rotate CW (right)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1000
+#: ../../Zotlabs/Module/Photos.php:1002
msgid "Rotate CCW (left)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1003
+#: ../../Zotlabs/Module/Photos.php:1005
msgid "Move photo to album"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1004
+#: ../../Zotlabs/Module/Photos.php:1006
msgid "Enter a new album name"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1005
+#: ../../Zotlabs/Module/Photos.php:1007
msgid "or select an existing one (doubleclick)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1008
+#: ../../Zotlabs/Module/Photos.php:1010
msgid "Caption"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1010
+#: ../../Zotlabs/Module/Photos.php:1012
msgid "Add a Tag"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1018
+#: ../../Zotlabs/Module/Photos.php:1020
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1021
+#: ../../Zotlabs/Module/Photos.php:1023
msgid "Flag as adult in album view"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269
+#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Lib/ThreadItem.php:267
msgid "I like this (toggle)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270
+#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:268
msgid "I don't like this (toggle)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412
-#: ../../include/conversation.php:739
+#: ../../Zotlabs/Module/Photos.php:1045 ../../Zotlabs/Lib/ThreadItem.php:410
+#: ../../include/conversation.php:736
msgid "Please wait"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
-#: ../../Zotlabs/Lib/ThreadItem.php:729
+#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Lib/ThreadItem.php:727
msgid "This is you"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
-#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6
+#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Module/Photos.php:1181
+#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6
msgid "Comment"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569
msgctxt "title"
msgid "Likes"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569
msgctxt "title"
msgid "Dislikes"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
msgctxt "title"
msgid "Agree"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
msgctxt "title"
msgid "Disagree"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570
msgctxt "title"
msgid "Abstain"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
msgctxt "title"
msgid "Attending"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
msgctxt "title"
msgid "Not attending"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571
msgctxt "title"
msgid "Might attend"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1110
#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199
msgid "View all"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
-#: ../../include/conversation.php:1907 ../../include/channel.php:1268
-#: ../../include/taxonomy.php:403
+#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../include/conversation.php:1904 ../../include/channel.php:1289
+#: ../../include/taxonomy.php:442
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
msgstr[0] ""
msgstr[1] ""
-#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
-#: ../../include/conversation.php:1910
+#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:196
+#: ../../include/conversation.php:1907
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
msgstr[0] ""
msgstr[1] ""
-#: ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Module/Photos.php:1207
msgid "Photo Tools"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1214
+#: ../../Zotlabs/Module/Photos.php:1216
msgid "In This Photo:"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1219
+#: ../../Zotlabs/Module/Photos.php:1221
msgid "Map"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401
+#: ../../Zotlabs/Module/Photos.php:1229 ../../Zotlabs/Lib/ThreadItem.php:399
msgctxt "noun"
msgid "Likes"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402
+#: ../../Zotlabs/Module/Photos.php:1230 ../../Zotlabs/Lib/ThreadItem.php:400
msgctxt "noun"
msgid "Dislikes"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407
+#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405
#: ../../include/acl_selectors.php:220
msgid "Close"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
-#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529
+#: ../../Zotlabs/Module/Photos.php:1307 ../../Zotlabs/Module/Photos.php:1320
+#: ../../Zotlabs/Module/Photos.php:1321 ../../include/photos.php:526
msgid "Recent Photos"
msgstr ""
@@ -4504,163 +4705,169 @@ msgstr ""
msgid "Invalid channel"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1854 ../../include/nav.php:462
+#: ../../Zotlabs/Module/Wiki.php:79 ../../Zotlabs/Lib/Apps.php:227
+#: ../../include/conversation.php:1854 ../../include/features.php:95
+#: ../../include/nav.php:445
+msgid "Wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:162 ../../addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1851 ../../include/nav.php:442
msgid "Wikis"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:166 ../../addon/gitwiki/Mod_Gitwiki.php:152
+#: ../../Zotlabs/Module/Wiki.php:168 ../../addon/gitwiki/Mod_Gitwiki.php:152
msgid "Download"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254
-#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Wiki.php:170 ../../Zotlabs/Module/Chat.php:256
+#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145
#: ../../addon/gitwiki/Mod_Gitwiki.php:154
msgid "Create New"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:170 ../../addon/gitwiki/Mod_Gitwiki.php:156
+#: ../../Zotlabs/Module/Wiki.php:172 ../../addon/gitwiki/Mod_Gitwiki.php:156
msgid "Wiki name"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:171 ../../addon/gitwiki/Mod_Gitwiki.php:157
+#: ../../Zotlabs/Module/Wiki.php:173 ../../addon/gitwiki/Mod_Gitwiki.php:157
msgid "Content type"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:173 ../../Zotlabs/Storage/Browser.php:234
+#: ../../Zotlabs/Module/Wiki.php:175 ../../Zotlabs/Storage/Browser.php:235
#: ../../addon/gitwiki/Mod_Gitwiki.php:159
msgid "Type"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:180 ../../addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:166
msgid "Create a status post for this wiki"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:205 ../../addon/gitwiki/Mod_Gitwiki.php:185
+#: ../../Zotlabs/Module/Wiki.php:224 ../../addon/gitwiki/Mod_Gitwiki.php:185
msgid "Wiki not found"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:229 ../../addon/gitwiki/Mod_Gitwiki.php:210
+#: ../../Zotlabs/Module/Wiki.php:248 ../../addon/gitwiki/Mod_Gitwiki.php:210
msgid "Rename page"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:233 ../../addon/gitwiki/Mod_Gitwiki.php:214
+#: ../../Zotlabs/Module/Wiki.php:258 ../../addon/gitwiki/Mod_Gitwiki.php:214
msgid "Error retrieving page content"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:239
+#: ../../Zotlabs/Module/Wiki.php:264
msgid "New page"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:263 ../../addon/gitwiki/Mod_Gitwiki.php:242
+#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:242
msgid "Revision Comparison"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:264 ../../addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:243
msgid "Revert"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:268
+#: ../../Zotlabs/Module/Wiki.php:293
msgid "Short description of your changes (optional)"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:275 ../../addon/gitwiki/Mod_Gitwiki.php:252
+#: ../../Zotlabs/Module/Wiki.php:300 ../../addon/gitwiki/Mod_Gitwiki.php:252
msgid "Source"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:283 ../../addon/gitwiki/Mod_Gitwiki.php:260
+#: ../../Zotlabs/Module/Wiki.php:309 ../../addon/gitwiki/Mod_Gitwiki.php:260
msgid "New page name"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1232
+#: ../../Zotlabs/Module/Wiki.php:314 ../../addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1229
msgid "Embed image from photo albums"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1326
+#: ../../Zotlabs/Module/Wiki.php:315 ../../addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1323
msgid "Embed an image from your albums"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:291 ../../addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
+#: ../../Zotlabs/Module/Wiki.php:317 ../../addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1325 ../../include/conversation.php:1372
msgid "OK"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:292 ../../addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1268
+#: ../../Zotlabs/Module/Wiki.php:318 ../../addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1265
msgid "Choose images to embed"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:293 ../../addon/gitwiki/Mod_Gitwiki.php:270
-#: ../../include/conversation.php:1269
+#: ../../Zotlabs/Module/Wiki.php:319 ../../addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1266
msgid "Choose an album"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:294 ../../addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../Zotlabs/Module/Wiki.php:320 ../../addon/gitwiki/Mod_Gitwiki.php:271
msgid "Choose a different album"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:295 ../../addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1271
+#: ../../Zotlabs/Module/Wiki.php:321 ../../addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1268
msgid "Error getting album list"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1272
+#: ../../Zotlabs/Module/Wiki.php:322 ../../addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1269
msgid "Error getting photo link"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:297 ../../addon/gitwiki/Mod_Gitwiki.php:274
-#: ../../include/conversation.php:1273
+#: ../../Zotlabs/Module/Wiki.php:323 ../../addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1270
msgid "Error getting album"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:337
+#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:337
msgid "Error creating wiki. Invalid name."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:371
+#: ../../Zotlabs/Module/Wiki.php:398
msgid "A wiki with this name already exists."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:384 ../../addon/gitwiki/Mod_Gitwiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:411 ../../addon/gitwiki/Mod_Gitwiki.php:348
msgid "Wiki created, but error creating Home page."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:353
+#: ../../Zotlabs/Module/Wiki.php:418 ../../addon/gitwiki/Mod_Gitwiki.php:353
msgid "Error creating wiki"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:403
+#: ../../Zotlabs/Module/Wiki.php:430
msgid "Wiki delete permission denied."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:413
+#: ../../Zotlabs/Module/Wiki.php:440
msgid "Error deleting wiki"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:439 ../../addon/gitwiki/Mod_Gitwiki.php:400
+#: ../../Zotlabs/Module/Wiki.php:466 ../../addon/gitwiki/Mod_Gitwiki.php:400
msgid "New page created"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:558
+#: ../../Zotlabs/Module/Wiki.php:587
msgid "Cannot delete Home"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:622
+#: ../../Zotlabs/Module/Wiki.php:651
msgid "Current Revision"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:622
+#: ../../Zotlabs/Module/Wiki.php:651
msgid "Selected Revision"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:672
+#: ../../Zotlabs/Module/Wiki.php:701
msgid "You must be authenticated."
msgstr ""
-#: ../../Zotlabs/Module/Chanview.php:134
+#: ../../Zotlabs/Module/Chanview.php:139
msgid "toggle full screen mode"
msgstr ""
@@ -4668,7 +4875,7 @@ msgstr ""
msgid "Layout updated."
msgstr ""
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
msgid "Feature disabled."
msgstr ""
@@ -4688,32 +4895,32 @@ msgstr ""
msgid "Layout Help"
msgstr ""
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
-#: ../../include/conversation.php:1042
+#: ../../Zotlabs/Module/Poke.php:153 ../../Zotlabs/Module/Poke.php:182
+#: ../../Zotlabs/Lib/Apps.php:236 ../../include/conversation.php:1039
msgid "Poke"
msgstr ""
-#: ../../Zotlabs/Module/Poke.php:169
+#: ../../Zotlabs/Module/Poke.php:183
msgid "Poke somebody"
msgstr ""
-#: ../../Zotlabs/Module/Poke.php:172
+#: ../../Zotlabs/Module/Poke.php:186
msgid "Poke/Prod"
msgstr ""
-#: ../../Zotlabs/Module/Poke.php:173
+#: ../../Zotlabs/Module/Poke.php:187
msgid "Poke, prod or do other things to somebody"
msgstr ""
-#: ../../Zotlabs/Module/Poke.php:180
+#: ../../Zotlabs/Module/Poke.php:194
msgid "Recipient"
msgstr ""
-#: ../../Zotlabs/Module/Poke.php:181
+#: ../../Zotlabs/Module/Poke.php:195
msgid "Choose what you wish to do to recipient"
msgstr ""
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
msgid "Make this post private"
msgstr ""
@@ -4724,7 +4931,7 @@ msgstr ""
#: ../../Zotlabs/Module/Profile_photo.php:115
#: ../../Zotlabs/Module/Profile_photo.php:226
-#: ../../include/photo/photo_driver.php:647
+#: ../../include/photo/photo_driver.php:658
msgid "Profile Photos"
msgstr ""
@@ -4741,7 +4948,7 @@ msgid ""
msgstr ""
#: ../../Zotlabs/Module/Profile_photo.php:203
-#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:149
+#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:145
msgid "Unable to process image"
msgstr ""
@@ -4823,28 +5030,32 @@ msgstr ""
msgid "Unable to locate original post."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:451
+#: ../../Zotlabs/Module/Item.php:470
msgid "Empty post discarded."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:825
+#: ../../Zotlabs/Module/Item.php:844
msgid "Duplicate post suppressed."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:955
+#: ../../Zotlabs/Module/Item.php:989
msgid "System error. Post not saved."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1085
+#: ../../Zotlabs/Module/Item.php:1025
+msgid "Your comment is awaiting approval."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1123
msgid "Unable to obtain post information from database."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1092
+#: ../../Zotlabs/Module/Item.php:1130
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1099
+#: ../../Zotlabs/Module/Item.php:1137
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -4869,18 +5080,18 @@ msgstr ""
msgid "posted an event"
msgstr ""
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
msgid "Invalid item."
msgstr ""
-#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
+#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77
#: ../../Zotlabs/Module/Display.php:122
#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146
#: ../../include/help.php:68
msgid "Page not found."
msgstr ""
-#: ../../Zotlabs/Module/Page.php:131
+#: ../../Zotlabs/Module/Page.php:165
msgid ""
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
@@ -4928,9 +5139,9 @@ msgstr ""
msgid "Connection has been removed."
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:229
#: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:982 ../../include/nav.php:106
+#: ../../include/conversation.php:979 ../../include/nav.php:102
msgid "View Profile"
msgstr ""
@@ -5084,101 +5295,119 @@ msgstr ""
msgid "none"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:847
-#: ../../Zotlabs/Widget/Settings_menu.php:107
+#: ../../Zotlabs/Module/Connedit.php:851
+msgid "This connection is unreachable from this location."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:852
+msgid "This connection may be unreachable from other channel locations."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:854
+msgid "Location independence is not supported by their network."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:860
+msgid ""
+"This connection is unreachable from this location. Location independence is "
+"not supported by their network."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:863
+#: ../../Zotlabs/Widget/Settings_menu.php:109
msgid "Connection Default Permissions"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955
+#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:864
msgid "Apply these permissions automatically"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:864
msgid "Connection requests will be approved without your interaction"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:849
+#: ../../Zotlabs/Module/Connedit.php:865
msgid "Permission role"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:850
+#: ../../Zotlabs/Module/Connedit.php:866
msgid "Add permission role"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:856
+#: ../../Zotlabs/Module/Connedit.php:872
msgid "This connection's primary address is"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../Zotlabs/Module/Connedit.php:873
msgid "Available locations:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Connedit.php:878
msgid ""
"The permissions indicated on this page will be applied to all new "
"connections."
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:862
+#: ../../Zotlabs/Module/Connedit.php:879
msgid "Connection Tools"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:864
+#: ../../Zotlabs/Module/Connedit.php:881
msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155
+#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Rate.php:155
#: ../../include/js_strings.php:20
msgid "Rating"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:866
+#: ../../Zotlabs/Module/Connedit.php:883
msgid "Slide to adjust your rating"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872
+#: ../../Zotlabs/Module/Connedit.php:884 ../../Zotlabs/Module/Connedit.php:889
msgid "Optionally explain your rating"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Zotlabs/Module/Connedit.php:886
msgid "Custom Filter"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:870
+#: ../../Zotlabs/Module/Connedit.php:887
msgid "Only import posts with this text"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:887 ../../Zotlabs/Module/Connedit.php:888
msgid ""
"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
"all posts"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:888
msgid "Do not import posts with this text"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:873
+#: ../../Zotlabs/Module/Connedit.php:890
msgid "This information is public!"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Connedit.php:895
msgid "Connection Pending Approval"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Zotlabs/Module/Connedit.php:900
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Zotlabs/Module/Connedit.php:907
msgid ""
"Some permissions may be inherited from your channel's <a href=\"settings"
"\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -5186,172 +5415,85 @@ msgid ""
"any impact unless the inherited setting changes."
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:891
+#: ../../Zotlabs/Module/Connedit.php:908
msgid "Last update:"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:900
+#: ../../Zotlabs/Module/Connedit.php:917
msgid "Details"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137
-msgid "Organisation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:904 ../../addon/cdav/Mod_Cdav.php:1138
-#: ../../include/page_widgets.php:46
-msgid "Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Profiles.php:789
-#: ../../addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Profiles.php:791
-#: ../../addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Profiles.php:792
-#: ../../addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:794
-#: ../../addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:795
-#: ../../addon/cdav/Mod_Cdav.php:1145 ../../addon/cdav/cdav.php:270
-#: ../../include/connections.php:668
-msgid "Mobile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:912 ../../Zotlabs/Module/Profiles.php:796
-#: ../../addon/cdav/Mod_Cdav.php:1146 ../../addon/cdav/cdav.php:271
-#: ../../include/connections.php:669
-msgid "Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:797
-#: ../../addon/cdav/Mod_Cdav.php:1147 ../../addon/cdav/cdav.php:274
-#: ../../include/connections.php:672
-msgid "Work"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:799
-#: ../../addon/cdav/Mod_Cdav.php:1149 ../../addon/jappixmini/jappixmini.php:368
-msgid "Add Contact"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:800
-#: ../../addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:921 ../../addon/cdav/Mod_Cdav.php:1155
-msgid "P.O. Box"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:922 ../../addon/cdav/Mod_Cdav.php:1156
-msgid "Additional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:923 ../../addon/cdav/Mod_Cdav.php:1157
-msgid "Street"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:924 ../../addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:925 ../../addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:926 ../../addon/cdav/Mod_Cdav.php:1160
-msgid "ZIP Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760
-#: ../../addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
+#: ../../Zotlabs/Module/Chat.php:94 ../../Zotlabs/Lib/Apps.php:216
+msgid "My Chatrooms"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:179
+#: ../../Zotlabs/Module/Chat.php:181
msgid "Room not found"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:195
+#: ../../Zotlabs/Module/Chat.php:197
msgid "Leave Room"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:198
msgid "Delete Room"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Zotlabs/Module/Chat.php:199
msgid "I am away right now"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Zotlabs/Module/Chat.php:200
msgid "I am online"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Zotlabs/Module/Chat.php:202
msgid "Bookmark this room"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259
-#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
+#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1260
msgid "Please enter a link URL:"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312
-#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744
-#: ../../include/conversation.php:1373
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:742
+#: ../../include/conversation.php:1370
msgid "Encrypt text"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:230
+#: ../../Zotlabs/Module/Chat.php:232
msgid "New Chatroom"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:231
+#: ../../Zotlabs/Module/Chat.php:233
msgid "Chatroom name"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Zotlabs/Module/Chat.php:234
msgid "Expiration of chats (minutes)"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:248
+#: ../../Zotlabs/Module/Chat.php:250
#, php-format
msgid "%1$s's Chatrooms"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:253
+#: ../../Zotlabs/Module/Chat.php:255
msgid "No chatrooms available"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:257
+#: ../../Zotlabs/Module/Chat.php:259
msgid "Expiration"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:258
+#: ../../Zotlabs/Module/Chat.php:260
msgid "min"
msgstr ""
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1783 ../../include/nav.php:392
-msgid "Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:224
-#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791
-#: ../../include/nav.php:400
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:225
+#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Storage/Browser.php:247
+#: ../../include/conversation.php:1788 ../../include/nav.php:380
msgid "Files"
msgstr ""
@@ -5391,7 +5533,7 @@ msgstr ""
msgid "Submit and proceed"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281
msgid "Menus"
msgstr ""
@@ -5443,13 +5585,14 @@ msgstr ""
msgid "Allow bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282
msgid "Layouts"
msgstr ""
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/nav.php:161 ../../include/nav.php:268
-#: ../../include/help.php:55 ../../include/help.php:61
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Module/Help.php:18
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:157
+#: ../../include/nav.php:258 ../../include/help.php:55
+#: ../../include/help.php:61
msgid "Help"
msgstr ""
@@ -5465,12 +5608,13 @@ msgstr ""
msgid "Download PDL file"
msgstr ""
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141
+#: ../../include/bbcode.php:334
msgid "post"
msgstr ""
#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
-#: ../../include/text.php:1945
+#: ../../include/text.php:1938
msgid "comment"
msgstr ""
@@ -5502,8 +5646,8 @@ msgstr ""
msgid "Could not create privacy group."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3922
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
+#: ../../include/items.php:3892
msgid "Privacy group not found."
msgstr ""
@@ -5511,39 +5655,39 @@ msgstr ""
msgid "Privacy group updated."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:90
+#: ../../Zotlabs/Module/Group.php:92
msgid "Create a group of channels."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186
msgid "Privacy group name: "
msgstr ""
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189
msgid "Members are visible to other channels"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:111
+#: ../../Zotlabs/Module/Group.php:113
msgid "Privacy group removed."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Zotlabs/Module/Group.php:115
msgid "Unable to remove privacy group."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:183
+#: ../../Zotlabs/Module/Group.php:185
msgid "Privacy group editor"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81
+#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81
msgid "Members"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:199
+#: ../../Zotlabs/Module/Group.php:201
msgid "All Connected Channels"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:231
+#: ../../Zotlabs/Module/Group.php:233
msgid "Click on a channel to add or remove."
msgstr ""
@@ -5638,7 +5782,7 @@ msgid "View this profile"
msgstr ""
#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1066
+#: ../../include/channel.php:1081
msgid "Edit visibility"
msgstr ""
@@ -5650,7 +5794,7 @@ msgstr ""
msgid "Change cover photo"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1052
msgid "Change profile photo"
msgstr ""
@@ -5670,7 +5814,7 @@ msgstr ""
msgid "Add profile things"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654
msgid "Personal"
msgstr ""
@@ -5815,12 +5959,12 @@ msgstr ""
msgid "Communications"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1077
msgid "Profile Image"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
-#: ../../include/nav.php:109
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1059
+#: ../../include/nav.php:105
msgid "Edit Profiles"
msgstr ""
@@ -5832,42 +5976,42 @@ msgstr ""
msgid "Edit Webpage"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Manage.php:145
msgid "Create a new channel"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:205
+#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:199
msgid "Channel Manager"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:169
+#: ../../Zotlabs/Module/Manage.php:171
msgid "Current Channel"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
msgid "Switch to one of your channels by selecting it."
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:172
+#: ../../Zotlabs/Module/Manage.php:174
msgid "Default Channel"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
msgid "Make Default"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:176
+#: ../../Zotlabs/Module/Manage.php:178
#, php-format
msgid "%d new messages"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:177
+#: ../../Zotlabs/Module/Manage.php:179
#, php-format
msgid "%d new introductions"
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Zotlabs/Module/Manage.php:181
msgid "Delegated Channel"
msgstr ""
@@ -5875,45 +6019,45 @@ msgstr ""
msgid "This directory server requires an access token"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:20
+#: ../../Zotlabs/Module/Siteinfo.php:19
msgid "About this site"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Zotlabs/Module/Siteinfo.php:20
msgid "Site Name"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025
+#: ../../Zotlabs/Module/Siteinfo.php:24
msgid "Administrator"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:27 ../../Zotlabs/Module/Register.php:221
+#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:221
msgid "Terms of Service"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Zotlabs/Module/Siteinfo.php:27
msgid "Software and Project information"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:29
+#: ../../Zotlabs/Module/Siteinfo.php:28
msgid "This site is powered by $Projectname"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Zotlabs/Module/Siteinfo.php:29
msgid ""
"Federated and decentralised networking and identity services provided by Zot"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Zotlabs/Module/Siteinfo.php:31
#, php-format
msgid "Version %s"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:33
+#: ../../Zotlabs/Module/Siteinfo.php:32
msgid "Project homepage"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:34
+#: ../../Zotlabs/Module/Siteinfo.php:33
msgid "Developer homepage"
msgstr ""
@@ -5922,7 +6066,7 @@ msgid "No ratings"
msgstr ""
#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
-#: ../../include/conversation.php:1032
+#: ../../include/conversation.php:1029
msgid "Ratings"
msgstr ""
@@ -5938,64 +6082,65 @@ msgstr ""
msgid "Description: "
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:52
+#: ../../Zotlabs/Module/Webpages.php:38 ../../Zotlabs/Module/Webpages.php:237
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1838
+#: ../../include/nav.php:429
+msgid "Webpages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:54
msgid "Import Webpage Elements"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:53
+#: ../../Zotlabs/Module/Webpages.php:55
msgid "Import selected"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:76
+#: ../../Zotlabs/Module/Webpages.php:78
msgid "Export Webpage Elements"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:77
+#: ../../Zotlabs/Module/Webpages.php:79
msgid "Export selected"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1841 ../../include/nav.php:449
-msgid "Webpages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44
+#: ../../Zotlabs/Module/Webpages.php:248
msgid "Actions"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45
+#: ../../Zotlabs/Module/Webpages.php:249
msgid "Page Link"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:255
+#: ../../Zotlabs/Module/Webpages.php:250
msgid "Page Title"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:285
+#: ../../Zotlabs/Module/Webpages.php:280
msgid "Invalid file type."
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:297
+#: ../../Zotlabs/Module/Webpages.php:292
msgid "Error opening zip file"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:308
+#: ../../Zotlabs/Module/Webpages.php:303
msgid "Invalid folder path."
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:335
+#: ../../Zotlabs/Module/Webpages.php:330
msgid "No webpage elements detected."
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:410
+#: ../../Zotlabs/Module/Webpages.php:405
msgid "Import complete."
msgstr ""
-#: ../../Zotlabs/Module/Editpost.php:38
+#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
msgid "Item is not editable"
msgstr ""
-#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:140
msgid "Edit post"
msgstr ""
@@ -6081,7 +6226,7 @@ msgid "*"
msgstr ""
#: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213
+#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209
msgid "Channel Sources"
msgstr ""
@@ -6137,6 +6282,10 @@ msgstr ""
msgid "Unable to remove source."
msgstr ""
+#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:245
+msgid "Post"
+msgstr ""
+
#: ../../Zotlabs/Module/Like.php:19
msgid "Like/Dislike"
msgstr ""
@@ -6172,55 +6321,59 @@ msgstr ""
msgid "Previous action reversed."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812
+#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1399
#: ../../include/conversation.php:160
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163
+#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:423
+#: ../../Zotlabs/Module/Like.php:427
#, php-format
msgid "%1$s agrees with %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:425
+#: ../../Zotlabs/Module/Like.php:429
#, php-format
msgid "%1$s doesn't agree with %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:427
+#: ../../Zotlabs/Module/Like.php:431
#, php-format
msgid "%1$s abstains from a decision on %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:429
+#: ../../Zotlabs/Module/Like.php:433
#, php-format
msgid "%1$s is attending %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:431
+#: ../../Zotlabs/Module/Like.php:435
#, php-format
msgid "%1$s is not attending %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:433
+#: ../../Zotlabs/Module/Like.php:437
#, php-format
msgid "%1$s may attend %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:547
msgid "Action completed."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:539
+#: ../../Zotlabs/Module/Like.php:548
msgid "Thank you."
msgstr ""
+#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:232
+msgid "Directory"
+msgstr ""
+
#: ../../Zotlabs/Module/Directory.php:245
#, php-format
msgid "%d rating"
@@ -6240,13 +6393,12 @@ msgstr ""
msgid "Homepage: "
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1314
msgid "Age:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560
-#: ../../include/channel.php:1134 ../../include/event.php:52
-#: ../../include/event.php:84
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1149
+#: ../../include/event.php:52 ../../include/event.php:84
msgid "Location:"
msgstr ""
@@ -6254,18 +6406,18 @@ msgstr ""
msgid "Description:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1330
msgid "Hometown:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1338
msgid "About:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56
#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1002 ../../include/channel.php:1119
-#: ../../include/connections.php:110
+#: ../../include/conversation.php:999 ../../include/channel.php:1134
+#: ../../include/connections.php:111
msgid "Connect"
msgstr ""
@@ -6297,7 +6449,7 @@ msgstr ""
msgid "Finding:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
#: ../../include/contact_widgets.php:24
msgid "Channel Suggestions"
msgstr ""
@@ -6342,13 +6494,18 @@ msgstr ""
msgid "Lookup xchan beginning with (or webbie): "
msgstr ""
-#: ../../Zotlabs/Module/Suggest.php:37
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Lib/Apps.php:220
+#: ../../include/features.php:333
+msgid "Suggest Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Suggest.php:39
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
"hours."
msgstr ""
-#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
msgid "Ignore/Hide"
msgstr ""
@@ -6360,103 +6517,108 @@ msgstr ""
msgid "Post successful."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:65
+#: ../../Zotlabs/Module/Mail.php:73
msgid "Unable to lookup recipient."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:72
+#: ../../Zotlabs/Module/Mail.php:80
msgid "Unable to communicate with requested channel."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:79
+#: ../../Zotlabs/Module/Mail.php:87
msgid "Cannot verify requested channel."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:97
+#: ../../Zotlabs/Module/Mail.php:105
msgid "Selected channel has private message restrictions. Send failed."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:178
+#: ../../Zotlabs/Module/Mail.php:143 ../../Zotlabs/Lib/Apps.php:234
+#: ../../include/nav.php:187
+msgid "Mail"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:160
msgid "Messages"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:191
+#: ../../Zotlabs/Module/Mail.php:173
msgid "message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:232
+#: ../../Zotlabs/Module/Mail.php:214
msgid "Message recalled."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:245
+#: ../../Zotlabs/Module/Mail.php:227
msgid "Conversation removed."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381
+#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:288
+#: ../../Zotlabs/Module/Mail.php:270
msgid "Requested channel is not in this network"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:296
+#: ../../Zotlabs/Module/Mail.php:278
msgid "Send Private Message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439
+#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
msgid "To:"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441
+#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
msgid "Subject:"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447
-#: ../../include/conversation.php:1323
+#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../include/conversation.php:1320
msgid "Attach file"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:307
+#: ../../Zotlabs/Module/Mail.php:289
msgid "Send"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452
-#: ../../include/conversation.php:1368
+#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../include/conversation.php:1365
msgid "Set expiration date"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:411
+#: ../../Zotlabs/Module/Mail.php:393
msgid "Delete message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:412
+#: ../../Zotlabs/Module/Mail.php:394
msgid "Delivery report"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:413
+#: ../../Zotlabs/Module/Mail.php:395
msgid "Recall message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:415
+#: ../../Zotlabs/Module/Mail.php:397
msgid "Message has been recalled."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:432
+#: ../../Zotlabs/Module/Mail.php:414
msgid "Delete Conversation"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:434
+#: ../../Zotlabs/Module/Mail.php:416
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:438
+#: ../../Zotlabs/Module/Mail.php:420
msgid "Send Reply"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:443
+#: ../../Zotlabs/Module/Mail.php:425
#, php-format
msgid "Your message for %s (%s):"
msgstr ""
@@ -6498,19 +6660,19 @@ msgstr ""
msgid "Rate"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263
msgid "webpage"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269
msgid "block"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266
msgid "layout"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272
msgid "menu"
msgstr ""
@@ -6552,7 +6714,11 @@ msgstr ""
msgid "Save to Folder"
msgstr ""
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#: ../../Zotlabs/Module/Probe.php:11 ../../Zotlabs/Lib/Apps.php:219
+msgid "Remote Diagnostics"
+msgstr ""
+
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
#, php-format
msgid "Fetching URL returns error: %1$s"
msgstr ""
@@ -6635,16 +6801,16 @@ msgstr ""
msgid "yes"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:256
msgid "Membership on this site is by invitation only."
msgstr ""
-#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610
-#: ../../include/nav.php:149
+#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1579
+#: ../../include/nav.php:145
msgid "Register"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:271
+#: ../../Zotlabs/Module/Register.php:269
msgid ""
"This site may require email verification after submitting this form. If you "
"are returned to a login page, please check your email for instructions."
@@ -6655,30 +6821,30 @@ msgstr ""
msgid "Cover Photos"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273
msgid "female"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274
#, php-format
msgid "%1$s updated her %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275
msgid "male"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276
#, php-format
msgid "%1$s updated his %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278
#, php-format
msgid "%1$s updated their %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1776
msgid "cover photo"
msgstr ""
@@ -6690,8 +6856,8 @@ msgstr ""
msgid "Documentation Search"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773
-#: ../../include/nav.php:382
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1770
+#: ../../include/nav.php:362
msgid "About"
msgstr ""
@@ -6743,6 +6909,10 @@ msgstr ""
msgid "Search Results For:"
msgstr ""
+#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:223
+msgid "Activity"
+msgstr ""
+
#: ../../Zotlabs/Module/Network.php:221
msgid "Privacy group is empty"
msgstr ""
@@ -6777,47 +6947,47 @@ msgstr ""
msgid "Welcome to %s"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:87
+#: ../../Zotlabs/Module/Filestorage.php:79
msgid "Permission Denied."
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:103
+#: ../../Zotlabs/Module/Filestorage.php:95
msgid "File not found."
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:146
+#: ../../Zotlabs/Module/Filestorage.php:138
msgid "Edit file permissions"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Zotlabs/Module/Filestorage.php:151
msgid "Set/edit permissions"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:152
msgid "Include all files and sub folders"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Filestorage.php:153
msgid "Return to file list"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Zotlabs/Module/Filestorage.php:155
msgid "Copy/paste this code to attach file to a post"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Filestorage.php:156
msgid "Copy/paste this URL to link file from a web page"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:166
+#: ../../Zotlabs/Module/Filestorage.php:158
msgid "Share this file"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:167
+#: ../../Zotlabs/Module/Filestorage.php:159
msgid "Show URL to this file"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Filestorage.php:160
msgid "Notify your contacts about this file"
msgstr ""
@@ -6846,71 +7016,59 @@ msgstr ""
msgid "View Connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
-msgstr ""
-
#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
+msgid "Blocked accounts"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
+#: ../../Zotlabs/Module/Admin.php:98
+msgid "Expired accounts"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
+#: ../../Zotlabs/Module/Admin.php:99
+msgid "Expiring accounts"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
+#: ../../Zotlabs/Module/Admin.php:112
+msgid "Clones"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:116
+#: ../../Zotlabs/Module/Admin.php:118
msgid "Message queues"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:133
+#: ../../Zotlabs/Module/Admin.php:132
msgid "Your software should be updated"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:138
+#: ../../Zotlabs/Module/Admin.php:137
msgid "Summary"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Zotlabs/Module/Admin.php:140
msgid "Registered accounts"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Zotlabs/Module/Admin.php:141
msgid "Pending registrations"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:143
+#: ../../Zotlabs/Module/Admin.php:142
msgid "Registered channels"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Zotlabs/Module/Admin.php:143
msgid "Active plugins"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Zotlabs/Module/Admin.php:144
msgid "Version"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Zotlabs/Module/Admin.php:145
msgid "Repository version (master)"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Zotlabs/Module/Admin.php:146
msgid "Repository version (dev)"
msgstr ""
@@ -6959,7 +7117,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1606
msgid "Password Reset"
msgstr ""
@@ -7008,120 +7166,90 @@ msgstr ""
msgid "Reset"
msgstr ""
-#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:212
-msgid "Site Admin"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:213 ../../addon/buglink/buglink.php:16
-msgid "Report Bug"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:214
-msgid "View Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:215
-msgid "My Chatrooms"
+#: ../../Zotlabs/Module/Notifications.php:43
+#: ../../Zotlabs/Lib/ThreadItem.php:392
+msgid "Mark all seen"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:217
-msgid "Firefox Share"
+#: ../../Zotlabs/Lib/Techlevels.php:10
+msgid "0. Beginner/Basic"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:218
-msgid "Remote Diagnostics"
+#: ../../Zotlabs/Lib/Techlevels.php:11
+msgid "1. Novice - not skilled but willing to learn"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
-msgid "Suggest Channels"
+#: ../../Zotlabs/Lib/Techlevels.php:12
+msgid "2. Intermediate - somewhat comfortable"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629 ../../include/nav.php:117
-msgid "Login"
+#: ../../Zotlabs/Lib/Techlevels.php:13
+msgid "3. Advanced - very comfortable"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:222
-msgid "Activity"
+#: ../../Zotlabs/Lib/Techlevels.php:14
+msgid "4. Expert - I can write computer code"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857
-#: ../../include/features.php:99 ../../include/nav.php:465
-msgid "Wiki"
+#: ../../Zotlabs/Lib/Techlevels.php:15
+msgid "5. Wizard - I probably know more than you do"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:180
-msgid "Channel Home"
+#: ../../Zotlabs/Lib/Apps.php:213
+msgid "Site Admin"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1802
-#: ../../include/conversation.php:1805 ../../include/nav.php:200
-#: ../../include/nav.php:411 ../../include/nav.php:414
-msgid "Events"
+#: ../../Zotlabs/Lib/Apps.php:214 ../../addon/buglink/buglink.php:16
+msgid "Report Bug"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Directory"
+#: ../../Zotlabs/Lib/Apps.php:218
+msgid "Firefox Share"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192
-msgid "Mail"
+#: ../../Zotlabs/Lib/Apps.php:221 ../../boot.php:1598 ../../include/nav.php:113
+msgid "Login"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:236
+#: ../../Zotlabs/Lib/Apps.php:237
msgid "Chat"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:238
-msgid "Probe"
-msgstr ""
-
#: ../../Zotlabs/Lib/Apps.php:239
-msgid "Suggest"
+msgid "Probe"
msgstr ""
#: ../../Zotlabs/Lib/Apps.php:240
-msgid "Random Channel"
+msgid "Suggest"
msgstr ""
#: ../../Zotlabs/Lib/Apps.php:241
-msgid "Invite"
+msgid "Random Channel"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Zotlabs/Lib/Apps.php:243 ../../Zotlabs/Widget/Admin.php:26
msgid "Features"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:243 ../../addon/openid/MysqlProvider.php:69
-msgid "Language"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:244
-msgid "Post"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:245 ../../addon/openid/MysqlProvider.php:58
+#: ../../Zotlabs/Lib/Apps.php:246 ../../addon/openid/MysqlProvider.php:58
#: ../../addon/openid/MysqlProvider.php:59
#: ../../addon/openid/MysqlProvider.php:60
msgid "Profile Photo"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Lib/Apps.php:366
msgid "Purchase"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:369
+#: ../../Zotlabs/Lib/Apps.php:370
msgid "Undelete"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:374
+#: ../../Zotlabs/Lib/Apps.php:376
msgid "Add to app-tray"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:375
+#: ../../Zotlabs/Lib/Apps.php:377
msgid "Remove from app-tray"
msgstr ""
@@ -7209,8 +7337,8 @@ msgid "Message"
msgstr ""
#: ../../Zotlabs/Lib/NativeWikiPage.php:578
-#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610
-#: ../../include/bbcode.php:756
+#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:667
+#: ../../include/bbcode.php:813
msgid "Different viewers will see this text differently"
msgstr ""
@@ -7297,21 +7425,20 @@ msgstr ""
msgid "Room is full"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977
+#: ../../Zotlabs/Lib/Enotify.php:60
msgid "$Projectname Notification"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:218
-#: ../../addon/diaspora/util.php:231 ../../addon/diaspora/p.php:46
-#: ../../include/network.php:1978
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:283
+#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:46
msgid "$projectname"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1980
+#: ../../Zotlabs/Lib/Enotify.php:63
msgid "Thank You,"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982
+#: ../../Zotlabs/Lib/Enotify.php:65
#, php-format
msgid "%s Administrator"
msgstr ""
@@ -7345,175 +7472,185 @@ msgstr ""
msgid "Please visit %s to view and/or reply to your private messages."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:183
+#: ../../Zotlabs/Lib/Enotify.php:184
#, php-format
msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:191
+#: ../../Zotlabs/Lib/Enotify.php:192
#, php-format
msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:200
+#: ../../Zotlabs/Lib/Enotify.php:201
#, php-format
msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:211
+#: ../../Zotlabs/Lib/Enotify.php:213
+#, php-format
+msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:215
#, php-format
msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:212
+#: ../../Zotlabs/Lib/Enotify.php:216
#, php-format
msgid "%1$s, %2$s commented on an item/conversation you have been following."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292
-#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335
-#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367
+#: ../../Zotlabs/Lib/Enotify.php:219 ../../Zotlabs/Lib/Enotify.php:301
+#: ../../Zotlabs/Lib/Enotify.php:318 ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Zotlabs/Lib/Enotify.php:362 ../../Zotlabs/Lib/Enotify.php:376
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:273
+#: ../../Zotlabs/Lib/Enotify.php:223 ../../Zotlabs/Lib/Enotify.php:224
+#, php-format
+msgid "Please visit %s to approve or reject this comment."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:282
#, php-format
msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:288
+#: ../../Zotlabs/Lib/Enotify.php:297
#, php-format
msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:289
+#: ../../Zotlabs/Lib/Enotify.php:298
#, php-format
msgid "%1$s, %2$s liked an item/conversation you created."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:300
+#: ../../Zotlabs/Lib/Enotify.php:309
#, php-format
msgid "[$Projectname:Notify] %s posted to your profile wall"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:302
+#: ../../Zotlabs/Lib/Enotify.php:311
#, php-format
msgid "%1$s, %2$s posted to your profile wall at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:304
+#: ../../Zotlabs/Lib/Enotify.php:313
#, php-format
msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:328
+#: ../../Zotlabs/Lib/Enotify.php:337
#, php-format
msgid "[$Projectname:Notify] %s tagged you"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:329
+#: ../../Zotlabs/Lib/Enotify.php:338
#, php-format
msgid "%1$s, %2$s tagged you at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:330
+#: ../../Zotlabs/Lib/Enotify.php:339
#, php-format
msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:342
+#: ../../Zotlabs/Lib/Enotify.php:351
#, php-format
msgid "[$Projectname:Notify] %1$s poked you"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:343
+#: ../../Zotlabs/Lib/Enotify.php:352
#, php-format
msgid "%1$s, %2$s poked you at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Zotlabs/Lib/Enotify.php:353
#, php-format
msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:360
+#: ../../Zotlabs/Lib/Enotify.php:369
#, php-format
msgid "[$Projectname:Notify] %s tagged your post"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:361
+#: ../../Zotlabs/Lib/Enotify.php:370
#, php-format
msgid "%1$s, %2$s tagged your post at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:362
+#: ../../Zotlabs/Lib/Enotify.php:371
#, php-format
msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:374
+#: ../../Zotlabs/Lib/Enotify.php:383
msgid "[$Projectname:Notify] Introduction received"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:375
+#: ../../Zotlabs/Lib/Enotify.php:384
#, php-format
msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:376
+#: ../../Zotlabs/Lib/Enotify.php:385
#, php-format
msgid ""
"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
+#: ../../Zotlabs/Lib/Enotify.php:389 ../../Zotlabs/Lib/Enotify.php:408
#, php-format
msgid "You may visit their profile at %s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:382
+#: ../../Zotlabs/Lib/Enotify.php:391
#, php-format
msgid "Please visit %s to approve or reject the connection request."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:389
+#: ../../Zotlabs/Lib/Enotify.php:398
msgid "[$Projectname:Notify] Friend suggestion received"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:390
+#: ../../Zotlabs/Lib/Enotify.php:399
#, php-format
msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:391
+#: ../../Zotlabs/Lib/Enotify.php:400
#, php-format
msgid ""
"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:397
+#: ../../Zotlabs/Lib/Enotify.php:406
msgid "Name:"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:398
+#: ../../Zotlabs/Lib/Enotify.php:407
msgid "Photo:"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:401
+#: ../../Zotlabs/Lib/Enotify.php:410
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:620
+#: ../../Zotlabs/Lib/Enotify.php:629
msgid "[$Projectname:Notify]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:780
+#: ../../Zotlabs/Lib/Enotify.php:789
msgid "created a new post"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:781
+#: ../../Zotlabs/Lib/Enotify.php:790
#, php-format
msgid "commented on %s's post"
msgstr ""
@@ -7522,21 +7659,21 @@ msgstr ""
msgid "Wiki files deleted successfully"
msgstr ""
-#: ../../Zotlabs/Lib/DB_Upgrade.php:93
+#: ../../Zotlabs/Lib/DB_Upgrade.php:95
#, php-format
msgid "Update Error at %s"
msgstr ""
-#: ../../Zotlabs/Lib/DB_Upgrade.php:99
+#: ../../Zotlabs/Lib/DB_Upgrade.php:101
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656
msgid "Private Message"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
+#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648
msgid "Select"
msgstr ""
@@ -7580,11 +7717,11 @@ msgstr ""
msgid "starred"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663
msgid "Message signature validated"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
+#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664
msgid "Message signature incorrect"
msgstr ""
@@ -7592,135 +7729,143 @@ msgstr ""
msgid "Add Tag"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
+#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:355
msgid "like"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
+#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:356
msgid "dislike"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:274
+#: ../../Zotlabs/Lib/ThreadItem.php:272
msgid "Share This"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:274
+#: ../../Zotlabs/Lib/ThreadItem.php:272
msgid "share"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:283
+#: ../../Zotlabs/Lib/ThreadItem.php:281
msgid "Delivery Report"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:301
+#: ../../Zotlabs/Lib/ThreadItem.php:299
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
msgstr[0] ""
msgstr[1] ""
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
+#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329
#, php-format
msgid "View %s's profile - %s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:334
+#: ../../Zotlabs/Lib/ThreadItem.php:332
msgid "to"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:335
+#: ../../Zotlabs/Lib/ThreadItem.php:333
msgid "via"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:336
+#: ../../Zotlabs/Lib/ThreadItem.php:334
msgid "Wall-to-Wall"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:337
+#: ../../Zotlabs/Lib/ThreadItem.php:335
msgid "via Wall-To-Wall:"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
+#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715
#, php-format
msgid "from %s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
+#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718
#, php-format
msgid "last edited: %s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719
#, php-format
msgid "Expires: %s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:358
msgid "Attend"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:361
+#: ../../Zotlabs/Lib/ThreadItem.php:359
msgid "Attendance Options"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:362
+#: ../../Zotlabs/Lib/ThreadItem.php:360
msgid "Vote"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:363
+#: ../../Zotlabs/Lib/ThreadItem.php:361
msgid "Voting Options"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../Zotlabs/Lib/ThreadItem.php:382
#: ../../addon/bookmarker/bookmarker.php:38
msgid "Save Bookmarks"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:385
+#: ../../Zotlabs/Lib/ThreadItem.php:383
msgid "Add to Calendar"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:394
-msgid "Mark all seen"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7
#, php-format
msgid "%s show all"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
+#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315
msgid "Bold"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
+#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316
msgid "Italic"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317
msgid "Underline"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318
msgid "Quote"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319
msgid "Code"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:738
+#: ../../Zotlabs/Lib/ThreadItem.php:736
msgid "Image"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../Zotlabs/Lib/ThreadItem.php:737
msgid "Insert Link"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../Zotlabs/Lib/ThreadItem.php:738
msgid "Video"
msgstr ""
+#: ../../Zotlabs/Lib/ThreadItem.php:747
+msgid "Your full name (required)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:748
+msgid "Your email address (required)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:749
+msgid "Your website URL (optional)"
+msgstr ""
+
#: ../../Zotlabs/Zot/Auth.php:138
msgid ""
"Remote authentication blocked. You are logged into this site locally. Please "
@@ -7733,72 +7878,72 @@ msgstr ""
msgid "Welcome %s. Remote authentication successful."
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237
+#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238
msgid "parent"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692
msgid "Collection"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:133
+#: ../../Zotlabs/Storage/Browser.php:134
msgid "Principal"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:136
+#: ../../Zotlabs/Storage/Browser.php:137
msgid "Addressbook"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:139
+#: ../../Zotlabs/Storage/Browser.php:140
msgid "Calendar"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:142
+#: ../../Zotlabs/Storage/Browser.php:143
msgid "Schedule Inbox"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:145
+#: ../../Zotlabs/Storage/Browser.php:146
msgid "Schedule Outbox"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:225
+#: ../../Zotlabs/Storage/Browser.php:226
msgid "Total"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:227
+#: ../../Zotlabs/Storage/Browser.php:228
msgid "Shared"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:301
+#: ../../Zotlabs/Storage/Browser.php:304
#, php-format
msgid "You are using %1$s of your available file storage."
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:306
+#: ../../Zotlabs/Storage/Browser.php:309
#, php-format
msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:317
+#: ../../Zotlabs/Storage/Browser.php:320
msgid "WARNING:"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:327
+#: ../../Zotlabs/Storage/Browser.php:330
msgid ""
"Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\" "
"href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop "
"Clients</a>"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:331
+#: ../../Zotlabs/Storage/Browser.php:334
msgid "Create new folder"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:333
+#: ../../Zotlabs/Storage/Browser.php:336
msgid "Upload file"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:347
+#: ../../Zotlabs/Storage/Browser.php:350
msgid "Drop files here to immediately upload"
msgstr ""
@@ -7806,9 +7951,85 @@ msgstr ""
msgid "Forums"
msgstr ""
+#: ../../Zotlabs/Widget/Cdav.php:37
+msgid "Select Channel"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:42
+msgid "Read-write"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:43
+msgid "Read-only"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:116
+msgid "My Calendars"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:118
+msgid "Shared Calendars"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:122
+msgid "Share this calendar"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:124
+msgid "Calendar name and color"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:126
+msgid "Create new calendar"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:128
+msgid "Calendar Name"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:129
+msgid "Calendar Tools"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:130
+msgid "Import calendar"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:131
+msgid "Select a calendar to import to"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:158
+msgid "Addressbooks"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:160
+msgid "Addressbook name"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:162
+msgid "Create new addressbook"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:163
+msgid "Addressbook Name"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:165
+msgid "Addressbook Tools"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:166
+msgid "Import addressbook"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cdav.php:167
+msgid "Select an addressbook to import to"
+msgstr ""
+
#: ../../Zotlabs/Widget/Appcategories.php:39
#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/taxonomy.php:227 ../../include/taxonomy.php:309
msgid "Categories"
msgstr ""
@@ -7841,21 +8062,21 @@ msgstr ""
msgid "Combined View"
msgstr ""
-#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:190
msgid "Inbox"
msgstr ""
-#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:196
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:191
msgid "Outbox"
msgstr ""
-#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:197
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:192
msgid "New Message"
msgstr ""
#: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1816 ../../include/conversation.php:1819
-#: ../../include/nav.php:425 ../../include/nav.php:428
+#: ../../include/conversation.php:1813 ../../include/conversation.php:1816
+#: ../../include/nav.php:405 ../../include/nav.php:408
msgid "Chatrooms"
msgstr ""
@@ -7906,23 +8127,22 @@ msgid "Archives"
msgstr ""
#: ../../Zotlabs/Widget/Conversations.php:17
-#: ../../Zotlabs/Widget/Conversations.php:29
-msgid "Conversations"
+msgid "Received Messages"
msgstr ""
#: ../../Zotlabs/Widget/Conversations.php:21
-msgid "Received Messages"
+msgid "Sent Messages"
msgstr ""
#: ../../Zotlabs/Widget/Conversations.php:25
-msgid "Sent Messages"
+msgid "Conversations"
msgstr ""
-#: ../../Zotlabs/Widget/Conversations.php:39
+#: ../../Zotlabs/Widget/Conversations.php:35
msgid "No messages."
msgstr ""
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Zotlabs/Widget/Conversations.php:55
msgid "Delete conversation"
msgstr ""
@@ -7938,11 +8158,11 @@ msgstr ""
msgid "Remove term"
msgstr ""
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297
msgid "Saved Searches"
msgstr ""
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:337
msgid "add"
msgstr ""
@@ -7950,15 +8170,15 @@ msgstr ""
msgid "Notes"
msgstr ""
-#: ../../Zotlabs/Widget/Wiki_pages.php:54 ../../addon/gitwiki/gitwiki.php:76
+#: ../../Zotlabs/Widget/Wiki_pages.php:52 ../../addon/gitwiki/gitwiki.php:76
msgid "Wiki Pages"
msgstr ""
-#: ../../Zotlabs/Widget/Wiki_pages.php:60 ../../addon/gitwiki/gitwiki.php:81
+#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:81
msgid "Add new page"
msgstr ""
-#: ../../Zotlabs/Widget/Wiki_pages.php:61 ../../addon/gitwiki/gitwiki.php:82
+#: ../../Zotlabs/Widget/Wiki_pages.php:59 ../../addon/gitwiki/gitwiki.php:82
msgid "Page name"
msgstr ""
@@ -7979,7 +8199,7 @@ msgid "See more..."
msgstr ""
#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:390
+#: ../../include/features.php:386
msgid "Saved Folders"
msgstr ""
@@ -7999,7 +8219,7 @@ msgstr ""
msgid "DB updates"
msgstr ""
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:215
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:209
msgid "Admin"
msgstr ""
@@ -8035,15 +8255,15 @@ msgstr ""
msgid "Export channel"
msgstr ""
-#: ../../Zotlabs/Widget/Settings_menu.php:83
+#: ../../Zotlabs/Widget/Settings_menu.php:84
msgid "Connected apps"
msgstr ""
-#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153
+#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:149
msgid "Permission Groups"
msgstr ""
-#: ../../Zotlabs/Widget/Settings_menu.php:115
+#: ../../Zotlabs/Widget/Settings_menu.php:117
msgid "Premium Channel Settings"
msgstr ""
@@ -8055,156 +8275,147 @@ msgstr ""
msgid "Source channel not found."
msgstr ""
-#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26
-#, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
-msgstr ""
-
-#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28
-msgctxt "opensearch"
-msgid "$Projectname"
-msgstr ""
-
-#: ../../boot.php:1609
+#: ../../boot.php:1578
msgid "Create an account to access services and applications"
msgstr ""
-#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127
+#: ../../boot.php:1597 ../../include/nav.php:99 ../../include/nav.php:123
+#: ../../include/nav.php:140
msgid "Logout"
msgstr ""
-#: ../../boot.php:1631
+#: ../../boot.php:1600
msgid "Login/Email"
msgstr ""
-#: ../../boot.php:1632
+#: ../../boot.php:1601
msgid "Password"
msgstr ""
-#: ../../boot.php:1633
+#: ../../boot.php:1602
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1636
+#: ../../boot.php:1605
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:2174
+#: ../../boot.php:2143
msgid "toggle mobile"
msgstr ""
-#: ../../boot.php:2327
+#: ../../boot.php:2296
#, php-format
msgid "[$Projectname] Website SSL error for %s"
msgstr ""
-#: ../../boot.php:2332
+#: ../../boot.php:2301
msgid "Website SSL certificate is not valid. Please correct."
msgstr ""
-#: ../../boot.php:2450
+#: ../../boot.php:2420
#, php-format
msgid "[$Projectname] Cron tasks not running on %s"
msgstr ""
-#: ../../boot.php:2455
+#: ../../boot.php:2425
msgid "Cron/Scheduled tasks not running."
msgstr ""
-#: ../../boot.php:2456 ../../include/datetime.php:286
+#: ../../boot.php:2426 ../../include/datetime.php:286
msgid "never"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:9
+#: ../../view/theme/redbasic/php/config.php:16
+#: ../../view/theme/redbasic/php/config.php:19
msgid "Focus (Hubzilla default)"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/redbasic/php/config.php:99
msgid "Theme settings"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:100
msgid "Narrow navbar"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:90
+#: ../../view/theme/redbasic/php/config.php:101
msgid "Navigation bar background color"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:91
+#: ../../view/theme/redbasic/php/config.php:102
msgid "Navigation bar icon color "
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:92
+#: ../../view/theme/redbasic/php/config.php:103
msgid "Navigation bar active icon color "
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:93
+#: ../../view/theme/redbasic/php/config.php:104
msgid "Link color"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:94
+#: ../../view/theme/redbasic/php/config.php:105
msgid "Set font-color for banner"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/redbasic/php/config.php:106
msgid "Set the background color"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:96
+#: ../../view/theme/redbasic/php/config.php:107
msgid "Set the background image"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:108
msgid "Set the background color of items"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:109
msgid "Set the background color of comments"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
msgid "Set font-size for the entire application"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
msgid "Examples: 1rem, 100%, 16px"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:111
msgid "Set font-color for posts and comments"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
msgid "Set radius of corners"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
msgid "Example: 4px"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:113
msgid "Set shadow depth of photos"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
msgid "Set maximum width of content region in pixel"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
msgid "Leave empty for default width"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:115
msgid "Left align page content"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:116
msgid "Set size of conversation author photo"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:117
msgid "Set size of followup author photos"
msgstr ""
@@ -8345,232 +8556,43 @@ msgstr ""
msgid "Skeleton Settings"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:119
+#: ../../addon/gnusoc/gnusoc.php:200
msgid "GNU-Social Protocol Settings updated."
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:130
+#: ../../addon/gnusoc/gnusoc.php:219
+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:222
msgid "Enable the GNU-Social protocol for this channel"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:134
+#: ../../addon/gnusoc/gnusoc.php:226
msgid "GNU-Social Protocol Settings"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:324
+#: ../../addon/gnusoc/gnusoc.php:417
msgid "Follow"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:327
+#: ../../addon/gnusoc/gnusoc.php:420
#, php-format
msgid "%1$s is now following %2$s"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:744
-msgid "INVALID EVENT DISMISSED!"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:745
-msgid "Summary: "
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:746
-msgid "Date: "
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:747 ../../addon/cdav/Mod_Cdav.php:754
-msgid "Reason: "
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:752
-msgid "INVALID CARD DISMISSED!"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:753
-msgid "Name: "
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:770
-msgid ""
-"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV "
-"Settings before you can use it."
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:836 ../../addon/cdav/Mod_Cdav.php:837
-msgid "Example: YYYY-MM-DD HH:mm"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:837
-msgid "End date and time"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:852
-msgid "List month"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:853
-msgid "List week"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:854
-msgid "List day"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:861
-msgid "More"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:862
-msgid "Less"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:863
-msgid "Select calendar"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:865
-msgid "Delete all"
-msgstr ""
-
-#: ../../addon/cdav/Mod_Cdav.php:867
-msgid "Sorry! Editing of recurrent events is not yet implemented."
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:36
-msgid "Errors encountered creating database table: "
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:197
-msgid "Default Calendar"
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:206
-msgid "Default Addressbook"
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:215
-msgid "CalDAV/CardDAV Settings saved."
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:234
-msgid "Enable CalDAV/CardDAV Server for this channel"
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:237
-#, php-format
-msgid "Your CalDAV resources are located at %s "
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:240
-#, php-format
-msgid "Your CardDAV resources are located at %s "
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:246
-msgid "CalDAV/CardDAV Settings"
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:272 ../../include/connections.php:670
-msgid "Home, Voice"
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:273 ../../include/connections.php:671
-msgid "Home, Fax"
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:275 ../../include/connections.php:673
-msgid "Work, Voice"
-msgstr ""
-
-#: ../../addon/cdav/cdav.php:276 ../../include/connections.php:674
-msgid "Work, Fax"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:37
-msgid "Select Channel"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:42
-msgid "Read-write"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:43
-msgid "Read-only"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:116
-msgid "My Calendars"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:118
-msgid "Shared Calendars"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:122
-msgid "Share this calendar"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:124
-msgid "Calendar name and color"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:126
-msgid "Create new calendar"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:128
-msgid "Calendar Name"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:129
-msgid "Calendar Tools"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:130
-msgid "Import calendar"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:131
-msgid "Select a calendar to import to"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:158
-msgid "Addressbooks"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:160
-msgid "Addressbook name"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:162
-msgid "Create new addressbook"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:163
-msgid "Addressbook Name"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:165
-msgid "Addressbook Tools"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:166
-msgid "Import addressbook"
-msgstr ""
-
-#: ../../addon/cdav/include/widgets.php:167
-msgid "Select an addressbook to import to"
-msgstr ""
-
#: ../../addon/planets/planets.php:121
msgid "Planets Settings updated."
msgstr ""
-#: ../../addon/planets/planets.php:153
+#: ../../addon/planets/planets.php:149
msgid "Enable Planets Plugin"
msgstr ""
-#: ../../addon/planets/planets.php:157
+#: ../../addon/planets/planets.php:153
msgid "Planets Settings"
msgstr ""
@@ -8603,8 +8625,8 @@ msgstr ""
msgid "Page to load after image selection."
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048
-#: ../../include/nav.php:111
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1063
+#: ../../include/nav.php:107
msgid "Edit Profile"
msgstr ""
@@ -9143,12 +9165,12 @@ msgid "Login failed."
msgstr ""
#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
+#: ../../include/selectors.php:66 ../../include/channel.php:1230
msgid "Male"
msgstr ""
#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
+#: ../../include/selectors.php:66 ../../include/channel.php:1228
msgid "Female"
msgstr ""
@@ -9335,27 +9357,38 @@ msgstr ""
msgid "declared undying love for"
msgstr ""
-#: ../../addon/diaspora/diaspora.php:675
+#: ../../addon/diaspora/diaspora.php:715
msgid "Diaspora Protocol Settings updated."
msgstr ""
-#: ../../addon/diaspora/diaspora.php:694
+#: ../../addon/diaspora/diaspora.php:734
+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:737
msgid "Enable the Diaspora protocol for this channel"
msgstr ""
-#: ../../addon/diaspora/diaspora.php:698
+#: ../../addon/diaspora/diaspora.php:741
msgid "Allow any Diaspora member to comment on your public posts"
msgstr ""
-#: ../../addon/diaspora/diaspora.php:702
+#: ../../addon/diaspora/diaspora.php:745
msgid "Prevent your hashtags from being redirected to other sites"
msgstr ""
-#: ../../addon/diaspora/diaspora.php:707
+#: ../../addon/diaspora/diaspora.php:749
+msgid "Sign and forward posts and comments with no existing Diaspora signature"
+msgstr ""
+
+#: ../../addon/diaspora/diaspora.php:754
msgid "Followed hashtags (comma separated, do not include the #)"
msgstr ""
-#: ../../addon/diaspora/diaspora.php:712
+#: ../../addon/diaspora/diaspora.php:759
msgid "Diaspora Protocol Settings"
msgstr ""
@@ -9481,25 +9514,6 @@ msgstr ""
msgid "Message subject"
msgstr ""
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:44
-#, php-format
-msgid "Reconnecting %d connections"
-msgstr ""
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:63
-msgid "Diaspora Reconnect"
-msgstr ""
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:65
-msgid ""
-"Use this form to re-establish Diaspora connections which were initially made "
-"from a different hub."
-msgstr ""
-
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:70
-msgid "Reconnect"
-msgstr ""
-
#: ../../addon/openstreetmap/openstreetmap.php:146
msgid "View Larger"
msgstr ""
@@ -9585,8 +9599,8 @@ msgstr ""
msgid "Hubzilla to Friendica Post Settings"
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139
-#: ../../include/channel.php:1296
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1154
+#: ../../include/channel.php:1317
msgid "Status:"
msgstr ""
@@ -10140,7 +10154,7 @@ msgstr ""
msgid "Error creating new game."
msgstr ""
-#: ../../addon/chess/chess.php:381 ../../include/channel.php:899
+#: ../../addon/chess/chess.php:381 ../../include/channel.php:914
msgid "Requested channel is not available."
msgstr ""
@@ -10215,15 +10229,15 @@ msgstr ""
msgid "Twitter Post Settings"
msgstr ""
-#: ../../addon/smileybutton/smileybutton.php:273
+#: ../../addon/smileybutton/smileybutton.php:211
msgid "Deactivate the feature"
msgstr ""
-#: ../../addon/smileybutton/smileybutton.php:277
+#: ../../addon/smileybutton/smileybutton.php:215
msgid "Hide the button and show the smilies directly."
msgstr ""
-#: ../../addon/smileybutton/smileybutton.php:281
+#: ../../addon/smileybutton/smileybutton.php:219
msgid "Smileybutton Settings"
msgstr ""
@@ -10505,6 +10519,22 @@ msgstr ""
msgid "pageheader Settings saved."
msgstr ""
+#: ../../addon/authchoose/authchoose.php:67
+msgid "Only authenticate automatically to sites of your friends"
+msgstr ""
+
+#: ../../addon/authchoose/authchoose.php:67
+msgid "By default you are automatically authenticated anywhere in the network"
+msgstr ""
+
+#: ../../addon/authchoose/authchoose.php:71
+msgid "Authchoose Settings"
+msgstr ""
+
+#: ../../addon/authchoose/authchoose.php:85
+msgid "Atuhchoose Settings updated."
+msgstr ""
+
#: ../../addon/moremoods/moremoods.php:19
msgid "lonely"
msgstr ""
@@ -10700,6 +10730,17 @@ msgstr ""
msgid "Authentication successful but rejected: account creation is disabled."
msgstr ""
+#: ../../addon/opensearch/opensearch.php:26
+#, php-format
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
+msgstr ""
+
+#: ../../addon/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
+msgstr ""
+
#: ../../addon/opensearch/opensearch.php:43
msgid "Search $Projectname"
msgstr ""
@@ -10798,11 +10839,11 @@ msgstr ""
msgid "Hermaphrodite"
msgstr ""
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:49 ../../include/channel.php:1234
msgid "Neuter"
msgstr ""
-#: ../../include/selectors.php:49
+#: ../../include/selectors.php:49 ../../include/channel.php:1236
msgid "Non-specific"
msgstr ""
@@ -10992,340 +11033,288 @@ msgstr ""
msgid "%1$s poked %2$s"
msgstr ""
-#: ../../include/conversation.php:239 ../../include/text.php:1115
-#: ../../include/text.php:1120
+#: ../../include/conversation.php:239 ../../include/text.php:1096
+#: ../../include/text.php:1101
msgid "poked"
msgstr ""
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:688
#, php-format
msgid "View %s's profile @ %s"
msgstr ""
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:708
msgid "Categories:"
msgstr ""
-#: ../../include/conversation.php:712
+#: ../../include/conversation.php:709
msgid "Filed under:"
msgstr ""
-#: ../../include/conversation.php:737
+#: ../../include/conversation.php:734
msgid "View in context"
msgstr ""
-#: ../../include/conversation.php:834
+#: ../../include/conversation.php:831
msgid "remove"
msgstr ""
-#: ../../include/conversation.php:838 ../../include/nav.php:272
+#: ../../include/conversation.php:835 ../../include/nav.php:262
msgid "Loading..."
msgstr ""
-#: ../../include/conversation.php:839
+#: ../../include/conversation.php:836
msgid "Delete Selected Items"
msgstr ""
-#: ../../include/conversation.php:882
+#: ../../include/conversation.php:879
msgid "View Source"
msgstr ""
-#: ../../include/conversation.php:892
+#: ../../include/conversation.php:889
msgid "Follow Thread"
msgstr ""
-#: ../../include/conversation.php:901
+#: ../../include/conversation.php:898
msgid "Unfollow Thread"
msgstr ""
-#: ../../include/conversation.php:992
+#: ../../include/conversation.php:989
msgid "Activity/Posts"
msgstr ""
-#: ../../include/conversation.php:1012
+#: ../../include/conversation.php:1009
msgid "Edit Connection"
msgstr ""
-#: ../../include/conversation.php:1022
+#: ../../include/conversation.php:1019
msgid "Message"
msgstr ""
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1153
#, php-format
msgid "%s likes this."
msgstr ""
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1153
#, php-format
msgid "%s doesn't like this."
msgstr ""
-#: ../../include/conversation.php:1160
+#: ../../include/conversation.php:1157
#, 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:1162
+#: ../../include/conversation.php:1159
#, 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:1168
+#: ../../include/conversation.php:1165
msgid "and"
msgstr ""
-#: ../../include/conversation.php:1171
+#: ../../include/conversation.php:1168
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1169
#, php-format
msgid "%s like this."
msgstr ""
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1169
#, php-format
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1212
msgid "Set your location"
msgstr ""
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1213
msgid "Clear browser location"
msgstr ""
-#: ../../include/conversation.php:1264
+#: ../../include/conversation.php:1261
msgid "Tag term:"
msgstr ""
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1262
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:1270
+#: ../../include/conversation.php:1267
msgid "Choose a different album..."
msgstr ""
-#: ../../include/conversation.php:1274
+#: ../../include/conversation.php:1271
msgid "Comments enabled"
msgstr ""
-#: ../../include/conversation.php:1275
+#: ../../include/conversation.php:1272
msgid "Comments disabled"
msgstr ""
-#: ../../include/conversation.php:1313
+#: ../../include/conversation.php:1310
msgid "Page link name"
msgstr ""
-#: ../../include/conversation.php:1316
+#: ../../include/conversation.php:1313
msgid "Post as"
msgstr ""
-#: ../../include/conversation.php:1330
+#: ../../include/conversation.php:1327
msgid "Toggle voting"
msgstr ""
-#: ../../include/conversation.php:1333
+#: ../../include/conversation.php:1330
msgid "Disable comments"
msgstr ""
-#: ../../include/conversation.php:1334
+#: ../../include/conversation.php:1331
msgid "Toggle comments"
msgstr ""
-#: ../../include/conversation.php:1342
+#: ../../include/conversation.php:1339
msgid "Categories (optional, comma-separated list)"
msgstr ""
-#: ../../include/conversation.php:1365
+#: ../../include/conversation.php:1362
msgid "Other networks and post services"
msgstr ""
-#: ../../include/conversation.php:1371
+#: ../../include/conversation.php:1368
msgid "Set publish date"
msgstr ""
-#: ../../include/conversation.php:1634
+#: ../../include/conversation.php:1631
msgid "Discover"
msgstr ""
-#: ../../include/conversation.php:1637
+#: ../../include/conversation.php:1634
msgid "Imported public streams"
msgstr ""
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1639
msgid "Commented Order"
msgstr ""
-#: ../../include/conversation.php:1645
+#: ../../include/conversation.php:1642
msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/conversation.php:1649
+#: ../../include/conversation.php:1646
msgid "Posted Order"
msgstr ""
-#: ../../include/conversation.php:1652
+#: ../../include/conversation.php:1649
msgid "Sort by Post Date"
msgstr ""
-#: ../../include/conversation.php:1660
+#: ../../include/conversation.php:1657
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/conversation.php:1669
+#: ../../include/conversation.php:1666
msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/conversation.php:1675
+#: ../../include/conversation.php:1672
msgid "Starred"
msgstr ""
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1675
msgid "Favourite Posts"
msgstr ""
-#: ../../include/conversation.php:1685
+#: ../../include/conversation.php:1682
msgid "Spam"
msgstr ""
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1685
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1763 ../../include/nav.php:372
+#: ../../include/conversation.php:1760 ../../include/nav.php:352
msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/conversation.php:1776 ../../include/nav.php:385
+#: ../../include/conversation.php:1773 ../../include/nav.php:365
msgid "Profile Details"
msgstr ""
-#: ../../include/conversation.php:1786 ../../include/nav.php:395
-#: ../../include/photos.php:528
+#: ../../include/conversation.php:1783 ../../include/nav.php:375
+#: ../../include/photos.php:525
msgid "Photo Albums"
msgstr ""
-#: ../../include/conversation.php:1794 ../../include/nav.php:403
+#: ../../include/conversation.php:1791 ../../include/nav.php:383
msgid "Files and Storage"
msgstr ""
-#: ../../include/conversation.php:1830 ../../include/nav.php:438
+#: ../../include/conversation.php:1827 ../../include/nav.php:418
msgid "Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1833 ../../include/nav.php:441
+#: ../../include/conversation.php:1830 ../../include/nav.php:421
msgid "Saved Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1844 ../../include/nav.php:452
+#: ../../include/conversation.php:1841 ../../include/nav.php:432
msgid "View Webpages"
msgstr ""
-#: ../../include/conversation.php:1913
+#: ../../include/conversation.php:1910
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1916
+#: ../../include/conversation.php:1913
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1919
+#: ../../include/conversation.php:1916
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1922
+#: ../../include/conversation.php:1919
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1925
+#: ../../include/conversation.php:1922
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1928
+#: ../../include/conversation.php:1925
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
-msgstr ""
-
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
-msgstr ""
-
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
-msgstr ""
-
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
-msgstr ""
-
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
-msgstr ""
-
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr ""
-
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
-msgstr ""
-
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
-msgstr ""
-
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
-msgstr ""
-
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
-msgstr ""
-
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
-msgstr ""
-
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
-msgstr ""
-
-#: ../../include/permissions.php:55
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr ""
-
#: ../../include/dir_fns.php:141
msgid "Directory Options"
msgstr ""
@@ -11380,320 +11369,328 @@ msgstr ""
msgid "newer"
msgstr ""
-#: ../../include/text.php:945
+#: ../../include/text.php:939
msgid "No connections"
msgstr ""
-#: ../../include/text.php:970
+#: ../../include/text.php:964
#, php-format
msgid "View all %s connections"
msgstr ""
-#: ../../include/text.php:1115 ../../include/text.php:1120
+#: ../../include/text.php:1096 ../../include/text.php:1101
msgid "poke"
msgstr ""
-#: ../../include/text.php:1121
+#: ../../include/text.php:1102
msgid "ping"
msgstr ""
-#: ../../include/text.php:1121
+#: ../../include/text.php:1102
msgid "pinged"
msgstr ""
-#: ../../include/text.php:1122
+#: ../../include/text.php:1103
msgid "prod"
msgstr ""
-#: ../../include/text.php:1122
+#: ../../include/text.php:1103
msgid "prodded"
msgstr ""
-#: ../../include/text.php:1123
+#: ../../include/text.php:1104
msgid "slap"
msgstr ""
-#: ../../include/text.php:1123
+#: ../../include/text.php:1104
msgid "slapped"
msgstr ""
-#: ../../include/text.php:1124
+#: ../../include/text.php:1105
msgid "finger"
msgstr ""
-#: ../../include/text.php:1124
+#: ../../include/text.php:1105
msgid "fingered"
msgstr ""
-#: ../../include/text.php:1125
+#: ../../include/text.php:1106
msgid "rebuff"
msgstr ""
-#: ../../include/text.php:1125
+#: ../../include/text.php:1106
msgid "rebuffed"
msgstr ""
-#: ../../include/text.php:1137
+#: ../../include/text.php:1118
msgid "happy"
msgstr ""
-#: ../../include/text.php:1138
+#: ../../include/text.php:1119
msgid "sad"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1120
msgid "mellow"
msgstr ""
-#: ../../include/text.php:1140
+#: ../../include/text.php:1121
msgid "tired"
msgstr ""
-#: ../../include/text.php:1141
+#: ../../include/text.php:1122
msgid "perky"
msgstr ""
-#: ../../include/text.php:1142
+#: ../../include/text.php:1123
msgid "angry"
msgstr ""
-#: ../../include/text.php:1143
+#: ../../include/text.php:1124
msgid "stupefied"
msgstr ""
-#: ../../include/text.php:1144
+#: ../../include/text.php:1125
msgid "puzzled"
msgstr ""
-#: ../../include/text.php:1145
+#: ../../include/text.php:1126
msgid "interested"
msgstr ""
-#: ../../include/text.php:1146
+#: ../../include/text.php:1127
msgid "bitter"
msgstr ""
-#: ../../include/text.php:1147
+#: ../../include/text.php:1128
msgid "cheerful"
msgstr ""
-#: ../../include/text.php:1148
+#: ../../include/text.php:1129
msgid "alive"
msgstr ""
-#: ../../include/text.php:1149
+#: ../../include/text.php:1130
msgid "annoyed"
msgstr ""
-#: ../../include/text.php:1150
+#: ../../include/text.php:1131
msgid "anxious"
msgstr ""
-#: ../../include/text.php:1151
+#: ../../include/text.php:1132
msgid "cranky"
msgstr ""
-#: ../../include/text.php:1152
+#: ../../include/text.php:1133
msgid "disturbed"
msgstr ""
-#: ../../include/text.php:1153
+#: ../../include/text.php:1134
msgid "frustrated"
msgstr ""
-#: ../../include/text.php:1154
+#: ../../include/text.php:1135
msgid "depressed"
msgstr ""
-#: ../../include/text.php:1155
+#: ../../include/text.php:1136
msgid "motivated"
msgstr ""
-#: ../../include/text.php:1156
+#: ../../include/text.php:1137
msgid "relaxed"
msgstr ""
-#: ../../include/text.php:1157
+#: ../../include/text.php:1138
msgid "surprised"
msgstr ""
-#: ../../include/text.php:1335 ../../include/js_strings.php:70
+#: ../../include/text.php:1312 ../../include/js_strings.php:70
msgid "Monday"
msgstr ""
-#: ../../include/text.php:1335 ../../include/js_strings.php:71
+#: ../../include/text.php:1312 ../../include/js_strings.php:71
msgid "Tuesday"
msgstr ""
-#: ../../include/text.php:1335 ../../include/js_strings.php:72
+#: ../../include/text.php:1312 ../../include/js_strings.php:72
msgid "Wednesday"
msgstr ""
-#: ../../include/text.php:1335 ../../include/js_strings.php:73
+#: ../../include/text.php:1312 ../../include/js_strings.php:73
msgid "Thursday"
msgstr ""
-#: ../../include/text.php:1335 ../../include/js_strings.php:74
+#: ../../include/text.php:1312 ../../include/js_strings.php:74
msgid "Friday"
msgstr ""
-#: ../../include/text.php:1335 ../../include/js_strings.php:75
+#: ../../include/text.php:1312 ../../include/js_strings.php:75
msgid "Saturday"
msgstr ""
-#: ../../include/text.php:1335 ../../include/js_strings.php:69
+#: ../../include/text.php:1312 ../../include/js_strings.php:69
msgid "Sunday"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:45
+#: ../../include/text.php:1316 ../../include/js_strings.php:45
msgid "January"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:46
+#: ../../include/text.php:1316 ../../include/js_strings.php:46
msgid "February"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:47
+#: ../../include/text.php:1316 ../../include/js_strings.php:47
msgid "March"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:48
+#: ../../include/text.php:1316 ../../include/js_strings.php:48
msgid "April"
msgstr ""
-#: ../../include/text.php:1339
+#: ../../include/text.php:1316
msgid "May"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:50
+#: ../../include/text.php:1316 ../../include/js_strings.php:50
msgid "June"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:51
+#: ../../include/text.php:1316 ../../include/js_strings.php:51
msgid "July"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:52
+#: ../../include/text.php:1316 ../../include/js_strings.php:52
msgid "August"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:53
+#: ../../include/text.php:1316 ../../include/js_strings.php:53
msgid "September"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:54
+#: ../../include/text.php:1316 ../../include/js_strings.php:54
msgid "October"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:55
+#: ../../include/text.php:1316 ../../include/js_strings.php:55
msgid "November"
msgstr ""
-#: ../../include/text.php:1339 ../../include/js_strings.php:56
+#: ../../include/text.php:1316 ../../include/js_strings.php:56
msgid "December"
msgstr ""
-#: ../../include/text.php:1403 ../../include/text.php:1407
+#: ../../include/text.php:1380 ../../include/text.php:1384
msgid "Unknown Attachment"
msgstr ""
-#: ../../include/text.php:1409
+#: ../../include/text.php:1386 ../../include/feedutils.php:780
msgid "unknown"
msgstr ""
-#: ../../include/text.php:1445
+#: ../../include/text.php:1422
msgid "remove category"
msgstr ""
-#: ../../include/text.php:1519
+#: ../../include/text.php:1496
msgid "remove from file"
msgstr ""
-#: ../../include/text.php:1781 ../../include/language.php:367
+#: ../../include/text.php:1615 ../../include/message.php:12
+msgid "Download binary/encrypted content"
+msgstr ""
+
+#: ../../include/text.php:1774 ../../include/language.php:367
msgid "default"
msgstr ""
-#: ../../include/text.php:1789
+#: ../../include/text.php:1782
msgid "Page layout"
msgstr ""
-#: ../../include/text.php:1789
+#: ../../include/text.php:1782
msgid "You can create your own with the layouts tool"
msgstr ""
-#: ../../include/text.php:1817
+#: ../../include/text.php:1810
msgid "Page content type"
msgstr ""
-#: ../../include/text.php:1950
+#: ../../include/text.php:1943
msgid "activity"
msgstr ""
-#: ../../include/text.php:2264
+#: ../../include/text.php:2006
+msgid "a-z, 0-9, -, _, and . only"
+msgstr ""
+
+#: ../../include/text.php:2277
msgid "Design Tools"
msgstr ""
-#: ../../include/text.php:2270
+#: ../../include/text.php:2283
msgid "Pages"
msgstr ""
-#: ../../include/text.php:2292
+#: ../../include/text.php:2305
msgid "Import website..."
msgstr ""
-#: ../../include/text.php:2293
+#: ../../include/text.php:2306
msgid "Select folder to import"
msgstr ""
-#: ../../include/text.php:2294
+#: ../../include/text.php:2307
msgid "Import from a zipped folder:"
msgstr ""
-#: ../../include/text.php:2295
+#: ../../include/text.php:2308
msgid "Import from cloud files:"
msgstr ""
-#: ../../include/text.php:2296
+#: ../../include/text.php:2309
msgid "/cloud/channel/path/to/folder"
msgstr ""
-#: ../../include/text.php:2297
+#: ../../include/text.php:2310
msgid "Enter path to website files"
msgstr ""
-#: ../../include/text.php:2298
+#: ../../include/text.php:2311
msgid "Select folder"
msgstr ""
-#: ../../include/text.php:2299
+#: ../../include/text.php:2312
msgid "Export website..."
msgstr ""
-#: ../../include/text.php:2300
+#: ../../include/text.php:2313
msgid "Export to a zip file"
msgstr ""
-#: ../../include/text.php:2301
+#: ../../include/text.php:2314
msgid "website.zip"
msgstr ""
-#: ../../include/text.php:2302
+#: ../../include/text.php:2315
msgid "Enter a name for the zip file."
msgstr ""
-#: ../../include/text.php:2303
+#: ../../include/text.php:2316
msgid "Export to cloud files"
msgstr ""
-#: ../../include/text.php:2304
+#: ../../include/text.php:2317
msgid "/path/to/export/folder"
msgstr ""
-#: ../../include/text.php:2305
+#: ../../include/text.php:2318
msgid "Enter a path to a cloud files destination."
msgstr ""
-#: ../../include/text.php:2306
+#: ../../include/text.php:2319
msgid "Specify folder"
msgstr ""
@@ -11743,27 +11740,9 @@ msgstr[1] ""
msgid "show more"
msgstr ""
-#: ../../include/markdown.php:444
-msgid "Attachments:"
-msgstr ""
-
-#: ../../include/markdown.php:538 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/markdown.php:540
-msgid "$Projectname event notification:"
-msgstr ""
-
-#: ../../include/markdown.php:544 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/markdown.php:552 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
+#: ../../include/markdown.php:139 ../../include/bbcode.php:332
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
msgstr ""
#: ../../include/follow.php:26
@@ -11790,7 +11769,7 @@ msgstr ""
msgid "Channel discovery failed."
msgstr ""
-#: ../../include/follow.php:202
+#: ../../include/follow.php:186
msgid "Cannot connect to yourself."
msgstr ""
@@ -12041,19 +12020,19 @@ msgctxt "calendar"
msgid "All day"
msgstr ""
-#: ../../include/message.php:30
+#: ../../include/message.php:40
msgid "Unable to determine sender."
msgstr ""
-#: ../../include/message.php:69
+#: ../../include/message.php:79
msgid "No recipient provided."
msgstr ""
-#: ../../include/message.php:74
+#: ../../include/message.php:84
msgid "[no subject]"
msgstr ""
-#: ../../include/message.php:227
+#: ../../include/message.php:214
msgid "Stored post could not be verified."
msgstr ""
@@ -12096,49 +12075,49 @@ msgstr ""
msgid "Cannot locate file to revise/update"
msgstr ""
-#: ../../include/attach.php:671
+#: ../../include/attach.php:673
#, php-format
msgid "File exceeds size limit of %d"
msgstr ""
-#: ../../include/attach.php:685
+#: ../../include/attach.php:687
#, php-format
msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
msgstr ""
-#: ../../include/attach.php:855
+#: ../../include/attach.php:857
msgid "File upload failed. Possible system limit or action terminated."
msgstr ""
-#: ../../include/attach.php:868
+#: ../../include/attach.php:870
msgid "Stored file could not be verified. Upload failed."
msgstr ""
-#: ../../include/attach.php:923 ../../include/attach.php:939
+#: ../../include/attach.php:925 ../../include/attach.php:941
msgid "Path not available."
msgstr ""
-#: ../../include/attach.php:988 ../../include/attach.php:1153
+#: ../../include/attach.php:990 ../../include/attach.php:1155
msgid "Empty pathname"
msgstr ""
-#: ../../include/attach.php:1014
+#: ../../include/attach.php:1016
msgid "duplicate filename or path"
msgstr ""
-#: ../../include/attach.php:1039
+#: ../../include/attach.php:1041
msgid "Path not found."
msgstr ""
-#: ../../include/attach.php:1107
+#: ../../include/attach.php:1109
msgid "mkdir failed."
msgstr ""
-#: ../../include/attach.php:1111
+#: ../../include/attach.php:1113
msgid "database storage failed."
msgstr ""
-#: ../../include/attach.php:1159
+#: ../../include/attach.php:1161
msgid "Empty path"
msgstr ""
@@ -12146,77 +12125,77 @@ msgstr ""
msgid "guest:"
msgstr ""
-#: ../../include/security.php:532
+#: ../../include/security.php:531
msgid ""
"The form security token was not correct. This probably happened because the "
"form has been opened for too long (>3 hours) before submitting it."
msgstr ""
-#: ../../include/items.php:869 ../../include/items.php:916
+#: ../../include/items.php:851 ../../include/items.php:903
msgid "(Unknown)"
msgstr ""
-#: ../../include/items.php:1110
+#: ../../include/items.php:1087
msgid "Visible to anybody on the internet."
msgstr ""
-#: ../../include/items.php:1112
+#: ../../include/items.php:1089
msgid "Visible to you only."
msgstr ""
-#: ../../include/items.php:1114
+#: ../../include/items.php:1091
msgid "Visible to anybody in this network."
msgstr ""
-#: ../../include/items.php:1116
+#: ../../include/items.php:1093
msgid "Visible to anybody authenticated."
msgstr ""
-#: ../../include/items.php:1118
+#: ../../include/items.php:1095
#, php-format
msgid "Visible to anybody on %s."
msgstr ""
-#: ../../include/items.php:1120
+#: ../../include/items.php:1097
msgid "Visible to all connections."
msgstr ""
-#: ../../include/items.php:1122
+#: ../../include/items.php:1099
msgid "Visible to approved connections."
msgstr ""
-#: ../../include/items.php:1124
+#: ../../include/items.php:1101
msgid "Visible to specific connections."
msgstr ""
-#: ../../include/items.php:3938
+#: ../../include/items.php:3908
msgid "Privacy group is empty."
msgstr ""
-#: ../../include/items.php:3945
+#: ../../include/items.php:3915
#, php-format
msgid "Privacy group: %s"
msgstr ""
-#: ../../include/items.php:3957
+#: ../../include/items.php:3927
msgid "Connection not found."
msgstr ""
-#: ../../include/items.php:4310
+#: ../../include/items.php:4280
msgid "profile photo"
msgstr ""
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
#, php-format
msgid "[Edited %s]"
msgstr ""
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
msgctxt "edit_activity"
msgid "Post"
msgstr ""
-#: ../../include/items.php:4506
+#: ../../include/items.php:4473
msgctxt "edit_activity"
msgid "Comment"
msgstr ""
@@ -12225,229 +12204,253 @@ msgstr ""
msgid "Unable to obtain identity information from database"
msgstr ""
-#: ../../include/channel.php:67
+#: ../../include/channel.php:68
msgid "Empty name"
msgstr ""
-#: ../../include/channel.php:70
+#: ../../include/channel.php:71
msgid "Name too long"
msgstr ""
-#: ../../include/channel.php:181
+#: ../../include/channel.php:182
msgid "No account identifier"
msgstr ""
-#: ../../include/channel.php:193
+#: ../../include/channel.php:194
msgid "Nickname is required."
msgstr ""
-#: ../../include/channel.php:207
+#: ../../include/channel.php:208
msgid "Reserved nickname. Please choose another."
msgstr ""
-#: ../../include/channel.php:212
+#: ../../include/channel.php:213
msgid ""
"Nickname has unsupported characters or is already being used on this site."
msgstr ""
-#: ../../include/channel.php:270
+#: ../../include/channel.php:272
msgid "Unable to retrieve created identity"
msgstr ""
-#: ../../include/channel.php:342
+#: ../../include/channel.php:344
msgid "Default Profile"
msgstr ""
-#: ../../include/channel.php:1045
+#: ../../include/channel.php:1060
msgid "Create New Profile"
msgstr ""
-#: ../../include/channel.php:1065
+#: ../../include/channel.php:1080
msgid "Visible to everybody"
msgstr ""
-#: ../../include/channel.php:1138 ../../include/channel.php:1252
+#: ../../include/channel.php:1153 ../../include/channel.php:1273
msgid "Gender:"
msgstr ""
-#: ../../include/channel.php:1140 ../../include/channel.php:1307
+#: ../../include/channel.php:1155 ../../include/channel.php:1328
msgid "Homepage:"
msgstr ""
-#: ../../include/channel.php:1141
+#: ../../include/channel.php:1156
msgid "Online Now"
msgstr ""
-#: ../../include/channel.php:1257
+#: ../../include/channel.php:1232
+msgid "Trans"
+msgstr ""
+
+#: ../../include/channel.php:1278
msgid "Like this channel"
msgstr ""
-#: ../../include/channel.php:1281
+#: ../../include/channel.php:1302
msgid "j F, Y"
msgstr ""
-#: ../../include/channel.php:1282
+#: ../../include/channel.php:1303
msgid "j F"
msgstr ""
-#: ../../include/channel.php:1289
+#: ../../include/channel.php:1310
msgid "Birthday:"
msgstr ""
-#: ../../include/channel.php:1302
+#: ../../include/channel.php:1323
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/channel.php:1305
+#: ../../include/channel.php:1326
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/channel.php:1311
+#: ../../include/channel.php:1332
msgid "Tags:"
msgstr ""
-#: ../../include/channel.php:1313
+#: ../../include/channel.php:1334
msgid "Political Views:"
msgstr ""
-#: ../../include/channel.php:1315
+#: ../../include/channel.php:1336
msgid "Religion:"
msgstr ""
-#: ../../include/channel.php:1319
+#: ../../include/channel.php:1340
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/channel.php:1321
+#: ../../include/channel.php:1342
msgid "Likes:"
msgstr ""
-#: ../../include/channel.php:1323
+#: ../../include/channel.php:1344
msgid "Dislikes:"
msgstr ""
-#: ../../include/channel.php:1325
+#: ../../include/channel.php:1346
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/channel.php:1327
+#: ../../include/channel.php:1348
msgid "My other channels:"
msgstr ""
-#: ../../include/channel.php:1329
+#: ../../include/channel.php:1350
msgid "Musical interests:"
msgstr ""
-#: ../../include/channel.php:1331
+#: ../../include/channel.php:1352
msgid "Books, literature:"
msgstr ""
-#: ../../include/channel.php:1333
+#: ../../include/channel.php:1354
msgid "Television:"
msgstr ""
-#: ../../include/channel.php:1335
+#: ../../include/channel.php:1356
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/channel.php:1337
+#: ../../include/channel.php:1358
msgid "Love/Romance:"
msgstr ""
-#: ../../include/channel.php:1339
+#: ../../include/channel.php:1360
msgid "Work/employment:"
msgstr ""
-#: ../../include/channel.php:1341
+#: ../../include/channel.php:1362
msgid "School/education:"
msgstr ""
-#: ../../include/channel.php:1364
+#: ../../include/channel.php:1385
msgid "Like this thing"
msgstr ""
-#: ../../include/channel.php:2139
+#: ../../include/channel.php:2154
#, php-format
msgid "User '%s' deleted"
msgstr ""
-#: ../../include/event.php:1004
+#: ../../include/event.php:22 ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/event.php:73
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/event.php:77
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:1008
msgid "This event has been added to your calendar."
msgstr ""
-#: ../../include/event.php:1204
+#: ../../include/event.php:1208
msgid "Not specified"
msgstr ""
-#: ../../include/event.php:1205
+#: ../../include/event.php:1209
msgid "Needs Action"
msgstr ""
-#: ../../include/event.php:1206
+#: ../../include/event.php:1210
msgid "Completed"
msgstr ""
-#: ../../include/event.php:1207
+#: ../../include/event.php:1211
msgid "In Process"
msgstr ""
-#: ../../include/event.php:1208
+#: ../../include/event.php:1212
msgid "Cancelled"
msgstr ""
-#: ../../include/network.php:776
-msgid "view full size"
+#: ../../include/event.php:1292 ../../include/connections.php:676
+msgid "Home, Voice"
+msgstr ""
+
+#: ../../include/event.php:1293 ../../include/connections.php:677
+msgid "Home, Fax"
+msgstr ""
+
+#: ../../include/event.php:1295 ../../include/connections.php:679
+msgid "Work, Voice"
+msgstr ""
+
+#: ../../include/event.php:1296 ../../include/connections.php:680
+msgid "Work, Fax"
msgstr ""
-#: ../../include/network.php:2042
-msgid "No Subject"
+#: ../../include/network.php:751
+msgid "view full size"
msgstr ""
-#: ../../include/network.php:2310 ../../include/network.php:2311
+#: ../../include/network.php:1691 ../../include/network.php:1692
msgid "Friendica"
msgstr ""
-#: ../../include/network.php:2312
+#: ../../include/network.php:1693
msgid "OStatus"
msgstr ""
-#: ../../include/network.php:2313
+#: ../../include/network.php:1694
msgid "GNU-Social"
msgstr ""
-#: ../../include/network.php:2314
+#: ../../include/network.php:1695
msgid "RSS/Atom"
msgstr ""
-#: ../../include/network.php:2316
+#: ../../include/network.php:1697
msgid "Diaspora"
msgstr ""
-#: ../../include/network.php:2317
+#: ../../include/network.php:1698
msgid "Facebook"
msgstr ""
-#: ../../include/network.php:2318
+#: ../../include/network.php:1699
msgid "Zot"
msgstr ""
-#: ../../include/network.php:2319
+#: ../../include/network.php:1700
msgid "LinkedIn"
msgstr ""
-#: ../../include/network.php:2320
+#: ../../include/network.php:1701
msgid "XMPP/IM"
msgstr ""
-#: ../../include/network.php:2321
+#: ../../include/network.php:1702
msgid "MySpace"
msgstr ""
-#: ../../include/page_widgets.php:7
-msgid "New Page"
-msgstr ""
-
#: ../../include/language.php:380
msgid "Select an alternate language"
msgstr ""
@@ -12481,404 +12484,399 @@ msgid ""
"permissions set who is allowed to view the post."
msgstr ""
-#: ../../include/dba/dba_driver.php:189
+#: ../../include/dba/dba_driver.php:190
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
-#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
-#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
-#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
-#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
-#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
-#: ../../include/bbcode.php:1079
+#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097
+#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105
+#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111
+#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119
+#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127
+#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133
+#: ../../include/bbcode.php:1136
msgid "Image/photo"
msgstr ""
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147
msgid "Encrypted content"
msgstr ""
-#: ../../include/bbcode.php:189
+#: ../../include/bbcode.php:249
#, php-format
msgid "Install %s element: "
msgstr ""
-#: ../../include/bbcode.php:193
+#: ../../include/bbcode.php:253
#, php-format
msgid ""
"This post contains an installable %s element, however you lack permissions "
"to install it on this site."
msgstr ""
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+#: ../../include/bbcode.php:409 ../../include/bbcode.php:417
msgid "Click to open/close"
msgstr ""
-#: ../../include/bbcode.php:357
+#: ../../include/bbcode.php:417
msgid "spoiler"
msgstr ""
-#: ../../include/bbcode.php:1028
+#: ../../include/bbcode.php:1085
msgid "$1 wrote:"
msgstr ""
-#: ../../include/oembed.php:315
+#: ../../include/oembed.php:317
msgid " by "
msgstr ""
-#: ../../include/oembed.php:316
+#: ../../include/oembed.php:318
msgid " on "
msgstr ""
-#: ../../include/oembed.php:345
+#: ../../include/oembed.php:347
msgid "Embedded content"
msgstr ""
-#: ../../include/oembed.php:354
+#: ../../include/oembed.php:356
msgid "Embedding disabled"
msgstr ""
-#: ../../include/features.php:58
+#: ../../include/features.php:54
msgid "General Features"
msgstr ""
-#: ../../include/features.php:63
+#: ../../include/features.php:59
msgid "Multiple Profiles"
msgstr ""
-#: ../../include/features.php:64
+#: ../../include/features.php:60
msgid "Ability to create multiple profiles"
msgstr ""
-#: ../../include/features.php:72
+#: ../../include/features.php:68
msgid "Advanced Profiles"
msgstr ""
-#: ../../include/features.php:73
+#: ../../include/features.php:69
msgid "Additional profile sections and selections"
msgstr ""
-#: ../../include/features.php:81
+#: ../../include/features.php:77
msgid "Profile Import/Export"
msgstr ""
-#: ../../include/features.php:82
+#: ../../include/features.php:78
msgid "Save and load profile details across sites/channels"
msgstr ""
-#: ../../include/features.php:90
+#: ../../include/features.php:86
msgid "Web Pages"
msgstr ""
-#: ../../include/features.php:91
+#: ../../include/features.php:87
msgid "Provide managed web pages on your channel"
msgstr ""
-#: ../../include/features.php:100
+#: ../../include/features.php:96
msgid "Provide a wiki for your channel"
msgstr ""
-#: ../../include/features.php:117
+#: ../../include/features.php:113
msgid "Private Notes"
msgstr ""
-#: ../../include/features.php:118
+#: ../../include/features.php:114
msgid "Enables a tool to store notes and reminders (note: not encrypted)"
msgstr ""
-#: ../../include/features.php:126
+#: ../../include/features.php:122
msgid "Navigation Channel Select"
msgstr ""
-#: ../../include/features.php:127
+#: ../../include/features.php:123
msgid "Change channels directly from within the navigation dropdown menu"
msgstr ""
-#: ../../include/features.php:135
+#: ../../include/features.php:131
msgid "Photo Location"
msgstr ""
-#: ../../include/features.php:136
+#: ../../include/features.php:132
msgid "If location data is available on uploaded photos, link this to a map."
msgstr ""
-#: ../../include/features.php:144
+#: ../../include/features.php:140
msgid "Access Controlled Chatrooms"
msgstr ""
-#: ../../include/features.php:145
+#: ../../include/features.php:141
msgid "Provide chatrooms and chat services with access control."
msgstr ""
-#: ../../include/features.php:154
+#: ../../include/features.php:150
msgid "Provide alternate connection permission roles."
msgstr ""
-#: ../../include/features.php:162
+#: ../../include/features.php:158
msgid "Smart Birthdays"
msgstr ""
-#: ../../include/features.php:163
+#: ../../include/features.php:159
msgid ""
"Make birthday events timezone aware in case your friends are scattered "
"across the planet."
msgstr ""
-#: ../../include/features.php:171
+#: ../../include/features.php:167
msgid "Event Timezone Selection"
msgstr ""
-#: ../../include/features.php:172
+#: ../../include/features.php:168
msgid "Allow event creation in timezones other than your own."
msgstr ""
-#: ../../include/features.php:180
+#: ../../include/features.php:176
msgid "Advanced Directory Search"
msgstr ""
-#: ../../include/features.php:181
+#: ../../include/features.php:177
msgid "Allows creation of complex directory search queries"
msgstr ""
-#: ../../include/features.php:189
+#: ../../include/features.php:185
msgid "Advanced Theme and Layout Settings"
msgstr ""
-#: ../../include/features.php:190
+#: ../../include/features.php:186
msgid "Allows fine tuning of themes and page layouts"
msgstr ""
-#: ../../include/features.php:200
+#: ../../include/features.php:196
msgid "Post Composition Features"
msgstr ""
-#: ../../include/features.php:204
+#: ../../include/features.php:200
msgid "Large Photos"
msgstr ""
-#: ../../include/features.php:205
+#: ../../include/features.php:201
msgid ""
"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
"(640px) photo thumbnails"
msgstr ""
-#: ../../include/features.php:214
+#: ../../include/features.php:210
msgid "Automatically import channel content from other channels or feeds"
msgstr ""
-#: ../../include/features.php:222
+#: ../../include/features.php:218
msgid "Even More Encryption"
msgstr ""
-#: ../../include/features.php:223
+#: ../../include/features.php:219
msgid ""
"Allow optional encryption of content end-to-end with a shared secret key"
msgstr ""
-#: ../../include/features.php:231
+#: ../../include/features.php:227
msgid "Enable Voting Tools"
msgstr ""
-#: ../../include/features.php:232
+#: ../../include/features.php:228
msgid "Provide a class of post which others can vote on"
msgstr ""
-#: ../../include/features.php:240
+#: ../../include/features.php:236
msgid "Disable Comments"
msgstr ""
-#: ../../include/features.php:241
+#: ../../include/features.php:237
msgid "Provide the option to disable comments for a post"
msgstr ""
-#: ../../include/features.php:249
+#: ../../include/features.php:245
msgid "Delayed Posting"
msgstr ""
-#: ../../include/features.php:250
+#: ../../include/features.php:246
msgid "Allow posts to be published at a later date"
msgstr ""
-#: ../../include/features.php:258
+#: ../../include/features.php:254
msgid "Content Expiration"
msgstr ""
-#: ../../include/features.php:259
+#: ../../include/features.php:255
msgid "Remove posts/comments and/or private messages at a future time"
msgstr ""
-#: ../../include/features.php:267
+#: ../../include/features.php:263
msgid "Suppress Duplicate Posts/Comments"
msgstr ""
-#: ../../include/features.php:268
+#: ../../include/features.php:264
msgid ""
"Prevent posts with identical content to be published with less than two "
"minutes in between submissions."
msgstr ""
-#: ../../include/features.php:279
+#: ../../include/features.php:275
msgid "Network and Stream Filtering"
msgstr ""
-#: ../../include/features.php:283
+#: ../../include/features.php:279
msgid "Search by Date"
msgstr ""
-#: ../../include/features.php:284
+#: ../../include/features.php:280
msgid "Ability to select posts by date ranges"
msgstr ""
-#: ../../include/features.php:292 ../../include/group.php:331
+#: ../../include/features.php:288 ../../include/group.php:332
msgid "Privacy Groups"
msgstr ""
-#: ../../include/features.php:293
+#: ../../include/features.php:289
msgid "Enable management and selection of privacy groups"
msgstr ""
-#: ../../include/features.php:302
+#: ../../include/features.php:298
msgid "Save search terms for re-use"
msgstr ""
-#: ../../include/features.php:310
+#: ../../include/features.php:306
msgid "Network Personal Tab"
msgstr ""
-#: ../../include/features.php:311
+#: ../../include/features.php:307
msgid "Enable tab to display only Network posts that you've interacted on"
msgstr ""
-#: ../../include/features.php:319
+#: ../../include/features.php:315
msgid "Network New Tab"
msgstr ""
-#: ../../include/features.php:320
+#: ../../include/features.php:316
msgid "Enable tab to display all new Network activity"
msgstr ""
-#: ../../include/features.php:328
+#: ../../include/features.php:324
msgid "Affinity Tool"
msgstr ""
-#: ../../include/features.php:329
+#: ../../include/features.php:325
msgid "Filter stream activity by depth of relationships"
msgstr ""
-#: ../../include/features.php:338
+#: ../../include/features.php:334
msgid "Show friend and connection suggestions"
msgstr ""
-#: ../../include/features.php:346
+#: ../../include/features.php:342
msgid "Connection Filtering"
msgstr ""
-#: ../../include/features.php:347
+#: ../../include/features.php:343
msgid "Filter incoming posts from connections based on keywords/content"
msgstr ""
-#: ../../include/features.php:359
+#: ../../include/features.php:355
msgid "Post/Comment Tools"
msgstr ""
-#: ../../include/features.php:363
+#: ../../include/features.php:359
msgid "Community Tagging"
msgstr ""
-#: ../../include/features.php:364
+#: ../../include/features.php:360
msgid "Ability to tag existing posts"
msgstr ""
-#: ../../include/features.php:372
+#: ../../include/features.php:368
msgid "Post Categories"
msgstr ""
-#: ../../include/features.php:373
+#: ../../include/features.php:369
msgid "Add categories to your posts"
msgstr ""
-#: ../../include/features.php:381
+#: ../../include/features.php:377
msgid "Emoji Reactions"
msgstr ""
-#: ../../include/features.php:382
+#: ../../include/features.php:378
msgid "Add emoji reaction ability to posts"
msgstr ""
-#: ../../include/features.php:391
+#: ../../include/features.php:387
msgid "Ability to file posts under folders"
msgstr ""
-#: ../../include/features.php:399
+#: ../../include/features.php:395
msgid "Dislike Posts"
msgstr ""
-#: ../../include/features.php:400
+#: ../../include/features.php:396
msgid "Ability to dislike posts/comments"
msgstr ""
-#: ../../include/features.php:408
+#: ../../include/features.php:404
msgid "Star Posts"
msgstr ""
-#: ../../include/features.php:409
+#: ../../include/features.php:405
msgid "Ability to mark special posts with a star indicator"
msgstr ""
-#: ../../include/features.php:417
+#: ../../include/features.php:413
msgid "Tag Cloud"
msgstr ""
-#: ../../include/features.php:418
+#: ../../include/features.php:414
msgid "Provide a personal tag cloud on your channel page"
msgstr ""
-#: ../../include/features.php:430
+#: ../../include/features.php:425
msgid "Premium Channel"
msgstr ""
-#: ../../include/features.php:431
+#: ../../include/features.php:426
msgid ""
"Allows you to set restrictions and terms on those that connect with your "
"channel"
msgstr ""
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+#: ../../include/taxonomy.php:267 ../../include/taxonomy.php:288
msgid "Tags"
msgstr ""
-#: ../../include/taxonomy.php:293
+#: ../../include/taxonomy.php:332
msgid "Keywords"
msgstr ""
-#: ../../include/taxonomy.php:314
+#: ../../include/taxonomy.php:353
msgid "have"
msgstr ""
-#: ../../include/taxonomy.php:314
+#: ../../include/taxonomy.php:353
msgid "has"
msgstr ""
-#: ../../include/taxonomy.php:315
+#: ../../include/taxonomy.php:354
msgid "want"
msgstr ""
-#: ../../include/taxonomy.php:315
+#: ../../include/taxonomy.php:354
msgid "wants"
msgstr ""
-#: ../../include/taxonomy.php:316
+#: ../../include/taxonomy.php:355
msgid "likes"
msgstr ""
-#: ../../include/taxonomy.php:317
+#: ../../include/taxonomy.php:356
msgid "dislikes"
msgstr ""
@@ -12902,51 +12900,51 @@ msgstr ""
msgid "Invitation could not be verified."
msgstr ""
-#: ../../include/account.php:130
+#: ../../include/account.php:157
msgid "Please enter the required information."
msgstr ""
-#: ../../include/account.php:198
+#: ../../include/account.php:224
msgid "Failed to store account information."
msgstr ""
-#: ../../include/account.php:263
+#: ../../include/account.php:291
#, php-format
msgid "Registration confirmation for %s"
msgstr ""
-#: ../../include/account.php:330
+#: ../../include/account.php:360
#, php-format
msgid "Registration request at %s"
msgstr ""
-#: ../../include/account.php:352
+#: ../../include/account.php:382
msgid "your registration password"
msgstr ""
-#: ../../include/account.php:358 ../../include/account.php:420
+#: ../../include/account.php:388 ../../include/account.php:450
#, php-format
msgid "Registration details for %s"
msgstr ""
-#: ../../include/account.php:431
+#: ../../include/account.php:461
msgid "Account approved."
msgstr ""
-#: ../../include/account.php:471
+#: ../../include/account.php:501
#, php-format
msgid "Registration revoked for %s"
msgstr ""
-#: ../../include/account.php:756 ../../include/account.php:758
+#: ../../include/account.php:780 ../../include/account.php:782
msgid "Click here to upgrade."
msgstr ""
-#: ../../include/account.php:764
+#: ../../include/account.php:788
msgid "This action exceeds the limits set by your subscription plan."
msgstr ""
-#: ../../include/account.php:769
+#: ../../include/account.php:793
msgid "This action is not available under your subscription plan."
msgstr ""
@@ -13031,166 +13029,178 @@ msgstr ""
msgid "Happy Birthday %1$s"
msgstr ""
-#: ../../include/nav.php:92
+#: ../../include/nav.php:90
msgid "Remote authentication"
msgstr ""
-#: ../../include/nav.php:92
+#: ../../include/nav.php:90
msgid "Click to authenticate to your home hub"
msgstr ""
-#: ../../include/nav.php:103 ../../include/nav.php:127
+#: ../../include/nav.php:99 ../../include/nav.php:123
msgid "End this session"
msgstr ""
-#: ../../include/nav.php:106
+#: ../../include/nav.php:102
msgid "Your profile page"
msgstr ""
-#: ../../include/nav.php:109
+#: ../../include/nav.php:105
msgid "Manage/Edit profiles"
msgstr ""
-#: ../../include/nav.php:111
+#: ../../include/nav.php:107
msgid "Edit your profile"
msgstr ""
-#: ../../include/nav.php:117
+#: ../../include/nav.php:113
msgid "Sign in"
msgstr ""
-#: ../../include/nav.php:142
+#: ../../include/nav.php:138
msgid "Take me home"
msgstr ""
-#: ../../include/nav.php:144
+#: ../../include/nav.php:140
msgid "Log me out of this site"
msgstr ""
-#: ../../include/nav.php:149
+#: ../../include/nav.php:145
msgid "Create an account"
msgstr ""
-#: ../../include/nav.php:161
+#: ../../include/nav.php:157
msgid "Help and documentation"
msgstr ""
-#: ../../include/nav.php:164
+#: ../../include/nav.php:160
msgid "Search site @name, #tag, ?docs, content"
msgstr ""
-#: ../../include/nav.php:176
+#: ../../include/nav.php:171
msgid "Grid"
msgstr ""
-#: ../../include/nav.php:176
+#: ../../include/nav.php:171
msgid "Your grid"
msgstr ""
-#: ../../include/nav.php:177
+#: ../../include/nav.php:172
msgid "View your network/grid"
msgstr ""
-#: ../../include/nav.php:178
+#: ../../include/nav.php:173
msgid "Mark all grid notifications seen"
msgstr ""
-#: ../../include/nav.php:180
+#: ../../include/nav.php:175
msgid "Channel home"
msgstr ""
-#: ../../include/nav.php:181
+#: ../../include/nav.php:176
msgid "View your channel home"
msgstr ""
-#: ../../include/nav.php:182
+#: ../../include/nav.php:177
msgid "Mark all channel notifications seen"
msgstr ""
-#: ../../include/nav.php:188
+#: ../../include/nav.php:183
msgid "Notices"
msgstr ""
-#: ../../include/nav.php:188
+#: ../../include/nav.php:183
msgid "Notifications"
msgstr ""
-#: ../../include/nav.php:189
+#: ../../include/nav.php:184
msgid "View all notifications"
msgstr ""
-#: ../../include/nav.php:192
+#: ../../include/nav.php:185
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:187
msgid "Private mail"
msgstr ""
-#: ../../include/nav.php:193
+#: ../../include/nav.php:188
msgid "View your private messages"
msgstr ""
-#: ../../include/nav.php:194
+#: ../../include/nav.php:189
msgid "Mark all private messages seen"
msgstr ""
-#: ../../include/nav.php:200
+#: ../../include/nav.php:195
msgid "Event Calendar"
msgstr ""
-#: ../../include/nav.php:201
+#: ../../include/nav.php:196
msgid "View events"
msgstr ""
-#: ../../include/nav.php:202
+#: ../../include/nav.php:197
msgid "Mark all events seen"
msgstr ""
-#: ../../include/nav.php:205
+#: ../../include/nav.php:199
msgid "Manage Your Channels"
msgstr ""
-#: ../../include/nav.php:207
+#: ../../include/nav.php:201
msgid "Account/Channel Settings"
msgstr ""
-#: ../../include/nav.php:215
+#: ../../include/nav.php:209
msgid "Site Setup and Configuration"
msgstr ""
-#: ../../include/nav.php:277
+#: ../../include/nav.php:268
msgid "@name, #tag, ?doc, content"
msgstr ""
-#: ../../include/nav.php:278
+#: ../../include/nav.php:269
msgid "Please wait..."
msgstr ""
-#: ../../include/nav.php:280
+#: ../../include/nav.php:272
msgid "Add Apps"
msgstr ""
-#: ../../include/photos.php:115
+#: ../../include/nav.php:273
+msgid "Arrange Apps"
+msgstr ""
+
+#: ../../include/nav.php:274
+msgid "Toggle System Apps"
+msgstr ""
+
+#: ../../include/photos.php:111
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
msgstr ""
-#: ../../include/photos.php:122
+#: ../../include/photos.php:118
msgid "Image file is empty."
msgstr ""
-#: ../../include/photos.php:261
+#: ../../include/photos.php:257
msgid "Photo storage failed."
msgstr ""
-#: ../../include/photos.php:301
+#: ../../include/photos.php:297
msgid "a new photo"
msgstr ""
-#: ../../include/photos.php:305
+#: ../../include/photos.php:301
#, php-format
msgctxt "photo_upload"
msgid "%1$s posted %2$s to %3$s"
msgstr ""
-#: ../../include/photos.php:533
+#: ../../include/photos.php:530
msgid "Upload New Photos"
msgstr ""
@@ -13202,12 +13212,12 @@ msgstr ""
msgid "Unable to verify channel signature"
msgstr ""
-#: ../../include/zot.php:2313
+#: ../../include/zot.php:2320
#, php-format
msgid "Unable to verify site signature for %s"
msgstr ""
-#: ../../include/zot.php:3764
+#: ../../include/zot.php:3780
msgid "invalid target signature"
msgstr ""
@@ -13222,27 +13232,27 @@ msgstr ""
msgid "Add new connections to this privacy group"
msgstr ""
-#: ../../include/group.php:309
+#: ../../include/group.php:310
msgid "edit"
msgstr ""
-#: ../../include/group.php:332
+#: ../../include/group.php:333
msgid "Edit group"
msgstr ""
-#: ../../include/group.php:333
+#: ../../include/group.php:334
msgid "Add privacy group"
msgstr ""
-#: ../../include/group.php:334
+#: ../../include/group.php:335
msgid "Channels not in any privacy group"
msgstr ""
-#: ../../include/connections.php:127
+#: ../../include/connections.php:128
msgid "New window"
msgstr ""
-#: ../../include/connections.php:128
+#: ../../include/connections.php:129
msgid "Open the selected location in a different window or browser tab"
msgstr ""
diff --git a/util/typo.php b/util/typo.php
index a8d363340..e25e57601 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -12,7 +12,6 @@
App::init();
-// $a = new App();
echo "Directory: include\n";
$files = glob('include/*.php');